From 7d15f39dc4c2474cb791cb7159ce4290d58e36ac Mon Sep 17 00:00:00 2001 From: Mattias Karlsson Date: Thu, 21 May 2026 22:10:48 +0200 Subject: [PATCH] (GH-117) Update Cake.* to 6.2.0-alpha0073 - fixes #129 --- ...enerators#CakeAliasGlobalUsings.g.verified.cs | 2 ++ ...nGenerators#CakePropertyAliases.g.verified.cs | 16 ++++++++++++++++ ...thodCalls#CakeAliasGlobalUsings.g.verified.cs | 2 ++ ...MethodCalls#CakePropertyAliases.g.verified.cs | 16 ++++++++++++++++ ...thModules#CakeAliasGlobalUsings.g.verified.cs | 2 ++ ...WithModules#CakePropertyAliases.g.verified.cs | 16 ++++++++++++++++ .../Models/IntegrationTestData.cs | 3 +++ src/Cake.Sdk/Cake.Sdk.csproj | 3 +-- src/Cake.Template/templates/cakefile/cake.cs | 1 + .../templates/cakeminimalfile/cake.cs | 3 ++- .../templates/cakemultifile/cake.cs | 1 + src/Directory.Packages.props | 10 +++++----- 12 files changed, 67 insertions(+), 8 deletions(-) diff --git a/src/Cake.Generator.Core.Tests/Unit/CakeGeneratorTests.RunGenerators#CakeAliasGlobalUsings.g.verified.cs b/src/Cake.Generator.Core.Tests/Unit/CakeGeneratorTests.RunGenerators#CakeAliasGlobalUsings.g.verified.cs index f5aa58c..20af34a 100644 --- a/src/Cake.Generator.Core.Tests/Unit/CakeGeneratorTests.RunGenerators#CakeAliasGlobalUsings.g.verified.cs +++ b/src/Cake.Generator.Core.Tests/Unit/CakeGeneratorTests.RunGenerators#CakeAliasGlobalUsings.g.verified.cs @@ -24,6 +24,8 @@ global using global::Cake.Common.Build.Jenkins; global using global::Cake.Common.Build.Jenkins.Data; global using global::Cake.Common.Build.MyGet; +global using global::Cake.Common.Build.Rwx; +global using global::Cake.Common.Build.Rwx.Data; global using global::Cake.Common.Build.TeamCity; global using global::Cake.Common.Build.TravisCI; global using global::Cake.Common.Build.TravisCI.Data; diff --git a/src/Cake.Generator.Core.Tests/Unit/CakeGeneratorTests.RunGenerators#CakePropertyAliases.g.verified.cs b/src/Cake.Generator.Core.Tests/Unit/CakeGeneratorTests.RunGenerators#CakePropertyAliases.g.verified.cs index 4671688..8781c87 100644 --- a/src/Cake.Generator.Core.Tests/Unit/CakeGeneratorTests.RunGenerators#CakePropertyAliases.g.verified.cs +++ b/src/Cake.Generator.Core.Tests/Unit/CakeGeneratorTests.RunGenerators#CakePropertyAliases.g.verified.cs @@ -20,6 +20,7 @@ public static partial class Cake_Common private static global::Cake.Common.Build.GitHubActions.IGitHubActionsProvider? _GitHubActions; private static global::Cake.Common.Build.AzurePipelines.IAzurePipelinesProvider? _AzurePipelines; private static global::Cake.Common.Build.WoodpeckerCI.IWoodpeckerCIProvider? _WoodpeckerCI; + private static global::Cake.Common.Build.Rwx.IRwxProvider? _Rwx; /// /// @@ -246,6 +247,21 @@ public static partial class Cake_Common public static global::Cake.Common.Build.WoodpeckerCI.IWoodpeckerCIProvider WoodpeckerCI => _WoodpeckerCI ??= global::Cake.Common.Build.BuildSystemAliases.WoodpeckerCI(Context); + /// + /// + /// Gets an instance that can be used to + /// obtain information from the RWX environment. + /// + /// + /// + /// var isRwxBuild = Rwx.IsRunningOnRwx; + /// + /// + /// A instance. + /// + public static global::Cake.Common.Build.Rwx.IRwxProvider Rwx + => _Rwx ??= global::Cake.Common.Build.BuildSystemAliases.Rwx(Context); + } } diff --git a/src/Cake.Generator.Core.Tests/Unit/CakeGeneratorTests.RunGenerators_WithMainMethods_GeneratesMainMethodCalls#CakeAliasGlobalUsings.g.verified.cs b/src/Cake.Generator.Core.Tests/Unit/CakeGeneratorTests.RunGenerators_WithMainMethods_GeneratesMainMethodCalls#CakeAliasGlobalUsings.g.verified.cs index f5aa58c..20af34a 100644 --- a/src/Cake.Generator.Core.Tests/Unit/CakeGeneratorTests.RunGenerators_WithMainMethods_GeneratesMainMethodCalls#CakeAliasGlobalUsings.g.verified.cs +++ b/src/Cake.Generator.Core.Tests/Unit/CakeGeneratorTests.RunGenerators_WithMainMethods_GeneratesMainMethodCalls#CakeAliasGlobalUsings.g.verified.cs @@ -24,6 +24,8 @@ global using global::Cake.Common.Build.Jenkins; global using global::Cake.Common.Build.Jenkins.Data; global using global::Cake.Common.Build.MyGet; +global using global::Cake.Common.Build.Rwx; +global using global::Cake.Common.Build.Rwx.Data; global using global::Cake.Common.Build.TeamCity; global using global::Cake.Common.Build.TravisCI; global using global::Cake.Common.Build.TravisCI.Data; diff --git a/src/Cake.Generator.Core.Tests/Unit/CakeGeneratorTests.RunGenerators_WithMainMethods_GeneratesMainMethodCalls#CakePropertyAliases.g.verified.cs b/src/Cake.Generator.Core.Tests/Unit/CakeGeneratorTests.RunGenerators_WithMainMethods_GeneratesMainMethodCalls#CakePropertyAliases.g.verified.cs index 4671688..8781c87 100644 --- a/src/Cake.Generator.Core.Tests/Unit/CakeGeneratorTests.RunGenerators_WithMainMethods_GeneratesMainMethodCalls#CakePropertyAliases.g.verified.cs +++ b/src/Cake.Generator.Core.Tests/Unit/CakeGeneratorTests.RunGenerators_WithMainMethods_GeneratesMainMethodCalls#CakePropertyAliases.g.verified.cs @@ -20,6 +20,7 @@ public static partial class Cake_Common private static global::Cake.Common.Build.GitHubActions.IGitHubActionsProvider? _GitHubActions; private static global::Cake.Common.Build.AzurePipelines.IAzurePipelinesProvider? _AzurePipelines; private static global::Cake.Common.Build.WoodpeckerCI.IWoodpeckerCIProvider? _WoodpeckerCI; + private static global::Cake.Common.Build.Rwx.IRwxProvider? _Rwx; /// /// @@ -246,6 +247,21 @@ public static partial class Cake_Common public static global::Cake.Common.Build.WoodpeckerCI.IWoodpeckerCIProvider WoodpeckerCI => _WoodpeckerCI ??= global::Cake.Common.Build.BuildSystemAliases.WoodpeckerCI(Context); + /// + /// + /// Gets an instance that can be used to + /// obtain information from the RWX environment. + /// + /// + /// + /// var isRwxBuild = Rwx.IsRunningOnRwx; + /// + /// + /// A instance. + /// + public static global::Cake.Common.Build.Rwx.IRwxProvider Rwx + => _Rwx ??= global::Cake.Common.Build.BuildSystemAliases.Rwx(Context); + } } diff --git a/src/Cake.Generator.Core.Tests/Unit/CakeGeneratorTests.RunGenerators_WithModules#CakeAliasGlobalUsings.g.verified.cs b/src/Cake.Generator.Core.Tests/Unit/CakeGeneratorTests.RunGenerators_WithModules#CakeAliasGlobalUsings.g.verified.cs index f5aa58c..20af34a 100644 --- a/src/Cake.Generator.Core.Tests/Unit/CakeGeneratorTests.RunGenerators_WithModules#CakeAliasGlobalUsings.g.verified.cs +++ b/src/Cake.Generator.Core.Tests/Unit/CakeGeneratorTests.RunGenerators_WithModules#CakeAliasGlobalUsings.g.verified.cs @@ -24,6 +24,8 @@ global using global::Cake.Common.Build.Jenkins; global using global::Cake.Common.Build.Jenkins.Data; global using global::Cake.Common.Build.MyGet; +global using global::Cake.Common.Build.Rwx; +global using global::Cake.Common.Build.Rwx.Data; global using global::Cake.Common.Build.TeamCity; global using global::Cake.Common.Build.TravisCI; global using global::Cake.Common.Build.TravisCI.Data; diff --git a/src/Cake.Generator.Core.Tests/Unit/CakeGeneratorTests.RunGenerators_WithModules#CakePropertyAliases.g.verified.cs b/src/Cake.Generator.Core.Tests/Unit/CakeGeneratorTests.RunGenerators_WithModules#CakePropertyAliases.g.verified.cs index 4671688..8781c87 100644 --- a/src/Cake.Generator.Core.Tests/Unit/CakeGeneratorTests.RunGenerators_WithModules#CakePropertyAliases.g.verified.cs +++ b/src/Cake.Generator.Core.Tests/Unit/CakeGeneratorTests.RunGenerators_WithModules#CakePropertyAliases.g.verified.cs @@ -20,6 +20,7 @@ public static partial class Cake_Common private static global::Cake.Common.Build.GitHubActions.IGitHubActionsProvider? _GitHubActions; private static global::Cake.Common.Build.AzurePipelines.IAzurePipelinesProvider? _AzurePipelines; private static global::Cake.Common.Build.WoodpeckerCI.IWoodpeckerCIProvider? _WoodpeckerCI; + private static global::Cake.Common.Build.Rwx.IRwxProvider? _Rwx; /// /// @@ -246,6 +247,21 @@ public static partial class Cake_Common public static global::Cake.Common.Build.WoodpeckerCI.IWoodpeckerCIProvider WoodpeckerCI => _WoodpeckerCI ??= global::Cake.Common.Build.BuildSystemAliases.WoodpeckerCI(Context); + /// + /// + /// Gets an instance that can be used to + /// obtain information from the RWX environment. + /// + /// + /// + /// var isRwxBuild = Rwx.IsRunningOnRwx; + /// + /// + /// A instance. + /// + public static global::Cake.Common.Build.Rwx.IRwxProvider Rwx + => _Rwx ??= global::Cake.Common.Build.BuildSystemAliases.Rwx(Context); + } } diff --git a/src/Cake.Generator.TestApp/Models/IntegrationTestData.cs b/src/Cake.Generator.TestApp/Models/IntegrationTestData.cs index fd7c5d9..1b41da4 100644 --- a/src/Cake.Generator.TestApp/Models/IntegrationTestData.cs +++ b/src/Cake.Generator.TestApp/Models/IntegrationTestData.cs @@ -103,6 +103,7 @@ public record BuildData(string ExpectedVersion, string Version); public string CakeCsCode => $$""" + #!/usr/bin/env dotnet #:package Cake.Generator@{{Version}} #:package {{XunitAssertPackage}} {{BaseCode}} @@ -110,6 +111,7 @@ public record BuildData(string ExpectedVersion, string Version); public string CakeSdkCsCode => $$""" + #!/usr/bin/env dotnet #:sdk Cake.Sdk #:package {{XunitAssertPackage}} {{BaseCode}} @@ -138,6 +140,7 @@ public record BuildData(string ExpectedVersion, string Version); public string CakeSdkFilesCsCode => $$""" + #!/usr/bin/env dotnet #:sdk Cake.Sdk #:property IncludeAdditionalFiles=cake.sdk.files/**/*.cs #:property ExcludeAdditionalFiles=cake.sdk.files/**/Excluded.cs diff --git a/src/Cake.Sdk/Cake.Sdk.csproj b/src/Cake.Sdk/Cake.Sdk.csproj index f05aacd..9b56d72 100644 --- a/src/Cake.Sdk/Cake.Sdk.csproj +++ b/src/Cake.Sdk/Cake.Sdk.csproj @@ -44,7 +44,6 @@ latest false true - __NoWarn__;CA2266 @@ -67,7 +66,7 @@ $ - $([System.String]::Copy('$(SdkPropsContent)').Replace('__VERSION__', '$(Version)').Replace('__IncludeAdditionalFiles__', '$(DollarSign)(IncludeAdditionalFiles)').Replace('__ExcludeAdditionalFiles__', '$(DollarSign)(ExcludeAdditionalFiles)').Replace('__MSBuildThisFileDirectory__', '$(DollarSign)(MSBuildThisFileDirectory)').Replace('__NoWarn__', '$(NoWarn)')) + $([System.String]::Copy('$(SdkPropsContent)').Replace('__VERSION__', '$(Version)').Replace('__IncludeAdditionalFiles__', '$(DollarSign)(IncludeAdditionalFiles)').Replace('__ExcludeAdditionalFiles__', '$(DollarSign)(ExcludeAdditionalFiles)').Replace('__MSBuildThisFileDirectory__', '$(DollarSign)(MSBuildThisFileDirectory)')) diff --git a/src/Cake.Template/templates/cakefile/cake.cs b/src/Cake.Template/templates/cakefile/cake.cs index a07bcd6..11f5298 100644 --- a/src/Cake.Template/templates/cakefile/cake.cs +++ b/src/Cake.Template/templates/cakefile/cake.cs @@ -1,3 +1,4 @@ +#!/usr/bin/env dotnet #:sdk Cake.Sdk@CakeSdkVersion var target = Argument("target", "Test"); diff --git a/src/Cake.Template/templates/cakeminimalfile/cake.cs b/src/Cake.Template/templates/cakeminimalfile/cake.cs index ad992fd..6576428 100644 --- a/src/Cake.Template/templates/cakeminimalfile/cake.cs +++ b/src/Cake.Template/templates/cakeminimalfile/cake.cs @@ -1,4 +1,5 @@ -#:sdk Cake.Sdk@CakeSdkVersion +#!/usr/bin/env dotnet +#:sdk Cake.Sdk@CakeSdkVersion Task("TrivialTask") .Does(() => diff --git a/src/Cake.Template/templates/cakemultifile/cake.cs b/src/Cake.Template/templates/cakemultifile/cake.cs index 0c7159a..53ceff1 100644 --- a/src/Cake.Template/templates/cakemultifile/cake.cs +++ b/src/Cake.Template/templates/cakemultifile/cake.cs @@ -1,3 +1,4 @@ +#!/usr/bin/env dotnet #:sdk Cake.Sdk@CakeSdkVersion #:property IncludeAdditionalFiles=build/**/*.cs #:property ExcludeAdditionalFiles=build/**/Except*.cs diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index 833c62b..63eb081 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -6,11 +6,11 @@ - - - - - + + + + +