(cake-buildGH-4345) Add .NET 9 (net9.0) TFM

* fixes cake-build#4345
devlead · Oct 28, 2024 · 9ddf75c · 9ddf75c
1 parent 3df1b94
commit 9ddf75c
Show file tree

Hide file tree

Showing 19 changed files with 63 additions and 44 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -16,20 +16,19 @@ jobs:
         os: [windows-latest, macos-13, ubuntu-latest]
     steps:
       - name: Get the sources
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
-      - name: Install .NET SDK 6.0.x - 8.0.x
-        uses: actions/setup-dotnet@v3
+      - name: Install .NET SDK 8.0.x - 9.0.x
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
-            6.0.x
-            7.0.x
             8.0.x
+            9.0.x
 
       - name: Install .NET Core SDK (global.json)
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v4
         with:
           global-json-file: global.json
 
@@ -47,7 +46,6 @@ jobs:
           script-path: tests/integration/Cake.Common/Build/GitHubActions/ValidateGitHubActionsProvider.cake
           cake-version: tool-manifest
           arguments: |
-            CAKE_NETCOREAPP_6_0_VERSION_OS: ${{ steps.build-cake.outputs.CAKE_NETCOREAPP_6_0_VERSION_OS }}
-            CAKE_NETCOREAPP_7_0_VERSION_OS: ${{ steps.build-cake.outputs.CAKE_NETCOREAPP_7_0_VERSION_OS }}
             CAKE_NETCOREAPP_8_0_VERSION_OS: ${{ steps.build-cake.outputs.CAKE_NETCOREAPP_8_0_VERSION_OS }}
+            CAKE_NETCOREAPP_9_0_VERSION_OS: ${{ steps.build-cake.outputs.CAKE_NETCOREAPP_9_0_VERSION_OS }}
             ValidateGitHubActionsProvider: true
diff --git a/build.cake b/build.cake
@@ -108,7 +108,7 @@ Task("Run-Unit-Tests")
         () => GetFiles("./src/**/*.Tests.csproj"),
         (parameters, project, context) =>
 {
-    foreach(var framework in new[] { "net8.0" })
+    foreach(var framework in new[] { "net8.0", "net9.0" })
     {
         FilePath testResultsPath = MakeAbsolute(parameters.Paths.Directories.TestResults
             .CombineWithFilePath($"{project.GetFilenameWithoutExtension()}_{framework}_TestResults.xml"));
@@ -368,7 +368,8 @@ Task("Run-Integration-Tests")
     .DeferOnError()
     .DoesForEach<BuildParameters, FilePath>(
         parameters => new[] {
-            GetFiles($"{parameters.Paths.Directories.IntegrationTestsBinTool.FullPath}/**/net8.0/**/Cake.dll").Single()
+            GetFiles($"{parameters.Paths.Directories.IntegrationTestsBinTool.FullPath}/**/net8.0/**/Cake.dll").Single(),
+            GetFiles($"{parameters.Paths.Directories.IntegrationTestsBinTool.FullPath}/**/net9.0/**/Cake.dll").Single()
         },
         (parameters, cakeAssembly, context) =>
 {

diff --git a/global.json b/global.json
@@ -3,7 +3,7 @@
         "src"
     ],
     "sdk": {
-        "version": "8.0.403",
+        "version": "9.0.100-rc.2.24474.11",
         "rollForward": "latestFeature"
     }
 }
diff --git a/src/Cake.Core.Tests/Unit/CakeRuntimeTests.cs b/src/Cake.Core.Tests/Unit/CakeRuntimeTests.cs
@@ -39,7 +39,9 @@ public void Should_Return_Correct_Result_For_CoreClr()
                 Assert.Equal(".NETStandard,Version=v2.0", framework.FullName);
 #else
                 var expect = string.Concat(".NETCoreApp,Version=v",
-#if NET8_0
+#if NET9_0
+                                "9.0");
+#elif NET8_0
                                 "8.0");
 #elif NET7_0
                                 "7.0");
