Merge pull request #663 from dotnet/dropnetcore2.1

AArnott · web-flow · commit 97920b75ddcf · 2021-09-30T14:04:17.000-06:00
Drop .NET Core 2.1 support
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -56,10 +56,10 @@ stages:
       displayName: Configure git commit author for testing
 
     - task: UseDotNet@2
-      displayName: Install .NET Core 5.0.202 SDK
+      displayName: Install .NET Core 5.0.401 SDK
       inputs:
         packageType: sdk
-        version: 5.0.202
+        version: 5.0.401
 
     - task: UseDotNet@2
       displayName: Install .NET Core 3.1 runtime
@@ -69,9 +69,9 @@ stages:
 
     - pwsh: |
         Invoke-WebRequest -Uri "https://dot.net/v1/dotnet-install.ps1" -OutFile dotnet-install.ps1
-        & .\dotnet-install.ps1 -Architecture x86 -Version 5.0.202 -InstallDir "C:\Program Files (x86)\dotnet\" -NoPath -Verbose
+        & .\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.202, 3.1
+      displayName: Install 32-bit .NET Core SDK 5.0.401, 3.1
       condition: ne(variables['dotnet32'], '')
 
     - script: dotnet --info
@@ -107,7 +107,7 @@ stages:
       displayName: Build LKG package
       workingDirectory: src/Nerdbank.GitVersioning.Tasks
 
-    - script: dotnet publish -c $(BuildConfiguration) -o ../nerdbank-gitversioning.npm/out/nbgv.cli/tools/netcoreapp2.1/any /bl:"$(Build.ArtifactStagingDirectory)/build_logs/nbgv_publish.binlog"
+    - script: dotnet publish -c $(BuildConfiguration) -o ../nerdbank-gitversioning.npm/out/nbgv.cli/tools/netcoreapp3.1/any /bl:"$(Build.ArtifactStagingDirectory)/build_logs/nbgv_publish.binlog"
       displayName: Publish nbgv tool
       workingDirectory: src/nbgv
 
@@ -323,21 +323,16 @@ stages:
     pool:
       vmImage: $(imageName)
     steps:
-    - task: UseDotNet@2
-      displayName: Install .NET Core 2.1 runtime
-      inputs:
-        packageType: runtime
-        version: 2.1.x
     - 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.202 SDK
+      displayName: Install .NET Core 5.0.401 SDK
       inputs:
         packageType: sdk
-        version: 5.0.202
+        version: 5.0.401
     - script: dotnet --info
       displayName: Show dotnet SDK info
     - bash: |
diff --git a/global.json b/global.json
@@ -1,5 +1,7 @@
 {
   "sdk": {
-    "version": "5.0.202"
+    "version": "5.0.401",
+    "rollForward": "patch",
+    "allowPrerelease": false
   }
 }
diff --git a/src/NerdBank.GitVersioning.Benchmarks/Nerdbank.GitVersioning.Benchmarks.csproj b/src/NerdBank.GitVersioning.Benchmarks/Nerdbank.GitVersioning.Benchmarks.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;netcoreapp2.1;net5.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
     <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net461</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
diff --git a/src/Nerdbank.GitVersioning.Tasks/Nerdbank.GitVersioning.Tasks.csproj b/src/Nerdbank.GitVersioning.Tasks/Nerdbank.GitVersioning.Tasks.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net461;netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>net461;netcoreapp3.1</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 
     <NuSpecFile>Nerdbank.GitVersioning.nuspec</NuSpecFile>
@@ -26,7 +26,7 @@
 
   <Target Name="PackBuildOutputs" DependsOnTargets="SatelliteDllsProjectOutputGroup;DebugSymbolsProjectOutputGroup">
     <PropertyGroup>
-      <BuildSubDir Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">MSBuildCore\</BuildSubDir>
+      <BuildSubDir Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">MSBuildCore\</BuildSubDir>
       <BuildSubDir Condition=" '$(TargetFramework)' == 'net461' ">MSBuildFull\</BuildSubDir>
     </PropertyGroup>
     <Error Text="Unrecognized TargetFramework" Condition=" '$(BuildSubDir)' == '' " />
@@ -83,7 +83,7 @@
   <ItemGroup Condition="'$(TargetFramework)' == 'net461' ">
     <PackageReference Include="Microsoft.Build.Tasks.Core" Version="15.9.20" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
     <PackageReference Include="Microsoft.Build.Tasks.Core" Version="15.9.20" />
     <PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
   </ItemGroup>
diff --git a/src/Nerdbank.GitVersioning.Tasks/Nerdbank.GitVersioning.nuspec b/src/Nerdbank.GitVersioning.Tasks/Nerdbank.GitVersioning.nuspec
@@ -40,14 +40,13 @@ IMPORTANT: The 3.x release may produce a different version height than prior maj
     <file src="$LibGit2SharpNativeBinaries$runtimes\win-x86\native\git2-6777db8.dll" target="build\MSBuildFull\lib\win32\x86\git2-6777db8.dll" />
 
     <file src="$LibGit2SharpNativeBinaries$libgit2\LibGit2Sharp.dll.config" target="build\MSBuildCore\LibGit2Sharp.dll.config" />
