Skip to content

Commit 2ddd2b8

Browse files
f-alizadaf-alizada
authored
Merge branch 'main' into dev/f-alizada/add-automation-for-respect-custom-culture-property
2 parents b14e9f4 + 29904b2 commit 2ddd2b8

File tree

87 files changed

+136
-4060
lines changed

Some content is hidden

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

87 files changed

+136
-4060
lines changed

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

‎eng/Versions.props

Lines changed: 23 additions & 23 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>
@@ -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>
@@ -241,25 +241,25 @@
241241
</PropertyGroup>
242242
<PropertyGroup>
243243
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
244-
<MicrosoftAspNetCoreAppRefPackageVersion>9.0.0-preview.7.24368.11</MicrosoftAspNetCoreAppRefPackageVersion>
245-
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>9.0.0-preview.7.24368.11</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
246-
<MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>9.0.0-preview.7.24368.11</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
247-
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>9.0.0-preview.7.24368.11</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
248-
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>9.0.0-preview.7.24368.11</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
249-
<MicrosoftAspNetCoreAnalyzersPackageVersion>9.0.0-preview.7.24368.11</MicrosoftAspNetCoreAnalyzersPackageVersion>
250-
<MicrosoftAspNetCoreTestHostPackageVersion>9.0.0-preview.7.24368.11</MicrosoftAspNetCoreTestHostPackageVersion>
251-
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>9.0.0-preview.7.24368.11</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
252-
<MicrosoftAspNetCoreAppRefInternalPackageVersion>9.0.0-preview.7.24368.11</MicrosoftAspNetCoreAppRefInternalPackageVersion>
253-
<VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>9.0.0-preview.7.24368.11</VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>
254-
<dotnetdevcertsPackageVersion>9.0.0-preview.7.24368.11</dotnetdevcertsPackageVersion>
255-
<dotnetuserjwtsPackageVersion>9.0.0-preview.7.24368.11</dotnetuserjwtsPackageVersion>
256-
<dotnetusersecretsPackageVersion>9.0.0-preview.7.24368.11</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.24367.1</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
261-
<MicrosoftCodeAnalysisRazorToolingInternalVersion>9.0.0-preview.24367.1</MicrosoftCodeAnalysisRazorToolingInternalVersion>
262-
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>9.0.0-preview.24367.1</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 -->
@@ -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"

‎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)'

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ try {
4242
--azdev-pat "$AzdoToken" `
4343
--bar-uri "$MaestroApiEndPoint" `
4444
--ci `
45+
--verbose `
4546
@optionalParams
4647

4748
if ($LastExitCode -ne 0) {

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
"cmake": "latest"
1818
},
1919
"msbuild-sdks": {
20-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24360.4",
21-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24360.4",
20+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24368.9",
21+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24368.9",
2222
"Microsoft.Build.NoTargets": "3.7.0",
2323
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1"
2424
}

‎sdk.sln

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -501,8 +501,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VSTemplateLocator", "src\In
501501
EndProject
502502
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "core-sdk-tasks.Tests", "test\core-sdk-tasks.Tests\core-sdk-tasks.Tests.csproj", "{21C21975-84C1-4A24-8E21-F7EC790A4584}"
503503
EndProject
504-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Tools.Tests.Utilities", "test\Microsoft.DotNet.Tools.Tests.Utilities\Microsoft.DotNet.Tools.Tests.Utilities.csproj", "{6E690AC5-8D00-419F-B5BC-C29D099EDE59}"
505-
EndProject
506504
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.WebTools.AspireService.Package", "src\BuiltInTools\AspireService\Microsoft.WebTools.AspireService.Package.csproj", "{19014C60-F87C-4CC7-AC0F-C41B6126EBCE}"
507505
EndProject
508506
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Microsoft.WebTools.AspireService", "src\BuiltInTools\AspireService\Microsoft.WebTools.AspireService.shproj", "{94C8526E-DCC2-442F-9868-3DD0BA2688BE}"
@@ -959,10 +957,6 @@ Global
959957
{21C21975-84C1-4A24-8E21-F7EC790A4584}.Debug|Any CPU.Build.0 = Debug|Any CPU
960958
{21C21975-84C1-4A24-8E21-F7EC790A4584}.Release|Any CPU.ActiveCfg = Release|Any CPU
961959
{21C21975-84C1-4A24-8E21-F7EC790A4584}.Release|Any CPU.Build.0 = Release|Any CPU
962-
{6E690AC5-8D00-419F-B5BC-C29D099EDE59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
963-
{6E690AC5-8D00-419F-B5BC-C29D099EDE59}.Debug|Any CPU.Build.0 = Debug|Any CPU
964-
{6E690AC5-8D00-419F-B5BC-C29D099EDE59}.Release|Any CPU.ActiveCfg = Release|Any CPU
965-
{6E690AC5-8D00-419F-B5BC-C29D099EDE59}.Release|Any CPU.Build.0 = Release|Any CPU
966960
{19014C60-F87C-4CC7-AC0F-C41B6126EBCE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
967961
{19014C60-F87C-4CC7-AC0F-C41B6126EBCE}.Debug|Any CPU.Build.0 = Debug|Any CPU
968962
{19014C60-F87C-4CC7-AC0F-C41B6126EBCE}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -1146,7 +1140,6 @@ Global
11461140
{27E399C0-6F91-45D6-A63D-041DA41CCFDF} = {3FA6F1CB-295B-4414-B18F-93845917A8CD}
11471141
{0CBA5FB8-71A3-457A-89F3-E52B9602164A} = {3FA6F1CB-295B-4414-B18F-93845917A8CD}
11481142
{21C21975-84C1-4A24-8E21-F7EC790A4584} = {580D1AE7-AA8F-4912-8B76-105594E00B3B}
1149-
{6E690AC5-8D00-419F-B5BC-C29D099EDE59} = {580D1AE7-AA8F-4912-8B76-105594E00B3B}
11501143
{19014C60-F87C-4CC7-AC0F-C41B6126EBCE} = {71A9F549-0EB6-41F9-BC16-4A6C5007FC91}
11511144
{94C8526E-DCC2-442F-9868-3DD0BA2688BE} = {71A9F549-0EB6-41F9-BC16-4A6C5007FC91}
11521145
{FA579C03-2EB4-4D47-88EE-BFF339E96FAF} = {22AB674F-ED91-4FBC-BFEE-8A1E82F9F05E}

0 commit comments

Comments
 (0)