diff --git a/Directory.Build.props b/Directory.Build.props index e21d7f07ef7f03..91fab1f3f2c088 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -24,6 +24,7 @@ $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'eng')) $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts')) $([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'bin')) + $([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'obj')) @@ -61,11 +62,18 @@ runtime git://github.com/dotnet/runtime https://github.com/dotnet/runtime - https://github.com/dotnet/runtime/blob/master/LICENSE.TXT $([MSBuild]::NormalizePath('$(LibrariesProjectRoot)', 'pkg', 'Microsoft.NETCore.Platforms', 'runtime.json')) + $(RepoRoot)LICENSE.TXT + $(RepoRoot)THIRD-PARTY-NOTICES.TXT + https://go.microsoft.com/fwlink/?LinkID=799421 + $(CopyrightNetFoundation) + MIT - + true @@ -78,6 +86,7 @@ + IL latest preview @@ -96,6 +105,10 @@ $([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant()) + + true + + diff --git a/eng/Build.props b/eng/Build.props index 5e060adde8d6b7..b6fb7341d77089 100644 --- a/eng/Build.props +++ b/eng/Build.props @@ -75,8 +75,11 @@ + Properties="Configuration=Debug;Platform=AnyCPU;__BuildPhase=Restore" + Targets="Restore" /> + diff --git a/eng/Versions.props b/eng/Versions.props index 6938c1b5e09bfb..05133fec2f96d9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -51,6 +51,14 @@ 5.0.0-alpha1.19563.3 5.0.0-alpha1.19563.3 + 1.0.0-beta-build0015 + 2.0.43 + 1.0.4-preview6.19326.1 + 2.2.0 + + 2.1.0-preview3-26416-01 5.0.0-alpha.1.19563.6 5.0.0-alpha.1.19563.6 @@ -87,7 +95,6 @@ 16.5.0-preview-20200103-01 2.4.1 - 2.0.5 12.0.3 2.1.26 4.12.0 diff --git a/eng/packaging.props b/eng/packaging.props index a7eb2fa7b041a5..13259e646c1696 100644 --- a/eng/packaging.props +++ b/eng/packaging.props @@ -1,12 +1,7 @@ $(PkgDir)descriptions.json - $(RepoRoot)LICENSE.TXT - $(RepoRoot)THIRD-PARTY-NOTICES.TXT - https://go.microsoft.com/fwlink/?LinkID=799421 - https://github.com/dotnet/corefx - $(CopyrightNetFoundation) - MIT + $(Platform) x64 @@ -55,11 +50,6 @@ - - - true - true diff --git a/eng/pipelines/coreclr/templates/build-job.yml b/eng/pipelines/coreclr/templates/build-job.yml index 45278faac880cb..5ad4600efd92b7 100644 --- a/eng/pipelines/coreclr/templates/build-job.yml +++ b/eng/pipelines/coreclr/templates/build-job.yml @@ -150,7 +150,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:BuildOS=$(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:OSGroup=$(osGroup) /p:Platform=$(archType) /p:Configuration=$(_BuildConfig) /p:DotNetSignType=$env:_SignType -projects $(Build.SourcesDirectory)\eng\empty.csproj displayName: Sign Binaries - task: PublishBuildArtifacts@1 @@ -205,7 +205,7 @@ jobs: # Publish official build - ${{ if 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:__BuildOS=$(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:Platform=$(archType) /p:__BuildOS=$(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 @@ -215,7 +215,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:__BuildOS=$(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:Platform=$(archType) /p:__BuildOS=$(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/src/coreclr/Directory.Build.props b/src/coreclr/Directory.Build.props index 2e05f56574bc74..b48e2bb5b44928 100644 --- a/src/coreclr/Directory.Build.props +++ b/src/coreclr/Directory.Build.props @@ -1,28 +1,140 @@ + + + - true + $(__BuildArch) + + + x64 + arm + $(Platform) + + $(__BuildOS) + Windows_NT + Linux + OSX + AnyOS + + $(__BuildType) + Debug + Release + Checked + + + Debug;Release;Checked + x64;x86;arm;arm64 - - - - + + + + Portable + true + + + false + $(DefineConstants);DEBUG + + + true + $(DefineConstants);DEBUG + + + true + + + + + + + + + + + + true + win-$(Platform) + + + + + true + true + ubuntu.14.04-$(Platform) + + + + + true + true + osx.10.12-$(Platform) + + + + + true + true + ubuntu.14.04-$(Platform) + + + + + $(ConfigurationErrorMsg);Unknown OSGroup [$(OSGroup)] specificed in your project. + + + + + + + + $(__DistroRid) + + $(__RuntimeId) + $(TestNugetRuntimeId) - - $(CopyrightNetFoundation) - MIT + + x64 + x86 + x64 - false + $(OSGroup).$(Platform).$(Configuration) + + $(ArtifactsBinDir)coreclr\$(OSPlatformConfig)\ + $(MSBuildThisFileDirectory)src\ + $(BinDir).nuget\ + + $(BinDir) + $(BaseRootOutputPath)$(MSBuildProjectName)\ + $(BaseOutputPath) + $(ArtifactsObjDir)coreclr\$(OSPlatformConfig)\ + $(BaseRootIntermediateOutputPath)$(MSBuildProjectName)\ + $(BaseIntermediateOutputPath) + - $(NumberOfCores) + $(TargetRid) + + false + $(NumberOfCores) strict;nullablePublicOnly + + + diff --git a/src/coreclr/Directory.Build.targets b/src/coreclr/Directory.Build.targets index 92465d4434802e..37719868377259 100644 --- a/src/coreclr/Directory.Build.targets +++ b/src/coreclr/Directory.Build.targets @@ -1,8 +1,6 @@ - - - + @@ -12,4 +10,5 @@ $(ProductVersion) $(InformationalVersion)-$(VersionSuffix) + diff --git a/src/coreclr/build-packages.cmd b/src/coreclr/build-packages.cmd index b13ce5b0f831f1..dffef8df40619e 100644 --- a/src/coreclr/build-packages.cmd +++ b/src/coreclr/build-packages.cmd @@ -39,7 +39,7 @@ powershell -NoProfile -ExecutionPolicy ByPass -NoLogo -File "%__RepoRootDir%eng\ -r -b -projects %__ProjectDir%src\.nuget\packages.builds^ -verbosity minimal /bl:%logFile% /nodeReuse:false^ /p:__BuildOS=Windows_NT^ - /p:PortableBuild=true /p:FilterToOSGroup=Windows_NT^ + /p:FilterToOSGroup=Windows_NT^ %__MSBuildArgs% %unprocessedArgs% if NOT [!ERRORLEVEL!]==[0] ( diff --git a/src/coreclr/build-packages.sh b/src/coreclr/build-packages.sh index a0c7b1fce00e30..aeaa9330ff1011 100755 --- a/src/coreclr/build-packages.sh +++ b/src/coreclr/build-packages.sh @@ -131,7 +131,7 @@ logFile=$__RepoRootDir/artifacts/log/build-packages.binlog $__RepoRootDir/eng/common/build.sh -r -b -projects $__ProjectRoot/src/.nuget/packages.builds \ -verbosity minimal -bl:$logFile \ /p:__BuildOS=$__BuildOS \ - /p:PortableBuild=true /p:__DistroRid=$__DistroRid \ + /p:__DistroRid=$__DistroRid \ $buildArgs $unprocessedBuildArgs if [ $? -ne 0 ] then diff --git a/src/coreclr/build-test.cmd b/src/coreclr/build-test.cmd index 3bdba25d24cb28..236f8a7db30bc2 100644 --- a/src/coreclr/build-test.cmd +++ b/src/coreclr/build-test.cmd @@ -61,7 +61,6 @@ set __CopyNativeTestBinaries=0 set __CopyNativeProjectsAfterCombinedTestBuild=true set __SkipGenerateLayout=0 set __LocalCoreFXConfig=%__BuildType% -set __SkipFXRestoreArg= set __GenerateLayoutOnly=0 @REM CMD has a nasty habit of eating "=" on the argument list, so passing: @@ -125,16 +124,6 @@ if %__Priority% GTR 0 ( set "__PriorityArg=/p:CLRTestPriorityToBuild=%__Priority%" ) -set TargetsWindowsArg= -set TargetsWindowsMsbuildArg= -if "%__TargetsWindows%"=="1" ( - set TargetsWindowsArg=-TargetsWindows=true - set TargetsWindowsMsbuildArg=/p:TargetsWindows=true -) else if "%__TargetsWindows%"=="0" ( - set TargetsWindowsArg=-TargetsWindows=false - set TargetsWindowsMsbuildArg=/p:TargetsWindows=false -) - @if defined _echo @echo on set __CommonMSBuildArgs=/p:__BuildOS=%__BuildOS% /p:__BuildType=%__BuildType% /p:__BuildArch=%__BuildArch% @@ -294,9 +283,8 @@ set __Logging='!__MsbuildLog!' '!__MsbuildWrn!' '!__MsbuildErr!' REM Disable warnAsError - coreclr issue 19922 powershell -NoProfile -ExecutionPolicy ByPass -NoLogo -Command "%__RepoRootDir%\eng\common\msbuild.ps1" %__ArcadeScriptArgs%^ %__ProjectDir%\tests\build.proj -warnAsError:0 /t:BatchRestorePackages /nodeReuse:false^ - /p:RestoreDefaultOptimizationDataPackage=false /p:PortableBuild=true^ + /p:RestoreDefaultOptimizationDataPackage=false^ /p:UsePartialNGENOptimization=false /maxcpucount^ - %__SkipFXRestoreArg%^ !__Logging! %__CommonMSBuildArgs% %__PriorityArg% %__UnprocessedBuildArgs% if errorlevel 1 ( @@ -356,13 +344,11 @@ for /l %%G in (1, 1, %__NumberOfTestGroups%) do ( set __MSBuildBuildArgs=!__MSBuildBuildArgs! -warnAsError:0 set __MSBuildBuildArgs=!__MSBuildBuildArgs! /nodeReuse:false set __MSBuildBuildArgs=!__MSBuildBuildArgs! !__Logging! - set __MSBuildBuildArgs=!__MSBuildBuildArgs! !TargetsWindowsMsbuildArg! set __MSBuildBuildArgs=!__MSBuildBuildArgs! !__msbuildArgs! set __MSBuildBuildArgs=!__MSBuildBuildArgs! !__PriorityArg! set __MSBuildBuildArgs=!__MSBuildBuildArgs! !__UnprocessedBuildArgs! set __MSBuildBuildArgs=!__MSBuildBuildArgs! /p:CopyNativeProjectBinaries=!__CopyNativeProjectsAfterCombinedTestBuild! set __MSBuildBuildArgs=!__MSBuildBuildArgs! /p:__SkipPackageRestore=true - set __MSBuildBuildArgs=!__MSBuildBuildArgs! !__SkipFXRestoreArg! echo Running: msbuild !__MSBuildBuildArgs! !__CommonMSBuildCmdPrefix! !__MSBuildBuildArgs! @@ -378,7 +364,7 @@ for /l %%G in (1, 1, %__NumberOfTestGroups%) do ( ) ) else ( REM Disable warnAsError - coreclr issue 19922 - set __MSBuildBuildArgs=!__ProjectDir!\tests\build.proj -warnAsError:0 /nodeReuse:false !__Logging! !TargetsWindowsMsbuildArg! !__msbuildArgs! !__PriorityArg! !__SkipFXRestoreArg! !__UnprocessedBuildArgs! "/t:CopyAllNativeProjectReferenceBinaries" + set __MSBuildBuildArgs=!__ProjectDir!\tests\build.proj -warnAsError:0 /nodeReuse:false !__Logging! !__msbuildArgs! !__PriorityArg! !__UnprocessedBuildArgs! "/t:CopyAllNativeProjectReferenceBinaries" echo Running: msbuild !__MSBuildBuildArgs! !__CommonMSBuildCmdPrefix! !__MSBuildBuildArgs! @@ -404,7 +390,7 @@ if "%__CopyNativeTestBinaries%" == "1" goto :SkipManagedBuild REM Check that we've built about as many tests as we expect. This is primarily intended to prevent accidental changes that cause us to build REM drastically fewer Pri-1 tests than expected. echo %__MsgPrefix%Check the managed tests build -echo Running: dotnet msbuild %__ProjectDir%\tests\src\runtest.proj /t:CheckTestBuild /nodeReuse:false /p:CLRTestPriorityToBuild=%__Priority% %__SkipFXRestoreArg% %__msbuildArgs% %__unprocessedBuildArgs% +echo Running: dotnet msbuild %__ProjectDir%\tests\src\runtest.proj /t:CheckTestBuild /nodeReuse:false /p:CLRTestPriorityToBuild=%__Priority% %__msbuildArgs% %__unprocessedBuildArgs% powershell -NoProfile -ExecutionPolicy ByPass -NoLogo -File "%__RepoRootDir%\eng\common\msbuild.ps1" %__ArcadeScriptArgs%^ %__ProjectDir%\tests\src\runtest.proj /t:CheckTestBuild /nodeReuse:false /p:CLRTestPriorityToBuild=%__Priority% %__msbuildArgs% %__unprocessedBuildArgs% if errorlevel 1 ( @@ -460,9 +446,8 @@ set __Logging=!__MsbuildLog! !__MsbuildWrn! !__MsbuildErr! powershell -NoProfile -ExecutionPolicy ByPass -NoLogo -File "%__RepoRootDir%\eng\common\msbuild.ps1" %__ArcadeScriptArgs%^ %__ProjectDir%\tests\src\runtest.proj /t:CreateTestOverlay /nodeReuse:false^ - /p:RestoreDefaultOptimizationDataPackage=false /p:PortableBuild=true^ + /p:RestoreDefaultOptimizationDataPackage=false^ /p:UsePartialNGENOptimization=false /maxcpucount^ - %__SkipFXRestoreArg%^ !__Logging! %__CommonMSBuildArgs% %RuntimeIdArg% %__PriorityArg% %__UnprocessedBuildArgs% if errorlevel 1 ( echo %__ErrMsgPrefix%%__MsgPrefix%Error: Create Test Overlay failed. Refer to the build log files for details: @@ -494,7 +479,7 @@ set __MsbuildErr=/flp2:ErrorsOnly;LogFile="%__BuildErr%" set __Logging=!__MsbuildLog! !__MsbuildWrn! !__MsbuildErr! REM Build wrappers using the local SDK's msbuild. As we move to arcade, the other builds should be moved away from run.exe as well. -call "%__RepoRootDir%\dotnet.cmd" msbuild %__ProjectDir%\tests\src\runtest.proj /nodereuse:false /p:BuildWrappers=true !__Logging! %__msbuildArgs% %TargetsWindowsMsbuildArg% %__SkipFXRestoreArg% %__UnprocessedBuildArgs% +call "%__RepoRootDir%\dotnet.cmd" msbuild %__ProjectDir%\tests\src\runtest.proj /nodereuse:false /p:BuildWrappers=true !__Logging! %__msbuildArgs% %__UnprocessedBuildArgs% if errorlevel 1 ( echo %__ErrMsgPrefix%%__MsgPrefix%Error: XUnit wrapper build failed. Refer to the build log files for details: echo %__BuildLog% diff --git a/src/coreclr/build-test.sh b/src/coreclr/build-test.sh index 37d9154bb311ab..4791a32fe948d0 100755 --- a/src/coreclr/build-test.sh +++ b/src/coreclr/build-test.sh @@ -80,8 +80,6 @@ generate_layout() # Set up the directory for MSBuild debug logs. export MSBUILDDEBUGPATH="${__MsbuildDebugLogsDir}" - __BuildProperties="-p:OSGroup=${__BuildOS} -p:BuildOS=${__BuildOS} -p:BuildArch=${__BuildArch} -p:BuildType=${__BuildType}" - # ========================================================================================= # === # === Restore product binaries from packages @@ -290,8 +288,6 @@ build_Tests() # Set up the directory for MSBuild debug logs. export MSBUILDDEBUGPATH="${__MsbuildDebugLogsDir}" - __BuildProperties="-p:OSGroup=${__BuildOS} -p:BuildOS=${__BuildOS} -p:BuildArch=${__BuildArch} -p:BuildType=${__BuildType}" - # ========================================================================================= # === # === Restore product binaries from packages @@ -401,7 +397,7 @@ build_MSBuild_projects() # Generate build command buildArgs=("$projectName") - buildArgs+=("/p:RestoreDefaultOptimizationDataPackage=false" "/p:PortableBuild=true") + buildArgs+=("/p:RestoreDefaultOptimizationDataPackage=false") buildArgs+=("/p:UsePartialNGENOptimization=false" "/maxcpucount") buildArgs+=("${__msbuildLog}" "${__msbuildWrn}" "${__msbuildErr}") @@ -435,7 +431,7 @@ build_MSBuild_projects() # Generate build command buildArgs=("$projectName") - buildArgs+=("/p:RestoreDefaultOptimizationDataPackage=false" "/p:PortableBuild=true") + buildArgs+=("/p:RestoreDefaultOptimizationDataPackage=false") buildArgs+=("/p:UsePartialNGENOptimization=false" "/maxcpucount") buildArgs+=("${__msbuildLog}" "${__msbuildWrn}" "${__msbuildErr}") diff --git a/src/coreclr/build.cmd b/src/coreclr/build.cmd index 698d2683e9f015..d36031f6217393 100644 --- a/src/coreclr/build.cmd +++ b/src/coreclr/build.cmd @@ -634,7 +634,7 @@ if %__BuildCoreLib% EQU 1 ( powershell -NoProfile -ExecutionPolicy ByPass -NoLogo -File "%__RepoRootDir%\eng\common\msbuild.ps1" /clp:nosummary %__ArcadeScriptArgs%^ %__ProjectDir%\src\build.proj /t:Restore^ - /nodeReuse:false /p:PortableBuild=true /maxcpucount /p:IncludeRestoreOnlyProjects=true^ + /nodeReuse:false /maxcpucount /p:IncludeRestoreOnlyProjects=true^ !__Logging! %__CommonMSBuildArgs% !__ExtraBuildArgs! %__UnprocessedBuildArgs% if not !errorlevel! == 0 ( echo %__ErrMsgPrefix%%__MsgPrefix%Error: Managed Product assemblies restore failed. Refer to the build log files for details. @@ -646,7 +646,7 @@ if %__BuildCoreLib% EQU 1 ( ) powershell -NoProfile -ExecutionPolicy ByPass -NoLogo -Command "%__RepoRootDir%\eng\common\msbuild.ps1" /clp:nosummary %__ArcadeScriptArgs%^ - %__ProjectDir%\src\build.proj /nodeReuse:false /p:PortableBuild=true /maxcpucount^ + %__ProjectDir%\src\build.proj /nodeReuse:false /maxcpucount^ '!__MsbuildLog!' '!__MsbuildWrn!' '!__MsbuildErr!' %__CommonMSBuildArgs% !__ExtraBuildArgs! %__UnprocessedBuildArgs% if not !errorlevel! == 0 ( echo %__ErrMsgPrefix%%__MsgPrefix%Error: Managed Product assemblies build failed. Refer to the build log files for details. @@ -659,7 +659,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:__BuildArch=%__BuildArch% if not !errorlevel! == 0 ( echo %__ErrMsgPrefix%%__MsgPrefix%Error: Failed to build crossgen2. @@ -880,8 +880,7 @@ if %__BuildPackages% EQU 1 ( powershell -NoProfile -ExecutionPolicy ByPass -NoLogo -File "%__RepoRootDir%\eng\common\build.ps1"^ -r -b -projects %__SourceDir%\.nuget\packages.builds^ -verbosity minimal /clp:nosummary /nodeReuse:false /bl:!__BuildLog!^ - /p:PortableBuild=true^ - /p:Platform=%__BuildArch% %__CommonMSBuildArgs% %__UnprocessedBuildArgs% + %__CommonMSBuildArgs% %__UnprocessedBuildArgs% if not !errorlevel! == 0 ( echo %__ErrMsgPrefix%%__MsgPrefix%Error: Nuget package generation failed. Refer to the build log file for details. echo !__BuildLog! diff --git a/src/coreclr/build.sh b/src/coreclr/build.sh index e24eb5f881b78e..b7481b34f07903 100755 --- a/src/coreclr/build.sh +++ b/src/coreclr/build.sh @@ -336,7 +336,7 @@ build_CoreLib() "$__RepoRootDir/eng/common/msbuild.sh" /clp:nosummary $__ArcadeScriptArgs \ $__ProjectDir/src/build.proj /t:Restore \ - /p:PortableBuild=true /maxcpucount /p:IncludeRestoreOnlyProjects=true \ + /maxcpucount /p:IncludeRestoreOnlyProjects=true \ /flp:Verbosity=normal\;LogFile=$__LogsDir/System.Private.CoreLib_$__BuildOS__$__BuildArch__$__BuildType.log \ /p:__IntermediatesDir=$__IntermediatesDir /p:__RootBinDir=$__RootBinDir \ $__CommonMSBuildArgs $__ExtraBuildArgs $__UnprocessedBuildArgs @@ -349,7 +349,7 @@ build_CoreLib() "$__RepoRootDir/eng/common/msbuild.sh" /clp:nosummary $__ArcadeScriptArgs \ $__ProjectDir/src/build.proj \ - /p:PortableBuild=true /maxcpucount \ + /maxcpucount \ /flp:Verbosity=normal\;LogFile=$__LogsDir/System.Private.CoreLib_$__BuildOS__$__BuildArch__$__BuildType.log \ /p:__IntermediatesDir=$__IntermediatesDir /p:__RootBinDir=$__RootBinDir \ $__CommonMSBuildArgs $__ExtraBuildArgs $__UnprocessedBuildArgs @@ -362,7 +362,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:__BuildArch=$__BuildArch local exit_code=$? if [ $exit_code != 0 ]; then @@ -443,7 +443,6 @@ generate_NugetPackages() # Package build uses the Arcade system and scripts, relying on it to restore required toolsets as part of build $__RepoRootDir/eng/common/build.sh -r -b -projects $__SourceDir/.nuget/packages.builds \ -verbosity minimal -bl:$__LogsDir/Nuget_$__BuildOS__$__BuildArch__$__BuildType.binlog \ - /p:PortableBuild=true \ /p:__IntermediatesDir=$__IntermediatesDir /p:__RootBinDir=$__RootBinDir /p:__DoCrossArchBuild=$__CrossBuild \ $__CommonMSBuildArgs $__UnprocessedBuildArgs diff --git a/src/coreclr/clr.featuredefines.props b/src/coreclr/clr.featuredefines.props index ac15abd310b1c6..79be5e8789eb86 100644 --- a/src/coreclr/clr.featuredefines.props +++ b/src/coreclr/clr.featuredefines.props @@ -1,80 +1,80 @@ - - true - true - true - true - true - true - true - true - true - true - true - + + true + true + true + true + true + true + true + true + true + true + true + - - true - true + + true + true - true - true - true - true - true - + true + true + true + true + true + - - true - true - true - true - true - true - true - true - true - true - true - true - true - + + true + true + true + true + true + true + true + true + true + true + true + true + true + - - - true - - + + + true + + - - $(DefineConstants);FEATURE_APPX - $(DefineConstants);FEATURE_ARRAYSTUB_AS_IL - $(DefineConstants);FEATURE_MULTICASTSTUB_AS_IL - $(DefineConstants);FEATURE_INSTANTIATINGSTUB_AS_IL - $(DefineConstants);FEATURE_STUBS_AS_IL - $(DefineConstants);FEATURE_CLASSIC_COMINTEROP - $(DefineConstants);FEATURE_COLLECTIBLE_ALC - $(DefineConstants);FEATURE_COMINTEROP - $(DefineConstants);FEATURE_COMINTEROP_APARTMENT_SUPPORT - $(DefineConstants);FEATURE_COMINTEROP_UNMANAGED_ACTIVATION - $(DefineConstants);FEATURE_COMINTEROP_WINRT_MANAGED_ACTIVATION - $(DefineConstants);FEATURE_MANAGED_ETW - $(DefineConstants);FEATURE_MANAGED_ETW_CHANNELS - $(DefineConstants);FEATURE_PAL - $(DefineConstants);FEATURE_PERFTRACING - $(DefineConstants);FEATURE_EVENTSOURCE_XPLAT - $(DefineConstants);FEATURE_WIN32_REGISTRY - $(DefineConstants);FEATURE_DEFAULT_INTERFACES - $(DefineConstants);FEATURE_TYPEEQUIVALENCE - $(DefineConstants);FEATURE_BASICFREEZE - $(DefineConstants);FEATURE_PORTABLE_SHUFFLE_THUNKS - $(DefineConstants);FEATURE_UTF8STRING + + $(DefineConstants);FEATURE_APPX + $(DefineConstants);FEATURE_ARRAYSTUB_AS_IL + $(DefineConstants);FEATURE_MULTICASTSTUB_AS_IL + $(DefineConstants);FEATURE_INSTANTIATINGSTUB_AS_IL + $(DefineConstants);FEATURE_STUBS_AS_IL + $(DefineConstants);FEATURE_CLASSIC_COMINTEROP + $(DefineConstants);FEATURE_COLLECTIBLE_ALC + $(DefineConstants);FEATURE_COMINTEROP + $(DefineConstants);FEATURE_COMINTEROP_APARTMENT_SUPPORT + $(DefineConstants);FEATURE_COMINTEROP_UNMANAGED_ACTIVATION + $(DefineConstants);FEATURE_COMINTEROP_WINRT_MANAGED_ACTIVATION + $(DefineConstants);FEATURE_MANAGED_ETW + $(DefineConstants);FEATURE_MANAGED_ETW_CHANNELS + $(DefineConstants);FEATURE_PAL + $(DefineConstants);FEATURE_PERFTRACING + $(DefineConstants);FEATURE_EVENTSOURCE_XPLAT + $(DefineConstants);FEATURE_WIN32_REGISTRY + $(DefineConstants);FEATURE_DEFAULT_INTERFACES + $(DefineConstants);FEATURE_TYPEEQUIVALENCE + $(DefineConstants);FEATURE_BASICFREEZE + $(DefineConstants);FEATURE_PORTABLE_SHUFFLE_THUNKS + $(DefineConstants);FEATURE_UTF8STRING - $(DefineConstants);PROFILING_SUPPORTED - $(DefineConstants);FEATURE_PROFAPI_ATTACH_DETACH + $(DefineConstants);PROFILING_SUPPORTED + $(DefineConstants);FEATURE_PROFAPI_ATTACH_DETACH - $(DefineConstants);PLATFORM_UNIX - $(DefineConstants);PLATFORM_WINDOWS - $(DefineConstants);PLATFORM_OSX - + $(DefineConstants);PLATFORM_UNIX + $(DefineConstants);PLATFORM_WINDOWS + $(DefineConstants);PLATFORM_OSX + diff --git a/src/coreclr/dependencies.props b/src/coreclr/dependencies.props deleted file mode 100644 index 6336b791dc5801..00000000000000 --- a/src/coreclr/dependencies.props +++ /dev/null @@ -1,43 +0,0 @@ - - - - - 5d3c9a7c54c1c59b764de0e2dfb6bbb4ce29476c - - - - - 1.0.0-beta-build0015 - 2.0.43 - 1.0.4-preview6.19326.1 - 2.2.0 - - - 2.1.0-preview3-26416-01 - - - - - build-info/dotnet/ - master - $(MSBuildThisFileFullPath) - - - - - $(BaseDotNetBuildInfo)coreclr/$(DependencyBranch) - $(CoreClrCurrentRef) - - - - https://raw.githubusercontent.com/dotnet/versions - - - - - - - diff --git a/src/coreclr/dir.common.props b/src/coreclr/dir.common.props deleted file mode 100644 index 90ecca279182ff..00000000000000 --- a/src/coreclr/dir.common.props +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - $(MSBuildThisFileDirectory) - - - - - $(__BuildArch) - x64 - x64 - - $(__BuildType) - Debug - Debug - Release - Checked - - $(__BuildOS) - Windows_NT - Linux - OSX - - - <__BuildOS>$(BuildOS) - <__BuildArch>$(BuildArch) - - $(BuildType) - $(BuildArch) - - $(BuildOS).$(BuildArch).$(BuildType) - - - - - $(MSBuildThisFileDirectory)..\..\ - $(MSBuildThisFileDirectory) - - $(RootRepoDir)artifacts\obj\coreclr\$(MSBuildProjectName)\ - - $(ProjectDir)src\ - $(RootRepoDir)artifacts\ - $(RootBinDir)bin\coreclr\$(PlatformConfigPathPart)\ - - - $(BinDir).nuget\ - - - - - 5.0.0 - - - false - $(PackageVersion) - - preview8 - - - - - true - true - true - true - true - - true - - - $(__DistroRid) - - - x64 - x86 - x64 - - - - 8.0 - true - - - - - Portable - - - - - - - coreclr - - - true - - - - - true - - - - - false - - - - - diff --git a/src/coreclr/src/.nuget/Directory.Build.props b/src/coreclr/src/.nuget/Directory.Build.props index 75092cad12ddcf..b58d56dbc9a32f 100644 --- a/src/coreclr/src/.nuget/Directory.Build.props +++ b/src/coreclr/src/.nuget/Directory.Build.props @@ -1,8 +1,7 @@ - - + @@ -14,16 +13,14 @@ <_parseDistroRid>$(__DistroRid) - <_parseDistroRid Condition="'$(_parseDistroRid)' == '' and '$(__BuildOS)' == 'OSX'">osx.10.12-x64 + <_parseDistroRid Condition="'$(_parseDistroRid)' == '' and '$(TargetsOSX)' == 'true'">osx.10.12-x64 <_distroRidIndex>$(_parseDistroRid.IndexOfAny("-")) <_archRidIndex>$([MSBuild]::Add($(_distroRidIndex), 1)) $(_parseDistroRid.SubString(0, $(_distroRidIndex))) win10 $(_parseDistroRid.SubString($(_archRidIndex))) - $(Platform) - $(BuildArch) - + $(Platform) $(OSRid) Windows_NT;OSX;Android;Linux;FreeBSD @@ -43,7 +40,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 '$(__BuildOS)' != ''">$(__BuildOS) + <_derivedPackageTargetOSGroup Condition="'$(_derivedPackageTargetOSGroup)' == '' and '$(OSGroup)' != ''">$(OSGroup) <_derivedPackageTargetOSGroup Condition="'$(_derivedPackageTargetOSGroup)' == ''">Linux <_isSupportedOSGroup Condition="!$(SupportedPackageOSGroups.Contains(';$(_derivedPackageTargetOSGroup);'))">false diff --git a/src/coreclr/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Windows_NT.Microsoft.NETCore.Runtime.CoreCLR.props b/src/coreclr/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Windows_NT.Microsoft.NETCore.Runtime.CoreCLR.props index 3e006903d4dc96..494b3ea9b7566a 100644 --- a/src/coreclr/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Windows_NT.Microsoft.NETCore.Runtime.CoreCLR.props +++ b/src/coreclr/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Windows_NT.Microsoft.NETCore.Runtime.CoreCLR.props @@ -3,7 +3,7 @@ $(MinOSForArch)-$(PackagePlatform) $(Platform) - amd64 + amd64 $(CrossTargetComponentFolder) amd64 _$(LongNamePlatform)_$(LongNamePlatform)_$(FileVersion) @@ -21,7 +21,7 @@ runtimes\$(PackageTargetRuntime)\native - + diff --git a/src/coreclr/src/.nuget/builds.targets b/src/coreclr/src/.nuget/builds.targets index d58f010d3939b8..012ac4273baf35 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 05960492d14dca..0c1557bfed23bb 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 - <_BuildOSArchLowercase>$(BuildOS.ToLower())-$(BuildArch.ToLower()) + <_BuildOSArchLowercase>$(OSGroup.ToLower())-$(Platform.ToLower()) diff --git a/src/coreclr/src/.nuget/packages.builds b/src/coreclr/src/.nuget/packages.builds index fa33f6a2a88eae..3185bc4879c915 100644 --- a/src/coreclr/src/.nuget/packages.builds +++ b/src/coreclr/src/.nuget/packages.builds @@ -21,7 +21,7 @@ - + diff --git a/src/coreclr/src/.nuget/packaging.props b/src/coreclr/src/.nuget/packaging.props index 2fb1f606e83443..6236a4347e9f8b 100644 --- a/src/coreclr/src/.nuget/packaging.props +++ b/src/coreclr/src/.nuget/packaging.props @@ -1,18 +1,10 @@ - - $(MSBuildThisFileDirectory)/descriptions.json - $(CoreclrDir)/LICENSE.TXT - $(CoreclrDir)/THIRD-PARTY-NOTICES.TXT - - https://go.microsoft.com/fwlink/?LinkID=799421 - - https://dot.net + $(MSBuildThisFileDirectory)descriptions.json $(Platform) - x64 win7 win8 win10 @@ -30,11 +22,6 @@ - - - true - true 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 44080e82e54977..4f45e4bca6dc56 100644 --- a/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj +++ b/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj @@ -6,16 +6,13 @@ true false false - netcoreapp2.1 + $(NetCoreAppCurrent) + netcoreapp3.0 - - Portable true - $(BinDir)IL/ - Debug;Release;Checked - x64;x86;arm;arm64 + $(BinDir)IL\ true true @@ -31,9 +28,6 @@ - $(BuildType) - $(BuildArch) - arm true false @@ -51,8 +45,7 @@ $(NoWarn),0419,0649 enable - - CORECLR;NETCOREAPP + $(DefineConstants);CORECLR true - x64 false BIT64;AMD64;$(DefineConstants) - x86 BIT32;$(DefineConstants) - arm BIT32;ARM;$(DefineConstants) - AnyCPU BIT64;ARM64;$(DefineConstants) - false - true - _LOGGING;DEBUG;$(DefineConstants) - CODE_ANALYSIS;$(DefineConstants) - - - true + $(DefineConstants);_LOGGING + $(DefineConstants);CODE_ANALYSIS @@ -120,16 +104,6 @@ $(MSBuildThisFileDirectory)src - - - - i386 - $(Platform) - - - - - @@ -328,8 +302,8 @@ - + !Exists('$(ArtifactsObjDir)coreclr\Eventing\$(Platform)\$(Configuration)\NativeRuntimeEventSource.cs')"/> + src\System\Diagnostics\Eventing\Generated\NativeRuntimeEventSource.cs @@ -440,11 +414,8 @@ $(IntermediateOutputPath)\cmake.definitions - + - - Windows_NT - true diff --git a/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.sln b/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.sln index d1d038ce9085de..815f6027038b67 100644 --- a/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.sln +++ b/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.sln @@ -12,38 +12,38 @@ Global ..\..\..\libraries\System.Private.CoreLib\src\System.Private.CoreLib.Shared.projitems*{845c8b26-350b-4e63-bd11-2c8150444e28}*SharedItemsImports = 13 EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution - Checked|amd64 = Checked|amd64 + Checked|x64 = Checked|x64 Checked|arm = Checked|arm Checked|arm64 = Checked|arm64 Checked|x86 = Checked|x86 - Debug|amd64 = Debug|amd64 + Debug|x64 = Debug|x64 Debug|arm = Debug|arm Debug|arm64 = Debug|arm64 Debug|x86 = Debug|x86 - Release|amd64 = Release|amd64 + Release|x64 = Release|x64 Release|arm = Release|arm Release|arm64 = Release|arm64 Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {3DA06C3A-2E7B-4CB7-80ED-9B12916013F9}.Checked|amd64.ActiveCfg = Checked|x64 - {3DA06C3A-2E7B-4CB7-80ED-9B12916013F9}.Checked|amd64.Build.0 = Checked|x64 + {3DA06C3A-2E7B-4CB7-80ED-9B12916013F9}.Checked|x64.ActiveCfg = Checked|x64 + {3DA06C3A-2E7B-4CB7-80ED-9B12916013F9}.Checked|x64.Build.0 = Checked|x64 {3DA06C3A-2E7B-4CB7-80ED-9B12916013F9}.Checked|arm.ActiveCfg = Checked|arm {3DA06C3A-2E7B-4CB7-80ED-9B12916013F9}.Checked|arm.Build.0 = Checked|arm {3DA06C3A-2E7B-4CB7-80ED-9B12916013F9}.Checked|arm64.ActiveCfg = Checked|arm64 {3DA06C3A-2E7B-4CB7-80ED-9B12916013F9}.Checked|arm64.Build.0 = Checked|arm64 {3DA06C3A-2E7B-4CB7-80ED-9B12916013F9}.Checked|x86.ActiveCfg = Checked|x86 {3DA06C3A-2E7B-4CB7-80ED-9B12916013F9}.Checked|x86.Build.0 = Checked|x86 - {3DA06C3A-2E7B-4CB7-80ED-9B12916013F9}.Debug|amd64.ActiveCfg = Debug|x64 - {3DA06C3A-2E7B-4CB7-80ED-9B12916013F9}.Debug|amd64.Build.0 = Debug|x64 + {3DA06C3A-2E7B-4CB7-80ED-9B12916013F9}.Debug|x64.ActiveCfg = Debug|x64 + {3DA06C3A-2E7B-4CB7-80ED-9B12916013F9}.Debug|x64.Build.0 = Debug|x64 {3DA06C3A-2E7B-4CB7-80ED-9B12916013F9}.Debug|arm.ActiveCfg = Debug|arm {3DA06C3A-2E7B-4CB7-80ED-9B12916013F9}.Debug|arm.Build.0 = Debug|arm {3DA06C3A-2E7B-4CB7-80ED-9B12916013F9}.Debug|arm64.ActiveCfg = Debug|arm64 {3DA06C3A-2E7B-4CB7-80ED-9B12916013F9}.Debug|arm64.Build.0 = Debug|arm64 {3DA06C3A-2E7B-4CB7-80ED-9B12916013F9}.Debug|x86.ActiveCfg = Debug|x86 {3DA06C3A-2E7B-4CB7-80ED-9B12916013F9}.Debug|x86.Build.0 = Debug|x86 - {3DA06C3A-2E7B-4CB7-80ED-9B12916013F9}.Release|amd64.ActiveCfg = Release|x64 - {3DA06C3A-2E7B-4CB7-80ED-9B12916013F9}.Release|amd64.Build.0 = Release|x64 + {3DA06C3A-2E7B-4CB7-80ED-9B12916013F9}.Release|x64.ActiveCfg = Release|x64 + {3DA06C3A-2E7B-4CB7-80ED-9B12916013F9}.Release|x64.Build.0 = Release|x64 {3DA06C3A-2E7B-4CB7-80ED-9B12916013F9}.Release|arm.ActiveCfg = Release|arm {3DA06C3A-2E7B-4CB7-80ED-9B12916013F9}.Release|arm.Build.0 = Release|arm {3DA06C3A-2E7B-4CB7-80ED-9B12916013F9}.Release|arm64.ActiveCfg = Release|arm64 diff --git a/src/coreclr/src/build.proj b/src/coreclr/src/build.proj index 4cf380346a271d..fbfe44c1b1c07f 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\$(Platform)" /> true - false + false diff --git a/src/coreclr/src/jit/jit.settings.targets b/src/coreclr/src/jit/jit.settings.targets index 9c567c070b936e..455cc62ab7716e 100644 --- a/src/coreclr/src/jit/jit.settings.targets +++ b/src/coreclr/src/jit/jit.settings.targets @@ -94,7 +94,7 @@ - + @@ -107,7 +107,7 @@ - + @@ -119,7 +119,7 @@ - + @@ -130,7 +130,7 @@ - + diff --git a/src/coreclr/src/scripts/scripts.pyproj b/src/coreclr/src/scripts/scripts.pyproj index c0b7bef6415e5f..f262595c26739d 100644 --- a/src/coreclr/src/scripts/scripts.pyproj +++ b/src/coreclr/src/scripts/scripts.pyproj @@ -1,7 +1,7 @@  - Debug + Debug 2.0 {9d304b80-696f-4873-85ca-cbd2fdb900af} diff --git a/src/coreclr/src/tools/ReadyToRun.SuperIlc/ReadyToRun.SuperIlc.csproj b/src/coreclr/src/tools/ReadyToRun.SuperIlc/ReadyToRun.SuperIlc.csproj index 3cf0cbfe0848ee..9e77c9efd6f7a2 100644 --- a/src/coreclr/src/tools/ReadyToRun.SuperIlc/ReadyToRun.SuperIlc.csproj +++ b/src/coreclr/src/tools/ReadyToRun.SuperIlc/ReadyToRun.SuperIlc.csproj @@ -1,6 +1,5 @@  - ReadyToRun.SuperIlc true Exe $(NetCoreAppCurrent) @@ -10,20 +9,10 @@ - - 16.0.461 - - - 16.0.461 - - - 2.0.38 - - - 0.2.0-alpha.19174.3 - - - 1.6.0 - + + + + + diff --git a/src/coreclr/src/tools/crossgen2/ILCompiler.DependencyAnalysisFramework/ILCompiler.DependencyAnalysisFramework.csproj b/src/coreclr/src/tools/crossgen2/ILCompiler.DependencyAnalysisFramework/ILCompiler.DependencyAnalysisFramework.csproj index 81f4d5d5fb6331..5852c07acd8c76 100644 --- a/src/coreclr/src/tools/crossgen2/ILCompiler.DependencyAnalysisFramework/ILCompiler.DependencyAnalysisFramework.csproj +++ b/src/coreclr/src/tools/crossgen2/ILCompiler.DependencyAnalysisFramework/ILCompiler.DependencyAnalysisFramework.csproj @@ -1,12 +1,8 @@  - Library - ILCompiler.DependencyAnalysisFramework - ILCompiler.DependencyAnalysisFramework netstandard1.3 false x64;x86 - $(BuildArch) false - $(MSBuildThisFileDirectory) - $(MSBuildThisFileDirectory)src\ - + $(MSBuildThisFileDirectory) + $(CoreClrTestDir)src\ - - - $(MSBuildThisFileDirectory)..\..\..\artifacts\ - $(RootBinDir)bin\coreclr\$(BuildOS).$(BuildArch).$(BuildType)\ + $(ArtifactsBinDir)TargetingPack\ - $(__TestWorkingDir)\ - $(RootBinDir)tests\coreclr\$(BuildOS).$(BuildArch).$(BuildType)\ + $([MSBuild]::NormalizeDirectory('$(BaseRootOutputPath)', '$(OSPlatformConfig)', 'tests')) + $([MSBuild]::NormalizeDirectory('$(BaseRootIntermediateOutputPath)', '$(OSPlatformConfig)', 'tests')) - $(__AltJitArch) - + $(TestSourceDir) + $([MSBuild]::MakeRelative($(TestRelativeBasePath), $(MSBuildProjectDirectory))) - - - - $(RootBinDir)obj\ - $(BaseIntermediateOutputPath)\$(BuildOS).$(BuildArch).$(BuildType) - $(BaseIntermediateOutputPath)\coreclr\$(BuildOS).$(BuildArch).$(BuildType) - + $([MSBuild]::NormalizeDirectory('$(TestWorkingDir)', '$(BuildProjectRelativeDir)', '$(MSBuildProjectName)')) + $(BaseOutputPath) - - - $(RootBinDir)TargetingPack\ + $([MSBuild]::NormalizeDirectory('$(TestWorkingIntermediateDir)', '$(BuildProjectRelativeDir)', '$(MSBuildProjectName)')) + $(BaseIntermediateOutputPath) - + false @@ -63,12 +49,4 @@ 0 - - - $(ProductVersion) - $([MSBuild]::NormalizeDirectory('$(TestWorkingDir)', 'testhost')) - $([MSBuild]::NormalizeDirectory('$(TestHostRootPath)', 'host', 'fxr', '$(TestHostVersion)')) - $([MSBuild]::NormalizeDirectory('$(TestHostRootPath)', 'shared', 'Microsoft.NETCore.App', '$(TestHostVersion)')) - - diff --git a/src/coreclr/tests/Directory.Build.targets b/src/coreclr/tests/Directory.Build.targets index 13e7a77c6465cf..8c2fc490d5c031 100644 --- a/src/coreclr/tests/Directory.Build.targets +++ b/src/coreclr/tests/Directory.Build.targets @@ -1,11 +1,10 @@ - - + + + - - diff --git a/src/coreclr/tests/build.proj b/src/coreclr/tests/build.proj index 25a9ecdffc71ab..6eb75883490d9f 100644 --- a/src/coreclr/tests/build.proj +++ b/src/coreclr/tests/build.proj @@ -1,5 +1,4 @@ - - + @@ -27,7 +26,7 @@ - + @@ -45,11 +44,11 @@ - <_ConfigurationProperties>/p:__BuildOS=$(__BuildOS) /p:__BuildArch=$(__BuildArch) /p:__BuildType=$(__BuildType) - "$(DotNetTool)" restore $(RestoreProj) $(PackageVersionArg) /p:SetTFMForRestore=true $(_ConfigurationProperties) $(__SkipFXRestoreArg) - "$(DotNetTool)" restore -r $(__DistroRid) $(RestoreProj) $(PackageVersionArg) /p:SetTFMForRestore=true $(_ConfigurationProperties) $(__SkipFXRestoreArg) + <_ConfigurationProperties>/p:OSGroup=$(OSGroup) /p:Platform=$(Platform) /p:Configuration=$(Configuration) + "$(DotNetTool)" restore $(RestoreProj) $(PackageVersionArg) /p:SetTFMForRestore=true $(_ConfigurationProperties) + "$(DotNetTool)" restore -r $(__DistroRid) $(RestoreProj) $(PackageVersionArg) /p:SetTFMForRestore=true $(_ConfigurationProperties) - + diff --git a/src/coreclr/tests/dir.common.props b/src/coreclr/tests/dir.common.props deleted file mode 100644 index 4382aa1fbfe4ec..00000000000000 --- a/src/coreclr/tests/dir.common.props +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - $(BuildOS).$(Platform).$(Configuration) - - $(MSBuildThisFileDirectory)src - $([MSBuild]::MakeRelative($(TestSrcDir), $(MSBuildProjectDirectory)))\$(MSBuildProjectName)\ - - - $(RootRepoDir)/artifacts/tests/coreclr/obj/$(OSPlatformConfig)/Managed/$(BuildProjectRelativeDir) - $(BaseIntermediateOutputPath) - - $(RootRepoDir)/artifacts/tests/coreclr/$(OSPlatformConfig)/$(BuildProjectRelativeDir) - $(BaseOutputPath) - - - - - true - - - - - - - diff --git a/src/coreclr/tests/dir.sdkbuild.props b/src/coreclr/tests/dir.sdkbuild.props deleted file mode 100644 index 5a6d532c1f0981..00000000000000 --- a/src/coreclr/tests/dir.sdkbuild.props +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - $(NetCoreAppCurrent) - false - false - $(BuildArch) - - - false - - - diff --git a/src/coreclr/tests/disableversioncheck.targets b/src/coreclr/tests/disableversioncheck.targets deleted file mode 100644 index b1635a202f55e6..00000000000000 --- a/src/coreclr/tests/disableversioncheck.targets +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - 99.0 - - - - diff --git a/src/coreclr/tests/external/external.csproj b/src/coreclr/tests/external/external.csproj index 13383f9a73f31a..37131cbe076fad 100644 --- a/src/coreclr/tests/external/external.csproj +++ b/src/coreclr/tests/external/external.csproj @@ -71,11 +71,11 @@ - - - - - + + + + + diff --git a/src/coreclr/tests/helixpublishwitharcade.proj b/src/coreclr/tests/helixpublishwitharcade.proj index f68924f3b8d314..18b2d3f20a12b6 100644 --- a/src/coreclr/tests/helixpublishwitharcade.proj +++ b/src/coreclr/tests/helixpublishwitharcade.proj @@ -15,9 +15,9 @@ <_PropertiesToPass> - __BuildArch=$(__BuildArch); - __BuildOS=$(__BuildOS); - __BuildType=$(__BuildType); + Platform=$(Platform); + OSGroup=$(OSGroup); + Configuration=$(Configuration); Creator=$(_Creator); HelixAccessToken=$(_HelixAccessToken); HelixBuild=$(_HelixBuild); @@ -58,9 +58,8 @@ - $([MSBuild]::NormalizeDirectory($(TestWorkingDir))) - $(BinDir)Tests\Core_Root\ - $(BinDir)Payloads\ + $(TestWorkingDir)Core_Root\ + $(TestWorkingDir)Payloads\ SetStressModes_$(Scenario).cmd SetStressModes_$(Scenario).sh @@ -77,7 +76,7 @@ - <_XUnitWrapperDll Include="$(BinDir)**\*.XUnitWrapper.dll" Exclude="$(PayloadsRootDirectory)**\*.XUnitWrapper.dll;@(XUnitWrapperGrouping->Metadata('FullPath'))"> + <_XUnitWrapperDll Include="$(TestWorkingDir)**\*.XUnitWrapper.dll" Exclude="$(PayloadsRootDirectory)**\*.XUnitWrapper.dll;@(XUnitWrapperGrouping->Metadata('FullPath'))"> @@ -114,7 +113,7 @@ <_PayloadFiles Update="@(_PayloadFiles)"> - $(_PayloadGroup)\$([System.IO.Path]::GetRelativePath($(BinDir), %(FullPath))) + $(_PayloadGroup)\$([System.IO.Path]::GetRelativePath($(TestWorkingDir), %(FullPath))) @@ -169,17 +168,17 @@ true true true - $(BuildArch) - $(BuildType) - $(BuildType)-$(Scenario) + $(Platform) + $(Configuration) + $(Configuration)-$(Scenario) false false false false R2R R2R-CG2 - $(TestRunNamePrefix)$(BuildOS) $(BuildArch) $(BuildType) @ - $(TestRunNamePrefix)$(BuildOS) $(BuildArch) $(BuildType) $(Scenario) @ + $(TestRunNamePrefix)$(OSGroup) $(Platform) $(Configuration) @ + $(TestRunNamePrefix)$(OSGroup) $(Platform) $(Configuration) $(Scenario) @ $([System.TimeSpan]::FromMinutes($(TimeoutPerTestInMinutes)).TotalMilliseconds) true <_XUnitParallelMode>collections @@ -218,12 +217,12 @@ - - + + - - + + diff --git a/src/coreclr/tests/issues.targets b/src/coreclr/tests/issues.targets index aaf9d7057cda49..3cc18f6999f264 100644 --- a/src/coreclr/tests/issues.targets +++ b/src/coreclr/tests/issues.targets @@ -126,7 +126,7 @@ - + needs triage @@ -283,7 +283,7 @@ - + needs triage @@ -335,7 +335,7 @@ - + 18056 @@ -357,7 +357,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. @@ -388,7 +388,7 @@ - + 20682 @@ -588,7 +588,7 @@ - + 15016 @@ -673,7 +673,7 @@ - + Varargs not supported on this platform @@ -725,7 +725,7 @@ - + Test times out @@ -750,7 +750,7 @@ - + 19340 diff --git a/src/coreclr/tests/override.targets b/src/coreclr/tests/override.targets index 0173750d95b4e3..f135ab9ac44b05 100644 --- a/src/coreclr/tests/override.targets +++ b/src/coreclr/tests/override.targets @@ -1,4 +1,4 @@ - + @@ -10,16 +10,17 @@ + DependsOnTargets="GetReferenceAssemblyPaths"> - + - + diff --git a/src/coreclr/tests/publishdependency.targets b/src/coreclr/tests/publishdependency.targets index 2df245cde3fd3f..fb8d4ba85c8e0d 100644 --- a/src/coreclr/tests/publishdependency.targets +++ b/src/coreclr/tests/publishdependency.targets @@ -6,8 +6,7 @@ - $(__BuildArch) - x64 + $(Platform) win7 win8 win10 @@ -21,7 +20,7 @@ - $(RootRepoDir)\artifacts\bin\coreclr\$(BuildOS).$(BuildArch).$(BuildType) + $(RuntimePath) $(ProductDestination)\ref diff --git a/src/coreclr/tests/runtest.sh b/src/coreclr/tests/runtest.sh index 737de857a2b52a..4e8af80fa8c76a 100755 --- a/src/coreclr/tests/runtest.sh +++ b/src/coreclr/tests/runtest.sh @@ -42,88 +42,6 @@ function print_usage { echo ' --buildXUnitWrappers : Force creating the xunit wrappers, this is useful if there have been changes to issues.targets' echo ' --printLastResultsOnly : Print the results of the last run' echo ' --runincontext : Run each tests in an unloadable AssemblyLoadContext' - echo '' - echo 'CoreFX Test Options ' - echo ' --corefxtests : Runs CoreFX tests' - echo ' --corefxtestsall : Runs all available CoreFX tests' - echo ' --corefxtestlist= : Runs the CoreFX tests specified in the passed list' - echo ' --testHostDir= : Directory containing a built test host including core binaries, test dependencies' - echo ' and a dotnet executable' - echo ' --coreclr-src= : Specify the CoreCLR root directory. Required to build the TestFileSetup tool for CoreFX testing.' -} - -function create_testhost -{ - if [ ! -d "$testHostDir" ]; then - exit_with_error "$errorSource" "Did not find the test host directory: $testHostDir" - fi - - # Initialize test variables - local dotnetExe=$coreClrSrc/../../dotnet.sh - local coreClrSrcTestDir=$coreClrSrc/tests - - if [ -z $coreClrBinDir ]; then - local coreClrBinDir=${coreClrSrc}/../../artifacts/bin/coreclr - export __CoreFXTestDir=${coreClrSrc}/../../artifacts/tests/CoreFX - else - export __CoreFXTestDir=${coreClrBinDir}/tests/CoreFX - fi - - local coreFXTestSetupUtilityName=CoreFX.TestUtils.TestFileSetup - local coreFXTestSetupUtility="${coreClrSrcTestDir}/src/Common/CoreFX/TestFileSetup/${coreFXTestSetupUtilityName}.csproj" - local coreFXTestSetupUtilityOutputPath=${__CoreFXTestDir}/TestUtilities - local coreFXTestBinariesOutputPath=${__CoreFXTestDir}/tests_downloaded - - if [ -z $CoreFXTestList]; then - local CoreFXTestList="${coreClrSrcTestDir}/CoreFX/CoreFX.issues.json" - fi - - case "${OSName}" in - # Check if we're running under OSX - Darwin) - local coreFXTestRemoteURL=$(<${coreClrSrcTestDir}/CoreFX/CoreFXTestListURL_OSX.txt) - local coreFXTestExclusionDef=nonosxtests - ;; - # Default to Linux - *) - local coreFXTestRemoteURL=$(<${coreClrSrcTestDir}/CoreFX/CoreFXTestListURL_Linux.txt) - local coreFXTestExclusionDef=nonlinuxtests - ;; - esac - - local coreFXTestExecutable=xunit.console.netcore.exe - local coreFXLogDir=${coreClrBinDir}/log/CoreFX/ - local coreFXTestExecutableArgs="--notrait category=nonnetcoreapptests --notrait category=${coreFXTestExclusionDef} --notrait category=failing --notrait category=IgnoreForCI --notrait category=OuterLoop --notrait Benchmark=true" - - chmod +x ${dotnetExe} - resetCommandArgs=("msbuild /t:Restore ${coreFXTestSetupUtility}") - echo "${dotnetExe} $resetCommandArgs" - "${dotnetExe}" $resetCommandArgs - - buildCommandArgs=("msbuild ${coreFXTestSetupUtility} /p:OutputPath=${coreFXTestSetupUtilityOutputPath} /p:Platform=${_arch} /p:Configuration=Release") - echo "${dotnetExe} $buildCommandArgs" - "${dotnetExe}" $buildCommandArgs - - if [ "${RunCoreFXTestsAll}" == "1" ]; then - local coreFXRunCommand=--runAllTests - else - local coreFXRunCommand=--runSpecifiedTests - fi - - local buildTestSetupUtilArgs=("${coreFXTestSetupUtilityOutputPath}/${coreFXTestSetupUtilityName}.dll --clean --outputDirectory ${coreFXTestBinariesOutputPath} --testListJsonPath ${CoreFXTestList} ${coreFXRunCommand} --dotnetPath ${testHostDir}/dotnet --testUrl ${coreFXTestRemoteURL} --executable ${coreFXTestExecutable} --log ${coreFXLogDir} ${coreFXTestExecutableArgs}") - echo "${dotnetExe} $buildTestSetupUtilArgs" - "${dotnetExe}" $buildTestSetupUtilArgs - - local exitCode=$? - if [ $exitCode != 0 ]; then - echo Running CoreFX tests finished with failures - else - echo Running CoreFX tests finished successfully - fi - - echo Check ${coreFXLogDir} for test run logs - - exit ${exitCode} } function set_up_core_dump_generation { @@ -200,7 +118,6 @@ coreClrBinDir= mscorlibDir= coreFxBinDir= coreClrObjs= -coreClrSrc= coverageOutputDir= testEnv= playlistFile= @@ -327,20 +244,6 @@ do --runcrossgen2tests) export RunCrossGen2=1 ;; - --corefxtests) - export RunCoreFXTests=1 - ;; - --corefxtestsall) - export RunCoreFXTests=1 - export RunCoreFXTestsAll=1 - ;; - --corefxtestlist) - export RunCoreFXTests=1 - export CoreFXTestList=${i#*=} - ;; - --testHostDir=*) - export testHostDir=${i#*=} - ;; --sequential) runSequential=1 ;; @@ -362,9 +265,6 @@ do --coreclr-objs=*) coreClrObjs=${i#*=} ;; - --coreclr-src=*) - coreClrSrc=${i#*=} - ;; --coverage-output-dir=*) coverageOutputDir=${i#*=} ;; @@ -410,40 +310,6 @@ fi export COMPlus_gcServer="$serverGC" -################################################################################ -# CoreFX -################################################################################ - -if [ "$RunCoreFXTests" == 1 ]; -then - if [ -z "$coreClrSrc" ] - then - echo "Coreclr src files are required to run CoreFX tests" - echo "Coreclr src files root path can be passed using '--coreclr-src' argument" - print_usage - exit $EXIT_CODE_EXCEPTION - fi - - if [ -z "$testHostDir" ]; then - echo "--testHostDir is required to run CoreFX tests" - print_usage - exit $EXIT_CODE_EXCEPTION - fi - - if [ ! -f "$testHostDir/dotnet" ]; then - echo "Executable dotnet not found in $testHostDir" - exit $EXIT_CODE_EXCEPTION - fi - - if [ ! -d "$testHostDir" ]; then - echo "Directory specified by --testHostDir does not exist: $testRootDir" - exit $EXIT_CODE_EXCEPTION - fi - - create_testhost - exit 0 -fi - ################################################################################ # Runtest.py ################################################################################ diff --git a/src/coreclr/tests/scripts/run-corefx-tests.py b/src/coreclr/tests/scripts/run-corefx-tests.py index 1ff22dc52b52c7..610407f6df33ea 100644 --- a/src/coreclr/tests/scripts/run-corefx-tests.py +++ b/src/coreclr/tests/scripts/run-corefx-tests.py @@ -325,7 +325,7 @@ def main(args): sys.exit(1) # Override the built corefx runtime (which it picked up by copying from packages determined - # by its dependencies.props file). Note that we always build Release corefx. + # by its Versions.props file). Note that we always build Release corefx. # We must copy all files, not just the files that already exist in the corefx runtime # directory. This is required so we copy over all altjit compilers. # diff --git a/src/coreclr/tests/src/CLRTest.Jit.targets b/src/coreclr/tests/src/CLRTest.Jit.targets index 13d431a19b456a..868c8b4ddded9b 100644 --- a/src/coreclr/tests/src/CLRTest.Jit.targets +++ b/src/coreclr/tests/src/CLRTest.Jit.targets @@ -25,7 +25,7 @@ WARNING: When setting properties based on their current state (for example: $([MSBuild]::MakeRelative($(OutputPath), $(_CLRTestToRunFileFullPath)).Replace("\","/")) $(MSBuildProjectName).exe - $([MSBuild]::MakeRelative($(OutputPath), $(BaseOutputPathWithConfig)dasm\$(BuildProjectRelativeDir)).Replace("\","/")) + $([MSBuild]::MakeRelative($(OutputPath), $(TestWorkingDir)dasm\$(BuildProjectRelativeDir)).Replace("\","/")) $([MSBuild]::MakeRelative($(OutputPath), $(_CLRTestToRunFileFullPath))) $(MSBuildProjectName).exe - $([MSBuild]::MakeRelative($(OutputPath), $(BaseOutputPathWithConfig)dasm\$(BuildProjectRelativeDir))) + $([MSBuild]::MakeRelative($(OutputPath), $(TestWorkingDir)dasm\$(BuildProjectRelativeDir))) + TestLibrary - Library - ..\..\ BuildOnly - $(DefineConstants);$([System.String]::Copy('$(BuildArch)').ToUpper()) true - false $(NetCoreAppCurrent) $(TestSourceDir)Common\CoreCLRTestLibrary\obj\project.assets.json - - - False - - + @@ -25,9 +18,4 @@ - - - diff --git a/src/coreclr/tests/src/Common/Directory.Build.props b/src/coreclr/tests/src/Common/Directory.Build.props new file mode 100644 index 00000000000000..5a46e754e85258 --- /dev/null +++ b/src/coreclr/tests/src/Common/Directory.Build.props @@ -0,0 +1,9 @@ + + + + + + false + + + diff --git a/src/coreclr/tests/src/Common/Directory.Build.targets b/src/coreclr/tests/src/Common/Directory.Build.targets index 43424eab03de0a..73cb4ff572f89e 100644 --- a/src/coreclr/tests/src/Common/Directory.Build.targets +++ b/src/coreclr/tests/src/Common/Directory.Build.targets @@ -1,11 +1,6 @@ - - + + diff --git a/src/coreclr/tests/src/Common/PerfHarness/PerfHarness.csproj b/src/coreclr/tests/src/Common/PerfHarness/PerfHarness.csproj index 7cbf38359e7d4d..b5f2ad4298cd59 100644 --- a/src/coreclr/tests/src/Common/PerfHarness/PerfHarness.csproj +++ b/src/coreclr/tests/src/Common/PerfHarness/PerfHarness.csproj @@ -1,17 +1,13 @@ - - exe netcoreapp2.0 - - All - - + + \ No newline at end of file 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 8d668cf795e28c..4fc82bc7621345 100644 --- a/src/coreclr/tests/src/Common/test_dependencies/test_dependencies.csproj +++ b/src/coreclr/tests/src/Common/test_dependencies/test_dependencies.csproj @@ -1,4 +1,5 @@  + BuildOnly false @@ -6,24 +7,19 @@ true true win-arm;win-arm64;win-x64;win-x86;$(TargetRid) - $(BuildArch) true Release + $(TestSourceDir)Common\test_dependencies\obj\project.assets.json + true + - - - $(TestSourceDir)Common\test_dependencies\obj\project.assets.json - - - - - + - + @@ -32,4 +28,5 @@ + diff --git a/src/coreclr/tests/src/Directory.Build.props b/src/coreclr/tests/src/Directory.Build.props index 4d633211a5b1d5..a3c5b0eedd4d98 100644 --- a/src/coreclr/tests/src/Directory.Build.props +++ b/src/coreclr/tests/src/Directory.Build.props @@ -1,41 +1,9 @@ - - - - - true - false - full - $(DefineConstants);DEBUG;TRACE;XUNIT_PERF - - - true - true - pdbonly - $(DefineConstants);TRACE;XUNIT_PERF - - - true - true - full - $(DefineConstants);DEBUG;TRACE;XUNIT_PERF - + - - $(RootRepoDir)\artifacts\tests\coreclr - $(__TestRootDir) - $(BaseOutputPath)\$(OSPlatformConfig)\ - $(BaseOutputPathWithConfig) - $(RootRepoDir)\artifacts\tests\coreclr\obj\$(OSPlatformConfig)\Managed\ - $(__ManagedTestIntermediatesDir)\ - <__NativeTestIntermediatesDir Condition="'$(__NativeTestIntermediatesDir)' == ''">$([System.IO.Path]::GetFullPath($(BaseOutputPathWithConfig)..\..\coreclr\obj\$(BuildOS).$(Platform).$(Configuration)\Native\)) - $(MSBuildProjectName)\ - $([System.String]::Copy('$(MSBuildProjectDirectory)').Replace($(TestSourceDir),''))\$(MSBuildProjectName) - $(BaseIntermediateOutputPath)$(BuildProjectRelativeDir)\ - $(BaseOutputPathWithConfig)$(BuildProjectRelativeDir)\ - true + $([MSBuild]::NormalizeDirectory('$(TestWorkingIntermediateDir', 'native')) @@ -43,7 +11,6 @@ true true false - false 78,162,164,168,169,219,251,252,414,429,642,649,652,675,1691,1717,1718,3001,3002,3003,3005,3008 false @@ -55,94 +22,9 @@ false - - - Windows_NT - Linux - OSX - FreeBSD - AnyOS - - - - - - - - - - - - true - win-$(__BuildArch) - - - - - true - true - ubuntu.14.04-$(__BuildArch) - - - - - true - true - osx.10.12-$(__BuildArch) - - - - - true - true - ubuntu.14.04-$(__BuildArch) - - - - - $(ConfigurationErrorMsg);Unknown OSGroup [$(OSGroup)] specificed in your project. - - - - - - $(__RuntimeId) - $(TestNugetRuntimeId) - - - - - $(TargetRid) - $(TargetRid) - - - - true - C# - IL - - - - - true - - 2 - - $(MSBuildProjectDirectory)\obj - - - $(NetCoreAppCurrentTargetFrameworkMoniker) - $(NetCoreAppCurrent) - diff --git a/src/coreclr/tests/src/Directory.Build.targets b/src/coreclr/tests/src/Directory.Build.targets index 49e5369de3fad9..cc34690c998fe0 100644 --- a/src/coreclr/tests/src/Directory.Build.targets +++ b/src/coreclr/tests/src/Directory.Build.targets @@ -1,4 +1,7 @@ + + + SharedLibrary @@ -50,22 +53,13 @@ <_CLRTestNeedsProjectToRun Condition=" '$(_CLRTestNeedsToRun)' and '!$(_CLRTestBuildsExecutable)' ">true - - - None - - - + false - - false @@ -95,15 +89,6 @@ true - - - - IL - CSharp - - true - - - + - + @@ -183,8 +168,8 @@ Condition="'$(_CopyNativeProjectBinaries)' == 'true'" BeforeTargets="Build" > - - + + @@ -197,8 +182,8 @@ + Condition="'$(UseLiveBuild)' != 'false'" + BeforeTargets="BeforeResolveReferences"> @@ -214,6 +199,7 @@ @@ -223,28 +209,14 @@ + Condition="Exists('$(AssemblyName).reflect.xml')"/> - + $(TestSourceDir)Common\test_dependencies\obj\project.assets.json - - - - - - - true - - - 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 89aa8c1024002f..7f31581f7b75f5 100644 --- a/src/coreclr/tests/src/GC/API/GC/GetAllocatedBytesForCurrentThread.csproj +++ b/src/coreclr/tests/src/GC/API/GC/GetAllocatedBytesForCurrentThread.csproj @@ -2,8 +2,6 @@ Exe true - - PdbOnly True diff --git a/src/coreclr/tests/src/GC/API/GC/GetTotalAllocatedBytes.csproj b/src/coreclr/tests/src/GC/API/GC/GetTotalAllocatedBytes.csproj index c0d2e0cca49811..1520cfa315452d 100644 --- a/src/coreclr/tests/src/GC/API/GC/GetTotalAllocatedBytes.csproj +++ b/src/coreclr/tests/src/GC/API/GC/GetTotalAllocatedBytes.csproj @@ -2,8 +2,6 @@ Exe true - - PdbOnly 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..a4656ab8f726b4 100644 --- a/src/coreclr/tests/src/Interop/ExecInDefAppDom/InjectedCode/InjectedCode.csproj +++ b/src/coreclr/tests/src/Interop/ExecInDefAppDom/InjectedCode/InjectedCode.csproj @@ -1,8 +1,7 @@ - Library BuildOnly - $(DefineConstants);$([System.String]::Copy('$(BuildArch)').ToUpper()) + $(DefineConstants);$([System.String]::Copy('$(Platform)').ToUpper()) true false diff --git a/src/coreclr/tests/src/Interop/NativeLibraryResolveCallback/CallbackStressTest.csproj b/src/coreclr/tests/src/Interop/NativeLibraryResolveCallback/CallbackStressTest.csproj index e7e11ee01e7142..80fe28a1f125cd 100644 --- a/src/coreclr/tests/src/Interop/NativeLibraryResolveCallback/CallbackStressTest.csproj +++ b/src/coreclr/tests/src/Interop/NativeLibraryResolveCallback/CallbackStressTest.csproj @@ -3,7 +3,7 @@ Exe true true - WINDOWS + WINDOWS 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..4cf23c66632c3d 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 @@ -2,16 +2,14 @@ Exe 1 - - PdbOnly 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..4cf23c66632c3d 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 @@ -2,16 +2,14 @@ Exe 1 - - PdbOnly 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..4cf23c66632c3d 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 @@ -2,16 +2,14 @@ Exe 1 - - PdbOnly 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..4cf23c66632c3d 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 @@ -2,16 +2,14 @@ Exe 1 - - PdbOnly True - - - - - + + + + + diff --git a/src/coreclr/tests/src/JIT/Directed/StructABI/StructABI.csproj b/src/coreclr/tests/src/JIT/Directed/StructABI/StructABI.csproj index 911901bba3b08f..de37c63e683217 100644 --- a/src/coreclr/tests/src/JIT/Directed/StructABI/StructABI.csproj +++ b/src/coreclr/tests/src/JIT/Directed/StructABI/StructABI.csproj @@ -2,16 +2,14 @@ Exe true - - PdbOnly 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 2f5a590fc443e4..12cd2a4e40ddbe 100644 --- a/src/coreclr/tests/src/JIT/Directed/VectorABI/VectorMgdMgd_ro.csproj +++ b/src/coreclr/tests/src/JIT/Directed/VectorABI/VectorMgdMgd_ro.csproj @@ -1,8 +1,6 @@ Exe - - True True diff --git a/src/coreclr/tests/src/JIT/Directed/arglist/vararg.csproj b/src/coreclr/tests/src/JIT/Directed/arglist/vararg.csproj index 7cbbd08c1d318c..942251cbb73d1d 100644 --- a/src/coreclr/tests/src/JIT/Directed/arglist/vararg.csproj +++ b/src/coreclr/tests/src/JIT/Directed/arglist/vararg.csproj @@ -2,11 +2,7 @@ Exe true - - - $(DefineConstants);WIN32 - - + $(DefineConstants);WIN32 PdbOnly 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 ab3b41778a50fa..f5857f9f15c555 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,10 +1,7 @@ Exe - true - true - - + true PdbOnly True 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..edc8ffd2ce88bc 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 @@ -2,15 +2,13 @@ Exe true - - 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..b83ba820d8aa97 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 @@ -2,15 +2,13 @@ Exe 1 - - 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..518b8610e9bb90 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 @@ -2,15 +2,13 @@ Exe true - - 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..d5e8fc707b7c1e 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 @@ -2,15 +2,13 @@ Exe true - - 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..86455339ed41cc 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 @@ -2,15 +2,13 @@ Exe 1 - - 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..33cd9b5171a396 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 @@ -2,15 +2,13 @@ Exe true - - 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 5f87f876ad48e5..0803c51c6250e7 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 @@ -4,8 +4,6 @@ true true - - Full False 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 4d335ba36f1ce1..1d15825ae6f9bc 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 @@ -4,8 +4,6 @@ true true - - None False 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 2fd748ff617d87..99f5216699a19d 100644 --- a/src/coreclr/tests/src/JIT/Methodical/tailcall_v4/hijacking.ilproj +++ b/src/coreclr/tests/src/JIT/Methodical/tailcall_v4/hijacking.ilproj @@ -4,12 +4,8 @@ true true - - PdbOnly True - - true 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..78a34e94777143 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 @@ -3,12 +3,10 @@ Exe true 1 - - 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..b153d945242f58 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 @@ -3,12 +3,10 @@ Exe true 1 - - 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..37ad481946afe2 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 @@ -3,12 +3,10 @@ Exe true 1 - - 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..af7b3531c67792 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 @@ -3,12 +3,10 @@ Exe true 1 - - 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..eb6f9a212ea3fc 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 @@ -3,12 +3,10 @@ Exe true 1 - - 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..ca5f0240900419 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 @@ -3,12 +3,10 @@ Exe true 1 - - 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 c6f2f71fb4da0f..09dab2bce72fc6 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 @@ -2,17 +2,15 @@ Exe 1 - - None 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 c1a989ff64dc93..b7afd265103c9c 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 @@ -4,8 +4,6 @@ true 1 - - Full False diff --git a/src/coreclr/tests/src/JIT/SIMD/VectorConvert_r.csproj b/src/coreclr/tests/src/JIT/SIMD/VectorConvert_r.csproj index 902e992a37987f..0ccdb352977381 100644 --- a/src/coreclr/tests/src/JIT/SIMD/VectorConvert_r.csproj +++ b/src/coreclr/tests/src/JIT/SIMD/VectorConvert_r.csproj @@ -1,11 +1,7 @@ Exe - - - BIT32;$(DefineConstants) - - + BIT32;$(DefineConstants) None diff --git a/src/coreclr/tests/src/JIT/SIMD/VectorConvert_ro.csproj b/src/coreclr/tests/src/JIT/SIMD/VectorConvert_ro.csproj index 9fa4314423cad6..bafc61d53ad480 100644 --- a/src/coreclr/tests/src/JIT/SIMD/VectorConvert_ro.csproj +++ b/src/coreclr/tests/src/JIT/SIMD/VectorConvert_ro.csproj @@ -1,11 +1,7 @@ Exe - - - BIT32;$(DefineConstants) - - + BIT32;$(DefineConstants) None True 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 7c2ebaf89b8333..74311025588a94 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 @@ -4,8 +4,6 @@ true true - - Full False 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 3ee4e7975851fc..98b4dd9e6dd688 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 @@ -4,8 +4,6 @@ true true - - None False 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 542bac8936aa10..cac648673b7dab 100644 --- a/src/coreclr/tests/src/JIT/jit64/opt/cse/hugeexpr1.csproj +++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/hugeexpr1.csproj @@ -3,13 +3,11 @@ Exe true 1 - - Full True - true + true 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 7fc02936a48fc1..9435e61c4f7dc5 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 38aa1fdf1ee616..4d968c75c1fee0 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 ea5854a7cb2eab..3909bb68d25814 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/baseservices/exceptions/WindowsEventLog/WindowsEventLog.csproj b/src/coreclr/tests/src/baseservices/exceptions/WindowsEventLog/WindowsEventLog.csproj index c6a5f9d0472203..fa137857ee8547 100644 --- a/src/coreclr/tests/src/baseservices/exceptions/WindowsEventLog/WindowsEventLog.csproj +++ b/src/coreclr/tests/src/baseservices/exceptions/WindowsEventLog/WindowsEventLog.csproj @@ -2,7 +2,7 @@ Exe $(DefineConstants);STATIC - WINDOWS + WINDOWS true diff --git a/src/coreclr/tests/src/dirs.proj b/src/coreclr/tests/src/dirs.proj index 90ba9794745942..aa5f3a7077f525 100644 --- a/src/coreclr/tests/src/dirs.proj +++ b/src/coreclr/tests/src/dirs.proj @@ -45,6 +45,10 @@ + + <__TestGroupToBuild Condition="'$(__TestGroupToBuild)' == ''">1 + + @@ -121,9 +125,4 @@ - - - - - diff --git a/src/coreclr/tests/src/performance/Scenario/JitBench/JitBench.csproj b/src/coreclr/tests/src/performance/Scenario/JitBench/JitBench.csproj index 74cb291ad5664f..dbf7344f6cf903 100644 --- a/src/coreclr/tests/src/performance/Scenario/JitBench/JitBench.csproj +++ b/src/coreclr/tests/src/performance/Scenario/JitBench/JitBench.csproj @@ -11,19 +11,19 @@ $(CommandLineParserVersion) - $(MicrosoftDiagnosticsTracingTraceEventPackageVersion) + $(MicrosoftDiagnosticsTracingTraceEventVersion) - $(XunitPerformanceApiPackageVersion) + $(XunitPerformanceApiVersion) - $(XunitPerformanceApiPackageVersion) + $(XunitPerformanceApiVersion) - $(XunitPerformanceApiPackageVersion) + $(XunitPerformanceApiVersion) - $(XunitPerformanceApiPackageVersion) + $(XunitPerformanceApiVersion) @@ -32,13 +32,13 @@ - - - + + + - + diff --git a/src/coreclr/tests/src/performance/Scenario/JitBench/unofficial_dotnet/Directory.Build.props b/src/coreclr/tests/src/performance/Scenario/JitBench/unofficial_dotnet/Directory.Build.props deleted file mode 100644 index ae5b4798dac860..00000000000000 --- a/src/coreclr/tests/src/performance/Scenario/JitBench/unofficial_dotnet/Directory.Build.props +++ /dev/null @@ -1,6 +0,0 @@ - - - diff --git a/src/coreclr/tests/src/performance/Scenario/JitBench/unofficial_dotnet/Directory.Build.targets b/src/coreclr/tests/src/performance/Scenario/JitBench/unofficial_dotnet/Directory.Build.targets deleted file mode 100644 index ae5b4798dac860..00000000000000 --- a/src/coreclr/tests/src/performance/Scenario/JitBench/unofficial_dotnet/Directory.Build.targets +++ /dev/null @@ -1,6 +0,0 @@ - - - diff --git a/src/coreclr/tests/src/performance/Scenario/JitBench/unofficial_dotnet/JitBench.csproj b/src/coreclr/tests/src/performance/Scenario/JitBench/unofficial_dotnet/JitBench.csproj index e00e28e1f547b1..f2ce3cabcebfd0 100644 --- a/src/coreclr/tests/src/performance/Scenario/JitBench/unofficial_dotnet/JitBench.csproj +++ b/src/coreclr/tests/src/performance/Scenario/JitBench/unofficial_dotnet/JitBench.csproj @@ -1,12 +1,9 @@ - - - AnyCPU - Release Exe netcoreapp2.0 + false .NETCoreApp,Version=v2.0 @@ -18,19 +15,19 @@ $(CommandLineParserVersion) - $(MicrosoftDiagnosticsTracingTraceEventPackageVersion) + $(MicrosoftDiagnosticsTracingTraceEventVersion) - $(XunitPerformanceApiPackageVersion) + $(XunitPerformanceApiVersion) - $(XunitPerformanceApiPackageVersion) + $(XunitPerformanceApiVersion) - $(XunitPerformanceApiPackageVersion) + $(XunitPerformanceApiVersion) - $(XunitPerformanceApiPackageVersion) + $(XunitPerformanceApiVersion) @@ -39,13 +36,13 @@ - - - + + + - + diff --git a/src/coreclr/tests/src/readytorun/r2rdump/R2RDumpTest.csproj b/src/coreclr/tests/src/readytorun/r2rdump/R2RDumpTest.csproj index 97007a0ee28844..44bafca915f260 100644 --- a/src/coreclr/tests/src/readytorun/r2rdump/R2RDumpTest.csproj +++ b/src/coreclr/tests/src/readytorun/r2rdump/R2RDumpTest.csproj @@ -2,13 +2,9 @@ Exe false - ..\..\..\..\..\..\ - $(CoreClrDir)artifacts\bin\coreclr\$(BuildOS).$(BuildArch).$(BuildType)\netcoreapp2.0\R2RDump.dll - $(CoreClrDir).dotnet\dotnet - ../../../../../../ - $(BashCoreClrDir)artifacts/bin/coreclr/$(BuildOS).$(BuildArch).$(BuildType)/netcoreapp2.0/R2RDump.dll - $(CoreClrDir).dotnet/dotnet - $(CoreClrDir)tests\src\readytorun\r2rdump\files\$(BuildOS).$(BuildArch).$(BuildType)\ + $([MSBuild]::NormalizePath('$(BinDir)', 'netcoreapp2.0', 'R2RDump.dll')) + $(RepoRoot)dotnet + $(CoreClrProjectRoot)tests\src\readytorun\r2rdump\files\$(OSPlatformConfig)\ true @@ -35,10 +31,10 @@ $(CLRTestBatchPreCommands) %Core_Root%\crossgen /readytorun /platform_assemblies_paths %Core_Root%%3B%25CD% /out GcInfoTransitions.ni.dll GcInfoTransitions.dll %Core_Root%\crossgen /readytorun /platform_assemblies_paths %Core_Root%%3B%25CD% /out GenericFunctions.ni.dll GenericFunctions.dll %Core_Root%\crossgen /readytorun /platform_assemblies_paths %Core_Root%%3B%25CD% /out MultipleRuntimeFunctions.ni.dll MultipleRuntimeFunctions.dll -$(DotnetToolCommand) $(R2RDumpCommand) --in HelloWorld.ni.dll --out HelloWorld-test.xml -x -v --ignoreSensitive -$(DotnetToolCommand) $(R2RDumpCommand) --in GcInfoTransitions.ni.dll --out GcInfoTransitions-test.xml -x -v --ignoreSensitive -$(DotnetToolCommand) $(R2RDumpCommand) --in GenericFunctions.ni.dll --out GenericFunctions-test.xml -x -v --ignoreSensitive -$(DotnetToolCommand) $(R2RDumpCommand) --in MultipleRuntimeFunctions.ni.dll --out MultipleRuntimeFunctions-test.xml -x -v --ignoreSensitive +$(DotnetToolCommand).cmd $(R2RDumpCommand) --in HelloWorld.ni.dll --out HelloWorld-test.xml -x -v --ignoreSensitive +$(DotnetToolCommand).cmd $(R2RDumpCommand) --in GcInfoTransitions.ni.dll --out GcInfoTransitions-test.xml -x -v --ignoreSensitive +$(DotnetToolCommand).cmd $(R2RDumpCommand) --in GenericFunctions.ni.dll --out GenericFunctions-test.xml -x -v --ignoreSensitive +$(DotnetToolCommand).cmd $(R2RDumpCommand) --in MultipleRuntimeFunctions.ni.dll --out MultipleRuntimeFunctions-test.xml -x -v --ignoreSensitive ]]> diff --git a/src/coreclr/tests/src/runtest.proj b/src/coreclr/tests/src/runtest.proj index f313b4d24cdddf..f9ecd4e1e953b6 100644 --- a/src/coreclr/tests/src/runtest.proj +++ b/src/coreclr/tests/src/runtest.proj @@ -1,9 +1,10 @@ - - + + + - $(BaseOutputPathWithConfig) - $(XunitTestBinBase)\TestWrappers\ + $(TestWorkingDir) + $(XunitTestBinBase)TestWrappers\ 1 @@ -23,7 +24,6 @@ Text="$(XunitTestBinBase) does not exist. Please run build-test.cmd from the repo root at least once to get the tests built." /> - @@ -37,7 +37,6 @@ $([System.IO.Path]::GetFullPath(%(AllRunnableTestPaths.Identity))) - @@ -93,11 +92,12 @@ $(_XunitEpilog) - - - $(XUnitTestBinBase)\$(CategoryWithSlash) - $(MicrosoftNETCoreAppVersion) + $(XunitWrapperGeneratedCSDirBase) + $(MicrosoftNETCoreAppVersion) + $(CoreClrTestDir)Directory.Build.props + $(CoreClrTestDir)Directory.Build.targets + false @@ -139,7 +139,19 @@ $(_XunitEpilog) - + + + + + + @@ -352,8 +364,8 @@ namespace $([System.String]::Copy($(Category)).Replace(".","_").Replace("\",""). - - + + @@ -389,6 +401,6 @@ namespace $([System.String]::Copy($(Category)).Replace(".","_").Replace("\",""). - + diff --git a/src/coreclr/tests/testgrouping.proj b/src/coreclr/tests/testgrouping.proj index 1ff04a97d59cc2..4995a9c4355449 100644 --- a/src/coreclr/tests/testgrouping.proj +++ b/src/coreclr/tests/testgrouping.proj @@ -1,154 +1,154 @@ - + baseservices.threading.generics - $(BinDir)baseservices\threading\baseservices.threading.XUnitWrapper.dll + $(TestWorkingDir)baseservices\threading\baseservices.threading.XUnitWrapper.dll - + JIT.jit64.hfa - $(BinDir)JIT\jit64\JIT.jit64.XUnitWrapper.dll + $(TestWorkingDir)JIT\jit64\JIT.jit64.XUnitWrapper.dll - + JIT.jit64.mcc - $(BinDir)JIT\jit64\JIT.jit64.XUnitWrapper.dll + $(TestWorkingDir)JIT\jit64\JIT.jit64.XUnitWrapper.dll - + JIT.jit64.opt - $(BinDir)JIT\jit64\JIT.jit64.XUnitWrapper.dll + $(TestWorkingDir)JIT\jit64\JIT.jit64.XUnitWrapper.dll - + JIT.jit64.valuetypes - $(BinDir)JIT\jit64\JIT.jit64.XUnitWrapper.dll + $(TestWorkingDir)JIT\jit64\JIT.jit64.XUnitWrapper.dll - + JIT.Methodical.a-dA-D - $(BinDir)JIT\Methodical\JIT.Methodical.XUnitWrapper.dll + $(TestWorkingDir)JIT\Methodical\JIT.Methodical.XUnitWrapper.dll - + JIT.Methodical.eh - $(BinDir)JIT\Methodical\JIT.Methodical.XUnitWrapper.dll + $(TestWorkingDir)JIT\Methodical\JIT.Methodical.XUnitWrapper.dll - + JIT.Methodical.e-iE-I - $(BinDir)JIT\Methodical\JIT.Methodical.XUnitWrapper.dll + $(TestWorkingDir)JIT\Methodical\JIT.Methodical.XUnitWrapper.dll - + JIT.Methodical.e-iE-I - $(BinDir)JIT\Methodical\JIT.Methodical.XUnitWrapper.dll + $(TestWorkingDir)JIT\Methodical\JIT.Methodical.XUnitWrapper.dll - + JIT.Regression.CLR-x86-JIT.V1-M09-M11 - $(BinDir)JIT\Regression\JIT.Regression.XUnitWrapper.dll + $(TestWorkingDir)JIT\Regression\JIT.Regression.XUnitWrapper.dll - + JIT.Regression.CLR-x86-JIT.V1-M12-M13 - $(BinDir)JIT\Regression\JIT.Regression.XUnitWrapper.dll + $(TestWorkingDir)JIT\Regression\JIT.Regression.XUnitWrapper.dll - + Loader.classloader.generics - $(BinDir)Loader\classloader\Loader.classloader.XUnitWrapper.dll + $(TestWorkingDir)Loader\classloader\Loader.classloader.XUnitWrapper.dll - + Loader.classloader.TypeGeneratorTests.TypeGeneratorTest0-299 - $(BinDir)Loader\classloader\Loader.classloader.XUnitWrapper.dll + $(TestWorkingDir)Loader\classloader\Loader.classloader.XUnitWrapper.dll - + Loader.classloader.TypeGeneratorTests.TypeGeneratorTest300-599 - $(BinDir)Loader\classloader\Loader.classloader.XUnitWrapper.dll + $(TestWorkingDir)Loader\classloader\Loader.classloader.XUnitWrapper.dll - + Loader.classloader.TypeGeneratorTests.TypeGeneratorTest600-899 - $(BinDir)Loader\classloader\Loader.classloader.XUnitWrapper.dll + $(TestWorkingDir)Loader\classloader\Loader.classloader.XUnitWrapper.dll - + Loader.classloader.TypeGeneratorTests.TypeGeneratorTest900-1199 - $(BinDir)Loader\classloader\Loader.classloader.XUnitWrapper.dll + $(TestWorkingDir)Loader\classloader\Loader.classloader.XUnitWrapper.dll - + Loader.classloader.TypeGeneratorTests.TypeGeneratorTest1200-1500 - $(BinDir)Loader\classloader\Loader.classloader.XUnitWrapper.dll - - - + $(TestWorkingDir)Loader\classloader\Loader.classloader.XUnitWrapper.dll + + + PayloadGroup0 - + Interop - + JIT diff --git a/src/coreclr/tests/tests.targets b/src/coreclr/tests/tests.targets index 1d9ec9d8f2f1ad..802a16c191f828 100644 --- a/src/coreclr/tests/tests.targets +++ b/src/coreclr/tests/tests.targets @@ -1,18 +1,17 @@ - - + <_SkipTestAssemblies Include="$(SkipTestAssemblies)" /> - $(BaseOutputPathWithConfig)\tests\ - <__TestRunHtmlLog Condition="'$(__TestRunHtmlLog)' == ''">$(__LogsDir)\TestRun.html - <__TestRunXmlLog Condition="'$(__TestRunXmlLog)' == ''">$(__LogsDir)\TestRun.xml + $(TestWorkingDir)tests\ + <__TestRunHtmlLog Condition="'$(__TestRunHtmlLog)' == ''">$(__LogsDir)\TestRun.html + <__TestRunXmlLog Condition="'$(__TestRunXmlLog)' == ''">$(__LogsDir)\TestRun.xml - + @@ -60,7 +59,7 @@ from working directory instead of full paths (see https://github.com/Microsoft/msbuild/issues/2530) --> - <_TestAssembliesRelative Include="@(TestAssemblies -> Replace('$(BaseOutputPathWithConfig)', '.\'))" /> + <_TestAssembliesRelative Include="@(TestAssemblies -> Replace('$(TestWorkingDir)', '.\'))" /> @@ -70,7 +69,7 @@ + WorkingDirectory="$(TestWorkingDir)"/> diff --git a/src/installer/Directory.Build.props b/src/installer/Directory.Build.props index 9670824f2a1285..be487df30a5daa 100644 --- a/src/installer/Directory.Build.props +++ b/src/installer/Directory.Build.props @@ -39,8 +39,6 @@ - true - true diff --git a/src/installer/managed/CommonManaged.props b/src/installer/managed/CommonManaged.props index 5195cc2c4dd56c..3fd259e9e37fca 100644 --- a/src/installer/managed/CommonManaged.props +++ b/src/installer/managed/CommonManaged.props @@ -1,5 +1,4 @@ - - + true @@ -8,11 +7,7 @@ true true true - LICENSE.TXT - https://dot.net Microsoft - $(RepoRoot)$(PackageLicenseFile) - $(RepoRoot)THIRD-PARTY-NOTICES.TXT true $(NoWarn);CS1591 @@ -24,7 +19,7 @@ If this Arcade SDK feature is desired in the future, this will need to be worked through. No issue tracks this as of writing. --> - + @@ -38,11 +33,6 @@ true - - git - git://github.com/dotnet/core-setup - - @@ -50,10 +40,6 @@ - - - diff --git a/src/installer/pkg/Directory.Build.props b/src/installer/pkg/Directory.Build.props index f0208581754add..f0a08080e60f3b 100644 --- a/src/installer/pkg/Directory.Build.props +++ b/src/installer/pkg/Directory.Build.props @@ -7,13 +7,8 @@ - $(RepoRoot)LICENSE.TXT - $(RepoRoot)THIRD-PARTY-NOTICES.TXT - MIT $(InstallerProjectRoot)pkg/projects/descriptions.json - - https://go.microsoft.com/fwlink/?LinkID=799417 - https://dot.net + $(Platform) x64 diff --git a/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/tests/Microsoft.Diagnostics.Tracing.EventSource.Redist.Tests.csproj b/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/tests/Microsoft.Diagnostics.Tracing.EventSource.Redist.Tests.csproj index bd9cd2daa75fbb..1852bd991c642d 100644 --- a/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/tests/Microsoft.Diagnostics.Tracing.EventSource.Redist.Tests.csproj +++ b/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/tests/Microsoft.Diagnostics.Tracing.EventSource.Redist.Tests.csproj @@ -36,6 +36,6 @@ - + \ No newline at end of file diff --git a/src/libraries/System.Diagnostics.Tracing/tests/System.Diagnostics.Tracing.Tests.csproj b/src/libraries/System.Diagnostics.Tracing/tests/System.Diagnostics.Tracing.Tests.csproj index 64190fd8703985..bb7f5383706903 100644 --- a/src/libraries/System.Diagnostics.Tracing/tests/System.Diagnostics.Tracing.Tests.csproj +++ b/src/libraries/System.Diagnostics.Tracing/tests/System.Diagnostics.Tracing.Tests.csproj @@ -44,6 +44,6 @@ - + \ No newline at end of file