Skip to content

Commit 6b2817e

Browse files
authored
[automated] Merge branch 'release/9.0.3xx' => 'release/10.0.1xx' (#50839)
2 parents aa89d21 + 80089b8 commit 6b2817e

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

NuGet.config

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@
77
<!-- End: Package sources from dotnet-aspire -->
88
<!-- Begin: Package sources from dotnet-runtime -->
99
<add key="darc-int-dotnet-runtime-893c2eb" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-893c2ebb/nuget/v3/index.json" />
10-
<add key="darc-int-dotnet-runtime-893c2eb-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-893c2ebb-4/nuget/v3/index.json" />
11-
<add key="darc-int-dotnet-runtime-893c2eb-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-893c2ebb-3/nuget/v3/index.json" />
12-
<add key="darc-int-dotnet-runtime-893c2eb-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-893c2ebb-2/nuget/v3/index.json" />
13-
<add key="darc-int-dotnet-runtime-893c2eb-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-893c2ebb-1/nuget/v3/index.json" />
1410
<!-- End: Package sources from dotnet-runtime -->
1511
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1612
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
@@ -42,10 +38,6 @@
4238
<clear />
4339
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
4440
<!-- Begin: Package sources from dotnet-runtime -->
45-
<add key="darc-int-dotnet-runtime-893c2eb-1" value="true" />
46-
<add key="darc-int-dotnet-runtime-893c2eb-2" value="true" />
47-
<add key="darc-int-dotnet-runtime-893c2eb-3" value="true" />
48-
<add key="darc-int-dotnet-runtime-893c2eb-4" value="true" />
4941
<add key="darc-int-dotnet-runtime-893c2eb" value="true" />
5042
<!-- End: Package sources from dotnet-runtime -->
5143
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->

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

Lines changed: 7 additions & 0 deletions
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)

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 }}

0 commit comments

Comments
 (0)