Skip to content

Commit 0feebe4

Browse files
marcpopMSFTmarcpopMSFT
authored
Merge branch 'release/9.0.3xx' into internal-merge-9.0.3xx-2025-09-09-1126
2 parents b3e9785 + 7be4fcf commit 0feebe4

File tree

10 files changed

+40
-31
lines changed

10 files changed

+40
-31
lines changed

‎eng/Version.Details.xml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -417,9 +417,9 @@
417417
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
418418
</Dependency>
419419
<!-- Intermediate is necessary for source build. -->
420-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="9.0.0-alpha.1.24511.3">
420+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="9.0.0-alpha.1.25462.1">
421421
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
422-
<Sha>c43ee853e96528e2f2eb0f6d8c151ddc07b6a844</Sha>
422+
<Sha>c0c87c3c3c8a5bf00101b729dc27f34bc7f0ce73</Sha>
423423
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
424424
</Dependency>
425425
<Dependency Name="Microsoft.Deployment.DotNet.Releases" Version="2.0.0-rtm.1.25059.4">
@@ -555,34 +555,34 @@
555555
</Dependency>
556556
</ProductDependencies>
557557
<ToolsetDependencies>
558-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25460.1">
558+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25462.4">
559559
<Uri>https://github.com/dotnet/arcade</Uri>
560-
<Sha>43df065432cbc74c0fa44d7569a0c31f64883f03</Sha>
560+
<Sha>e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92</Sha>
561561
</Dependency>
562-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25460.1">
562+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25462.4">
563563
<Uri>https://github.com/dotnet/arcade</Uri>
564-
<Sha>43df065432cbc74c0fa44d7569a0c31f64883f03</Sha>
564+
<Sha>e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92</Sha>
565565
</Dependency>
566-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25460.1">
566+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25462.4">
567567
<Uri>https://github.com/dotnet/arcade</Uri>
568-
<Sha>43df065432cbc74c0fa44d7569a0c31f64883f03</Sha>
568+
<Sha>e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92</Sha>
569569
</Dependency>
570-
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.25460.1">
570+
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.25462.4">
571571
<Uri>https://github.com/dotnet/arcade</Uri>
572-
<Sha>43df065432cbc74c0fa44d7569a0c31f64883f03</Sha>
572+
<Sha>e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92</Sha>
573573
</Dependency>
574-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25460.1">
574+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25462.4">
575575
<Uri>https://github.com/dotnet/arcade</Uri>
576-
<Sha>43df065432cbc74c0fa44d7569a0c31f64883f03</Sha>
576+
<Sha>e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92</Sha>
577577
</Dependency>
578-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25460.1">
578+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25462.4">
579579
<Uri>https://github.com/dotnet/arcade</Uri>
580-
<Sha>43df065432cbc74c0fa44d7569a0c31f64883f03</Sha>
580+
<Sha>e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92</Sha>
581581
</Dependency>
582582
<!-- Intermediate is necessary for source build. -->
583-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25460.1">
583+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25462.4">
584584
<Uri>https://github.com/dotnet/arcade</Uri>
585-
<Sha>43df065432cbc74c0fa44d7569a0c31f64883f03</Sha>
585+
<Sha>e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92</Sha>
586586
<SourceBuild RepoName="arcade" ManagedOnly="true" />
587587
</Dependency>
588588
<Dependency Name="System.Reflection.MetadataLoadContext" Version="9.0.9">

‎eng/Versions.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -272,10 +272,10 @@
272272
</PropertyGroup>
273273
<PropertyGroup>
274274
<!-- Dependencies from https://github.com/dotnet/arcade -->
275-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.25460.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
276-
<MicrosoftDotNetSignToolVersion>9.0.0-beta.25460.1</MicrosoftDotNetSignToolVersion>
277-
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.25460.1</MicrosoftDotNetXliffTasksVersion>
278-
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25460.1</MicrosoftDotNetXUnitExtensionsVersion>
275+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.25462.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
276+
<MicrosoftDotNetSignToolVersion>9.0.0-beta.25462.4</MicrosoftDotNetSignToolVersion>
277+
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.25462.4</MicrosoftDotNetXliffTasksVersion>
278+
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25462.4</MicrosoftDotNetXUnitExtensionsVersion>
279279
</PropertyGroup>
280280
<PropertyGroup>
281281
<!-- Dependencies from https://github.com/dotnet/sourcelink -->

‎eng/common/core-templates/job/publish-build-assets.yml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ parameters:
3434

