Skip to content

Commit 5b85daa

Browse files
pascalbergerpascalberger
committed
Merge branch 'release/5.0.1'
2 parents 8254720 + f45269c commit 5b85daa

File tree

100 files changed

+2695
-446
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+2695
-446
lines changed

‎.appveyor.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ install:
1212
- ps: Invoke-WebRequest -Uri "https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.ps1" -OutFile "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1"
1313
- ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version 5.0.408 -InstallDir $env:DOTNET_INSTALL_DIR'
1414
- ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version 8.0.404 -InstallDir $env:DOTNET_INSTALL_DIR'
15-
- ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version 9.0.100 -InstallDir $env:DOTNET_INSTALL_DIR'
15+
- ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version 9.0.101 -InstallDir $env:DOTNET_INSTALL_DIR'
1616
- ps: $env:Path = "$env:DOTNET_INSTALL_DIR;$env:Path"
1717
- ps: dotnet --info
1818
- ps: Install-Product node 20
@@ -23,7 +23,7 @@ build_script:
2323

2424
# Tests
2525
test_script:
26-
- ps: cd .\tests\script-runner\
26+
- ps: cd .\tests\script-runner\net8.0-git-cli\
2727
- ps: .\build.ps1 --verbosity=diagnostic
2828

2929
#---------------------------------#

‎.azuredevops/pipelines/templates/jobs/test-frosting.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
parameters:
2+
- name: images
3+
type: object
4+
- name: dotNetVersions
5+
type: object
6+
- name: repositoryInfoProviders
7+
type: object
8+
9+
jobs:
10+
- ${{ each image in parameters.images }}:
11+
- ${{ each dotnetVersion in parameters.dotNetVersions }}:
12+
- ${{ each repositoryInfoProvider in parameters.repositoryInfoProviders }}:
13+
- job: Test_Frosting_${{ replace(replace(image,'-','_'),'.','_') }}_Net${{ dotNetVersion }}_${{ replace(repositoryInfoProvider,'-','_') }}
14+
displayName: Integration Tests Frosting ${{ image }} (.NET ${{ dotNetVersion }} / ${{ repositoryInfoProvider }})
15+
dependsOn: Build
16+
pool:
17+
vmImage: '${{ image }}'
18+
steps:
19+
- template: ../steps/prepare-test.yml
20+
parameters:
21+
dotNetVersion: ${{ dotNetVersion }}
22+
- bash: |
23+
./build.sh --verbosity=diagnostic
24+
workingDirectory: ./tests/frosting/net${{ dotNetVersion }}.0-${{ repositoryInfoProvider }}
25+
displayName: 'Run integration tests'
26+
- publish: $(Build.SourcesDirectory)/tests/frosting/net${{ dotNetVersion }}.0-${{ repositoryInfoProvider }}/build/BuildArtifacts/output
27+
artifact: Integration Tests Frosting ${{ image }} (.NET ${{ dotNetVersion }} + ${{ repositoryInfoProvider }})
28+
displayName: 'Publish generated reports as build artifact'

‎.azuredevops/pipelines/templates/jobs/test-scripting.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
parameters:
2+
- name: images
3+
type: object
4+
- name: dotNetVersions
5+
type: object
6+
- name: repositoryInfoProviders
7+
type: object
8+
9+
jobs:
10+
- ${{ each image in parameters.images }}:
11+
- ${{ each dotnetVersion in parameters.dotNetVersions }}:
12+
- ${{ each repositoryInfoProvider in parameters.repositoryInfoProviders }}:
13+
- job: Test_Script_Runner_${{ replace(replace(image,'-','_'),'.','_') }}_Net${{ dotNetVersion }}_${{ replace(repositoryInfoProvider,'-','_') }}
14+
displayName: Integration Tests Script Runner ${{ image }} (.NET ${{ dotNetVersion }} / ${{ repositoryInfoProvider }})
15+
dependsOn: Build
16+
pool:
17+
vmImage: '${{ image }}'
18+
steps:
19+
- template: ../steps/prepare-test.yml
20+
parameters:
21+
dotNetVersion: ${{ dotNetVersion }}
22+
- bash: |
23+
./build.sh --verbosity=diagnostic
24+
workingDirectory: ./tests/script-runner/net${{ dotNetVersion }}.0-${{ repositoryInfoProvider }}
25+
displayName: 'Run integration tests'
26+
- publish: $(Build.SourcesDirectory)/tests/script-runner/net${{ dotNetVersion }}.0-${{ repositoryInfoProvider }}/BuildArtifacts/output
27+
artifact: Integration Tests Script Runner ${{ image }} (.NET ${{ dotNetVersion }} + ${{ repositoryInfoProvider }})
28+
displayName: 'Publish generated reports as build artifact'

