Skip to content

Commit

Permalink
Merge branch 'release/4.11.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
pascalberger committed Oct 7, 2024
2 parents 3ce334d + 1efb93a commit ecfc5f1
Show file tree
Hide file tree
Showing 11 changed files with 54 additions and 53 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
run: .\build.ps1
shell: powershell
- name: Publish NuGet package as build artifact
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4
with:
name: NuGet Package
path: ./BuildArtifacts/Packages/NuGet/
Expand Down Expand Up @@ -53,7 +53,7 @@ jobs:
working-directory: ./tests/script-runner/
shell: powershell
- name: Publish generated reports as build artifact
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4
with:
name: Integration Tests Script Runner Windows (.NET Core tool)
path: ./tests/script-runner/BuildArtifacts/output/
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@

<ItemGroup>
<PackageReference Include="Cake.Frosting" Version="4.0.0" />
<PackageReference Include="Cake.Issues.Testing" Version="4.10.1" />
<PackageReference Include="Cake.Issues.Testing" Version="4.11.0" />
<PackageReference Include="Cake.Testing" Version="4.0.0" />
<PackageReference Include="Cake.Testing.Xunit" Version="4.0.0" />
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
<PackageReference Include="xunit" Version="2.9.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ For recipe compatible with Cake Script Runners see Cake.Issues.Recipe.</Descript
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<RepositoryType>git</RepositoryType>
<RepositoryUrl>https://github.com/cake-contrib/Cake.Issues.Recipe.git</RepositoryUrl>
<PackageReleaseNotes>https://github.com/cake-contrib/Cake.Issues.Recipe/releases/tag/4.10.1</PackageReleaseNotes>
<PackageReleaseNotes>https://github.com/cake-contrib/Cake.Issues.Recipe/releases/tag/4.11.0</PackageReleaseNotes>
</PropertyGroup>

<ItemGroup>
Expand All @@ -42,20 +42,20 @@ For recipe compatible with Cake Script Runners see Cake.Issues.Recipe.</Descript
<PackageReference Include="Cake.AzureDevOps" Version="4.0.0" />
<PackageReference Include="Cake.Frosting" Version="4.0.0" PrivateAssets="All" />
<PackageReference Include="Cake.Frosting.Git" Version="4.0.0" />
<PackageReference Include="Cake.Issues" Version="4.10.1" />
<PackageReference Include="Cake.Frosting.Issues.EsLint" Version="4.10.1" />
<PackageReference Include="Cake.Frosting.Issues.InspectCode" Version="4.10.1" />
<PackageReference Include="Cake.Frosting.Issues.Markdownlint" Version="4.10.1" />
<PackageReference Include="Cake.Frosting.Issues.MsBuild" Version="4.10.1" />
<PackageReference Include="Cake.Frosting.Issues.Sarif" Version="4.10.1" />
<PackageReference Include="Cake.Frosting.Issues.PullRequests" Version="4.10.1" />
<PackageReference Include="Cake.Frosting.Issues.PullRequests.AppVeyor" Version="4.10.1" />
<PackageReference Include="Cake.Frosting.Issues.PullRequests.AzureDevOps" Version="4.10.1" />
<PackageReference Include="Cake.Frosting.Issues.PullRequests.GitHubActions" Version="4.10.1" />
<PackageReference Include="Cake.Frosting.Issues.Reporting" Version="4.10.1" />
<PackageReference Include="Cake.Frosting.Issues.Reporting.Sarif" Version="4.10.1" />
<PackageReference Include="Cake.Frosting.Issues.Reporting.Generic" Version="4.10.1" />
<PackageReference Include="Cake.Frosting.Issues.Reporting.Console" Version="4.10.1" />
<PackageReference Include="Cake.Issues" Version="4.11.0" />
<PackageReference Include="Cake.Frosting.Issues.EsLint" Version="4.11.0" />
<PackageReference Include="Cake.Frosting.Issues.InspectCode" Version="4.11.0" />
<PackageReference Include="Cake.Frosting.Issues.Markdownlint" Version="4.11.0" />
<PackageReference Include="Cake.Frosting.Issues.MsBuild" Version="4.11.0" />
<PackageReference Include="Cake.Frosting.Issues.Sarif" Version="4.11.0" />
<PackageReference Include="Cake.Frosting.Issues.PullRequests" Version="4.11.0" />
<PackageReference Include="Cake.Frosting.Issues.PullRequests.AppVeyor" Version="4.11.0" />
<PackageReference Include="Cake.Frosting.Issues.PullRequests.AzureDevOps" Version="4.11.0" />
<PackageReference Include="Cake.Frosting.Issues.PullRequests.GitHubActions" Version="4.11.0" />
<PackageReference Include="Cake.Frosting.Issues.Reporting" Version="4.11.0" />
<PackageReference Include="Cake.Frosting.Issues.Reporting.Sarif" Version="4.11.0" />
<PackageReference Include="Cake.Frosting.Issues.Reporting.Generic" Version="4.11.0" />
<PackageReference Include="Cake.Frosting.Issues.Reporting.Console" Version="4.11.0" />
</ItemGroup>

