Skip to content

Commit

Permalink
Merge branch 'release/5.0.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
pascalberger committed Dec 18, 2024
2 parents 8254720 + f45269c commit 5b85daa
Show file tree
Hide file tree
Showing 100 changed files with 2,695 additions and 446 deletions.
4 changes: 2 additions & 2 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ install:
- ps: Invoke-WebRequest -Uri "https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.ps1" -OutFile "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1"
- ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version 5.0.408 -InstallDir $env:DOTNET_INSTALL_DIR'
- ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version 8.0.404 -InstallDir $env:DOTNET_INSTALL_DIR'
- ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version 9.0.100 -InstallDir $env:DOTNET_INSTALL_DIR'
- ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version 9.0.101 -InstallDir $env:DOTNET_INSTALL_DIR'
- ps: $env:Path = "$env:DOTNET_INSTALL_DIR;$env:Path"
- ps: dotnet --info
- ps: Install-Product node 20
Expand All @@ -23,7 +23,7 @@ build_script:

# Tests
test_script:
- ps: cd .\tests\script-runner\
- ps: cd .\tests\script-runner\net8.0-git-cli\
- ps: .\build.ps1 --verbosity=diagnostic

#---------------------------------#
Expand Down
28 changes: 28 additions & 0 deletions .azuredevops/pipelines/templates/jobs/test-frosting.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
parameters:
- name: images
type: object
- name: dotNetVersions
type: object
- name: repositoryInfoProviders
type: object

jobs:
- ${{ each image in parameters.images }}:
- ${{ each dotnetVersion in parameters.dotNetVersions }}:
- ${{ each repositoryInfoProvider in parameters.repositoryInfoProviders }}:
- job: Test_Frosting_${{ replace(replace(image,'-','_'),'.','_') }}_Net${{ dotNetVersion }}_${{ replace(repositoryInfoProvider,'-','_') }}
displayName: Integration Tests Frosting ${{ image }} (.NET ${{ dotNetVersion }} / ${{ repositoryInfoProvider }})
dependsOn: Build
pool:
vmImage: '${{ image }}'
steps:
- template: ../steps/prepare-test.yml
parameters:
dotNetVersion: ${{ dotNetVersion }}
- bash: |
./build.sh --verbosity=diagnostic
workingDirectory: ./tests/frosting/net${{ dotNetVersion }}.0-${{ repositoryInfoProvider }}
displayName: 'Run integration tests'
- publish: $(Build.SourcesDirectory)/tests/frosting/net${{ dotNetVersion }}.0-${{ repositoryInfoProvider }}/build/BuildArtifacts/output
artifact: Integration Tests Frosting ${{ image }} (.NET ${{ dotNetVersion }} + ${{ repositoryInfoProvider }})
displayName: 'Publish generated reports as build artifact'
28 changes: 28 additions & 0 deletions .azuredevops/pipelines/templates/jobs/test-scripting.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
parameters:
- name: images
type: object
- name: dotNetVersions
type: object
- name: repositoryInfoProviders
type: object

jobs:
- ${{ each image in parameters.images }}:
- ${{ each dotnetVersion in parameters.dotNetVersions }}:
- ${{ each repositoryInfoProvider in parameters.repositoryInfoProviders }}:
- job: Test_Script_Runner_${{ replace(replace(image,'-','_'),'.','_') }}_Net${{ dotNetVersion }}_${{ replace(repositoryInfoProvider,'-','_') }}
displayName: Integration Tests Script Runner ${{ image }} (.NET ${{ dotNetVersion }} / ${{ repositoryInfoProvider }})
dependsOn: Build
pool:
vmImage: '${{ image }}'
steps:
- template: ../steps/prepare-test.yml
parameters:
dotNetVersion: ${{ dotNetVersion }}
- bash: |
./build.sh --verbosity=diagnostic
workingDirectory: ./tests/script-runner/net${{ dotNetVersion }}.0-${{ repositoryInfoProvider }}
displayName: 'Run integration tests'
- publish: $(Build.SourcesDirectory)/tests/script-runner/net${{ dotNetVersion }}.0-${{ repositoryInfoProvider }}/BuildArtifacts/output
artifact: Integration Tests Script Runner ${{ image }} (.NET ${{ dotNetVersion }} + ${{ repositoryInfoProvider }})
displayName: 'Publish generated reports as build artifact'
24 changes: 24 additions & 0 deletions .azuredevops/pipelines/templates/steps/prepare-test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
parameters:
- name: dotNetVersion
type: string