@@ -71,6 +73,7 @@ public void Should_Return_Correct_Result_For_CoreClr()
                             case ".NETCoreApp,Version=v5.0":
                             case ".NETCoreApp,Version=v6.0":
                             case ".NETCoreApp,Version=v7.0":
+                            case ".NETCoreApp,Version=v8.0":
                                 {
                                     TestOutputHelper.WriteLine("Expect changed from {0} to {1}.", expect, framework.FullName);
                                     expect = framework.FullName;
@@ -88,6 +91,7 @@ public void Should_Return_Correct_Result_For_CoreClr()
                             case ".NETCoreApp,Version=v5.0":
                             case ".NETCoreApp,Version=v6.0":
                             case ".NETCoreApp,Version=v7.0":
+                            case ".NETCoreApp,Version=v8.0":
                             {
                                 TestOutputHelper.WriteLine("Expect changed from {0} to {1}.", expect, framework.FullName);
                                 expect = framework.FullName;
@@ -104,6 +108,7 @@ public void Should_Return_Correct_Result_For_CoreClr()
                             case ".NETCoreApp,Version=v5.0":
                             case ".NETCoreApp,Version=v6.0":
                             case ".NETCoreApp,Version=v7.0":
+                            case ".NETCoreApp,Version=v8.0":
                             {
                                 TestOutputHelper.WriteLine("Expect changed from {0} to {1}.", expect, framework.FullName);
                                 expect = framework.FullName;
@@ -119,6 +124,7 @@ public void Should_Return_Correct_Result_For_CoreClr()
                             case ".NETCoreApp,Version=v5.0":
                             case ".NETCoreApp,Version=v6.0":
                             case ".NETCoreApp,Version=v7.0":
+                            case ".NETCoreApp,Version=v8.0":
                                 {
                                     TestOutputHelper.WriteLine("Expect changed from {0} to {1}.", expect, framework.FullName);
                                     expect = framework.FullName;
@@ -133,6 +139,7 @@ public void Should_Return_Correct_Result_For_CoreClr()
                         {
                             case ".NETCoreApp,Version=v6.0":
                             case ".NETCoreApp,Version=v7.0":
+                            case ".NETCoreApp,Version=v8.0":
                                 {
                                     TestOutputHelper.WriteLine("Expect changed from {0} to {1}.", expect, framework.FullName);
                                     expect = framework.FullName;
@@ -146,6 +153,7 @@ public void Should_Return_Correct_Result_For_CoreClr()
                         switch (framework.FullName)
                         {
                             case ".NETCoreApp,Version=v7.0":
+                            case ".NETCoreApp,Version=v8.0":
                                 {
                                     TestOutputHelper.WriteLine("Expect changed from {0} to {1}.", expect, framework.FullName);
                                     expect = framework.FullName;

diff --git a/src/Cake.Core/Scripting/ScriptConventions.cs b/src/Cake.Core/Scripting/ScriptConventions.cs
@@ -128,6 +128,9 @@ private string GetFrameworkDefine()
                 case ".NETCoreApp,Version=v8.0":
                     return "NET8_0";
 
+                case ".NETCoreApp,Version=v9.0":
+                    return "NET9_0";
+
                 default:
                     Console.Error.WriteLine(_runtime.BuiltFramework.FullName);
                     Console.Error.Flush();

diff --git a/src/Cake.Frosting.Template/templates/cakefrosting/.template.config/template.json b/src/Cake.Frosting.Template/templates/cakefrosting/.template.config/template.json
@@ -17,12 +17,16 @@
         "type": "parameter",
         "description": "The target framework for the project.",
         "datatype": "choice",
-        "defaultValue": "net8.0",
+        "defaultValue": "net9.0",
         "replaces": "TargetFrameworkValue",
         "choices": [
             {
             "choice": "net8.0",
             "description": "Target .NET 8"
+            },
+            {
+              "choice": "net9.0",
+              "description": "Target .NET 9"
             }
         ]
     }

diff --git a/src/Cake.NuGet/Cake.NuGet.csproj b/src/Cake.NuGet/Cake.NuGet.csproj
@@ -25,6 +25,9 @@
     <PackageReference Include="NuGet.Resolver" />
     <PackageReference Include="NuGet.Common" />
     <PackageReference Include="Newtonsoft.Json" />
+
+    <!-- Pin nuget transitive packages vulnerability issues NuGet.Packaging -->
+    <PackageReference Include="System.Security.Cryptography.Pkcs" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Cake/Cake.csproj b/src/Cake/Cake.csproj
@@ -31,5 +31,6 @@
     <PackageReference Include="System.Reflection.Metadata"  />
     <PackageReference Include="Autofac" />
     <PackageReference Include="Basic.Reference.Assemblies.Net80" Condition="'$(TargetFramework)' == 'net8.0'" />
+    <PackageReference Include="Basic.Reference.Assemblies.Net90" Condition="'$(TargetFramework)' == 'net9.0'" />
   </ItemGroup>
 </Project>
diff --git a/src/Cake/Infrastructure/Scripting/ReferenceAssemblyResolver.cs b/src/Cake/Infrastructure/Scripting/ReferenceAssemblyResolver.cs
@@ -24,6 +24,8 @@ IEnumerable<Assembly> TryGetReferenceAssemblies()
                 foreach (var reference in
 #if NET8_0
             Basic.Reference.Assemblies.Net80.References.All)
+#else
+            Basic.Reference.Assemblies.Net90.References.All)
 #endif
                 {
                     Assembly assembly;

diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -8,6 +8,7 @@
     <GlobalPackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All" />
     <PackageVersion Include="Autofac" Version="8.1.1" />
     <PackageVersion Include="Basic.Reference.Assemblies.Net80" Version="1.7.9" />
+    <PackageVersion Include="Basic.Reference.Assemblies.Net90" Version="1.7.9" />
     <PackageVersion Include="Cake.Frosting" Version="3.1.0.0" />
     <PackageVersion Include="Castle.Core" Version="5.1.1" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.11.0" />
@@ -34,5 +35,9 @@
     <PackageVersion Include="Verify.Xunit" Version="27.0.1" />
     <PackageVersion Include="xunit" Version="2.9.2" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
+
+    <!-- Pin nuget transitive packages vulnerability issues NuGet.Packaging -->
+    <PackageVersion Include="System.Security.Cryptography.Pkcs" Version="9.0.0-rc.2.24473.5" />
   </ItemGroup>
+
 </Project>
diff --git a/src/Shared.msbuild b/src/Shared.msbuild
@@ -1,7 +1,7 @@
 <Project>
   <!-- General package metadata -->
   <PropertyGroup>
-    <TargetFrameworks>net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.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>

diff --git a/tests/integration/Cake.Common/Build/GitHubActions/ValidateGitHubActionsProvider.cake b/tests/integration/Cake.Common/Build/GitHubActions/ValidateGitHubActionsProvider.cake
@@ -20,7 +20,8 @@ Setup(
 Task("ValidateEnvironment")
     .DoesForEach<BuildData, string>(
         data => new [] {
-            $"CAKE_{data.OS}_NETCOREAPP_8_0_VERSION"
+            $"CAKE_{data.OS}_NETCOREAPP_8_0_VERSION",
+            $"CAKE_{data.OS}_NETCOREAPP_9_0_VERSION"
         },
         (data, envKey) => Assert.Equal(data.GitVersion, EnvironmentVariable(envKey))
     );
@@ -29,14 +30,16 @@ Task("ValidatePath")
     .DoesForEach<BuildData, string>(
         new [] {
             "Cake\\WTool\\Wtools\\Wnet8\\W0",
+            "Cake\\WTool\\Wtools\\Wnet9\\W0"
         },
         (data, path) => Assert.Matches(path, data.Path)
     );
 
 Task("ValidateVariable")
     .DoesForEach<BuildData, string>(
         () => new [] {
-            "CAKE_NETCOREAPP_8_0_VERSION_OS"
+            "CAKE_NETCOREAPP_8_0_VERSION_OS",
+            "CAKE_NETCOREAPP_9_0_VERSION_OS"
         },
         (data, varKey) => Assert.Equal(data.GitVersionAndOS, Argument<string>(varKey))
     );

diff --git a/tests/integration/Cake.Common/Tools/Command/CommandAliases.cake b/tests/integration/Cake.Common/Tools/Command/CommandAliases.cake
@@ -36,11 +36,7 @@ Usage:
 Arguments:
   <PACKAGE_ID>  The NuGet Package Id of the tool to list
 
-Options:
-  -g, --global        List tools installed for the current user.
-  --local             List the tools installed in the local tool manifest.
-  --tool-path <PATH>  The directory containing the tools to list.
-  -?, -h, --help      Show command line help.";
+Options:";
 
     // When
     var exitCode = ctx.Command(settings.ToolExecutableNames, out var standardOutput, "tool list -h");
@@ -65,11 +61,7 @@ Usage:
 Arguments:
   <PACKAGE_ID>  The NuGet Package Id of the tool to list
 
-Options:
-  -g, --global        List tools installed for the current user.
-  --local             List the tools installed in the local tool manifest.
-  --tool-path <PATH>  The directory containing the tools to list.
-  -?, -h, --help      Show command line help.";
+Options:";
 
     // When
     var exitCode = ctx.Command(settings, out var standardOutput, "tool list -h");
@@ -94,11 +86,7 @@ Usage:
 Arguments:
   <PACKAGE_ID>  The NuGet Package Id of the tool to list
 
-Options:
-  -g, --global        List tools installed for the current user.
-  --local             List the tools installed in the local tool manifest.
-  --tool-path <PATH>  The directory containing the tools to list.
-  -?, -h, --help      Show command line help.";
+Options:";
 
     // When
     var exitCode = ctx.Command(

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/net8.0/hwapp.dll");
+    var assembly = path.CombineWithFilePath("hwapp/bin/Debug/net9.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/net8.0/hwapp.tests.dll");
+    var assembly = path.CombineWithFilePath("hwapp.tests/bin/Debug/net9.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/net8.0/hwapp.dll");
+    var assembly = path.CombineWithFilePath("hwapp/bin/Debug/net9.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/net8.0/hwapp.dll");
+    var assembly = path.CombineWithFilePath("hwapp/bin/Debug/net9.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/net8.0/hwapp.dll");
+    var assembly = path.CombineWithFilePath("hwapp/bin/Debug/net9.0/hwapp.dll");
 
     // When
     DotNetMSBuild(project.FullPath);

diff --git a/tests/integration/Cake.Core/Scripting/AddinDirective.cake b/tests/integration/Cake.Core/Scripting/AddinDirective.cake
@@ -23,7 +23,8 @@ Task("Cake.Core.Scripting.AddinDirective.LoadTargetedAddin")
                                  .SetTargetFramework(
                                      cake switch
                                      {
-                                        _ => "net8.0"
+                                        FilePath net8_0Path         when net8_0Path.FullPath.Contains("net8.0")                 => "net8.0",
+                                        _ => "net9.0"
                                      }
                                  );
 

diff --git a/tests/integration/Cake.Core/Scripting/DefineDirective.cake b/tests/integration/Cake.Core/Scripting/DefineDirective.cake
@@ -54,6 +54,8 @@ Task("Cake.Core.Scripting.DefineDirective.Runtime")
                     "7.0",
 #elif NET8_0
                     "8.0",
+#elif NET9_0
+                    "9.0",
 #endif
                     context.Environment.Runtime.BuiltFramework.FullName);
 });

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>net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.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,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
-    <PackageReference Include="xunit" Version="2.6.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.6.1" />
+    <PackageReference Include="xunit" Version="2.9.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

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>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\hwapp.common\hwapp.common.csproj" />
-Original file line number
+Diff line change
@@ Expand Up / @@ -54,6 +54,8 @@ Task("Cake.Core.Scripting.DefineDirective.Runtime") @@
                         "7.0",
     #elif NET8_0
                         "8.0",
+    #elif NET9_0
+                        "9.0",
     #endif
                         context.Environment.Runtime.BuiltFramework.FullName);
     });
@@ Expand Down @@