Skip to content

Commit cc18665

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[release/8.0] Update dependencies from dotnet/arcade (#5282)
[release/8.0] Update dependencies from dotnet/arcade
1 parent 27af1b9 commit cc18665

File tree

8 files changed

+38
-40
lines changed

8 files changed

+38
-40
lines changed

‎NuGet.config‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,8 @@
99
<clear />
1010
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
1111
<!-- Begin: Package sources from dotnet-runtime -->
12-
<add key="darc-int-dotnet-runtime-574100b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-574100b6/nuget/v3/index.json" />
13-
<add key="darc-int-dotnet-runtime-574100b-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-574100b6-4/nuget/v3/index.json" />
14-
<add key="darc-int-dotnet-runtime-574100b-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-574100b6-3/nuget/v3/index.json" />
15-
<add key="darc-int-dotnet-runtime-574100b-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-574100b6-2/nuget/v3/index.json" />
16-
<add key="darc-int-dotnet-runtime-574100b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-574100b6-1/nuget/v3/index.json" />
1712
<!-- End: Package sources from dotnet-runtime -->
1813
<!-- Begin: Package sources from dotnet-winforms -->
19-
<add key="darc-int-dotnet-winforms-8dbcd44" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-8dbcd442/nuget/v3/index.json" />
20-
<add key="darc-int-dotnet-winforms-8dbcd44-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-8dbcd442-4/nuget/v3/index.json" />
21-
<add key="darc-int-dotnet-winforms-8dbcd44-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-8dbcd442-3/nuget/v3/index.json" />
22-
<add key="darc-int-dotnet-winforms-8dbcd44-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-8dbcd442-2/nuget/v3/index.json" />
23-
<add key="darc-int-dotnet-winforms-8dbcd44-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-8dbcd442-1/nuget/v3/index.json" />
2414
<!-- End: Package sources from dotnet-winforms -->
2515
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2616
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -33,18 +23,8 @@
3323
<clear />
3424
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
3525
<!-- Begin: Package sources from dotnet-runtime -->
36-
<add key="darc-int-dotnet-runtime-574100b-1" value="true" />
37-
<add key="darc-int-dotnet-runtime-574100b-2" value="true" />
38-
<add key="darc-int-dotnet-runtime-574100b-3" value="true" />
39-
<add key="darc-int-dotnet-runtime-574100b-4" value="true" />
40-
<add key="darc-int-dotnet-runtime-574100b" value="true" />
4126
<!-- End: Package sources from dotnet-runtime -->
4227
<!-- Begin: Package sources from dotnet-winforms -->
43-
<add key="darc-int-dotnet-winforms-8dbcd44-1" value="true" />
44-
<add key="darc-int-dotnet-winforms-8dbcd44-2" value="true" />
45-
<add key="darc-int-dotnet-winforms-8dbcd44-3" value="true" />
46-
<add key="darc-int-dotnet-winforms-8dbcd44-4" value="true" />
47-
<add key="darc-int-dotnet-winforms-8dbcd44" value="true" />
4828
<!-- End: Package sources from dotnet-winforms -->
4929
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
5030
</disabledPackageSources>

‎eng/Version.Details.xml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -151,29 +151,29 @@
151151
</Dependency>
152152
</ProductDependencies>
153153
<ToolsetDependencies>
154-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25461.1">
154+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25473.1">
155155
<Uri>https://github.com/dotnet/arcade</Uri>
156-
<Sha>958612453c58fd32328461580b19ce5ecf4aedd2</Sha>
156+
<Sha>ea77ace912db0e1cf28f199cb456b27fe311635e</Sha>
157157
</Dependency>
158-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.25461.1">
158+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.25473.1">
159159
<Uri>https://github.com/dotnet/arcade</Uri>
160-
<Sha>958612453c58fd32328461580b19ce5ecf4aedd2</Sha>
160+
<Sha>ea77ace912db0e1cf28f199cb456b27fe311635e</Sha>
161161
</Dependency>
162-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.25461.1">
162+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.25473.1">
163163
<Uri>https://github.com/dotnet/arcade</Uri>
164-
<Sha>958612453c58fd32328461580b19ce5ecf4aedd2</Sha>
164+
<Sha>ea77ace912db0e1cf28f199cb456b27fe311635e</Sha>
165165
</Dependency>
166-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.25461.1">
166+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.25473.1">
167167
<Uri>https://github.com/dotnet/arcade</Uri>
168-
<Sha>958612453c58fd32328461580b19ce5ecf4aedd2</Sha>
168+
<Sha>ea77ace912db0e1cf28f199cb456b27fe311635e</Sha>
169169
</Dependency>
170-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.25461.1">
170+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.25473.1">
171171
<Uri>https://github.com/dotnet/arcade</Uri>
172-
<Sha>958612453c58fd32328461580b19ce5ecf4aedd2</Sha>
172+
<Sha>ea77ace912db0e1cf28f199cb456b27fe311635e</Sha>
173173
</Dependency>
174-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.25461.1">
174+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.25473.1">
175175
<Uri>https://github.com/dotnet/arcade</Uri>
176-
<Sha>958612453c58fd32328461580b19ce5ecf4aedd2</Sha>
176+
<Sha>ea77ace912db0e1cf28f199cb456b27fe311635e</Sha>
177177
</Dependency>
178178
</ToolsetDependencies>
179179
</Dependencies>

‎eng/Versions.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
</PropertyGroup>
1313
<PropertyGroup>
1414
<!-- arcade -->
15-
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.25461.1</MicrosoftDotNetBuildTasksFeedVersion>
16-
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.25461.1</MicrosoftDotNetBuildTasksArchivesVersion>
17-
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.25461.1</MicrosoftDotNetBuildTasksInstallersVersion>
18-
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.25461.1</MicrosoftDotNetVersionToolsTasksVersion>
15+
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.25473.1</MicrosoftDotNetBuildTasksFeedVersion>
16+
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.25473.1</MicrosoftDotNetBuildTasksArchivesVersion>
17+
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.25473.1</MicrosoftDotNetBuildTasksInstallersVersion>
18+
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.25473.1</MicrosoftDotNetVersionToolsTasksVersion>
1919
<!-- corefx -->
2020
<SystemDataDataSetExtensionsVersion>4.5.0</SystemDataDataSetExtensionsVersion>
2121
<SystemDataSqlClientVersion>4.9.0</SystemDataSqlClientVersion>

‎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
@@ -3,8 +3,8 @@
33
"dotnet": "8.0.120"
44
},
55
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25461.1",
7-
"Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.25461.1",
6+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25473.1",
7+
"Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.25473.1",
88
"Microsoft.Build.NoTargets": "3.7.0",
99
"Microsoft.Build.Traversal": "3.4.0"
1010
}

0 commit comments

Comments
 (0)