steps:
- task: UseDotNet@2
inputs:
version: '${{ parameters.dotNetVersion }}.x'
displayName: 'Install .NET ${{ parameters.dotNetVersion }}'
- task: NodeTool@0
inputs:
versionSpec: '20.x'
displayName: 'Install NodeJs 20.x'
- script: |
npm install -g markdownlint-cli
displayName: 'Install required tools'
- download: current
artifact: NuGet Package
displayName: 'Download build artifact'
- task: CopyFiles@2
inputs:
sourceFolder: $(Pipeline.Workspace)/NuGet Package
targetFolder: $(Build.SourcesDirectory)/BuildArtifacts/Packages/NuGet
displayName: 'Copy build artifact for test run'
10 changes: 5 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ jobs:
run: .\build.ps1
shell: powershell
- name: Publish NuGet package as build artifact
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4
with:
name: NuGet Package
path: ./BuildArtifacts/Packages/NuGet/
# Integration Tests Script Runner Windows (.NET tool)
# Integration Tests Script Runner Windows 2019 (.NET 8)
Test_Windows_DotNetTool:
name: Integration Tests Script Runner Windows (.NET tool)
needs: Build
Expand All @@ -49,10 +49,10 @@ jobs:
8.x
- name: Run integration tests
run: ./build.ps1 --verbosity=diagnostic
working-directory: ./tests/script-runner/
working-directory: ./tests/script-runner/net8.0-git-cli/
shell: powershell
- name: Publish generated reports as build artifact
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4
with:
name: Integration Tests Script Runner Windows (.NET tool)
path: ./tests/script-runner/BuildArtifacts/output/
path: ./tests/script-runner/net8.0/BuildArtifacts/output/
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

<ItemGroup>
<PackageReference Include="Cake.Frosting" Version="5.0.0" />
<PackageReference Include="Cake.Issues.Testing" Version="5.0.0" />
<PackageReference Include="Cake.Issues.Testing" Version="5.0.1" />
<PackageReference Include="Cake.Testing" Version="5.0.0" />
<PackageReference Include="Cake.Testing.Xunit" Version="5.0.0" />
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0">
Expand All @@ -27,7 +27,7 @@
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
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/5.0.0-beta.1</PackageReleaseNotes>
<PackageReleaseNotes>https://github.com/cake-contrib/Cake.Issues.Recipe/releases/tag/5.0.1</PackageReleaseNotes>
</PropertyGroup>

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

</Project>
2 changes: 1 addition & 1 deletion Cake.Frosting.Issues.Recipe/global.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"sdk": {
"allowPrerelease": true,
"version": "9.0.100",
"version": "9.0.101",
"rollForward": "latestFeature"
}
}
30 changes: 15 additions & 15 deletions Cake.Issues.Recipe/Content/addins.cake
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@
// ADDINS
///////////////////////////////////////////////////////////////////////////////

#addin nuget:?package=Cake.Git&version=5.0.0
#addin nuget:?package=Cake.Issues&version=5.0.0
#addin nuget:?package=Cake.Issues.MsBuild&version=5.0.0
#addin nuget:?package=Cake.Issues.InspectCode&version=5.0.0
#addin nuget:?package=Cake.Issues.Markdownlint&version=5.0.0
#addin nuget:?package=Cake.Issues.EsLint&version=5.0.0
#addin nuget:?package=Cake.Issues.Sarif&version=5.0.0
#addin nuget:?package=Cake.Issues.Reporting&version=5.0.0
#addin nuget:?package=Cake.Issues.Reporting.Generic&version=5.0.0
#addin nuget:?package=Cake.Issues.Reporting.Sarif&version=5.0.0
#addin nuget:?package=Cake.Issues.Reporting.Console&version=5.0.0
#addin nuget:?package=Cake.Issues.PullRequests&version=5.0.0
#addin nuget:?package=Cake.Issues.PullRequests.AppVeyor&version=5.0.0
#addin nuget:?package=Cake.Issues.PullRequests.AzureDevOps&version=5.0.0
#addin nuget:?package=Cake.Issues.PullRequests.GitHubActions&version=5.0.0
#addin nuget:?package=Cake.Git&version=5.0.1
#addin nuget:?package=Cake.Issues&version=5.0.1
#addin nuget:?package=Cake.Issues.MsBuild&version=5.0.1
#addin nuget:?package=Cake.Issues.InspectCode&version=5.0.1
#addin nuget:?package=Cake.Issues.Markdownlint&version=5.0.1
#addin nuget:?package=Cake.Issues.EsLint&version=5.0.1
#addin nuget:?package=Cake.Issues.Sarif&version=5.0.1
#addin nuget:?package=Cake.Issues.Reporting&version=5.0.1
#addin nuget:?package=Cake.Issues.Reporting.Generic&version=5.0.1
#addin nuget:?package=Cake.Issues.Reporting.Sarif&version=5.0.1
#addin nuget:?package=Cake.Issues.Reporting.Console&version=5.0.1
#addin nuget:?package=Cake.Issues.PullRequests&version=5.0.1
#addin nuget:?package=Cake.Issues.PullRequests.AppVeyor&version=5.0.1
#addin nuget:?package=Cake.Issues.PullRequests.AzureDevOps&version=5.0.1
#addin nuget:?package=Cake.Issues.PullRequests.GitHubActions&version=5.0.1
#addin nuget:?package=Cake.AzureDevOps&version=5.0.0
Loading

0 comments on commit 5b85daa

Please sign in to comment.