Skip to content

Commit c36b66f

Browse files
author
Mirroring
committed
Merge commit 'cddad1eeb82fe9f8f46b11442e353f46230ec6ac'
2 parents 5292f3a + cddad1e commit c36b66f

File tree

66 files changed

+9978
-208
lines changed

Some content is hidden

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

66 files changed

+9978
-208
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": "8.0.0-prerelease.24229.2",
18+
"version": "8.0.0-prerelease.24480.1",
1919
"commands": [
2020
"xharness"
2121
]

‎.config/tsaoptions.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
"instanceUrl": "https://devdiv.visualstudio.com/",
33
"template": "TFSDEVDIV",
44
"projectName": "DEVDIV",
5-
"areaPath": "DevDiv\\NET Libraries",
5+
"areaPath": "DevDiv\\NET Runtime",
66
"iterationPath": "DevDiv",
77
"notificationAliases": [ "[email protected]" ],
88
"repositoryName": "Runtime",
9-
"codebaseName": "Runtime"
10-
}
9+
"codebaseName": "Runtime",
10+
"serviceTreeId": "1dc8dedc-8f5f-4b94-b182-ec3bdfb207b0"
11+
}

‎eng/Version.Details.xml

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,9 @@
104104
<Sha>fe3794a68bd668d36d4d5014a9e6c9d22c0e6d86</Sha>
105105
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
106106
</Dependency>
107-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.24379.1">
107+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.24510.2">
108108
<Uri>https://github.com/dotnet/source-build-externals</Uri>
109-
<Sha>fb970eccb0a9cae3092464e29cbabda0d4115049</Sha>
109+
<Sha>d4feb7e49067fc9bbf7dfb9fa76a326c33fa0595</Sha>
110110
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
111111
</Dependency>
112112
</ProductDependencies>
@@ -185,57 +185,57 @@
185185
<Uri>https://github.com/dotnet/arcade</Uri>
186186
<Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</Sha>
187187
</Dependency>
188-
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="8.0.0-beta.24362.2">
188+
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="8.0.0-beta.24510.3">
189189
<Uri>https://github.com/dotnet/runtime-assets</Uri>
190-
<Sha>50994571d2f8b4b689c7a0b96c96356fc444b406</Sha>
190+
<Sha>c36e23fc4c2c7d5a02a413dfbbf33c503eb4e2de</Sha>
191191
</Dependency>
192-
<Dependency Name="System.Data.Common.TestData" Version="8.0.0-beta.24362.2">
192+
<Dependency Name="System.Data.Common.TestData" Version="8.0.0-beta.24510.3">
193193
<Uri>https://github.com/dotnet/runtime-assets</Uri>
194-
<Sha>50994571d2f8b4b689c7a0b96c96356fc444b406</Sha>
194+
<Sha>c36e23fc4c2c7d5a02a413dfbbf33c503eb4e2de</Sha>
195195
</Dependency>
196-
<Dependency Name="System.Drawing.Common.TestData" Version="8.0.0-beta.24362.2">
196+
<Dependency Name="System.Drawing.Common.TestData" Version="8.0.0-beta.24510.3">
197197
<Uri>https://github.com/dotnet/runtime-assets</Uri>
198-
<Sha>50994571d2f8b4b689c7a0b96c96356fc444b406</Sha>
198+
<Sha>c36e23fc4c2c7d5a02a413dfbbf33c503eb4e2de</Sha>
199199
</Dependency>
200-
<Dependency Name="System.Formats.Tar.TestData" Version="8.0.0-beta.24362.2">
200+
<Dependency Name="System.Formats.Tar.TestData" Version="8.0.0-beta.24510.3">
201201
<Uri>https://github.com/dotnet/runtime-assets</Uri>
202-
<Sha>50994571d2f8b4b689c7a0b96c96356fc444b406</Sha>
202+
<Sha>c36e23fc4c2c7d5a02a413dfbbf33c503eb4e2de</Sha>
203203
</Dependency>
204-
<Dependency Name="System.IO.Compression.TestData" Version="8.0.0-beta.24362.2">
204+
<Dependency Name="System.IO.Compression.TestData" Version="8.0.0-beta.24510.3">
205205
<Uri>https://github.com/dotnet/runtime-assets</Uri>
206-
<Sha>50994571d2f8b4b689c7a0b96c96356fc444b406</Sha>
206+
<Sha>c36e23fc4c2c7d5a02a413dfbbf33c503eb4e2de</Sha>
207207
</Dependency>
208-
<Dependency Name="System.IO.Packaging.TestData" Version="8.0.0-beta.24362.2">
208+
<Dependency Name="System.IO.Packaging.TestData" Version="8.0.0-beta.24510.3">
209209
<Uri>https://github.com/dotnet/runtime-assets</Uri>
210-
<Sha>50994571d2f8b4b689c7a0b96c96356fc444b406</Sha>
210+
<Sha>c36e23fc4c2c7d5a02a413dfbbf33c503eb4e2de</Sha>
211211
</Dependency>
212-
<Dependency Name="System.Net.TestData" Version="8.0.0-beta.24362.2">
212+
<Dependency Name="System.Net.TestData" Version="8.0.0-beta.24510.3">
213213
<Uri>https://github.com/dotnet/runtime-assets</Uri>
214-
<Sha>50994571d2f8b4b689c7a0b96c96356fc444b406</Sha>
214+
<Sha>c36e23fc4c2c7d5a02a413dfbbf33c503eb4e2de</Sha>
215215
</Dependency>
216-
<Dependency Name="System.Private.Runtime.UnicodeData" Version="8.0.0-beta.24362.2">
216+
<Dependency Name="System.Private.Runtime.UnicodeData" Version="8.0.0-beta.24510.3">
217217
<Uri>https://github.com/dotnet/runtime-assets</Uri>
218-
<Sha>50994571d2f8b4b689c7a0b96c96356fc444b406</Sha>
218+
<Sha>c36e23fc4c2c7d5a02a413dfbbf33c503eb4e2de</Sha>
219219
</Dependency>
220-
<Dependency Name="System.Runtime.TimeZoneData" Version="8.0.0-beta.24362.2">
220+
<Dependency Name="System.Runtime.TimeZoneData" Version="8.0.0-beta.24510.3">
221221
<Uri>https://github.com/dotnet/runtime-assets</Uri>
222-
<Sha>50994571d2f8b4b689c7a0b96c96356fc444b406</Sha>
222+
<Sha>c36e23fc4c2c7d5a02a413dfbbf33c503eb4e2de</Sha>
223223
</Dependency>
224-
<Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="8.0.0-beta.24362.2">
224+
<Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="8.0.0-beta.24510.3">
225225
<Uri>https://github.com/dotnet/runtime-assets</Uri>
226-
<Sha>50994571d2f8b4b689c7a0b96c96356fc444b406</Sha>
226+
<Sha>c36e23fc4c2c7d5a02a413dfbbf33c503eb4e2de</Sha>
227227
</Dependency>
228-
<Dependency Name="System.Text.RegularExpressions.TestData" Version="8.0.0-beta.24362.2">
228+
<Dependency Name="System.Text.RegularExpressions.TestData" Version="8.0.0-beta.24510.3">
229229
<Uri>https://github.com/dotnet/runtime-assets</Uri>
230-
<Sha>50994571d2f8b4b689c7a0b96c96356fc444b406</Sha>
230+
<Sha>c36e23fc4c2c7d5a02a413dfbbf33c503eb4e2de</Sha>
231231
</Dependency>
232-
<Dependency Name="System.Windows.Extensions.TestData" Version="8.0.0-beta.24362.2">
232+
<Dependency Name="System.Windows.Extensions.TestData" Version="8.0.0-beta.24510.3">
233233
<Uri>https://github.com/dotnet/runtime-assets</Uri>
234-
<Sha>50994571d2f8b4b689c7a0b96c96356fc444b406</Sha>
234+
<Sha>c36e23fc4c2c7d5a02a413dfbbf33c503eb4e2de</Sha>
235235
</Dependency>
236-
<Dependency Name="Microsoft.DotNet.CilStrip.Sources" Version="8.0.0-beta.24362.2">
236+
<Dependency Name="Microsoft.DotNet.CilStrip.Sources" Version="8.0.0-beta.24510.3">
237237
<Uri>https://github.com/dotnet/runtime-assets</Uri>
238-
<Sha>50994571d2f8b4b689c7a0b96c96356fc444b406</Sha>
238+
<Sha>c36e23fc4c2c7d5a02a413dfbbf33c503eb4e2de</Sha>
239239
</Dependency>
240240
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="16.0.5-alpha.1.24362.2" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100">
241241
<Uri>https://github.com/dotnet/llvm-project</Uri>
@@ -322,17 +322,17 @@
322322
<Uri>https://github.com/dotnet/runtime</Uri>
323323
<Sha>edbd5c769a19798b6955050baccf99e6797d3208</Sha>
324324
</Dependency>
325-
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="8.0.0-prerelease.24229.2">
325+
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="8.0.0-prerelease.24480.1">
326326
<Uri>https://github.com/dotnet/xharness</Uri>
327-
<Sha>aacfb6328fdef17e572617bbb551431bb9cb1ff2</Sha>
327+
<Sha>2195e37696de37d2c2b0f83d73f49c96d9b584de</Sha>
328328
</Dependency>
329-
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="8.0.0-prerelease.24229.2">
329+
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="8.0.0-prerelease.24480.1">
330330
<Uri>https://github.com/dotnet/xharness</Uri>
331-
<Sha>aacfb6328fdef17e572617bbb551431bb9cb1ff2</Sha>
331+
<Sha>2195e37696de37d2c2b0f83d73f49c96d9b584de</Sha>
332332
</Dependency>
333-
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="8.0.0-prerelease.24229.2">
333+
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="8.0.0-prerelease.24480.1">
334334
<Uri>https://github.com/dotnet/xharness</Uri>
335-
<Sha>aacfb6328fdef17e572617bbb551431bb9cb1ff2</Sha>
335+
<Sha>2195e37696de37d2c2b0f83d73f49c96d9b584de</Sha>
336336
</Dependency>
337337
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.24508.1">
338338
<Uri>https://github.com/dotnet/arcade</Uri>
@@ -354,13 +354,13 @@
354354
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
355355
<Sha>67613417f5e1af250e6ddfba79f8f2885d8e90fb</Sha>
356356
</Dependency>
357-
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="8.0.0-alpha.0.24453.2">
357+
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="8.0.0-alpha.0.24514.2">
358358
<Uri>https://github.com/dotnet/hotreload-utils</Uri>
359-
<Sha>5339e12def2a3605d069c429840089ae27838728</Sha>
359+
<Sha>ef1f3313ca21d4eb766aefc48ea243421be2643f</Sha>
360360
</Dependency>
361-
<Dependency Name="System.Runtime.Numerics.TestData" Version="8.0.0-beta.24362.2">
361+
<Dependency Name="System.Runtime.Numerics.TestData" Version="8.0.0-beta.24510.3">
362362
<Uri>https://github.com/dotnet/runtime-assets</Uri>
363-
<Sha>50994571d2f8b4b689c7a0b96c96356fc444b406</Sha>
363+
<Sha>c36e23fc4c2c7d5a02a413dfbbf33c503eb4e2de</Sha>
364364
</Dependency>
365365
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.8.0-7.23566.2">
366366
<Uri>https://github.com/dotnet/roslyn</Uri>

