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 Jan 31, 2025
2 parents 5c05534 + 01a20ba commit f945ae0
Show file tree
Hide file tree
Showing 14 changed files with 19 additions and 19 deletions.
4 changes: 2 additions & 2 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ install:
- ps: mkdir $env:DOTNET_INSTALL_DIR -Force | Out-Null
- 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 8.0.405 -InstallDir $env:DOTNET_INSTALL_DIR'
- ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version 9.0.102 -InstallDir $env:DOTNET_INSTALL_DIR'
- ps: $env:Path = "$env:DOTNET_INSTALL_DIR;$env:Path"
- ps: dotnet --info

Expand Down
2 changes: 1 addition & 1 deletion azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
- job: Build_macOS
displayName: Build & Test macOS
pool:
vmImage: 'macOS-12'
vmImage: 'macOS-13'
steps:
# .NET 5 required for GitVersion
- task: UseDotNet@2
Expand Down
2 changes: 1 addition & 1 deletion 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.102",
"rollForward": "latestFeature"
}
}
2 changes: 1 addition & 1 deletion nuspec/nuget/Cake.AzureDevOps.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ For addin compatible with Cake Frosting see Cake.Frosting.AzureDevOps.
<repository type="git" url="https://github.com/cake-contrib/Cake.AzureDevOps.git"/>
<copyright>Copyright © Pascal Berger</copyright>
<tags>cake cake-addin azure-devops azure-devops-server</tags>
<releaseNotes>https://github.com/cake-contrib/Cake.AzureDevOps/releases/tag/5.0.0</releaseNotes>
<releaseNotes>https://github.com/cake-contrib/Cake.AzureDevOps/releases/tag/5.0.1</releaseNotes>
</metadata>
<files>
<file src="..\..\..\..\nuspec\nuget\icon.png" target="" />
Expand Down
2 changes: 1 addition & 1 deletion nuspec/nuget/Cake.Frosting.AzureDevOps.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ For addin compatible with Cake Script Runners see Cake.AzureDevOps.
<repository type="git" url="https://github.com/cake-contrib/Cake.AzureDevOps.git"/>
<copyright>Copyright © Pascal Berger</copyright>
<tags>cake cake-addin azure-devops azure-devops-server</tags>
<releaseNotes>https://github.com/cake-contrib/Cake.AzureDevOps/releases/tag/5.0.0</releaseNotes>
<releaseNotes>https://github.com/cake-contrib/Cake.AzureDevOps/releases/tag/5.0.1</releaseNotes>
<dependencies>
<group targetFramework="net8.0">
<dependency id="Cake.Core" version="5.0" exclude="Build,Analyzers" />
Expand Down
10 changes: 5 additions & 5 deletions src/Cake.AzureDevOps.Tests/Cake.AzureDevOps.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,22 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="Cake.Common" Version="5.0.0" />
<PackageReference Include="Cake.Core" Version="5.0.0" />
<PackageReference Include="Cake.Testing" Version="5.0.0" />
<PackageReference Include="Microsoft.TeamFoundationServer.Client" Version="19.225.1" />
<PackageReference Include="Moq" Version="4.18.4" />
<PackageReference Include="Shouldly" Version="4.2.1" />
<PackageReference Include="Shouldly" Version="4.3.0" />
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.1" />
<!--Transitive dependencies specified to fix security vulnerabilities-->
<PackageReference Include="System.Data.SqlClient" Version="4.9.0" />
<PackageReference Include="System.Formats.Asn1" Version="9.0.0" />
<PackageReference Include="System.Formats.Asn1" Version="9.0.1" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.2.1" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ protected override Mock<GitHttpClient> Setup(Mock<GitHttpClient> m)
It.IsAny<string>(),
It.IsAny<Guid>(),
true,
null,
int.MaxValue,
null,
It.IsAny<GitBaseVersionDescriptor>(),
It.IsAny<GitTargetVersionDescriptor>(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ protected override Mock<GitHttpClient> Setup(Mock<GitHttpClient> m)
m.Setup(arg => arg.CreatePullRequestStatusAsync(It.IsAny<GitPullRequestStatus>(), It.IsAny<Guid>(), It.IsAny<int>(), It.IsAny<object>(), It.IsAny<CancellationToken>()))
.ReturnsAsync(() => null);

m.Setup(arg => arg.GetCommitDiffsAsync(It.IsAny<string>(), It.IsAny<Guid>(), true, null, null, It.IsAny<GitBaseVersionDescriptor>(), It.IsAny<GitTargetVersionDescriptor>(), null, CancellationToken.None))
m.Setup(arg => arg.GetCommitDiffsAsync(It.IsAny<string>(), It.IsAny<Guid>(), true, int.MaxValue, null, It.IsAny<GitBaseVersionDescriptor>(), It.IsAny<GitTargetVersionDescriptor>(), null, CancellationToken.None))
.ReturnsAsync(() => new GitCommitDiffs { ChangeCounts = [], Changes = [] });

m.Setup(arg => arg.UpdateThreadAsync(It.IsAny<GitPullRequestCommentThread>(), It.IsAny<Guid>(), It.IsAny<int>(), It.IsAny<int>(), null, CancellationToken.None))
Expand Down
2 changes: 1 addition & 1 deletion src/Cake.AzureDevOps/Cake.AzureDevOps.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<!--Transitive dependencies specified to fix security vulnerabilities-->
<PackageReference Include="Microsoft.Identity.Client" Version="4.66.2" />
<PackageReference Include="System.Data.SqlClient" Version="4.9.0" />
<PackageReference Include="System.Formats.Asn1" Version="9.0.0" />
<PackageReference Include="System.Formats.Asn1" Version="9.0.1" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.2.1" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@ public IEnumerable<FilePath> GetModifiedFiles()
this.ProjectName,
this.RepositoryId,
true, // bool? diffCommonCommit
null, // int? top
int.MaxValue, // int? top
null, // int? skip
baseVersionDescriptor,
targetVersionDescriptor)
Expand Down
2 changes: 1 addition & 1 deletion tests/frosting/net8.0/global.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"sdk": {
"allowPrerelease": true,
"version": "8.0.404",
"version": "8.0.405",
"rollForward": "latestFeature"
}
}
2 changes: 1 addition & 1 deletion tests/frosting/net9.0/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.102",
"rollForward": "latestFeature"
}
}
2 changes: 1 addition & 1 deletion tests/script-runner/net8.0/global.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"sdk": {
"allowPrerelease": true,
"version": "8.0.404",
"version": "8.0.405",
"rollForward": "latestFeature"
}
}
2 changes: 1 addition & 1 deletion tests/script-runner/net9.0/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.102",
"rollForward": "latestFeature"
}
}

0 comments on commit f945ae0

Please sign in to comment.