‎.azuredevops/pipelines/templates/steps/prepare-test.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
parameters:
2+
- name: dotNetVersion
3+
type: string
4+
5+
steps:
6+
- task: UseDotNet@2
7+
inputs:
8+
version: '${{ parameters.dotNetVersion }}.x'
9+
displayName: 'Install .NET ${{ parameters.dotNetVersion }}'
10+
- task: NodeTool@0
11+
inputs:
12+
versionSpec: '20.x'
13+
displayName: 'Install NodeJs 20.x'
14+
- script: |
15+
npm install -g markdownlint-cli
16+
displayName: 'Install required tools'
17+
- download: current
18+
artifact: NuGet Package
19+
displayName: 'Download build artifact'
20+
- task: CopyFiles@2
21+
inputs:
22+
sourceFolder: $(Pipeline.Workspace)/NuGet Package
23+
targetFolder: $(Build.SourcesDirectory)/BuildArtifacts/Packages/NuGet
24+
displayName: 'Copy build artifact for test run'

‎.github/workflows/build.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ jobs:
2222
run: .\build.ps1
2323
shell: powershell
2424
- name: Publish NuGet package as build artifact
25-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4
25+
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4
2626
with:
2727
name: NuGet Package
2828
path: ./BuildArtifacts/Packages/NuGet/
29-
# Integration Tests Script Runner Windows (.NET tool)
29+
# Integration Tests Script Runner Windows 2019 (.NET 8)
3030
Test_Windows_DotNetTool:
3131
name: Integration Tests Script Runner Windows (.NET tool)
3232
needs: Build
@@ -49,10 +49,10 @@ jobs:
4949
8.x
5050
- name: Run integration tests
5151
run: ./build.ps1 --verbosity=diagnostic
52-
working-directory: ./tests/script-runner/
52+
working-directory: ./tests/script-runner/net8.0-git-cli/
5353
shell: powershell
5454
- name: Publish generated reports as build artifact
55-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4
55+
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4
5656
with:
5757
name: Integration Tests Script Runner Windows (.NET tool)
58-
path: ./tests/script-runner/BuildArtifacts/output/
58+
path: ./tests/script-runner/net8.0/BuildArtifacts/output/

‎Cake.Frosting.Issues.Recipe/Cake.Frosting.Issues.Recipe.Tests/Cake.Frosting.Issues.Recipe.Tests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
<ItemGroup>
2020
<PackageReference Include="Cake.Frosting" Version="5.0.0" />
21-
<PackageReference Include="Cake.Issues.Testing" Version="5.0.0" />
21+
<PackageReference Include="Cake.Issues.Testing" Version="5.0.1" />
2222
<PackageReference Include="Cake.Testing" Version="5.0.0" />
2323
<PackageReference Include="Cake.Testing.Xunit" Version="5.0.0" />
2424
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0">
@@ -27,7 +27,7 @@
2727
</PackageReference>
2828
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
2929
<PackageReference Include="xunit" Version="2.9.2" />
30-
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
30+
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.0">
3131
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
3232
<PrivateAssets>all</PrivateAssets>
3333
</PackageReference>

