Skip to content

Commit c1b0b27

Browse files
dotnet-botdotnet-bot
committed
Merge in 'release/6.0' changes
2 parents de31d46 + ab21f0e commit c1b0b27

File tree

58 files changed

+1184
-1034
lines changed

Some content is hidden

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

58 files changed

+1184
-1034
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
]
1616
},
1717
"microsoft.dotnet.xharness.cli": {
18-
"version": "6.0.0-prerelease.24208.3",
18+
"version": "6.0.0-prerelease.24224.2",
1919
"commands": [
2020
"xharness"
2121
]

‎NuGet.config‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
1111
<!-- Begin: Package sources from dotnet-emsdk -->
1212
<add key="darc-pub-dotnet-emsdk-5a2faf3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-5a2faf37/nuget/v3/index.json" />
13+
<add key="darc-pub-dotnet-emsdk-1107112" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-1107112d/nuget/v3/index.json" />
14+
<add key="darc-pub-dotnet-emsdk-8601068" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-86010681/nuget/v3/index.json" />
1315
<!-- End: Package sources from dotnet-emsdk -->
1416
<!-- Begin: Package sources from dotnet-wcf -->
1517
<!-- End: Package sources from dotnet-wcf -->

‎eng/Version.Details.xml‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
<Dependencies>
22
<ProductDependencies>
3-
<Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="6.0.0-rtm.24211.1">
3+
<Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="6.0.0-rtm.24269.3">
44
<Uri>https://github.com/dotnet/icu</Uri>
5-
<Sha>f2734cffa9b7f1270de7cc701e76b9a8eb938a19</Sha>
5+
<Sha>def3524876b6b84a72e8ed02db6077f9c0ce8a75</Sha>
66
</Dependency>
77
<Dependency Name="System.Net.MsQuic.Transport" Version="6.0.0-servicing.22205.1">
88
<Uri>https://github.com/dotnet/msquic</Uri>
99
<Sha>7312355e44fd230b7aa26c7190f3870391751476</Sha>
1010
</Dependency>
1111
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.100" Version="6.0.32">
1212
<Uri>https://github.com/dotnet/emsdk</Uri>
13-
<Sha>5a2faf37a44cf9ec7d58ef5cf8e7e9420ea04615</Sha>
13+
<Sha>8601068126449af799f8e07ca358dbbd4b3fcab4</Sha>
1414
</Dependency>
1515
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.300" Version="6.0.32">
1616
<Uri>https://github.com/dotnet/emsdk</Uri>
17-
<Sha>5a2faf37a44cf9ec7d58ef5cf8e7e9420ea04615</Sha>
17+
<Sha>8601068126449af799f8e07ca358dbbd4b3fcab4</Sha>
1818
</Dependency>
1919
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.400" Version="6.0.32">
2020
<Uri>https://github.com/dotnet/emsdk</Uri>
21-
<Sha>5a2faf37a44cf9ec7d58ef5cf8e7e9420ea04615</Sha>
21+
<Sha>8601068126449af799f8e07ca358dbbd4b3fcab4</Sha>
2222
</Dependency>
2323
<Dependency Name="System.ServiceModel.Primitives" Version="4.9.0">
2424
<Uri>https://github.com/dotnet/wcf</Uri>
@@ -102,49 +102,49 @@
102102
<Uri>https://github.com/microsoft/vstest</Uri>
103103
<Sha>140434f7109d357d0158ade9e5164a4861513965</Sha>
104104
</Dependency>
105-
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="6.0.0-beta.24211.3">
105+
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="6.0.0-beta.24271.2">
106106
<Uri>https://github.com/dotnet/runtime-assets</Uri>
107-
<Sha>3b33dc5e6c1ab334ee4ca9f76ccae84ade59a12a</Sha>
107+
<Sha>600fbf042f688f9db813f69bd8a6525b84efb7e6</Sha>
108108
</Dependency>
109-
<Dependency Name="System.Data.Common.TestData" Version="6.0.0-beta.24211.3">
109+
<Dependency Name="System.Data.Common.TestData" Version="6.0.0-beta.24271.2">
110110
<Uri>https://github.com/dotnet/runtime-assets</Uri>
111-
<Sha>3b33dc5e6c1ab334ee4ca9f76ccae84ade59a12a</Sha>
111+
<Sha>600fbf042f688f9db813f69bd8a6525b84efb7e6</Sha>
112112
</Dependency>
113-
<Dependency Name="System.Drawing.Common.TestData" Version="6.0.0-beta.24211.3">
113+
<Dependency Name="System.Drawing.Common.TestData" Version="6.0.0-beta.24271.2">
114114
<Uri>https://github.com/dotnet/runtime-assets</Uri>
115-
<Sha>3b33dc5e6c1ab334ee4ca9f76ccae84ade59a12a</Sha>
115+
<Sha>600fbf042f688f9db813f69bd8a6525b84efb7e6</Sha>
116116
</Dependency>
117-
<Dependency Name="System.IO.Compression.TestData" Version="6.0.0-beta.24211.3">
117+
<Dependency Name="System.IO.Compression.TestData" Version="6.0.0-beta.24271.2">
118118
<Uri>https://github.com/dotnet/runtime-assets</Uri>
119-
<Sha>3b33dc5e6c1ab334ee4ca9f76ccae84ade59a12a</Sha>
119+
<Sha>600fbf042f688f9db813f69bd8a6525b84efb7e6</Sha>
120120
</Dependency>
121-
<Dependency Name="System.IO.Packaging.TestData" Version="6.0.0-beta.24211.3">
121+
<Dependency Name="System.IO.Packaging.TestData" Version="6.0.0-beta.24271.2">
122122
<Uri>https://github.com/dotnet/runtime-assets</Uri>
123-
<Sha>3b33dc5e6c1ab334ee4ca9f76ccae84ade59a12a</Sha>
123+
<Sha>600fbf042f688f9db813f69bd8a6525b84efb7e6</Sha>
124124
</Dependency>
125-
<Dependency Name="System.Net.TestData" Version="6.0.0-beta.24211.3">
125+
<Dependency Name="System.Net.TestData" Version="6.0.0-beta.24271.2">
126126
<Uri>https://github.com/dotnet/runtime-assets</Uri>
127-
<Sha>3b33dc5e6c1ab334ee4ca9f76ccae84ade59a12a</Sha>
127+
<Sha>600fbf042f688f9db813f69bd8a6525b84efb7e6</Sha>
128128
</Dependency>
129-
<Dependency Name="System.Private.Runtime.UnicodeData" Version="6.0.0-beta.24211.3">
129+
<Dependency Name="System.Private.Runtime.UnicodeData" Version="6.0.0-beta.24271.2">
130130
<Uri>https://github.com/dotnet/runtime-assets</Uri>
131-
<Sha>3b33dc5e6c1ab334ee4ca9f76ccae84ade59a12a</Sha>
131+
<Sha>600fbf042f688f9db813f69bd8a6525b84efb7e6</Sha>
132132
</Dependency>
133-
<Dependency Name="System.Runtime.TimeZoneData" Version="6.0.0-beta.24211.3">
133+
<Dependency Name="System.Runtime.TimeZoneData" Version="6.0.0-beta.24271.2">
134134
<Uri>https://github.com/dotnet/runtime-assets</Uri>
135-
<Sha>3b33dc5e6c1ab334ee4ca9f76ccae84ade59a12a</Sha>
135+
<Sha>600fbf042f688f9db813f69bd8a6525b84efb7e6</Sha>
136136
</Dependency>
137-
<Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="6.0.0-beta.24211.3">
137+
<Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="6.0.0-beta.24271.2">
138138
<Uri>https://github.com/dotnet/runtime-assets</Uri>
139-
<Sha>3b33dc5e6c1ab334ee4ca9f76ccae84ade59a12a</Sha>
139+
<Sha>600fbf042f688f9db813f69bd8a6525b84efb7e6</Sha>
140140
</Dependency>
141-
<Dependency Name="System.Windows.Extensions.TestData" Version="6.0.0-beta.24211.3">
141+
<Dependency Name="System.Windows.Extensions.TestData" Version="6.0.0-beta.24271.2">
142142
<Uri>https://github.com/dotnet/runtime-assets</Uri>
143-
<Sha>3b33dc5e6c1ab334ee4ca9f76ccae84ade59a12a</Sha>
143+
<Sha>600fbf042f688f9db813f69bd8a6525b84efb7e6</Sha>
144144
</Dependency>
145-
<Dependency Name="Microsoft.DotNet.CilStrip.Sources" Version="6.0.0-beta.24211.3">
145+
<Dependency Name="Microsoft.DotNet.CilStrip.Sources" Version="6.0.0-beta.24271.2">
146146
<Uri>https://github.com/dotnet/runtime-assets</Uri>
147-
<Sha>3b33dc5e6c1ab334ee4ca9f76ccae84ade59a12a</Sha>
147+
<Sha>600fbf042f688f9db813f69bd8a6525b84efb7e6</Sha>
148148
</Dependency>
149149
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="11.1.0-alpha.1.21416.1">
150150
<Uri>https://github.com/dotnet/llvm-project</Uri>
@@ -214,13 +214,13 @@
214214
<Uri>https://github.com/mono/linker</Uri>
215215
<Sha>c8499798a2a09639174e2f5c694d6652794cc73d</Sha>
216216
</Dependency>
217-
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="6.0.0-prerelease.24208.3">
217+
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="6.0.0-prerelease.24224.2">
218218
<Uri>https://github.com/dotnet/xharness</Uri>
219-
<Sha>b107ade008f89b2e4e7ce73ee92b6ba193bb623a</Sha>
219+
<Sha>d1dd9c2ce3fc0b9358d2cda64c52d052d1a612c1</Sha>
220220
</Dependency>
221-
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="6.0.0-prerelease.24208.3">
221+
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="6.0.0-prerelease.24224.2">
222222
<Uri>https://github.com/dotnet/xharness</Uri>
223-
<Sha>b107ade008f89b2e4e7ce73ee92b6ba193bb623a</Sha>
223+
<Sha>d1dd9c2ce3fc0b9358d2cda64c52d052d1a612c1</Sha>
224224
</Dependency>
225225
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.24266.4">
226226
<Uri>https://github.com/dotnet/arcade</Uri>
@@ -242,13 +242,13 @@
242242
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
243243
<Sha>d50065944d8b41d804448a7056351481d583ad3d</Sha>
244244
</Dependency>
245-
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="6.0.0-alpha.0.24211.2">
245+
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="6.0.0-alpha.0.24271.2">
246246
<Uri>https://github.com/dotnet/hotreload-utils</Uri>
247-
<Sha>b11d2b601cd75038e3f587650f75286f0a0b6902</Sha>
247+
<Sha>6f095cd6901ed48a469289f7f4f91d30a420d1ad</Sha>
248248
</Dependency>
249-
<Dependency Name="System.Runtime.Numerics.TestData" Version="6.0.0-beta.24211.3">
249+
<Dependency Name="System.Runtime.Numerics.TestData" Version="6.0.0-beta.24271.2">
250250
<Uri>https://github.com/dotnet/runtime-assets</Uri>
251-
<Sha>3b33dc5e6c1ab334ee4ca9f76ccae84ade59a12a</Sha>
251+
<Sha>600fbf042f688f9db813f69bd8a6525b84efb7e6</Sha>
252252
</Dependency>
253253
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0-rc1.21413.4">
254254
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>

‎eng/Versions.props‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -108,25 +108,25 @@
108108
<SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>
109109
<runtimenativeSystemIOPortsVersion>6.0.0-rc.1.21415.6</runtimenativeSystemIOPortsVersion>
110110
<!-- Runtime-Assets dependencies -->
111-
<SystemRuntimeNumericsTestDataVersion>6.0.0-beta.24211.3</SystemRuntimeNumericsTestDataVersion>
112-
<SystemComponentModelTypeConverterTestDataVersion>6.0.0-beta.24211.3</SystemComponentModelTypeConverterTestDataVersion>
113-
<SystemDataCommonTestDataVersion>6.0.0-beta.24211.3</SystemDataCommonTestDataVersion>
114-
<SystemDrawingCommonTestDataVersion>6.0.0-beta.24211.3</SystemDrawingCommonTestDataVersion>
115-
<SystemIOCompressionTestDataVersion>6.0.0-beta.24211.3</SystemIOCompressionTestDataVersion>
116-
<SystemIOPackagingTestDataVersion>6.0.0-beta.24211.3</SystemIOPackagingTestDataVersion>
117-
<SystemNetTestDataVersion>6.0.0-beta.24211.3</SystemNetTestDataVersion>
118-
<SystemPrivateRuntimeUnicodeDataVersion>6.0.0-beta.24211.3</SystemPrivateRuntimeUnicodeDataVersion>
119-
<SystemRuntimeTimeZoneDataVersion>6.0.0-beta.24211.3</SystemRuntimeTimeZoneDataVersion>
120-
<SystemSecurityCryptographyX509CertificatesTestDataVersion>6.0.0-beta.24211.3</SystemSecurityCryptographyX509CertificatesTestDataVersion>
121-
<SystemWindowsExtensionsTestDataVersion>6.0.0-beta.24211.3</SystemWindowsExtensionsTestDataVersion>
122-
<MicrosoftDotNetCilStripSourcesVersion>6.0.0-beta.24211.3</MicrosoftDotNetCilStripSourcesVersion>
111+
<SystemRuntimeNumericsTestDataVersion>6.0.0-beta.24271.2</SystemRuntimeNumericsTestDataVersion>
112+
<SystemComponentModelTypeConverterTestDataVersion>6.0.0-beta.24271.2</SystemComponentModelTypeConverterTestDataVersion>
113+
<SystemDataCommonTestDataVersion>6.0.0-beta.24271.2</SystemDataCommonTestDataVersion>
114+
<SystemDrawingCommonTestDataVersion>6.0.0-beta.24271.2</SystemDrawingCommonTestDataVersion>
115+
<SystemIOCompressionTestDataVersion>6.0.0-beta.24271.2</SystemIOCompressionTestDataVersion>
116+
<SystemIOPackagingTestDataVersion>6.0.0-beta.24271.2</SystemIOPackagingTestDataVersion>
117+
<SystemNetTestDataVersion>6.0.0-beta.24271.2</SystemNetTestDataVersion>
118+
<SystemPrivateRuntimeUnicodeDataVersion>6.0.0-beta.24271.2</SystemPrivateRuntimeUnicodeDataVersion>
119+
<SystemRuntimeTimeZoneDataVersion>6.0.0-beta.24271.2</SystemRuntimeTimeZoneDataVersion>
120+
<SystemSecurityCryptographyX509CertificatesTestDataVersion>6.0.0-beta.24271.2</SystemSecurityCryptographyX509CertificatesTestDataVersion>
121+
<SystemWindowsExtensionsTestDataVersion>6.0.0-beta.24271.2</SystemWindowsExtensionsTestDataVersion>
122+
<MicrosoftDotNetCilStripSourcesVersion>6.0.0-beta.24271.2</MicrosoftDotNetCilStripSourcesVersion>
123123
<!-- dotnet-optimization dependencies -->
124124
<optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.21416.5</optimizationwindows_ntx64MIBCRuntimeVersion>
125125
<optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.21416.5</optimizationwindows_ntx86MIBCRuntimeVersion>
126126
<optimizationlinuxx64MIBCRuntimeVersion>1.0.0-prerelease.21416.5</optimizationlinuxx64MIBCRuntimeVersion>
127127
<optimizationPGOCoreCLRVersion>1.0.0-prerelease.21416.5</optimizationPGOCoreCLRVersion>
128128
<!-- Not auto-updated. -->
129-
<MicrosoftDiaSymReaderNativeVersion>16.11.29-beta1.23404.4</MicrosoftDiaSymReaderNativeVersion>
129+
<MicrosoftDiaSymReaderNativeVersion>17.10.0-beta1.24272.1</MicrosoftDiaSymReaderNativeVersion>
130130
<SystemCommandLineVersion>2.0.0-beta1.20253.1</SystemCommandLineVersion>
131131
<TraceEventVersion>2.0.65</TraceEventVersion>
132132
<CommandLineParserVersion>2.2.0</CommandLineParserVersion>
@@ -143,9 +143,9 @@
143143
<!-- Testing -->
144144
<MicrosoftNETCoreCoreDisToolsVersion>1.0.1-prerelease-00006</MicrosoftNETCoreCoreDisToolsVersion>
145145
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
146-
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>6.0.0-prerelease.24208.3</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
147-
<MicrosoftDotNetXHarnessCLIVersion>6.0.0-prerelease.24208.3</MicrosoftDotNetXHarnessCLIVersion>
148-
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>6.0.0-alpha.0.23367.3</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
146+
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>6.0.0-prerelease.24224.2</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
147+
<MicrosoftDotNetXHarnessCLIVersion>6.0.0-prerelease.24224.2</MicrosoftDotNetXHarnessCLIVersion>
148+
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>6.0.0-alpha.0.24271.2</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
149149
<XUnitVersion>2.4.2-pre.9</XUnitVersion>
150150
<XUnitRunnerVisualStudioVersion>2.4.2</XUnitRunnerVisualStudioVersion>
151151
<CoverletCollectorVersion>1.3.0</CoverletCollectorVersion>
@@ -162,7 +162,7 @@
162162
<MicrosoftNETILLinkTasksVersion>6.0.100-1.21459.1</MicrosoftNETILLinkTasksVersion>
163163
<MicrosoftNETILLinkAnalyzerPackageVersion>$(MicrosoftNETILLinkTasksVersion)</MicrosoftNETILLinkAnalyzerPackageVersion>
164164
<!-- ICU -->
165-
<MicrosoftNETCoreRuntimeICUTransportVersion>6.0.0-rtm.24211.1</MicrosoftNETCoreRuntimeICUTransportVersion>
165+
<MicrosoftNETCoreRuntimeICUTransportVersion>6.0.0-rtm.24269.3</MicrosoftNETCoreRuntimeICUTransportVersion>
166166
<!-- MsQuic -->
167167
<SystemNetMsQuicTransportVersion>6.0.0-servicing.22205.1</SystemNetMsQuicTransportVersion>
168168
<!-- Mono LLVM -->

‎eng/native/configurecompiler.cmake‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -376,6 +376,9 @@ if (CLR_CMAKE_HOST_UNIX)
376376
add_compile_options(-Wno-single-bit-bitfield-constant-conversion)
377377
add_compile_options(-Wno-cast-function-type-strict)
378378
add_compile_options(-Wno-incompatible-function-pointer-types-strict)
379+
380+
# clang 18.1 supressions
381+
add_compile_options(-Wno-switch-default)
379382
else()
380383
add_compile_options(-Wno-unknown-pragmas)
381384
add_compile_options(-Wno-uninitialized)

‎eng/native/init-compiler.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ if [[ -z "$CLR_CC" ]]; then
4646
# Set default versions
4747
if [[ -z "$majorVersion" ]]; then
4848
# note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero.
49-
if [[ "$compiler" == "clang" ]]; then versions=( 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 )
49+
if [[ "$compiler" == "clang" ]]; then versions=( 18 17 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 )
5050
elif [[ "$compiler" == "gcc" ]]; then versions=( 12 11 10 9 8 7 6 5 4.9 ); fi
5151

5252
for version in "${versions[@]}"; do

‎eng/pipelines/common/global-build-job.yml‎

Lines changed: 30 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ parameters:
1414
dependsOn: []
1515
pool: ''
1616
platform: ''
17-
pgoType: ''
1817
condition: true
1918
useContinueOnErrorDuringBuild: false
2019
shouldContinueOnError: false
@@ -26,8 +25,7 @@ parameters:
2625
helixQueues: ''
2726
enablePublishTestResults: false
2827
testResultsFormat: ''
29-
extraStepsTemplate: ''
30-
extraStepsParameters: {}
28+
postBuildSteps: []
3129
enableRichCodeNavigation: false
3230
richCodeNavigationLanguage: 'csharp'
3331
richCodeNavigationEnvironment: 'production'
@@ -173,11 +171,12 @@ jobs:
173171
displayName: Install native dependencies
174172

175173
# Build
176-
- ${{ if eq(parameters.buildingOnSourceBuildImage, false) }}:
177-
- script: $(_sclEnableCommand) $(Build.SourcesDirectory)$(dir)build$(scriptExt) -ci -arch ${{ parameters.archType }} $(_osParameter) ${{ parameters.buildArgs }} $(_officialBuildParameter) $(_crossBuildPropertyArg) $(_cxx11Parameter) $(_richCodeNavigationParam) $(_buildDarwinFrameworksParameter)
178-
displayName: Build product
179-
${{ if eq(parameters.useContinueOnErrorDuringBuild, true) }}:
180-
continueOnError: ${{ parameters.shouldContinueOnError }}
174+
- template: /eng/pipelines/common/templates/global-build-step.yml
175+
parameters:
176+
buildArgs: ${{ parameters.buildArgs }}
177+
useContinueOnErrorDuringBuild: ${{ parameters.useContinueOnErrorDuringBuild }}
178+
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
179+
archType: ${{ parameters.archType }}
181180

182181
- ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS', 'Android') }}:
183182
- script: |
@@ -187,22 +186,29 @@ jobs:
187186
condition: always()
188187
189188
# If intended to send extra steps after regular build add them here.
190-
- ${{ if ne(parameters.extraStepsTemplate, '') }}:
191-
- template: ${{ parameters.extraStepsTemplate }}
192-
parameters:
193-
osGroup: ${{ parameters.osGroup }}
194-
osSubgroup: ${{ parameters.osSubgroup }}
195-
archType: ${{ parameters.archType }}
196-
buildConfig: ${{ parameters.buildConfig }}
197-
runtimeFlavor: ${{ parameters.runtimeFlavor }}
198-
runtimeVariant: ${{ parameters.runtimeVariant }}
199-
helixQueues: ${{ parameters.helixQueues }}
200-
targetRid: ${{ parameters.targetRid }}
201-
nameSuffix: ${{ parameters.nameSuffix }}
202-
platform: ${{ parameters.platform }}
203-
pgoType: ${{ parameters.pgoType }}
204-
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
205-
${{ insert }}: ${{ parameters.extraStepsParameters }}
189+
- ${{ if ne(parameters.postBuildSteps,'') }}:
190+
- ${{ each postBuildStep in parameters.postBuildSteps }}:
191+
- ${{ if ne(postBuildStep.template, '') }}:
192+
- template: ${{ postBuildStep.template }}
193+
parameters:
194+
osGroup: ${{ parameters.osGroup }}
195+
osSubgroup: ${{ parameters.osSubgroup }}
196+
archType: ${{ parameters.archType }}
197+
buildConfig: ${{ parameters.buildConfig }}
198+
runtimeFlavor: ${{ parameters.runtimeFlavor }}
199+
runtimeVariant: ${{ parameters.runtimeVariant }}
200+
helixQueues: ${{ parameters.helixQueues }}
201+
targetRid: ${{ parameters.targetRid }}
202+
nameSuffix: ${{ parameters.nameSuffix }}
203+
platform: ${{ parameters.platform }}
204+
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
205+
${{ if ne(postBuildStep.forwardedParameters, '') }}:
206+
${{ each parameter in postBuildStep.forwardedParameters }}:
207+
${{ parameter }}: ${{ parameters[parameter] }}
208+
${{ if ne(postBuildStep.parameters, '') }}:
209+
${{ insert }}: ${{ postBuildStep.parameters }}
210+
- ${{ else }}:
211+
- ${{ postBuildStep }}
206212

207213
- task: PublishBuildArtifacts@1
208214
displayName: Publish Logs

‎eng/pipelines/common/templates/global-build-step.yml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
parameters:
2+
buildArgs: ''
3+
useContinueOnErrorDuringBuild: false
4+
shouldContinueOnError: false
5+
archType: ''
6+
displayName: Build product
7+
8+
steps:
9+
- script: $(_sclEnableCommand) $(Build.SourcesDirectory)$(dir)build$(scriptExt) -ci -arch ${{ parameters.archType }} $(_osParameter) ${{ parameters.buildArgs }} $(_officialBuildParameter) $(_crossBuildPropertyArg) $(_cxx11Parameter) $(_richCodeNavigationParam) $(_buildDarwinFrameworksParameter)
10+
displayName: ${{ parameters.displayName }}
11+
${{ if eq(parameters.useContinueOnErrorDuringBuild, true) }}:
12+
continueOnError: ${{ parameters.shouldContinueOnError }}

‎eng/pipelines/common/templates/runtimes/build-test-job.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ parameters:
2323
runtimeVariant: ''
2424
dependsOn: []
2525
dependOnEvaluatePaths: false
26-
pgoType: ''
2726

2827
### Build managed test components (native components are getting built as part
2928
### of the the product build job).

0 commit comments

Comments
 (0)