tests/dir.props directly - these should eventually go away. -->
<PropertyGroup>
- <OSPlatformConfig>$(BuildOS).$(Platform).$(Configuration)</OSPlatformConfig>
+ <OSPlatformConfig>$(BuildOS).$(BuildArch).$(Configuration)</OSPlatformConfig>
<TestSrcDir>$(MSBuildThisFileDirectory)src</TestSrcDir>
<BuildProjectRelativeDir>$([MSBuild]::MakeRelative($(TestSrcDir), $(MSBuildProjectDirectory)))\$(MSBuildProjectName)\</BuildProjectRelativeDir>
<TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<EnableDefaultItems>false</EnableDefaultItems>
- <Platform>$(BuildArch)</Platform>
+ <Platform>AnyCPU</Platform>
<!-- [ARCADE REMOVE] This line should be removed we use the Arcade Sdk. -->
<DeterministicSourcePaths>false</DeterministicSourcePaths>
<BinDir>$(BaseOutputPathWithConfig)</BinDir>
<BaseIntermediateOutputPath>$(RootRepoDir)\artifacts\tests\coreclr\obj\$(OSPlatformConfig)\Managed\</BaseIntermediateOutputPath>
<BaseIntermediateOutputPath Condition="'$(__ManagedTestIntermediatesDir)' != ''">$(__ManagedTestIntermediatesDir)\</BaseIntermediateOutputPath>
- <__NativeTestIntermediatesDir Condition="'$(__NativeTestIntermediatesDir)' == ''">$([System.IO.Path]::GetFullPath($(BaseOutputPathWithConfig)..\..\coreclr\obj\$(BuildOS).$(Platform).$(Configuration)\Native\))</__NativeTestIntermediatesDir>
+ <__NativeTestIntermediatesDir Condition="'$(__NativeTestIntermediatesDir)' == ''">$([System.IO.Path]::GetFullPath($(BaseOutputPathWithConfig)..\..\coreclr\obj\$(BuildOS).$(BuildArch).$(Configuration)\Native\))</__NativeTestIntermediatesDir>
<BuildProjectRelativeDir>$(MSBuildProjectName)\</BuildProjectRelativeDir>
<BuildProjectRelativeDir Condition="'$(MSBuildProjectDirectory.Contains($(TestSourceDir)))'">$([System.String]::Copy('$(MSBuildProjectDirectory)').Replace($(TestSourceDir),''))\$(MSBuildProjectName)</BuildProjectRelativeDir>
<IntermediateOutputPath>$(BaseIntermediateOutputPath)$(BuildProjectRelativeDir)\</IntermediateOutputPath>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
- <HeapVerifyIncompatible Condition="'$(Platform)' == 'arm'">true</HeapVerifyIncompatible>
+ <HeapVerifyIncompatible Condition="'$(BuildArch)' == 'arm'">true</HeapVerifyIncompatible>
</PropertyGroup>
<PropertyGroup>
<!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
- <HeapVerifyIncompatible Condition="'$(Platform)' == 'arm'">true</HeapVerifyIncompatible>
+ <HeapVerifyIncompatible Condition="'$(BuildArch)' == 'arm'">true</HeapVerifyIncompatible>
</PropertyGroup>
<PropertyGroup>
<!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
<PropertyGroup>
<OutputType>Exe</OutputType>
<GCStressIncompatible>true</GCStressIncompatible>
- <HeapVerifyIncompatible Condition="'$(Platform)' == 'x86' or '$(Platform)' == 'arm' or '$(Platform)' == 'arm64'">true</HeapVerifyIncompatible>
+ <HeapVerifyIncompatible Condition="'$(BuildArch)' == 'x86' or '$(BuildArch)' == 'arm' or '$(BuildArch)' == 'arm64'">true</HeapVerifyIncompatible>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<ItemGroup>
<OutputType>Exe</OutputType>
<CLRTestExecutionArguments>/numrequests:100</CLRTestExecutionArguments>
<GCStressIncompatible>true</GCStressIncompatible>
- <HeapVerifyIncompatible Condition="'$(Platform)' == 'x86' or '$(Platform)' == 'arm' or '$(Platform)' == 'arm64'">true</HeapVerifyIncompatible>
+ <HeapVerifyIncompatible Condition="'$(BuildArch)' == 'x86' or '$(BuildArch)' == 'arm' or '$(BuildArch)' == 'arm64'">true</HeapVerifyIncompatible>
</PropertyGroup>
<ItemGroup>
<Compile Include="cache.cs" />
<TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
<DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
<!-- IJW is not supported on ARM64 -->
- <DisableProjectBuild Condition="'$(Platform)' == 'arm64'">true</DisableProjectBuild>
+ <DisableProjectBuild Condition="'$(BuildArch)' == 'arm64'">true</DisableProjectBuild>
<!-- Loading IJW assemblies into an unloadable context is not allowed -->
<UnloadabilityIncompatible>true</UnloadabilityIncompatible>
</PropertyGroup>
<TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
<DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
<!-- IJW is not supported on ARM64 -->
- <DisableProjectBuild Condition="'$(Platform)' == 'arm64'">true</DisableProjectBuild>
+ <DisableProjectBuild Condition="'$(BuildArch)' == 'arm64'">true</DisableProjectBuild>
<!-- Loading IJW assemblies into an unloadable context is not allowed -->
<UnloadabilityIncompatible>true</UnloadabilityIncompatible>
</PropertyGroup>
<TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
<DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
<!-- IJW is not supported on ARM64 -->
- <DisableProjectBuild Condition="'$(Platform)' == 'arm64'">true</DisableProjectBuild>
+ <DisableProjectBuild Condition="'$(BuildArch)' == 'arm64'">true</DisableProjectBuild>
<!-- Loading IJW assemblies into an unloadable context is not allowed -->
<UnloadabilityIncompatible>true</UnloadabilityIncompatible>
</PropertyGroup>
<TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
<DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
<!-- IJW is not supported on ARM64 -->
- <DisableProjectBuild Condition="'$(Platform)' == 'arm64'">true</DisableProjectBuild>
+ <DisableProjectBuild Condition="'$(BuildArch)' == 'arm64'">true</DisableProjectBuild>
<!-- Loading IJW assemblies into an unloadable context is not allowed -->
<UnloadabilityIncompatible>true</UnloadabilityIncompatible>
</PropertyGroup>
<TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
<DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
<!-- IJW is not supported on ARM64 -->
- <DisableProjectBuild Condition="'$(Platform)' == 'arm64'">true</DisableProjectBuild>
+ <DisableProjectBuild Condition="'$(BuildArch)' == 'arm64'">true</DisableProjectBuild>
<!-- Loading IJW assemblies into an unloadable context is not allowed -->
<UnloadabilityIncompatible>true</UnloadabilityIncompatible>
</PropertyGroup>
<TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
<DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
<!-- IJW is not supported on ARM64 -->
- <DisableProjectBuild Condition="'$(Platform)' == 'arm64'">true</DisableProjectBuild>
+ <DisableProjectBuild Condition="'$(BuildArch)' == 'arm64'">true</DisableProjectBuild>
<!-- Native varargs not supported on ARM -->
- <DisableProjectBuild Condition="'$(Platform)' == 'arm'">true</DisableProjectBuild>
+ <DisableProjectBuild Condition="'$(BuildArch)' == 'arm'">true</DisableProjectBuild>
<!-- Loading IJW assemblies into an unloadable context is not allowed -->
<UnloadabilityIncompatible>true</UnloadabilityIncompatible>
</PropertyGroup>
<ItemGroup
Condition="'$(TargetsWindows)' == 'true' And ('$(Configuration)' == 'Debug' Or '$(Configuration)' == 'Checked') And '$(CopyDebugCRTDllsToOutputDirectory)' == 'true'" >
- <None Include="$(VCToolsRedistDir)onecore/debug_nonredist/$(Platform)/Microsoft.VC*.DebugCRT/vcruntime*d.dll" Link="%(Filename)%(Extension)" CopyToOutputDirectory="Always" />
- <None Include="$(VCToolsRedistDir)onecore/debug_nonredist/$(Platform)/Microsoft.VC*.DebugCRT/msvcp*d.dll" Link="%(Filename)%(Extension)" CopyToOutputDirectory="Always" />
- <None Include="$(ExtensionSdkDir)/Microsoft.UniversalCRT.Debug/$(UCRTVersion)/Redist/Debug/$(Platform)/ucrtbased.dll" CopyToOutputDirectory="Always" />
+ <None Include="$(VCToolsRedistDir)onecore/debug_nonredist/$(BuildArch)/Microsoft.VC*.DebugCRT/vcruntime*d.dll" Link="%(Filename)%(Extension)" CopyToOutputDirectory="Always" />
+ <None Include="$(VCToolsRedistDir)onecore/debug_nonredist/$(BuildArch)/Microsoft.VC*.DebugCRT/msvcp*d.dll" Link="%(Filename)%(Extension)" CopyToOutputDirectory="Always" />
+ <None Include="$(ExtensionSdkDir)/Microsoft.UniversalCRT.Debug/$(UCRTVersion)/Redist/Debug/$(BuildArch)/ucrtbased.dll" CopyToOutputDirectory="Always" />
</ItemGroup>
</Project>
<!-- Test unsupported outside of windows -->
<TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
<DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
- <DisableProjectBuild Condition="'$(Platform)' == 'arm' or '$(Platform)' == 'arm64'">true</DisableProjectBuild>
+ <DisableProjectBuild Condition="'$(BuildArch)' == 'arm' or '$(BuildArch)' == 'arm64'">true</DisableProjectBuild>
<!-- WinRT interop is not compatible with unloadability -->
<UnloadabilityIncompatible>true</UnloadabilityIncompatible>
</PropertyGroup>
<DebugType />
<Optimize>True</Optimize>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
- <JitOptimizationSensitive Condition="'$(Platform)' == 'arm64'">true</JitOptimizationSensitive>
+ <JitOptimizationSensitive Condition="'$(BuildArch)' == 'arm64'">true</JitOptimizationSensitive>
</PropertyGroup>
<ItemGroup>
<Compile Include="VectorMgdMgd.cs" />
<Project Sdk="Microsoft.NET.Sdk.IL">
<PropertyGroup>
<OutputType>Exe</OutputType>
- <DisableProjectBuild Condition="'$(Platform)' == 'x64'">true</DisableProjectBuild>
- <DisableProjectBuild Condition="'$(Platform)' == 'arm64'">true</DisableProjectBuild>
+ <DisableProjectBuild Condition="'$(BuildArch)' == 'x64'">true</DisableProjectBuild>
+ <DisableProjectBuild Condition="'$(BuildArch)' == 'arm64'">true</DisableProjectBuild>
</PropertyGroup>
<PropertyGroup>
<DebugType>PdbOnly</DebugType>
<PropertyGroup>
<OutputType>Exe</OutputType>
<!-- NOTE: this test simply takes too long to complete under GC stress/heap verify; it is not fundamentally incompatible -->
- <GCStressIncompatible Condition="'$(Platform)' == 'x86'">true</GCStressIncompatible>
+ <GCStressIncompatible Condition="'$(BuildArch)' == 'x86'">true</GCStressIncompatible>
<HeapVerifyIncompatible>true</HeapVerifyIncompatible>
</PropertyGroup>
<PropertyGroup>
<PropertyGroup>
<OutputType>Exe</OutputType>
<!-- NOTE: this test simply takes too long to complete under GC stress/heap verify; it is not fundamentally incompatible -->
- <GCStressIncompatible Condition="'$(Platform)' == 'x86'">true</GCStressIncompatible>
+ <GCStressIncompatible Condition="'$(BuildArch)' == 'x86'">true</GCStressIncompatible>
<HeapVerifyIncompatible>true</HeapVerifyIncompatible>
</PropertyGroup>
<PropertyGroup>
<PropertyGroup>
<OutputType>Exe</OutputType>
<!-- NOTE: this test simply takes too long to complete under heap verify. It is not fundamentally incompatible. -->
- <GCStressIncompatible Condition="'$(Platform)' == 'x86'">true</GCStressIncompatible>
- <HeapVerifyIncompatible Condition="'$(Platform)' == 'x86'">true</HeapVerifyIncompatible>
+ <GCStressIncompatible Condition="'$(BuildArch)' == 'x86'">true</GCStressIncompatible>
+ <HeapVerifyIncompatible Condition="'$(BuildArch)' == 'x86'">true</HeapVerifyIncompatible>
</PropertyGroup>
<PropertyGroup>
<DebugType>PdbOnly</DebugType>
<Optimize>True</Optimize>
</PropertyGroup>
<PropertyGroup>
- <PointerSize Condition="'$(Platform)'=='x64'">64</PointerSize>
- <PointerSize Condition="'$(Platform)'=='arm64'">64</PointerSize>
- <PointerSize Condition="'$(Platform)'=='x86'">32</PointerSize>
- <PointerSize Condition="'$(Platform)'=='arm'">32</PointerSize>
- <PointerSize Condition="'$(Platform)'=='armel'">32</PointerSize>
+ <PointerSize Condition="'$(BuildArch)'=='x64'">64</PointerSize>
+ <PointerSize Condition="'$(BuildArch)'=='arm64'">64</PointerSize>
+ <PointerSize Condition="'$(BuildArch)'=='x86'">32</PointerSize>
+ <PointerSize Condition="'$(BuildArch)'=='arm'">32</PointerSize>
+ <PointerSize Condition="'$(BuildArch)'=='armel'">32</PointerSize>
</PropertyGroup>
<ItemGroup Condition=" '$(PointerSize)' == '64' ">
<Compile Include="DevDiv_278523_64.il" />
<PropertyGroup>
<OutputType>Exe</OutputType>
<!-- NOTE: this test simply takes too long to complete under GC stress; it is not fundamentally incompatible -->
- <GCStressIncompatible Condition="'$(Platform)' == 'x86'">true</GCStressIncompatible>
+ <GCStressIncompatible Condition="'$(BuildArch)' == 'x86'">true</GCStressIncompatible>
<CLRTestPriority>1</CLRTestPriority>
</PropertyGroup>
<PropertyGroup>
<PropertyGroup>
<OutputType>Exe</OutputType>
<!-- NOTE: this test simply takes too long to complete under heap verify. It is not fundamentally incompatible. -->
- <GCStressIncompatible Condition="'$(Platform)' == 'x86'">true</GCStressIncompatible>
- <HeapVerifyIncompatible Condition="'$(Platform)' == 'x86'">true</HeapVerifyIncompatible>
+ <GCStressIncompatible Condition="'$(BuildArch)' == 'x86'">true</GCStressIncompatible>
+ <HeapVerifyIncompatible Condition="'$(BuildArch)' == 'x86'">true</HeapVerifyIncompatible>
</PropertyGroup>
<PropertyGroup>
<DebugType>Full</DebugType>
<PropertyGroup>
<OutputType>Exe</OutputType>
<!-- NOTE: this test simply takes too long to complete under heap verify. It is not fundamentally incompatible. -->
- <GCStressIncompatible Condition="'$(Platform)' == 'x86'">true</GCStressIncompatible>
- <HeapVerifyIncompatible Condition="'$(Platform)' == 'x86'">true</HeapVerifyIncompatible>
+ <GCStressIncompatible Condition="'$(BuildArch)' == 'x86'">true</GCStressIncompatible>
+ <HeapVerifyIncompatible Condition="'$(BuildArch)' == 'x86'">true</HeapVerifyIncompatible>
</PropertyGroup>
<PropertyGroup>
<DebugType>None</DebugType>
<Optimize>True</Optimize>
<!-- This test is very resource heavy and doesn't play well with some JitStress modes, especially when memory is limited (x86),
on arm the test fails to crossgen with stress mode because of an relocation offset size limit, see #16587 -->
- <JitOptimizationSensitive Condition="'$(Platform)' == 'x86' Or '$(Platform)' == 'arm'">true</JitOptimizationSensitive>
+ <JitOptimizationSensitive Condition="'$(BuildArch)' == 'x86' Or '$(BuildArch)' == 'arm'">true</JitOptimizationSensitive>
</PropertyGroup>
<ItemGroup>
<Compile Include="hugeexpr1.cs" />
<!-- This test takes a long time to complete -->
<UnloadabilityIncompatible>true</UnloadabilityIncompatible>
<!-- https://github.com/dotnet/coreclr/issues/24633 -->
- <JitOptimizationSensitive Condition="'$(Platform)' == 'arm'">true</JitOptimizationSensitive>
+ <JitOptimizationSensitive Condition="'$(BuildArch)' == 'arm'">true</JitOptimizationSensitive>
</PropertyGroup>
<PropertyGroup>
<DebugType>Full</DebugType>
<CLRTestKind>BuildAndRun</CLRTestKind>
<CLRTestPriority>0</CLRTestPriority>
<!-- Crossgen2 currently targets only x64 -->
- <DisableProjectBuild Condition="'$(Platform)' != 'x64'">true</DisableProjectBuild>
+ <DisableProjectBuild Condition="'$(BuildArch)' != 'x64'">true</DisableProjectBuild>
<!-- Known not to work with GCStress for now: https://github.com/dotnet/coreclr/issues/26633 -->
<GCStressIncompatible>true</GCStressIncompatible>
<!-- This is an explicit crossgen test -->
<CLRTestPriority>0</CLRTestPriority>
<!-- Crossgen2 currently targets only x64 -->
- <DisableProjectBuild Condition="'$(Platform)' != 'x64'">true</DisableProjectBuild>
+ <DisableProjectBuild Condition="'$(BuildArch)' != 'x64'">true</DisableProjectBuild>
<!-- Generate ILDLL so that the DLL can be the crossgenned assembly -->
<TargetExt>.ildll</TargetExt>
<CLRTestKind>BuildAndRun</CLRTestKind>
<CLRTestPriority>0</CLRTestPriority>
<!-- Crossgen2 currently targets only x64 -->
- <DisableProjectBuild Condition="'$(Platform)' != 'x64'">true</DisableProjectBuild>
+ <DisableProjectBuild Condition="'$(BuildArch)' != 'x64'">true</DisableProjectBuild>
<!-- Known not to work with GCStress for now: https://github.com/dotnet/coreclr/issues/26633 -->
<GCStressIncompatible>true</GCStressIncompatible>
<!-- This is an explicit crossgen test -->
<!-- Test unsupported outside of windows -->
<!-- Test unsupported on arm targets -->
<TestUnsupportedOutsideWindows>true</TestUnsupportedOutsideWindows>
- <DisableProjectBuild Condition=" '$(Platform)' == 'arm64' or '$(Platform)' == 'arm' or '$(TargetsUnix)' == 'true' ">true</DisableProjectBuild>
+ <DisableProjectBuild Condition=" '$(BuildArch)' == 'arm64' or '$(BuildArch)' == 'arm' or '$(TargetsUnix)' == 'true' ">true</DisableProjectBuild>
</PropertyGroup>
<PropertyGroup>
<!-- Fails with JIT stress modes, issue #19415 -->