Skip to content

Commit 396eba4

Browse files
dkurepadkurepa
authored
[Production rollout] Rollout 2025-08-12 (#5138)
<!-- Link the GitHub or AzDO issue this pull request is associated with. Please copy and paste the full URL rather than using the dotnet/arcade-services# syntax --> #5137
2 parents f8e47c9 + 5ee9f15 commit 396eba4

30 files changed

Lines changed: 718 additions & 348 deletions

‎eng/Version.Details.props‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ This file should be imported by eng/Versions.props
2121
<MicrosoftDotNetKustoPackageVersion>1.1.0-beta.25215.1</MicrosoftDotNetKustoPackageVersion>
2222
<MicrosoftDotNetServicesUtilityPackageVersion>1.1.0-beta.25215.1</MicrosoftDotNetServicesUtilityPackageVersion>
2323
<!-- dotnet/arcade dependencies -->
24-
<MicrosoftDotNetArcadeSdkPackageVersion>8.0.0-beta.25378.1</MicrosoftDotNetArcadeSdkPackageVersion>
25-
<MicrosoftDotNetBuildTasksFeedPackageVersion>8.0.0-beta.25378.1</MicrosoftDotNetBuildTasksFeedPackageVersion>
26-
<MicrosoftDotNetSignToolPackageVersion>8.0.0-beta.25378.1</MicrosoftDotNetSignToolPackageVersion>
27-
<MicrosoftDotNetSwaggerGeneratorMSBuildPackageVersion>8.0.0-beta.25378.1</MicrosoftDotNetSwaggerGeneratorMSBuildPackageVersion>
28-
<MicrosoftDotNetVersionToolsPackageVersion>8.0.0-beta.25378.1</MicrosoftDotNetVersionToolsPackageVersion>
24+
<MicrosoftDotNetArcadeSdkPackageVersion>8.0.0-beta.25407.1</MicrosoftDotNetArcadeSdkPackageVersion>
25+
<MicrosoftDotNetBuildTasksFeedPackageVersion>8.0.0-beta.25407.1</MicrosoftDotNetBuildTasksFeedPackageVersion>
26+
<MicrosoftDotNetSignToolPackageVersion>8.0.0-beta.25407.1</MicrosoftDotNetSignToolPackageVersion>
27+
<MicrosoftDotNetSwaggerGeneratorMSBuildPackageVersion>8.0.0-beta.25407.1</MicrosoftDotNetSwaggerGeneratorMSBuildPackageVersion>
28+
<MicrosoftDotNetVersionToolsPackageVersion>8.0.0-beta.25407.1</MicrosoftDotNetVersionToolsPackageVersion>
2929
<!-- dotnet/dnceng dependencies -->
3030
<MicrosoftDncEngConfigurationBootstrapPackageVersion>1.1.0-beta.25381.1</MicrosoftDncEngConfigurationBootstrapPackageVersion>
3131
<MicrosoftDncEngSecretManagerPackageVersion>1.1.0-beta.25381.1</MicrosoftDncEngSecretManagerPackageVersion>

‎eng/Version.Details.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,25 +55,25 @@
5555
</Dependency>
5656
</ProductDependencies>
5757
<ToolsetDependencies>
58-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25378.1">
58+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25407.1">
5959
<Uri>https://github.com/dotnet/arcade</Uri>
60-
<Sha>8dca4f8ae100b102230287f8cc1b75264c9f1a6f</Sha>
60+
<Sha>a5ec3fab69ac440afe6764b2e046af6e8fcafa74</Sha>
6161
</Dependency>
62-
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25378.1">
62+
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25407.1">
6363
<Uri>https://github.com/dotnet/arcade</Uri>
64-
<Sha>8dca4f8ae100b102230287f8cc1b75264c9f1a6f</Sha>
64+
<Sha>a5ec3fab69ac440afe6764b2e046af6e8fcafa74</Sha>
6565
</Dependency>
66-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.25378.1">
66+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.25407.1">
6767
<Uri>https://github.com/dotnet/arcade</Uri>
68-
<Sha>8dca4f8ae100b102230287f8cc1b75264c9f1a6f</Sha>
68+
<Sha>a5ec3fab69ac440afe6764b2e046af6e8fcafa74</Sha>
6969
</Dependency>
70-
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="8.0.0-beta.25378.1">
70+
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="8.0.0-beta.25407.1">
7171
<Uri>https://github.com/dotnet/arcade</Uri>
72-
<Sha>8dca4f8ae100b102230287f8cc1b75264c9f1a6f</Sha>
72+
<Sha>a5ec3fab69ac440afe6764b2e046af6e8fcafa74</Sha>
7373
</Dependency>
74-
<Dependency Name="Microsoft.DotNet.VersionTools" Version="8.0.0-beta.25378.1">
74+
<Dependency Name="Microsoft.DotNet.VersionTools" Version="8.0.0-beta.25407.1">
7575
<Uri>https://github.com/dotnet/arcade</Uri>
76-
<Sha>8dca4f8ae100b102230287f8cc1b75264c9f1a6f</Sha>
76+
<Sha>a5ec3fab69ac440afe6764b2e046af6e8fcafa74</Sha>
7777
</Dependency>
7878
<Dependency Name="Microsoft.DncEng.SecretManager" Version="1.1.0-beta.25381.1">
7979
<Uri>https://github.com/dotnet/dnceng</Uri>

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
1515
}
1616
},
1717
"msbuild-sdks": {
18-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25378.1"
18+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25407.1"
1919
}
2020
}

‎src/Maestro/Maestro.MergePolicies/DontAutomergeDowngradesMergePolicy.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,11 @@ private static List<string> GetDowngradeOrInvalidVersionMessages(PullRequestUpda
5353
foreach (var dependency in pr.RequiredUpdates)
5454
{
5555
bool gotValidVersions = true;
56+
// check if the dependency was just added (this can happen in a backflow)
57+
if (dependency.FromVersion == null)
58+
{
59+
continue;
60+
}
5661
if (!SemanticVersion.TryParse(dependency.FromVersion, out var fromVersion))
5762
{
5863
messages.Add($" Could not parse the 'from' version '{dependency.FromVersion}' of {dependency.DependencyName} as a Semantic Version string");

0 commit comments

Comments
 (0)