Skip to content

Commit 2fdad83

Browse files
authored
[release/8.0.4xx] Update dependencies from dotnet/arcade (#20607)
2 parents d312eec + b9f8174 commit 2fdad83

File tree

7 files changed

+29
-11
lines changed

7 files changed

+29
-11
lines changed

eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -214,18 +214,18 @@
214214
</Dependency>
215215
</ProductDependencies>
216216
<ToolsetDependencies>
217-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25461.1">
217+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25462.6">
218218
<Uri>https://github.com/dotnet/arcade</Uri>
219-
<Sha>958612453c58fd32328461580b19ce5ecf4aedd2</Sha>
219+
<Sha>1df8dfdfc8068e5180687a3079427b120de18eed</Sha>
220220
<SourceBuild RepoName="arcade" ManagedOnly="true" />
221221
</Dependency>
222-
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.25461.1">
222+
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.25462.6">
223223
<Uri>https://github.com/dotnet/arcade</Uri>
224-
<Sha>958612453c58fd32328461580b19ce5ecf4aedd2</Sha>
224+
<Sha>1df8dfdfc8068e5180687a3079427b120de18eed</Sha>
225225
</Dependency>
226-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.25461.1">
226+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.25462.6">
227227
<Uri>https://github.com/dotnet/arcade</Uri>
228-
<Sha>958612453c58fd32328461580b19ce5ecf4aedd2</Sha>
228+
<Sha>1df8dfdfc8068e5180687a3079427b120de18eed</Sha>
229229
</Dependency>
230230
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.24306.1">
231231
<Uri>https://github.com/dotnet/arcade-services</Uri>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
</PropertyGroup>
4040
<PropertyGroup>
4141
<!-- Dependency from https://github.com/dotnet/arcade -->
42-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.25461.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
42+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.25462.6</MicrosoftDotNetBuildTasksInstallersPackageVersion>
4343
</PropertyGroup>
4444
<PropertyGroup>
4545
<!-- Dependency from https://github.com/dotnet/arcade-services -->

eng/common/templates-official/job/publish-build-assets.yml

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

3333
repositoryAlias: self
3434

35+
officialBuildId: ''
36+
3537
jobs:
3638
- job: Asset_Registry_Publish
3739

@@ -52,6 +54,11 @@ jobs:
5254
value: false
5355
- ${{ if eq(parameters.publishAssetsImmediately, 'true') }}:
5456
- template: /eng/common/templates-official/post-build/common-variables.yml
57+
- name: OfficialBuildId
58+
${{ if ne(parameters.officialBuildId, '') }}:
59+
value: ${{ parameters.officialBuildId }}
60+
${{ else }}:
61+
value: $(Build.BuildNumber)
5562

5663
pool:
5764
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
@@ -93,7 +100,7 @@ jobs:
93100
/p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests'
94101
/p:MaestroApiEndpoint=https://maestro.dot.net
95102
/p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }}
96-
/p:OfficialBuildId=$(Build.BuildNumber)
103+
/p:OfficialBuildId=$(OfficialBuildId)
97104
condition: ${{ parameters.condition }}
98105
continueOnError: ${{ parameters.continueOnError }}
99106

eng/common/templates-official/jobs/jobs.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ parameters:
4141
enableSourceIndex: false
4242
sourceIndexParams: {}
4343
repositoryAlias: self
44+
officialBuildId: ''
4445

4546
# Internal resources (telemetry, microbuild) can only be accessed from non-public projects,
4647
# and some (Microbuild) should only be applied to non-PR cases for internal builds.
@@ -97,3 +98,4 @@ jobs:
9798
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
9899
signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }}
99100
repositoryAlias: ${{ parameters.repositoryAlias }}
101+
officialBuildId: ${{ parameters.officialBuildId }}

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

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

3333
repositoryAlias: self
3434

35+
officialBuildId: ''
36+
3537
jobs:
3638
- job: Asset_Registry_Publish
3739

@@ -52,6 +54,11 @@ jobs:
5254
value: false
5355
- ${{ if eq(parameters.publishAssetsImmediately, 'true') }}:
5456
- template: /eng/common/templates/post-build/common-variables.yml
57+
- name: OfficialBuildId
58+
${{ if ne(parameters.officialBuildId, '') }}:
59+
value: ${{ parameters.officialBuildId }}
60+
${{ else }}:
61+
value: $(Build.BuildNumber)
5562

5663
pool:
5764
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
@@ -91,7 +98,7 @@ jobs:
9198
/p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests'
9299
/p:MaestroApiEndpoint=https://maestro.dot.net
93100
/p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }}
94-
/p:OfficialBuildId=$(Build.BuildNumber)
101+
/p:OfficialBuildId=$(OfficialBuildId)
95102
condition: ${{ parameters.condition }}
96103
continueOnError: ${{ parameters.continueOnError }}
97104

eng/common/templates/jobs/jobs.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ parameters:
4141
enableSourceIndex: false
4242
sourceIndexParams: {}
4343
repositoryAlias: self
44+
officialBuildId: ''
4445

4546
# Internal resources (telemetry, microbuild) can only be accessed from non-public projects,
4647
# and some (Microbuild) should only be applied to non-PR cases for internal builds.
@@ -97,3 +98,4 @@ jobs:
9798
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
9899
signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }}
99100
repositoryAlias: ${{ parameters.repositoryAlias }}
101+
officialBuildId: ${{ parameters.officialBuildId }}

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"cmake": "3.21.0"
1212
},
1313
"msbuild-sdks": {
14-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25461.1",
15-
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.25461.1"
14+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25462.6",
15+
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.25462.6"
1616
}
1717
}

0 commit comments

Comments
 (0)