Skip to content

Commit 3cf8751

Browse files
ForgindForgind
authored
Merge branch 'main' into stj-version
2 parents 9fe4889 + 1a84d18 commit 3cf8751

File tree

131 files changed

+878
-5953
lines changed

Some content is hidden

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

131 files changed

+878
-5953
lines changed

‎.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: 84 additions & 84 deletions
Large diffs are not rendered by default.

‎eng/Versions.props‎

Lines changed: 29 additions & 29 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>
@@ -164,10 +164,10 @@
164164
</PropertyGroup>
165165
<PropertyGroup>
166166
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
167-
<VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>9.0.0-preview.7.24367.1</VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>
168-
<VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>9.0.0-preview.7.24367.1</VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>
169-
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>9.0.0-preview.7.24367.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
170-
<MicrosoftWindowsDesktopAppRefPackageVersion>9.0.0-preview.7.24367.1</MicrosoftWindowsDesktopAppRefPackageVersion>
167+
<VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>9.0.0-preview.7.24368.1</VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>
168+
<VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>9.0.0-preview.7.24368.1</VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>
169+
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>9.0.0-preview.7.24368.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
170+
<MicrosoftWindowsDesktopAppRefPackageVersion>9.0.0-preview.7.24368.1</MicrosoftWindowsDesktopAppRefPackageVersion>
171171
</PropertyGroup>
172172
<PropertyGroup>
173173
<!-- Dependencies from https://github.com/nuget/nuget.client -->
@@ -210,8 +210,8 @@
210210
then use that in Directory.Packages.props.
211211
212212
At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. -->
213-
<MicrosoftBuildVersion>17.12.0-preview-24366-01</MicrosoftBuildVersion>
214-
<MicrosoftBuildLocalizationVersion>17.12.0-preview-24366-01</MicrosoftBuildLocalizationVersion>
213+
<MicrosoftBuildVersion>17.12.0-preview-24368-09</MicrosoftBuildVersion>
214+
<MicrosoftBuildLocalizationVersion>17.12.0-preview-24368-09</MicrosoftBuildLocalizationVersion>
215215
<MicrosoftBuildMinimumVersion Condition="Exists('$(RepoRoot)src\Layout\redist\minimumMSBuildVersion') and '$(DotNetBuildSourceOnly)' != 'true'">$([System.IO.File]::ReadAllText('$(RepoRoot)src\Layout\redist\minimumMSBuildVersion').Trim())</MicrosoftBuildMinimumVersion>
216216
</PropertyGroup>
217217
<PropertyGroup>
@@ -244,30 +244,30 @@
244244
</PropertyGroup>
245245
<PropertyGroup>
246246
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
247-
<MicrosoftAspNetCoreAppRefPackageVersion>9.0.0-preview.7.24366.8</MicrosoftAspNetCoreAppRefPackageVersion>
248-
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>9.0.0-preview.7.24366.8</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
249-
<MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>9.0.0-preview.7.24366.8</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
250-
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>9.0.0-preview.7.24366.8</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
251-
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>9.0.0-preview.7.24366.8</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
252-
<MicrosoftAspNetCoreAnalyzersPackageVersion>9.0.0-preview.7.24366.8</MicrosoftAspNetCoreAnalyzersPackageVersion>
253-
<MicrosoftAspNetCoreTestHostPackageVersion>9.0.0-preview.7.24366.8</MicrosoftAspNetCoreTestHostPackageVersion>
254-
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>9.0.0-preview.7.24366.8</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
255-
<MicrosoftAspNetCoreAppRefInternalPackageVersion>9.0.0-preview.7.24366.8</MicrosoftAspNetCoreAppRefInternalPackageVersion>
256-
<VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>9.0.0-preview.7.24366.8</VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>
257-
<dotnetdevcertsPackageVersion>9.0.0-preview.7.24366.8</dotnetdevcertsPackageVersion>
258-
<dotnetuserjwtsPackageVersion>9.0.0-preview.7.24366.8</dotnetuserjwtsPackageVersion>
259-
<dotnetusersecretsPackageVersion>9.0.0-preview.7.24366.8</dotnetusersecretsPackageVersion>
247+
<MicrosoftAspNetCoreAppRefPackageVersion>9.0.0-preview.7.24369.10</MicrosoftAspNetCoreAppRefPackageVersion>
248+
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>9.0.0-preview.7.24369.10</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
249+
<MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>9.0.0-preview.7.24369.10</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
250+
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>9.0.0-preview.7.24369.10</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
251+
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>9.0.0-preview.7.24369.10</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
252+
<MicrosoftAspNetCoreAnalyzersPackageVersion>9.0.0-preview.7.24369.10</MicrosoftAspNetCoreAnalyzersPackageVersion>
253+
<MicrosoftAspNetCoreTestHostPackageVersion>9.0.0-preview.7.24369.10</MicrosoftAspNetCoreTestHostPackageVersion>
254+
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>9.0.0-preview.7.24369.10</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
255+
<MicrosoftAspNetCoreAppRefInternalPackageVersion>9.0.0-preview.7.24369.10</MicrosoftAspNetCoreAppRefInternalPackageVersion>
256+
<VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>9.0.0-preview.7.24369.10</VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>
257+
<dotnetdevcertsPackageVersion>9.0.0-preview.7.24369.10</dotnetdevcertsPackageVersion>
258+
<dotnetuserjwtsPackageVersion>9.0.0-preview.7.24369.10</dotnetuserjwtsPackageVersion>
259+
<dotnetusersecretsPackageVersion>9.0.0-preview.7.24369.10</dotnetusersecretsPackageVersion>
260260
</PropertyGroup>
261261
<PropertyGroup>
262262
<!-- Dependencies from https://github.com/dotnet/razor -->
263-
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>9.0.0-preview.24367.1</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
264-
<MicrosoftCodeAnalysisRazorToolingInternalVersion>9.0.0-preview.24367.1</MicrosoftCodeAnalysisRazorToolingInternalVersion>
265-
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>9.0.0-preview.24367.1</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
263+
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>9.0.0-preview.24369.5</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
264+
<MicrosoftCodeAnalysisRazorToolingInternalVersion>9.0.0-preview.24369.5</MicrosoftCodeAnalysisRazorToolingInternalVersion>
265+
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>9.0.0-preview.24369.5</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
266266
</PropertyGroup>
267267
<PropertyGroup>
268268
<!-- Dependencies from https://github.com/dotnet/wpf -->
269-
<MicrosoftNETSdkWindowsDesktopPackageVersion>9.0.0-preview.7.24366.8</MicrosoftNETSdkWindowsDesktopPackageVersion>
270-
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>9.0.0-preview.7.24366.8</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
269+
<MicrosoftNETSdkWindowsDesktopPackageVersion>9.0.0-preview.7.24367.6</MicrosoftNETSdkWindowsDesktopPackageVersion>
270+
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>9.0.0-preview.7.24367.6</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
271271
</PropertyGroup>
272272
<PropertyGroup Label="Runtime and Apphost aliases">
273273
<!-- 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. -->
@@ -311,10 +311,10 @@
311311
</PropertyGroup>
312312
<PropertyGroup>
313313
<!-- Dependencies from https://github.com/dotnet/arcade -->
314-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24360.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
315-
<MicrosoftDotNetSignToolVersion>9.0.0-beta.24360.4</MicrosoftDotNetSignToolVersion>
316-
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.24360.4</MicrosoftDotNetXliffTasksVersion>
317-
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24360.4</MicrosoftDotNetXUnitExtensionsVersion>
314+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24368.9</MicrosoftDotNetBuildTasksInstallersPackageVersion>
315+
<MicrosoftDotNetSignToolVersion>9.0.0-beta.24368.9</MicrosoftDotNetSignToolVersion>
316+
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.24368.9</MicrosoftDotNetXliffTasksVersion>
317+
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24368.9</MicrosoftDotNetXUnitExtensionsVersion>
318318
</PropertyGroup>
319319
<PropertyGroup>
320320
<!-- 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"

‎eng/common/core-templates/steps/publish-logs.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ steps:
3232
'$(MaestroAccessToken)'
3333
'$(dn-bot-all-orgs-artifact-feeds-rw)'
3434
'$(akams-client-id)'
35-
'$(akams-client-secret)'
3635
'$(microsoft-symbol-server-pat)'
3736
'$(symweb-symbol-server-pat)'
3837
'$(dn-bot-all-orgs-build-rw-code-rw)'

0 commit comments

Comments
 (0)