Upgrade to cake 2.0 and other fixes.

.config/dotnet-tools.json

@@ -0,0 +1,12 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "cake.tool": {
+      "version": "2.0.0",
+      "commands": [
+        "dotnet-cake"
+      ]
+    }
+  }
+}

.editorconfig

@@ -78,4 +78,10 @@ csharp_new_line_before_else = true
 csharp_new_line_before_catch = true
 csharp_new_line_before_finally = true
 csharp_new_line_before_members_in_object_initializers = true
-csharp_new_line_before_members_in_anonymous_types = true
+csharp_new_line_before_members_in_anonymous_types = true
+
+# Stylecop
+dotnet_diagnostic.SA1101.severity = none
+dotnet_diagnostic.SA1309.severity = none
+dotnet_diagnostic.SA1600.severity = none
+dotnet_diagnostic.SA1633.severity = none

ReleaseNotes.md

@@ -1,3 +1,10 @@
+### New in 4.0.0
+* Using Cake 2.0.0
+* Following rules from Cake Guidelines
+* Target frameworks netcoreapp3.1, net5.0, net6.0
+* Adjusted to StyleCop rules
+* For .net6.0 depending on DacFX preview due to known issue https://github.com/microsoft/DacFx/issues/33
+
 ### New in 3.0.0
 * Updating to netstandard 2.0
 * Using Cake 1.0.0

appveyor.ps1

@@ -2,13 +2,13 @@
 # Installation
 #-------------------------------
 
-Write-Host "Downloading .NET Core SDK 3.1 ..."
+Write-Host "Downloading .NET SDK 6.0 ..."
 
-(New-Object System.Net.WebClient).DownloadFile('https://download.visualstudio.microsoft.com/download/pr/cc28204e-58d7-4f2e-9539-aad3e71945d9/d4da77c35a04346cc08b0cacbc6611d5/dotnet-sdk-3.1.406-win-x64.exe','dotnet-sdk-3.1.406-win-x64.exe')
+(New-Object System.Net.WebClient).DownloadFile('https://download.visualstudio.microsoft.com/download/pr/0f71eaf1-ce85-480b-8e11-c3e2725b763a/9044bfd1c453e2215b6f9a0c224d20fe/dotnet-sdk-6.0.100-win-x64.exe','dotnet-sdk-6.0.100-win-x64.exe')
 # Invoke-WebRequest "https://go.microsoft.com/fwlink/?linkid=841686" -OutFile "dotnet-core-sdk.exe"
 
-Write-Host "Installing .NET Core SDK 3.1 ..."
+Write-Host "Installing .NET SDK 6.0 ..."
 
-Invoke-Command -ScriptBlock { ./dotnet-sdk-3.1.406-win-x64.exe /S /v/qn }
+Invoke-Command -ScriptBlock { ./dotnet-sdk-6.0.100-win-x64.exe /S /v/qn }
 
 Write-Host "Installation succeeded." -ForegroundColor Green

appveyor.yml

@@ -1,5 +1,5 @@
 version: "{build}"
-image: Visual Studio 2019
+image: Visual Studio 2022
 environment:
     NUGET_API_KEY:
         secure: 8qBLJ+Nj3wkgj/DZEtGYQK21clewDLJ5vPwf3XMgVyPn8jl5WRzzee3mc0WqEHi+

build.cake

@@ -1,5 +1,5 @@
-#tool "nuget:?package=NUnit.ConsoleRunner&version=3.12.0"
-#tool "nuget:?package=GitVersion.CommandLine&version=5.6.6"
+#tool "nuget:?package=NUnit.ConsoleRunner&version=3.13.0"
+#tool "nuget:?package=GitVersion.CommandLine&version=5.8.1"
 #load "./parameters.cake"
 
 
@@ -54,7 +54,7 @@ Task("Restore-Nuget-Packages")
 {
     Information("Restoring packages in {0}", BuildParameters.Solution);
 
-    DotNetCoreRestore(BuildParameters.Solution);
+    DotNetRestore(BuildParameters.Solution);
 });
 
 