‎Cake.Frosting.Issues.Recipe/Cake.Frosting.Issues.Recipe/Cake.Frosting.Issues.Recipe.csproj

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ For recipe compatible with Cake Script Runners see Cake.Issues.Recipe.</Descript
2525
<PackageLicenseExpression>MIT</PackageLicenseExpression>
2626
<RepositoryType>git</RepositoryType>
2727
<RepositoryUrl>https://github.com/cake-contrib/Cake.Issues.Recipe.git</RepositoryUrl>
28-
<PackageReleaseNotes>https://github.com/cake-contrib/Cake.Issues.Recipe/releases/tag/5.0.0-beta.1</PackageReleaseNotes>
28+
<PackageReleaseNotes>https://github.com/cake-contrib/Cake.Issues.Recipe/releases/tag/5.0.1</PackageReleaseNotes>
2929
</PropertyGroup>
3030

3131
<ItemGroup>
@@ -41,21 +41,21 @@ For recipe compatible with Cake Script Runners see Cake.Issues.Recipe.</Descript
4141
<ItemGroup>
4242
<PackageReference Include="Cake.AzureDevOps" Version="5.0.0" />
4343
<PackageReference Include="Cake.Frosting" Version="5.0.0" PrivateAssets="All" />
44-
<PackageReference Include="Cake.Frosting.Git" Version="5.0.0" />
45-
<PackageReference Include="Cake.Issues" Version="5.0.0" />
46-
<PackageReference Include="Cake.Frosting.Issues.EsLint" Version="5.0.0" />
47-
<PackageReference Include="Cake.Frosting.Issues.InspectCode" Version="5.0.0" />
48-
<PackageReference Include="Cake.Frosting.Issues.Markdownlint" Version="5.0.0" />
49-
<PackageReference Include="Cake.Frosting.Issues.MsBuild" Version="5.0.0" />
50-
<PackageReference Include="Cake.Frosting.Issues.Sarif" Version="5.0.0" />
51-
<PackageReference Include="Cake.Frosting.Issues.PullRequests" Version="5.0.0" />
52-
<PackageReference Include="Cake.Frosting.Issues.PullRequests.AppVeyor" Version="5.0.0" />
53-
<PackageReference Include="Cake.Frosting.Issues.PullRequests.AzureDevOps" Version="5.0.0" />
54-
<PackageReference Include="Cake.Frosting.Issues.PullRequests.GitHubActions" Version="5.0.0" />
55-
<PackageReference Include="Cake.Frosting.Issues.Reporting" Version="5.0.0" />
56-
<PackageReference Include="Cake.Frosting.Issues.Reporting.Sarif" Version="5.0.0" />
57-
<PackageReference Include="Cake.Frosting.Issues.Reporting.Generic" Version="5.0.0" />
58-
<PackageReference Include="Cake.Frosting.Issues.Reporting.Console" Version="5.0.0" />
44+
<PackageReference Include="Cake.Frosting.Git" Version="5.0.1" />
45+
<PackageReference Include="Cake.Issues" Version="5.0.1" />
46+
<PackageReference Include="Cake.Frosting.Issues.EsLint" Version="5.0.1" />
47+
<PackageReference Include="Cake.Frosting.Issues.InspectCode" Version="5.0.1" />
48+
<PackageReference Include="Cake.Frosting.Issues.Markdownlint" Version="5.0.1" />
49+
<PackageReference Include="Cake.Frosting.Issues.MsBuild" Version="5.0.1" />
50+
<PackageReference Include="Cake.Frosting.Issues.Sarif" Version="5.0.1" />
51+
<PackageReference Include="Cake.Frosting.Issues.PullRequests" Version="5.0.1" />
52+
<PackageReference Include="Cake.Frosting.Issues.PullRequests.AppVeyor" Version="5.0.1" />
53+
<PackageReference Include="Cake.Frosting.Issues.PullRequests.AzureDevOps" Version="5.0.1" />
54+
<PackageReference Include="Cake.Frosting.Issues.PullRequests.GitHubActions" Version="5.0.1" />
55+
<PackageReference Include="Cake.Frosting.Issues.Reporting" Version="5.0.1" />
56+
<PackageReference Include="Cake.Frosting.Issues.Reporting.Sarif" Version="5.0.1" />
57+
<PackageReference Include="Cake.Frosting.Issues.Reporting.Generic" Version="5.0.1" />
58+
<PackageReference Include="Cake.Frosting.Issues.Reporting.Console" Version="5.0.1" />
5959
</ItemGroup>
6060