‎eng/Versions.props

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -145,20 +145,20 @@
145145
<SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>
146146
<runtimenativeSystemIOPortsVersion>8.0.0-rc.1.23406.6</runtimenativeSystemIOPortsVersion>
147147
<!-- Runtime-Assets dependencies -->
148-
<SystemRuntimeNumericsTestDataVersion>8.0.0-beta.24362.2</SystemRuntimeNumericsTestDataVersion>
149-
<SystemComponentModelTypeConverterTestDataVersion>8.0.0-beta.24362.2</SystemComponentModelTypeConverterTestDataVersion>
150-
<SystemDataCommonTestDataVersion>8.0.0-beta.24362.2</SystemDataCommonTestDataVersion>
151-
<SystemDrawingCommonTestDataVersion>8.0.0-beta.24362.2</SystemDrawingCommonTestDataVersion>
152-
<SystemFormatsTarTestDataVersion>8.0.0-beta.24362.2</SystemFormatsTarTestDataVersion>
153-
<SystemIOCompressionTestDataVersion>8.0.0-beta.24362.2</SystemIOCompressionTestDataVersion>
154-
<SystemIOPackagingTestDataVersion>8.0.0-beta.24362.2</SystemIOPackagingTestDataVersion>
155-
<SystemNetTestDataVersion>8.0.0-beta.24362.2</SystemNetTestDataVersion>
156-
<SystemPrivateRuntimeUnicodeDataVersion>8.0.0-beta.24362.2</SystemPrivateRuntimeUnicodeDataVersion>
157-
<SystemRuntimeTimeZoneDataVersion>8.0.0-beta.24362.2</SystemRuntimeTimeZoneDataVersion>
158-
<SystemSecurityCryptographyX509CertificatesTestDataVersion>8.0.0-beta.24362.2</SystemSecurityCryptographyX509CertificatesTestDataVersion>
159-
<SystemTextRegularExpressionsTestDataVersion>8.0.0-beta.24362.2</SystemTextRegularExpressionsTestDataVersion>
160-
<SystemWindowsExtensionsTestDataVersion>8.0.0-beta.24362.2</SystemWindowsExtensionsTestDataVersion>
161-
<MicrosoftDotNetCilStripSourcesVersion>8.0.0-beta.24362.2</MicrosoftDotNetCilStripSourcesVersion>
148+
<SystemRuntimeNumericsTestDataVersion>8.0.0-beta.24510.3</SystemRuntimeNumericsTestDataVersion>
149+
<SystemComponentModelTypeConverterTestDataVersion>8.0.0-beta.24510.3</SystemComponentModelTypeConverterTestDataVersion>
150+
<SystemDataCommonTestDataVersion>8.0.0-beta.24510.3</SystemDataCommonTestDataVersion>
151+
<SystemDrawingCommonTestDataVersion>8.0.0-beta.24510.3</SystemDrawingCommonTestDataVersion>
152+
<SystemFormatsTarTestDataVersion>8.0.0-beta.24510.3</SystemFormatsTarTestDataVersion>
153+
<SystemIOCompressionTestDataVersion>8.0.0-beta.24510.3</SystemIOCompressionTestDataVersion>
154+
<SystemIOPackagingTestDataVersion>8.0.0-beta.24510.3</SystemIOPackagingTestDataVersion>
155+
<SystemNetTestDataVersion>8.0.0-beta.24510.3</SystemNetTestDataVersion>
156+
<SystemPrivateRuntimeUnicodeDataVersion>8.0.0-beta.24510.3</SystemPrivateRuntimeUnicodeDataVersion>
157+
<SystemRuntimeTimeZoneDataVersion>8.0.0-beta.24510.3</SystemRuntimeTimeZoneDataVersion>
158+
<SystemSecurityCryptographyX509CertificatesTestDataVersion>8.0.0-beta.24510.3</SystemSecurityCryptographyX509CertificatesTestDataVersion>
159+
<SystemTextRegularExpressionsTestDataVersion>8.0.0-beta.24510.3</SystemTextRegularExpressionsTestDataVersion>
160+
<SystemWindowsExtensionsTestDataVersion>8.0.0-beta.24510.3</SystemWindowsExtensionsTestDataVersion>
161+
<MicrosoftDotNetCilStripSourcesVersion>8.0.0-beta.24510.3</MicrosoftDotNetCilStripSourcesVersion>
162162
<!-- dotnet-optimization dependencies -->
163163
<optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.23566.3</optimizationwindows_ntx64MIBCRuntimeVersion>
164164
<optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.23566.3</optimizationwindows_ntx86MIBCRuntimeVersion>
@@ -185,10 +185,10 @@
185185
<!-- Testing -->
186186
<MicrosoftNETCoreCoreDisToolsVersion>1.1.0</MicrosoftNETCoreCoreDisToolsVersion>
187187
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
188-
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>8.0.0-prerelease.24229.2</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
189-
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>8.0.0-prerelease.24229.2</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
190-
<MicrosoftDotNetXHarnessCLIVersion>8.0.0-prerelease.24229.2</MicrosoftDotNetXHarnessCLIVersion>
191-
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>8.0.0-alpha.0.24453.2</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
188+
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>8.0.0-prerelease.24480.1</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
189+
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>8.0.0-prerelease.24480.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
190+
<MicrosoftDotNetXHarnessCLIVersion>8.0.0-prerelease.24480.1</MicrosoftDotNetXHarnessCLIVersion>
191+
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>8.0.0-alpha.0.24514.2</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
192192
<XUnitVersion>2.4.2</XUnitVersion>
193193
<XUnitAnalyzersVersion>1.0.0</XUnitAnalyzersVersion>
194194
<XUnitRunnerVisualStudioVersion>2.4.5</XUnitRunnerVisualStudioVersion>

