Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/// <member name="M:Cake.Common.Build.BuildSystemAliases.BuildSystem(Cake.Core.ICakeContext)">
/// <summary>
Expand Down Expand Up @@ -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);

/// <member name="M:Cake.Common.Build.BuildSystemAliases.Rwx(Cake.Core.ICakeContext)">
/// <summary>
/// Gets an <see cref="T:Cake.Common.Build.Rwx.RwxProvider" /> instance that can be used to
/// obtain information from the RWX environment.
/// </summary>
/// <example>
/// <code>
/// var isRwxBuild = Rwx.IsRunningOnRwx;
/// </code>
/// </example>
/// <returns>A <see cref="N:Cake.Common.Build.Rwx" /> instance.</returns>
/// </member>
public static global::Cake.Common.Build.Rwx.IRwxProvider Rwx
=> _Rwx ??= global::Cake.Common.Build.BuildSystemAliases.Rwx(Context);

}

}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/// <member name="M:Cake.Common.Build.BuildSystemAliases.BuildSystem(Cake.Core.ICakeContext)">
/// <summary>
Expand Down Expand Up @@ -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);

/// <member name="M:Cake.Common.Build.BuildSystemAliases.Rwx(Cake.Core.ICakeContext)">
/// <summary>
/// Gets an <see cref="T:Cake.Common.Build.Rwx.RwxProvider" /> instance that can be used to
/// obtain information from the RWX environment.
/// </summary>
/// <example>
/// <code>
/// var isRwxBuild = Rwx.IsRunningOnRwx;
/// </code>
/// </example>
/// <returns>A <see cref="N:Cake.Common.Build.Rwx" /> instance.</returns>
/// </member>
public static global::Cake.Common.Build.Rwx.IRwxProvider Rwx
=> _Rwx ??= global::Cake.Common.Build.BuildSystemAliases.Rwx(Context);

}

}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/// <member name="M:Cake.Common.Build.BuildSystemAliases.BuildSystem(Cake.Core.ICakeContext)">
/// <summary>
Expand Down Expand Up @@ -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);

/// <member name="M:Cake.Common.Build.BuildSystemAliases.Rwx(Cake.Core.ICakeContext)">
/// <summary>
/// Gets an <see cref="T:Cake.Common.Build.Rwx.RwxProvider" /> instance that can be used to
/// obtain information from the RWX environment.
/// </summary>
/// <example>
/// <code>
/// var isRwxBuild = Rwx.IsRunningOnRwx;
/// </code>
/// </example>
/// <returns>A <see cref="N:Cake.Common.Build.Rwx" /> instance.</returns>
/// </member>
public static global::Cake.Common.Build.Rwx.IRwxProvider Rwx
=> _Rwx ??= global::Cake.Common.Build.BuildSystemAliases.Rwx(Context);

}

}
3 changes: 3 additions & 0 deletions src/Cake.Generator.TestApp/Models/IntegrationTestData.cs
Original file line number Diff line number Diff line change
Expand Up @@ -103,13 +103,15 @@ public record BuildData(string ExpectedVersion, string Version);

public string CakeCsCode =>
$$"""
#!/usr/bin/env dotnet
#:package Cake.Generator@{{Version}}
#:package {{XunitAssertPackage}}
{{BaseCode}}
""";

public string CakeSdkCsCode =>
$$"""
#!/usr/bin/env dotnet
#:sdk Cake.Sdk
#:package {{XunitAssertPackage}}
{{BaseCode}}
Expand Down Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions src/Cake.Sdk/Cake.Sdk.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
<LangVersion>latest</LangVersion>
<PublishAot>false</PublishAot>
<JsonSerializerIsReflectionEnabledByDefault>true</JsonSerializerIsReflectionEnabledByDefault>
<NoWarn>__NoWarn__;CA2266</NoWarn>
</PropertyGroup>

<ItemGroup>
Expand All @@ -67,7 +66,7 @@
<!-- Replace placeholders with actual values and MSBuild properties -->
<PropertyGroup>
<DollarSign>$</DollarSign>
<SdkPropsContentWithVersion>$([System.String]::Copy('$(SdkPropsContent)').Replace('__VERSION__', '$(Version)').Replace('__IncludeAdditionalFiles__', '$(DollarSign)(IncludeAdditionalFiles)').Replace('__ExcludeAdditionalFiles__', '$(DollarSign)(ExcludeAdditionalFiles)').Replace('__MSBuildThisFileDirectory__', '$(DollarSign)(MSBuildThisFileDirectory)').Replace('__NoWarn__', '$(NoWarn)'))</SdkPropsContentWithVersion>
<SdkPropsContentWithVersion>$([System.String]::Copy('$(SdkPropsContent)').Replace('__VERSION__', '$(Version)').Replace('__IncludeAdditionalFiles__', '$(DollarSign)(IncludeAdditionalFiles)').Replace('__ExcludeAdditionalFiles__', '$(DollarSign)(ExcludeAdditionalFiles)').Replace('__MSBuildThisFileDirectory__', '$(DollarSign)(MSBuildThisFileDirectory)'))</SdkPropsContentWithVersion>
</PropertyGroup>

<!-- Ensure directories exist -->
Expand Down
1 change: 1 addition & 0 deletions src/Cake.Template/templates/cakefile/cake.cs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#!/usr/bin/env dotnet
#:sdk Cake.Sdk@CakeSdkVersion

var target = Argument("target", "Test");
Expand Down
3 changes: 2 additions & 1 deletion src/Cake.Template/templates/cakeminimalfile/cake.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#:sdk Cake.Sdk@CakeSdkVersion
#!/usr/bin/env dotnet
#:sdk Cake.Sdk@CakeSdkVersion

Task("TrivialTask")
.Does(() =>
Expand Down
1 change: 1 addition & 0 deletions src/Cake.Template/templates/cakemultifile/cake.cs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#!/usr/bin/env dotnet
#:sdk Cake.Sdk@CakeSdkVersion
#:property IncludeAdditionalFiles=build/**/*.cs
#:property ExcludeAdditionalFiles=build/**/Except*.cs
Expand Down
10 changes: 5 additions & 5 deletions src/Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
<ItemGroup>
<AdditionalFiles Include="$(MSBuildThisFileDirectory)stylecop.json" Link="stylecop.json" />
<GlobalPackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556" PrivateAssets="All" />
<PackageVersion Include="Cake.Core" Version="6.2.0-alpha0071" />
<PackageVersion Include="Cake.Common" Version="6.2.0-alpha0071" />
<PackageVersion Include="Cake.Cli" Version="6.2.0-alpha0071" />
<PackageVersion Include="Cake.DotNetTool.Module" Version="6.2.0-alpha0071" />
<PackageVersion Include="Cake.NuGet" Version="6.2.0-alpha0071" />
<PackageVersion Include="Cake.Core" Version="6.2.0-alpha0073" />
<PackageVersion Include="Cake.Common" Version="6.2.0-alpha0073" />
<PackageVersion Include="Cake.Cli" Version="6.2.0-alpha0073" />
<PackageVersion Include="Cake.DotNetTool.Module" Version="6.2.0-alpha0073" />
<PackageVersion Include="Cake.NuGet" Version="6.2.0-alpha0073" />
<PackageVersion Include="Cake.Twitter" Version="6.0.0" />
<PackageVersion Include="Cake.BuildSystems.Module" Version="9.0.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.11.0" />
Expand Down
Loading