Skip to content

Commit 4f1bc49

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Update dependencies from dotnet/arcade (#11399)
[main] Update dependencies from dotnet/arcade - revert changes
1 parent a99edf1 commit 4f1bc49

File tree

6 files changed

+32
-23
lines changed

6 files changed

+32
-23
lines changed

‎eng/Version.Details.xml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -159,33 +159,33 @@
159159
</Dependency>
160160
</ProductDependencies>
161161
<ToolsetDependencies>
162-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25457.1">
162+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25462.2">
163163
<Uri>https://github.com/dotnet/arcade</Uri>
164-
<Sha>d7585e79b1397fe8783ac30c81bf5be4d250bcb1</Sha>
164+
<Sha>c32cd132a730a7b9f947498b2ae75dbdc6785456</Sha>
165165
</Dependency>
166-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="11.0.0-beta.25457.1">
166+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="11.0.0-beta.25462.2">
167167
<Uri>https://github.com/dotnet/arcade</Uri>
168-
<Sha>d7585e79b1397fe8783ac30c81bf5be4d250bcb1</Sha>
168+
<Sha>c32cd132a730a7b9f947498b2ae75dbdc6785456</Sha>
169169
</Dependency>
170-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25457.1">
170+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25462.2">
171171
<Uri>https://github.com/dotnet/arcade</Uri>
172-
<Sha>d7585e79b1397fe8783ac30c81bf5be4d250bcb1</Sha>
172+
<Sha>c32cd132a730a7b9f947498b2ae75dbdc6785456</Sha>
173173
</Dependency>
174-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="11.0.0-beta.25457.1">
174+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="11.0.0-beta.25462.2">
175175
<Uri>https://github.com/dotnet/arcade</Uri>
176-
<Sha>d7585e79b1397fe8783ac30c81bf5be4d250bcb1</Sha>
176+
<Sha>c32cd132a730a7b9f947498b2ae75dbdc6785456</Sha>
177177
</Dependency>
178-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="11.0.0-beta.25457.1">
178+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="11.0.0-beta.25462.2">
179179
<Uri>https://github.com/dotnet/arcade</Uri>
180-
<Sha>d7585e79b1397fe8783ac30c81bf5be4d250bcb1</Sha>
180+
<Sha>c32cd132a730a7b9f947498b2ae75dbdc6785456</Sha>
181181
</Dependency>
182-
<Dependency Name="Microsoft.DotNet.XUnitV3Extensions" Version="11.0.0-beta.25457.1">
182+
<Dependency Name="Microsoft.DotNet.XUnitV3Extensions" Version="11.0.0-beta.25462.2">
183183
<Uri>https://github.com/dotnet/arcade</Uri>
184-
<Sha>d7585e79b1397fe8783ac30c81bf5be4d250bcb1</Sha>
184+
<Sha>c32cd132a730a7b9f947498b2ae75dbdc6785456</Sha>
185185
</Dependency>
186-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="11.0.0-beta.25457.1">
186+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="11.0.0-beta.25462.2">
187187
<Uri>https://github.com/dotnet/arcade</Uri>
188-
<Sha>d7585e79b1397fe8783ac30c81bf5be4d250bcb1</Sha>
188+
<Sha>c32cd132a730a7b9f947498b2ae75dbdc6785456</Sha>
189189
</Dependency>
190190
</ToolsetDependencies>
191191
</Dependencies>

‎eng/Versions.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@
3737
<MicrosoftDeveloperControlPlanewindowsamd64Version>0.17.1</MicrosoftDeveloperControlPlanewindowsamd64Version>
3838
<MicrosoftDeveloperControlPlanewindowsarm64Version>0.17.1</MicrosoftDeveloperControlPlanewindowsarm64Version>
3939
<!-- Other -->
40-
<MicrosoftDotNetRemoteExecutorVersion>11.0.0-beta.25457.1</MicrosoftDotNetRemoteExecutorVersion>
41-
<MicrosoftDotNetXUnitV3ExtensionsVersion>11.0.0-beta.25457.1</MicrosoftDotNetXUnitV3ExtensionsVersion>
42-
<MicrosoftDotNetBuildTasksArchivesVersion>11.0.0-beta.25457.1</MicrosoftDotNetBuildTasksArchivesVersion>
40+
<MicrosoftDotNetRemoteExecutorVersion>11.0.0-beta.25462.2</MicrosoftDotNetRemoteExecutorVersion>
41+
<MicrosoftDotNetXUnitV3ExtensionsVersion>11.0.0-beta.25462.2</MicrosoftDotNetXUnitV3ExtensionsVersion>
42+
<MicrosoftDotNetBuildTasksArchivesVersion>11.0.0-beta.25462.2</MicrosoftDotNetBuildTasksArchivesVersion>
4343
<!-- dotnet/extensions -->
4444
<MicrosoftExtensionsAIVersion>9.9.0</MicrosoftExtensionsAIVersion>
4545
<MicrosoftExtensionsAIPreviewVersion>9.9.0-preview.1.25458.4</MicrosoftExtensionsAIPreviewVersion>

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

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

4141
repositoryAlias: self
4242

43+
officialBuildId: ''
44+
4345
jobs:
4446
- job: Asset_Registry_Publish
4547

@@ -62,6 +64,11 @@ jobs:
6264
value: false
6365
# unconditional - needed for logs publishing (redactor tool version)
6466
- template: /eng/common/core-templates/post-build/common-variables.yml
67+
- name: OfficialBuildId
68+
${{ if ne(parameters.officialBuildId, '') }}:
69+
value: ${{ parameters.officialBuildId }}
70+
${{ else }}:
71+
value: $(Build.BuildNumber)
6572

6673
pool:
6774
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
@@ -124,7 +131,7 @@ jobs:
124131
/p:ManifestsPath='$(Build.StagingDirectory)/AssetManifests'
125132
/p:IsAssetlessBuild=${{ parameters.isAssetlessBuild }}
126133
/p:MaestroApiEndpoint=https://maestro.dot.net
127-
/p:OfficialBuildId=$(Build.BuildNumber)
134+
/p:OfficialBuildId=$(OfficialBuildId)
128135
condition: ${{ parameters.condition }}
129136
continueOnError: ${{ parameters.continueOnError }}
130137

‎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.
@@ -116,3 +117,4 @@ jobs:
116117
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
117118
signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }}
118119
repositoryAlias: ${{ parameters.repositoryAlias }}
120+
officialBuildId: ${{ parameters.officialBuildId }}

‎eng/common/core-templates/steps/source-index-stage1-publish.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
parameters:
2-
sourceIndexUploadPackageVersion: 2.0.0-20250818.1
3-
sourceIndexProcessBinlogPackageVersion: 1.0.1-20250818.1
2+
sourceIndexUploadPackageVersion: 2.0.0-20250906.1
3+
sourceIndexProcessBinlogPackageVersion: 1.0.1-20250906.1
44
sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
55
binlogPath: artifacts/log/Debug/Build.binlog
66

‎global.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
"msbuild-sdks": {
3434
"Microsoft.Build.NoTargets": "3.7.0",
3535
"Microsoft.Build.Traversal": "3.2.0",
36-
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25457.1",
37-
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25457.1",
38-
"Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.25457.1"
36+
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25462.2",
37+
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25462.2",
38+
"Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.25462.2"
3939
}
4040
}

0 commit comments

Comments
 (0)