Skip to content

Commit 3ddb91e

Browse files
f-alizadaf-alizada
authored
Merge branch 'main' into dev/f-alizada/add-automation-for-respect-custom-culture-property
2 parents 10896e1 + ea524b1 commit 3ddb91e

File tree

12 files changed

+11539
-151
lines changed

12 files changed

+11539
-151
lines changed

‎eng/ManualVersions.props

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,13 @@
99
Basically: In this file, choose the highest version when resolving merge conflicts.
1010
-->
1111
<PropertyGroup>
12-
<MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>10.0.17763.31</MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>
13-
<MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>10.0.18362.31</MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>
14-
<MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>10.0.19041.31</MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>
15-
<MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>10.0.20348.31</MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>
16-
<MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>10.0.22000.31</MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>
17-
<MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>10.0.22621.31</MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>
12+
<MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>10.0.17763.34</MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>
13+
<MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>10.0.18362.34</MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>
14+
<MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>10.0.19041.34</MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>
15+
<MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>10.0.20348.34</MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>
16+
<MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>10.0.22000.34</MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>
17+
<MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>10.0.22621.34</MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>
18+
<MicrosoftWindowsSDKNETRef10_0_26100PackageVersion>10.0.26100.34</MicrosoftWindowsSDKNETRef10_0_26100PackageVersion>
1819
</PropertyGroup>
1920

2021
</Project>

‎eng/SourceBuildPrebuiltBaseline.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@
4747

4848
<!-- These are coming in via runtime but the source-build infra isn't able to automatically pick up the right intermediate. -->
4949
<UsagePattern IdentityGlob="Microsoft.NETCore.App.Crossgen2.linux-x64/*9.0.*" />
50+
51+
<UsagePattern IdentityGlob="System.IO.Pipelines/*8.0.0*" />
52+
<UsagePattern IdentityGlob="System.Threading.Tasks.Dataflow/*8.0.0*" />
5053
</IgnorePatterns>
5154

5255
</UsageData>

‎eng/Version.Details.xml

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

