Skip to content

Commit 884bbaa

Browse files
anvillananvillan
authored
Merge branch 'main' into dev/anvillan/publish_webjob_linux
2 parents f4afe30 + 1a84d18 commit 884bbaa

File tree

147 files changed

+1382
-6065
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

147 files changed

+1382
-6065
lines changed

‎.config/dotnet-tools.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"microsoft.dotnet.darc": {
6-
"version": "1.1.0-beta.24327.2",
6+
"version": "1.1.0-beta.24367.3",
77
"commands": [
88
"darc"
99
]

‎.editorconfig

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -506,5 +506,12 @@ dotnet_diagnostic.IDE0040.severity = warning
506506
[*.txt]
507507
insert_final_newline = false
508508

509-
[test/dotnet-new.Tests/**/Approvals/**]
510-
trim_trailing_whitespace = false
509+
# Verify settings
510+
[*.{received,verified}.{txt,xml,json}]
511+
charset = "utf-8-bom"
512+
end_of_line = lf
513+
indent_size = unset
514+
indent_style = unset
515+
insert_final_newline = false
516+
tab_width = unset
517+
trim_trailing_whitespace = false

‎.gitattributes

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,9 @@
5555

5656
*.jpg binary
5757
*.png binary
58-
*.gif binary
58+
*.gif binary
59+
60+
# VerifyTests
61+
*.verified.txt text eol=lf working-tree-encoding=UTF-8
62+
*.verified.xml text eol=lf working-tree-encoding=UTF-8
63+
*.verified.json text eol=lf working-tree-encoding=UTF-8

‎.vsts-ci.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@ variables:
4343
- name: _signArgument
4444
value: -sign /p:SignCoreSdk=true
4545
- name: _officialBuildProperties
46+
# The OfficialBuilder property is set to Microsoft for the official build only.
47+
# This property is checked in Directory.Build.props and adds the MICROSOFT_ENABLE_TELEMETRY constant.
48+
# This constant is used in CompileOptions.cs to set both TelemetryOptOutDefault and TelemetryOptOutDefaultString.
4649
value: /p:DotNetPublishUsingPipelines=true /p:OfficialBuilder=Microsoft /p:OfficialBuildId=$(Build.BuildNumber)
4750

4851
resources:

‎eng/SourceBuildPrebuiltBaseline.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
<UsagePattern IdentityGlob="System.Composition.Runtime/*7.0.0*" />
3333
<UsagePattern IdentityGlob="System.Composition.TypedParts/*7.0.0*" />
3434
<UsagePattern IdentityGlob="System.Diagnostics.EventLog/*7.0.0*" />
35+
<UsagePattern IdentityGlob="System.Formats.Asn1/*8.0.1*" />
3536
<UsagePattern IdentityGlob="System.Reflection.MetadataLoadContext/*7.0.0*" />
3637
<UsagePattern IdentityGlob="System.Reflection.Metadata/8.0.0" />
3738
<UsagePattern IdentityGlob="System.Security.Cryptography.ProtectedData/*7.0.0*" />

‎eng/Version.Details.xml

Lines changed: 142 additions & 142 deletions
Large diffs are not rendered by default.

‎eng/Versions.props

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
<WebDeploymentPackageVersion>4.0.5</WebDeploymentPackageVersion>
8080
<SystemCommandLineVersion>2.0.0-beta4.24324.3</SystemCommandLineVersion>
8181
<SystemCommandLineRenderingVersion>0.4.0-alpha.24324.3</SystemCommandLineRenderingVersion>
82-
<MicrosoftDeploymentDotNetReleasesVersion>2.0.0-preview.1.24305.1</MicrosoftDeploymentDotNetReleasesVersion>
82+
<MicrosoftDeploymentDotNetReleasesVersion>2.0.0-preview.1.24366.1</MicrosoftDeploymentDotNetReleasesVersion>
8383
<MicrosoftDiaSymReaderVersion>2.2.0-beta.24327.2</MicrosoftDiaSymReaderVersion>
8484
<MicrosoftCodeAnalysisAnalyzerTestingVersion>1.1.2-beta1.22216.1</MicrosoftCodeAnalysisAnalyzerTestingVersion>
8585
<MicrosoftVisualBasicVersion>10.3.0</MicrosoftVisualBasicVersion>
@@ -106,11 +106,11 @@
106106
</PropertyGroup>
107107
<PropertyGroup>
108108
<!-- Dependency from https://github.com/dotnet/arcade-services -->
109-
<MicrosoftDotNetDarcLibVersion>1.1.0-beta.24327.2</MicrosoftDotNetDarcLibVersion>
109+
<MicrosoftDotNetDarcLibVersion>1.1.0-beta.24367.3</MicrosoftDotNetDarcLibVersion>
110110
</PropertyGroup>
111111
<PropertyGroup>
112112
<!-- Dependency from https://github.com/dotnet/winforms -->
113-
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>9.0.0-preview.7.24365.2</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
113+
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>9.0.0-preview.7.24366.8</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
114114
</PropertyGroup>
115115
<PropertyGroup>
116116
<!-- Dependency from https://github.com/dotnet/test-templates -->
@@ -161,25 +161,25 @@
161161
</PropertyGroup>
162162
<PropertyGroup>
163163
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
164-
<VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>9.0.0-preview.7.24366.2</VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>
165-
<VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>9.0.0-preview.7.24366.2</VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>
166-
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>9.0.0-preview.7.24366.2</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
167-
<MicrosoftWindowsDesktopAppRefPackageVersion>9.0.0-preview.7.24366.2</MicrosoftWindowsDesktopAppRefPackageVersion>
164+
<VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>9.0.0-preview.7.24368.1</VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>
165+
<VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>9.0.0-preview.7.24368.1</VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>
166+
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>9.0.0-preview.7.24368.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
167+
<MicrosoftWindowsDesktopAppRefPackageVersion>9.0.0-preview.7.24368.1</MicrosoftWindowsDesktopAppRefPackageVersion>
168168
</PropertyGroup>
169169
<PropertyGroup>
170170
<!-- Dependencies from https://github.com/nuget/nuget.client -->
171-
<NuGetBuildTasksPackageVersion>6.12.0-preview.1.27</NuGetBuildTasksPackageVersion>
172-
<NuGetBuildTasksConsolePackageVersion>6.12.0-preview.1.27</NuGetBuildTasksConsolePackageVersion>
173-
<NuGetLocalizationPackageVersion>6.12.0-preview.1.27</NuGetLocalizationPackageVersion>
174-
<NuGetBuildTasksPackPackageVersion>6.12.0-preview.1.27</NuGetBuildTasksPackPackageVersion>
175-
<NuGetCommandLineXPlatPackageVersion>6.12.0-preview.1.27</NuGetCommandLineXPlatPackageVersion>
176-
<NuGetProjectModelPackageVersion>6.12.0-preview.1.27</NuGetProjectModelPackageVersion>
177-
<MicrosoftBuildNuGetSdkResolverPackageVersion>6.12.0-preview.1.27</MicrosoftBuildNuGetSdkResolverPackageVersion>
178-
<NuGetCommonPackageVersion>6.12.0-preview.1.27</NuGetCommonPackageVersion>
179-
<NuGetConfigurationPackageVersion>6.12.0-preview.1.27</NuGetConfigurationPackageVersion>
180-
<NuGetFrameworksPackageVersion>6.12.0-preview.1.27</NuGetFrameworksPackageVersion>
181-
<NuGetPackagingPackageVersion>6.12.0-preview.1.27</NuGetPackagingPackageVersion>
182-
<NuGetVersioningPackageVersion>6.12.0-preview.1.27</NuGetVersioningPackageVersion>
171+
<NuGetBuildTasksPackageVersion>6.12.0-preview.1.32</NuGetBuildTasksPackageVersion>
172+
<NuGetBuildTasksConsolePackageVersion>6.12.0-preview.1.32</NuGetBuildTasksConsolePackageVersion>
173+
<NuGetLocalizationPackageVersion>6.12.0-preview.1.32</NuGetLocalizationPackageVersion>
174+
<NuGetBuildTasksPackPackageVersion>6.12.0-preview.1.32</NuGetBuildTasksPackPackageVersion>
175+
<NuGetCommandLineXPlatPackageVersion>6.12.0-preview.1.32</NuGetCommandLineXPlatPackageVersion>
176+
<NuGetProjectModelPackageVersion>6.12.0-preview.1.32</NuGetProjectModelPackageVersion>
177+
<MicrosoftBuildNuGetSdkResolverPackageVersion>6.12.0-preview.1.32</MicrosoftBuildNuGetSdkResolverPackageVersion>
178+
<NuGetCommonPackageVersion>6.12.0-preview.1.32</NuGetCommonPackageVersion>
179+
<NuGetConfigurationPackageVersion>6.12.0-preview.1.32</NuGetConfigurationPackageVersion>
180+
<NuGetFrameworksPackageVersion>6.12.0-preview.1.32</NuGetFrameworksPackageVersion>
181+
<NuGetPackagingPackageVersion>6.12.0-preview.1.32</NuGetPackagingPackageVersion>
182+
<NuGetVersioningPackageVersion>6.12.0-preview.1.32</NuGetVersioningPackageVersion>
183183
</PropertyGroup>
184184
<PropertyGroup>
185185
<!-- Dependencies from https://github.com/Microsoft/vstest -->
@@ -207,8 +207,8 @@
207207
then use that in Directory.Packages.props.
208208
209209
At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. -->
210-
<MicrosoftBuildVersion>17.12.0-preview-24366-01</MicrosoftBuildVersion>
211-
<MicrosoftBuildLocalizationVersion>17.12.0-preview-24366-01</MicrosoftBuildLocalizationVersion>
210+
<MicrosoftBuildVersion>17.12.0-preview-24368-09</MicrosoftBuildVersion>
211+
<MicrosoftBuildLocalizationVersion>17.12.0-preview-24368-09</MicrosoftBuildLocalizationVersion>
212212
<MicrosoftBuildMinimumVersion Condition="Exists('$(RepoRoot)src\Layout\redist\minimumMSBuildVersion') and '$(DotNetBuildSourceOnly)' != 'true'">$([System.IO.File]::ReadAllText('$(RepoRoot)src\Layout\redist\minimumMSBuildVersion').Trim())</MicrosoftBuildMinimumVersion>
213213
</PropertyGroup>
214214
<PropertyGroup>
@@ -230,41 +230,41 @@
230230
</PropertyGroup>
231231
<PropertyGroup>
232232
<!-- Dependencies from https://github.com/dotnet/roslyn -->
233-
<MicrosoftNetCompilersToolsetVersion>4.12.0-1.24366.3</MicrosoftNetCompilersToolsetVersion>
234-
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.12.0-1.24366.3</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
235-
<MicrosoftCodeAnalysisPackageVersion>4.12.0-1.24366.3</MicrosoftCodeAnalysisPackageVersion>
236-
<MicrosoftCodeAnalysisCSharpPackageVersion>4.12.0-1.24366.3</MicrosoftCodeAnalysisCSharpPackageVersion>
237-
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.12.0-1.24366.3</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
238-
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.12.0-1.24366.3</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
239-
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.12.0-1.24366.3</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
240-
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.12.0-1.24366.3</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
233+
<MicrosoftNetCompilersToolsetVersion>4.12.0-1.24366.6</MicrosoftNetCompilersToolsetVersion>
234+
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.12.0-1.24366.6</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
235+
<MicrosoftCodeAnalysisPackageVersion>4.12.0-1.24366.6</MicrosoftCodeAnalysisPackageVersion>
236+
<MicrosoftCodeAnalysisCSharpPackageVersion>4.12.0-1.24366.6</MicrosoftCodeAnalysisCSharpPackageVersion>
237+
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.12.0-1.24366.6</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
238+
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.12.0-1.24366.6</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
239+
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.12.0-1.24366.6</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
240+
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.12.0-1.24366.6</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
241241
</PropertyGroup>
242242
<PropertyGroup>
243243
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
244-
<MicrosoftAspNetCoreAppRefPackageVersion>9.0.0-preview.7.24366.1</MicrosoftAspNetCoreAppRefPackageVersion>
245-
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>9.0.0-preview.7.24366.1</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
246-
<MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>9.0.0-preview.7.24366.1</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
247-
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>9.0.0-preview.7.24366.1</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
248-
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>9.0.0-preview.7.24366.1</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
249-
<MicrosoftAspNetCoreAnalyzersPackageVersion>9.0.0-preview.7.24366.1</MicrosoftAspNetCoreAnalyzersPackageVersion>
250-
<MicrosoftAspNetCoreTestHostPackageVersion>9.0.0-preview.7.24366.1</MicrosoftAspNetCoreTestHostPackageVersion>
251-
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>9.0.0-preview.7.24366.1</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
252-
<MicrosoftAspNetCoreAppRefInternalPackageVersion>9.0.0-preview.7.24366.1</MicrosoftAspNetCoreAppRefInternalPackageVersion>
253-
<VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>9.0.0-preview.7.24366.1</VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>
254-
<dotnetdevcertsPackageVersion>9.0.0-preview.7.24366.1</dotnetdevcertsPackageVersion>
255-
<dotnetuserjwtsPackageVersion>9.0.0-preview.7.24366.1</dotnetuserjwtsPackageVersion>
256-
<dotnetusersecretsPackageVersion>9.0.0-preview.7.24366.1</dotnetusersecretsPackageVersion>
244+
<MicrosoftAspNetCoreAppRefPackageVersion>9.0.0-preview.7.24369.10</MicrosoftAspNetCoreAppRefPackageVersion>
245+
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>9.0.0-preview.7.24369.10</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
246+
<MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>9.0.0-preview.7.24369.10</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
247+
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>9.0.0-preview.7.24369.10</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
248+
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>9.0.0-preview.7.24369.10</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
249+
<MicrosoftAspNetCoreAnalyzersPackageVersion>9.0.0-preview.7.24369.10</MicrosoftAspNetCoreAnalyzersPackageVersion>
250+
<MicrosoftAspNetCoreTestHostPackageVersion>9.0.0-preview.7.24369.10</MicrosoftAspNetCoreTestHostPackageVersion>
251+
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>9.0.0-preview.7.24369.10</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
252+
<MicrosoftAspNetCoreAppRefInternalPackageVersion>9.0.0-preview.7.24369.10</MicrosoftAspNetCoreAppRefInternalPackageVersion>
253+
<VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>9.0.0-preview.7.24369.10</VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>
254+
<dotnetdevcertsPackageVersion>9.0.0-preview.7.24369.10</dotnetdevcertsPackageVersion>
255+
<dotnetuserjwtsPackageVersion>9.0.0-preview.7.24369.10</dotnetuserjwtsPackageVersion>
256+
<dotnetusersecretsPackageVersion>9.0.0-preview.7.24369.10</dotnetusersecretsPackageVersion>
257257
</PropertyGroup>
258258
<PropertyGroup>
259259
<!-- Dependencies from https://github.com/dotnet/razor -->
260-
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>9.0.0-preview.24366.7</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
261-
<MicrosoftCodeAnalysisRazorToolingInternalVersion>9.0.0-preview.24366.7</MicrosoftCodeAnalysisRazorToolingInternalVersion>
262-
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>9.0.0-preview.24366.7</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
260+
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>9.0.0-preview.24369.5</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
261+
<MicrosoftCodeAnalysisRazorToolingInternalVersion>9.0.0-preview.24369.5</MicrosoftCodeAnalysisRazorToolingInternalVersion>
262+
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>9.0.0-preview.24369.5</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
263263
</PropertyGroup>
264264
<PropertyGroup>
265265
<!-- Dependencies from https://github.com/dotnet/wpf -->
266-
<MicrosoftNETSdkWindowsDesktopPackageVersion>9.0.0-preview.7.24365.4</MicrosoftNETSdkWindowsDesktopPackageVersion>
267-
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>9.0.0-preview.7.24365.4</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
266+
<MicrosoftNETSdkWindowsDesktopPackageVersion>9.0.0-preview.7.24367.6</MicrosoftNETSdkWindowsDesktopPackageVersion>
267+
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>9.0.0-preview.7.24367.6</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
268268
</PropertyGroup>
269269
<PropertyGroup Label="Runtime and Apphost aliases">
270270
<!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 version above and create aliases without the winx64 here for clarity elsewhere. -->
@@ -308,10 +308,10 @@
308308
</PropertyGroup>
309309
<PropertyGroup>
310310
<!-- Dependencies from https://github.com/dotnet/arcade -->
311-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24360.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
312-
<MicrosoftDotNetSignToolVersion>9.0.0-beta.24360.4</MicrosoftDotNetSignToolVersion>
313-
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.24360.4</MicrosoftDotNetXliffTasksVersion>
314-
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24360.4</MicrosoftDotNetXUnitExtensionsVersion>
311+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24368.9</MicrosoftDotNetBuildTasksInstallersPackageVersion>
312+
<MicrosoftDotNetSignToolVersion>9.0.0-beta.24368.9</MicrosoftDotNetSignToolVersion>
313+
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.24368.9</MicrosoftDotNetXliffTasksVersion>
314+
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24368.9</MicrosoftDotNetXUnitExtensionsVersion>
315315
</PropertyGroup>
316316
<PropertyGroup>
317317
<!-- Dependencies from https://github.com/dotnet/sourcelink -->

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,9 +143,10 @@ jobs:
143143
scriptType: ps
144144
scriptLocation: scriptPath
145145
scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
146-
arguments: -BuildId $(BARBuildId)
146+
arguments: >
147+
-BuildId $(BARBuildId)
147148
-PublishingInfraVersion 3
148-
-AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)'
149+
-AzdoToken '$(System.AccessToken)'
149150
-WaitPublishingFinish true
150151
-ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
151152
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'

‎eng/common/core-templates/post-build/post-build.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -307,9 +307,10 @@ stages:
307307
scriptType: ps
308308
scriptLocation: scriptPath
309309
scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1
310-
arguments: -BuildId $(BARBuildId)
310+
arguments: >
311+
-BuildId $(BARBuildId)
311312
-PublishingInfraVersion ${{ parameters.publishingInfraVersion }}
312-
-AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)'
313+
-AzdoToken '$(System.AccessToken)'
313314
-WaitPublishingFinish true
314315
-ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
315316
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'

‎eng/common/core-templates/steps/get-federated-access-token.yml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,31 @@ parameters:
33
type: string
44
- name: outputVariableName
55
type: string
6+
- name: is1ESPipeline
7+
type: boolean
8+
- name: stepName
9+
type: string
10+
default: 'getFederatedAccessToken'
11+
- name: condition
12+
type: string
13+
default: ''
614
# Resource to get a token for. Common values include:
715
# - '499b84ac-1321-427f-aa17-267ca6975798' for Azure DevOps
816
# - 'https://storage.azure.com/' for storage
917
# Defaults to Azure DevOps
1018
- name: resource
1119
type: string
1220
default: '499b84ac-1321-427f-aa17-267ca6975798'
21+
- name: isStepOutputVariable
22+
type: boolean
23+
default: false
1324

1425
steps:
1526
- task: AzureCLI@2
1627
displayName: 'Getting federated access token for feeds'
28+
name: ${{ parameters.stepName }}
29+
${{ if ne(parameters.condition, '') }}:
30+
condition: ${{ parameters.condition }}
1731
inputs:
1832
azureSubscription: ${{ parameters.federatedServiceConnection }}
1933
scriptType: 'pscore'
@@ -25,4 +39,4 @@ steps:
2539
exit 1
2640
}
2741
Write-Host "Setting '${{ parameters.outputVariableName }}' with the access token value"
28-
Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true]$accessToken"
42+
Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true;isOutput=${{ parameters.isStepOutputVariable }}]$accessToken"

0 commit comments

Comments
 (0)