(maint) upgrade to netcoreapp3.1

arturcic · arturcic · commit eb8ef2129daf · 2019-12-10T10:05:22.000+02:00
diff --git a/.artifactignore b/.artifactignore
@@ -1,7 +1,7 @@
 **/*
 
 !artifacts/*/bin/netcoreapp2.1
-!artifacts/*/bin/netcoreapp3.0
+!artifacts/*/bin/netcoreapp3.1
 !artifacts/*/build-artifact
 !artifacts/*/nuget
 
diff --git a/build/pack.cake b/build/pack.cake
@@ -36,7 +36,7 @@ Task("Pack-Prepare")
 
         var settings = new DotNetCorePublishSettings
         {
-            Framework = parameters.CoreFxVersion30,
+            Framework = parameters.CoreFxVersion31,
             Runtime = runtimeName,
             NoRestore = false,
             Configuration = parameters.Configuration,
diff --git a/build/test.cake b/build/test.cake
@@ -5,7 +5,7 @@ Task("UnitTest")
     .IsDependentOn("Build")
     .Does<BuildParameters>((parameters) =>
 {
-    var frameworks = new[] { parameters.CoreFxVersion21, parameters.CoreFxVersion30, parameters.FullFxVersion472 };
+    var frameworks = new[] { parameters.CoreFxVersion21, parameters.CoreFxVersion31, parameters.FullFxVersion472 };
     var testResultsPath = parameters.Paths.Directories.TestResultsOutput;
 
     foreach(var framework in frameworks)
diff --git a/build/utils/docker.cake b/build/utils/docker.cake
@@ -101,7 +101,7 @@ void DockerTestArtifact(DockerImage dockerImage, BuildParameters parameters, str
     Information("Docker tag: {0}", tag);
     Information("Docker cmd: {0}", cmd);
 
-    if (os == "windows" && targetframework == parameters.CoreFxVersion30)
+    if (os == "windows" && targetframework == parameters.CoreFxVersion31)
     {
         cmd = "-Command " + cmd; // powershell 7 needs a -Command parameter
     }
diff --git a/build/utils/parameters.cake b/build/utils/parameters.cake
@@ -11,7 +11,7 @@ public class BuildParameters
     public const string MainRepoOwner = "gittools";
     public const string MainRepoName = "GitVersion";
     public string CoreFxVersion21 { get; private set; }  = "netcoreapp2.1";
-    public string CoreFxVersion30 { get; private set; }  = "netcoreapp3.0";
+    public string CoreFxVersion31 { get; private set; }  = "netcoreapp3.1";
     public string FullFxVersion472 { get; private set; } = "net472";
 
     public string DockerDistro { get; private set; }
diff --git a/build/utils/paths.cake b/build/utils/paths.cake
@@ -30,7 +30,7 @@ public class BuildPaths
         var artifactsBinPortableDir       = artifactsBinDir.Combine("portable");
         var artifactsBinCmdlineDir        = artifactsBinDir.Combine("cmdline");
         var artifactsBinCoreFx21Dir       = artifactsBinDir.Combine(parameters.CoreFxVersion21);
-        var artifactsBinCoreFx30Dir       = artifactsBinDir.Combine(parameters.CoreFxVersion30);
+        var artifactsBinCoreFx30Dir       = artifactsBinDir.Combine(parameters.CoreFxVersion31);
         var artifactsBinFullFx472Dir      = artifactsBinDir.Combine(parameters.FullFxVersion472);
         var nativeDir                     = artifactsDir.Combine("native");
         var nugetRootDir                  = artifactsDir.Combine("nuget");
diff --git a/build/utils/utils.cake b/build/utils/utils.cake
@@ -145,7 +145,7 @@ void RunGitVersionOnCI(BuildParameters parameters)
 
 GitVersionSettings SetGitVersionTool(GitVersionSettings settings, BuildParameters parameters, string toolPath)
 {
-    var gitversionTool = GetFiles($"{toolPath}/{parameters.CoreFxVersion30}/GitVersion.dll").FirstOrDefault();
+    var gitversionTool = GetFiles($"{toolPath}/{parameters.CoreFxVersion31}/GitVersion.dll").FirstOrDefault();
 
     settings.ToolPath = Context.FindToolInPath(IsRunningOnUnix() ? "dotnet" : "dotnet.exe");
     settings.ArgumentCustomization = args => gitversionTool + " " + args.Render();
@@ -155,7 +155,7 @@ GitVersionSettings SetGitVersionTool(GitVersionSettings settings, BuildParameter
 
 void PublishGitVersionToArtifacts(BuildParameters parameters)
 {
-    var frameworks = new[] { parameters.CoreFxVersion21, parameters.CoreFxVersion30, parameters.FullFxVersion472 };
+    var frameworks = new[] { parameters.CoreFxVersion21, parameters.CoreFxVersion31, parameters.FullFxVersion472 };
 
     // publish Framework-dependent deployment
     foreach(var framework in frameworks)
diff --git a/src/Docker/docker.json b/src/Docker/docker.json
@@ -7,7 +7,7 @@
             "ubuntu-16.04",
             "ubuntu-18.04"
         ],
-        "3.0": [
+        "3.1": [
             "centos-7",
             "debian-9",
             "fedora-30",
@@ -19,7 +19,7 @@
         "2.1": [
             "nanoserver-1809"
         ],
-        "3.0": [
+        "3.1": [
             "nanoserver-1809"
         ]
     }
diff --git a/src/GitVersionCore.Tests/GitVersionCore.Tests.csproj b/src/GitVersionCore.Tests/GitVersionCore.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net472;netcoreapp2.1;netcoreapp3.0</TargetFrameworks>
+        <TargetFrameworks>net472;netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
 
         <DebugType>full</DebugType>
         <Optimize>false</Optimize>
diff --git a/src/GitVersionExe.Tests/GitVersionExe.Tests.csproj b/src/GitVersionExe.Tests/GitVersionExe.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>net472;netcoreapp2.1;netcoreapp3.0</TargetFrameworks>
+        <TargetFrameworks>net472;netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
         <LangVersion>8.0</LangVersion>
     </PropertyGroup>
 
diff --git a/src/GitVersionExe/GitVersionExe.csproj b/src/GitVersionExe/GitVersionExe.csproj
@@ -4,7 +4,7 @@
         <OutputType>Exe</OutputType>
         <RootNamespace>GitVersion</RootNamespace>
         <AssemblyName>GitVersion</AssemblyName>
-        <TargetFrameworks>netcoreapp2.1;netcoreapp3.0</TargetFrameworks>
+        <TargetFrameworks>netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
         <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
         <PlatformTarget>AnyCPU</PlatformTarget>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
diff --git a/src/GitVersionTask.MsBuild/GitVersionTask.MsBuild.csproj b/src/GitVersionTask.MsBuild/GitVersionTask.MsBuild.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net472;netcoreapp2.1;netcoreapp3.0</TargetFrameworks>
+        <TargetFrameworks>net472;netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
         <LangVersion>8.0</LangVersion>
     </PropertyGroup>
 
diff --git a/src/GitVersionTask.Tests/GitVersionTask.Tests.csproj b/src/GitVersionTask.Tests/GitVersionTask.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>net472;netcoreapp2.1;netcoreapp3.0</TargetFrameworks>
+        <TargetFrameworks>net472;netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
         <LangVersion>8.0</LangVersion>
     </PropertyGroup>
 
diff --git a/src/GitVersionTask/GitVersionTask.csproj b/src/GitVersionTask/GitVersionTask.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net472;netcoreapp2.1;netcoreapp3.0</TargetFrameworks>
+        <TargetFrameworks>net472;netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
 
         <IsPackable>true</IsPackable>
 

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ Task("Pack-Prepare")`
`36`	`36`
`37`	`37`	`var settings = new DotNetCorePublishSettings`
`38`	`38`	`{`
`39`		`- Framework = parameters.CoreFxVersion30,`
	`39`	`+ Framework = parameters.CoreFxVersion31,`
`40`	`40`	`Runtime = runtimeName,`
`41`	`41`	`NoRestore = false,`
`42`	`42`	`Configuration = parameters.Configuration,`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ Task("UnitTest")`
`5`	`5`	`.IsDependentOn("Build")`
`6`	`6`	`.Does<BuildParameters>((parameters) =>`
`7`	`7`	`{`
`8`		`- var frameworks = new[] { parameters.CoreFxVersion21, parameters.CoreFxVersion30, parameters.FullFxVersion472 };`
	`8`	`+ var frameworks = new[] { parameters.CoreFxVersion21, parameters.CoreFxVersion31, parameters.FullFxVersion472 };`
`9`	`9`	`var testResultsPath = parameters.Paths.Directories.TestResultsOutput;`
`10`	`10`
`11`	`11`	`foreach(var framework in frameworks)`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ void DockerTestArtifact(DockerImage dockerImage, BuildParameters parameters, str`
`101`	`101`	`Information("Docker tag: {0}", tag);`
`102`	`102`	`Information("Docker cmd: {0}", cmd);`
`103`	`103`
`104`		`- if (os == "windows" && targetframework == parameters.CoreFxVersion30)`
	`104`	`+ if (os == "windows" && targetframework == parameters.CoreFxVersion31)`
`105`	`105`	`{`
`106`	`106`	`cmd = "-Command " + cmd; // powershell 7 needs a -Command parameter`
`107`	`107`	`}`
Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ void RunGitVersionOnCI(BuildParameters parameters)`
`145`	`145`
`146`	`146`	`GitVersionSettings SetGitVersionTool(GitVersionSettings settings, BuildParameters parameters, string toolPath)`
`147`	`147`	`{`
`148`		`- var gitversionTool = GetFiles($"{toolPath}/{parameters.CoreFxVersion30}/GitVersion.dll").FirstOrDefault();`
	`148`	`+ var gitversionTool = GetFiles($"{toolPath}/{parameters.CoreFxVersion31}/GitVersion.dll").FirstOrDefault();`
`149`	`149`
`150`	`150`	`settings.ToolPath = Context.FindToolInPath(IsRunningOnUnix() ? "dotnet" : "dotnet.exe");`
`151`	`151`	`settings.ArgumentCustomization = args => gitversionTool + " " + args.Render();`
`@@ -155,7 +155,7 @@ GitVersionSettings SetGitVersionTool(GitVersionSettings settings, BuildParameter`
`155`	`155`
`156`	`156`	`void PublishGitVersionToArtifacts(BuildParameters parameters)`
`157`	`157`	`{`
`158`		`- var frameworks = new[] { parameters.CoreFxVersion21, parameters.CoreFxVersion30, parameters.FullFxVersion472 };`
	`158`	`+ var frameworks = new[] { parameters.CoreFxVersion21, parameters.CoreFxVersion31, parameters.FullFxVersion472 };`
`159`	`159`
`160`	`160`	`// publish Framework-dependent deployment`
`161`	`161`	`foreach(var framework in frameworks)`