6161
</Project>

‎Cake.Frosting.Issues.Recipe/global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"sdk": {
33
"allowPrerelease": true,
4-
"version": "9.0.100",
4+
"version": "9.0.101",
55
"rollForward": "latestFeature"
66
}
77
}

‎Cake.Issues.Recipe/Content/addins.cake

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22
// ADDINS
33
///////////////////////////////////////////////////////////////////////////////
44

5-
#addin nuget:?package=Cake.Git&version=5.0.0
6-
#addin nuget:?package=Cake.Issues&version=5.0.0
7-
#addin nuget:?package=Cake.Issues.MsBuild&version=5.0.0
8-
#addin nuget:?package=Cake.Issues.InspectCode&version=5.0.0
9-
#addin nuget:?package=Cake.Issues.Markdownlint&version=5.0.0
10-
#addin nuget:?package=Cake.Issues.EsLint&version=5.0.0
11-
#addin nuget:?package=Cake.Issues.Sarif&version=5.0.0
12-
#addin nuget:?package=Cake.Issues.Reporting&version=5.0.0
13-
#addin nuget:?package=Cake.Issues.Reporting.Generic&version=5.0.0
14-
#addin nuget:?package=Cake.Issues.Reporting.Sarif&version=5.0.0
15-
#addin nuget:?package=Cake.Issues.Reporting.Console&version=5.0.0
16-
#addin nuget:?package=Cake.Issues.PullRequests&version=5.0.0
17-
#addin nuget:?package=Cake.Issues.PullRequests.AppVeyor&version=5.0.0
18-
#addin nuget:?package=Cake.Issues.PullRequests.AzureDevOps&version=5.0.0
19-
#addin nuget:?package=Cake.Issues.PullRequests.GitHubActions&version=5.0.0
5+
#addin nuget:?package=Cake.Git&version=5.0.1
6+
#addin nuget:?package=Cake.Issues&version=5.0.1
7+
#addin nuget:?package=Cake.Issues.MsBuild&version=5.0.1
8+
#addin nuget:?package=Cake.Issues.InspectCode&version=5.0.1
9+
#addin nuget:?package=Cake.Issues.Markdownlint&version=5.0.1
10+
#addin nuget:?package=Cake.Issues.EsLint&version=5.0.1
11+
#addin nuget:?package=Cake.Issues.Sarif&version=5.0.1
12+
#addin nuget:?package=Cake.Issues.Reporting&version=5.0.1
13+
#addin nuget:?package=Cake.Issues.Reporting.Generic&version=5.0.1
14+
#addin nuget:?package=Cake.Issues.Reporting.Sarif&version=5.0.1
15+
#addin nuget:?package=Cake.Issues.Reporting.Console&version=5.0.1
16+
#addin nuget:?package=Cake.Issues.PullRequests&version=5.0.1
17+
#addin nuget:?package=Cake.Issues.PullRequests.AppVeyor&version=5.0.1
18+
#addin nuget:?package=Cake.Issues.PullRequests.AzureDevOps&version=5.0.1
19+
#addin nuget:?package=Cake.Issues.PullRequests.GitHubActions&version=5.0.1
2020
#addin nuget:?package=Cake.AzureDevOps&version=5.0.0

0 commit comments

Comments
 (0)