3535
repositoryAlias: self
3636

37+
officialBuildId: ''
38+
3739
jobs:
3840
- job: Asset_Registry_Publish
3941

@@ -56,6 +58,11 @@ jobs:
5658
value: false
5759
# unconditional - needed for logs publishing (redactor tool version)
5860
- template: /eng/common/core-templates/post-build/common-variables.yml
61+
- name: OfficialBuildId
62+
${{ if ne(parameters.officialBuildId, '') }}:
63+
value: ${{ parameters.officialBuildId }}
64+
${{ else }}:
65+
value: $(Build.BuildNumber)
5966

6067
pool:
6168
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
@@ -100,7 +107,7 @@ jobs:
100107
/p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests'
101108
/p:MaestroApiEndpoint=https://maestro.dot.net
102109
/p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }}
103-
/p:OfficialBuildId=$(Build.BuildNumber)
110+
/p:OfficialBuildId=$(OfficialBuildId)
104111
condition: ${{ parameters.condition }}
105112
continueOnError: ${{ parameters.continueOnError }}
106113

‎eng/common/core-templates/jobs/jobs.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ parameters:
4444
artifacts: {}
4545
is1ESPipeline: ''
4646
repositoryAlias: self
47+
officialBuildId: ''
4748

4849
# Internal resources (telemetry, microbuild) can only be accessed from non-public projects,
4950
# and some (Microbuild) should only be applied to non-PR cases for internal builds.
@@ -119,3 +120,4 @@ jobs:
119120
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
120121
signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }}
121122
repositoryAlias: ${{ parameters.repositoryAlias }}
123+
officialBuildId: ${{ parameters.officialBuildId }}

‎eng/install-scancode.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set -euo pipefail
55
# Install instructions: https://scancode-toolkit.readthedocs.io/en/latest/getting-started/install.html#installation-as-a-library-via-pip
66

77
# See latest release at https://github.com/nexB/scancode-toolkit/releases
8-
SCANCODE_VERSION="32.4.0"
8+
SCANCODE_VERSION="32.4.1"
99

1010
pyEnvPath="/tmp/scancode-env"
1111
python3 -m venv $pyEnvPath

‎global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
"cmake": "latest"
1818
},
1919
"msbuild-sdks": {
20-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25460.1",
21-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25460.1",
20+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25462.4",
21+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25462.4",
2222
"Microsoft.Build.NoTargets": "3.7.0",
2323
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1"
2424
}

‎src/SourceBuild/content/eng/Version.Details.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<ProductDependencies>
33
</ProductDependencies>
44
<ToolsetDependencies>
5-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25325.4">
5+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25415.3">
66
<Uri>https://github.com/dotnet/arcade</Uri>
7-
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
7+
<Sha>d87d66c43d0660e5c8e84e667c5c8a8140bce888</Sha>
88
</Dependency>
99
</ToolsetDependencies>
1010
</Dependencies>

‎src/SourceBuild/content/eng/Versions.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
of a .NET major or minor release, prebuilts may be needed. When the release is mature, prebuilts
2424
are not necessary, and this property is removed from the file.
2525
-->
26-
<PrivateSourceBuiltSdkVersion>9.0.109</PrivateSourceBuiltSdkVersion>
27-
<PrivateSourceBuiltArtifactsVersion>9.0.109-servicing.25368.1</PrivateSourceBuiltArtifactsVersion>
26+
<PrivateSourceBuiltSdkVersion>9.0.110</PrivateSourceBuiltSdkVersion>
27+
<PrivateSourceBuiltArtifactsVersion>9.0.110-servicing.25421.1</PrivateSourceBuiltArtifactsVersion>
2828
<!-- command-line-api dependencies -->
2929
<SystemCommandLineVersion>2.0.0-beta4.24126.1</SystemCommandLineVersion>
3030
<!-- msbuild dependencies -->

‎src/SourceBuild/content/global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"tools": {
3-
"dotnet": "9.0.109"
3+
"dotnet": "9.0.110"
44
},
55
"msbuild-sdks": {
66
"Microsoft.Build.NoTargets": "3.7.0",
77
"Microsoft.Build.Traversal": "3.4.0",
8-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25325.4"
8+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25415.3"
99
}
1010
}

‎test/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselineFactory.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ 4 when IsFramework(segments[4]) => "${Tfm}",
391391

392392
return file;
393393

394-
bool IsFramework(string segment)
394+
static bool IsFramework(string segment)
395395
{
396396
try
397397
{

0 commit comments

Comments
 (0)