Skip to content

Commit d869bd0

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20240710.5 (#104743)
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24266.3 -> To Version 8.0.0-beta.24360.5 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent bdb0f31 commit d869bd0

21 files changed

+352
-114
lines changed

Diff for: ‎eng/Version.Details.xml

+36-36
Original file line numberDiff line numberDiff line change
@@ -111,79 +111,79 @@
111111
</Dependency>
112112
</ProductDependencies>
113113
<ToolsetDependencies>
114-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24266.3">
114+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24360.5">
115115
<Uri>https://github.com/dotnet/arcade</Uri>
116-
<Sha>e6f70c7dd528f05cd28cec2a179d58c22e91d9ac</Sha>
116+
<Sha>c9efa535175049eb9cba06cae1f8c3d5dbe768a9</Sha>
117117
<SourceBuild RepoName="arcade" ManagedOnly="true" />
118118
</Dependency>
119119
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23475.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
120120
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
121121
<Sha>73f0850939d96131c28cf6ea6ee5aacb4da0083a</Sha>
122122
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
123123
</Dependency>
124-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24266.3">
124+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.24360.5">
125125
<Uri>https://github.com/dotnet/arcade</Uri>
126-
<Sha>e6f70c7dd528f05cd28cec2a179d58c22e91d9ac</Sha>
126+
<Sha>c9efa535175049eb9cba06cae1f8c3d5dbe768a9</Sha>
127127
</Dependency>
128-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.24266.3">
128+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.24360.5">
129129
<Uri>https://github.com/dotnet/arcade</Uri>
130-
<Sha>e6f70c7dd528f05cd28cec2a179d58c22e91d9ac</Sha>
130+
<Sha>c9efa535175049eb9cba06cae1f8c3d5dbe768a9</Sha>
131131
</Dependency>
132-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.24266.3">
132+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.24360.5">
133133
<Uri>https://github.com/dotnet/arcade</Uri>
134-
<Sha>e6f70c7dd528f05cd28cec2a179d58c22e91d9ac</Sha>
134+
<Sha>c9efa535175049eb9cba06cae1f8c3d5dbe768a9</Sha>
135135
</Dependency>
136-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.24266.3">
136+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.24360.5">
137137
<Uri>https://github.com/dotnet/arcade</Uri>
138-
<Sha>e6f70c7dd528f05cd28cec2a179d58c22e91d9ac</Sha>
138+
<Sha>c9efa535175049eb9cba06cae1f8c3d5dbe768a9</Sha>
139139
</Dependency>
140-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.24266.3">
140+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.24360.5">
141141
<Uri>https://github.com/dotnet/arcade</Uri>
142-
<Sha>e6f70c7dd528f05cd28cec2a179d58c22e91d9ac</Sha>
142+
<Sha>c9efa535175049eb9cba06cae1f8c3d5dbe768a9</Sha>
143143
</Dependency>
144-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.24266.3">
144+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.24360.5">
145145
<Uri>https://github.com/dotnet/arcade</Uri>
146-
<Sha>e6f70c7dd528f05cd28cec2a179d58c22e91d9ac</Sha>
146+
<Sha>c9efa535175049eb9cba06cae1f8c3d5dbe768a9</Sha>
147147
</Dependency>
148-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.24266.3">
148+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.24360.5">
149149
<Uri>https://github.com/dotnet/arcade</Uri>
150-
<Sha>e6f70c7dd528f05cd28cec2a179d58c22e91d9ac</Sha>
150+
<Sha>c9efa535175049eb9cba06cae1f8c3d5dbe768a9</Sha>
151151
</Dependency>
152-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.24266.3">
152+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.24360.5">
153153
<Uri>https://github.com/dotnet/arcade</Uri>
154-
<Sha>e6f70c7dd528f05cd28cec2a179d58c22e91d9ac</Sha>
154+
<Sha>c9efa535175049eb9cba06cae1f8c3d5dbe768a9</Sha>
155155
</Dependency>
156-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.24266.3">
156+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.24360.5">
157157
<Uri>https://github.com/dotnet/arcade</Uri>
158-
<Sha>e6f70c7dd528f05cd28cec2a179d58c22e91d9ac</Sha>
158+
<Sha>c9efa535175049eb9cba06cae1f8c3d5dbe768a9</Sha>
159159
</Dependency>
160-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.24266.3">
160+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.24360.5">
161161
<Uri>https://github.com/dotnet/arcade</Uri>
162-
<Sha>e6f70c7dd528f05cd28cec2a179d58c22e91d9ac</Sha>
162+
<Sha>c9efa535175049eb9cba06cae1f8c3d5dbe768a9</Sha>
163163
</Dependency>
164-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.24266.3">
164+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.24360.5">
165165
<Uri>https://github.com/dotnet/arcade</Uri>
166-
<Sha>e6f70c7dd528f05cd28cec2a179d58c22e91d9ac</Sha>
166+
<Sha>c9efa535175049eb9cba06cae1f8c3d5dbe768a9</Sha>
167167
</Dependency>
168-
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.24266.3">
168+
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.24360.5">
169169
<Uri>https://github.com/dotnet/arcade</Uri>
170-
<Sha>e6f70c7dd528f05cd28cec2a179d58c22e91d9ac</Sha>
170+
<Sha>c9efa535175049eb9cba06cae1f8c3d5dbe768a9</Sha>
171171
</Dependency>
172-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.24266.3">
172+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.24360.5">
173173
<Uri>https://github.com/dotnet/arcade</Uri>
174-
<Sha>e6f70c7dd528f05cd28cec2a179d58c22e91d9ac</Sha>
174+
<Sha>c9efa535175049eb9cba06cae1f8c3d5dbe768a9</Sha>
175175
</Dependency>
176-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.24266.3">
176+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.24360.5">
177177
<Uri>https://github.com/dotnet/arcade</Uri>
178-
<Sha>e6f70c7dd528f05cd28cec2a179d58c22e91d9ac</Sha>
178+
<Sha>c9efa535175049eb9cba06cae1f8c3d5dbe768a9</Sha>
179179
</Dependency>
180-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.24266.3">
180+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.24360.5">
181181
<Uri>https://github.com/dotnet/arcade</Uri>
182-
<Sha>e6f70c7dd528f05cd28cec2a179d58c22e91d9ac</Sha>
182+
<Sha>c9efa535175049eb9cba06cae1f8c3d5dbe768a9</Sha>
183183
</Dependency>
184-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.24266.3">
184+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.24360.5">
185185
<Uri>https://github.com/dotnet/arcade</Uri>
186-
<Sha>e6f70c7dd528f05cd28cec2a179d58c22e91d9ac</Sha>
186+
<Sha>c9efa535175049eb9cba06cae1f8c3d5dbe768a9</Sha>
187187
</Dependency>
188188
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="8.0.0-beta.24270.1">
189189
<Uri>https://github.com/dotnet/runtime-assets</Uri>
@@ -334,9 +334,9 @@
334334
<Uri>https://github.com/dotnet/xharness</Uri>
335335
<Sha>aacfb6328fdef17e572617bbb551431bb9cb1ff2</Sha>
336336
</Dependency>
337-
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.24266.3">
337+
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.24360.5">
338338
<Uri>https://github.com/dotnet/arcade</Uri>
339-
<Sha>e6f70c7dd528f05cd28cec2a179d58c22e91d9ac</Sha>
339+
<Sha>c9efa535175049eb9cba06cae1f8c3d5dbe768a9</Sha>
340340
</Dependency>
341341
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.23566.3">
342342
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

Diff for: ‎eng/Versions.props

+15-15
Original file line numberDiff line numberDiff line change
@@ -87,21 +87,21 @@
8787
<!-- SDK dependencies -->
8888
<MicrosoftDotNetApiCompatTaskVersion>8.0.100</MicrosoftDotNetApiCompatTaskVersion>
8989
<!-- Arcade dependencies -->
90-
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.24266.3</MicrosoftDotNetBuildTasksFeedVersion>
91-
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.24266.3</MicrosoftDotNetCodeAnalysisVersion>
92-
<MicrosoftDotNetGenAPIVersion>8.0.0-beta.24266.3</MicrosoftDotNetGenAPIVersion>
93-
<MicrosoftDotNetGenFacadesVersion>8.0.0-beta.24266.3</MicrosoftDotNetGenFacadesVersion>
94-
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.24266.3</MicrosoftDotNetXUnitExtensionsVersion>
95-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.24266.3</MicrosoftDotNetXUnitConsoleRunnerVersion>
96-
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.24266.3</MicrosoftDotNetBuildTasksArchivesVersion>
97-
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.24266.3</MicrosoftDotNetBuildTasksInstallersVersion>
98-
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.24266.3</MicrosoftDotNetBuildTasksPackagingVersion>
99-
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.24266.3</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
100-
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.24266.3</MicrosoftDotNetBuildTasksTemplatingVersion>
101-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.24266.3</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
102-
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.24266.3</MicrosoftDotNetRemoteExecutorVersion>
103-
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.24266.3</MicrosoftDotNetVersionToolsTasksVersion>
104-
<MicrosoftDotNetPackageTestingVersion>8.0.0-beta.24266.3</MicrosoftDotNetPackageTestingVersion>
90+
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.24360.5</MicrosoftDotNetBuildTasksFeedVersion>
91+
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.24360.5</MicrosoftDotNetCodeAnalysisVersion>
92+
<MicrosoftDotNetGenAPIVersion>8.0.0-beta.24360.5</MicrosoftDotNetGenAPIVersion>
93+
<MicrosoftDotNetGenFacadesVersion>8.0.0-beta.24360.5</MicrosoftDotNetGenFacadesVersion>
94+
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.24360.5</MicrosoftDotNetXUnitExtensionsVersion>
95+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.24360.5</MicrosoftDotNetXUnitConsoleRunnerVersion>
96+
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.24360.5</MicrosoftDotNetBuildTasksArchivesVersion>
97+
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.24360.5</MicrosoftDotNetBuildTasksInstallersVersion>
98+
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.24360.5</MicrosoftDotNetBuildTasksPackagingVersion>
99+
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.24360.5</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
100+
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.24360.5</MicrosoftDotNetBuildTasksTemplatingVersion>
101+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.24360.5</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
102+
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.24360.5</MicrosoftDotNetRemoteExecutorVersion>
103+
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.24360.5</MicrosoftDotNetVersionToolsTasksVersion>
104+
<MicrosoftDotNetPackageTestingVersion>8.0.0-beta.24360.5</MicrosoftDotNetPackageTestingVersion>
105105
<!-- NuGet dependencies -->
106106
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
107107
<!-- Installer dependencies -->

Diff for: ‎eng/common/post-build/publish-using-darc.ps1

+7-8
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ param(
22
[Parameter(Mandatory=$true)][int] $BuildId,
33
[Parameter(Mandatory=$true)][int] $PublishingInfraVersion,
44
[Parameter(Mandatory=$true)][string] $AzdoToken,
5-
[Parameter(Mandatory=$true)][string] $MaestroToken,
65
[Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net',
76
[Parameter(Mandatory=$true)][string] $WaitPublishingFinish,
87
[Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters,
@@ -31,13 +30,13 @@ try {
3130
}
3231

3332
& $darc add-build-to-channel `
34-
--id $buildId `
35-
--publishing-infra-version $PublishingInfraVersion `
36-
--default-channels `
37-
--source-branch main `
38-
--azdev-pat $AzdoToken `
39-
--bar-uri $MaestroApiEndPoint `
40-
--password $MaestroToken `
33+
--id $buildId `
34+
--publishing-infra-version $PublishingInfraVersion `
35+
--default-channels `
36+
--source-branch main `
37+
--azdev-pat "$AzdoToken" `
38+
--bar-uri "$MaestroApiEndPoint" `
39+
--ci `
4140
@optionalParams
4241

4342
if ($LastExitCode -ne 0) {

Diff for: ‎eng/common/templates-official/job/publish-build-assets.yml

+13-8
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,16 @@ jobs:
7676

7777
- task: NuGetAuthenticate@1
7878

79-
- task: PowerShell@2
79+
- task: AzureCLI@2
8080
displayName: Publish Build Assets
8181
inputs:
82-
filePath: eng\common\sdk-task.ps1
83-
arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet
82+
azureSubscription: "Darc: Maestro Production"
83+
scriptType: ps
84+
scriptLocation: scriptPath
85+
scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1
86+
arguments: >
87+
-task PublishBuildAssets -restore -msbuildEngine dotnet
8488
/p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests'
85-
/p:BuildAssetRegistryToken=$(MaestroAccessToken)
8689
/p:MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com
8790
/p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }}
8891
/p:OfficialBuildId=$(Build.BuildNumber)
@@ -137,14 +140,16 @@ jobs:
137140
BARBuildId: ${{ parameters.BARBuildId }}
138141
PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
139142

140-
- task: PowerShell@2
143+
- task: AzureCLI@2
141144
displayName: Publish Using Darc
142145
inputs:
143-
filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
144-
arguments: -BuildId $(BARBuildId)
146+
azureSubscription: "Darc: Maestro Production"
147+
scriptType: ps
148+
scriptLocation: scriptPath
149+
scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
150+
arguments: -BuildId $(BARBuildId)
145151
-PublishingInfraVersion 3
146152
-AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)'
147-
-MaestroToken '$(MaestroApiAccessToken)'
148153
-WaitPublishingFinish true
149154
-ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
150155
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'

Diff for: ‎eng/common/templates-official/job/source-build.yml

+8
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,12 @@ parameters:
3131
# container and pool.
3232
platform: {}
3333

34+
# If set to true and running on a non-public project,
35+
# Internal blob storage locations will be enabled.
36+
# This is not enabled by default because many repositories do not need internal sources
37+
# and do not need to have the required service connections approved in the pipeline.
38+
enableInternalSources: false
39+
3440
jobs:
3541
- job: ${{ parameters.jobNamePrefix }}_${{ parameters.platform.name }}
3642
displayName: Source-Build (${{ parameters.platform.name }})
@@ -62,6 +68,8 @@ jobs:
6268
clean: all
6369

6470
steps:
71+
- ${{ if eq(parameters.enableInternalSources, true) }}:
72+
- template: /eng/common/templates-official/steps/enable-internal-runtimes.yml
6573
- template: /eng/common/templates-official/steps/source-build.yml
6674
parameters:
6775
platform: ${{ parameters.platform }}

Diff for: ‎eng/common/templates-official/job/source-index-stage1.yml

+7-9
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
value: ${{ parameters.sourceIndexPackageSource }}
2424
- name: BinlogPath
2525
value: ${{ parameters.binlogPath }}
26-
- template: /eng/common/templates/variables/pool-providers.yml
26+
- template: /eng/common/templates-official/variables/pool-providers.yml
2727

2828
${{ if ne(parameters.pool, '') }}:
2929
pool: ${{ parameters.pool }}
@@ -34,7 +34,8 @@ jobs:
3434
demands: ImageOverride -equals windows.vs2019.amd64.open
3535
${{ if eq(variables['System.TeamProject'], 'internal') }}:
3636
name: $(DncEngInternalBuildPool)
37-
demands: ImageOverride -equals windows.vs2019.amd64
37+
image: windows.vs2022.amd64
38+
os: windows
3839

3940
steps:
4041
- ${{ each preStep in parameters.preSteps }}:
@@ -70,16 +71,13 @@ jobs:
7071
scriptType: 'ps'
7172
scriptLocation: 'inlineScript'
7273
inlineScript: |
73-
echo "##vso[task.setvariable variable=ARM_CLIENT_ID]$env:servicePrincipalId"
74-
echo "##vso[task.setvariable variable=ARM_ID_TOKEN]$env:idToken"
75-
echo "##vso[task.setvariable variable=ARM_TENANT_ID]$env:tenantId"
74+
echo "##vso[task.setvariable variable=ARM_CLIENT_ID;issecret=true]$env:servicePrincipalId"
75+
echo "##vso[task.setvariable variable=ARM_ID_TOKEN;issecret=true]$env:idToken"
76+
echo "##vso[task.setvariable variable=ARM_TENANT_ID;issecret=true]$env:tenantId"
7677
7778
- script: |
78-
echo "Client ID: $(ARM_CLIENT_ID)"
79-
echo "ID Token: $(ARM_ID_TOKEN)"
80-
echo "Tenant ID: $(ARM_TENANT_ID)"
8179
az login --service-principal -u $(ARM_CLIENT_ID) --tenant $(ARM_TENANT_ID) --allow-no-subscriptions --federated-token $(ARM_ID_TOKEN)
8280
displayName: "Login to Azure"
8381
8482
- script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) -s netsourceindexstage1 -b stage1
85-
displayName: Upload stage1 artifacts to source index
83+
displayName: Upload stage1 artifacts to source index

Diff for: ‎eng/common/templates-official/jobs/source-build.yml

+8
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,12 @@ parameters:
2121
# one job runs on 'defaultManagedPlatform'.
2222
platforms: []
2323

24+
# If set to true and running on a non-public project,
25+
# Internal nuget and blob storage locations will be enabled.
26+
# This is not enabled by default because many repositories do not need internal sources
27+
# and do not need to have the required service connections approved in the pipeline.
28+
enableInternalSources: false
29+
2430
jobs:
2531

2632
- ${{ if ne(parameters.allCompletedJobId, '') }}:
@@ -38,9 +44,11 @@ jobs:
3844
parameters:
3945
jobNamePrefix: ${{ parameters.jobNamePrefix }}
4046
platform: ${{ platform }}
47+
enableInternalSources: ${{ parameters.enableInternalSources }}
4148

4249
- ${{ if eq(length(parameters.platforms), 0) }}:
4350
- template: /eng/common/templates-official/job/source-build.yml
4451
parameters:
4552
jobNamePrefix: ${{ parameters.jobNamePrefix }}
4653
platform: ${{ parameters.defaultManagedPlatform }}
54+
enableInternalSources: ${{ parameters.enableInternalSources }}

Diff for: ‎eng/common/templates-official/post-build/post-build.yml

+5-3
Original file line numberDiff line numberDiff line change
@@ -272,14 +272,16 @@ stages:
272272

273273
- task: NuGetAuthenticate@1
274274

275-
- task: PowerShell@2
275+
- task: AzureCLI@2
276276
displayName: Publish Using Darc
277277
inputs:
278-
filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
278+
azureSubscription: "Darc: Maestro Production"
279+
scriptType: ps
280+
scriptLocation: scriptPath
281+
scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
279282
arguments: -BuildId $(BARBuildId)
280283
-PublishingInfraVersion ${{ parameters.publishingInfraVersion }}
281284
-AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)'
282-
-MaestroToken '$(MaestroApiAccessToken)'
283285
-WaitPublishingFinish true
284286
-ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
285287
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'

Diff for: ‎eng/common/templates-official/steps/enable-internal-runtimes.yml

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
# Obtains internal runtime download credentials and populates the 'dotnetbuilds-internal-container-read-token-base64'
2+
# variable with the base64-encoded SAS token, by default
3+
4+
parameters:
5+
- name: federatedServiceConnection
6+
type: string
7+
default: 'dotnetbuilds-internal-read'
8+
- name: outputVariableName
9+
type: string
10+
default: 'dotnetbuilds-internal-container-read-token-base64'
11+
- name: expiryInHours
12+
type: number
13+
default: 1
14+
- name: base64Encode
15+
type: boolean
16+
default: true
17+
18+
steps:
19+
- ${{ if ne(variables['System.TeamProject'], 'public') }}:
20+
- template: /eng/common/templates-official/steps/get-delegation-sas.yml
21+
parameters:
22+
federatedServiceConnection: ${{ parameters.federatedServiceConnection }}
23+
outputVariableName: ${{ parameters.outputVariableName }}
24+
expiryInHours: ${{ parameters.expiryInHours }}
25+
base64Encode: ${{ parameters.base64Encode }}
26+
storageAccount: dotnetbuilds
27+
container: internal
28+
permissions: rl

0 commit comments

Comments
 (0)