Merge pull request #849 from Particular/add-net6-support-63

Add support for .NET 6

Author: bording

.github/workflows/ci.yml

@@ -46,7 +46,7 @@ jobs:
         uses: actions/setup-dotnet@v1.9.0
         with:
           dotnet-version: |
-            5.0.x
+            6.0.x
             3.1.x
       - name: Build
         run: dotnet build src --configuration Release

.github/workflows/release.yml

@@ -23,7 +23,7 @@ jobs:
       - name: Setup .NET SDK
         uses: actions/setup-dotnet@v1.9.0
         with:
-          dotnet-version: 5.0.x
+          dotnet-version: 6.0.x
       - name: Build
         run: dotnet build src --configuration Release
       - name: Install NuGetKeyVaultSignTool

src/.gitignore

@@ -1,2 +1 @@
 PromotedSqlScripts/
-Integration/Directory.Build.props

src/AcceptanceTestHelper/AcceptanceTestHelper.csproj

@@ -13,7 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NServiceBus" Version="[7.4.1,)" />
+    <PackageReference Include="NServiceBus" Version="7.6.0" />
   </ItemGroup>
 
 </Project>

src/CommandLine/NServiceBus.Persistence.Sql.CommandLine.csproj

@@ -1,26 +1,21 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <ToolCommandName>sql-persistence</ToolCommandName>
     <PackAsTool>True</PackAsTool>
-    <Description>.NET Core global tool to generate scripts for NServiceBus Sql persistence</Description>
+    <Description>.NET tool for generating deployment scripts for the NServiceBus.Persistence.Sql package</Description>
     <GenerateDocumentationFile>false</GenerateDocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="3.1.0" />
-	<PackageReference Include="Particular.Packaging" Version="1.2.1" PrivateAssets="All" />
+    <ProjectReference Include="..\ScriptBuilder\ScriptBuilder.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\ScriptBuilder\ScriptBuilder.csproj" />
+    <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="3.1.0" />
+    <PackageReference Include="Particular.Packaging" Version="1.4.0" PrivateAssets="All" />
   </ItemGroup>
-  
-  <PropertyGroup>
-    <PackageId>NServiceBus.Persistence.Sql.CommandLine</PackageId>
-    <Description>Dotnet tool for generating deployment scripts for the NServiceBus.Persistence.Sql package</Description>
-  </PropertyGroup>
 
 </Project>