Remove support for netcoreapp2.1 and add support for net6.0 (#194)

* Remove support for netcoreapp2.1 and add support for net6.0

* Use DACFX preview

* Update workflow for .NET 6

* Change TFM logic yet again

* Fix version dependency in workflow

* Yet more fixes

* Fix comment

Co-authored-by: Jonathan Mezach <[email protected]>

Author: AroglDarthu

.github/workflows/main.yml

@@ -26,12 +26,7 @@ jobs:
         fetch-depth: 0 # avoid shallow clone so nbgv can do its work.
         submodules: 'true' # need to check out the SqlTools submodule to build successfully.
 
-    # Install .NET Core SDK's for 2.1, 3.1 and 5.0
-    - name: Setup dotnet 2.1
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: '2.1.x'
-
+    # Install .NET Core SDK's for 3.1, 5.0 and 6.0
     - name: Setup dotnet 3.1
       uses: actions/setup-dotnet@v1
       with:
@@ -42,6 +37,11 @@ jobs:
       with:
         dotnet-version: '5.0.x'
 
+    - name: Setup dotnet 6.0
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: '6.0.x'
+
     # Install Nerdbank.GitVersioning
     - name: install nbgv
       run: dotnet tool install --tool-path . nbgv
@@ -112,7 +112,7 @@ jobs:
     strategy:
       matrix:
         os: [ "ubuntu-18.04", "macos-10.15", "windows-2019" ]
-        dotnet: [ '2.1.x', '3.1.x', '5.0.x' ]
+        dotnet: [ '3.1.x', '5.0.x', '6.0.x' ]
       fail-fast: false
 
     steps:
@@ -176,13 +176,12 @@ jobs:
 
     # Build the project using double wildcard (i.e. 1.*-*)
     - name: build project (double floating version / dotnet 3)
-      if: ${{ matrix.dotnet != '2.1.x' }}
-      run: dotnet build ./test/TestProjectWithSDKRef/TestProjectWithSDKRef.csproj /bl /p:DependencyVersion="1.*-*" /warnaserror:SQL71502
+      run: dotnet build ./test/TestProjectWithSDKRef/TestProjectWithSDKRef.csproj /bl /p:DependencyVersion="2.*-*" /warnaserror:SQL71502
       shell: pwsh
 
     # Upload dacpac
     - name: upload
-      if: ${{ matrix.os == 'ubuntu-18.04' && matrix.dotnet == '3.1.x' }}
+      if: ${{ matrix.os == 'ubuntu-18.04' && matrix.dotnet == '6.0.x' }}
       uses: actions/[email protected]
       with:
         name: dacpac-package
@@ -279,7 +278,7 @@ jobs:
     # Setup .NET SDK
     - uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: '5.0.x'
+        dotnet-version: '6.0.x'
 
     # Install Nerdbank.GitVersioning
     - name: install nbgv
@@ -296,11 +295,11 @@ jobs:
       with:
         files: 'test/TestProjectWithSDKRef/TestProjectWithSDKRef.csproj'
       env:
-        DependencyVersion: '1.*-*'
+        DependencyVersion: '2.*-*'
 
     # Publish the project
     - name: publish project
-      run: dotnet publish ./test/TestProjectWithSDKRef/TestProjectWithSDKRef.csproj /p:TargetUser=sa /p:TargetPassword=JdMsKZPBBA8kVFXVrj8d /bl /p:DependencyVersion="1.*-*" /warnaserror:SQL71502
+      run: dotnet publish ./test/TestProjectWithSDKRef/TestProjectWithSDKRef.csproj /p:TargetUser=sa /p:TargetPassword=JdMsKZPBBA8kVFXVrj8d /bl /p:DependencyVersion="2.*-*" /warnaserror:SQL71502
 
     # Upload binary log
     - name: upload
@@ -325,7 +324,7 @@ jobs:
     # Setup .NET SDK
     - uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: '5.0.x'
+        dotnet-version: '6.0.x'
 
     # Download artifacts
     - name: download-artifact

src/DacpacTool/DacpacTool.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>netcoreapp2.1;netcoreapp3.1;netcoreapp5.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
     <LangVersion>9.0</LangVersion>
   </PropertyGroup>
 
@@ -12,8 +12,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SqlServer.DACFX" Version="150.5282.3" />
-    <PackageReference Include="System.CommandLine" Version="2.0.0-beta1.21216.1" />
+    <PackageReference Include="Microsoft.SqlServer.DACFX" Version="160.5323.3-preview" />
+    <PackageReference Include="System.CommandLine" Version="2.0.0-beta1.21308.1" />
   </ItemGroup>
 
   <!-- References to Microsoft.SqlTools.ManagedBatchParser -->

src/MSBuild.Sdk.SqlProj/MSBuild.Sdk.SqlProj.csproj

@@ -31,7 +31,7 @@
 
   <Target Name="IncludeDacpacTool" AfterTargets="Build">
     <PropertyGroup>
-      <_DacpacToolSupportedTfms>netcoreapp2.1;netcoreapp3.1;netcoreapp5.0</_DacpacToolSupportedTfms>
+      <_DacpacToolSupportedTfms>netcoreapp3.1;net5.0;net6.0</_DacpacToolSupportedTfms>
     </PropertyGroup>
     <ItemGroup>
       <DacpacToolSupportedTfms Include="$(_DacpacToolSupportedTfms)" />

src/MSBuild.Sdk.SqlProj/Sdk/Sdk.targets

@@ -85,18 +85,19 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.Managed.targets" Condition="'$(MSBuildAssemblyVersion)' >= '16.0' And '$(ManagedLanguageTargetsGotImported)' != 'true'" />
 
   <!--
-    Validates that the environment is setup correctly for the DacpacTool to run. Currently we target .NET Core 2.1 and 3.1 and we pick the highest version based on
+    Validates that the environment is setup correctly for the DacpacTool to run. Currently we target .NET Core 3.1, 5.0 or 6.0 and we pick the version based on
     the BundledNETCoreAppTargetFrameworkVersion property. This property is set by the SDK, so we'll need to ensure that the SDK that is being used is compatible with one
     of the supported target frameworks.
   -->
   <Target Name="ValidateEnvironment">
     <PropertyGroup>
-      <DacpacToolTfm>netcoreapp$(BundledNETCoreAppTargetFrameworkVersion)</DacpacToolTfm>
+      <DacpacToolTfm Condition="'$(BundledNETCoreAppTargetFrameworkVersion)' == '3.1'">netcoreapp$(BundledNETCoreAppTargetFrameworkVersion)</DacpacToolTfm>
+      <DacpacToolTfm Condition="'$(BundledNETCoreAppTargetFrameworkVersion)' != '3.1'">net$(BundledNETCoreAppTargetFrameworkVersion)</DacpacToolTfm>
       <DacpacToolExe>$(MSBuildThisFileDirectory)../tools/$(DacpacToolTfm)/DacpacTool.dll</DacpacToolExe>
     </PropertyGroup>
     <Error Condition="!Exists($(DacpacToolExe))"
-           Text="The current SDK bundles target framework 'netcoreapp$(BundledNETCoreAppTargetFrameworkVersion)' which is not supported by MSBuild.Sdk.SqlProj. Either install a .NET Core SDK that supports 2.1, 3.1 or 5.0, or file an issue at https://github.com/rr-wfm/MSBuild.Sdk.SqlProj/ to add support. If you have preview SDKs installed, you may have to use a global.json file: https://docs.microsoft.com/dotnet/core/tools/global-json" />
-    <Message Importance="normal" Text="Using target framework $(DacpacToolTfm) to run DacpacTool" />
+           Text="The current SDK bundles target framework '$(BundledNETCoreAppTargetFrameworkVersion)' which is not supported by MSBuild.Sdk.SqlProj. Either install a .NET Core SDK that supports 3.1, 5.0 or 6.0, or file an issue at https://github.com/rr-wfm/MSBuild.Sdk.SqlProj/ to add support. If you have preview SDKs installed, you may have to use a global.json file: https://docs.microsoft.com/dotnet/core/tools/global-json" />
+    <Message Importance="High" Text="Using target framework $(DacpacToolTfm) to run DacpacTool" />
   </Target>
 
   <!--

test/DacpacTool.Tests/DacpacTool.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net5.0;netcoreapp3.1;netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <AssemblyName>MSBuild.Sdk.SqlProj.DacpacTool.Tests</AssemblyName>
     <RootNamespace>MSBuild.Sdk.SqlProj.DacpacTool.Tests</RootNamespace>

test/TestProject/global.json

@@ -0,0 +1,6 @@
+{
+    "sdk": {
+      "version": "6.0.0",
+      "rollForward": "latestMinor"
+    }
+}

version.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "1.18.0-beta.{height}",
+  "version": "2.0.0-beta.{height}",
   "nuGetPackageVersion": {
     "semVer": 2.0
   },