Merge pull request #3993 from Marusyk/rmarusyk/remove-tfm-3.1-5.0

Remove .NET Core 3.1 and .NET 5 TFM
cake-build · Oct 24, 2022 · 3490356 · 3490356
2 parents 9504860 + ac25392
commit 3490356
Show file tree

Hide file tree

Showing 18 changed files with 49 additions and 50 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -21,16 +21,6 @@ jobs:
       - name: Fetch all history for all tags and branches
         run: git fetch --prune --unshallow
 
-      - name: Install .NET Core SDK 3.1.x
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: '3.1.x'
-
-      - name: Install .NET Core SDK 5.0.x
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: '5.0.x'
-
       - name: Install .NET SDK 6.0.x
         uses: actions/setup-dotnet@v1
         with:

diff --git a/appveyor.yml b/appveyor.yml
@@ -7,8 +7,7 @@ init:
 build_script:
   - ps: Invoke-RestMethod -Uri 'https://dot.net/v1/dotnet-install.ps1' -OutFile '.\dotnet-install.ps1'
   - ps: New-Item -Path .\.dotnet -ItemType Directory -Force | Out-Null
-  - ps: .\dotnet-install.ps1 -Channel 3.1 -InstallDir .\.dotnet
-  - ps: .\dotnet-install.ps1 -Channel 5.0 -InstallDir .\.dotnet
+  - ps: .\dotnet-install.ps1 -Channel 6.0 -InstallDir .\.dotnet
   - ps: .\build.ps1 --target="AppVeyor"
 
 # Tests

diff --git a/build.cake b/build.cake
@@ -123,10 +123,10 @@ Task("Run-Unit-Tests")
         () => GetFiles("./src/**/*.Tests.csproj"),
         (parameters, project, context) =>
 {
-    foreach(var framework in new[] { "netcoreapp3.1", "net5.0", "net6.0", "net7.0" })
+    foreach(var framework in new[] { "net6.0", "net7.0" })
     {
         FilePath testResultsPath = MakeAbsolute(parameters.Paths.Directories.TestResults
-                                    .CombineWithFilePath($"{project.GetFilenameWithoutExtension()}_{framework}_TestResults.xml"));
+            .CombineWithFilePath($"{project.GetFilenameWithoutExtension()}_{framework}_TestResults.xml"));
 
         DotNetTest(project.FullPath, new DotNetTestSettings
         {
@@ -390,8 +390,6 @@ Task("Run-Integration-Tests")
     .DeferOnError()
     .DoesForEach<BuildParameters, FilePath>(
         parameters => new[] {
-            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(),
             GetFiles($"{parameters.Paths.Directories.IntegrationTestsBinTool.FullPath}/**/net7.0/**/Cake.dll").Single()
         },

diff --git a/src/Cake.Frosting.Template/Cake.Frosting.Template.csproj b/src/Cake.Frosting.Template/Cake.Frosting.Template.csproj
@@ -5,7 +5,7 @@
     <AssemblyName>Cake.Frosting.Template</AssemblyName>
     <Title>Cake.Frosting templates for the .NET SDK.</Title>
     <Description>Cake.Frosting templates for the .NET SDK.</Description>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <IncludeContentInPack>true</IncludeContentInPack>
     <IncludeBuildOutput>false</IncludeBuildOutput>
     <ContentTargetFolders>content</ContentTargetFolders>

diff --git a/src/Cake.Frosting.Template/templates/cakefrosting/.template.config/template.json b/src/Cake.Frosting.Template/templates/cakefrosting/.template.config/template.json
@@ -11,5 +11,24 @@
     "type": "project"
   },
   "groupIdentity": "Cake",
-  "description": "Create a Cake.Frosting build project."
+  "description": "Create a Cake.Frosting build project.",
+  "symbols": {
+    "framework": {
+        "type": "parameter",
+        "description": "The target framework for the project.",
+        "datatype": "choice",
+        "defaultValue": "net7.0",
+        "replaces": "TargetFrameworkValue",
+        "choices": [
+            {
+            "choice": "net6.0",
+            "description": "Target .NET 6"
+            },
+            {
+            "choice": "net7.0",
+            "description": "Target .NET 7"
+            }
+        ]
+    }
+  }
 }
diff --git a/src/Cake.Frosting.Template/templates/cakefrosting/build/Build.csproj b/src/Cake.Frosting.Template/templates/cakefrosting/build/Build.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>TargetFrameworkValue</TargetFramework>
     <RunWorkingDirectory>$(MSBuildProjectDirectory)</RunWorkingDirectory>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Cake.Frosting" Version="2.2.0" />
+    <PackageReference Include="Cake.Frosting" Version="3.0.0" />
   </ItemGroup>
 </Project>
diff --git a/src/Cake.NuGet/Cake.NuGet.csproj b/src/Cake.NuGet/Cake.NuGet.csproj
@@ -25,7 +25,6 @@
     <PackageReference Include="NuGet.Resolver" Version="6.3.1" />
     <PackageReference Include="NuGet.Common" Version="6.3.1" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Condition="'$(TargetFramework)' == 'netcoreapp3.1'" Include="Microsoft.DotNet.PlatformAbstractions" Version="3.1.6" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Cake/Cake.csproj b/src/Cake/Cake.csproj
@@ -32,7 +32,5 @@
     <PackageReference Include="Autofac" Version="6.4.0" />
     <PackageReference Include="Basic.Reference.Assemblies.Net70" Version="1.3.0"  Condition="'$(TargetFramework)' == 'net7.0'" />
     <PackageReference Include="Basic.Reference.Assemblies.Net60" Version="1.3.0" Condition="'$(TargetFramework)' == 'net6.0'" />
-    <PackageReference Include="Basic.Reference.Assemblies.Net50" Version="1.3.0" Condition="'$(TargetFramework)' == 'net5.0'" />
-    <PackageReference Include="Basic.Reference.Assemblies.NetCoreApp31" Version="1.3.0" Condition="'$(TargetFramework)' == 'netcoreapp3.1'" />
   </ItemGroup>
 </Project>
diff --git a/src/Cake/Infrastructure/Scripting/ReferenceAssemblyResolver.cs b/src/Cake/Infrastructure/Scripting/ReferenceAssemblyResolver.cs
@@ -22,11 +22,7 @@ public Assembly[] GetReferenceAssemblies()
             IEnumerable<Assembly> TryGetReferenceAssemblies()
             {
                 foreach (var reference in
-#if NETCOREAPP3_1
-            Basic.Reference.Assemblies.NetCoreApp31.All)
-#elif NET5_0
-            Basic.Reference.Assemblies.Net50.All)
-#elif NET6_0
+#if NET6_0
             Basic.Reference.Assemblies.Net60.All)
 #else
             Basic.Reference.Assemblies.Net70.All)

