Update build stuff (henkmollema#167)

* Multi-target tests
* Update/simplify build scripts

Author: henkmollema

.travis.yml

@@ -16,9 +16,4 @@ branches:
 script:
     - dotnet restore
     - dotnet build
-    - dotnet test test/Dommel.Tests
-    - dotnet test test/Dommel.IntegrationTests
-    - dotnet test test/Dommel.Json.Tests
-    - dotnet test test/Dommel.Json.IntegrationTests
-script:
-  - ./build.sh
+    - dotnet test --no-build

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 Henk Mollema
+Copyright (c) 2019 Henk Mollema
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

NuGet.Config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
-    <add key="NuGet" value="https://nuget.org/api/v2" />
+     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
   </packageSources>
 </configuration>

build.ps1

@@ -25,18 +25,7 @@ echo "build: Build version suffix is $buildSuffix"
 exec { & dotnet build Dommel.sln -c Release --version-suffix=$buildSuffix /p:CI=true }
 
 echo "build: Executing tests"
-Push-Location -Path .\test\Dommel.Tests
 exec { & dotnet test -c Release --no-build }
-Pop-Location
-Push-Location -Path .\test\Dommel.IntegrationTests
-exec { & dotnet test -c Release --no-build }
-Pop-Location
-Push-Location -Path .\test\Dommel.Json.Tests
-exec { & dotnet test -c Release --no-build }
-Pop-Location
-Push-Location -Path .\test\Dommel.Json.IntegrationTests
-exec { & dotnet test -c Release --no-build }
-Pop-Location
 
 if ($env:APPVEYOR_BUILD_NUMBER) {
     $versionSuffix = "{0:00000}" -f [convert]::ToInt32("0" + $env:APPVEYOR_BUILD_NUMBER, 10)

build.sh

@@ -1,3 +1,2 @@
 dotnet build
-dotnet test test/Dommel.Tests
-dotnet test test/Dommel.IntegrationTests
+dotnet test

src/Dommel/Dommel.csproj

@@ -14,6 +14,7 @@
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>https://github.com/henkmollema/Dommel</RepositoryUrl>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>embedded</DebugType>
   </PropertyGroup>

test/Dommel.IntegrationTests/Dommel.IntegrationTests.csproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>net461;netcoreapp2.1;netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp3.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>

test/Dommel.Json.IntegrationTests/Databases/JsonMySqlDatabaseDriver.cs

@@ -6,6 +6,8 @@ namespace Dommel.Json.IntegrationTests
 {
     public class JsonMySqlDatabaseDriver : MySqlDatabaseDriver
     {
+        public override string DefaultDatabaseName => "dommeljsontests";
+
         protected override async Task<bool> CreateTables()
         {
             using (var con = GetConnection(DefaultDatabaseName))

test/Dommel.Json.IntegrationTests/Databases/JsonPostgresDatabaseDriver.cs

@@ -6,15 +6,17 @@ namespace Dommel.Json.IntegrationTests
 {
     public class JsonPostgresDatabaseDriver : PostgresDatabaseDriver
     {
+        public override string DefaultDatabaseName => "dommeljsontests";
+
         protected override async Task<bool> CreateTables()
         {
             using (var con = GetConnection(DefaultDatabaseName))
             {
                 var sql = @"
 create table if not exists ""Leads"" (
-    ""Id"" serial primary key, 
-    ""DateCreated"" timestamp, 
-    ""Email"" varchar(255), 
+    ""Id"" serial primary key,
+    ""DateCreated"" timestamp,
+    ""Email"" varchar(255),
     ""Data"" json,
     ""Metadata"" json
 );";

test/Dommel.Json.IntegrationTests/Databases/JsonSqlServerDatabaseDriver.cs

@@ -6,6 +6,8 @@ namespace Dommel.Json.IntegrationTests
 {
     public class JsonSqlServerDatabaseDriver : SqlServerDatabaseDriver
     {
+        public override string DefaultDatabaseName => "dommeljsontests";
+
         protected override async Task<bool> CreateTables()
         {
             using (var con = GetConnection(DefaultDatabaseName))

test/Dommel.Json.IntegrationTests/Dommel.Json.IntegrationTests.csproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFrameworks>net461;netcoreapp2.1;netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp3.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>

test/Dommel.Json.Tests/Dommel.Json.Tests.csproj

@@ -1,7 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFrameworks>net461;netcoreapp2.1;netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp3.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Dommel.Json\Dommel.Json.csproj" />

test/Dommel.Tests/Dommel.Tests.csproj

@@ -1,7 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>net461;netcoreapp2.1;netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp3.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="coverlet.msbuild" Version="2.7.0">