Skip to content

Commit c4b8507

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Update dependencies from dotnet/arcade, dotnet/dnceng (#5271)
[main] Update dependencies from dotnet/arcade, dotnet/dnceng
1 parent fb23c03 commit c4b8507

8 files changed

Lines changed: 44 additions & 26 deletions

File tree

‎.config/dotnet-tools.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"microsoft.dnceng.secretmanager": {
6-
"version": "1.1.0-beta.25421.1",
6+
"version": "1.1.0-beta.25462.1",
77
"commands": [
88
"secret-manager"
99
]
@@ -15,7 +15,7 @@
1515
]
1616
},
1717
"microsoft.dnceng.configuration.bootstrap": {
18-
"version": "1.1.0-beta.25421.1",
18+
"version": "1.1.0-beta.25462.1",
1919
"commands": [
2020
"bootstrap-dnceng-configuration"
2121
]

‎eng/Version.Details.props‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ This file should be imported by eng/Versions.props
2020
<MicrosoftDotNetKustoPackageVersion>1.1.0-beta.25215.1</MicrosoftDotNetKustoPackageVersion>
2121
<MicrosoftDotNetServicesUtilityPackageVersion>1.1.0-beta.25215.1</MicrosoftDotNetServicesUtilityPackageVersion>
2222
<!-- dotnet/arcade dependencies -->
23-
<MicrosoftDotNetArcadeSdkPackageVersion>8.0.0-beta.25461.1</MicrosoftDotNetArcadeSdkPackageVersion>
24-
<MicrosoftDotNetBuildTasksFeedPackageVersion>8.0.0-beta.25461.1</MicrosoftDotNetBuildTasksFeedPackageVersion>
25-
<MicrosoftDotNetSignToolPackageVersion>8.0.0-beta.25461.1</MicrosoftDotNetSignToolPackageVersion>
26-
<MicrosoftDotNetSwaggerGeneratorMSBuildPackageVersion>8.0.0-beta.25461.1</MicrosoftDotNetSwaggerGeneratorMSBuildPackageVersion>
27-
<MicrosoftDotNetVersionToolsPackageVersion>8.0.0-beta.25461.1</MicrosoftDotNetVersionToolsPackageVersion>
23+
<MicrosoftDotNetArcadeSdkPackageVersion>8.0.0-beta.25462.6</MicrosoftDotNetArcadeSdkPackageVersion>
24+
<MicrosoftDotNetBuildTasksFeedPackageVersion>8.0.0-beta.25462.6</MicrosoftDotNetBuildTasksFeedPackageVersion>
25+
<MicrosoftDotNetSignToolPackageVersion>8.0.0-beta.25462.6</MicrosoftDotNetSignToolPackageVersion>
26+
<MicrosoftDotNetSwaggerGeneratorMSBuildPackageVersion>8.0.0-beta.25462.6</MicrosoftDotNetSwaggerGeneratorMSBuildPackageVersion>
27+
<MicrosoftDotNetVersionToolsPackageVersion>8.0.0-beta.25462.6</MicrosoftDotNetVersionToolsPackageVersion>
2828
<!-- dotnet/dnceng dependencies -->
29-
<MicrosoftDncEngConfigurationBootstrapPackageVersion>1.1.0-beta.25421.1</MicrosoftDncEngConfigurationBootstrapPackageVersion>
30-
<MicrosoftDncEngSecretManagerPackageVersion>1.1.0-beta.25421.1</MicrosoftDncEngSecretManagerPackageVersion>
29+
<MicrosoftDncEngConfigurationBootstrapPackageVersion>1.1.0-beta.25462.1</MicrosoftDncEngConfigurationBootstrapPackageVersion>
30+
<MicrosoftDncEngSecretManagerPackageVersion>1.1.0-beta.25462.1</MicrosoftDncEngSecretManagerPackageVersion>
3131
</PropertyGroup>
3232
<!--Property group for alternate package version names-->
3333
<PropertyGroup>

‎eng/Version.Details.xml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -55,33 +55,33 @@
5555
</Dependency>
5656
</ProductDependencies>
5757
<ToolsetDependencies>
58-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25461.1">
58+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25462.6">
5959
<Uri>https://github.com/dotnet/arcade</Uri>
60-
<Sha>958612453c58fd32328461580b19ce5ecf4aedd2</Sha>
60+
<Sha>1df8dfdfc8068e5180687a3079427b120de18eed</Sha>
6161
</Dependency>
62-
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25461.1">
62+
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25462.6">
6363
<Uri>https://github.com/dotnet/arcade</Uri>
64-
<Sha>958612453c58fd32328461580b19ce5ecf4aedd2</Sha>
64+
<Sha>1df8dfdfc8068e5180687a3079427b120de18eed</Sha>
6565
</Dependency>
66-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.25461.1">
66+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.25462.6">
6767
<Uri>https://github.com/dotnet/arcade</Uri>
68-
<Sha>958612453c58fd32328461580b19ce5ecf4aedd2</Sha>
68+
<Sha>1df8dfdfc8068e5180687a3079427b120de18eed</Sha>
6969
</Dependency>
70-
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="8.0.0-beta.25461.1">
70+
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="8.0.0-beta.25462.6">
7171
<Uri>https://github.com/dotnet/arcade</Uri>
72-
<Sha>958612453c58fd32328461580b19ce5ecf4aedd2</Sha>
72+
<Sha>1df8dfdfc8068e5180687a3079427b120de18eed</Sha>
7373
</Dependency>
74-
<Dependency Name="Microsoft.DotNet.VersionTools" Version="8.0.0-beta.25461.1">
74+
<Dependency Name="Microsoft.DotNet.VersionTools" Version="8.0.0-beta.25462.6">
7575
<Uri>https://github.com/dotnet/arcade</Uri>
76-
<Sha>958612453c58fd32328461580b19ce5ecf4aedd2</Sha>
76+
<Sha>1df8dfdfc8068e5180687a3079427b120de18eed</Sha>
7777
</Dependency>
78-
<Dependency Name="Microsoft.DncEng.SecretManager" Version="1.1.0-beta.25421.1">
78+
<Dependency Name="Microsoft.DncEng.SecretManager" Version="1.1.0-beta.25462.1">
7979
<Uri>https://github.com/dotnet/dnceng</Uri>
80-
<Sha>949759ff23ff663a2c3e105cf504b281fe667d01</Sha>
80+
<Sha>09610d6f7190ad575e85801971d078bdac13c1ed</Sha>
8181
</Dependency>
82-
<Dependency Name="Microsoft.DncEng.Configuration.Bootstrap" Version="1.1.0-beta.25421.1">
82+
<Dependency Name="Microsoft.DncEng.Configuration.Bootstrap" Version="1.1.0-beta.25462.1">
8383
<Uri>https://github.com/dotnet/dnceng</Uri>
84-
<Sha>949759ff23ff663a2c3e105cf504b281fe667d01</Sha>
84+
<Sha>09610d6f7190ad575e85801971d078bdac13c1ed</Sha>
8585
</Dependency>
8686
</ToolsetDependencies>
8787
</Dependencies>

‎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: 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.25461.1"
18+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25462.6"
1919
}
2020
}

0 commit comments

Comments
 (0)