Build with the .NET 6.0 SDK

Author: AArnott

azure-pipelines.yml

@@ -54,24 +54,31 @@ stages:
         git config --global user.name ci
         git config --global user.email [email protected]
       displayName: Configure git commit author for testing
+    - task: UseDotNet@2
+      displayName: Install .NET Core 3.1 runtime
+      inputs:
+        packageType: runtime
+        version: 3.1.x
 
     - task: UseDotNet@2
-      displayName: Install .NET Core 5.0.401 SDK
+      displayName: Install .NET 5.0 SDK
       inputs:
-        packageType: sdk
-        version: 5.0.401
+        packageType: sdk # necessary for msbuild tests to run on .NET 5 runtime
+        version: 5.0.x
 
     - task: UseDotNet@2
-      displayName: Install .NET Core 3.1 runtime
+      displayName: Install .NET 6.0 SDK
       inputs:
-        packageType: runtime
-        version: 3.1.x
+        packageType: sdk
+        version: 6.0.100
+
 
     - pwsh: |
         Invoke-WebRequest -Uri "https://dot.net/v1/dotnet-install.ps1" -OutFile dotnet-install.ps1
-        & .\dotnet-install.ps1 -Architecture x86 -Version 5.0.401 -InstallDir "C:\Program Files (x86)\dotnet\" -NoPath -Verbose
-        & .\dotnet-install.ps1 -Architecture x86 -Channel 3.1 -InstallDir "C:\Program Files (x86)\dotnet\" -NoPath -Verbose
-      displayName: Install 32-bit .NET Core SDK 5.0.401, 3.1
+        & .\dotnet-install.ps1 -Architecture x86 -Channel 3.1 -InstallDir "C:\Program Files (x86)\dotnet\" -NoPath -Verbose -Runtime dotnet
+        & .\dotnet-install.ps1 -Architecture x86 -Channel 5.0 -InstallDir "C:\Program Files (x86)\dotnet\" -NoPath -Verbose
+        & .\dotnet-install.ps1 -Architecture x86 -Version 6.0.100 -InstallDir "C:\Program Files (x86)\dotnet\" -NoPath -Verbose
+      displayName: Install 32-bit .NET SDK and runtimes
       condition: ne(variables['dotnet32'], '')
 
     - script: dotnet --info
@@ -328,10 +335,15 @@ stages:
         packageType: runtime
         version: 3.1.x
     - task: UseDotNet@2
-      displayName: Install .NET Core 5.0.401 SDK
+      displayName: Install .NET 5.0 runtime
+      inputs:
+        packageType: runtime
+        version: 5.0.x
+    - task: UseDotNet@2
+      displayName: Install .NET 6.0.100 SDK
       inputs:
         packageType: sdk
-        version: 5.0.401
+        version: 6.0.100
     - script: dotnet --info
       displayName: Show dotnet SDK info
     - bash: |

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "5.0.401",
+    "version": "6.0.100",
     "rollForward": "patch",
     "allowPrerelease": false
   }

src/Directory.Build.props

@@ -24,7 +24,6 @@
     <LibGit2SharpNativeVersion>2.0.312</LibGit2SharpNativeVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Net.Compilers.Toolset" Version="3.11.0" PrivateAssets="all" />
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
     <PackageReference Include="CSharpIsNullAnalyzer" Version="0.1.288-beta">

src/NerdBank.GitVersioning.Tests/NerdBank.GitVersioning.Tests.csproj

@@ -36,7 +36,7 @@
     <PackageReference Include="System.Collections.Immutable" Version="1.5.0" />
     <PackageReference Include="Microsoft.Build" Version="15.1.548" ExcludeAssets="runtime" />
     <PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.1.548" ExcludeAssets="runtime" />
-    <PackageReference Include="Microsoft.Build.Locator" Version="1.2.6" />
+    <PackageReference Include="Microsoft.Build.Locator" Version="1.4.1" />
     <PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.9.0" />
     <PackageReference Include="Xunit.Combinatorial" Version="1.2.7" />
     <PackageReference Include="xunit" Version="2.4.1" />