diff --git a/docs/workflow/testing/coreclr/testing.md b/docs/workflow/testing/coreclr/testing.md index 3f3dac5fe0e815..286a425932be51 100644 --- a/docs/workflow/testing/coreclr/testing.md +++ b/docs/workflow/testing/coreclr/testing.md @@ -33,7 +33,7 @@ Note: CoreCLR must be built prior to building an individual test. See the first * It is possible to explicitly run only the native test build with `build-test.sh/cmd skipmanaged` * Managed Test: Invoke `dotnet build` on the project directly. `dotnet` can be the `dotnet.sh` or `dotnet.cmd` script in the repo root. ``` -/dotnet.sh build /src/coreclr/tests/src/JIT/CodegenBringupTests/Array1_d.csproj /p:__BuildType=Release +/dotnet.sh build /src/coreclr/tests/src/JIT/CodegenBringupTests/Array1_d.csproj /p:Configuration=Release ``` ## Additional Documents diff --git a/docs/workflow/testing/coreclr/unix-test-instructions.md b/docs/workflow/testing/coreclr/unix-test-instructions.md index 7d298ce5bde209..2ba333c640daa5 100644 --- a/docs/workflow/testing/coreclr/unix-test-instructions.md +++ b/docs/workflow/testing/coreclr/unix-test-instructions.md @@ -28,12 +28,12 @@ Please note that this builds the Priority 0 tests. To build priority 1: During development there are many instances where building an individual test is fast and necessary. All of the necessary tools to build are under `coreclr`. It is possible to use `~/runtime/dotnet.sh msbuild` as you would normally use MSBuild with a few caveats. -**!! Note !! -- Passing /p:__TargetOS=[OSX|Linux] is required.** +**!! Note !! -- Passing /p:TargetOS=[OSX|Linux] is required.** ## Building an Individual Test ``` -/path/to/runtime/dotnet.sh msbuild src/coreclr/tests/src/path-to-proj-file /p:__TargetOS= /p:__BuildType= +/path/to/runtime/dotnet.sh msbuild src/coreclr/tests/src/path-to-proj-file /p:TargetOS= /p:Configuration= ``` ## Running Tests diff --git a/eng/Configurations.props b/eng/Configurations.props index eedf6a04d99560..eaa276ebdaa3e7 100644 --- a/eng/Configurations.props +++ b/eng/Configurations.props @@ -12,14 +12,13 @@ - <__TargetOS Condition="'$(__TargetOS)' == '' and $([MSBuild]::IsOSPlatform('OSX'))">OSX - <__TargetOS Condition="'$(__TargetOS)' == '' and $([MSBuild]::IsOSPlatform('FREEBSD'))">FreeBSD - <__TargetOS Condition="'$(__TargetOS)' == '' and $([MSBuild]::IsOSPlatform('NETBSD'))">NetBSD - <__TargetOS Condition="'$(__TargetOS)' == '' and $([MSBuild]::IsOSUnixLike())">Linux - <__TargetOS Condition="'$(__TargetOS)' == '' and $([MSBuild]::IsOSPlatform('WINDOWS'))">Windows_NT - $(__TargetOS) + OSX + FreeBSD + NetBSD + Linux + Windows_NT $(TargetOS) $(TargetOS) $(TargetOS) - \ No newline at end of file + diff --git a/eng/native/build-commons.sh b/eng/native/build-commons.sh index 87d76fc412cda4..53be70562aaff0 100755 --- a/eng/native/build-commons.sh +++ b/eng/native/build-commons.sh @@ -387,7 +387,7 @@ else __NumProc=$(nproc --all) fi -__CommonMSBuildArgs="/p:__BuildArch=$__BuildArch /p:__BuildType=$__BuildType /p:__TargetOS=$__TargetOS /nodeReuse:false $__OfficialBuildIdArg $__SignTypeArg $__SkipRestoreArg" +__CommonMSBuildArgs="/p:TargetArchitecture=$__BuildArch /p:Configuration=$__BuildType /p:TargetOS=$__TargetOS /nodeReuse:false $__OfficialBuildIdArg $__SignTypeArg $__SkipRestoreArg" # Configure environment if we are doing a verbose build if [[ "$__VerboseBuild" == 1 ]]; then diff --git a/eng/pipelines/coreclr/templates/build-job.yml b/eng/pipelines/coreclr/templates/build-job.yml index ac283f7db2b703..c20d4fb300bdf3 100644 --- a/eng/pipelines/coreclr/templates/build-job.yml +++ b/eng/pipelines/coreclr/templates/build-job.yml @@ -146,7 +146,7 @@ jobs: # Sign on Windows - ${{ if and(eq(parameters.osGroup, 'Windows_NT'), eq(parameters.signBinaries, 'true')) }}: - - powershell: eng\common\build.ps1 -ci -sign -restore -configuration:$(buildConfig) -warnaserror:0 /p:ArcadeBuild=true /p:OfficialBuild=true /p:TargetOS=$(osGroup) /p:BuildArch=$(archType) /p:BuildType=$(_BuildConfig) /p:DotNetSignType=$env:_SignType -projects $(Build.SourcesDirectory)\eng\empty.csproj + - powershell: eng\common\build.ps1 -ci -sign -restore -configuration:$(buildConfig) -warnaserror:0 /p:ArcadeBuild=true /p:OfficialBuild=true /p:TargetOS=$(osGroup) /p:TargetArchitecture=$(archType) /p:Configuration=$(_BuildConfig) /p:DotNetSignType=$env:_SignType -projects $(Build.SourcesDirectory)\eng\empty.csproj displayName: Sign Binaries - task: PublishPipelineArtifact@1 diff --git a/eng/pipelines/mono/templates/build-job.yml b/eng/pipelines/mono/templates/build-job.yml index 878f34e9374191..08e7d3c62374ac 100644 --- a/eng/pipelines/mono/templates/build-job.yml +++ b/eng/pipelines/mono/templates/build-job.yml @@ -120,7 +120,7 @@ jobs: # Publish official build - ${{ if and(ne(parameters.llvm, true), eq(parameters.publishToBlobFeed, 'true')) }}: - ${{ if ne(parameters.osGroup, 'Windows_NT') }}: - - script: $(Build.SourcesDirectory)/eng/common/build.sh --ci --restore --publish --configuration $(_BuildConfig) /p:DotNetPublishUsingPipelines=true /p:DotNetPublishToBlobFeed=true /p:DotNetPublishBlobFeedUrl=$(dotnetfeedUrl) /p:DotNetPublishBlobFeedKey=$(dotnetfeedPAT) /p:__BuildType=$(_BuildConfig) /p:__BuildArch=$(archType) /p:__TargetOS=$(osGroup) /p:OSIdentifier=$(osGroup)$(osSubgroup) /bl:"$(Build.SourcesDirectory)/artifacts/log/publish-pkgs.binlog" --projects $(Build.SourcesDirectory)/eng/empty.csproj + - script: $(Build.SourcesDirectory)/eng/common/build.sh --ci --restore --publish --configuration $(_BuildConfig) /p:DotNetPublishUsingPipelines=true /p:DotNetPublishToBlobFeed=true /p:DotNetPublishBlobFeedUrl=$(dotnetfeedUrl) /p:DotNetPublishBlobFeedKey=$(dotnetfeedPAT) /p:Configuration=$(_BuildConfig) /p:TargetArchitecture=$(archType) /p:TargetOS=$(osGroup) /p:OSIdentifier=$(osGroup)$(osSubgroup) /bl:"$(Build.SourcesDirectory)/artifacts/log/publish-pkgs.binlog" --projects $(Build.SourcesDirectory)/eng/empty.csproj displayName: Publish packages to blob feed env: # TODO: remove NUGET_PACKAGES once https://github.com/dotnet/arcade/issues/1578 is fixed @@ -130,7 +130,7 @@ jobs: DotNetCoreSdkDir: /usr/local/dotnet - ${{ if eq(parameters.osGroup, 'Windows_NT') }}: # TODO: pass publish feed url and access token in from the internal pipeline - - powershell: eng\common\build.ps1 -ci -restore -publish -configuration $(_BuildConfig) /p:DotNetPublishUsingPipelines=true /p:DotNetPublishToBlobFeed=true /p:DotNetPublishBlobFeedUrl=$(dotnetfeedUrl) /p:DotNetPublishBlobFeedKey=$(dotnetfeedPAT) /p:__BuildType=$(_BuildConfig) /p:__BuildArch=$(archType) /p:__TargetOS=$(osGroup) /p:OSIdentifier=$(osGroup)$(osSubgroup) /bl:"$(Build.SourcesDirectory)\artifacts\log\publish-pkgs.binlog" -projects $(Build.SourcesDirectory)\eng\empty.csproj + - powershell: eng\common\build.ps1 -ci -restore -publish -configuration $(_BuildConfig) /p:DotNetPublishUsingPipelines=true /p:DotNetPublishToBlobFeed=true /p:DotNetPublishBlobFeedUrl=$(dotnetfeedUrl) /p:DotNetPublishBlobFeedKey=$(dotnetfeedPAT) /p:Configuration=$(_BuildConfig) /p:TargetArchitecture=$(archType) /p:TargetOS=$(osGroup) /p:OSIdentifier=$(osGroup)$(osSubgroup) /bl:"$(Build.SourcesDirectory)\artifacts\log\publish-pkgs.binlog" -projects $(Build.SourcesDirectory)\eng\empty.csproj displayName: Publish packages to blob feed env: # TODO: remove NUGET_PACKAGES once https://github.com/dotnet/arcade/issues/1578 is fixed diff --git a/eng/testing/tests.targets b/eng/testing/tests.targets index ad930a6e744873..9936c2ad8293dd 100644 --- a/eng/testing/tests.targets +++ b/eng/testing/tests.targets @@ -1,6 +1,5 @@ - $(DefaultOSGroup) $(OutDir) RunnerTemplate.cmd diff --git a/src/coreclr/build-runtime.cmd b/src/coreclr/build-runtime.cmd index 77e64097a09b1d..7ba07fedafd874 100644 --- a/src/coreclr/build-runtime.cmd +++ b/src/coreclr/build-runtime.cmd @@ -72,7 +72,7 @@ REM __PassThroughArgs is a set of things that will be passed through to nested c REM when using "all". set __PassThroughArgs= -REM __UnprocessedBuildArgs are args that we pass to msbuild (e.g. /p:__BuildArch=x64) +REM __UnprocessedBuildArgs are args that we pass to msbuild (e.g. /p:TargetArchitecture=x64) set "__args= %*" set processedArgs= set __UnprocessedBuildArgs= @@ -223,7 +223,7 @@ if %__BuildTypeDebug%==1 set __BuildType=Debug if %__BuildTypeChecked%==1 set __BuildType=Checked if %__BuildTypeRelease%==1 set __BuildType=Release -set __CommonMSBuildArgs=/p:__TargetOS=%__TargetOS% /p:__BuildType=%__BuildType% /p:__BuildArch=%__BuildArch% +set __CommonMSBuildArgs=/p:TargetOS=%__TargetOS% /p:Configuration=%__BuildType% /p:TargetArchitecture=%__BuildArch% if %__EnforcePgo%==1 ( if %__BuildArchArm%==1 ( diff --git a/src/coreclr/build-test.cmd b/src/coreclr/build-test.cmd index 4be7b2ac7f6540..2dbb3b134ddaa6 100644 --- a/src/coreclr/build-test.cmd +++ b/src/coreclr/build-test.cmd @@ -44,7 +44,7 @@ set "__MsbuildDebugLogsDir=%__LogsDir%\MsbuildDebugLogs" :: Default __Exclude to issues.targets set __Exclude=%__TestDir%\issues.targets -REM __UnprocessedBuildArgs are args that we pass to msbuild (e.g. /p:__BuildArch=x64) +REM __UnprocessedBuildArgs are args that we pass to msbuild (e.g. /p:TargetArchitecture=x64) set "__args= %*" set processedArgs= set __UnprocessedBuildArgs= @@ -141,8 +141,8 @@ if "%__TargetsWindows%"=="1" ( @if defined _echo @echo on -set __CommonMSBuildArgs=/p:__TargetOS=%__TargetOS% /p:__BuildType=%__BuildType% /p:__BuildArch=%__BuildArch% -set __msbuildArgs=/p:__TargetOS=%__TargetOS% /p:__BuildType=%__BuildType% /p:__BuildArch=%__BuildArch% /nologo /verbosity:minimal /clp:Summary /maxcpucount +set __CommonMSBuildArgs=/p:TargetOS=%__TargetOS% /p:Configuration=%__BuildType% /p:TargetArchitecture=%__BuildArch% +set __msbuildArgs=/p:TargetOS=%__TargetOS% /p:Configuration=%__BuildType% /p:TargetArchitecture=%__BuildArch% /nologo /verbosity:minimal /clp:Summary /maxcpucount echo %__MsgPrefix%Commencing CoreCLR test build diff --git a/src/coreclr/build-test.sh b/src/coreclr/build-test.sh index f4f2eecc631a01..24b7d3275b071f 100755 --- a/src/coreclr/build-test.sh +++ b/src/coreclr/build-test.sh @@ -32,7 +32,7 @@ build_test_wrappers() __MsbuildErr="/fileloggerparameters2:\"ErrorsOnly;LogFile=${__BuildErr}\"" __Logging="$__MsbuildLog $__MsbuildWrn $__MsbuildErr /consoleloggerparameters:$buildVerbosity" - nextCommand="\"${__DotNetCli}\" msbuild \"${__ProjectDir}/tests/src/runtest.proj\" /nodereuse:false /p:BuildWrappers=true /p:TestBuildMode=$__TestBuildMode /p:TargetsWindows=false $__Logging /p:__TargetOS=$__TargetOS /p:__BuildType=$__BuildType /p:__BuildArch=$__BuildArch" + nextCommand="\"${__DotNetCli}\" msbuild \"${__ProjectDir}/tests/src/runtest.proj\" /nodereuse:false /p:BuildWrappers=true /p:TestBuildMode=$__TestBuildMode /p:TargetsWindows=false $__Logging /p:TargetOS=$__TargetOS /p:Configuration=$__BuildType /p:TargetArchitecture=$__BuildArch" eval $nextCommand local exitCode="$?" @@ -90,7 +90,7 @@ generate_layout() MSBUILDDEBUGPATH="${__MsbuildDebugLogsDir}" export MSBUILDDEBUGPATH - __BuildProperties="-p:TargetOS=${__TargetOS} -p:BuildArch=${__BuildArch} -p:BuildType=${__BuildType}" + __BuildProperties="-p:TargetOS=${__TargetOS} -p:TargetArchitecture=${__BuildArch} -p:Configuration=${__BuildType}" # ========================================================================================= # === @@ -311,7 +311,7 @@ build_Tests() MSBUILDDEBUGPATH="${__MsbuildDebugLogsDir}" export MSBUILDDEBUGPATH - __BuildProperties="-p:TargetOS=${__TargetOS} -p:BuildArch=${__BuildArch} -p:BuildType=${__BuildType}" + __BuildProperties="-p:TargetOS=${__TargetOS} -p:TargetArchitecture=${__BuildArch} -p:Configuration=${__BuildType}" # ========================================================================================= # === diff --git a/src/coreclr/build.cmd b/src/coreclr/build.cmd index 995f181602ea5a..19757613a653cc 100644 --- a/src/coreclr/build.cmd +++ b/src/coreclr/build.cmd @@ -74,7 +74,7 @@ REM __PassThroughArgs is a set of things that will be passed through to nested c REM when using "all". set __PassThroughArgs= -REM __UnprocessedBuildArgs are args that we pass to msbuild (e.g. /p:__BuildArch=x64) +REM __UnprocessedBuildArgs are args that we pass to msbuild (e.g. /p:TargetArchitecture=x64) set "__args= %*" set processedArgs= set __UnprocessedBuildArgs= @@ -263,7 +263,7 @@ if %__BuildTypeDebug%==1 set __BuildType=Debug if %__BuildTypeChecked%==1 set __BuildType=Checked if %__BuildTypeRelease%==1 set __BuildType=Release -set __CommonMSBuildArgs=/p:__TargetOS=%__TargetOS% /p:__BuildType=%__BuildType% /p:__BuildArch=%__BuildArch% !__SkipRestoreArg! !__OfficialBuildIdArg! +set __CommonMSBuildArgs=/p:TargetOS=%__TargetOS% /p:Configuration=%__BuildType% /p:TargetArchitecture=%__BuildArch% !__SkipRestoreArg! !__OfficialBuildIdArg! if %__EnforcePgo%==1 ( if %__BuildArchArm%==1 ( @@ -664,7 +664,7 @@ if %__BuildCoreLib% EQU 1 ( if "%__BuildManagedTools%" == "1" ( echo %__MsgPrefix%Publishing crossgen2... - call %__RepoRootDir%\dotnet.cmd publish --self-contained -r win-%__BuildArch% -c %__BuildType% -o "%__BinDir%\crossgen2" "%__ProjectDir%\src\tools\crossgen2\crossgen2\crossgen2.csproj" /nologo /p:BuildArch=%__BuildArch% + call %__RepoRootDir%\dotnet.cmd publish --self-contained -r win-%__BuildArch% -c %__BuildType% -o "%__BinDir%\crossgen2" "%__ProjectDir%\src\tools\crossgen2\crossgen2\crossgen2.csproj" /nologo /p:TargetArchitecture=%__BuildArch% if not !errorlevel! == 0 ( echo %__ErrMsgPrefix%%__MsgPrefix%Error: Failed to build crossgen2. diff --git a/src/coreclr/build.sh b/src/coreclr/build.sh index 15e912625b9253..edfe44ae7985ea 100755 --- a/src/coreclr/build.sh +++ b/src/coreclr/build.sh @@ -220,7 +220,7 @@ build_CoreLib() if [[ "$__BuildManagedTools" -eq "1" ]]; then echo "Publishing crossgen2 for $__DistroRid" - "$__RepoRootDir/dotnet.sh" publish --self-contained -r $__DistroRid -c $__BuildType -o "$__BinDir/crossgen2" "$__ProjectRoot/src/tools/crossgen2/crossgen2/crossgen2.csproj" /nologo /p:BuildArch=$__BuildArch + "$__RepoRootDir/dotnet.sh" publish --self-contained -r $__DistroRid -c $__BuildType -o "$__BinDir/crossgen2" "$__ProjectRoot/src/tools/crossgen2/crossgen2/crossgen2.csproj" /nologo /p:TargetArchitecture=$__BuildArch local exit_code="$?" if [[ "$exit_code" != 0 ]]; then diff --git a/src/coreclr/dir.common.props b/src/coreclr/dir.common.props index 5ab02aec8387c1..eb59939656fdea 100644 --- a/src/coreclr/dir.common.props +++ b/src/coreclr/dir.common.props @@ -10,25 +10,18 @@ - $(__BuildArch) - $(TargetArchitecture) - x64 - x64 + + $(__BuildArch) + $(__BuildType) - $(__BuildType) - Debug - Debug - Release - Checked + Debug + Debug + Release + Checked - - <__TargetOS>$(TargetOS) - <__BuildArch>$(BuildArch) + $(TargetArchitecture) - $(BuildType) - $(BuildArch) - - $(TargetOS).$(BuildArch).$(BuildType) + $(TargetOS).$(TargetArchitecture).$(Configuration) @@ -69,9 +62,9 @@ $(__DistroRid) - x64 - x86 - x64 + x64 + x86 + x64 diff --git a/src/coreclr/src/.nuget/Directory.Build.props b/src/coreclr/src/.nuget/Directory.Build.props index 6a72dc344eb4cc..e321b384626e0e 100644 --- a/src/coreclr/src/.nuget/Directory.Build.props +++ b/src/coreclr/src/.nuget/Directory.Build.props @@ -17,7 +17,7 @@ <_parseDistroRid>$(__DistroRid) - <_parseDistroRid Condition="'$(_parseDistroRid)' == '' and '$(__TargetOS)' == 'OSX'">osx.10.12-x64 + <_parseDistroRid Condition="'$(_parseDistroRid)' == '' and '$(TargetOS)' == 'OSX'">osx.10.12-x64 <_distroRidIndex>$(_parseDistroRid.LastIndexOfAny("-")) <_archRidIndex>$([MSBuild]::Add($(_distroRidIndex), 1)) $(_parseDistroRid.SubString(0, $(_distroRidIndex))) @@ -25,7 +25,6 @@ $(_parseDistroRid.SubString($(_archRidIndex))) $(Platform) - $(BuildArch) $(OSRid) @@ -46,7 +45,7 @@ <_derivedPackageTargetOSGroup Condition="'$(_derivedPackageTargetOSGroup)' == '' and '$(_runtimeOSFamily)' == 'osx'">OSX <_derivedPackageTargetOSGroup Condition="'$(_derivedPackageTargetOSGroup)' == '' and '$(_runtimeOSFamily)' == 'android'">Android <_derivedPackageTargetOSGroup Condition="'$(_derivedPackageTargetOSGroup)' == '' and '$(_runtimeOSFamily)' == 'win'">Windows_NT - <_derivedPackageTargetOSGroup Condition="'$(_derivedPackageTargetOSGroup)' == '' and '$(__TargetOS)' != ''">$(__TargetOS) + <_derivedPackageTargetOSGroup Condition="'$(_derivedPackageTargetOSGroup)' == '' and '$(TargetOS)' != ''">$(TargetOS) <_derivedPackageTargetOSGroup Condition="'$(_derivedPackageTargetOSGroup)' == ''">Linux <_isSupportedOSGroup Condition="!$(SupportedPackageOSGroups.Contains(';$(_derivedPackageTargetOSGroup);'))">false diff --git a/src/coreclr/src/.nuget/builds.targets b/src/coreclr/src/.nuget/builds.targets index d58f010d3939b8..66d4f4e06619ec 100644 --- a/src/coreclr/src/.nuget/builds.targets +++ b/src/coreclr/src/.nuget/builds.targets @@ -9,7 +9,7 @@ true - false + false diff --git a/src/coreclr/src/.nuget/optdata/optdata.csproj b/src/coreclr/src/.nuget/optdata/optdata.csproj index 20a06457ce630d..d19c3125fe5d3e 100644 --- a/src/coreclr/src/.nuget/optdata/optdata.csproj +++ b/src/coreclr/src/.nuget/optdata/optdata.csproj @@ -3,10 +3,10 @@ $(NetCoreAppCurrent) true - True - True + True + True win7-x64;win7-x86;linux-x64 - <_TargetOSArchLowercase>$(TargetOS.ToLower())-$(BuildArch.ToLower()) + <_TargetOSArchLowercase>$(TargetOS.ToLower())-$(TargetArchitecture.ToLower()) diff --git a/src/coreclr/src/Directory.Build.props b/src/coreclr/src/Directory.Build.props index dee51cc890b274..d07cd53645db07 100644 --- a/src/coreclr/src/Directory.Build.props +++ b/src/coreclr/src/Directory.Build.props @@ -1,8 +1,4 @@ - - <__BuildType>$(Configuration) - - diff --git a/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj b/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj index 2d168eebe3ac46..58c55ee6c2b25d 100644 --- a/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj +++ b/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj @@ -31,7 +31,7 @@ - $(BuildArch) + $(TargetArchitecture) arm true @@ -421,7 +421,7 @@ - + src\System\Diagnostics\Eventing\Generated\NativeRuntimeEventSource.CoreCLR.cs diff --git a/src/coreclr/src/build.proj b/src/coreclr/src/build.proj index af6a867b6d9b3b..ad5ff6e63a70a2 100644 --- a/src/coreclr/src/build.proj +++ b/src/coreclr/src/build.proj @@ -2,7 +2,7 @@ - + @@ -17,17 +17,17 @@ The api-*xstate.dll binary needs to be signed. --> - + - + DestinationFolder="$(BinDir)Redist\ucrt\DLLs\$(TargetArchitecture)" /> true - false + false diff --git a/src/coreclr/tests/Directory.Build.props b/src/coreclr/tests/Directory.Build.props index 7e57e7a601e994..d2a5b807c5f728 100644 --- a/src/coreclr/tests/Directory.Build.props +++ b/src/coreclr/tests/Directory.Build.props @@ -15,10 +15,10 @@ - $(ArtifactsDir)bin\coreclr\$(TargetOS).$(BuildArch).$(BuildType)\ + $(ArtifactsDir)bin\coreclr\$(TargetOS).$(TargetArchitecture).$(Configuration)\ $(__TestWorkingDir)\ - $(ArtifactsDir)tests\coreclr\$(TargetOS).$(BuildArch).$(BuildType)\ + $(ArtifactsDir)tests\coreclr\$(TargetOS).$(TargetArchitecture).$(Configuration)\ $(__AltJitArch) @@ -28,8 +28,8 @@ $(ArtifactsDir)obj\ - $(BaseIntermediateOutputPath)\$(TargetOS).$(BuildArch).$(BuildType) - $(BaseIntermediateOutputPath)\coreclr\$(TargetOS).$(BuildArch).$(BuildType) + $(BaseIntermediateOutputPath)\$(TargetOS).$(TargetArchitecture).$(Configuration) + $(BaseIntermediateOutputPath)\coreclr\$(TargetOS).$(TargetArchitecture).$(Configuration) diff --git a/src/coreclr/tests/build.proj b/src/coreclr/tests/build.proj index 6bb478984d0942..f09deee581fd87 100644 --- a/src/coreclr/tests/build.proj +++ b/src/coreclr/tests/build.proj @@ -45,7 +45,7 @@ - <_ConfigurationProperties>/p:__TargetOS=$(__TargetOS) /p:__BuildArch=$(__BuildArch) /p:__BuildType=$(__BuildType) + <_ConfigurationProperties>/p:TargetOS=$(TargetOS) /p:TargetArchitecture=$(TargetArchitecture) /p:Configuration=$(Configuration) "$(DotNetTool)" restore $(RestoreProj) $(PackageVersionArg) /p:SetTFMForRestore=true $(_ConfigurationProperties) $(__SkipFXRestoreArg) "$(DotNetTool)" restore -r $(__DistroRid) $(RestoreProj) $(PackageVersionArg) /p:SetTFMForRestore=true $(_ConfigurationProperties) $(__SkipFXRestoreArg) diff --git a/src/coreclr/tests/dir.common.props b/src/coreclr/tests/dir.common.props index cece71183fbf88..97f640014d0c5d 100644 --- a/src/coreclr/tests/dir.common.props +++ b/src/coreclr/tests/dir.common.props @@ -10,7 +10,7 @@ tests/dir.props directly - these should eventually go away. --> - $(TargetOS).$(BuildArch).$(Configuration) + $(TargetOS).$(TargetArchitecture).$(Configuration) $(MSBuildThisFileDirectory)src $([MSBuild]::MakeRelative($(TestSrcDir), $(MSBuildProjectDirectory)))\$(MSBuildProjectName)\ diff --git a/src/coreclr/tests/helixpublishwitharcade.proj b/src/coreclr/tests/helixpublishwitharcade.proj index c17019aefb81da..93276627286dea 100644 --- a/src/coreclr/tests/helixpublishwitharcade.proj +++ b/src/coreclr/tests/helixpublishwitharcade.proj @@ -15,9 +15,9 @@ <_PropertiesToPass> - __BuildArch=$(__BuildArch); - __TargetOS=$(__TargetOS); - __BuildType=$(__BuildType); + TargetArchitecture=$(TargetArchitecture); + TargetOS=$(TargetOS); + Configuration=$(Configuration); Creator=$(_Creator); HelixAccessToken=$(_HelixAccessToken); HelixBuild=$(_HelixBuild); @@ -167,17 +167,17 @@ true true true - $(BuildArch) - $(BuildType) - $(BuildType)-$(Scenario) + $(TargetArchitecture) + $(Configuration) + $(Configuration)-$(Scenario) false false false false R2R R2R-CG2 - $(TestRunNamePrefix)$(TargetOS) $(BuildArch) $(BuildType) @ - $(TestRunNamePrefix)$(TargetOS) $(BuildArch) $(BuildType) $(Scenario) @ + $(TestRunNamePrefix)$(TargetOS) $(TargetArchitecture) $(Configuration) @ + $(TestRunNamePrefix)$(TargetOS) $(TargetArchitecture) $(Configuration) $(Scenario) @ $([System.TimeSpan]::FromMinutes($(TimeoutPerTestInMinutes)).TotalMilliseconds) true <_XUnitParallelMode>collections diff --git a/src/coreclr/tests/issues.targets b/src/coreclr/tests/issues.targets index 27c9557369200f..dfe9489e3ae084 100644 --- a/src/coreclr/tests/issues.targets +++ b/src/coreclr/tests/issues.targets @@ -135,7 +135,7 @@ - + needs triage @@ -292,7 +292,7 @@ - + needs triage @@ -344,7 +344,7 @@ - + https://github.com/dotnet/runtime/issues/10354 @@ -363,7 +363,7 @@ - + 3392, test is useful to have because it can be run manually when making changes to the GC that can have effects in OOM scenarios, but not appropriate to run on our current test infrastructure. @@ -394,7 +394,7 @@ - + https://github.com/dotnet/runtime/issues/11360 @@ -594,7 +594,7 @@ - + https://github.com/dotnet/runtime/issues/9270 @@ -685,7 +685,7 @@ - + Varargs not supported on this platform @@ -737,7 +737,7 @@ - + Test times out @@ -762,7 +762,7 @@ - + https://github.com/dotnet/runtime/issues/10848 diff --git a/src/coreclr/tests/override.targets b/src/coreclr/tests/override.targets index e51db2c91a3466..61df0e559c57ac 100644 --- a/src/coreclr/tests/override.targets +++ b/src/coreclr/tests/override.targets @@ -14,7 +14,7 @@ > - + diff --git a/src/coreclr/tests/publishdependency.targets b/src/coreclr/tests/publishdependency.targets index bdb61e870d427b..bdef4ffa0c6d16 100644 --- a/src/coreclr/tests/publishdependency.targets +++ b/src/coreclr/tests/publishdependency.targets @@ -6,8 +6,7 @@ - $(__BuildArch) - x64 + $(TargetArchitecture) win7 win8 win10 @@ -21,7 +20,7 @@ - $(RepoRoot)\artifacts\bin\coreclr\$(TargetOS).$(BuildArch).$(BuildType) + $(RepoRoot)\artifacts\bin\coreclr\$(TargetOS).$(TargetArchitecture).$(Configuration) $(ProductDestination)\ref diff --git a/src/coreclr/tests/runtest.py b/src/coreclr/tests/runtest.py index 09fb8466af0dc3..68444d5d440890 100755 --- a/src/coreclr/tests/runtest.py +++ b/src/coreclr/tests/runtest.py @@ -637,9 +637,9 @@ def call_msbuild(args): if g_verbose: command += ["/verbosity:diag"] - command += ["/p:__TargetOS=%s" % args.host_os, - "/p:__BuildArch=%s" % args.arch, - "/p:__BuildType=%s" % args.build_type, + command += ["/p:TargetOS=%s" % args.host_os, + "/p:TargetArchitecture=%s" % args.arch, + "/p:Configuration=%s" % args.build_type, "/p:__LogsDir=%s" % args.logs_dir] print(" ".join(command)) diff --git a/src/coreclr/tests/src/Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj b/src/coreclr/tests/src/Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj index ee73e32e4f84a4..fc2cefb4e518e4 100644 --- a/src/coreclr/tests/src/Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj +++ b/src/coreclr/tests/src/Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj @@ -4,7 +4,7 @@ Library ..\..\ BuildOnly - $(DefineConstants);$([System.String]::Copy('$(BuildArch)').ToUpper()) + $(DefineConstants);$([System.String]::Copy('$(TargetArchitecture)').ToUpper()) true false $(NetCoreAppCurrent) diff --git a/src/coreclr/tests/src/Common/test_dependencies/test_dependencies.csproj b/src/coreclr/tests/src/Common/test_dependencies/test_dependencies.csproj index 4124f743d21243..7b963e9a33983c 100644 --- a/src/coreclr/tests/src/Common/test_dependencies/test_dependencies.csproj +++ b/src/coreclr/tests/src/Common/test_dependencies/test_dependencies.csproj @@ -6,7 +6,6 @@ true true win-arm;win-arm64;win-x64;win-x86;$(TargetRid) - $(BuildArch) true Release @@ -23,7 +22,7 @@ - + diff --git a/src/coreclr/tests/src/Directory.Build.props b/src/coreclr/tests/src/Directory.Build.props index b70d49f4253fc8..fd07aff01d369e 100644 --- a/src/coreclr/tests/src/Directory.Build.props +++ b/src/coreclr/tests/src/Directory.Build.props @@ -30,7 +30,7 @@ $(BaseOutputPathWithConfig) $(RepoRoot)\artifacts\tests\coreclr\obj\$(OSPlatformConfig)\Managed\ $(__ManagedTestIntermediatesDir)\ - <__NativeTestIntermediatesDir Condition="'$(__NativeTestIntermediatesDir)' == ''">$([System.IO.Path]::GetFullPath($(BaseOutputPathWithConfig)..\..\coreclr\obj\$(TargetOS).$(BuildArch).$(Configuration)\Native\)) + <__NativeTestIntermediatesDir Condition="'$(__NativeTestIntermediatesDir)' == ''">$([System.IO.Path]::GetFullPath($(BaseOutputPathWithConfig)..\..\coreclr\obj\$(TargetOS).$(TargetArchitecture).$(Configuration)\Native\)) $(MSBuildProjectName)\ $([System.String]::Copy('$(MSBuildProjectDirectory)').Replace($(TestSourceDir),''))\$(MSBuildProjectName) $(BaseIntermediateOutputPath)$(BuildProjectRelativeDir)\ @@ -67,28 +67,28 @@ TargetsWindows property may already be set. Only set the property if it is not already defined --> true - win-$(__BuildArch) + win-$(TargetArchitecture) true true - ubuntu.14.04-$(__BuildArch) + ubuntu.14.04-$(TargetArchitecture) true true - osx.10.12-$(__BuildArch) + osx.10.12-$(TargetArchitecture) true true - ubuntu.14.04-$(__BuildArch) + ubuntu.14.04-$(TargetArchitecture) diff --git a/src/coreclr/tests/src/Directory.Build.targets b/src/coreclr/tests/src/Directory.Build.targets index c113fe2002341e..f99c73df8825c0 100644 --- a/src/coreclr/tests/src/Directory.Build.targets +++ b/src/coreclr/tests/src/Directory.Build.targets @@ -139,10 +139,10 @@ - + - + @@ -240,7 +240,6 @@ true - $(BuildArch) Release diff --git a/src/coreclr/tests/src/GC/API/GC/GetAllocatedBytesForCurrentThread.csproj b/src/coreclr/tests/src/GC/API/GC/GetAllocatedBytesForCurrentThread.csproj index e29d63129935e0..71463c3dabd0b9 100644 --- a/src/coreclr/tests/src/GC/API/GC/GetAllocatedBytesForCurrentThread.csproj +++ b/src/coreclr/tests/src/GC/API/GC/GetAllocatedBytesForCurrentThread.csproj @@ -1,7 +1,7 @@ Exe - true + true diff --git a/src/coreclr/tests/src/GC/API/GC/GetTotalAllocatedBytes.csproj b/src/coreclr/tests/src/GC/API/GC/GetTotalAllocatedBytes.csproj index b56eadc0e740f8..3bb2bb69479651 100644 --- a/src/coreclr/tests/src/GC/API/GC/GetTotalAllocatedBytes.csproj +++ b/src/coreclr/tests/src/GC/API/GC/GetTotalAllocatedBytes.csproj @@ -1,7 +1,7 @@ Exe - true + true diff --git a/src/coreclr/tests/src/GC/Regressions/v2.0-rtm/494226/494226.csproj b/src/coreclr/tests/src/GC/Regressions/v2.0-rtm/494226/494226.csproj index 9230aa5645fce0..01ae67cf7e10b9 100644 --- a/src/coreclr/tests/src/GC/Regressions/v2.0-rtm/494226/494226.csproj +++ b/src/coreclr/tests/src/GC/Regressions/v2.0-rtm/494226/494226.csproj @@ -2,7 +2,7 @@ Exe true - true + true true diff --git a/src/coreclr/tests/src/GC/Scenarios/ServerModel/servermodel.csproj b/src/coreclr/tests/src/GC/Scenarios/ServerModel/servermodel.csproj index 418639a5a2cd4c..eee4947a80a783 100644 --- a/src/coreclr/tests/src/GC/Scenarios/ServerModel/servermodel.csproj +++ b/src/coreclr/tests/src/GC/Scenarios/ServerModel/servermodel.csproj @@ -3,7 +3,7 @@ Exe /numrequests:100 true - true + true diff --git a/src/coreclr/tests/src/Interop/ExecInDefAppDom/InjectedCode/InjectedCode.csproj b/src/coreclr/tests/src/Interop/ExecInDefAppDom/InjectedCode/InjectedCode.csproj index 8b32a941119a5d..0e55857fa1da08 100644 --- a/src/coreclr/tests/src/Interop/ExecInDefAppDom/InjectedCode/InjectedCode.csproj +++ b/src/coreclr/tests/src/Interop/ExecInDefAppDom/InjectedCode/InjectedCode.csproj @@ -2,7 +2,7 @@ Library BuildOnly - $(DefineConstants);$([System.String]::Copy('$(BuildArch)').ToUpper()) + $(DefineConstants);$([System.String]::Copy('$(TargetArchitecture)').ToUpper()) true false diff --git a/src/coreclr/tests/src/Interop/IJW/CopyConstructorMarshaler/CopyConstructorMarshaler.csproj b/src/coreclr/tests/src/Interop/IJW/CopyConstructorMarshaler/CopyConstructorMarshaler.csproj index 5a392a9c8656ff..fb1698e9d4af6f 100644 --- a/src/coreclr/tests/src/Interop/IJW/CopyConstructorMarshaler/CopyConstructorMarshaler.csproj +++ b/src/coreclr/tests/src/Interop/IJW/CopyConstructorMarshaler/CopyConstructorMarshaler.csproj @@ -7,7 +7,7 @@ true true - true + true true diff --git a/src/coreclr/tests/src/Interop/IJW/FixupCallsHostWhenLoaded/FixupCallsHostWhenLoaded.csproj b/src/coreclr/tests/src/Interop/IJW/FixupCallsHostWhenLoaded/FixupCallsHostWhenLoaded.csproj index 84e494d08024f0..1a18ab5d375244 100644 --- a/src/coreclr/tests/src/Interop/IJW/FixupCallsHostWhenLoaded/FixupCallsHostWhenLoaded.csproj +++ b/src/coreclr/tests/src/Interop/IJW/FixupCallsHostWhenLoaded/FixupCallsHostWhenLoaded.csproj @@ -7,7 +7,7 @@ true true - true + true true diff --git a/src/coreclr/tests/src/Interop/IJW/LoadIjwFromModuleHandle/LoadIjwFromModuleHandle.csproj b/src/coreclr/tests/src/Interop/IJW/LoadIjwFromModuleHandle/LoadIjwFromModuleHandle.csproj index c57c638156b202..d486a91712ac65 100644 --- a/src/coreclr/tests/src/Interop/IJW/LoadIjwFromModuleHandle/LoadIjwFromModuleHandle.csproj +++ b/src/coreclr/tests/src/Interop/IJW/LoadIjwFromModuleHandle/LoadIjwFromModuleHandle.csproj @@ -9,7 +9,7 @@ true true - true + true true diff --git a/src/coreclr/tests/src/Interop/IJW/ManagedCallingNative/ManagedCallingNative.csproj b/src/coreclr/tests/src/Interop/IJW/ManagedCallingNative/ManagedCallingNative.csproj index 033a2664b235f1..1b3ffcfa12579a 100644 --- a/src/coreclr/tests/src/Interop/IJW/ManagedCallingNative/ManagedCallingNative.csproj +++ b/src/coreclr/tests/src/Interop/IJW/ManagedCallingNative/ManagedCallingNative.csproj @@ -7,7 +7,7 @@ true true - true + true true diff --git a/src/coreclr/tests/src/Interop/IJW/NativeCallingManaged/NativeCallingManaged.csproj b/src/coreclr/tests/src/Interop/IJW/NativeCallingManaged/NativeCallingManaged.csproj index eb21075d8f9fe7..683104f8d9abe7 100644 --- a/src/coreclr/tests/src/Interop/IJW/NativeCallingManaged/NativeCallingManaged.csproj +++ b/src/coreclr/tests/src/Interop/IJW/NativeCallingManaged/NativeCallingManaged.csproj @@ -7,7 +7,7 @@ true true - true + true true diff --git a/src/coreclr/tests/src/Interop/IJW/NativeVarargs/NativeVarargsTest.csproj b/src/coreclr/tests/src/Interop/IJW/NativeVarargs/NativeVarargsTest.csproj index 1c0cd49de7fd4a..d581a45a1bd619 100644 --- a/src/coreclr/tests/src/Interop/IJW/NativeVarargs/NativeVarargsTest.csproj +++ b/src/coreclr/tests/src/Interop/IJW/NativeVarargs/NativeVarargsTest.csproj @@ -7,9 +7,9 @@ true true - true + true - true + true true diff --git a/src/coreclr/tests/src/Interop/Interop.settings.targets b/src/coreclr/tests/src/Interop/Interop.settings.targets index a9d550ed9cd3c0..97077b2f9f8302 100644 --- a/src/coreclr/tests/src/Interop/Interop.settings.targets +++ b/src/coreclr/tests/src/Interop/Interop.settings.targets @@ -22,8 +22,8 @@ - - - + + + diff --git a/src/coreclr/tests/src/Interop/WinRT/NETClients/Bindings/NETClientBindings.csproj b/src/coreclr/tests/src/Interop/WinRT/NETClients/Bindings/NETClientBindings.csproj index 5f17399157c0de..7d18fc669e37a4 100644 --- a/src/coreclr/tests/src/Interop/WinRT/NETClients/Bindings/NETClientBindings.csproj +++ b/src/coreclr/tests/src/Interop/WinRT/NETClients/Bindings/NETClientBindings.csproj @@ -4,7 +4,7 @@ true true - true + true true diff --git a/src/coreclr/tests/src/JIT/Directed/PREFIX/unaligned/1/arglist.ilproj b/src/coreclr/tests/src/JIT/Directed/PREFIX/unaligned/1/arglist.ilproj index cb8278bf1e4eab..9b4a0487eddfe4 100644 --- a/src/coreclr/tests/src/JIT/Directed/PREFIX/unaligned/1/arglist.ilproj +++ b/src/coreclr/tests/src/JIT/Directed/PREFIX/unaligned/1/arglist.ilproj @@ -8,10 +8,10 @@ True - - - - - + + + + + diff --git a/src/coreclr/tests/src/JIT/Directed/PREFIX/unaligned/2/arglist.ilproj b/src/coreclr/tests/src/JIT/Directed/PREFIX/unaligned/2/arglist.ilproj index cb8278bf1e4eab..9b4a0487eddfe4 100644 --- a/src/coreclr/tests/src/JIT/Directed/PREFIX/unaligned/2/arglist.ilproj +++ b/src/coreclr/tests/src/JIT/Directed/PREFIX/unaligned/2/arglist.ilproj @@ -8,10 +8,10 @@ True - - - - - + + + + + diff --git a/src/coreclr/tests/src/JIT/Directed/PREFIX/unaligned/4/arglist.ilproj b/src/coreclr/tests/src/JIT/Directed/PREFIX/unaligned/4/arglist.ilproj index cb8278bf1e4eab..9b4a0487eddfe4 100644 --- a/src/coreclr/tests/src/JIT/Directed/PREFIX/unaligned/4/arglist.ilproj +++ b/src/coreclr/tests/src/JIT/Directed/PREFIX/unaligned/4/arglist.ilproj @@ -8,10 +8,10 @@ True - - - - - + + + + + diff --git a/src/coreclr/tests/src/JIT/Directed/PREFIX/volatile/1/arglist.ilproj b/src/coreclr/tests/src/JIT/Directed/PREFIX/volatile/1/arglist.ilproj index cb8278bf1e4eab..9b4a0487eddfe4 100644 --- a/src/coreclr/tests/src/JIT/Directed/PREFIX/volatile/1/arglist.ilproj +++ b/src/coreclr/tests/src/JIT/Directed/PREFIX/volatile/1/arglist.ilproj @@ -8,10 +8,10 @@ True - - - - - + + + + + diff --git a/src/coreclr/tests/src/JIT/Directed/VectorABI/VectorMgdMgd_ro.csproj b/src/coreclr/tests/src/JIT/Directed/VectorABI/VectorMgdMgd_ro.csproj index 4ac8db81b91337..cf5c3f7cca7443 100644 --- a/src/coreclr/tests/src/JIT/Directed/VectorABI/VectorMgdMgd_ro.csproj +++ b/src/coreclr/tests/src/JIT/Directed/VectorABI/VectorMgdMgd_ro.csproj @@ -6,7 +6,7 @@ True True - true + true diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i8_i.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i8_i.ilproj index 1f52caf73c08e2..1619e6d093a452 100644 --- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i8_i.ilproj +++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i8_i.ilproj @@ -1,8 +1,8 @@ Exe - true - true + true + true PdbOnly diff --git a/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_array_merge.ilproj b/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_array_merge.ilproj index 5697a2766e19da..478982eb0052ed 100644 --- a/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_array_merge.ilproj +++ b/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_array_merge.ilproj @@ -7,10 +7,10 @@ Full - - - - - + + + + + diff --git a/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgsizeof.ilproj b/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgsizeof.ilproj index 47bc72c5631615..0659873925cbd3 100644 --- a/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgsizeof.ilproj +++ b/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgsizeof.ilproj @@ -7,10 +7,10 @@ Full - - - - - + + + + + diff --git a/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_array_merge.ilproj b/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_array_merge.ilproj index f01269584d4040..c5ca10a9a65101 100644 --- a/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_array_merge.ilproj +++ b/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_array_merge.ilproj @@ -7,10 +7,10 @@ Full - - - - - + + + + + diff --git a/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_array_merge.ilproj b/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_array_merge.ilproj index 922a1c4c01a341..c5e2a6e9bd16d6 100644 --- a/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_array_merge.ilproj +++ b/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_array_merge.ilproj @@ -7,10 +7,10 @@ PdbOnly - - - - - + + + + + diff --git a/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relsizeof.ilproj b/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relsizeof.ilproj index 410949bea06d5e..3e8d48b9b73a65 100644 --- a/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relsizeof.ilproj +++ b/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relsizeof.ilproj @@ -7,10 +7,10 @@ PdbOnly - - - - - + + + + + diff --git a/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_array_merge.ilproj b/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_array_merge.ilproj index a2c3c1c7b9b2c1..f4667a3506a4d1 100644 --- a/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_array_merge.ilproj +++ b/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_array_merge.ilproj @@ -7,10 +7,10 @@ PdbOnly - - - - - + + + + + diff --git a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/10w5d_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/10w5d_cs_d.csproj index 758a3e491cbd5e..d9e03b8c1d2927 100644 --- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/10w5d_cs_d.csproj +++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/10w5d_cs_d.csproj @@ -2,7 +2,7 @@ Exe - true + true true diff --git a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/10w5d_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/10w5d_cs_r.csproj index becd835224dabe..164352e001623f 100644 --- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/10w5d_cs_r.csproj +++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/10w5d_cs_r.csproj @@ -2,7 +2,7 @@ Exe - true + true true diff --git a/src/coreclr/tests/src/JIT/Methodical/tailcall_v4/hijacking.ilproj b/src/coreclr/tests/src/JIT/Methodical/tailcall_v4/hijacking.ilproj index b214151fa08eba..2a102e5a37d90b 100644 --- a/src/coreclr/tests/src/JIT/Methodical/tailcall_v4/hijacking.ilproj +++ b/src/coreclr/tests/src/JIT/Methodical/tailcall_v4/hijacking.ilproj @@ -2,8 +2,8 @@ Exe - true - true + true + true PdbOnly diff --git a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof.ilproj b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof.ilproj index 2fb666af65b0f3..dc96da1d252a74 100644 --- a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof.ilproj +++ b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof.ilproj @@ -8,7 +8,7 @@ Full - - + + diff --git a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof32.ilproj b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof32.ilproj index 053d718eea93aa..31e939d4fd0e0d 100644 --- a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof32.ilproj +++ b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof32.ilproj @@ -8,7 +8,7 @@ Full - - + + diff --git a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof64.ilproj b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof64.ilproj index f47983fe35c50d..972c489bb437b9 100644 --- a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof64.ilproj +++ b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof64.ilproj @@ -8,7 +8,7 @@ Full - - + + diff --git a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof.ilproj b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof.ilproj index dd972e22b4699a..11a4aaf470f9f6 100644 --- a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof.ilproj +++ b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof.ilproj @@ -8,7 +8,7 @@ PdbOnly - - + + diff --git a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof32.ilproj b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof32.ilproj index 7ee24904c0e580..009bf41e26d2d9 100644 --- a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof32.ilproj +++ b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof32.ilproj @@ -8,7 +8,7 @@ PdbOnly - - + + diff --git a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof64.ilproj b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof64.ilproj index 50805c72739a80..e23cce8f45e4b2 100644 --- a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof64.ilproj +++ b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof64.ilproj @@ -8,7 +8,7 @@ PdbOnly - - + + diff --git a/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_278523/DevDiv_278523.ilproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_278523/DevDiv_278523.ilproj index d5df31251f8028..405a3177dd7b9a 100644 --- a/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_278523/DevDiv_278523.ilproj +++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_278523/DevDiv_278523.ilproj @@ -8,11 +8,11 @@ True - 64 - 64 - 32 - 32 - 32 + 64 + 64 + 32 + 32 + 32 diff --git a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b311420/b311420.csproj b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b311420/b311420.csproj index 3716edd2db9eea..c6722d9fa95781 100644 --- a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b311420/b311420.csproj +++ b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b311420/b311420.csproj @@ -2,7 +2,7 @@ Exe - true + true 1 diff --git a/src/coreclr/tests/src/JIT/SIMD/VectorConvert_r.csproj b/src/coreclr/tests/src/JIT/SIMD/VectorConvert_r.csproj index 1eda2930c4285f..6d2c482d19144b 100644 --- a/src/coreclr/tests/src/JIT/SIMD/VectorConvert_r.csproj +++ b/src/coreclr/tests/src/JIT/SIMD/VectorConvert_r.csproj @@ -2,7 +2,7 @@ Exe - + TARGET_32BIT;$(DefineConstants) diff --git a/src/coreclr/tests/src/JIT/SIMD/VectorConvert_ro.csproj b/src/coreclr/tests/src/JIT/SIMD/VectorConvert_ro.csproj index 32474bfd538c97..5fe92ee4e08cc0 100644 --- a/src/coreclr/tests/src/JIT/SIMD/VectorConvert_ro.csproj +++ b/src/coreclr/tests/src/JIT/SIMD/VectorConvert_ro.csproj @@ -2,7 +2,7 @@ Exe - + TARGET_32BIT;$(DefineConstants) diff --git a/src/coreclr/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_d.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_d.csproj index 49c7772430a859..18f71c6c469cd0 100644 --- a/src/coreclr/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_d.csproj +++ b/src/coreclr/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_d.csproj @@ -2,8 +2,8 @@ Exe - true - true + true + true Full diff --git a/src/coreclr/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_r.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_r.csproj index 2714565534ca1f..b95a968c11ae65 100644 --- a/src/coreclr/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_r.csproj +++ b/src/coreclr/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_r.csproj @@ -2,8 +2,8 @@ Exe - true - true + true + true None diff --git a/src/coreclr/tests/src/JIT/jit64/opt/cse/hugeexpr1.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/hugeexpr1.csproj index 5fa585470267ad..93c4af161f9d0c 100644 --- a/src/coreclr/tests/src/JIT/jit64/opt/cse/hugeexpr1.csproj +++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/hugeexpr1.csproj @@ -9,7 +9,7 @@ True - true + true diff --git a/src/coreclr/tests/src/JIT/superpmi/superpmicollect.csproj b/src/coreclr/tests/src/JIT/superpmi/superpmicollect.csproj index 89af0a2d3b892e..095f31979ad472 100644 --- a/src/coreclr/tests/src/JIT/superpmi/superpmicollect.csproj +++ b/src/coreclr/tests/src/JIT/superpmi/superpmicollect.csproj @@ -5,7 +5,7 @@ true - true + true Full diff --git a/src/coreclr/tests/src/Loader/classloader/generics/Instantiation/Nesting/NestedGenericClasses.csproj b/src/coreclr/tests/src/Loader/classloader/generics/Instantiation/Nesting/NestedGenericClasses.csproj index ee656d5276d957..79c3a7969925a3 100644 --- a/src/coreclr/tests/src/Loader/classloader/generics/Instantiation/Nesting/NestedGenericClasses.csproj +++ b/src/coreclr/tests/src/Loader/classloader/generics/Instantiation/Nesting/NestedGenericClasses.csproj @@ -5,7 +5,7 @@ BuildAndRun 1 - true + true diff --git a/src/coreclr/tests/src/Loader/classloader/generics/Instantiation/Nesting/NestedGenericStructs.csproj b/src/coreclr/tests/src/Loader/classloader/generics/Instantiation/Nesting/NestedGenericStructs.csproj index c654455c802301..33ebdc24fe3d70 100644 --- a/src/coreclr/tests/src/Loader/classloader/generics/Instantiation/Nesting/NestedGenericStructs.csproj +++ b/src/coreclr/tests/src/Loader/classloader/generics/Instantiation/Nesting/NestedGenericStructs.csproj @@ -5,7 +5,7 @@ BuildAndRun 1 - true + true diff --git a/src/coreclr/tests/src/Loader/classloader/generics/Instantiation/Nesting/NestedGenericTypesMix.csproj b/src/coreclr/tests/src/Loader/classloader/generics/Instantiation/Nesting/NestedGenericTypesMix.csproj index 1cdc7988962d96..91efdf3b2ac7f6 100644 --- a/src/coreclr/tests/src/Loader/classloader/generics/Instantiation/Nesting/NestedGenericTypesMix.csproj +++ b/src/coreclr/tests/src/Loader/classloader/generics/Instantiation/Nesting/NestedGenericTypesMix.csproj @@ -5,7 +5,7 @@ BuildAndRun 1 - true + true diff --git a/src/coreclr/tests/src/readytorun/coreroot_determinism/coreroot_determinism.csproj b/src/coreclr/tests/src/readytorun/coreroot_determinism/coreroot_determinism.csproj index df39adff851403..3fbc7d2691fd51 100644 --- a/src/coreclr/tests/src/readytorun/coreroot_determinism/coreroot_determinism.csproj +++ b/src/coreclr/tests/src/readytorun/coreroot_determinism/coreroot_determinism.csproj @@ -4,7 +4,7 @@ BuildAndRun 0 - true + true true diff --git a/src/coreclr/tests/src/readytorun/crossgen2/crossgen2smoke.csproj b/src/coreclr/tests/src/readytorun/crossgen2/crossgen2smoke.csproj index 62fdd0c6634ed0..e97fc45f15cdfd 100644 --- a/src/coreclr/tests/src/readytorun/crossgen2/crossgen2smoke.csproj +++ b/src/coreclr/tests/src/readytorun/crossgen2/crossgen2smoke.csproj @@ -6,7 +6,7 @@ 0 - true + true .ildll diff --git a/src/coreclr/tests/src/readytorun/determinism/crossgen2determinism.csproj b/src/coreclr/tests/src/readytorun/determinism/crossgen2determinism.csproj index 10b4f8610064c3..52d6c1ba8357d8 100644 --- a/src/coreclr/tests/src/readytorun/determinism/crossgen2determinism.csproj +++ b/src/coreclr/tests/src/readytorun/determinism/crossgen2determinism.csproj @@ -4,7 +4,7 @@ BuildAndRun 0 - true + true true diff --git a/src/coreclr/tests/src/readytorun/r2rdump/R2RDumpTest.csproj b/src/coreclr/tests/src/readytorun/r2rdump/R2RDumpTest.csproj index 3045a24bc75510..311dc45fd02570 100644 --- a/src/coreclr/tests/src/readytorun/r2rdump/R2RDumpTest.csproj +++ b/src/coreclr/tests/src/readytorun/r2rdump/R2RDumpTest.csproj @@ -3,16 +3,16 @@ Exe false ..\..\..\..\..\..\ - $(CoreClrDir)artifacts\bin\coreclr\$(TargetOS).$(BuildArch).$(BuildType)\netcoreapp2.0\R2RDump.dll + $(CoreClrDir)artifacts\bin\coreclr\$(TargetOS).$(TargetArchitecture).$(Configuration)\netcoreapp2.0\R2RDump.dll $(CoreClrDir).dotnet\dotnet ../../../../../../ - $(BashCoreClrDir)artifacts/bin/coreclr/$(TargetOS).$(BuildArch).$(BuildType)/netcoreapp2.0/R2RDump.dll + $(BashCoreClrDir)artifacts/bin/coreclr/$(TargetOS).$(TargetArchitecture).$(Configuration)/netcoreapp2.0/R2RDump.dll $(CoreClrDir).dotnet/dotnet - $(CoreClrDir)tests\src\readytorun\r2rdump\files\$(TargetOS).$(BuildArch).$(BuildType)\ + $(CoreClrDir)tests\src\readytorun\r2rdump\files\$(TargetOS).$(TargetArchitecture).$(Configuration)\ true - true + true diff --git a/src/coreclr/tests/src/readytorun/r2rdump/rebaseline.cmd b/src/coreclr/tests/src/readytorun/r2rdump/rebaseline.cmd index 93c132ed5ff58f..24105c8897a3e2 100644 --- a/src/coreclr/tests/src/readytorun/r2rdump/rebaseline.cmd +++ b/src/coreclr/tests/src/readytorun/r2rdump/rebaseline.cmd @@ -2,33 +2,33 @@ set CurrentDir=%~dp0 set ProjectDir=%CurrentDir%..\..\..\..\ set RepoRoot=%ProjectDir%..\..\ -"%RepoRoot%dotnet.cmd" build /p:__BuildArch=x64 /p:__TargetOS=Windows_NT /p:__BuildType=Checked %ProjectDir%src\tools\r2rdump\R2RDump.csproj -"%RepoRoot%dotnet.cmd" build /p:__BuildArch=x64 /p:__TargetOS=Windows_NT /p:__BuildType=Debug %ProjectDir%src\tools\r2rdump\R2RDump.csproj -"%RepoRoot%dotnet.cmd" build /p:__BuildArch=x86 /p:__TargetOS=Windows_NT /p:__BuildType=Release %ProjectDir%src\tools\r2rdump\R2RDump.csproj -"%RepoRoot%dotnet.cmd" build /p:__BuildArch=x86 /p:__TargetOS=Windows_NT /p:__BuildType=Debug %ProjectDir%src\tools\r2rdump\R2RDump.csproj +"%RepoRoot%dotnet.cmd" build /p:TargetArchitecture=x64 /p:TargetOS=Windows_NT /p:Configuration=Checked %ProjectDir%src\tools\r2rdump\R2RDump.csproj +"%RepoRoot%dotnet.cmd" build /p:TargetArchitecture=x64 /p:TargetOS=Windows_NT /p:Configuration=Debug %ProjectDir%src\tools\r2rdump\R2RDump.csproj +"%RepoRoot%dotnet.cmd" build /p:TargetArchitecture=x86 /p:TargetOS=Windows_NT /p:Configuration=Release %ProjectDir%src\tools\r2rdump\R2RDump.csproj +"%RepoRoot%dotnet.cmd" build /p:TargetArchitecture=x86 /p:TargetOS=Windows_NT /p:Configuration=Debug %ProjectDir%src\tools\r2rdump\R2RDump.csproj set tests=HelloWorld GcInfoTransitions GenericFunctions MultipleRuntimeFunctions (for %%a in (%tests%) do ( - "%RepoRoot%dotnet.cmd" build /p:__BuildArch=x64 /p:__TargetOS=Windows_NT /p:__BuildType=Checked "%ProjectDir%tests\src\readytorun\r2rdump\files\%%a.csproj" + "%RepoRoot%dotnet.cmd" build /p:TargetArchitecture=x64 /p:TargetOS=Windows_NT /p:Configuration=Checked "%ProjectDir%tests\src\readytorun\r2rdump\files\%%a.csproj" %ProjectDir%artifacts\tests\Windows_NT.x64.Checked\Tests\Core_Root\crossgen /readytorun /platform_assemblies_paths %ProjectDir%artifacts\tests\Windows_NT.x64.Checked\Tests\Core_Root /out %%a.ni.dll %ProjectDir%artifacts\tests\Windows_NT.x64.Checked\readytorun\r2rdump\files\%%a\%%a.dll "%RepoRoot%dotnet.cmd" %ProjectDir%artifacts\bin\coreclr\Windows_NT.x64.Checked\netcoreapp2.0\R2RDump.dll --in %%a.ni.dll --out %ProjectDir%tests\src\readytorun\r2rdump\files\Windows_NT.x64.Checked\%%a.xml -x -v --ignoreSensitive )) (for %%a in (%tests%) do ( - "%RepoRoot%dotnet.cmd" build /p:__BuildArch=x64 /p:__TargetOS=Windows_NT /p:__BuildType=Debug "%ProjectDir%tests\src\readytorun\r2rdump\files\%%a.csproj" + "%RepoRoot%dotnet.cmd" build /p:TargetArchitecture=x64 /p:TargetOS=Windows_NT /p:Configuration=Debug "%ProjectDir%tests\src\readytorun\r2rdump\files\%%a.csproj" %ProjectDir%artifacts\tests\Windows_NT.x64.Debug\Tests\Core_Root\crossgen /readytorun /platform_assemblies_paths %ProjectDir%artifacts\tests\Windows_NT.x64.Debug\Tests\Core_Root /out %%a.ni.dll %ProjectDir%artifacts\tests\Windows_NT.x64.Debug\readytorun\r2rdump\files\%%a\%%a.dll "%RepoRoot%dotnet.cmd" %ProjectDir%artifacts\bin\coreclr\Windows_NT.x64.Debug\netcoreapp2.0\R2RDump.dll --in %%a.ni.dll --out %ProjectDir%tests\src\readytorun\r2rdump\files\Windows_NT.x64.Debug\%%a.xml -x -v --ignoreSensitive )) (for %%a in (%tests%) do ( - "%RepoRoot%dotnet.cmd" build /p:__BuildArch=x86 /p:__TargetOS=Windows_NT /p:__BuildType=Release "%ProjectDir%tests\src\readytorun\r2rdump\files\%%a.csproj" + "%RepoRoot%dotnet.cmd" build /p:TargetArchitecture=x86 /p:TargetOS=Windows_NT /p:Configuration=Release "%ProjectDir%tests\src\readytorun\r2rdump\files\%%a.csproj" %ProjectDir%artifacts\tests\Windows_NT.x86.Release\Tests\Core_Root\crossgen /readytorun /platform_assemblies_paths %ProjectDir%artifacts\tests\Windows_NT.x86.Release\Tests\Core_Root /out %%a.ni.dll %ProjectDir%artifacts\tests\Windows_NT.x86.Release\readytorun\r2rdump\files\%%a\%%a.dll "%RepoRoot%dotnet.cmd" %ProjectDir%artifacts\bin\coreclr\Windows_NT.x86.Release\netcoreapp2.0\R2RDump.dll --in %%a.ni.dll --out %ProjectDir%tests\src\readytorun\r2rdump\files\Windows_NT.x86.Release\%%a.xml -x -v --ignoreSensitive )) (for %%a in (%tests%) do ( - "%RepoRoot%dotnet.cmd" build /p:__BuildArch=x86 /p:__TargetOS=Windows_NT /p:__BuildType=Debug "%ProjectDir%tests\src\readytorun\r2rdump\files\%%a.csproj" + "%RepoRoot%dotnet.cmd" build /p:TargetArchitecture=x86 /p:TargetOS=Windows_NT /p:Configuration=Debug "%ProjectDir%tests\src\readytorun\r2rdump\files\%%a.csproj" %ProjectDir%artifacts\tests\Windows_NT.x86.Debug\Tests\Core_Root\crossgen /readytorun /platform_assemblies_paths %ProjectDir%artifacts\tests\Windows_NT.x86.Debug\Tests\Core_Root /out %%a.ni.dll %ProjectDir%artifacts\tests\Windows_NT.x86.Debug\readytorun\r2rdump\files\%%a\%%a.dll "%RepoRoot%dotnet.cmd" %ProjectDir%artifacts\bin\coreclr\Windows_NT.x86.Debug\netcoreapp2.0\R2RDump.dll --in %%a.ni.dll --out %ProjectDir%tests\src\readytorun\r2rdump\files\Windows_NT.x86.Debug\%%a.xml -x -v --ignoreSensitive )) diff --git a/src/mono/Directory.Build.props b/src/mono/Directory.Build.props index 7f2e64a450a272..fad444ee9c0d67 100644 --- a/src/mono/Directory.Build.props +++ b/src/mono/Directory.Build.props @@ -8,7 +8,6 @@ x64 $(TargetArchitecture) - $(TargetArchitecture) $(TargetOS).$(Platform).$(Configuration)