</Project>
28 changes: 14 additions & 14 deletions Cake.Issues.Recipe/Content/addins.cake
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@
///////////////////////////////////////////////////////////////////////////////

#addin nuget:?package=Cake.Git&version=4.0.0
#addin nuget:?package=Cake.Issues&version=4.10.1
#addin nuget:?package=Cake.Issues.MsBuild&version=4.10.1
#addin nuget:?package=Cake.Issues.InspectCode&version=4.10.1
#addin nuget:?package=Cake.Issues.Markdownlint&version=4.10.1
#addin nuget:?package=Cake.Issues.EsLint&version=4.10.1
#addin nuget:?package=Cake.Issues.Sarif&version=4.10.1
#addin nuget:?package=Cake.Issues.Reporting&version=4.10.1
#addin nuget:?package=Cake.Issues.Reporting.Generic&version=4.10.1
#addin nuget:?package=Cake.Issues.Reporting.Sarif&version=4.10.1
#addin nuget:?package=Cake.Issues.Reporting.Console&version=4.10.1
#addin nuget:?package=Cake.Issues.PullRequests&version=4.10.1
#addin nuget:?package=Cake.Issues.PullRequests.AppVeyor&version=4.10.1
#addin nuget:?package=Cake.Issues.PullRequests.AzureDevOps&version=4.10.1
#addin nuget:?package=Cake.Issues.PullRequests.GitHubActions&version=4.10.1
#addin nuget:?package=Cake.Issues&version=4.11.0
#addin nuget:?package=Cake.Issues.MsBuild&version=4.11.0
#addin nuget:?package=Cake.Issues.InspectCode&version=4.11.0
#addin nuget:?package=Cake.Issues.Markdownlint&version=4.11.0
#addin nuget:?package=Cake.Issues.EsLint&version=4.11.0
#addin nuget:?package=Cake.Issues.Sarif&version=4.11.0
#addin nuget:?package=Cake.Issues.Reporting&version=4.11.0
#addin nuget:?package=Cake.Issues.Reporting.Generic&version=4.11.0
#addin nuget:?package=Cake.Issues.Reporting.Sarif&version=4.11.0
#addin nuget:?package=Cake.Issues.Reporting.Console&version=4.11.0
#addin nuget:?package=Cake.Issues.PullRequests&version=4.11.0
#addin nuget:?package=Cake.Issues.PullRequests.AppVeyor&version=4.11.0
#addin nuget:?package=Cake.Issues.PullRequests.AzureDevOps&version=4.11.0
#addin nuget:?package=Cake.Issues.PullRequests.GitHubActions&version=4.11.0
#addin nuget:?package=Cake.AzureDevOps&version=4.0.0
26 changes: 13 additions & 13 deletions docs/overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,19 @@ Cake.Issues recipes will add the following addins to your build:
| Addin Cake.Issues.Recipe | Addin.Frosting.Issues.Recipe | Remarks |
|---------------------------------------------------------|---------------------------------------------------------|-|
| [Cake.Git] 4.0.0 | [Cake.Frosting.Git] 4.0.0 | Only used if `RepositoryInfoProvider` type is set to `RepositoryInfoProviderType.CakeGit`. See [Git repository information configuration] for details. |
| [Cake.Issues] 4.10.1 | [Cake.Issues] 4.10.1 | |
| [Cake.Issues.MsBuild] 4.10.1 | [Cake.Frosting.Issues.MsBuild] 4.10.1 | |
| [Cake.Issues.InspectCode] 4.10.1 | [Cake.Frosting.Issues.InspectCode] 4.10.1 | |
| [Cake.Issues.Markdownlint] 4.10.1 | [Cake.Frosting.Issues.Markdownlint] 4.10.1 | |
| [Cake.Issues.EsLint] 4.10.1 | [Cake.Frosting.Issues.EsLint] 4.10.1 | |
| [Cake.Issues.Sarif] 4.10.1 | [Cake.Frosting.Issues.Sarif] 4.10.1 | |
| [Cake.Issues.Reporting] 4.10.1 | [Cake.Frosting.Issues.Reporting] 4.10.1 | |
| [Cake.Issues.Reporting.Generic] 4.10.1 | [Cake.Frosting.Issues.Reporting.Generic] 4.10.1 | |
| [Cake.Issues.Reporting.Sarif] 4.10.1 | [Cake.Frosting.Issues.Reporting.Sarif] 4.10.1 | |
| [Cake.Issues.PullRequests] 4.10.1 | [Cake.Frosting.Issues.PullRequests] 4.10.1 | |
| [Cake.Issues.PullRequests.AppVeyor] 4.10.1 | [Cake.Frosting.Issues.PullRequests.AppVeyor] 4.10.1 | |
| [Cake.Issues.PullRequests.AzureDevOps] 4.10.1 | [Cake.Frosting.Issues.PullRequests.AzureDevOps] 4.10.1 | |
| [Cake.Issues.PullRequests.GitHubActions] 4.10.1 | [Cake.Frosting.Issues.PullRequests.GitHubActions] 4.10.1 | |
| [Cake.Issues] 4.11.0 | [Cake.Issues] 4.11.0 | |
| [Cake.Issues.MsBuild] 4.11.0 | [Cake.Frosting.Issues.MsBuild] 4.11.0 | |
| [Cake.Issues.InspectCode] 4.11.0 | [Cake.Frosting.Issues.InspectCode] 4.11.0 | |
| [Cake.Issues.Markdownlint] 4.11.0 | [Cake.Frosting.Issues.Markdownlint] 4.11.0 | |
| [Cake.Issues.EsLint] 4.11.0 | [Cake.Frosting.Issues.EsLint] 4.11.0 | |
| [Cake.Issues.Sarif] 4.11.0 | [Cake.Frosting.Issues.Sarif] 4.11.0 | |
| [Cake.Issues.Reporting] 4.11.0 | [Cake.Frosting.Issues.Reporting] 4.11.0 | |
| [Cake.Issues.Reporting.Generic] 4.11.0 | [Cake.Frosting.Issues.Reporting.Generic] 4.11.0 | |
| [Cake.Issues.Reporting.Sarif] 4.11.0 | [Cake.Frosting.Issues.Reporting.Sarif] 4.11.0 | |
| [Cake.Issues.PullRequests] 4.11.0 | [Cake.Frosting.Issues.PullRequests] 4.11.0 | |
| [Cake.Issues.PullRequests.AppVeyor] 4.11.0 | [Cake.Frosting.Issues.PullRequests.AppVeyor] 4.11.0 | |
| [Cake.Issues.PullRequests.AzureDevOps] 4.11.0 | [Cake.Frosting.Issues.PullRequests.AzureDevOps] 4.11.0 | |
| [Cake.Issues.PullRequests.GitHubActions] 4.11.0 | [Cake.Frosting.Issues.PullRequests.GitHubActions] 4.11.0 | |
| [Cake.AzureDevOps] 4.0.0 | [Cake.AzureDevOps] 4.0.0 | |