‎eng/Versions.props

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -119,14 +119,14 @@
119119
</PropertyGroup>
120120
<PropertyGroup>
121121
<!-- Dependency from https://github.com/dotnet/winforms -->
122-
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>9.0.0-preview.7.24361.1</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
122+
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>9.0.0-preview.7.24364.1</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
123123
</PropertyGroup>
124124
<PropertyGroup>
125125
<!-- Dependency from https://github.com/dotnet/test-templates -->
126126
<!-- Supported versions -->
127127
<MicrosoftDotNetTestProjectTemplates60PackageVersion>1.1.0-rc.24069.1</MicrosoftDotNetTestProjectTemplates60PackageVersion>
128128
<MicrosoftDotNetTestProjectTemplates80PackageVersion>1.1.0-rc.24202.1</MicrosoftDotNetTestProjectTemplates80PackageVersion>
129-
<MicrosoftDotNetTestProjectTemplates90PackageVersion>1.1.0-rc.24360.1</MicrosoftDotNetTestProjectTemplates90PackageVersion>
129+
<MicrosoftDotNetTestProjectTemplates90PackageVersion>1.1.0-rc.24365.1</MicrosoftDotNetTestProjectTemplates90PackageVersion>
130130
</PropertyGroup>
131131
<PropertyGroup>
132132
<!-- Dependencies from https://github.com/dotnet/runtime -->
@@ -163,10 +163,10 @@
163163
</PropertyGroup>
164164
<PropertyGroup>
165165
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
166-
<VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>9.0.0-preview.7.24363.1</VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>
167-
<VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>9.0.0-preview.7.24363.1</VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>
168-
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>9.0.0-preview.7.24363.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
169-
<MicrosoftWindowsDesktopAppRefPackageVersion>9.0.0-preview.7.24363.1</MicrosoftWindowsDesktopAppRefPackageVersion>
166+
<VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>9.0.0-preview.7.24365.3</VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>
167+
<VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>9.0.0-preview.7.24365.3</VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>
168+
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>9.0.0-preview.7.24365.3</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
169+
<MicrosoftWindowsDesktopAppRefPackageVersion>9.0.0-preview.7.24365.3</MicrosoftWindowsDesktopAppRefPackageVersion>
170170
</PropertyGroup>
171171
<PropertyGroup>
172172
<!-- Dependencies from https://github.com/nuget/nuget.client -->
@@ -221,13 +221,13 @@
221221
</PropertyGroup>
222222
<PropertyGroup>
223223
<!-- Dependencies from https://github.com/dotnet/templating -->
224-
<MicrosoftTemplateEngineAbstractionsPackageVersion>9.0.100-preview.7.24359.3</MicrosoftTemplateEngineAbstractionsPackageVersion>
224+
<MicrosoftTemplateEngineAbstractionsPackageVersion>9.0.100-preview.7.24364.1</MicrosoftTemplateEngineAbstractionsPackageVersion>
225225
<MicrosoftTemplateEngineEdgePackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineEdgePackageVersion>
226226
<MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
227227
<MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
228228
<MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
229229
<!-- test dependencies -->
230-
<MicrosoftTemplateEngineMocksPackageVersion>9.0.100-preview.7.24359.3</MicrosoftTemplateEngineMocksPackageVersion>
230+
<MicrosoftTemplateEngineMocksPackageVersion>9.0.100-preview.7.24364.1</MicrosoftTemplateEngineMocksPackageVersion>
231231
<MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
232232
<MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
233233
<MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>
@@ -238,41 +238,41 @@
238238
</PropertyGroup>
239239
<PropertyGroup>
240240
<!-- Dependencies from https://github.com/dotnet/roslyn -->
241-
<MicrosoftNetCompilersToolsetVersion>4.12.0-1.24362.11</MicrosoftNetCompilersToolsetVersion>
242-
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.12.0-1.24362.11</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
243-
<MicrosoftCodeAnalysisPackageVersion>4.12.0-1.24362.11</MicrosoftCodeAnalysisPackageVersion>
244-
<MicrosoftCodeAnalysisCSharpPackageVersion>4.12.0-1.24362.11</MicrosoftCodeAnalysisCSharpPackageVersion>
245-
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.12.0-1.24362.11</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
246-
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.12.0-1.24362.11</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
247-
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.12.0-1.24362.11</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
248-
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.12.0-1.24362.11</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
241+
<MicrosoftNetCompilersToolsetVersion>4.12.0-1.24365.10</MicrosoftNetCompilersToolsetVersion>
242+
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.12.0-1.24365.10</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
243+
<MicrosoftCodeAnalysisPackageVersion>4.12.0-1.24365.10</MicrosoftCodeAnalysisPackageVersion>
244+
<MicrosoftCodeAnalysisCSharpPackageVersion>4.12.0-1.24365.10</MicrosoftCodeAnalysisCSharpPackageVersion>
245+
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.12.0-1.24365.10</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
246+
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.12.0-1.24365.10</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
247+
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.12.0-1.24365.10</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
248+
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.12.0-1.24365.10</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
249249
</PropertyGroup>
250250
<PropertyGroup>
251251
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
252-
<MicrosoftAspNetCoreAppRefPackageVersion>9.0.0-preview.7.24362.5</MicrosoftAspNetCoreAppRefPackageVersion>
253-
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>9.0.0-preview.7.24362.5</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
254-
<MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>9.0.0-preview.7.24362.5</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
255-
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>9.0.0-preview.7.24362.5</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
256-
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>9.0.0-preview.7.24362.5</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
257-
<MicrosoftAspNetCoreAnalyzersPackageVersion>9.0.0-preview.7.24362.5</MicrosoftAspNetCoreAnalyzersPackageVersion>
258-
<MicrosoftAspNetCoreTestHostPackageVersion>9.0.0-preview.7.24362.5</MicrosoftAspNetCoreTestHostPackageVersion>
259-
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>9.0.0-preview.7.24362.5</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
260-
<MicrosoftAspNetCoreAppRefInternalPackageVersion>9.0.0-preview.7.24362.5</MicrosoftAspNetCoreAppRefInternalPackageVersion>
261-
<VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>9.0.0-preview.7.24362.5</VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>
262-
<dotnetdevcertsPackageVersion>9.0.0-preview.7.24362.5</dotnetdevcertsPackageVersion>
263-
<dotnetuserjwtsPackageVersion>9.0.0-preview.7.24362.5</dotnetuserjwtsPackageVersion>
264-
<dotnetusersecretsPackageVersion>9.0.0-preview.7.24362.5</dotnetusersecretsPackageVersion>
252+
<MicrosoftAspNetCoreAppRefPackageVersion>9.0.0-preview.7.24365.9</MicrosoftAspNetCoreAppRefPackageVersion>
253+
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>9.0.0-preview.7.24365.9</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
254+
<MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>9.0.0-preview.7.24365.9</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
255+
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>9.0.0-preview.7.24365.9</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
256+
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>9.0.0-preview.7.24365.9</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
257+
<MicrosoftAspNetCoreAnalyzersPackageVersion>9.0.0-preview.7.24365.9</MicrosoftAspNetCoreAnalyzersPackageVersion>
258+
<MicrosoftAspNetCoreTestHostPackageVersion>9.0.0-preview.7.24365.9</MicrosoftAspNetCoreTestHostPackageVersion>
259+
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>9.0.0-preview.7.24365.9</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
260+
<MicrosoftAspNetCoreAppRefInternalPackageVersion>9.0.0-preview.7.24365.9</MicrosoftAspNetCoreAppRefInternalPackageVersion>
261+
<VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>9.0.0-preview.7.24365.9</VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>
262+
<dotnetdevcertsPackageVersion>9.0.0-preview.7.24365.9</dotnetdevcertsPackageVersion>
263+
<dotnetuserjwtsPackageVersion>9.0.0-preview.7.24365.9</dotnetuserjwtsPackageVersion>
264+
<dotnetusersecretsPackageVersion>9.0.0-preview.7.24365.9</dotnetusersecretsPackageVersion>
265265
</PropertyGroup>
266266
<PropertyGroup>
267267
<!-- Dependencies from https://github.com/dotnet/razor -->
268-
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>9.0.0-preview.24362.2</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
269-
<MicrosoftCodeAnalysisRazorToolingInternalVersion>9.0.0-preview.24362.2</MicrosoftCodeAnalysisRazorToolingInternalVersion>
270-
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>9.0.0-preview.24362.2</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
268+
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>9.0.0-preview.24365.1</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
269+
<MicrosoftCodeAnalysisRazorToolingInternalVersion>9.0.0-preview.24365.1</MicrosoftCodeAnalysisRazorToolingInternalVersion>
270+
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>9.0.0-preview.24365.1</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
271271
</PropertyGroup>
272272
<PropertyGroup>
273273
<!-- Dependencies from https://github.com/dotnet/wpf -->
274-
<MicrosoftNETSdkWindowsDesktopPackageVersion>9.0.0-preview.7.24362.2</MicrosoftNETSdkWindowsDesktopPackageVersion>
275-
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>9.0.0-preview.7.24362.2</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
274+
<MicrosoftNETSdkWindowsDesktopPackageVersion>9.0.0-preview.7.24365.1</MicrosoftNETSdkWindowsDesktopPackageVersion>
275+
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>9.0.0-preview.7.24365.1</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
276276
</PropertyGroup>
277277
<PropertyGroup Label="Runtime and Apphost aliases">
278278
<!-- 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. -->
@@ -355,13 +355,13 @@
355355
<PropertyGroup Label="Workload manifest package versions">
356356
<AspireFeatureBand>8.0.100</AspireFeatureBand>
357357
<MicrosoftNETSdkAspireManifest80100PackageVersion>8.0.1</MicrosoftNETSdkAspireManifest80100PackageVersion>
358-
<MauiFeatureBand>9.0.100-preview.1</MauiFeatureBand>
359-
<MauiWorkloadManifestVersion>9.0.0-preview.1.9973</MauiWorkloadManifestVersion>
360-
<XamarinAndroidWorkloadManifestVersion>34.99.0-preview.1.151</XamarinAndroidWorkloadManifestVersion>
361-
<XamarinIOSWorkloadManifestVersion>17.2.9088-net9-p1</XamarinIOSWorkloadManifestVersion>
362-
<XamarinMacCatalystWorkloadManifestVersion>17.2.9088-net9-p1</XamarinMacCatalystWorkloadManifestVersion>
363-
<XamarinMacOSWorkloadManifestVersion>14.2.9088-net9-p1</XamarinMacOSWorkloadManifestVersion>
364-
<XamarinTvOSWorkloadManifestVersion>17.2.9088-net9-p1</XamarinTvOSWorkloadManifestVersion>
358+
<MauiFeatureBand>9.0.100-preview.6</MauiFeatureBand>
359+
<MauiWorkloadManifestVersion>9.0.0-preview.6.24327.7</MauiWorkloadManifestVersion>
360+
<XamarinAndroidWorkloadManifestVersion>34.99.0-preview.6.340</XamarinAndroidWorkloadManifestVersion>
361+
<XamarinIOSWorkloadManifestVersion>17.2.9714-net9-p6</XamarinIOSWorkloadManifestVersion>
362+
<XamarinMacCatalystWorkloadManifestVersion>17.2.9714-net9-p6</XamarinMacCatalystWorkloadManifestVersion>
363+
<XamarinMacOSWorkloadManifestVersion>14.2.9714-net9-p6</XamarinMacOSWorkloadManifestVersion>
364+
<XamarinTvOSWorkloadManifestVersion>17.2.9714-net9-p6</XamarinTvOSWorkloadManifestVersion>
365365
<!-- Workloads from dotnet/emsdk -->
366366
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion>9.0.0-preview.7.24352.2</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion>
367367
<EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion)</EmscriptenWorkloadManifestVersion>