@@ -67,9 +67,9 @@ Task("Build")
 {
     Information("Building {0}", BuildParameters.Solution);
 
-    DotNetCoreMSBuild(
+    DotNetMSBuild(
         BuildParameters.Solution,
-        new DotNetCoreMSBuildSettings()
+        new DotNetMSBuildSettings()
             .WithTarget("Build")
             .SetConfiguration(configuration));
 });
@@ -120,15 +120,15 @@ Task("Run-Unit-Tests")
     .Does(() =>
 	{
         var testProject = "./src/Tests/Tests.csproj";
-        Information(testProject);       
+        Information(testProject);
 
-        var settings = new DotNetCoreTestSettings
+        var settings = new DotNetTestSettings
         {
             Configuration = "Release",
             Loggers = new List<string> { $"nunit;LogFilePath={parameters.TestResultsFile}" },
         };
 
-        DotNetCoreTest(testProject, settings);
+        DotNetTest(testProject, settings);
     })
     .Finally(() =>
     {
@@ -146,43 +146,21 @@ Task("Copy-Files")
     .Does(() =>
 	{
         EnsureDirectoryExists(parameters.ResultBinDir);
-        EnsureDirectoryExists(parameters.ResultBinDir + "/net461");
-        EnsureDirectoryExists(parameters.ResultBinDir + "/netstandard2.0");
+        EnsureDirectoryExists(parameters.ResultBinDir + "/netcoreapp3.1");
         EnsureDirectoryExists(parameters.ResultBinDir + "/net5.0");
-        EnsureDirectoryExists(parameters.ResultBinDir + "/net5.0/ref");
-
-        CopyFileToDirectory(parameters.BuildDir + "/net461/Cake.SqlServer.dll", parameters.ResultBinDir + "/net461");
-        CopyFileToDirectory(parameters.BuildDir + "/net461/Cake.SqlServer.pdb", parameters.ResultBinDir + "/net461");
-        CopyFileToDirectory(parameters.BuildDir + "/net461/Cake.SqlServer.xml", parameters.ResultBinDir + "/net461");
-        CopyFileToDirectory(parameters.BuildDir + "/net461/Microsoft.Data.SqlClient.dll", parameters.ResultBinDir + "/net461");
-        CopyFileToDirectory(parameters.BuildDir + "/net461/Microsoft.Data.SqlClient.SNI.x64.dll", parameters.ResultBinDir + "/net461");
-        CopyFileToDirectory(parameters.BuildDir + "/net461/Microsoft.Data.SqlClient.SNI.x64.pdb", parameters.ResultBinDir + "/net461");
-        CopyFileToDirectory(parameters.BuildDir + "/net461/Microsoft.Data.SqlClient.SNI.x86.dll", parameters.ResultBinDir + "/net461");
-        CopyFileToDirectory(parameters.BuildDir + "/net461/Microsoft.Data.SqlClient.SNI.x86.pdb", parameters.ResultBinDir + "/net461");
-        CopyFileToDirectory(parameters.BuildDir + "/net461/Microsoft.Data.Tools.Schema.Sql.dll", parameters.ResultBinDir + "/net461");
-        CopyFileToDirectory(parameters.BuildDir + "/net461/Microsoft.Data.Tools.Utilities.dll", parameters.ResultBinDir + "/net461");
-        CopyFileToDirectory(parameters.BuildDir + "/net461/Microsoft.Identity.Client.dll", parameters.ResultBinDir + "/net461");
-        CopyFileToDirectory(parameters.BuildDir + "/net461/Microsoft.IdentityModel.JsonWebTokens.dll", parameters.ResultBinDir + "/net461");
-        CopyFileToDirectory(parameters.BuildDir + "/net461/Microsoft.IdentityModel.Logging.dll", parameters.ResultBinDir + "/net461");
-        CopyFileToDirectory(parameters.BuildDir + "/net461/Microsoft.IdentityModel.Protocols.dll", parameters.ResultBinDir + "/net461");
-        CopyFileToDirectory(parameters.BuildDir + "/net461/Microsoft.IdentityModel.Protocols.OpenIdConnect.dll", parameters.ResultBinDir + "/net461");
-        CopyFileToDirectory(parameters.BuildDir + "/net461/Microsoft.IdentityModel.Tokens.dll", parameters.ResultBinDir + "/net461");
-        CopyFileToDirectory(parameters.BuildDir + "/net461/Microsoft.SqlServer.Dac.dll", parameters.ResultBinDir + "/net461");
-        CopyFileToDirectory(parameters.BuildDir + "/net461/Microsoft.SqlServer.Dac.Extensions.dll", parameters.ResultBinDir + "/net461");
-        CopyFileToDirectory(parameters.BuildDir + "/net461/Microsoft.SqlServer.TransactSql.ScriptDom.dll", parameters.ResultBinDir + "/net461");
-        CopyFileToDirectory(parameters.BuildDir + "/net461/Microsoft.SqlServer.Types.dll", parameters.ResultBinDir + "/net461");
-        CopyFileToDirectory(parameters.BuildDir + "/net461/System.IdentityModel.Tokens.Jwt.dll", parameters.ResultBinDir + "/net461");
-
-        CopyFileToDirectory(parameters.BuildDir + "/netstandard2.0/Cake.SqlServer.dll", parameters.ResultBinDir + "/netstandard2.0");
-        CopyFileToDirectory(parameters.BuildDir + "/netstandard2.0/Cake.SqlServer.pdb", parameters.ResultBinDir + "/netstandard2.0");
-        CopyFileToDirectory(parameters.BuildDir + "/netstandard2.0/Cake.SqlServer.xml", parameters.ResultBinDir + "/netstandard2.0");
-        CopyFileToDirectory(parameters.BuildDir + "/netstandard2.0/Cake.SqlServer.deps.json", parameters.ResultBinDir + "/netstandard2.0");
+        EnsureDirectoryExists(parameters.ResultBinDir + "/net6.0");
+
+        CopyFileToDirectory(parameters.BuildDir + "/netcoreapp3.1/Cake.SqlServer.dll", parameters.ResultBinDir + "/netcoreapp3.1");
+        CopyFileToDirectory(parameters.BuildDir + "/netcoreapp3.1/Cake.SqlServer.pdb", parameters.ResultBinDir + "/netcoreapp3.1");
+        CopyFileToDirectory(parameters.BuildDir + "/netcoreapp3.1/Cake.SqlServer.xml", parameters.ResultBinDir + "/netcoreapp3.1");
 
         CopyFileToDirectory(parameters.BuildDir + "/net5.0/Cake.SqlServer.dll", parameters.ResultBinDir + "/net5.0");
         CopyFileToDirectory(parameters.BuildDir + "/net5.0/Cake.SqlServer.pdb", parameters.ResultBinDir + "/net5.0");
         CopyFileToDirectory(parameters.BuildDir + "/net5.0/Cake.SqlServer.xml", parameters.ResultBinDir + "/net5.0");
-        CopyFileToDirectory(parameters.BuildDir + "/net5.0/Cake.SqlServer.deps.json", parameters.ResultBinDir + "/net5.0");
-        CopyFileToDirectory(parameters.BuildDir + "/net5.0/ref/Cake.SqlServer.dll", parameters.ResultBinDir + "/net5.0/ref");
+
+        CopyFileToDirectory(parameters.BuildDir + "/net6.0/Cake.SqlServer.dll", parameters.ResultBinDir + "/net6.0");
+        CopyFileToDirectory(parameters.BuildDir + "/net6.0/Cake.SqlServer.pdb", parameters.ResultBinDir + "/net6.0");
+        CopyFileToDirectory(parameters.BuildDir + "/net6.0/Cake.SqlServer.xml", parameters.ResultBinDir + "/net6.0");
 
         CopyFiles(new FilePath[] { "LICENSE", "README.md", "ReleaseNotes.md" }, parameters.ResultBinDir);
 	});