diff --git a/src/Shared.msbuild b/src/Shared.msbuild
@@ -1,7 +1,7 @@
 <Project>
   <!-- General package metadata -->
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
     <PackageId>$(AssemblyName)</PackageId>
     <Copyright>Copyright (c) .NET Foundation and contributors</Copyright>
     <Authors>Patrik Svensson, Mattias Karlsson, Gary Ewan Park, Alistair Chapman, Martin Björkström, Dave Glick, Pascal Berger, Jérémie Desautels, Enrico Campidoglio, C. Augusto Proiete, Nils Andresen, and contributors</Authors>
@@ -17,7 +17,7 @@
   </PropertyGroup>
 
   <!-- Define .NET Core constants -->
-  <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1' OR '$(TargetFramework)' == 'net5.0' OR '$(TargetFramework)' == 'net6.0' OR '$(TargetFramework)' == 'net7.0' ">
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net6.0' OR '$(TargetFramework)' == 'net7.0' ">
     <NetStandardImplicitPackageVersion>2.0.0</NetStandardImplicitPackageVersion>
     <DefineConstants>$(DefineConstants);NETCORE</DefineConstants>
     <DebugType>portable</DebugType>

diff --git a/tests/integration/Cake.Common/Build/GitHubActions/ValidateGitHubActionsProvider.cake b/tests/integration/Cake.Common/Build/GitHubActions/ValidateGitHubActionsProvider.cake
@@ -14,8 +14,6 @@ Setup(
 Task("ValidateEnvironment")
     .DoesForEach<BuildData, string>(
         data => new [] {
-            $"CAKE_{data.OS}_NETCOREAPP_3_1_VERSION",
-            $"CAKE_{data.OS}_NETCOREAPP_5_0_VERSION",
             $"CAKE_{data.OS}_NETCOREAPP_6_0_VERSION",
             $"CAKE_{data.OS}_NETCOREAPP_7_0_VERSION"
         },
@@ -26,9 +24,7 @@ Task("ValidatePath")
     .DoesForEach<BuildData, string>(
         new [] {
             "Cake\\WTool\\Wtools\\Wnet7\\W0",
-            "Cake\\WTool\\Wtools\\Wnet6\\W0",
-            "Cake\\WTool\\Wtools\\Wnet5\\W0",
-            "Cake\\WTool\\Wtools\\Wnetcoreapp3\\W1"
+            "Cake\\WTool\\Wtools\\Wnet6\\W0"
         },
         (data, path) => Assert.Matches(path, data.Path)
     );

diff --git a/tests/integration/Cake.Common/Tools/DotNet/DotNetAliases.cake b/tests/integration/Cake.Common/Tools/DotNet/DotNetAliases.cake
@@ -34,7 +34,7 @@ Task("Cake.Common.Tools.DotNet.DotNetAliases.DotNetBuild")
     // Given
     var path = Paths.Temp.Combine("./Cake.Common/Tools/DotNet");
     var project = path.CombineWithFilePath("hwapp/hwapp.csproj");
-    var assembly = path.CombineWithFilePath("hwapp/bin/Debug/netcoreapp3.1/hwapp.dll");
+    var assembly = path.CombineWithFilePath("hwapp/bin/Debug/net7.0/hwapp.dll");
 
     // When
     DotNetBuild(project.FullPath);
@@ -61,7 +61,7 @@ Task("Cake.Common.Tools.DotNet.DotNetAliases.DotNetVSTest")
 {
     // Given
     var path = Paths.Temp.Combine("./Cake.Common/Tools/DotNet");
-    var assembly = path.CombineWithFilePath("hwapp.tests/bin/Debug/netcoreapp3.1/hwapp.tests.dll");
+    var assembly = path.CombineWithFilePath("hwapp.tests/bin/Debug/net7.0/hwapp.tests.dll");
 
     // When
     DotNetVSTest(assembly.FullPath);
@@ -184,7 +184,7 @@ Task("Cake.Common.Tools.DotNet.DotNetAliases.DotNetExecute")
 {
     // Given
     var path = Paths.Temp.Combine("./Cake.Common/Tools/DotNet");
-    var assembly = path.CombineWithFilePath("hwapp/bin/Debug/netcoreapp3.1/hwapp.dll");
+    var assembly = path.CombineWithFilePath("hwapp/bin/Debug/net7.0/hwapp.dll");
 
     // When
     DotNetExecute(assembly);
@@ -197,7 +197,7 @@ Task("Cake.Common.Tools.DotNet.DotNetAliases.DotNetClean")
     // Given
     var path = Paths.Temp.Combine("./Cake.Common/Tools/DotNet");
     var project = path.CombineWithFilePath("hwapp/hwapp.csproj");
-    var assembly = path.CombineWithFilePath("hwapp/bin/Debug/netcoreapp3.1/hwapp.dll");
+    var assembly = path.CombineWithFilePath("hwapp/bin/Debug/net7.0/hwapp.dll");
     Assert.True(System.IO.File.Exists(assembly.FullPath));
 
     // When
@@ -214,7 +214,7 @@ Task("Cake.Common.Tools.DotNet.DotNetAliases.DotNetMSBuild")
     // Given
     var path = Paths.Temp.Combine("./Cake.Common/Tools/DotNet");
     var project = path.CombineWithFilePath("hwapp/hwapp.csproj");
-    var assembly = path.CombineWithFilePath("hwapp/bin/Debug/netcoreapp3.1/hwapp.dll");
+    var assembly = path.CombineWithFilePath("hwapp/bin/Debug/net7.0/hwapp.dll");
 
     // When
     DotNetMSBuild(project.FullPath);

diff --git a/tests/integration/Cake.Common/Tools/TextTransform/TextTransformAliases.cake b/tests/integration/Cake.Common/Tools/TextTransform/TextTransformAliases.cake
@@ -1,13 +1,17 @@
 #load "./../../../utilities/xunit.cake"
 #load "./../../../utilities/paths.cake"
 
+var environmentVariables = new Dictionary<string, string> {
+    { "DOTNET_ROLL_FORWARD", "Major" }
+};
+
 Task("Cake.Common.Tools.TextTransform.TextTransformAliases.TransformTemplate.Setup")
     .Does(() =>
 {
     var t4Path = Context.Tools.Resolve("t4") ?? Context.Tools.Resolve("t4.exe");
     if (t4Path == null)
     {
-        DotNetTool(null, "tool", "install --tool-path ./tools dotnet-t4 --version \"2.2.0-preview-0020-g990c44075e\" --add-source \"https://pkgs.dev.azure.com/cake-build/Cake/_packaging/cake/nuget/v3/index.json\"");
+        DotNetTool(null, "tool", "install --tool-path ./tools dotnet-t4 --version \"2.2.1\"");
     }
 });
 
@@ -28,7 +32,8 @@ Task("Cake.Common.Tools.TextTransform.TextTransformAliases.TransformTemplate.Pro
                     Properties = {
                         ["FirstName"] = "John",
                         ["LastName"] = "Doe"
-                    }
+                    },
+                    EnvironmentVariables = environmentVariables
                 };
 
     var expect = "Hello John Doe!";
@@ -53,7 +58,8 @@ Task("Cake.Common.Tools.TextTransform.TextTransformAliases.TransformTemplate.Cla
 
     var settings = new TextTransformSettings {
                     OutputFile = targetFile,
-                    Class = "HelloWorld"
+                    Class = "HelloWorld",
+                    EnvironmentVariables = environmentVariables
                 };
 
     var expect = @"public partial class HelloWorld : HelloWorldBase {";

diff --git a/tests/integration/Cake.Core/Scripting/AddinDirective.cake b/tests/integration/Cake.Core/Scripting/AddinDirective.cake
@@ -23,8 +23,6 @@ Task("Cake.Core.Scripting.AddinDirective.LoadTargetedAddin")
                                  .SetTargetFramework(
                                      cake switch
                                      {
-                                        FilePath netCoreApp3_1Path  when netCoreApp3_1Path.FullPath.Contains("netcoreapp3.1")   => "netcoreapp3.1",
-                                        FilePath net5_0Path         when net5_0Path.FullPath.Contains("net5.0")                 => "net5.0",
                                         FilePath net6_0Path         when net6_0Path.FullPath.Contains("net6.0")                 => "net6.0",
                                         _ => "net7.0"
                                      }

diff --git a/tests/integration/Cake.Core/Scripting/DefineDirective.cake b/tests/integration/Cake.Core/Scripting/DefineDirective.cake
@@ -68,7 +68,7 @@ Task("Cake.Core.Scripting.DefineDirective.Cake")
     Assert.True(cake);
 });
 
-#if NET5_0 || NET6_0 || NET7_0
+#if NET6_0 || NET7_0
     Task("Cake.Core.Scripting.DefineDirective.C#9")
     .Does(() =>
 {
@@ -117,7 +117,7 @@ public record CSharpNine(bool IsNine);
 //////////////////////////////////////////////////////////////////////////////
 
 Task("Cake.Core.Scripting.DefineDirective")
-#if NET5_0 || NET6_0 || NET7_0
+#if NET6_0 || NET7_0
     .IsDependentOn("Cake.Core.Scripting.DefineDirective.C#9")
 #endif
 #if NET6_0 || NET7_0

diff --git a/tests/integration/Cake.Frosting/build/Build.csproj b/tests/integration/Cake.Frosting/build/Build.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
     <PackAsTool>true</PackAsTool>
 
     <!-- Make sure start same folder .NET Core CLI and Visual Studio -->

diff --git a/tests/integration/resources/Cake.Common/Tools/DotNet/hwapp.tests/hwapp.tests.csproj b/tests/integration/resources/Cake.Common/Tools/DotNet/hwapp.tests/hwapp.tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

diff --git a/tests/integration/resources/Cake.Common/Tools/DotNet/hwapp/hwapp.csproj b/tests/integration/resources/Cake.Common/Tools/DotNet/hwapp/hwapp.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\hwapp.common\hwapp.common.csproj" />