-    <file src="$BaseOutputPath$netcoreapp2.1\LibGit2Sharp.dll" target="build\MSBuildCore\LibGit2Sharp.dll" />
-    <file src="$BaseOutputPath$netcoreapp2.1\Microsoft.DotNet.PlatformAbstractions.dll" target="build\MSBuildCore\Microsoft.DotNet.PlatformAbstractions.dll" />
-    <file src="$BaseOutputPath$netcoreapp2.1\NerdBank.GitVersioning.dll" target="build\MSBuildCore\NerdBank.GitVersioning.dll" />
-    <file src="$BaseOutputPath$netcoreapp2.1\Nerdbank.GitVersioning.Tasks.dll" target="build\MSBuildCore\Nerdbank.GitVersioning.Tasks.dll" />
-    <file src="$BaseOutputPath$netcoreapp2.1\Newtonsoft.Json.dll" target="build\MSBuildCore\Newtonsoft.Json.dll" />
-    <file src="$BaseOutputPath$netcoreapp2.1\System.Text.Json.dll" target="build\MSBuildCore\System.Text.Json.dll" />
-    <file src="$BaseOutputPath$netcoreapp2.1\Validation.dll" target="build\MSBuildCore\Validation.dll" />
-    <file src="$BaseOutputPath$netcoreapp2.1\System.Runtime.CompilerServices.Unsafe.dll" target="build\MSBuildCore\System.Runtime.CompilerServices.Unsafe.dll" />
+    <file src="$BaseOutputPath$netcoreapp3.1\LibGit2Sharp.dll" target="build\MSBuildCore\LibGit2Sharp.dll" />
+    <file src="$BaseOutputPath$netcoreapp3.1\Microsoft.DotNet.PlatformAbstractions.dll" target="build\MSBuildCore\Microsoft.DotNet.PlatformAbstractions.dll" />
+    <file src="$BaseOutputPath$netcoreapp3.1\NerdBank.GitVersioning.dll" target="build\MSBuildCore\NerdBank.GitVersioning.dll" />
+    <file src="$BaseOutputPath$netcoreapp3.1\Nerdbank.GitVersioning.Tasks.dll" target="build\MSBuildCore\Nerdbank.GitVersioning.Tasks.dll" />
+    <file src="$BaseOutputPath$netcoreapp3.1\Newtonsoft.Json.dll" target="build\MSBuildCore\Newtonsoft.Json.dll" />
+    <file src="$BaseOutputPath$netcoreapp3.1\System.Text.Json.dll" target="build\MSBuildCore\System.Text.Json.dll" />
+    <file src="$BaseOutputPath$netcoreapp3.1\Validation.dll" target="build\MSBuildCore\Validation.dll" />
 
     <file src="build\Nerdbank.GitVersioning.targets" target="build\Nerdbank.GitVersioning$LKGSuffix$.targets" />
     <file src="build\Nerdbank.GitVersioning.Common.targets" target="build\Nerdbank.GitVersioning.Common.targets" />
diff --git a/src/nerdbank-gitversioning.npm/ts/core.ts b/src/nerdbank-gitversioning.npm/ts/core.ts
@@ -5,6 +5,6 @@ const nbgvPath = 'nbgv.cli';
 
 export function getNbgvCommand(dotnetCommand?: string): string {
     var command = dotnetCommand || 'dotnet';
-    const nbgvDll = path.join(__dirname, nbgvPath, "tools", "netcoreapp2.1", "any", "nbgv.dll");
+    const nbgvDll = path.join(__dirname, nbgvPath, "tools", "netcoreapp3.1", "any", "nbgv.dll");
     return `${command} "${nbgvDll}"`;
 }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"sdk": {`
`3`		`- "version": "5.0.202"`
	`3`	`+ "version": "5.0.401",`
	`4`	`+ "rollForward": "patch",`
	`5`	`+ "allowPrerelease": false`
`4`	`6`	`}`
`5`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,6 @@ const nbgvPath = 'nbgv.cli';`
`5`	`5`
`6`	`6`	`export function getNbgvCommand(dotnetCommand?: string): string {`
`7`	`7`	`var command = dotnetCommand \|\| 'dotnet';`
`8`		`- const nbgvDll = path.join(__dirname, nbgvPath, "tools", "netcoreapp2.1", "any", "nbgv.dll");`
	`8`	`+ const nbgvDll = path.join(__dirname, nbgvPath, "tools", "netcoreapp3.1", "any", "nbgv.dll");`
`9`	`9`	return `${command} "${nbgvDll}"`;
`10`	`10`	`}`