Skip to content

Commit

Permalink
Merge commit 'cddad1eeb82fe9f8f46b11442e353f46230ec6ac'
Browse files Browse the repository at this point in the history
  • Loading branch information
Mirroring committed Oct 15, 2024
2 parents 5292f3a + cddad1e commit c36b66f
Show file tree
Hide file tree
Showing 66 changed files with 9,978 additions and 208 deletions.
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
]
},
"microsoft.dotnet.xharness.cli": {
"version": "8.0.0-prerelease.24229.2",
"version": "8.0.0-prerelease.24480.1",
"commands": [
"xharness"
]
Expand Down
7 changes: 4 additions & 3 deletions .config/tsaoptions.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@
"instanceUrl": "https://devdiv.visualstudio.com/",
"template": "TFSDEVDIV",
"projectName": "DEVDIV",
"areaPath": "DevDiv\\NET Libraries",
"areaPath": "DevDiv\\NET Runtime",
"iterationPath": "DevDiv",
"notificationAliases": [ "[email protected]" ],
"repositoryName": "Runtime",
"codebaseName": "Runtime"
}
"codebaseName": "Runtime",
"serviceTreeId": "1dc8dedc-8f5f-4b94-b182-ec3bdfb207b0"
}
76 changes: 38 additions & 38 deletions eng/Version.Details.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,9 @@
<Sha>fe3794a68bd668d36d4d5014a9e6c9d22c0e6d86</Sha>
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.24379.1">
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.24510.2">
<Uri>https://github.com/dotnet/source-build-externals</Uri>
<Sha>fb970eccb0a9cae3092464e29cbabda0d4115049</Sha>
<Sha>d4feb7e49067fc9bbf7dfb9fa76a326c33fa0595</Sha>
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
</Dependency>
</ProductDependencies>
Expand Down Expand Up @@ -185,57 +185,57 @@
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e5b13e054339e41d422212a0ecaf24fec20cb5a1</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="8.0.0-beta.24362.2">
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="8.0.0-beta.24510.3">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>50994571d2f8b4b689c7a0b96c96356fc444b406</Sha>
<Sha>c36e23fc4c2c7d5a02a413dfbbf33c503eb4e2de</Sha>
</Dependency>
<Dependency Name="System.Data.Common.TestData" Version="8.0.0-beta.24362.2">
<Dependency Name="System.Data.Common.TestData" Version="8.0.0-beta.24510.3">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>50994571d2f8b4b689c7a0b96c96356fc444b406</Sha>
<Sha>c36e23fc4c2c7d5a02a413dfbbf33c503eb4e2de</Sha>
</Dependency>
<Dependency Name="System.Drawing.Common.TestData" Version="8.0.0-beta.24362.2">
<Dependency Name="System.Drawing.Common.TestData" Version="8.0.0-beta.24510.3">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>50994571d2f8b4b689c7a0b96c96356fc444b406</Sha>
<Sha>c36e23fc4c2c7d5a02a413dfbbf33c503eb4e2de</Sha>
</Dependency>
<Dependency Name="System.Formats.Tar.TestData" Version="8.0.0-beta.24362.2">
<Dependency Name="System.Formats.Tar.TestData" Version="8.0.0-beta.24510.3">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>50994571d2f8b4b689c7a0b96c96356fc444b406</Sha>
<Sha>c36e23fc4c2c7d5a02a413dfbbf33c503eb4e2de</Sha>
</Dependency>
<Dependency Name="System.IO.Compression.TestData" Version="8.0.0-beta.24362.2">
<Dependency Name="System.IO.Compression.TestData" Version="8.0.0-beta.24510.3">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>50994571d2f8b4b689c7a0b96c96356fc444b406</Sha>
<Sha>c36e23fc4c2c7d5a02a413dfbbf33c503eb4e2de</Sha>
</Dependency>
<Dependency Name="System.IO.Packaging.TestData" Version="8.0.0-beta.24362.2">
<Dependency Name="System.IO.Packaging.TestData" Version="8.0.0-beta.24510.3">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>50994571d2f8b4b689c7a0b96c96356fc444b406</Sha>
<Sha>c36e23fc4c2c7d5a02a413dfbbf33c503eb4e2de</Sha>
</Dependency>
<Dependency Name="System.Net.TestData" Version="8.0.0-beta.24362.2">
<Dependency Name="System.Net.TestData" Version="8.0.0-beta.24510.3">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>50994571d2f8b4b689c7a0b96c96356fc444b406</Sha>
<Sha>c36e23fc4c2c7d5a02a413dfbbf33c503eb4e2de</Sha>
</Dependency>
<Dependency Name="System.Private.Runtime.UnicodeData" Version="8.0.0-beta.24362.2">
<Dependency Name="System.Private.Runtime.UnicodeData" Version="8.0.0-beta.24510.3">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>50994571d2f8b4b689c7a0b96c96356fc444b406</Sha>
<Sha>c36e23fc4c2c7d5a02a413dfbbf33c503eb4e2de</Sha>
</Dependency>
<Dependency Name="System.Runtime.TimeZoneData" Version="8.0.0-beta.24362.2">
<Dependency Name="System.Runtime.TimeZoneData" Version="8.0.0-beta.24510.3">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>50994571d2f8b4b689c7a0b96c96356fc444b406</Sha>
<Sha>c36e23fc4c2c7d5a02a413dfbbf33c503eb4e2de</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="8.0.0-beta.24362.2">
<Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="8.0.0-beta.24510.3">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>50994571d2f8b4b689c7a0b96c96356fc444b406</Sha>
<Sha>c36e23fc4c2c7d5a02a413dfbbf33c503eb4e2de</Sha>
</Dependency>
<Dependency Name="System.Text.RegularExpressions.TestData" Version="8.0.0-beta.24362.2">
<Dependency Name="System.Text.RegularExpressions.TestData" Version="8.0.0-beta.24510.3">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>50994571d2f8b4b689c7a0b96c96356fc444b406</Sha>
<Sha>c36e23fc4c2c7d5a02a413dfbbf33c503eb4e2de</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions.TestData" Version="8.0.0-beta.24362.2">
<Dependency Name="System.Windows.Extensions.TestData" Version="8.0.0-beta.24510.3">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>50994571d2f8b4b689c7a0b96c96356fc444b406</Sha>
<Sha>c36e23fc4c2c7d5a02a413dfbbf33c503eb4e2de</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CilStrip.Sources" Version="8.0.0-beta.24362.2">
<Dependency Name="Microsoft.DotNet.CilStrip.Sources" Version="8.0.0-beta.24510.3">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>50994571d2f8b4b689c7a0b96c96356fc444b406</Sha>
<Sha>c36e23fc4c2c7d5a02a413dfbbf33c503eb4e2de</Sha>
</Dependency>
<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">
<Uri>https://github.com/dotnet/llvm-project</Uri>
Expand Down Expand Up @@ -322,17 +322,17 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>edbd5c769a19798b6955050baccf99e6797d3208</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="8.0.0-prerelease.24229.2">
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="8.0.0-prerelease.24480.1">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>aacfb6328fdef17e572617bbb551431bb9cb1ff2</Sha>
<Sha>2195e37696de37d2c2b0f83d73f49c96d9b584de</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="8.0.0-prerelease.24229.2">
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="8.0.0-prerelease.24480.1">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>aacfb6328fdef17e572617bbb551431bb9cb1ff2</Sha>
<Sha>2195e37696de37d2c2b0f83d73f49c96d9b584de</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="8.0.0-prerelease.24229.2">
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="8.0.0-prerelease.24480.1">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>aacfb6328fdef17e572617bbb551431bb9cb1ff2</Sha>
<Sha>2195e37696de37d2c2b0f83d73f49c96d9b584de</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.24508.1">
<Uri>https://github.com/dotnet/arcade</Uri>
Expand All @@ -354,13 +354,13 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
<Sha>67613417f5e1af250e6ddfba79f8f2885d8e90fb</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="8.0.0-alpha.0.24453.2">
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="8.0.0-alpha.0.24514.2">
<Uri>https://github.com/dotnet/hotreload-utils</Uri>
<Sha>5339e12def2a3605d069c429840089ae27838728</Sha>
<Sha>ef1f3313ca21d4eb766aefc48ea243421be2643f</Sha>
</Dependency>
<Dependency Name="System.Runtime.Numerics.TestData" Version="8.0.0-beta.24362.2">
<Dependency Name="System.Runtime.Numerics.TestData" Version="8.0.0-beta.24510.3">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>50994571d2f8b4b689c7a0b96c96356fc444b406</Sha>
<Sha>c36e23fc4c2c7d5a02a413dfbbf33c503eb4e2de</Sha>
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.8.0-7.23566.2">
<Uri>https://github.com/dotnet/roslyn</Uri>
Expand Down
36 changes: 18 additions & 18 deletions eng/Versions.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,20 +145,20 @@
<SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>
<runtimenativeSystemIOPortsVersion>8.0.0-rc.1.23406.6</runtimenativeSystemIOPortsVersion>
<!-- Runtime-Assets dependencies -->
<SystemRuntimeNumericsTestDataVersion>8.0.0-beta.24362.2</SystemRuntimeNumericsTestDataVersion>
<SystemComponentModelTypeConverterTestDataVersion>8.0.0-beta.24362.2</SystemComponentModelTypeConverterTestDataVersion>
<SystemDataCommonTestDataVersion>8.0.0-beta.24362.2</SystemDataCommonTestDataVersion>
<SystemDrawingCommonTestDataVersion>8.0.0-beta.24362.2</SystemDrawingCommonTestDataVersion>
<SystemFormatsTarTestDataVersion>8.0.0-beta.24362.2</SystemFormatsTarTestDataVersion>
<SystemIOCompressionTestDataVersion>8.0.0-beta.24362.2</SystemIOCompressionTestDataVersion>
<SystemIOPackagingTestDataVersion>8.0.0-beta.24362.2</SystemIOPackagingTestDataVersion>
<SystemNetTestDataVersion>8.0.0-beta.24362.2</SystemNetTestDataVersion>
<SystemPrivateRuntimeUnicodeDataVersion>8.0.0-beta.24362.2</SystemPrivateRuntimeUnicodeDataVersion>
<SystemRuntimeTimeZoneDataVersion>8.0.0-beta.24362.2</SystemRuntimeTimeZoneDataVersion>
<SystemSecurityCryptographyX509CertificatesTestDataVersion>8.0.0-beta.24362.2</SystemSecurityCryptographyX509CertificatesTestDataVersion>
<SystemTextRegularExpressionsTestDataVersion>8.0.0-beta.24362.2</SystemTextRegularExpressionsTestDataVersion>
<SystemWindowsExtensionsTestDataVersion>8.0.0-beta.24362.2</SystemWindowsExtensionsTestDataVersion>
<MicrosoftDotNetCilStripSourcesVersion>8.0.0-beta.24362.2</MicrosoftDotNetCilStripSourcesVersion>
<SystemRuntimeNumericsTestDataVersion>8.0.0-beta.24510.3</SystemRuntimeNumericsTestDataVersion>
<SystemComponentModelTypeConverterTestDataVersion>8.0.0-beta.24510.3</SystemComponentModelTypeConverterTestDataVersion>
<SystemDataCommonTestDataVersion>8.0.0-beta.24510.3</SystemDataCommonTestDataVersion>
<SystemDrawingCommonTestDataVersion>8.0.0-beta.24510.3</SystemDrawingCommonTestDataVersion>
<SystemFormatsTarTestDataVersion>8.0.0-beta.24510.3</SystemFormatsTarTestDataVersion>
<SystemIOCompressionTestDataVersion>8.0.0-beta.24510.3</SystemIOCompressionTestDataVersion>
<SystemIOPackagingTestDataVersion>8.0.0-beta.24510.3</SystemIOPackagingTestDataVersion>
<SystemNetTestDataVersion>8.0.0-beta.24510.3</SystemNetTestDataVersion>
<SystemPrivateRuntimeUnicodeDataVersion>8.0.0-beta.24510.3</SystemPrivateRuntimeUnicodeDataVersion>
<SystemRuntimeTimeZoneDataVersion>8.0.0-beta.24510.3</SystemRuntimeTimeZoneDataVersion>
<SystemSecurityCryptographyX509CertificatesTestDataVersion>8.0.0-beta.24510.3</SystemSecurityCryptographyX509CertificatesTestDataVersion>
<SystemTextRegularExpressionsTestDataVersion>8.0.0-beta.24510.3</SystemTextRegularExpressionsTestDataVersion>
<SystemWindowsExtensionsTestDataVersion>8.0.0-beta.24510.3</SystemWindowsExtensionsTestDataVersion>
<MicrosoftDotNetCilStripSourcesVersion>8.0.0-beta.24510.3</MicrosoftDotNetCilStripSourcesVersion>
<!-- dotnet-optimization dependencies -->
<optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.23566.3</optimizationwindows_ntx64MIBCRuntimeVersion>
<optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.23566.3</optimizationwindows_ntx86MIBCRuntimeVersion>
Expand All @@ -185,10 +185,10 @@
<!-- Testing -->
<MicrosoftNETCoreCoreDisToolsVersion>1.1.0</MicrosoftNETCoreCoreDisToolsVersion>
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>8.0.0-prerelease.24229.2</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>8.0.0-prerelease.24229.2</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
<MicrosoftDotNetXHarnessCLIVersion>8.0.0-prerelease.24229.2</MicrosoftDotNetXHarnessCLIVersion>
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>8.0.0-alpha.0.24453.2</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>8.0.0-prerelease.24480.1</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>8.0.0-prerelease.24480.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
<MicrosoftDotNetXHarnessCLIVersion>8.0.0-prerelease.24480.1</MicrosoftDotNetXHarnessCLIVersion>
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>8.0.0-alpha.0.24514.2</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
<XUnitVersion>2.4.2</XUnitVersion>
<XUnitAnalyzersVersion>1.0.0</XUnitAnalyzersVersion>
<XUnitRunnerVisualStudioVersion>2.4.5</XUnitRunnerVisualStudioVersion>
Expand Down
2 changes: 1 addition & 1 deletion eng/build.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Param(
[switch]$coverage,
[string]$testscope,
[switch]$testnobuild,
[ValidateSet("x86","x64","arm","arm64","wasm")][string[]][Alias('a')]$arch = @([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant()),
[ValidateSet("x86","x64","arm","arm64","wasm")][string[]][Alias('a')]$arch = @([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture.ToString().ToLowerInvariant()),
[Parameter(Position=0)][string][Alias('s')]$subset,
[ValidateSet("Debug","Release","Checked")][string][Alias('rc')]$runtimeConfiguration,
[ValidateSet("Debug","Release")][string][Alias('lc')]$librariesConfiguration,
Expand Down
6 changes: 5 additions & 1 deletion eng/native/configurecompiler.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -945,7 +945,11 @@ if (CLR_CMAKE_HOST_WIN32)
elseif(CLR_CMAKE_HOST_ARCH_ARM64)

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

set(CMAKE_ASM_MASM_COMPILER ${CMAKE_ASM_COMPILER})
message("CMAKE_ASM_MASM_COMPILER explicitly set to: ${CMAKE_ASM_MASM_COMPILER}")
Expand Down
18 changes: 13 additions & 5 deletions eng/native/init-vs-env.cmd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,19 @@
:: as an argument, it also initializes VC++ build environment and CMakePath.

set "__VCBuildArch="
if /i "%~1" == "x86" (set __VCBuildArch=x86)
if /i "%~1" == "x64" (set __VCBuildArch=x86_amd64)
if /i "%~1" == "arm" (set __VCBuildArch=x86_arm)
if /i "%~1" == "arm64" (set __VCBuildArch=x86_arm64)
if /i "%~1" == "wasm" (if /i "%PROCESSOR_ARCHITECTURE%" == "ARM64" (set __VCBuildArch=x86_arm64) else (set __VCBuildArch=x86_amd64))
if /i "%PROCESSOR_ARCHITECTURE%" == "ARM64" (
if /i "%~1" == "x64" ( set __VCBuildArch=arm64_amd64 )
if /i "%~1" == "x86" ( set __VCBuildArch=arm64_x86 )
if /i "%~1" == "arm" ( set __VCBuildArch=arm64_arm )
if /i "%~1" == "arm64" ( set __VCBuildArch=arm64 )
if /i "%~1" == "wasm" ( set __VCBuildArch=arm64 )
) else (
if /i "%~1" == "x64" ( set __VCBuildArch=amd64 )
if /i "%~1" == "x86" ( set __VCBuildArch=amd64_x86 )
if /i "%~1" == "arm" ( set __VCBuildArch=amd64_arm )
if /i "%~1" == "arm64" ( set __VCBuildArch=amd64_arm64 )
if /i "%~1" == "wasm" ( set __VCBuildArch=amd64 )
)

:: Default to highest Visual Studio version available that has Visual C++ tools.
::
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/coreclr/templates/sign-diagnostic-files.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ parameters:
timeoutInMinutes: ''

steps:
- ${{ 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/'))) }}:
- ${{ 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'))) }}:
- task: UseDotNet@2
displayName: Install .NET 6 SDK for signing.
inputs:
Expand Down
24 changes: 12 additions & 12 deletions src/coreclr/build-runtime.cmd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,9 +174,6 @@ if %__TotalSpecifiedTargetArch% GTR 1 (
goto Usage
)

set __ProcessorArch=%PROCESSOR_ARCHITEW6432%
if "%__ProcessorArch%"=="" set __ProcessorArch=%PROCESSOR_ARCHITECTURE%

if %__TargetArchX64%==1 set __TargetArch=x64
if %__TargetArchX86%==1 set __TargetArch=x86
if %__TargetArchArm%==1 set __TargetArch=arm
Expand Down Expand Up @@ -361,18 +358,21 @@ if %__BuildNative% EQU 1 (
echo %__MsgPrefix%Commencing build of native components for %__TargetOS%.%__TargetArch%.%__BuildType%

REM Set the environment for the native build
set __VCTargetArch=amd64
if /i "%__HostArch%" == "x86" ( set __VCTargetArch=x86 )
if /i "%__HostArch%" == "arm" (
set __VCTargetArch=x86_arm
)
if /i "%__HostArch%" == "arm64" (
set __VCTargetArch=x86_arm64
if /i "%PROCESSOR_ARCHITECTURE%" == "ARM64" (
set __VCBuildArch=arm64
if /i "%__HostArch%" == "x64" ( set __VCBuildArch=arm64_amd64 )
if /i "%__HostArch%" == "x86" ( set __VCBuildArch=arm64_x86 )
if /i "%__HostArch%" == "arm" ( set __VCBuildArch=arm64_arm )
) else (
set __VCBuildArch=amd64
if /i "%__HostArch%" == "x86" ( set __VCBuildArch=amd64_x86 )
if /i "%__HostArch%" == "arm64" ( set __VCBuildArch=amd64_arm64 )
if /i "%__HostArch%" == "arm" ( set __VCBuildArch=amd64_arm )
)

if NOT DEFINED SkipVCEnvInit (
echo %__MsgPrefix%Using environment: "%__VCToolsRoot%\vcvarsall.bat" !__VCTargetArch!
call "%__VCToolsRoot%\vcvarsall.bat" !__VCTargetArch!
echo %__MsgPrefix%Using environment: "%__VCToolsRoot%\vcvarsall.bat" !__VCBuildArch!
call "%__VCToolsRoot%\vcvarsall.bat" !__VCBuildArch!
)
@if defined _echo @echo on

Expand Down
Loading

0 comments on commit c36b66f

Please sign in to comment.