Merge pull request #2873 from gitfool/gh2872

GH-2872: Bump eol target frameworks
cake-build · Oct 9, 2021 · f6b5b10 · f6b5b10
2 parents 2c736de + bd63831
commit f6b5b10
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 19 deletions.
diff --git a/build.cake b/build.cake
@@ -148,7 +148,7 @@ Task("Run-Unit-Tests")
         () => GetFiles("./src/**/*.Tests.csproj"),
         (parameters, project, context) =>
 {
-    foreach(var framework in new[] { "netcoreapp2.0", "netcoreapp3.0", "net461", "net5.0", "net6.0" })
+    foreach(var framework in new[] { "netcoreapp2.1", "netcoreapp3.1", "net461", "net5.0", "net6.0" })
     {
         FilePath testResultsPath = MakeAbsolute(parameters.Paths.Directories.TestResults
                                     .CombineWithFilePath($"{project.GetFilenameWithoutExtension()}_{framework}_TestResults.xml"));
@@ -182,7 +182,7 @@ Task("Copy-Files")
     // .NET Core
     DotNetCorePublish("./src/Cake/Cake.csproj", new DotNetCorePublishSettings
     {
-        Framework = "netcoreapp2.0",
+        Framework = "netcoreapp2.1",
         NoRestore = true,
         Configuration = parameters.Configuration,
         OutputDirectory = parameters.Paths.Directories.ArtifactsBinNetCore,
@@ -655,7 +655,7 @@ Task("Run-Integration-Tests")
     .DoesForEach<BuildParameters, FilePath>(
         parameters => new[] {
             GetFiles($"{parameters.Paths.Directories.IntegrationTestsBinTool.FullPath}/**/netcoreapp2.1/**/Cake.dll").Single(),
-            GetFiles($"{parameters.Paths.Directories.IntegrationTestsBinTool.FullPath}/**/netcoreapp3.0/**/Cake.dll").Single(),
+            GetFiles($"{parameters.Paths.Directories.IntegrationTestsBinTool.FullPath}/**/netcoreapp3.1/**/Cake.dll").Single(),
             GetFiles($"{parameters.Paths.Directories.IntegrationTestsBinTool.FullPath}/**/net5.0/**/Cake.dll").Single(),
             GetFiles($"{parameters.Paths.Directories.IntegrationTestsBinTool.FullPath}/**/net6.0/**/Cake.dll").Single(),
             parameters.Paths.Directories.IntegrationTestsBinFullFx.CombineWithFilePath("Cake.exe"),

diff --git a/build/paths.cake b/build/paths.cake
@@ -26,7 +26,7 @@ public class BuildPaths
         var artifactsDir = (DirectoryPath)(context.Directory("./artifacts") + context.Directory("v" + semVersion));
         var artifactsBinDir = artifactsDir.Combine("bin");
         var artifactsBinFullFx = artifactsBinDir.Combine("net461");
-        var artifactsBinNetCore = artifactsBinDir.Combine("netcoreapp2.0");
+        var artifactsBinNetCore = artifactsBinDir.Combine("netcoreapp2.1");
         var testResultsDir = artifactsDir.Combine("test-results");
         var nugetRoot = artifactsDir.Combine("nuget");
 

diff --git a/src/Cake.Common/Cake.Common.csproj b/src/Cake.Common/Cake.Common.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AssemblyName>Cake.Common</AssemblyName>
-    <TargetFrameworks>net46;netstandard2.0;net5.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net461;netstandard2.0;net5.0;net6.0</TargetFrameworks>
     <OutputType>Library</OutputType>
     <PlatformTarget>AnyCpu</PlatformTarget>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -17,7 +17,7 @@
     <ProjectReference Include="..\Cake.Core\Cake.Core.csproj" />
   </ItemGroup>
   <!-- .NET Framework packages -->
-   <ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
+   <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
      <Reference Include="System" />
      <Reference Include="System.IO.Compression" />
      <Reference Include="System.IO.Compression.FileSystem" />

diff --git a/src/Cake.Common/Tools/DotNetCore/DotNetCoreAliases.cs b/src/Cake.Common/Tools/DotNetCore/DotNetCoreAliases.cs
@@ -246,7 +246,7 @@ public static void DotNetCoreBuild(this ICakeContext context, string project)
         /// <code>
         /// var settings = new DotNetCoreBuildSettings
         /// {
-        ///     Framework = "netcoreapp2.0",
+        ///     Framework = "netcoreapp3.1",
         ///     Configuration = "Debug",
         ///     OutputDirectory = "./artifacts/"
         /// };
@@ -392,7 +392,7 @@ public static void DotNetCoreRun(this ICakeContext context, string project, Proc
         /// <code>
         /// var settings = new DotNetCoreRunSettings
         /// {
-        ///     Framework = "netcoreapp2.0",
+        ///     Framework = "netcoreapp3.1",
         ///     Configuration = "Release"
         /// };
         ///
@@ -471,7 +471,7 @@ public static void DotNetCorePublish(this ICakeContext context, string project)
         /// <code>
         /// var settings = new DotNetCorePublishSettings
         /// {
-        ///     Framework = "netcoreapp2.0",
+        ///     Framework = "netcoreapp3.1",
         ///     Configuration = "Release",
         ///     OutputDirectory = "./artifacts/"
         /// };
@@ -693,7 +693,7 @@ public static void DotNetCoreClean(this ICakeContext context, string project)
         /// <code>
         /// var settings = new DotNetCoreCleanSettings
         /// {
-        ///     Framework = "netcoreapp2.0",
+        ///     Framework = "netcoreapp3.1",
         ///     Configuration = "Debug",
         ///     OutputDirectory = "./artifacts/"
         /// };

diff --git a/src/Cake.Core/Cake.Core.csproj b/src/Cake.Core/Cake.Core.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AssemblyName>Cake.Core</AssemblyName>
-    <TargetFrameworks>net46;netstandard2.0;net5.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net461;netstandard2.0;net5.0;net6.0</TargetFrameworks>
     <OutputType>Library</OutputType>
     <PlatformTarget>AnyCpu</PlatformTarget>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -13,12 +13,12 @@
   <!-- Import shared functionality -->
   <Import Project="..\Shared.msbuild" />
   <!-- .NET Core packages -->
-  <ItemGroup Condition=" '$(TargetFramework)' != 'net46' ">
+  <ItemGroup Condition=" '$(TargetFramework)' != 'net461' ">
     <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
   </ItemGroup>
   <!-- .NET Framework packages -->
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />

diff --git a/src/Cake.NuGet.Tests/Cake.NuGet.Tests.csproj b/src/Cake.NuGet.Tests/Cake.NuGet.Tests.csproj
@@ -26,7 +26,7 @@
     <PackageReference Include="Castle.Core" Version="4.4.1" />
   </ItemGroup>
   <!-- .NET Framework packages -->
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
     <Reference Include="System" />
     <Reference Include="System.Threading.Tasks" />
     <Reference Include="Microsoft.CSharp" />

diff --git a/src/Cake.Testing.Xunit/Cake.Testing.Xunit.csproj b/src/Cake.Testing.Xunit/Cake.Testing.Xunit.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AssemblyName>Cake.Testing.Xunit</AssemblyName>
-    <TargetFrameworks>net46;netstandard2.0;net5.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net461;netstandard2.0;net5.0;net6.0</TargetFrameworks>
     <OutputType>Library</OutputType>
     <PlatformTarget>AnyCpu</PlatformTarget>
     <IsPackable>true</IsPackable>

diff --git a/src/Cake.Testing/Cake.Testing.csproj b/src/Cake.Testing/Cake.Testing.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AssemblyName>Cake.Testing</AssemblyName>
-    <TargetFrameworks>net46;netstandard2.0;net5.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net461;netstandard2.0;net5.0;net6.0</TargetFrameworks>
     <OutputType>Library</OutputType>
     <PlatformTarget>AnyCpu</PlatformTarget>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>

diff --git a/src/Cake/Cake.csproj b/src/Cake/Cake.csproj
@@ -4,11 +4,11 @@
     <AssemblyName>Cake</AssemblyName>
     <OutputType>Exe</OutputType>
     <PlatformTarget>AnyCpu</PlatformTarget>
-    <TargetFrameworks>netcoreapp2.1;netcoreapp3.0;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.1;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(PackAsTool)' != 'true'">
-    <TargetFrameworks>net461;netcoreapp2.0;$(TargetFrameworks);</TargetFrameworks>
+    <TargetFrameworks>net461;$(TargetFrameworks);</TargetFrameworks>
   </PropertyGroup>
 
   <Import Project="$(MSBuildThisFileDirectory)..\Shared.msbuild" />

diff --git a/src/Shared.msbuild b/src/Shared.msbuild
@@ -16,7 +16,7 @@
   </PropertyGroup>
 
   <!-- Define .NET Core constants -->
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'netcoreapp2.0' OR '$(TargetFramework)' == 'netcoreapp2.1' OR '$(TargetFramework)' == 'netcoreapp3.0' OR '$(TargetFramework)' == 'net5.0'  OR '$(TargetFramework)' == 'net6.0' ">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'netcoreapp2.1' OR '$(TargetFramework)' == 'netcoreapp3.1' OR '$(TargetFramework)' == 'net5.0' OR '$(TargetFramework)' == 'net6.0' ">
     <NetStandardImplicitPackageVersion>2.0.0</NetStandardImplicitPackageVersion>
     <DefineConstants>$(DefineConstants);NETCORE</DefineConstants>
     <DebugType>portable</DebugType>