‎eng/pipelines/templates/stages/vmr-build.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -125,14 +125,14 @@ stages:
125125
- template: ../jobs/vmr-build.yml
126126
parameters:
127127
# Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline
128-
buildName: ${{ format('{0}_Offline_PreviousSourceBuiltSdk', variables.alpineName) }}
128+
buildName: ${{ format('{0}_Offline_PreviousSourceBuiltSdk', variables.alpinePreviousName) }}
129129
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
130130
vmrBranch: ${{ variables.VmrBranch }}
131131
architecture: x64
132-
artifactsRid: ${{ variables.alpineX64Rid }}
132+
artifactsRid: ${{ variables.alpinePreviousX64Rid }}
133133
pool: ${{ parameters.pool_Linux }}
134-
container: ${{ variables.alpineContainer }}
135-
extraProperties: /p:TargetRID=${{ variables.alpineX64Rid }}
134+
container: ${{ variables.alpinePreviousContainer }}
135+
extraProperties: /p:TargetRID=${{ variables.alpinePreviousX64Rid }}
136136
buildFromArchive: false # 🚫
137137
buildSourceOnly: true # ✅
138138
enablePoison: true # ✅
@@ -154,6 +154,7 @@ stages:
154154
architecture: x64
155155
pool: ${{ parameters.pool_Linux }}
156156
container: ${{ variables.almaLinuxContainer }}
157+
extraProperties: /p:TargetRID=${{ variables.almaLinuxX64Rid }}
157158
buildFromArchive: false # 🚫
158159
buildSourceOnly: true # ✅
159160
enablePoison: false # 🚫
@@ -165,13 +166,13 @@ stages:
165166
- template: ../jobs/vmr-build.yml
166167
parameters:
167168
# Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline
168-
buildName: ${{ format('{0}_Online_MsftSdk', variables.alpineName) }}
169+
buildName: ${{ format('{0}_Online_MsftSdk', variables.alpineLatestName) }}
169170
isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
170171
vmrBranch: ${{ variables.VmrBranch }}
171172
architecture: x64
172173
pool: ${{ parameters.pool_Linux }}
173-
container: ${{ variables.alpineContainer }}
174-
extraProperties: /p:TargetRID=${{ variables.alpineX64Rid }}
174+
container: ${{ variables.alpineLatestContainer }}
175+
extraProperties: /p:TargetRID=${{ variables.alpineLatestX64Rid }}
175176
buildFromArchive: false # 🚫
176177
buildSourceOnly: true # ✅
177178
enablePoison: false # 🚫

‎eng/pipelines/templates/variables/vmr-build.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ variables:
1414

1515
- name: almaLinuxContainer
1616
value: mcr.microsoft.com/dotnet-buildtools/prereqs:almalinux-8-source-build
17-
- name: alpineContainer
17+
- name: alpineLatestContainer
18+
value: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.20-withnode
19+
- name: alpinePreviousContainer
1820
value: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode
1921
- name: centOSStreamContainer
2022
value: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9
@@ -47,7 +49,9 @@ variables:
4749

4850
- name: almaLinuxName
4951
value: AlmaLinux8
50-
- name: alpineName
52+
- name: alpineLatestName
53+
value: Alpine320
54+
- name: alpinePreviousName
5155
value: Alpine319
5256
- name: centOSStreamName
5357
value: CentOSStream9
@@ -58,7 +62,9 @@ variables:
5862

5963
- name: almaLinuxX64Rid
6064
value: almalinux.8-x64
61-
- name: alpineX64Rid
65+
- name: alpineLatestX64Rid
66+
value: alpine.3.20-x64
67+
- name: alpinePreviousX64Rid
6268
value: alpine.3.19-x64
6369
- name: centOSStreamX64Rid
6470
value: centos.9-x64

0 commit comments

Comments
 (0)