[Cake.Issues.Recipe]: https://www.nuget.org/packages/Cake.Issues.Recipe
Expand Down
2 changes: 1 addition & 1 deletion nuspec/nuget/Cake.Issues.Recipe.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ For recipe compatible with Cake Frosting see Cake.Frosting.Issues.Recipe.
<repository type="git" url="https://github.com/cake-contrib/Cake.Issues.Recipe.git"/>
<copyright>Copyright © Pascal Berger</copyright>
<tags>cake cake-recipe cake-issues</tags>
<releaseNotes>https://github.com/cake-contrib/Cake.Issues.Recipe/releases/tag/4.10.1</releaseNotes>
<releaseNotes>https://github.com/cake-contrib/Cake.Issues.Recipe/releases/tag/4.11.0</releaseNotes>
</metadata>
<files>
<file src="icon.png" target="" />
Expand Down
3 changes: 2 additions & 1 deletion recipe.cake
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ BuildParameters.SetParameters(
BuildParameters.PrintParameters(Context);

ToolSettings.SetToolPreprocessorDirectives(
gitReleaseManagerGlobalTool: "#tool dotnet:?package=GitReleaseManager.Tool&version=0.17.0"
gitReleaseManagerGlobalTool: "#tool dotnet:?package=GitReleaseManager.Tool&version=0.17.0",
gitVersionGlobalTool: "#tool dotnet:?package=GitVersion.Tool&version=5.12.0"
);

ToolSettings.SetToolSettings(context: Context);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers">
<PrivateAssets>all</PrivateAssets>
<Version>3.0.0</Version>
<Version>3.3.2</Version>
</PackageReference>
<PackageReference Include="StyleCop.Analyzers">
<PrivateAssets>all</PrivateAssets>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers">
<PrivateAssets>all</PrivateAssets>
<Version>3.0.0</Version>
<Version>3.3.2</Version>
</PackageReference>
<PackageReference Include="StyleCop.Analyzers">
<PrivateAssets>all</PrivateAssets>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers">
<PrivateAssets>all</PrivateAssets>
<Version>3.0.0</Version>
<Version>3.3.2</Version>
</PackageReference>
<PackageReference Include="StyleCop.Analyzers">
<PrivateAssets>all</PrivateAssets>
Expand Down
2 changes: 1 addition & 1 deletion tests/script-runner/src/ClassLibrary1/ClassLibrary1.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers">
<PrivateAssets>all</PrivateAssets>
<Version>3.0.0</Version>
<Version>3.3.2</Version>
</PackageReference>
<PackageReference Include="StyleCop.Analyzers">
<PrivateAssets>all</PrivateAssets>
Expand Down

0 comments on commit ecfc5f1

Please sign in to comment.