‎eng/build.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Param(
1111
[switch]$coverage,
1212
[string]$testscope,
1313
[switch]$testnobuild,
14-
[ValidateSet("x86","x64","arm","arm64","wasm")][string[]][Alias('a')]$arch = @([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant()),
14+
[ValidateSet("x86","x64","arm","arm64","wasm")][string[]][Alias('a')]$arch = @([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture.ToString().ToLowerInvariant()),
1515
[Parameter(Position=0)][string][Alias('s')]$subset,
1616
[ValidateSet("Debug","Release","Checked")][string][Alias('rc')]$runtimeConfiguration,
1717
[ValidateSet("Debug","Release")][string][Alias('lc')]$librariesConfiguration,

‎eng/native/configurecompiler.cmake

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -945,7 +945,11 @@ if (CLR_CMAKE_HOST_WIN32)
945945
elseif(CLR_CMAKE_HOST_ARCH_ARM64)
946946

947947
# Explicitly specify the assembler to be used for Arm64 compile
948-
file(TO_CMAKE_PATH "$ENV{VCToolsInstallDir}\\bin\\HostX86\\arm64\\armasm64.exe" CMAKE_ASM_COMPILER)
948+
if (CMAKE_SYSTEM_PROCESSOR STREQUAL "ARM64")
949+
file(TO_CMAKE_PATH "$ENV{VCToolsInstallDir}\\bin\\Hostarm64\\arm64\\armasm64.exe" CMAKE_ASM_COMPILER)
950+
else()
951+
file(TO_CMAKE_PATH "$ENV{VCToolsInstallDir}\\bin\\HostX64\\arm64\\armasm64.exe" CMAKE_ASM_COMPILER)
952+
endif()
949953

950954
set(CMAKE_ASM_MASM_COMPILER ${CMAKE_ASM_COMPILER})
951955
message("CMAKE_ASM_MASM_COMPILER explicitly set to: ${CMAKE_ASM_MASM_COMPILER}")

‎eng/native/init-vs-env.cmd

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,19 @@
44
:: as an argument, it also initializes VC++ build environment and CMakePath.
55

66
set "__VCBuildArch="
7-
if /i "%~1" == "x86" (set __VCBuildArch=x86)
8-
if /i "%~1" == "x64" (set __VCBuildArch=x86_amd64)
9-
if /i "%~1" == "arm" (set __VCBuildArch=x86_arm)
10-
if /i "%~1" == "arm64" (set __VCBuildArch=x86_arm64)
11-
if /i "%~1" == "wasm" (if /i "%PROCESSOR_ARCHITECTURE%" == "ARM64" (set __VCBuildArch=x86_arm64) else (set __VCBuildArch=x86_amd64))
7+
if /i "%PROCESSOR_ARCHITECTURE%" == "ARM64" (
8+
if /i "%~1" == "x64" ( set __VCBuildArch=arm64_amd64 )
9+
if /i "%~1" == "x86" ( set __VCBuildArch=arm64_x86 )
10+
if /i "%~1" == "arm" ( set __VCBuildArch=arm64_arm )
11+
if /i "%~1" == "arm64" ( set __VCBuildArch=arm64 )
12+
if /i "%~1" == "wasm" ( set __VCBuildArch=arm64 )
13+
) else (
14+
if /i "%~1" == "x64" ( set __VCBuildArch=amd64 )
15+
if /i "%~1" == "x86" ( set __VCBuildArch=amd64_x86 )
16+
if /i "%~1" == "arm" ( set __VCBuildArch=amd64_arm )
17+
if /i "%~1" == "arm64" ( set __VCBuildArch=amd64_arm64 )
18+
if /i "%~1" == "wasm" ( set __VCBuildArch=amd64 )
19+
)
1220

1321
:: Default to highest Visual Studio version available that has Visual C++ tools.
1422
::

‎eng/pipelines/coreclr/templates/sign-diagnostic-files.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ parameters:
44
timeoutInMinutes: ''
55

66
steps:
7-
- ${{ if and(eq(parameters.isOfficialBuild, true), ne(variables['Build.Reason'], 'PullRequest'), or(startswith(variables['Build.SourceBranch'], 'refs/heads/release/'), startswith(variables['Build.SourceBranch'], 'refs/heads/internal/release/'))) }}:
7+
- ${{ if and(eq(parameters.isOfficialBuild, true), ne(variables['Build.Reason'], 'PullRequest'), or(startswith(variables['Build.SourceBranch'], 'refs/heads/release/'), startswith(variables['Build.SourceBranch'], 'refs/heads/internal/release/')), not(endsWith(variables['Build.SourceBranch'], '-staging'))) }}:
88
- task: UseDotNet@2
99
displayName: Install .NET 6 SDK for signing.
1010
inputs:

‎src/coreclr/build-runtime.cmd

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -174,9 +174,6 @@ if %__TotalSpecifiedTargetArch% GTR 1 (
174174
goto Usage
175175
)
176176

177-
set __ProcessorArch=%PROCESSOR_ARCHITEW6432%
178-
if "%__ProcessorArch%"=="" set __ProcessorArch=%PROCESSOR_ARCHITECTURE%
179-
180177
if %__TargetArchX64%==1 set __TargetArch=x64
181178
if %__TargetArchX86%==1 set __TargetArch=x86
182179
if %__TargetArchArm%==1 set __TargetArch=arm
@@ -361,18 +358,21 @@ if %__BuildNative% EQU 1 (
361358
echo %__MsgPrefix%Commencing build of native components for %__TargetOS%.%__TargetArch%.%__BuildType%
362359

363360
REM Set the environment for the native build
364-
set __VCTargetArch=amd64
365-
if /i "%__HostArch%" == "x86" ( set __VCTargetArch=x86 )
366-
if /i "%__HostArch%" == "arm" (
367-
set __VCTargetArch=x86_arm
368-
)
369-
if /i "%__HostArch%" == "arm64" (
370-
set __VCTargetArch=x86_arm64
361+
if /i "%PROCESSOR_ARCHITECTURE%" == "ARM64" (
362+
set __VCBuildArch=arm64
363+
if /i "%__HostArch%" == "x64" ( set __VCBuildArch=arm64_amd64 )
364+
if /i "%__HostArch%" == "x86" ( set __VCBuildArch=arm64_x86 )
365+
if /i "%__HostArch%" == "arm" ( set __VCBuildArch=arm64_arm )
366+
) else (
367+
set __VCBuildArch=amd64
368+
if /i "%__HostArch%" == "x86" ( set __VCBuildArch=amd64_x86 )
369+
if /i "%__HostArch%" == "arm64" ( set __VCBuildArch=amd64_arm64 )
370+
if /i "%__HostArch%" == "arm" ( set __VCBuildArch=amd64_arm )
371371
)
372372

373373
if NOT DEFINED SkipVCEnvInit (
374-
echo %__MsgPrefix%Using environment: "%__VCToolsRoot%\vcvarsall.bat" !__VCTargetArch!
375-
call "%__VCToolsRoot%\vcvarsall.bat" !__VCTargetArch!
374+
echo %__MsgPrefix%Using environment: "%__VCToolsRoot%\vcvarsall.bat" !__VCBuildArch!
375+
call "%__VCToolsRoot%\vcvarsall.bat" !__VCBuildArch!
376376
)
377377
@if defined _echo @echo on
378378

0 commit comments

Comments
 (0)