From 12b164adf81939d808084edd3202fcd8e487abdf Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Mon, 16 Dec 2019 15:27:18 +0100 Subject: [PATCH 01/21] Remove dependencies.props favor of Versions.props Versions.props is the Arcade entry point to manage version which are being used throughout the repository. --- eng/Versions.props | 9 +++- src/coreclr/dependencies.props | 43 ------------------- src/coreclr/dir.common.props | 2 - src/coreclr/tests/external/external.csproj | 10 ++--- src/coreclr/tests/scripts/run-corefx-tests.py | 2 +- .../src/Common/PerfHarness/PerfHarness.csproj | 6 +-- .../Scenario/JitBench/JitBench.csproj | 14 +++--- .../unofficial_dotnet/JitBench.csproj | 14 +++--- ...cs.Tracing.EventSource.Redist.Tests.csproj | 2 +- .../System.Diagnostics.Tracing.Tests.csproj | 2 +- 10 files changed, 32 insertions(+), 72 deletions(-) delete mode 100644 src/coreclr/dependencies.props 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/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 index 90ecca279182ff..7a25e1657ad286 100644 --- a/src/coreclr/dir.common.props +++ b/src/coreclr/dir.common.props @@ -112,6 +112,4 @@ false - - 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/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/Common/PerfHarness/PerfHarness.csproj b/src/coreclr/tests/src/Common/PerfHarness/PerfHarness.csproj index 7cbf38359e7d4d..c93b54da15e1f5 100644 --- a/src/coreclr/tests/src/Common/PerfHarness/PerfHarness.csproj +++ b/src/coreclr/tests/src/Common/PerfHarness/PerfHarness.csproj @@ -1,17 +1,15 @@ - - exe netcoreapp2.0 - + All - + \ No newline at end of file diff --git a/src/coreclr/tests/src/performance/Scenario/JitBench/JitBench.csproj b/src/coreclr/tests/src/performance/Scenario/JitBench/JitBench.csproj index 74cb291ad5664f..619fdae81ae878 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,8 +32,8 @@ - - + + 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..db9a95da8b834b 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 @@ -18,19 +18,19 @@ $(CommandLineParserVersion) - $(MicrosoftDiagnosticsTracingTraceEventPackageVersion) + $(MicrosoftDiagnosticsTracingTraceEventVersion) - $(XunitPerformanceApiPackageVersion) + $(XunitPerformanceApiVersion) - $(XunitPerformanceApiPackageVersion) + $(XunitPerformanceApiVersion) - $(XunitPerformanceApiPackageVersion) + $(XunitPerformanceApiVersion) - $(XunitPerformanceApiPackageVersion) + $(XunitPerformanceApiVersion) @@ -39,8 +39,8 @@ - - + + 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 From 550cde817d36c789b9ab3452c894b555becc8adc Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Mon, 16 Dec 2019 15:35:01 +0100 Subject: [PATCH 02/21] Use Arcade Sdk.targets in coreclr/src/Common At the moment only Arcade Sdk.props are being imported in the common managed projects. Changing that to make sure that the same compiler is being used everywhere. --- .../CoreCLRTestLibrary/CoreCLRTestLibrary.csproj | 16 ++-------------- .../tests/src/Common/Directory.Build.props | 10 ++++++++++ .../tests/src/Common/Directory.Build.targets | 8 +------- .../src/Common/PerfHarness/PerfHarness.csproj | 4 +--- .../test_dependencies/test_dependencies.csproj | 9 ++++----- 5 files changed, 18 insertions(+), 29 deletions(-) create mode 100644 src/coreclr/tests/src/Common/Directory.Build.props diff --git a/src/coreclr/tests/src/Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj b/src/coreclr/tests/src/Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj index 6df9659d036b6a..335be0b52fdee8 100644 --- a/src/coreclr/tests/src/Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj +++ b/src/coreclr/tests/src/Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj @@ -1,20 +1,13 @@  + 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..87ec565f86c51c --- /dev/null +++ b/src/coreclr/tests/src/Common/Directory.Build.props @@ -0,0 +1,10 @@ + + + + + + + false + + + diff --git a/src/coreclr/tests/src/Common/Directory.Build.targets b/src/coreclr/tests/src/Common/Directory.Build.targets index 43424eab03de0a..841910dea9671d 100644 --- a/src/coreclr/tests/src/Common/Directory.Build.targets +++ b/src/coreclr/tests/src/Common/Directory.Build.targets @@ -1,11 +1,5 @@ - - + diff --git a/src/coreclr/tests/src/Common/PerfHarness/PerfHarness.csproj b/src/coreclr/tests/src/Common/PerfHarness/PerfHarness.csproj index c93b54da15e1f5..b5f2ad4298cd59 100644 --- a/src/coreclr/tests/src/Common/PerfHarness/PerfHarness.csproj +++ b/src/coreclr/tests/src/Common/PerfHarness/PerfHarness.csproj @@ -6,9 +6,7 @@ - - All - + 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..57963d2d478c0a 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 @@ -9,15 +10,12 @@ $(BuildArch) true Release + $(SourceDir)Common\test_dependencies\obj\project.assets.json + - - - - $(TestSourceDir)Common\test_dependencies\obj\project.assets.json - @@ -32,4 +30,5 @@ + From 22f4c79b9f3640068541bbbf3f0e4f4d8841b378 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Mon, 16 Dec 2019 15:57:34 +0100 Subject: [PATCH 03/21] Split restore and build targets in runtest.proj Restore and Build targets shouldn't run in the same msbuild invocation as that could cause issues with nuget auto-generated props/targets. --- src/coreclr/tests/src/Common/Directory.Build.targets | 1 + src/coreclr/tests/src/runtest.proj | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/coreclr/tests/src/Common/Directory.Build.targets b/src/coreclr/tests/src/Common/Directory.Build.targets index 841910dea9671d..73cb4ff572f89e 100644 --- a/src/coreclr/tests/src/Common/Directory.Build.targets +++ b/src/coreclr/tests/src/Common/Directory.Build.targets @@ -1,4 +1,5 @@ + diff --git a/src/coreclr/tests/src/runtest.proj b/src/coreclr/tests/src/runtest.proj index f313b4d24cdddf..2119ea608f881a 100644 --- a/src/coreclr/tests/src/runtest.proj +++ b/src/coreclr/tests/src/runtest.proj @@ -139,7 +139,12 @@ $(_XunitEpilog) - + + + From d8017e91ccd88153688298f57aed4c4d35fc16e3 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Mon, 16 Dec 2019 16:15:27 +0100 Subject: [PATCH 04/21] Fix duplicate imports of liveBuild.targets --- .../tests/src/Common/test_dependencies/test_dependencies.csproj | 2 -- 1 file changed, 2 deletions(-) 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 57963d2d478c0a..f8c9d4422d0ed1 100644 --- a/src/coreclr/tests/src/Common/test_dependencies/test_dependencies.csproj +++ b/src/coreclr/tests/src/Common/test_dependencies/test_dependencies.csproj @@ -17,8 +17,6 @@ - - From 35475c30a568f25c8eb5e1e3749239bb648a176e Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Mon, 16 Dec 2019 19:25:49 +0100 Subject: [PATCH 05/21] Fix intermediate paths for test projects Intermediate paths are encoded wrong so that MSBuildProjectExtensionsPath which defaults to BaseIntermediateOutputPath is set wrong and the in-built msbuild Exists check fails. This is because of a mixture of different slashes. --- src/coreclr/tests/dir.common.props | 10 +++++----- src/coreclr/tests/src/runtest.proj | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/coreclr/tests/dir.common.props b/src/coreclr/tests/dir.common.props index 4382aa1fbfe4ec..20921db6f0b3d5 100644 --- a/src/coreclr/tests/dir.common.props +++ b/src/coreclr/tests/dir.common.props @@ -12,17 +12,17 @@ $(BuildOS).$(Platform).$(Configuration) - $(MSBuildThisFileDirectory)src - $([MSBuild]::MakeRelative($(TestSrcDir), $(MSBuildProjectDirectory)))\$(MSBuildProjectName)\ + $(MSBuildThisFileDirectory)src + $([MSBuild]::MakeRelative($(TestRelativeBasePath), $(MSBuildProjectDirectory))) + $([MSBuild]::NormalizeDirectory('$(BuildProjectRelativeDir)', '$(MSBuildProjectName)')) - $(RootRepoDir)/artifacts/tests/coreclr/obj/$(OSPlatformConfig)/Managed/$(BuildProjectRelativeDir) + $([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'tests', 'coreclr', 'obj', '$(OSPlatformConfig)', 'Managed', '$(BuildProjectRelativeDir)')) $(BaseIntermediateOutputPath) - $(RootRepoDir)/artifacts/tests/coreclr/$(OSPlatformConfig)/$(BuildProjectRelativeDir) + $([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'tests', 'coreclr', '$(OSPlatformConfig)', '$(BuildProjectRelativeDir)')) $(BaseOutputPath) - diff --git a/src/coreclr/tests/src/runtest.proj b/src/coreclr/tests/src/runtest.proj index 2119ea608f881a..b6b79bb89922d6 100644 --- a/src/coreclr/tests/src/runtest.proj +++ b/src/coreclr/tests/src/runtest.proj @@ -97,6 +97,7 @@ $(_XunitEpilog) $(XUnitTestBinBase)\$(CategoryWithSlash) + $(XunitTestBinBase)\ $(MicrosoftNETCoreAppVersion) From 9ead24c498f59687a236acaff61dc36868f85e9a Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Mon, 16 Dec 2019 22:01:21 +0100 Subject: [PATCH 06/21] Various path fixes --- src/coreclr/tests/Directory.Build.props | 23 +++++++++---------- src/coreclr/tests/Directory.Build.targets | 7 +++--- src/coreclr/tests/dir.common.props | 10 ++++---- src/coreclr/tests/disableversioncheck.targets | 11 --------- .../tests/src/Common/Directory.Build.props | 3 +-- .../test_dependencies.csproj | 1 + src/coreclr/tests/src/Directory.Build.props | 4 ++-- src/coreclr/tests/src/Directory.Build.targets | 22 +++++++----------- src/coreclr/tests/src/runtest.proj | 5 ++-- 9 files changed, 34 insertions(+), 52 deletions(-) delete mode 100644 src/coreclr/tests/disableversioncheck.targets diff --git a/src/coreclr/tests/Directory.Build.props b/src/coreclr/tests/Directory.Build.props index 691df71028b1c7..c979342fffd940 100644 --- a/src/coreclr/tests/Directory.Build.props +++ b/src/coreclr/tests/Directory.Build.props @@ -1,11 +1,12 @@ - - + + 8.0 true + false @@ -15,16 +16,14 @@ $(MSBuildThisFileDirectory) - $(MSBuildThisFileDirectory)src\ + $(MSBuildThisFileDirectory) + $(ProjectDir)src\ - $(MSBuildThisFileDirectory)..\..\..\artifacts\ - $(RootBinDir)bin\coreclr\$(BuildOS).$(BuildArch).$(BuildType)\ - - $(__TestWorkingDir)\ - $(RootBinDir)tests\coreclr\$(BuildOS).$(BuildArch).$(BuildType)\ + $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'coreclr', '$(OSPlatformConfig)')) + $([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'tests', 'coreclr', '$(OSPlatformConfig)')) $(__AltJitArch) @@ -33,14 +32,14 @@ - $(RootBinDir)obj\ - $(BaseIntermediateOutputPath)\$(BuildOS).$(BuildArch).$(BuildType) - $(BaseIntermediateOutputPath)\coreclr\$(BuildOS).$(BuildArch).$(BuildType) + $(ArtifactsObjDir) + $(BaseIntermediateOutputPath)\$(OSPlatformConfig) + $(BaseIntermediateOutputPath)\coreclr\$(OSPlatformConfig) - $(RootBinDir)TargetingPack\ + $(ArtifactsDir)TargetingPack\ 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/dir.common.props b/src/coreclr/tests/dir.common.props index 20921db6f0b3d5..307225f6d80b32 100644 --- a/src/coreclr/tests/dir.common.props +++ b/src/coreclr/tests/dir.common.props @@ -1,4 +1,5 @@ - + + - $([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'tests', 'coreclr', 'obj', '$(OSPlatformConfig)', 'Managed', '$(BuildProjectRelativeDir)')) + $([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'tests', 'coreclr', 'obj', '$(OSPlatformConfig)', 'Managed', '$(BuildProjectRelativeDir)', '$(MSBuildProjectName)')) $(BaseIntermediateOutputPath) - $([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'tests', 'coreclr', '$(OSPlatformConfig)', '$(BuildProjectRelativeDir)')) + $([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'tests', 'coreclr', '$(OSPlatformConfig)', '$(BuildProjectRelativeDir)', '$(MSBuildProjectName)')) $(BaseOutputPath) @@ -30,7 +30,7 @@ - + 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/src/Common/Directory.Build.props b/src/coreclr/tests/src/Common/Directory.Build.props index 87ec565f86c51c..5a46e754e85258 100644 --- a/src/coreclr/tests/src/Common/Directory.Build.props +++ b/src/coreclr/tests/src/Common/Directory.Build.props @@ -2,9 +2,8 @@ - - false + false 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 f8c9d4422d0ed1..a0a2ce75110a28 100644 --- a/src/coreclr/tests/src/Common/test_dependencies/test_dependencies.csproj +++ b/src/coreclr/tests/src/Common/test_dependencies/test_dependencies.csproj @@ -11,6 +11,7 @@ true Release $(SourceDir)Common\test_dependencies\obj\project.assets.json + true diff --git a/src/coreclr/tests/src/Directory.Build.props b/src/coreclr/tests/src/Directory.Build.props index 4d633211a5b1d5..2645d5c1be256b 100644 --- a/src/coreclr/tests/src/Directory.Build.props +++ b/src/coreclr/tests/src/Directory.Build.props @@ -24,11 +24,11 @@ - $(RootRepoDir)\artifacts\tests\coreclr + $(ArtifactsDir)tests\coreclr $(__TestRootDir) $(BaseOutputPath)\$(OSPlatformConfig)\ $(BaseOutputPathWithConfig) - $(RootRepoDir)\artifacts\tests\coreclr\obj\$(OSPlatformConfig)\Managed\ + $(ArtifactsDir)tests\coreclr\obj\$(OSPlatformConfig)\Managed\ $(__ManagedTestIntermediatesDir)\ <__NativeTestIntermediatesDir Condition="'$(__NativeTestIntermediatesDir)' == ''">$([System.IO.Path]::GetFullPath($(BaseOutputPathWithConfig)..\..\coreclr\obj\$(BuildOS).$(Platform).$(Configuration)\Native\)) $(MSBuildProjectName)\ diff --git a/src/coreclr/tests/src/Directory.Build.targets b/src/coreclr/tests/src/Directory.Build.targets index 49e5369de3fad9..3c9f781accf7c1 100644 --- a/src/coreclr/tests/src/Directory.Build.targets +++ b/src/coreclr/tests/src/Directory.Build.targets @@ -197,6 +197,7 @@ @@ -223,28 +225,20 @@ + Condition="Exists('$(AssemblyName).reflect.xml')"/> - - $(TestSourceDir)Common\test_dependencies\obj\project.assets.json - - - - - - - + + $(SourceDir)Common\test_dependencies\obj\project.assets.json true - - - true $(BuildArch) Release - + + + diff --git a/src/coreclr/tests/src/runtest.proj b/src/coreclr/tests/src/runtest.proj index b6b79bb89922d6..10a5eb97fbd22b 100644 --- a/src/coreclr/tests/src/runtest.proj +++ b/src/coreclr/tests/src/runtest.proj @@ -93,12 +93,13 @@ $(_XunitEpilog) - - $(XUnitTestBinBase)\$(CategoryWithSlash) $(XunitTestBinBase)\ $(MicrosoftNETCoreAppVersion) + $(CoreClrTestDir)Directory.Build.props + $(CoreClrTestDir)Directory.Build.targets + false From fab6cf3c657dede0119c17cfccfd5bc8850f3ba9 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 17 Dec 2019 00:04:08 +0100 Subject: [PATCH 07/21] MSBuild cleanup --- Directory.Build.props | 6 +- src/coreclr/Directory.Build.props | 73 +++++++++-- src/coreclr/Directory.Build.targets | 2 +- src/coreclr/dir.common.props | 115 ------------------ src/coreclr/src/.nuget/packaging.props | 4 +- .../System.Private.CoreLib.csproj | 4 +- src/coreclr/tests/Directory.Build.props | 28 ++++- src/coreclr/tests/dir.common.props | 31 ----- src/coreclr/tests/override.targets | 7 +- src/coreclr/tests/publishdependency.targets | 2 +- .../src/readytorun/r2rdump/R2RDumpTest.csproj | 26 ++-- 11 files changed, 113 insertions(+), 185 deletions(-) delete mode 100644 src/coreclr/dir.common.props diff --git a/Directory.Build.props b/Directory.Build.props index e21d7f07ef7f03..3f1d40e4fa461b 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')) @@ -65,7 +66,10 @@ $([MSBuild]::NormalizePath('$(LibrariesProjectRoot)', 'pkg', 'Microsoft.NETCore.Platforms', 'runtime.json')) $(RepoRoot)LICENSE.TXT - + true diff --git a/src/coreclr/Directory.Build.props b/src/coreclr/Directory.Build.props index 2e05f56574bc74..d2c5d4327237c2 100644 --- a/src/coreclr/Directory.Build.props +++ b/src/coreclr/Directory.Build.props @@ -3,26 +3,83 @@ true + - - - + + + $(ArtifactsBinDir)coreclr\$(MSBuildProjectName)\ + $(ArtifactsObjDir)coreclr\$(MSBuildProjectName)\ + - - $(CopyrightNetFoundation) - MIT + + + $(__BuildArch) + x64 + x64 + + $(__BuildType) + Debug + Debug + Release + Checked + + $(__BuildOS) + Windows_NT + Linux + OSX + + + <__BuildOS>$(BuildOS) + <__BuildArch>$(BuildArch) + + $(BuildType) + $(BuildArch) + + $(BuildOS).$(BuildArch).$(BuildType) + + + - false + $(ProjectDir)src\ + $(ArtifactsBinDir)coreclr\$(PlatformConfigPathPart)\ + $(BinDir).nuget\ + - $(NumberOfCores) + true + true + true + true + true + + true + + + $(__DistroRid) + + + x64 + x86 + x64 + + + Portable + false + false + $(NumberOfCores) strict;nullablePublicOnly + + + $(CopyrightNetFoundation) + MIT + + diff --git a/src/coreclr/Directory.Build.targets b/src/coreclr/Directory.Build.targets index 92465d4434802e..a7ba0f5d20cb39 100644 --- a/src/coreclr/Directory.Build.targets +++ b/src/coreclr/Directory.Build.targets @@ -1,5 +1,5 @@ - + diff --git a/src/coreclr/dir.common.props b/src/coreclr/dir.common.props deleted file mode 100644 index 7a25e1657ad286..00000000000000 --- a/src/coreclr/dir.common.props +++ /dev/null @@ -1,115 +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/packaging.props b/src/coreclr/src/.nuget/packaging.props index 2fb1f606e83443..a3e32dbdb13479 100644 --- a/src/coreclr/src/.nuget/packaging.props +++ b/src/coreclr/src/.nuget/packaging.props @@ -3,8 +3,8 @@ $(MSBuildThisFileDirectory)/descriptions.json - $(CoreclrDir)/LICENSE.TXT - $(CoreclrDir)/THIRD-PARTY-NOTICES.TXT + $(CoreClrProjectRoot)/LICENSE.TXT + $(CoreClrProjectRoot)/THIRD-PARTY-NOTICES.TXT https://go.microsoft.com/fwlink/?LinkID=799421 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..da7010892cb2e5 100644 --- a/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj +++ b/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj @@ -13,7 +13,7 @@ true - $(BinDir)IL/ + $(BinDir)IL\ Debug;Release;Checked x64;x86;arm;arm64 @@ -440,7 +440,7 @@ $(IntermediateOutputPath)\cmake.definitions - + Windows_NT diff --git a/src/coreclr/tests/Directory.Build.props b/src/coreclr/tests/Directory.Build.props index c979342fffd940..e87fad067bfa14 100644 --- a/src/coreclr/tests/Directory.Build.props +++ b/src/coreclr/tests/Directory.Build.props @@ -1,13 +1,31 @@ - - + - 8.0 - true false + + $(BuildOS).$(Platform).$(Configuration) + + $(MSBuildThisFileDirectory)src + $([MSBuild]::MakeRelative($(TestRelativeBasePath), $(MSBuildProjectDirectory))) + + + $([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'tests', 'coreclr', 'obj', '$(OSPlatformConfig)', 'Managed', '$(BuildProjectRelativeDir)', '$(MSBuildProjectName)')) + $(BaseIntermediateOutputPath) + + $([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'tests', 'coreclr', '$(OSPlatformConfig)', '$(BuildProjectRelativeDir)', '$(MSBuildProjectName)')) + $(BaseOutputPath) + + + true + + + + + true @@ -17,7 +35,7 @@ $(MSBuildThisFileDirectory) $(MSBuildThisFileDirectory) - $(ProjectDir)src\ + $(TestProjectDir)src\ diff --git a/src/coreclr/tests/dir.common.props b/src/coreclr/tests/dir.common.props index 307225f6d80b32..6c511ffc6b2305 100644 --- a/src/coreclr/tests/dir.common.props +++ b/src/coreclr/tests/dir.common.props @@ -1,36 +1,5 @@ - - - - - - $(BuildOS).$(Platform).$(Configuration) - - $(MSBuildThisFileDirectory)src - $([MSBuild]::MakeRelative($(TestRelativeBasePath), $(MSBuildProjectDirectory))) - - - $([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'tests', 'coreclr', 'obj', '$(OSPlatformConfig)', 'Managed', '$(BuildProjectRelativeDir)', '$(MSBuildProjectName)')) - $(BaseIntermediateOutputPath) - - $([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'tests', 'coreclr', '$(OSPlatformConfig)', '$(BuildProjectRelativeDir)', '$(MSBuildProjectName)')) - $(BaseOutputPath) - - - true - - - - - diff --git a/src/coreclr/tests/override.targets b/src/coreclr/tests/override.targets index 0173750d95b4e3..d7c8b8bffe37f1 100644 --- a/src/coreclr/tests/override.targets +++ b/src/coreclr/tests/override.targets @@ -1,4 +1,4 @@ - + @@ -10,11 +10,10 @@ + DependsOnTargets="GetReferenceAssemblyPaths"> - + diff --git a/src/coreclr/tests/publishdependency.targets b/src/coreclr/tests/publishdependency.targets index 2df245cde3fd3f..66cf08ff0a94b7 100644 --- a/src/coreclr/tests/publishdependency.targets +++ b/src/coreclr/tests/publishdependency.targets @@ -21,7 +21,7 @@ - $(RootRepoDir)\artifacts\bin\coreclr\$(BuildOS).$(BuildArch).$(BuildType) + $(ArtifactsBinDir)coreclr\$(BuildOS).$(BuildArch).$(BuildType) $(ProductDestination)\ref diff --git a/src/coreclr/tests/src/readytorun/r2rdump/R2RDumpTest.csproj b/src/coreclr/tests/src/readytorun/r2rdump/R2RDumpTest.csproj index 97007a0ee28844..9c8cbe1cef671f 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('$(ArtifactsBinDir)', 'coreclr', '$(BuildOS).$(BuildArch).$(BuildType)', 'netcoreapp2.0', 'R2RDump.dll')) + $(RepoRoot)dotnet + $(CoreClrProjectRoot)tests\src\readytorun\r2rdump\files\$(BuildOS).$(BuildArch).$(BuildType)\ 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 ]]> From 99d0310db5b392d955c5f7070646a0e606b6eed2 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 17 Dec 2019 00:49:48 +0100 Subject: [PATCH 08/21] Update paths and common props --- Directory.Build.props | 4 ++ src/coreclr/Directory.Build.props | 19 ++--- src/coreclr/build-test.cmd | 10 +-- src/coreclr/tests/Directory.Build.props | 69 ++++--------------- src/coreclr/tests/build.proj | 7 +- src/coreclr/tests/dir.common.props | 5 -- src/coreclr/tests/dir.sdkbuild.props | 18 ----- src/coreclr/tests/override.targets | 2 +- src/coreclr/tests/publishdependency.targets | 2 +- .../test_dependencies.csproj | 2 +- src/coreclr/tests/src/Directory.Build.props | 2 +- src/coreclr/tests/src/Directory.Build.targets | 2 +- src/coreclr/tests/src/runtest.proj | 2 +- src/coreclr/tests/tests.targets | 3 +- src/installer/Directory.Build.props | 2 - 15 files changed, 43 insertions(+), 106 deletions(-) delete mode 100644 src/coreclr/tests/dir.common.props delete mode 100644 src/coreclr/tests/dir.sdkbuild.props diff --git a/Directory.Build.props b/Directory.Build.props index 3f1d40e4fa461b..a39fe8252085b7 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -100,6 +100,10 @@ $([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant()) + + true + + diff --git a/src/coreclr/Directory.Build.props b/src/coreclr/Directory.Build.props index d2c5d4327237c2..cb88fef6a36611 100644 --- a/src/coreclr/Directory.Build.props +++ b/src/coreclr/Directory.Build.props @@ -6,12 +6,6 @@ - - - $(ArtifactsBinDir)coreclr\$(MSBuildProjectName)\ - $(ArtifactsObjDir)coreclr\$(MSBuildProjectName)\ - - $(__BuildArch) @@ -36,7 +30,16 @@ $(BuildType) $(BuildArch) - $(BuildOS).$(BuildArch).$(BuildType) + $(BuildOS).$(BuildArch).$(BuildType) + + + + + $(ArtifactsBinDir)coreclr\ + $(BaseRootOutputPath)$(MSBuildProjectName)\ + $(ArtifactsObjDir)coreclr\ + $(BaseRootIntermediateOutputPath)$(MSBuildProjectName)\ + $(BaseRootOutputPath)$(OSPlatformConfig)\ @@ -44,7 +47,7 @@ $(ProjectDir)src\ - $(ArtifactsBinDir)coreclr\$(PlatformConfigPathPart)\ + $(RuntimePath) $(BinDir).nuget\ diff --git a/src/coreclr/build-test.cmd b/src/coreclr/build-test.cmd index 3bdba25d24cb28..f9d527b750453c 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: @@ -296,7 +295,6 @@ powershell -NoProfile -ExecutionPolicy ByPass -NoLogo -Command "%__RepoRootDir%\ %__ProjectDir%\tests\build.proj -warnAsError:0 /t:BatchRestorePackages /nodeReuse:false^ /p:RestoreDefaultOptimizationDataPackage=false /p:PortableBuild=true^ /p:UsePartialNGENOptimization=false /maxcpucount^ - %__SkipFXRestoreArg%^ !__Logging! %__CommonMSBuildArgs% %__PriorityArg% %__UnprocessedBuildArgs% if errorlevel 1 ( @@ -362,7 +360,6 @@ for /l %%G in (1, 1, %__NumberOfTestGroups%) do ( 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 +375,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! !TargetsWindowsMsbuildArg! !__msbuildArgs! !__PriorityArg! !__UnprocessedBuildArgs! "/t:CopyAllNativeProjectReferenceBinaries" echo Running: msbuild !__MSBuildBuildArgs! !__CommonMSBuildCmdPrefix! !__MSBuildBuildArgs! @@ -404,7 +401,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 ( @@ -462,7 +459,6 @@ powershell -NoProfile -ExecutionPolicy ByPass -NoLogo -File "%__RepoRootDir%\eng %__ProjectDir%\tests\src\runtest.proj /t:CreateTestOverlay /nodeReuse:false^ /p:RestoreDefaultOptimizationDataPackage=false /p:PortableBuild=true^ /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 +490,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% %TargetsWindowsMsbuildArg% %__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/tests/Directory.Build.props b/src/coreclr/tests/Directory.Build.props index e87fad067bfa14..9a4439ae5a6587 100644 --- a/src/coreclr/tests/Directory.Build.props +++ b/src/coreclr/tests/Directory.Build.props @@ -3,64 +3,33 @@ + $(NetCoreAppCurrent) + false false + $(__AltJitArch) + - $(BuildOS).$(Platform).$(Configuration) + + $(MSBuildThisFileDirectory) + $(CoreClrTestDir)src\ - $(MSBuildThisFileDirectory)src + $(TestSourceDir) $([MSBuild]::MakeRelative($(TestRelativeBasePath), $(MSBuildProjectDirectory))) + $(ArtifactsBinDir)TargetingPack\ + $([MSBuild]::NormalizeDirectory('$(BaseRootOutputPath)', '$(OSPlatformConfig)')) + $([MSBuild]::NormalizeDirectory('$(BaseRootOutputPath)', 'tests', '$(OSPlatformConfig)')) + - $([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'tests', 'coreclr', 'obj', '$(OSPlatformConfig)', 'Managed', '$(BuildProjectRelativeDir)', '$(MSBuildProjectName)')) + $([MSBuild]::NormalizeDirectory('$(TestWorkingDir)', '$(BuildProjectRelativeDir)', '$(MSBuildProjectName)')) $(BaseIntermediateOutputPath) - $([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'tests', 'coreclr', '$(OSPlatformConfig)', '$(BuildProjectRelativeDir)', '$(MSBuildProjectName)')) + $([MSBuild]::NormalizeDirectory('$(BaseRootIntermediateOutputPath)', 'tests', '$(OSPlatformConfig)', '$(BuildProjectRelativeDir)', '$(MSBuildProjectName)')) $(BaseOutputPath) - - - true - - - - - - - - true - - - - - $(MSBuildThisFileDirectory) - $(MSBuildThisFileDirectory) - $(TestProjectDir)src\ - - - - $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'coreclr', '$(OSPlatformConfig)')) - $([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'tests', 'coreclr', '$(OSPlatformConfig)')) - - $(__AltJitArch) - - - - - - $(ArtifactsObjDir) - $(BaseIntermediateOutputPath)\$(OSPlatformConfig) - $(BaseIntermediateOutputPath)\coreclr\$(OSPlatformConfig) - - - - - $(ArtifactsDir)TargetingPack\ - - - + false @@ -80,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/build.proj b/src/coreclr/tests/build.proj index 25a9ecdffc71ab..1f72ff894d9f6f 100644 --- a/src/coreclr/tests/build.proj +++ b/src/coreclr/tests/build.proj @@ -1,5 +1,4 @@ - - + @@ -46,8 +45,8 @@ <_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) + "$(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 6c511ffc6b2305..00000000000000 --- a/src/coreclr/tests/dir.common.props +++ /dev/null @@ -1,5 +0,0 @@ - - - - - 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/override.targets b/src/coreclr/tests/override.targets index d7c8b8bffe37f1..4b7949ccac3ca7 100644 --- a/src/coreclr/tests/override.targets +++ b/src/coreclr/tests/override.targets @@ -13,7 +13,7 @@ DependsOnTargets="GetReferenceAssemblyPaths"> - + diff --git a/src/coreclr/tests/publishdependency.targets b/src/coreclr/tests/publishdependency.targets index 66cf08ff0a94b7..758a57bc245ddb 100644 --- a/src/coreclr/tests/publishdependency.targets +++ b/src/coreclr/tests/publishdependency.targets @@ -21,7 +21,7 @@ - $(ArtifactsBinDir)coreclr\$(BuildOS).$(BuildArch).$(BuildType) + $(RuntimePath) $(ProductDestination)\ref 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 a0a2ce75110a28..8a6b2c2667ae28 100644 --- a/src/coreclr/tests/src/Common/test_dependencies/test_dependencies.csproj +++ b/src/coreclr/tests/src/Common/test_dependencies/test_dependencies.csproj @@ -10,7 +10,7 @@ $(BuildArch) true Release - $(SourceDir)Common\test_dependencies\obj\project.assets.json + $(TestSourceDir)Common\test_dependencies\obj\project.assets.json true diff --git a/src/coreclr/tests/src/Directory.Build.props b/src/coreclr/tests/src/Directory.Build.props index 2645d5c1be256b..3aaa84d317b5d5 100644 --- a/src/coreclr/tests/src/Directory.Build.props +++ b/src/coreclr/tests/src/Directory.Build.props @@ -24,7 +24,7 @@ - $(ArtifactsDir)tests\coreclr + $(ArtifactsDir)coreclr\tests $(__TestRootDir) $(BaseOutputPath)\$(OSPlatformConfig)\ $(BaseOutputPathWithConfig) diff --git a/src/coreclr/tests/src/Directory.Build.targets b/src/coreclr/tests/src/Directory.Build.targets index 3c9f781accf7c1..13e6b1443a398b 100644 --- a/src/coreclr/tests/src/Directory.Build.targets +++ b/src/coreclr/tests/src/Directory.Build.targets @@ -229,7 +229,7 @@ - $(SourceDir)Common\test_dependencies\obj\project.assets.json + $(TestSourceDir)Common\test_dependencies\obj\project.assets.json true true $(BuildArch) diff --git a/src/coreclr/tests/src/runtest.proj b/src/coreclr/tests/src/runtest.proj index 10a5eb97fbd22b..c9fb3c384b608e 100644 --- a/src/coreclr/tests/src/runtest.proj +++ b/src/coreclr/tests/src/runtest.proj @@ -96,7 +96,7 @@ $(_XunitEpilog) $(XUnitTestBinBase)\$(CategoryWithSlash) $(XunitTestBinBase)\ - $(MicrosoftNETCoreAppVersion) + $(MicrosoftNETCoreAppVersion) $(CoreClrTestDir)Directory.Build.props $(CoreClrTestDir)Directory.Build.targets false diff --git a/src/coreclr/tests/tests.targets b/src/coreclr/tests/tests.targets index 1d9ec9d8f2f1ad..299d74369c8f35 100644 --- a/src/coreclr/tests/tests.targets +++ b/src/coreclr/tests/tests.targets @@ -1,5 +1,4 @@ - - + <_SkipTestAssemblies Include="$(SkipTestAssemblies)" /> 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 From b63859457f01c801c72565a87ed0980d4a5368c7 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 17 Dec 2019 14:29:52 +0100 Subject: [PATCH 09/21] Cleanup coreclr managed properties --- Directory.Build.props | 1 + src/coreclr/Directory.Build.props | 104 +++++++++++---- src/coreclr/Directory.Build.targets | 3 + src/coreclr/src/.nuget/Directory.Build.props | 4 +- src/coreclr/src/.nuget/optdata/optdata.csproj | 6 +- .../System.Private.CoreLib.csproj | 13 -- src/coreclr/src/jit/jit.settings.targets | 8 +- src/coreclr/tests/Directory.Build.props | 39 ++++-- src/coreclr/tests/build.proj | 6 +- src/coreclr/tests/helixpublishwitharcade.proj | 16 +-- src/coreclr/tests/override.targets | 4 +- src/coreclr/tests/publishdependency.targets | 2 +- src/coreclr/tests/src/CLRTest.Jit.targets | 4 +- .../test_dependencies.csproj | 2 +- src/coreclr/tests/src/Directory.Build.props | 124 +----------------- src/coreclr/tests/src/Directory.Build.targets | 32 ++--- .../CallbackStressTest.csproj | 2 +- .../JIT/Directed/StructABI/StructABI.csproj | 6 +- .../src/JIT/Directed/arglist/vararg.csproj | 2 +- .../Nesting/NestedGenericClasses.csproj | 2 +- .../Nesting/NestedGenericStructs.csproj | 2 +- .../Nesting/NestedGenericTypesMix.csproj | 2 +- .../WindowsEventLog/WindowsEventLog.csproj | 2 +- src/coreclr/tests/src/dirs.proj | 9 +- .../Scenario/JitBench/JitBench.csproj | 4 +- .../unofficial_dotnet/JitBench.csproj | 4 +- .../src/readytorun/r2rdump/R2RDumpTest.csproj | 4 +- src/coreclr/tests/src/runtest.proj | 20 ++- src/coreclr/tests/testgrouping.proj | 2 +- src/coreclr/tests/tests.targets | 12 +- 30 files changed, 184 insertions(+), 257 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index a39fe8252085b7..1d3d29427a0fac 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -82,6 +82,7 @@ + IL latest preview diff --git a/src/coreclr/Directory.Build.props b/src/coreclr/Directory.Build.props index cb88fef6a36611..30bb665dce0ff8 100644 --- a/src/coreclr/Directory.Build.props +++ b/src/coreclr/Directory.Build.props @@ -8,29 +8,26 @@ - $(__BuildArch) - x64 - x64 - - $(__BuildType) - Debug - Debug - Release - Checked - - $(__BuildOS) - Windows_NT - Linux - OSX - - - <__BuildOS>$(BuildOS) - <__BuildArch>$(BuildArch) + $(__BuildArch) + x64 + x64 + + $(BuildArch) + $(BuildArch) + $(__BuildType) + Debug + Release + Checked $(BuildType) - $(BuildArch) - $(BuildOS).$(BuildArch).$(BuildType) + $(__BuildOS) + Windows_NT + Linux + OSX + AnyOS + + $(OSGroup).$(BuildArch).$(BuildType) @@ -43,6 +40,49 @@ + + + + + + + + + + + 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. + + + @@ -53,28 +93,34 @@ - true - true - true - true - true - - true - $(__DistroRid) + $(__RuntimeId) + $(TestNugetRuntimeId) + x64 x86 x64 + + + $(TargetRid) + $(TargetRid) + + Portable false - false $(NumberOfCores) strict;nullablePublicOnly diff --git a/src/coreclr/Directory.Build.targets b/src/coreclr/Directory.Build.targets index a7ba0f5d20cb39..a088228558bff8 100644 --- a/src/coreclr/Directory.Build.targets +++ b/src/coreclr/Directory.Build.targets @@ -12,4 +12,7 @@ $(ProductVersion) $(InformationalVersion)-$(VersionSuffix) + + + diff --git a/src/coreclr/src/.nuget/Directory.Build.props b/src/coreclr/src/.nuget/Directory.Build.props index 75092cad12ddcf..bfb235be526792 100644 --- a/src/coreclr/src/.nuget/Directory.Build.props +++ b/src/coreclr/src/.nuget/Directory.Build.props @@ -14,7 +14,7 @@ <_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))) @@ -43,7 +43,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/optdata/optdata.csproj b/src/coreclr/src/.nuget/optdata/optdata.csproj index 05960492d14dca..2b292eaf6ba57b 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())-$(BuildArch.ToLower()) 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 da7010892cb2e5..35edbbde8a1726 100644 --- a/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj +++ b/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj @@ -120,16 +120,6 @@ $(MSBuildThisFileDirectory)src - - - - i386 - $(Platform) - - - - - @@ -442,9 +432,6 @@ - - Windows_NT - true diff --git a/src/coreclr/src/jit/jit.settings.targets b/src/coreclr/src/jit/jit.settings.targets index 9c567c070b936e..eb9b683662b747 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/tests/Directory.Build.props b/src/coreclr/tests/Directory.Build.props index 9a4439ae5a6587..7c4ba344e121b3 100644 --- a/src/coreclr/tests/Directory.Build.props +++ b/src/coreclr/tests/Directory.Build.props @@ -1,6 +1,6 @@ - + $(NetCoreAppCurrent) @@ -13,20 +13,41 @@ $(MSBuildThisFileDirectory) $(CoreClrTestDir)src\ + + $(ArtifactsBinDir)TargetingPack\ + $(RuntimePath) + + $([MSBuild]::NormalizeDirectory('$(BaseRootOutputPath)', '$(OSPlatformConfig)', 'tests')) + $([MSBuild]::NormalizeDirectory('$(BaseRootIntermediateOutputPath)', '$(OSPlatformConfig)', 'tests')) + $(TestSourceDir) $([MSBuild]::MakeRelative($(TestRelativeBasePath), $(MSBuildProjectDirectory))) - $(ArtifactsBinDir)TargetingPack\ - $([MSBuild]::NormalizeDirectory('$(BaseRootOutputPath)', '$(OSPlatformConfig)')) - $([MSBuild]::NormalizeDirectory('$(BaseRootOutputPath)', 'tests', '$(OSPlatformConfig)')) + $([MSBuild]::NormalizeDirectory('$(TestWorkingDir)', '$(BuildProjectRelativeDir)', '$(MSBuildProjectName)')) + $(BaseOutputPath) - - $([MSBuild]::NormalizeDirectory('$(TestWorkingDir)', '$(BuildProjectRelativeDir)', '$(MSBuildProjectName)')) + $([MSBuild]::NormalizeDirectory('$(TestWorkingIntermediateDir)', '$(BuildProjectRelativeDir)', '$(MSBuildProjectName)')) $(BaseIntermediateOutputPath) + - $([MSBuild]::NormalizeDirectory('$(BaseRootIntermediateOutputPath)', 'tests', '$(OSPlatformConfig)', '$(BuildProjectRelativeDir)', '$(MSBuildProjectName)')) - $(BaseOutputPath) + + + true + false + full + $(DefineConstants);DEBUG;TRACE;XUNIT_PERF + + + true + true + pdbonly + $(DefineConstants);TRACE;XUNIT_PERF + + + true + true + full + $(DefineConstants);DEBUG;TRACE;XUNIT_PERF diff --git a/src/coreclr/tests/build.proj b/src/coreclr/tests/build.proj index 1f72ff894d9f6f..4f2d7e8ef18403 100644 --- a/src/coreclr/tests/build.proj +++ b/src/coreclr/tests/build.proj @@ -26,7 +26,7 @@ - + @@ -44,11 +44,11 @@ - <_ConfigurationProperties>/p:__BuildOS=$(__BuildOS) /p:__BuildArch=$(__BuildArch) /p:__BuildType=$(__BuildType) + <_ConfigurationProperties>/p:OSGroup=$(OSGroup) /p:BuildArch=$(BuildArch) /p:BuildType=$(BuildType) "$(DotNetTool)" restore $(RestoreProj) $(PackageVersionArg) /p:SetTFMForRestore=true $(_ConfigurationProperties) "$(DotNetTool)" restore -r $(__DistroRid) $(RestoreProj) $(PackageVersionArg) /p:SetTFMForRestore=true $(_ConfigurationProperties) - + diff --git a/src/coreclr/tests/helixpublishwitharcade.proj b/src/coreclr/tests/helixpublishwitharcade.proj index f68924f3b8d314..2f352bcc3c717e 100644 --- a/src/coreclr/tests/helixpublishwitharcade.proj +++ b/src/coreclr/tests/helixpublishwitharcade.proj @@ -15,8 +15,8 @@ <_PropertiesToPass> - __BuildArch=$(__BuildArch); - __BuildOS=$(__BuildOS); + BuildArch=$(BuildArch); + OSGroup=$(OSGroup); __BuildType=$(__BuildType); Creator=$(_Creator); HelixAccessToken=$(_HelixAccessToken); @@ -178,8 +178,8 @@ false R2R R2R-CG2 - $(TestRunNamePrefix)$(BuildOS) $(BuildArch) $(BuildType) @ - $(TestRunNamePrefix)$(BuildOS) $(BuildArch) $(BuildType) $(Scenario) @ + $(TestRunNamePrefix)$(OSGroup) $(BuildArch) $(BuildType) @ + $(TestRunNamePrefix)$(OSGroup) $(BuildArch) $(BuildType) $(Scenario) @ $([System.TimeSpan]::FromMinutes($(TimeoutPerTestInMinutes)).TotalMilliseconds) true <_XUnitParallelMode>collections @@ -218,12 +218,12 @@ - - + + - - + + diff --git a/src/coreclr/tests/override.targets b/src/coreclr/tests/override.targets index 4b7949ccac3ca7..874353915eb804 100644 --- a/src/coreclr/tests/override.targets +++ b/src/coreclr/tests/override.targets @@ -18,7 +18,9 @@ - + diff --git a/src/coreclr/tests/publishdependency.targets b/src/coreclr/tests/publishdependency.targets index 758a57bc245ddb..37f047464657a8 100644 --- a/src/coreclr/tests/publishdependency.targets +++ b/src/coreclr/tests/publishdependency.targets @@ -6,7 +6,7 @@ - $(__BuildArch) + $(BuildArch) x64 win7 win8 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))) - + diff --git a/src/coreclr/tests/src/Directory.Build.props b/src/coreclr/tests/src/Directory.Build.props index 3aaa84d317b5d5..507ceef75a338f 100644 --- a/src/coreclr/tests/src/Directory.Build.props +++ b/src/coreclr/tests/src/Directory.Build.props @@ -1,41 +1,11 @@ - - - - - true - false - full - $(DefineConstants);DEBUG;TRACE;XUNIT_PERF - - - true - true - pdbonly - $(DefineConstants);TRACE;XUNIT_PERF - - - true - true - full - $(DefineConstants);DEBUG;TRACE;XUNIT_PERF - + - + - $(ArtifactsDir)coreclr\tests - $(__TestRootDir) - $(BaseOutputPath)\$(OSPlatformConfig)\ - $(BaseOutputPathWithConfig) - $(ArtifactsDir)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 + $(TestWorkingDir) + $([MSBuild]::NormalizeDirectory('$(TestWorkingIntermediateDir', 'native')) @@ -43,7 +13,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 +24,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 13e6b1443a398b..7e51c2118648d0 100644 --- a/src/coreclr/tests/src/Directory.Build.targets +++ b/src/coreclr/tests/src/Directory.Build.targets @@ -1,4 +1,7 @@ + + + SharedLibrary @@ -52,7 +55,7 @@ - None + None false @@ -95,15 +96,6 @@ true - - - - IL - CSharp - - true - - - + - + @@ -183,8 +175,8 @@ Condition="'$(_CopyNativeProjectBinaries)' == 'true'" BeforeTargets="Build" > - - + + @@ -198,8 +190,7 @@ + BeforeTargets="BeforeResolveReferences"> @@ -236,9 +227,4 @@ Release - - - - - 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/StructABI/StructABI.csproj b/src/coreclr/tests/src/JIT/Directed/StructABI/StructABI.csproj index 911901bba3b08f..cd6e89f0f83dcc 100644 --- a/src/coreclr/tests/src/JIT/Directed/StructABI/StructABI.csproj +++ b/src/coreclr/tests/src/JIT/Directed/StructABI/StructABI.csproj @@ -9,9 +9,9 @@ - - - + + + diff --git a/src/coreclr/tests/src/JIT/Directed/arglist/vararg.csproj b/src/coreclr/tests/src/JIT/Directed/arglist/vararg.csproj index 7cbbd08c1d318c..637aa4e8701680 100644 --- a/src/coreclr/tests/src/JIT/Directed/arglist/vararg.csproj +++ b/src/coreclr/tests/src/JIT/Directed/arglist/vararg.csproj @@ -4,7 +4,7 @@ true - $(DefineConstants);WIN32 + $(DefineConstants);WIN32 PdbOnly 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 619fdae81ae878..dbf7344f6cf903 100644 --- a/src/coreclr/tests/src/performance/Scenario/JitBench/JitBench.csproj +++ b/src/coreclr/tests/src/performance/Scenario/JitBench/JitBench.csproj @@ -34,11 +34,11 @@ - + - + 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 db9a95da8b834b..fbf4bb59fcba65 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 @@ -41,11 +41,11 @@ - + - + diff --git a/src/coreclr/tests/src/readytorun/r2rdump/R2RDumpTest.csproj b/src/coreclr/tests/src/readytorun/r2rdump/R2RDumpTest.csproj index 9c8cbe1cef671f..dd5a71b3cd3115 100644 --- a/src/coreclr/tests/src/readytorun/r2rdump/R2RDumpTest.csproj +++ b/src/coreclr/tests/src/readytorun/r2rdump/R2RDumpTest.csproj @@ -2,9 +2,9 @@ Exe false - $([MSBuild]::NormalizePath('$(ArtifactsBinDir)', 'coreclr', '$(BuildOS).$(BuildArch).$(BuildType)', 'netcoreapp2.0', 'R2RDump.dll')) + $([MSBuild]::NormalizePath('$(RuntimePath)', 'netcoreapp2.0', 'R2RDump.dll')) $(RepoRoot)dotnet - $(CoreClrProjectRoot)tests\src\readytorun\r2rdump\files\$(BuildOS).$(BuildArch).$(BuildType)\ + $(CoreClrProjectRoot)tests\src\readytorun\r2rdump\files\$(OSPlatformConfig)\ true diff --git a/src/coreclr/tests/src/runtest.proj b/src/coreclr/tests/src/runtest.proj index c9fb3c384b608e..719b21fd1bde82 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))) - @@ -94,8 +93,7 @@ $(_XunitEpilog) - $(XUnitTestBinBase)\$(CategoryWithSlash) - $(XunitTestBinBase)\ + $(XunitWrapperGeneratedCSDirBase) $(MicrosoftNETCoreAppVersion) $(CoreClrTestDir)Directory.Build.props $(CoreClrTestDir)Directory.Build.targets @@ -359,8 +357,8 @@ namespace $([System.String]::Copy($(Category)).Replace(".","_").Replace("\",""). - - + + @@ -396,6 +394,6 @@ namespace $([System.String]::Copy($(Category)).Replace(".","_").Replace("\",""). - + diff --git a/src/coreclr/tests/testgrouping.proj b/src/coreclr/tests/testgrouping.proj index 1ff04a97d59cc2..04bd1531d7838d 100644 --- a/src/coreclr/tests/testgrouping.proj +++ b/src/coreclr/tests/testgrouping.proj @@ -10,7 +10,7 @@ $(BinDir)JIT\jit64\JIT.jit64.XUnitWrapper.dll - + JIT.jit64.mcc $(BinDir)JIT\jit64\JIT.jit64.XUnitWrapper.dll diff --git a/src/coreclr/tests/tests.targets b/src/coreclr/tests/tests.targets index 299d74369c8f35..802a16c191f828 100644 --- a/src/coreclr/tests/tests.targets +++ b/src/coreclr/tests/tests.targets @@ -5,13 +5,13 @@ - $(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 - + @@ -59,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)', '.\'))" /> @@ -69,7 +69,7 @@ + WorkingDirectory="$(TestWorkingDir)"/> From 699ca67c848801b6e92ffbf4ee5c68b63dc1ed51 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 17 Dec 2019 14:31:07 +0100 Subject: [PATCH 10/21] Split restore and build to fix design time imports The restore and build target invocations need to happen in separate msbuild task invocations and different global properties need to be passed in to mitigate issues with caching the invocations. For more context see https://github.com/microsoft/msbuild/issues/2811. --- eng/Build.props | 7 +++++-- src/coreclr/tests/src/runtest.proj | 15 +++++++++++---- 2 files changed, 16 insertions(+), 6 deletions(-) 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" /> + - - + + + + + From 35e89718c4cbee28750b8315e65e058953ba8c5d Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 17 Dec 2019 18:22:10 +0100 Subject: [PATCH 11/21] Further path fixes --- src/coreclr/Directory.Build.props | 17 +- src/coreclr/build-test.cmd | 15 +- .../System.Private.CoreLib.csproj | 4 +- src/coreclr/tests/Directory.Build.props | 2 - src/coreclr/tests/helixpublishwitharcade.proj | 9 +- src/coreclr/tests/override.targets | 2 +- src/coreclr/tests/src/Directory.Build.props | 2 - .../src/readytorun/r2rdump/R2RDumpTest.csproj | 2 +- src/coreclr/tests/testgrouping.proj | 188 +++++++++--------- 9 files changed, 111 insertions(+), 130 deletions(-) diff --git a/src/coreclr/Directory.Build.props b/src/coreclr/Directory.Build.props index 30bb665dce0ff8..af8b844c4122d6 100644 --- a/src/coreclr/Directory.Build.props +++ b/src/coreclr/Directory.Build.props @@ -16,6 +16,7 @@ $(BuildArch) $(__BuildType) + $(Configuration) Debug Release Checked @@ -32,11 +33,14 @@ - $(ArtifactsBinDir)coreclr\ + $(ArtifactsBinDir)coreclr\$(OSPlatformConfig)\ + $(MSBuildThisFileDirectory)src\ + $(BinDir).nuget\ + + $(BinDir) $(BaseRootOutputPath)$(MSBuildProjectName)\ - $(ArtifactsObjDir)coreclr\ + $(ArtifactsObjDir)coreclr\$(OSPlatformConfig)\ $(BaseRootIntermediateOutputPath)$(MSBuildProjectName)\ - $(BaseRootOutputPath)$(OSPlatformConfig)\ @@ -84,13 +88,6 @@ - - - $(ProjectDir)src\ - $(RuntimePath) - $(BinDir).nuget\ - - diff --git a/src/coreclr/build-test.cmd b/src/coreclr/build-test.cmd index f9d527b750453c..29745a2836269a 100644 --- a/src/coreclr/build-test.cmd +++ b/src/coreclr/build-test.cmd @@ -124,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% @@ -354,7 +344,6 @@ 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! @@ -375,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! !__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! @@ -490,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% %__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/src/System.Private.CoreLib/System.Private.CoreLib.csproj b/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj index 35edbbde8a1726..5e12a5f853647a 100644 --- a/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj +++ b/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj @@ -318,8 +318,8 @@ - + !Exists('$(ArtifactsObjDir)coreclr\Eventing\$(BuildArch)\$(Configuration)\NativeRuntimeEventSource.cs')"/> + src\System\Diagnostics\Eventing\Generated\NativeRuntimeEventSource.cs diff --git a/src/coreclr/tests/Directory.Build.props b/src/coreclr/tests/Directory.Build.props index 7c4ba344e121b3..f2d999fdae7310 100644 --- a/src/coreclr/tests/Directory.Build.props +++ b/src/coreclr/tests/Directory.Build.props @@ -13,9 +13,7 @@ $(MSBuildThisFileDirectory) $(CoreClrTestDir)src\ - $(ArtifactsBinDir)TargetingPack\ - $(RuntimePath) $([MSBuild]::NormalizeDirectory('$(BaseRootOutputPath)', '$(OSPlatformConfig)', 'tests')) $([MSBuild]::NormalizeDirectory('$(BaseRootIntermediateOutputPath)', '$(OSPlatformConfig)', 'tests')) diff --git a/src/coreclr/tests/helixpublishwitharcade.proj b/src/coreclr/tests/helixpublishwitharcade.proj index 2f352bcc3c717e..c903381a4e9731 100644 --- a/src/coreclr/tests/helixpublishwitharcade.proj +++ b/src/coreclr/tests/helixpublishwitharcade.proj @@ -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))) diff --git a/src/coreclr/tests/override.targets b/src/coreclr/tests/override.targets index 874353915eb804..f135ab9ac44b05 100644 --- a/src/coreclr/tests/override.targets +++ b/src/coreclr/tests/override.targets @@ -13,7 +13,7 @@ DependsOnTargets="GetReferenceAssemblyPaths"> - + diff --git a/src/coreclr/tests/src/Directory.Build.props b/src/coreclr/tests/src/Directory.Build.props index 507ceef75a338f..a3c5b0eedd4d98 100644 --- a/src/coreclr/tests/src/Directory.Build.props +++ b/src/coreclr/tests/src/Directory.Build.props @@ -2,9 +2,7 @@ - - $(TestWorkingDir) $([MSBuild]::NormalizeDirectory('$(TestWorkingIntermediateDir', 'native')) diff --git a/src/coreclr/tests/src/readytorun/r2rdump/R2RDumpTest.csproj b/src/coreclr/tests/src/readytorun/r2rdump/R2RDumpTest.csproj index dd5a71b3cd3115..44bafca915f260 100644 --- a/src/coreclr/tests/src/readytorun/r2rdump/R2RDumpTest.csproj +++ b/src/coreclr/tests/src/readytorun/r2rdump/R2RDumpTest.csproj @@ -2,7 +2,7 @@ Exe false - $([MSBuild]::NormalizePath('$(RuntimePath)', 'netcoreapp2.0', 'R2RDump.dll')) + $([MSBuild]::NormalizePath('$(BinDir)', 'netcoreapp2.0', 'R2RDump.dll')) $(RepoRoot)dotnet $(CoreClrProjectRoot)tests\src\readytorun\r2rdump\files\$(OSPlatformConfig)\ diff --git a/src/coreclr/tests/testgrouping.proj b/src/coreclr/tests/testgrouping.proj index 04bd1531d7838d..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 From c8745d85025bdcf5f7b422a23a4b6827b6a9a78a Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 8 Jan 2020 19:21:56 +0100 Subject: [PATCH 12/21] Pre-Christmas changes --- eng/packaging.props | 1 - eng/pipelines/coreclr/templates/build-job.yml | 2 +- src/coreclr/Directory.Build.props | 119 ++++++++++----- src/coreclr/Directory.Build.targets | 4 - src/coreclr/build-test.sh | 4 - src/coreclr/build.cmd | 4 +- src/coreclr/build.sh | 2 +- src/coreclr/clr.featuredefines.props | 142 +++++++++--------- src/coreclr/src/.nuget/Directory.Build.props | 6 +- .../src/.nuget/Directory.Build.targets | 4 +- ...ux.Microsoft.NETCore.Runtime.CoreCLR.props | 4 +- ...NT.Microsoft.NETCore.Runtime.CoreCLR.props | 8 +- src/coreclr/src/.nuget/builds.targets | 2 +- src/coreclr/src/.nuget/optdata/optdata.csproj | 6 +- src/coreclr/src/.nuget/packages.builds | 2 +- src/coreclr/src/.nuget/packaging.props | 12 +- .../System.Private.CoreLib.csproj | 38 ++--- src/coreclr/src/build.proj | 10 +- src/coreclr/src/gc/sample/GCSample.vcxproj | 20 +-- src/coreclr/src/scripts/scripts.pyproj | 6 +- .../src/tools/GCLogParser/parse-hb-log.csproj | 12 +- ...ompiler.DependencyAnalysisFramework.csproj | 5 +- .../ILCompiler.ReadyToRun.csproj | 4 +- .../ILCompiler.Reflection.ReadyToRun.csproj | 2 +- .../ILCompiler.TypeSystem.ReadyToRun.csproj | 3 +- .../crossgen2/crossgen2/crossgen2.csproj | 2 +- src/coreclr/src/tools/r2rdump/R2RDump.csproj | 2 +- src/coreclr/tests/Directory.Build.props | 21 +-- src/coreclr/tests/bringup_runtest.sh | 2 +- src/coreclr/tests/build.proj | 2 +- src/coreclr/tests/helixpublishwitharcade.proj | 14 +- src/coreclr/tests/issues.targets | 18 +-- src/coreclr/tests/publishdependency.targets | 2 +- src/coreclr/tests/runtest.cmd | 2 +- src/coreclr/tests/runtest.sh | 2 +- .../test_dependencies.csproj | 3 +- src/coreclr/tests/src/Directory.Build.targets | 12 +- .../GetAllocatedBytesForCurrentThread.csproj | 2 +- .../GC/API/GC/GetTotalAllocatedBytes.csproj | 2 +- .../Regressions/v2.0-rtm/494226/494226.csproj | 2 +- .../Scenarios/ServerModel/servermodel.csproj | 2 +- .../InjectedCode/InjectedCode.csproj | 2 +- .../CopyConstructorMarshaler.csproj | 2 +- .../FixupCallsHostWhenLoaded.csproj | 2 +- .../LoadIjwFromModuleHandle.csproj | 2 +- .../ManagedCallingNative.csproj | 2 +- .../NativeCallingManaged.csproj | 2 +- .../NativeVarargs/NativeVarargsTest.csproj | 4 +- .../src/Interop/Interop.settings.targets | 8 +- .../Bindings/NETClientBindings.csproj | 2 +- .../PREFIX/unaligned/1/arglist.ilproj | 10 +- .../PREFIX/unaligned/2/arglist.ilproj | 10 +- .../PREFIX/unaligned/4/arglist.ilproj | 10 +- .../Directed/PREFIX/volatile/1/arglist.ilproj | 10 +- .../Directed/VectorABI/VectorMgdMgd_ro.csproj | 2 +- .../Old/Conformance_Base/conv_ovf_i8_i.ilproj | 4 +- .../_il_dbgi_array_merge.ilproj | 10 +- .../ELEMENT_TYPE_IU/_il_dbgsizeof.ilproj | 10 +- .../_il_dbgu_array_merge.ilproj | 10 +- .../_il_reli_array_merge.ilproj | 10 +- .../ELEMENT_TYPE_IU/_il_relsizeof.ilproj | 10 +- .../_il_relu_array_merge.ilproj | 10 +- .../JIT/Methodical/fp/exgen/10w5d_cs_d.csproj | 2 +- .../JIT/Methodical/fp/exgen/10w5d_cs_r.csproj | 2 +- .../Methodical/tailcall_v4/hijacking.ilproj | 4 +- .../xxobj/sizeof/_il_dbgsizeof.ilproj | 4 +- .../xxobj/sizeof/_il_dbgsizeof32.ilproj | 4 +- .../xxobj/sizeof/_il_dbgsizeof64.ilproj | 4 +- .../xxobj/sizeof/_il_relsizeof.ilproj | 4 +- .../xxobj/sizeof/_il_relsizeof32.ilproj | 4 +- .../xxobj/sizeof/_il_relsizeof64.ilproj | 4 +- .../DevDiv_278523/DevDiv_278523.ilproj | 10 +- .../V2.0-Beta2/b311420/b311420.csproj | 2 +- .../tests/src/JIT/SIMD/VectorConvert_r.csproj | 2 +- .../src/JIT/SIMD/VectorConvert_ro.csproj | 2 +- .../jit64/opt/cg/cgstress/CgStress1_d.csproj | 4 +- .../jit64/opt/cg/cgstress/CgStress1_r.csproj | 4 +- .../src/JIT/jit64/opt/cse/hugeexpr1.csproj | 2 +- .../src/JIT/superpmi/superpmicollect.csproj | 2 +- .../unofficial_dotnet/JitBench.csproj | 2 - .../coreroot_determinism.csproj | 2 +- .../crossgen2/crossgen2smoke.csproj | 2 +- .../determinism/crossgen2determinism.csproj | 2 +- .../src/readytorun/r2rdump/R2RDumpTest.csproj | 2 +- 84 files changed, 342 insertions(+), 372 deletions(-) diff --git a/eng/packaging.props b/eng/packaging.props index a7eb2fa7b041a5..937db87e4be982 100644 --- a/eng/packaging.props +++ b/eng/packaging.props @@ -4,7 +4,6 @@ $(RepoRoot)LICENSE.TXT $(RepoRoot)THIRD-PARTY-NOTICES.TXT https://go.microsoft.com/fwlink/?LinkID=799421 - https://github.com/dotnet/corefx $(CopyrightNetFoundation) MIT diff --git a/eng/pipelines/coreclr/templates/build-job.yml b/eng/pipelines/coreclr/templates/build-job.yml index 45278faac880cb..3109c7207e078a 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:ArchGroup=$(archType) /p:ConfigurationGroup=$(_BuildConfig) /p:DotNetSignType=$env:_SignType -projects $(Build.SourcesDirectory)\eng\empty.csproj displayName: Sign Binaries - task: PublishBuildArtifacts@1 diff --git a/src/coreclr/Directory.Build.props b/src/coreclr/Directory.Build.props index af8b844c4122d6..64b600c1063505 100644 --- a/src/coreclr/Directory.Build.props +++ b/src/coreclr/Directory.Build.props @@ -1,51 +1,73 @@ - - true - - - $(__BuildArch) - x64 - x64 - - $(BuildArch) - $(BuildArch) - - $(__BuildType) - $(Configuration) - Debug - Release - Checked - $(BuildType) - - $(__BuildOS) + $(__BuildArch) + x64 + x64 + arm + $(ArchGroup) + + $(__BuildOS) Windows_NT Linux OSX AnyOS + - $(OSGroup).$(BuildArch).$(BuildType) + + + $(__BuildType) + Debug + Release + Checked + $(ConfigurationGroup) - - - $(ArtifactsBinDir)coreclr\$(OSPlatformConfig)\ - $(MSBuildThisFileDirectory)src\ - $(BinDir).nuget\ + + + $(__BuildType) + Debug + Release + Checked + Debug + + Windows_NT + Unix + Linux + OSX + FreeBSD + NetBSD + - $(BinDir) - $(BaseRootOutputPath)$(MSBuildProjectName)\ - $(ArtifactsObjDir)coreclr\$(OSPlatformConfig)\ - $(BaseRootIntermediateOutputPath)$(MSBuildProjectName)\ + + + + Portable + true + + + false + $(DefineConstants);DEBUG + + + true + $(DefineConstants);DEBUG + + + true - - - + @@ -57,28 +79,28 @@ TargetsWindows property may already be set. Only set the property if it is not already defined --> true - win-$(BuildArch) + win-$(ArchGroup) true true - ubuntu.14.04-$(BuildArch) + ubuntu.14.04-$(ArchGroup) true true - osx.10.12-$(BuildArch) + osx.10.12-$(ArchGroup) true true - ubuntu.14.04-$(BuildArch) + ubuntu.14.04-$(ArchGroup) @@ -97,9 +119,24 @@ $(TestNugetRuntimeId) - x64 - x86 - x64 + x64 + x86 + x64 + + + + $(OSGroup).$(ArchGroup).$(ConfigurationGroup) + + $(ArtifactsBinDir)coreclr\$(OSPlatformConfig)\ + $(MSBuildThisFileDirectory)src\ + $(BinDir).nuget\ + + $(BinDir) + $(BaseRootOutputPath)$(MSBuildProjectName)\ + $(BaseOutputPath) + $(ArtifactsObjDir)coreclr\$(OSPlatformConfig)\ + $(BaseRootIntermediateOutputPath)$(MSBuildProjectName)\ + $(BaseIntermediateOutputPath) - Portable false $(NumberOfCores) @@ -128,4 +163,6 @@ MIT + + diff --git a/src/coreclr/Directory.Build.targets b/src/coreclr/Directory.Build.targets index a088228558bff8..37719868377259 100644 --- a/src/coreclr/Directory.Build.targets +++ b/src/coreclr/Directory.Build.targets @@ -2,8 +2,6 @@ - - Microsoft%AE .NET Core @@ -13,6 +11,4 @@ $(InformationalVersion)-$(VersionSuffix) - - diff --git a/src/coreclr/build-test.sh b/src/coreclr/build-test.sh index 37d9154bb311ab..6a282f97a87881 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 diff --git a/src/coreclr/build.cmd b/src/coreclr/build.cmd index 698d2683e9f015..2b8d43cacafb74 100644 --- a/src/coreclr/build.cmd +++ b/src/coreclr/build.cmd @@ -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:ArchGroup=%__BuildArch% if not !errorlevel! == 0 ( echo %__ErrMsgPrefix%%__MsgPrefix%Error: Failed to build crossgen2. @@ -881,7 +881,7 @@ if %__BuildPackages% EQU 1 ( -r -b -projects %__SourceDir%\.nuget\packages.builds^ -verbosity minimal /clp:nosummary /nodeReuse:false /bl:!__BuildLog!^ /p:PortableBuild=true^ - /p:Platform=%__BuildArch% %__CommonMSBuildArgs% %__UnprocessedBuildArgs% + /p:ArchGroup=%__BuildArch% %__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..bd7e893d6ab1b7 100755 --- a/src/coreclr/build.sh +++ b/src/coreclr/build.sh @@ -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:ArchGroup=$__BuildArch local exit_code=$? if [ $exit_code != 0 ]; then diff --git a/src/coreclr/clr.featuredefines.props b/src/coreclr/clr.featuredefines.props index ac15abd310b1c6..a1d89bdf599ab7 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/src/.nuget/Directory.Build.props b/src/coreclr/src/.nuget/Directory.Build.props index bfb235be526792..1f0a6ceadd325d 100644 --- a/src/coreclr/src/.nuget/Directory.Build.props +++ b/src/coreclr/src/.nuget/Directory.Build.props @@ -1,8 +1,7 @@ - - + @@ -21,9 +20,6 @@ win10 $(_parseDistroRid.SubString($(_archRidIndex))) - $(Platform) - $(BuildArch) - $(OSRid) Windows_NT;OSX;Android;Linux;FreeBSD diff --git a/src/coreclr/src/.nuget/Directory.Build.targets b/src/coreclr/src/.nuget/Directory.Build.targets index a20c6f20e2b9ec..89e3160c0742d2 100644 --- a/src/coreclr/src/.nuget/Directory.Build.targets +++ b/src/coreclr/src/.nuget/Directory.Build.targets @@ -32,10 +32,10 @@ - runtimes/$(CrossTargetComponentFolder)_$(Platform)/native + runtimes/$(CrossTargetComponentFolder)_$(ArchGroup)/native - tools/$(CrossTargetComponentFolder)_$(Platform) + tools/$(CrossTargetComponentFolder)_$(ArchGroup) diff --git a/src/coreclr/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Linux.Microsoft.NETCore.Runtime.CoreCLR.props b/src/coreclr/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Linux.Microsoft.NETCore.Runtime.CoreCLR.props index f5ea97eb0ebafd..2634b8d1ed3a00 100644 --- a/src/coreclr/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Linux.Microsoft.NETCore.Runtime.CoreCLR.props +++ b/src/coreclr/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Linux.Microsoft.NETCore.Runtime.CoreCLR.props @@ -1,10 +1,10 @@ - <_PlatformDoesNotSupportCreatedump Condition="'$(Platform)' == 'x86'">true + <_PlatformDoesNotSupportCreatedump Condition="'$(ArchGroup)' == 'x86'">true <_PlatformDoesNotSupportCreatedump Condition="'$(_runtimeOSFamily)' == 'tizen'">true <_PlatformDoesNotSupportEventTrace Condition="'$(_runtimeOSFamily)' == 'tizen'">true - <_PlatformDoesNotSupportEventTrace Condition="'$(Platform)' == 'x86'">true + <_PlatformDoesNotSupportEventTrace Condition="'$(ArchGroup)' == 'x86'">true 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..7394c28f746008 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 @@ -2,8 +2,8 @@ $(MinOSForArch)-$(PackagePlatform) - $(Platform) - amd64 + $(ArchGroup) + amd64 $(CrossTargetComponentFolder) amd64 _$(LongNamePlatform)_$(LongNamePlatform)_$(FileVersion) @@ -21,7 +21,7 @@ runtimes\$(PackageTargetRuntime)\native - + @@ -42,7 +42,7 @@ - tools\$(CrossTargetComponentFolder)_$(Platform)\%(FileName)$(CrossTargetLongNameSuffix)%(Extension) + tools\$(CrossTargetComponentFolder)_$(ArchGroup)\%(FileName)$(CrossTargetLongNameSuffix)%(Extension) diff --git a/src/coreclr/src/.nuget/builds.targets b/src/coreclr/src/.nuget/builds.targets index d58f010d3939b8..c5e07d82f9988c 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 2b292eaf6ba57b..2e28e6f93917be 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>$(OSGroup.ToLower())-$(BuildArch.ToLower()) + <_BuildOSArchLowercase>$(OSGroup.ToLower())-$(ArchGroup.ToLower()) diff --git a/src/coreclr/src/.nuget/packages.builds b/src/coreclr/src/.nuget/packages.builds index fa33f6a2a88eae..e0a816937333f3 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 a3e32dbdb13479..39d295604aec36 100644 --- a/src/coreclr/src/.nuget/packaging.props +++ b/src/coreclr/src/.nuget/packaging.props @@ -1,17 +1,13 @@ - - $(MSBuildThisFileDirectory)/descriptions.json - $(CoreClrProjectRoot)/LICENSE.TXT - $(CoreClrProjectRoot)/THIRD-PARTY-NOTICES.TXT - + $(MSBuildThisFileDirectory)descriptions.json + $(RepoRoot)LICENSE.TXT + $(RepoRoot)THIRD-PARTY-NOTICES.TXT https://go.microsoft.com/fwlink/?LinkID=799421 - https://dot.net - - $(Platform) + $(ArchGroup) x64 win7 win8 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 5e12a5f853647a..8166fb7e8c87a8 100644 --- a/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj +++ b/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj @@ -6,10 +6,9 @@ true false false - netcoreapp2.1 + $(NetCoreAppCurrent) + netcoreapp3.0 - - Portable true @@ -31,9 +30,6 @@ - $(BuildType) - $(BuildArch) - arm true false @@ -51,8 +47,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 @@ -318,8 +304,8 @@ - + !Exists('$(ArtifactsObjDir)coreclr\Eventing\$(ArchGroup)\$(ConfigurationGroup)\NativeRuntimeEventSource.cs')"/> + src\System\Diagnostics\Eventing\Generated\NativeRuntimeEventSource.cs diff --git a/src/coreclr/src/build.proj b/src/coreclr/src/build.proj index 4cf380346a271d..88e72e91bdf3db 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\$(ArchGroup)" /> true - false + false diff --git a/src/coreclr/src/gc/sample/GCSample.vcxproj b/src/coreclr/src/gc/sample/GCSample.vcxproj index 98dadcad54e3ca..efca083a74c42e 100644 --- a/src/coreclr/src/gc/sample/GCSample.vcxproj +++ b/src/coreclr/src/gc/sample/GCSample.vcxproj @@ -17,13 +17,13 @@ 10.0 - + Application true v142 Unicode - + Application false v142 @@ -33,20 +33,20 @@ - - + + - - + + - + true - + false - + Use Level3 @@ -61,7 +61,7 @@ true - + Level3 Use diff --git a/src/coreclr/src/scripts/scripts.pyproj b/src/coreclr/src/scripts/scripts.pyproj index c0b7bef6415e5f..ce5c6e4b070ada 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} @@ -15,8 +15,8 @@ --man c:\src\coreclr\src\vm\clretwall.man --intermediate c:\work\runtimeeventsource False - - + + 10.0 diff --git a/src/coreclr/src/tools/GCLogParser/parse-hb-log.csproj b/src/coreclr/src/tools/GCLogParser/parse-hb-log.csproj index 940cb96f0ea3bc..627eeb5ed973f9 100644 --- a/src/coreclr/src/tools/GCLogParser/parse-hb-log.csproj +++ b/src/coreclr/src/tools/GCLogParser/parse-hb-log.csproj @@ -2,8 +2,8 @@ - Debug - AnyCPU + Debug + AnyCPU {6AE26CD6-C971-48D6-8C03-2FFA272B942C} Exe parse_hb_log @@ -13,7 +13,7 @@ true true - + AnyCPU true full @@ -23,7 +23,7 @@ prompt 4 - + AnyCPU pdbonly true @@ -32,7 +32,7 @@ prompt 4 - + true artifacts\x64\Debug\ DEBUG;TRACE @@ -42,7 +42,7 @@ MinimumRecommendedRules.ruleset true - + artifacts\x64\Release\ TRACE true 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..9fcc9987ee0f52 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,9 @@  - Library - ILCompiler.DependencyAnalysisFramework - ILCompiler.DependencyAnalysisFramework netstandard1.3 false x64;x86 - $(BuildArch) + $(ArchGroup) false - - true - false - full - $(DefineConstants);DEBUG;TRACE;XUNIT_PERF - - - true - true - pdbonly - $(DefineConstants);TRACE;XUNIT_PERF - - - true - true - full - $(DefineConstants);DEBUG;TRACE;XUNIT_PERF - - false diff --git a/src/coreclr/tests/bringup_runtest.sh b/src/coreclr/tests/bringup_runtest.sh index 916589f10c6ff9..4a88de4fb455f0 100755 --- a/src/coreclr/tests/bringup_runtest.sh +++ b/src/coreclr/tests/bringup_runtest.sh @@ -489,7 +489,7 @@ function create_testhost echo "${dotnetExe} $resetCommandArgs" "${dotnetExe}" $resetCommandArgs - buildCommandArgs=("msbuild ${coreFXTestSetupUtility} /p:OutputPath=${coreFXTestSetupUtilityOutputPath} /p:Platform=${_arch} /p:Configuration=Release") + buildCommandArgs=("msbuild ${coreFXTestSetupUtility} /p:OutputPath=${coreFXTestSetupUtilityOutputPath} /p:ArchGroup=${_arch} /p:ConfigurationGroup=Release") echo "${dotnetExe} $buildCommandArgs" "${dotnetExe}" $buildCommandArgs diff --git a/src/coreclr/tests/build.proj b/src/coreclr/tests/build.proj index 4f2d7e8ef18403..7c015035776226 100644 --- a/src/coreclr/tests/build.proj +++ b/src/coreclr/tests/build.proj @@ -44,7 +44,7 @@ - <_ConfigurationProperties>/p:OSGroup=$(OSGroup) /p:BuildArch=$(BuildArch) /p:BuildType=$(BuildType) + <_ConfigurationProperties>/p:OSGroup=$(OSGroup) /p:ArchGroup=$(ArchGroup) /p:ConfigurationGroup=$(ConfigurationGroup) "$(DotNetTool)" restore $(RestoreProj) $(PackageVersionArg) /p:SetTFMForRestore=true $(_ConfigurationProperties) "$(DotNetTool)" restore -r $(__DistroRid) $(RestoreProj) $(PackageVersionArg) /p:SetTFMForRestore=true $(_ConfigurationProperties) diff --git a/src/coreclr/tests/helixpublishwitharcade.proj b/src/coreclr/tests/helixpublishwitharcade.proj index c903381a4e9731..746d3ff64a6029 100644 --- a/src/coreclr/tests/helixpublishwitharcade.proj +++ b/src/coreclr/tests/helixpublishwitharcade.proj @@ -15,9 +15,9 @@ <_PropertiesToPass> - BuildArch=$(BuildArch); + ArchGroup=$(ArchGroup); OSGroup=$(OSGroup); - __BuildType=$(__BuildType); + ConfigurationGroup=$(ConfigurationGroup); Creator=$(_Creator); HelixAccessToken=$(_HelixAccessToken); HelixBuild=$(_HelixBuild); @@ -168,17 +168,17 @@ true true true - $(BuildArch) - $(BuildType) - $(BuildType)-$(Scenario) + $(ArchGroup) + $(ConfigurationGroup) + $(ConfigurationGroup)-$(Scenario) false false false false R2R R2R-CG2 - $(TestRunNamePrefix)$(OSGroup) $(BuildArch) $(BuildType) @ - $(TestRunNamePrefix)$(OSGroup) $(BuildArch) $(BuildType) $(Scenario) @ + $(TestRunNamePrefix)$(OSGroup) $(ArchGroup) $(ConfigurationGroup) @ + $(TestRunNamePrefix)$(OSGroup) $(ArchGroup) $(ConfigurationGroup) $(Scenario) @ $([System.TimeSpan]::FromMinutes($(TimeoutPerTestInMinutes)).TotalMilliseconds) true <_XUnitParallelMode>collections diff --git a/src/coreclr/tests/issues.targets b/src/coreclr/tests/issues.targets index aaf9d7057cda49..1b5e62b5401ad6 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/publishdependency.targets b/src/coreclr/tests/publishdependency.targets index 37f047464657a8..6afe488f5a3df5 100644 --- a/src/coreclr/tests/publishdependency.targets +++ b/src/coreclr/tests/publishdependency.targets @@ -6,7 +6,7 @@ - $(BuildArch) + $(ArchGroup) x64 win7 win8 diff --git a/src/coreclr/tests/runtest.cmd b/src/coreclr/tests/runtest.cmd index 7d5fd923888511..2d938d98bff705 100644 --- a/src/coreclr/tests/runtest.cmd +++ b/src/coreclr/tests/runtest.cmd @@ -197,7 +197,7 @@ exit /b %ERRORLEVEL% :: The issue is that we extend the build with our own targets which :: means that that rebuilding cannot successfully delete the task :: assembly. -set __msbuildCommonArgs=/nologo /nodeReuse:false %__msbuildExtraArgs% /p:Platform=%__MSBuildBuildArch% +set __msbuildCommonArgs=/nologo /nodeReuse:false %__msbuildExtraArgs% /p:ArchGroup=%__MSBuildBuildArch% if not defined __Sequential ( set __msbuildCommonArgs=%__msbuildCommonArgs% /maxcpucount diff --git a/src/coreclr/tests/runtest.sh b/src/coreclr/tests/runtest.sh index 737de857a2b52a..909597734c8725 100755 --- a/src/coreclr/tests/runtest.sh +++ b/src/coreclr/tests/runtest.sh @@ -100,7 +100,7 @@ function create_testhost echo "${dotnetExe} $resetCommandArgs" "${dotnetExe}" $resetCommandArgs - buildCommandArgs=("msbuild ${coreFXTestSetupUtility} /p:OutputPath=${coreFXTestSetupUtilityOutputPath} /p:Platform=${_arch} /p:Configuration=Release") + buildCommandArgs=("msbuild ${coreFXTestSetupUtility} /p:OutputPath=${coreFXTestSetupUtilityOutputPath} /p:ArchGroup=${_arch} /p:ConfigurationGroup=Release") echo "${dotnetExe} $buildCommandArgs" "${dotnetExe}" $buildCommandArgs 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 94604bf0ee4813..66ead059c43abe 100644 --- a/src/coreclr/tests/src/Common/test_dependencies/test_dependencies.csproj +++ b/src/coreclr/tests/src/Common/test_dependencies/test_dependencies.csproj @@ -7,7 +7,6 @@ true true win-arm;win-arm64;win-x64;win-x86;$(TargetRid) - $(BuildArch) true Release $(TestSourceDir)Common\test_dependencies\obj\project.assets.json @@ -20,7 +19,7 @@ - + diff --git a/src/coreclr/tests/src/Directory.Build.targets b/src/coreclr/tests/src/Directory.Build.targets index 7e51c2118648d0..a1fd9e039a80cc 100644 --- a/src/coreclr/tests/src/Directory.Build.targets +++ b/src/coreclr/tests/src/Directory.Build.targets @@ -53,14 +53,7 @@ <_CLRTestNeedsProjectToRun Condition=" '$(_CLRTestNeedsToRun)' and '!$(_CLRTestBuildsExecutable)' ">true - - - None - - - + false @@ -176,7 +169,7 @@ BeforeTargets="Build" > - + @@ -223,7 +216,6 @@ $(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..1ec863fe44276a 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 c0d2e0cca49811..27f8c1b7e19569 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 e8f3e8859df9d7..507cfdf8115472 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 e1bec38356cfb5..efa5b3430c1f81 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..ca0a5b31373430 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('$(ArchGroup)').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 c7a0eca8019f6b..a79d99d014d27c 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 3734d927eab1de..9661883d4568f9 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 071b9ffda803cb..54c8ad36ba5ae5 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 a0b5921242b071..5ac7a2b47a91fd 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 fb0e9d8c5d4669..8a54f6817b2343 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 231e66ecdd66bf..2c58b5d847a3ba 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 c26170bdc793bf..7bebf44706293d 100644 --- a/src/coreclr/tests/src/Interop/Interop.settings.targets +++ b/src/coreclr/tests/src/Interop/Interop.settings.targets @@ -20,10 +20,10 @@ + Condition="'$(TargetsWindows)' == 'true' And ('$(ConfigurationGroup)' == 'Debug' Or '$(ConfigurationGroup)' == 'Checked') And '$(CopyDebugCRTDllsToOutputDirectory)' == 'true'" > - - - + + + 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 d94f3ce044d291..95f9de3ec363c4 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..72bfe64e73d7d1 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..72bfe64e73d7d1 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..72bfe64e73d7d1 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..72bfe64e73d7d1 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 2f5a590fc443e4..d69d455e257e75 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 ab3b41778a50fa..17e0cf0f848c3b 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..d627b23f9ac4cd 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..3719e3bdb16a33 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..6bbb733cfae30b 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..5625fd927e9687 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..ef56c9164830d1 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..92e9b4cf53ed27 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 5f87f876ad48e5..b221b244726177 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 4d335ba36f1ce1..c3b630d079744d 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 2fd748ff617d87..6baeba2a28b324 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..f157f51df54320 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..5d9e4e58703ab2 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..e291635a2b337b 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..d9ed48c715c4f3 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..b9b0547639826a 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..36be03b67eddb1 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 c6f2f71fb4da0f..d4a70921b6f48f 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 c1a989ff64dc93..72661a406d4c40 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 902e992a37987f..c9c9758f74d826 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 - + BIT32;$(DefineConstants) diff --git a/src/coreclr/tests/src/JIT/SIMD/VectorConvert_ro.csproj b/src/coreclr/tests/src/JIT/SIMD/VectorConvert_ro.csproj index 9fa4314423cad6..59839d0cd09229 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 - + BIT32;$(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 7c2ebaf89b8333..fa7ced3b707eef 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 3ee4e7975851fc..f10b60687f9d0e 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 542bac8936aa10..65e49e83c9bed2 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 4839b999f344d3..ac0be4f2ed1a28 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/performance/Scenario/JitBench/unofficial_dotnet/JitBench.csproj b/src/coreclr/tests/src/performance/Scenario/JitBench/unofficial_dotnet/JitBench.csproj index fbf4bb59fcba65..64a8b98aab684f 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 @@ -3,8 +3,6 @@ - AnyCPU - Release Exe netcoreapp2.0 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 3133e130c8484d..c18e1a7ee81f5d 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 962adf7d5ee90d..eb201e02c3b07c 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 9aa236d17cdcb0..4843145ecf22d9 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 44bafca915f260..d029a45bbdb132 100644 --- a/src/coreclr/tests/src/readytorun/r2rdump/R2RDumpTest.csproj +++ b/src/coreclr/tests/src/readytorun/r2rdump/R2RDumpTest.csproj @@ -8,7 +8,7 @@ true - true + true From d398b71297c70c1480dcd3328318d52c5f4f41cd Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 14 Jan 2020 20:02:42 +0100 Subject: [PATCH 13/21] Share packaging props --- Directory.Build.props | 6 +++++- eng/packaging.props | 6 +----- src/coreclr/Directory.Build.props | 5 ----- src/coreclr/src/.nuget/packaging.props | 3 --- src/installer/pkg/Directory.Build.props | 7 +------ 5 files changed, 7 insertions(+), 20 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 1d3d29427a0fac..d81bf726956dc8 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -62,9 +62,13 @@ 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)LICENSE.TXT + $(RepoRoot)THIRD-PARTY-NOTICES.TXT + https://go.microsoft.com/fwlink/?LinkID=799421 + $(CopyrightNetFoundation) + MIT $(Platform) x64 diff --git a/src/coreclr/Directory.Build.props b/src/coreclr/Directory.Build.props index 64b600c1063505..23205e02ea6c96 100644 --- a/src/coreclr/Directory.Build.props +++ b/src/coreclr/Directory.Build.props @@ -158,11 +158,6 @@ strict;nullablePublicOnly - - $(CopyrightNetFoundation) - MIT - - diff --git a/src/coreclr/src/.nuget/packaging.props b/src/coreclr/src/.nuget/packaging.props index 39d295604aec36..f6784dd3f0e6fe 100644 --- a/src/coreclr/src/.nuget/packaging.props +++ b/src/coreclr/src/.nuget/packaging.props @@ -2,9 +2,6 @@ $(MSBuildThisFileDirectory)descriptions.json - $(RepoRoot)LICENSE.TXT - $(RepoRoot)THIRD-PARTY-NOTICES.TXT - https://go.microsoft.com/fwlink/?LinkID=799421 $(ArchGroup) 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 From cbf68ec94dd7722248b64c1fdf9193868ea80c23 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 14 Jan 2020 20:16:54 +0100 Subject: [PATCH 14/21] Remove rhel6 instance --- src/coreclr/Directory.Build.props | 1 - 1 file changed, 1 deletion(-) diff --git a/src/coreclr/Directory.Build.props b/src/coreclr/Directory.Build.props index 23205e02ea6c96..76dfc3b601fb4e 100644 --- a/src/coreclr/Directory.Build.props +++ b/src/coreclr/Directory.Build.props @@ -148,7 +148,6 @@ --> $(TargetRid) - $(TargetRid) From aad6adc44b5f8bb6c92da35a57a848519dfaa478 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 14 Jan 2020 20:36:20 +0100 Subject: [PATCH 15/21] Use PackageLicenseExpression over PackageLicenseFile --- Directory.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Build.props b/Directory.Build.props index d81bf726956dc8..91fab1f3f2c088 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -63,8 +63,8 @@ git://github.com/dotnet/runtime https://github.com/dotnet/runtime $([MSBuild]::NormalizePath('$(LibrariesProjectRoot)', 'pkg', 'Microsoft.NETCore.Platforms', 'runtime.json')) + $(RepoRoot)LICENSE.TXT - $(RepoRoot)LICENSE.TXT $(RepoRoot)THIRD-PARTY-NOTICES.TXT https://go.microsoft.com/fwlink/?LinkID=799421 $(CopyrightNetFoundation) From d38b14e4f30b3f133c59a642d82cd6c9859b7dc2 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 14 Jan 2020 21:44:55 +0100 Subject: [PATCH 16/21] More packaging cleanup --- eng/packaging.props | 5 ----- src/coreclr/src/.nuget/packaging.props | 5 ----- src/installer/managed/CommonManaged.props | 18 ++---------------- 3 files changed, 2 insertions(+), 26 deletions(-) diff --git a/eng/packaging.props b/eng/packaging.props index 0241c5a13a1a01..13259e646c1696 100644 --- a/eng/packaging.props +++ b/eng/packaging.props @@ -50,11 +50,6 @@ - - - true - true diff --git a/src/coreclr/src/.nuget/packaging.props b/src/coreclr/src/.nuget/packaging.props index f6784dd3f0e6fe..90e06ba7cae1ad 100644 --- a/src/coreclr/src/.nuget/packaging.props +++ b/src/coreclr/src/.nuget/packaging.props @@ -23,11 +23,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 @@ - - - From 5d29e5485405da0872f050dc96b63c6b1a8ebfb6 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 16 Jan 2020 09:44:36 +0100 Subject: [PATCH 17/21] Remove default set properties --- src/coreclr/build-packages.cmd | 2 +- src/coreclr/build-packages.sh | 2 +- src/coreclr/build-test.cmd | 4 ++-- src/coreclr/build-test.sh | 4 ++-- src/coreclr/build.cmd | 7 +++---- src/coreclr/build.sh | 5 ++--- 6 files changed, 11 insertions(+), 13 deletions(-) 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 29745a2836269a..236f8a7db30bc2 100644 --- a/src/coreclr/build-test.cmd +++ b/src/coreclr/build-test.cmd @@ -283,7 +283,7 @@ 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^ !__Logging! %__CommonMSBuildArgs% %__PriorityArg% %__UnprocessedBuildArgs% @@ -446,7 +446,7 @@ 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^ !__Logging! %__CommonMSBuildArgs% %RuntimeIdArg% %__PriorityArg% %__UnprocessedBuildArgs% if errorlevel 1 ( diff --git a/src/coreclr/build-test.sh b/src/coreclr/build-test.sh index 6a282f97a87881..4791a32fe948d0 100755 --- a/src/coreclr/build-test.sh +++ b/src/coreclr/build-test.sh @@ -397,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}") @@ -431,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 2b8d43cacafb74..e08a047dba2d72 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. @@ -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:ArchGroup=%__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 bd7e893d6ab1b7..450f5e661677f2 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 @@ -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 From d83b33ee08c9d3bf7f5321d00ab98c9dc39d8a84 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 16 Jan 2020 09:45:22 +0100 Subject: [PATCH 18/21] Revert some platform property changes --- src/coreclr/Directory.Build.props | 1 + src/coreclr/clr.featuredefines.props | 12 ++++---- src/coreclr/src/.nuget/Directory.Build.props | 30 ++++++++++--------- .../src/.nuget/Directory.Build.targets | 4 +-- ...ux.Microsoft.NETCore.Runtime.CoreCLR.props | 4 +-- ...NT.Microsoft.NETCore.Runtime.CoreCLR.props | 6 ++-- src/coreclr/src/.nuget/packaging.props | 2 +- .../ReadyToRun.SuperIlc.csproj | 21 ++++--------- ...ompiler.DependencyAnalysisFramework.csproj | 1 - .../ILCompiler.ReadyToRun.csproj | 1 - .../ILCompiler.Reflection.ReadyToRun.csproj | 3 -- .../ILCompiler.TypeSystem.ReadyToRun.csproj | 14 ++------- .../crossgen2/crossgen2/crossgen2.csproj | 6 +--- src/coreclr/src/tools/r2rdump/R2RDump.csproj | 17 ++++------- .../unofficial_dotnet/Directory.Build.props | 6 ---- .../unofficial_dotnet/Directory.Build.targets | 6 ---- .../unofficial_dotnet/JitBench.csproj | 3 +- 17 files changed, 47 insertions(+), 90 deletions(-) delete mode 100644 src/coreclr/tests/src/performance/Scenario/JitBench/unofficial_dotnet/Directory.Build.props delete mode 100644 src/coreclr/tests/src/performance/Scenario/JitBench/unofficial_dotnet/Directory.Build.targets diff --git a/src/coreclr/Directory.Build.props b/src/coreclr/Directory.Build.props index 76dfc3b601fb4e..301f4e579c86a9 100644 --- a/src/coreclr/Directory.Build.props +++ b/src/coreclr/Directory.Build.props @@ -9,6 +9,7 @@ x64 arm $(ArchGroup) + $(ArchGroup) $(__BuildOS) Windows_NT diff --git a/src/coreclr/clr.featuredefines.props b/src/coreclr/clr.featuredefines.props index a1d89bdf599ab7..79be5e8789eb86 100644 --- a/src/coreclr/clr.featuredefines.props +++ b/src/coreclr/clr.featuredefines.props @@ -19,15 +19,15 @@ true true - true + true true true - true - true - true + true + true + true true true true @@ -36,8 +36,8 @@ true true true - true - true + true + true diff --git a/src/coreclr/src/.nuget/Directory.Build.props b/src/coreclr/src/.nuget/Directory.Build.props index 1f0a6ceadd325d..963ff29d415581 100644 --- a/src/coreclr/src/.nuget/Directory.Build.props +++ b/src/coreclr/src/.nuget/Directory.Build.props @@ -19,7 +19,9 @@ $(_parseDistroRid.SubString(0, $(_distroRidIndex))) win10 - $(_parseDistroRid.SubString($(_archRidIndex))) + $(_parseDistroRid.SubString($(_archRidIndex))) + $(Platform) + $(ArchGroup) $(OSRid) Windows_NT;OSX;Android;Linux;FreeBSD @@ -73,42 +75,42 @@ - win-$(ArchGroup) + win-$(ArchGroupRid) - osx.10.12-$(ArchGroup) + osx.10.12-$(ArchGroupRid) - osx-$(ArchGroup) + osx-$(ArchGroupRid) - freebsd.11-$(ArchGroup) + freebsd.11-$(ArchGroupRid) - freebsd-$(ArchGroup) + freebsd-$(ArchGroupRid) - android.21-$(ArchGroup) + android.21-$(ArchGroupRid) - android-$(ArchGroup) + android-$(ArchGroupRid) - $(OSRid)-$(ArchGroup) + $(OSRid)-$(ArchGroupRid) - linux-$(ArchGroup) + linux-$(ArchGroupRid) - $(RuntimeOS)-$(ArchGroup) + $(RuntimeOS)-$(ArchGroupRid) - linux-$(ArchGroup) + linux-$(ArchGroupRid) @@ -181,8 +183,8 @@ - amd64 - $(ArchGroup) + amd64 + $(ArchGroupRid) diff --git a/src/coreclr/src/.nuget/Directory.Build.targets b/src/coreclr/src/.nuget/Directory.Build.targets index 89e3160c0742d2..a20c6f20e2b9ec 100644 --- a/src/coreclr/src/.nuget/Directory.Build.targets +++ b/src/coreclr/src/.nuget/Directory.Build.targets @@ -32,10 +32,10 @@ - runtimes/$(CrossTargetComponentFolder)_$(ArchGroup)/native + runtimes/$(CrossTargetComponentFolder)_$(Platform)/native - tools/$(CrossTargetComponentFolder)_$(ArchGroup) + tools/$(CrossTargetComponentFolder)_$(Platform) diff --git a/src/coreclr/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Linux.Microsoft.NETCore.Runtime.CoreCLR.props b/src/coreclr/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Linux.Microsoft.NETCore.Runtime.CoreCLR.props index 2634b8d1ed3a00..f5ea97eb0ebafd 100644 --- a/src/coreclr/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Linux.Microsoft.NETCore.Runtime.CoreCLR.props +++ b/src/coreclr/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Linux.Microsoft.NETCore.Runtime.CoreCLR.props @@ -1,10 +1,10 @@ - <_PlatformDoesNotSupportCreatedump Condition="'$(ArchGroup)' == 'x86'">true + <_PlatformDoesNotSupportCreatedump Condition="'$(Platform)' == 'x86'">true <_PlatformDoesNotSupportCreatedump Condition="'$(_runtimeOSFamily)' == 'tizen'">true <_PlatformDoesNotSupportEventTrace Condition="'$(_runtimeOSFamily)' == 'tizen'">true - <_PlatformDoesNotSupportEventTrace Condition="'$(ArchGroup)' == 'x86'">true + <_PlatformDoesNotSupportEventTrace Condition="'$(Platform)' == 'x86'">true 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 7394c28f746008..54b29bf9e40695 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 @@ -2,8 +2,8 @@ $(MinOSForArch)-$(PackagePlatform) - $(ArchGroup) - amd64 + $(Platform) + amd64 $(CrossTargetComponentFolder) amd64 _$(LongNamePlatform)_$(LongNamePlatform)_$(FileVersion) @@ -42,7 +42,7 @@ - tools\$(CrossTargetComponentFolder)_$(ArchGroup)\%(FileName)$(CrossTargetLongNameSuffix)%(Extension) + tools\$(CrossTargetComponentFolder)_$(Platform)\%(FileName)$(CrossTargetLongNameSuffix)%(Extension) diff --git a/src/coreclr/src/.nuget/packaging.props b/src/coreclr/src/.nuget/packaging.props index 90e06ba7cae1ad..2200e7a629959c 100644 --- a/src/coreclr/src/.nuget/packaging.props +++ b/src/coreclr/src/.nuget/packaging.props @@ -4,7 +4,7 @@ $(MSBuildThisFileDirectory)descriptions.json - $(ArchGroup) + $(Platform) x64 win7 win8 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 9fcc9987ee0f52..5852c07acd8c76 100644 --- a/src/coreclr/src/tools/crossgen2/ILCompiler.DependencyAnalysisFramework/ILCompiler.DependencyAnalysisFramework.csproj +++ b/src/coreclr/src/tools/crossgen2/ILCompiler.DependencyAnalysisFramework/ILCompiler.DependencyAnalysisFramework.csproj @@ -3,7 +3,6 @@ netstandard1.3 false x64;x86 - $(ArchGroup) false - 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 64a8b98aab684f..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,10 +1,9 @@ - - Exe netcoreapp2.0 + false .NETCoreApp,Version=v2.0 From 5a26d738479c3691f71dfbd25bdc01eff065de89 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 16 Jan 2020 10:48:56 +0100 Subject: [PATCH 19/21] Remove ArchGroup property in favor of Platform --- src/coreclr/Directory.Build.props | 29 ++-- src/coreclr/build.cmd | 2 +- src/coreclr/build.sh | 2 +- src/coreclr/src/.nuget/Directory.Build.props | 31 ++-- ...NT.Microsoft.NETCore.Runtime.CoreCLR.props | 2 +- src/coreclr/src/.nuget/builds.targets | 2 +- src/coreclr/src/.nuget/optdata/optdata.csproj | 6 +- src/coreclr/src/.nuget/packages.builds | 2 +- .../System.Private.CoreLib.csproj | 16 +-- .../System.Private.CoreLib.sln | 18 +-- src/coreclr/src/build.proj | 8 +- src/coreclr/src/gc/sample/GCSample.vcxproj | 20 +-- src/coreclr/src/jit/jit.settings.targets | 8 +- .../src/tools/GCLogParser/parse-hb-log.csproj | 10 +- src/coreclr/tests/bringup_runtest.sh | 2 +- src/coreclr/tests/build.proj | 2 +- src/coreclr/tests/helixpublishwitharcade.proj | 12 +- src/coreclr/tests/issues.targets | 18 +-- src/coreclr/tests/publishdependency.targets | 3 +- src/coreclr/tests/runtest.cmd | 2 +- src/coreclr/tests/runtest.sh | 134 ------------------ .../test_dependencies.csproj | 2 +- .../GetAllocatedBytesForCurrentThread.csproj | 4 +- .../GC/API/GC/GetTotalAllocatedBytes.csproj | 4 +- .../Regressions/v2.0-rtm/494226/494226.csproj | 2 +- .../Scenarios/ServerModel/servermodel.csproj | 2 +- .../InjectedCode/InjectedCode.csproj | 3 +- .../CopyConstructorMarshaler.csproj | 2 +- .../FixupCallsHostWhenLoaded.csproj | 2 +- .../LoadIjwFromModuleHandle.csproj | 2 +- .../ManagedCallingNative.csproj | 2 +- .../NativeCallingManaged.csproj | 2 +- .../NativeVarargs/NativeVarargsTest.csproj | 4 +- .../src/Interop/Interop.settings.targets | 6 +- .../Bindings/NETClientBindings.csproj | 2 +- .../PREFIX/unaligned/1/arglist.ilproj | 12 +- .../PREFIX/unaligned/2/arglist.ilproj | 12 +- .../PREFIX/unaligned/4/arglist.ilproj | 12 +- .../Directed/PREFIX/volatile/1/arglist.ilproj | 12 +- .../JIT/Directed/StructABI/StructABI.csproj | 2 - .../Directed/VectorABI/VectorMgdMgd_ro.csproj | 4 +- .../src/JIT/Directed/arglist/vararg.csproj | 4 - .../Old/Conformance_Base/conv_ovf_i8_i.ilproj | 5 +- .../_il_dbgi_array_merge.ilproj | 12 +- .../ELEMENT_TYPE_IU/_il_dbgsizeof.ilproj | 12 +- .../_il_dbgu_array_merge.ilproj | 12 +- .../_il_reli_array_merge.ilproj | 12 +- .../ELEMENT_TYPE_IU/_il_relsizeof.ilproj | 12 +- .../_il_relu_array_merge.ilproj | 12 +- .../JIT/Methodical/fp/exgen/10w5d_cs_d.csproj | 4 +- .../JIT/Methodical/fp/exgen/10w5d_cs_r.csproj | 4 +- .../Methodical/tailcall_v4/hijacking.ilproj | 8 +- .../xxobj/sizeof/_il_dbgsizeof.ilproj | 6 +- .../xxobj/sizeof/_il_dbgsizeof32.ilproj | 6 +- .../xxobj/sizeof/_il_dbgsizeof64.ilproj | 6 +- .../xxobj/sizeof/_il_relsizeof.ilproj | 6 +- .../xxobj/sizeof/_il_relsizeof32.ilproj | 6 +- .../xxobj/sizeof/_il_relsizeof64.ilproj | 6 +- .../DevDiv_278523/DevDiv_278523.ilproj | 12 +- .../V2.0-Beta2/b311420/b311420.csproj | 4 +- .../tests/src/JIT/SIMD/VectorConvert_r.csproj | 6 +- .../src/JIT/SIMD/VectorConvert_ro.csproj | 6 +- .../jit64/opt/cg/cgstress/CgStress1_d.csproj | 6 +- .../jit64/opt/cg/cgstress/CgStress1_r.csproj | 6 +- .../src/JIT/jit64/opt/cse/hugeexpr1.csproj | 4 +- .../src/JIT/superpmi/superpmicollect.csproj | 2 +- .../coreroot_determinism.csproj | 2 +- .../crossgen2/crossgen2smoke.csproj | 2 +- .../determinism/crossgen2determinism.csproj | 2 +- .../src/readytorun/r2rdump/R2RDumpTest.csproj | 2 +- 70 files changed, 199 insertions(+), 410 deletions(-) diff --git a/src/coreclr/Directory.Build.props b/src/coreclr/Directory.Build.props index 301f4e579c86a9..7677e537e85e76 100644 --- a/src/coreclr/Directory.Build.props +++ b/src/coreclr/Directory.Build.props @@ -4,12 +4,10 @@ - $(__BuildArch) - x64 - x64 - arm - $(ArchGroup) - $(ArchGroup) + $(__BuildArch) + x64 + arm + $(Platform) $(__BuildOS) Windows_NT @@ -55,6 +53,9 @@ Portable true + + Debug;Release;Checked + x64;x86;arm;arm64 false @@ -80,28 +81,28 @@ TargetsWindows property may already be set. Only set the property if it is not already defined --> true - win-$(ArchGroup) + win-$(Platform) true true - ubuntu.14.04-$(ArchGroup) + ubuntu.14.04-$(Platform) true true - osx.10.12-$(ArchGroup) + osx.10.12-$(Platform) true true - ubuntu.14.04-$(ArchGroup) + ubuntu.14.04-$(Platform) @@ -120,13 +121,13 @@ $(TestNugetRuntimeId) - x64 - x86 - x64 + x64 + x86 + x64 - $(OSGroup).$(ArchGroup).$(ConfigurationGroup) + $(OSGroup).$(Platform).$(ConfigurationGroup) $(ArtifactsBinDir)coreclr\$(OSPlatformConfig)\ $(MSBuildThisFileDirectory)src\ diff --git a/src/coreclr/build.cmd b/src/coreclr/build.cmd index e08a047dba2d72..d36031f6217393 100644 --- a/src/coreclr/build.cmd +++ b/src/coreclr/build.cmd @@ -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:ArchGroup=%__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. diff --git a/src/coreclr/build.sh b/src/coreclr/build.sh index 450f5e661677f2..b7481b34f07903 100755 --- a/src/coreclr/build.sh +++ b/src/coreclr/build.sh @@ -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:ArchGroup=$__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 diff --git a/src/coreclr/src/.nuget/Directory.Build.props b/src/coreclr/src/.nuget/Directory.Build.props index 963ff29d415581..b58d56dbc9a32f 100644 --- a/src/coreclr/src/.nuget/Directory.Build.props +++ b/src/coreclr/src/.nuget/Directory.Build.props @@ -19,9 +19,8 @@ $(_parseDistroRid.SubString(0, $(_distroRidIndex))) win10 - $(_parseDistroRid.SubString($(_archRidIndex))) - $(Platform) - $(ArchGroup) + $(_parseDistroRid.SubString($(_archRidIndex))) + $(Platform) $(OSRid) Windows_NT;OSX;Android;Linux;FreeBSD @@ -75,42 +74,42 @@ - win-$(ArchGroupRid) + win-$(ArchGroup) - osx.10.12-$(ArchGroupRid) + osx.10.12-$(ArchGroup) - osx-$(ArchGroupRid) + osx-$(ArchGroup) - freebsd.11-$(ArchGroupRid) + freebsd.11-$(ArchGroup) - freebsd-$(ArchGroupRid) + freebsd-$(ArchGroup) - android.21-$(ArchGroupRid) + android.21-$(ArchGroup) - android-$(ArchGroupRid) + android-$(ArchGroup) - $(OSRid)-$(ArchGroupRid) + $(OSRid)-$(ArchGroup) - linux-$(ArchGroupRid) + linux-$(ArchGroup) - $(RuntimeOS)-$(ArchGroupRid) + $(RuntimeOS)-$(ArchGroup) - linux-$(ArchGroupRid) + linux-$(ArchGroup) @@ -183,8 +182,8 @@ - amd64 - $(ArchGroupRid) + amd64 + $(ArchGroup) 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 54b29bf9e40695..9b6b102f93c747 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 @@ -21,7 +21,7 @@ runtimes\$(PackageTargetRuntime)\native - + diff --git a/src/coreclr/src/.nuget/builds.targets b/src/coreclr/src/.nuget/builds.targets index c5e07d82f9988c..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 2e28e6f93917be..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>$(OSGroup.ToLower())-$(ArchGroup.ToLower()) + <_BuildOSArchLowercase>$(OSGroup.ToLower())-$(Platform.ToLower()) diff --git a/src/coreclr/src/.nuget/packages.builds b/src/coreclr/src/.nuget/packages.builds index e0a816937333f3..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/System.Private.CoreLib/System.Private.CoreLib.csproj b/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj index 8166fb7e8c87a8..4bd63c1b81c3c6 100644 --- a/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj +++ b/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj @@ -13,8 +13,6 @@ $(BinDir)IL\ - Debug;Release;Checked - x64;x86;arm;arm64 true true @@ -60,24 +58,24 @@ - + false BIT64;AMD64;$(DefineConstants) - + BIT32;$(DefineConstants) - + BIT32;ARM;$(DefineConstants) - + BIT64;ARM64;$(DefineConstants) $(DefineConstants);_LOGGING - $(DefineConstants);CODE_ANALYSIS + $(DefineConstants);CODE_ANALYSIS @@ -304,8 +302,8 @@ - + !Exists('$(ArtifactsObjDir)coreclr\Eventing\$(Platform)\$(ConfigurationGroup)\NativeRuntimeEventSource.cs')"/> + src\System\Diagnostics\Eventing\Generated\NativeRuntimeEventSource.cs 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 88e72e91bdf3db..e313515f9d7523 100644 --- a/src/coreclr/src/build.proj +++ b/src/coreclr/src/build.proj @@ -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/gc/sample/GCSample.vcxproj b/src/coreclr/src/gc/sample/GCSample.vcxproj index efca083a74c42e..64ddbf9ebfe52e 100644 --- a/src/coreclr/src/gc/sample/GCSample.vcxproj +++ b/src/coreclr/src/gc/sample/GCSample.vcxproj @@ -17,13 +17,13 @@ 10.0 - + Application true v142 Unicode - + Application false v142 @@ -33,20 +33,20 @@ - - + + - - + + - + true - + false - + Use Level3 @@ -61,7 +61,7 @@ true - + Level3 Use diff --git a/src/coreclr/src/jit/jit.settings.targets b/src/coreclr/src/jit/jit.settings.targets index eb9b683662b747..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/tools/GCLogParser/parse-hb-log.csproj b/src/coreclr/src/tools/GCLogParser/parse-hb-log.csproj index 627eeb5ed973f9..6370eb4c091157 100644 --- a/src/coreclr/src/tools/GCLogParser/parse-hb-log.csproj +++ b/src/coreclr/src/tools/GCLogParser/parse-hb-log.csproj @@ -3,7 +3,7 @@ Debug - AnyCPU + AnyCPU {6AE26CD6-C971-48D6-8C03-2FFA272B942C} Exe parse_hb_log @@ -13,7 +13,7 @@ true true - + AnyCPU true full @@ -23,7 +23,7 @@ prompt 4 - + AnyCPU pdbonly true @@ -32,7 +32,7 @@ prompt 4 - + true artifacts\x64\Debug\ DEBUG;TRACE @@ -42,7 +42,7 @@ MinimumRecommendedRules.ruleset true - + artifacts\x64\Release\ TRACE true diff --git a/src/coreclr/tests/bringup_runtest.sh b/src/coreclr/tests/bringup_runtest.sh index 4a88de4fb455f0..e682fccd154a30 100755 --- a/src/coreclr/tests/bringup_runtest.sh +++ b/src/coreclr/tests/bringup_runtest.sh @@ -489,7 +489,7 @@ function create_testhost echo "${dotnetExe} $resetCommandArgs" "${dotnetExe}" $resetCommandArgs - buildCommandArgs=("msbuild ${coreFXTestSetupUtility} /p:OutputPath=${coreFXTestSetupUtilityOutputPath} /p:ArchGroup=${_arch} /p:ConfigurationGroup=Release") + buildCommandArgs=("msbuild ${coreFXTestSetupUtility} /p:OutputPath=${coreFXTestSetupUtilityOutputPath} /p:Platform=${_arch} /p:ConfigurationGroup=Release") echo "${dotnetExe} $buildCommandArgs" "${dotnetExe}" $buildCommandArgs diff --git a/src/coreclr/tests/build.proj b/src/coreclr/tests/build.proj index 7c015035776226..4d4356f09b4f9f 100644 --- a/src/coreclr/tests/build.proj +++ b/src/coreclr/tests/build.proj @@ -44,7 +44,7 @@ - <_ConfigurationProperties>/p:OSGroup=$(OSGroup) /p:ArchGroup=$(ArchGroup) /p:ConfigurationGroup=$(ConfigurationGroup) + <_ConfigurationProperties>/p:OSGroup=$(OSGroup) /p:Platform=$(Platform) /p:ConfigurationGroup=$(ConfigurationGroup) "$(DotNetTool)" restore $(RestoreProj) $(PackageVersionArg) /p:SetTFMForRestore=true $(_ConfigurationProperties) "$(DotNetTool)" restore -r $(__DistroRid) $(RestoreProj) $(PackageVersionArg) /p:SetTFMForRestore=true $(_ConfigurationProperties) diff --git a/src/coreclr/tests/helixpublishwitharcade.proj b/src/coreclr/tests/helixpublishwitharcade.proj index 746d3ff64a6029..6871f0f2ff4a1d 100644 --- a/src/coreclr/tests/helixpublishwitharcade.proj +++ b/src/coreclr/tests/helixpublishwitharcade.proj @@ -15,7 +15,7 @@ <_PropertiesToPass> - ArchGroup=$(ArchGroup); + Platform=$(Platform); OSGroup=$(OSGroup); ConfigurationGroup=$(ConfigurationGroup); Creator=$(_Creator); @@ -168,7 +168,7 @@ true true true - $(ArchGroup) + $(Platform) $(ConfigurationGroup) $(ConfigurationGroup)-$(Scenario) false @@ -177,8 +177,8 @@ false R2R R2R-CG2 - $(TestRunNamePrefix)$(OSGroup) $(ArchGroup) $(ConfigurationGroup) @ - $(TestRunNamePrefix)$(OSGroup) $(ArchGroup) $(ConfigurationGroup) $(Scenario) @ + $(TestRunNamePrefix)$(OSGroup) $(Platform) $(ConfigurationGroup) @ + $(TestRunNamePrefix)$(OSGroup) $(Platform) $(ConfigurationGroup) $(Scenario) @ $([System.TimeSpan]::FromMinutes($(TimeoutPerTestInMinutes)).TotalMilliseconds) true <_XUnitParallelMode>collections @@ -217,8 +217,8 @@ - - + + diff --git a/src/coreclr/tests/issues.targets b/src/coreclr/tests/issues.targets index 1b5e62b5401ad6..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/publishdependency.targets b/src/coreclr/tests/publishdependency.targets index 6afe488f5a3df5..fb8d4ba85c8e0d 100644 --- a/src/coreclr/tests/publishdependency.targets +++ b/src/coreclr/tests/publishdependency.targets @@ -6,8 +6,7 @@ - $(ArchGroup) - x64 + $(Platform) win7 win8 win10 diff --git a/src/coreclr/tests/runtest.cmd b/src/coreclr/tests/runtest.cmd index 2d938d98bff705..7d5fd923888511 100644 --- a/src/coreclr/tests/runtest.cmd +++ b/src/coreclr/tests/runtest.cmd @@ -197,7 +197,7 @@ exit /b %ERRORLEVEL% :: The issue is that we extend the build with our own targets which :: means that that rebuilding cannot successfully delete the task :: assembly. -set __msbuildCommonArgs=/nologo /nodeReuse:false %__msbuildExtraArgs% /p:ArchGroup=%__MSBuildBuildArch% +set __msbuildCommonArgs=/nologo /nodeReuse:false %__msbuildExtraArgs% /p:Platform=%__MSBuildBuildArch% if not defined __Sequential ( set __msbuildCommonArgs=%__msbuildCommonArgs% /maxcpucount diff --git a/src/coreclr/tests/runtest.sh b/src/coreclr/tests/runtest.sh index 909597734c8725..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:ArchGroup=${_arch} /p:ConfigurationGroup=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/src/Common/test_dependencies/test_dependencies.csproj b/src/coreclr/tests/src/Common/test_dependencies/test_dependencies.csproj index 66ead059c43abe..4fc82bc7621345 100644 --- a/src/coreclr/tests/src/Common/test_dependencies/test_dependencies.csproj +++ b/src/coreclr/tests/src/Common/test_dependencies/test_dependencies.csproj @@ -19,7 +19,7 @@ - + diff --git a/src/coreclr/tests/src/GC/API/GC/GetAllocatedBytesForCurrentThread.csproj b/src/coreclr/tests/src/GC/API/GC/GetAllocatedBytesForCurrentThread.csproj index 1ec863fe44276a..7f31581f7b75f5 100644 --- a/src/coreclr/tests/src/GC/API/GC/GetAllocatedBytesForCurrentThread.csproj +++ b/src/coreclr/tests/src/GC/API/GC/GetAllocatedBytesForCurrentThread.csproj @@ -1,9 +1,7 @@ Exe - true - - + 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 27f8c1b7e19569..1520cfa315452d 100644 --- a/src/coreclr/tests/src/GC/API/GC/GetTotalAllocatedBytes.csproj +++ b/src/coreclr/tests/src/GC/API/GC/GetTotalAllocatedBytes.csproj @@ -1,9 +1,7 @@ Exe - true - - + true PdbOnly 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 507cfdf8115472..e8f3e8859df9d7 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 efa5b3430c1f81..e1bec38356cfb5 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 ca0a5b31373430..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('$(ArchGroup)').ToUpper()) + $(DefineConstants);$([System.String]::Copy('$(Platform)').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 a79d99d014d27c..c7a0eca8019f6b 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 9661883d4568f9..3734d927eab1de 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 54c8ad36ba5ae5..071b9ffda803cb 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 5ac7a2b47a91fd..a0b5921242b071 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 8a54f6817b2343..fb0e9d8c5d4669 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 2c58b5d847a3ba..231e66ecdd66bf 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 7bebf44706293d..be9b2469a60326 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 95f9de3ec363c4..d94f3ce044d291 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 72bfe64e73d7d1..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 72bfe64e73d7d1..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 72bfe64e73d7d1..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 72bfe64e73d7d1..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 cd6e89f0f83dcc..de37c63e683217 100644 --- a/src/coreclr/tests/src/JIT/Directed/StructABI/StructABI.csproj +++ b/src/coreclr/tests/src/JIT/Directed/StructABI/StructABI.csproj @@ -2,8 +2,6 @@ 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 d69d455e257e75..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,12 +1,10 @@ Exe - - True True - 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 637aa4e8701680..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 - - 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 17e0cf0f848c3b..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 d627b23f9ac4cd..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 3719e3bdb16a33..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 6bbb733cfae30b..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 5625fd927e9687..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 ef56c9164830d1..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 92e9b4cf53ed27..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 b221b244726177..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 @@ -2,10 +2,8 @@ Exe - true + 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 c3b630d079744d..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 @@ -2,10 +2,8 @@ Exe - true + 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 6baeba2a28b324..99f5216699a19d 100644 --- a/src/coreclr/tests/src/JIT/Methodical/tailcall_v4/hijacking.ilproj +++ b/src/coreclr/tests/src/JIT/Methodical/tailcall_v4/hijacking.ilproj @@ -2,14 +2,10 @@ Exe - true - true - - + 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 f157f51df54320..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 5d9e4e58703ab2..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 e291635a2b337b..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 d9ed48c715c4f3..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 b9b0547639826a..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 36be03b67eddb1..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 d4a70921b6f48f..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 72661a406d4c40..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 @@ -2,10 +2,8 @@ Exe - true + 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 c9c9758f74d826..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 59839d0cd09229..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 fa7ced3b707eef..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 @@ -2,10 +2,8 @@ Exe - true - true - - + 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 f10b60687f9d0e..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 @@ -2,10 +2,8 @@ Exe - true - true - - + 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 65e49e83c9bed2..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/JIT/superpmi/superpmicollect.csproj b/src/coreclr/tests/src/JIT/superpmi/superpmicollect.csproj index ac0be4f2ed1a28..4839b999f344d3 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/readytorun/coreroot_determinism/coreroot_determinism.csproj b/src/coreclr/tests/src/readytorun/coreroot_determinism/coreroot_determinism.csproj index c18e1a7ee81f5d..3133e130c8484d 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 eb201e02c3b07c..962adf7d5ee90d 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 4843145ecf22d9..9aa236d17cdcb0 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 d029a45bbdb132..44bafca915f260 100644 --- a/src/coreclr/tests/src/readytorun/r2rdump/R2RDumpTest.csproj +++ b/src/coreclr/tests/src/readytorun/r2rdump/R2RDumpTest.csproj @@ -8,7 +8,7 @@ true - true + true From 4a441724cceaa68e580ff0873e378fa5b7d5c6d5 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 16 Jan 2020 11:05:34 +0100 Subject: [PATCH 20/21] Remove ConfigurationGroup in favor of Configuration --- eng/Signing.props | 2 +- eng/pipelines/coreclr/templates/build-job.yml | 6 +-- src/coreclr/Directory.Build.props | 43 ++++--------------- ...NT.Microsoft.NETCore.Runtime.CoreCLR.props | 2 +- .../System.Private.CoreLib.csproj | 6 +-- src/coreclr/src/build.proj | 4 +- src/coreclr/src/gc/sample/GCSample.vcxproj | 16 +++---- src/coreclr/src/scripts/scripts.pyproj | 6 +-- .../src/tools/GCLogParser/parse-hb-log.csproj | 10 ++--- src/coreclr/tests/bringup_runtest.sh | 2 +- src/coreclr/tests/build.proj | 2 +- src/coreclr/tests/helixpublishwitharcade.proj | 10 ++--- src/coreclr/tests/src/Directory.Build.targets | 2 +- .../src/Interop/Interop.settings.targets | 2 +- 14 files changed, 43 insertions(+), 70 deletions(-) diff --git a/eng/Signing.props b/eng/Signing.props index 3ab32f20c8eebe..2bcecebedf28cf 100644 --- a/eng/Signing.props +++ b/eng/Signing.props @@ -52,7 +52,7 @@ diff --git a/eng/pipelines/coreclr/templates/build-job.yml b/eng/pipelines/coreclr/templates/build-job.yml index 3109c7207e078a..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:OSGroup=$(osGroup) /p:ArchGroup=$(archType) /p:ConfigurationGroup=$(_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 7677e537e85e76..60b448e279ef9b 100644 --- a/src/coreclr/Directory.Build.props +++ b/src/coreclr/Directory.Build.props @@ -14,38 +14,11 @@ Linux OSX AnyOS - - - - $(__BuildType) - Debug - Release - Checked - $(ConfigurationGroup) - - - - - $(__BuildType) - Debug - Release - Checked - Debug - - Windows_NT - Unix - Linux - OSX - FreeBSD - NetBSD + $(__BuildType) + Debug + Release + Checked @@ -57,15 +30,15 @@ Debug;Release;Checked x64;x86;arm;arm64 - + false $(DefineConstants);DEBUG - + true $(DefineConstants);DEBUG - + true @@ -127,7 +100,7 @@ - $(OSGroup).$(Platform).$(ConfigurationGroup) + $(OSGroup).$(Platform).$(Configuration) $(ArtifactsBinDir)coreclr\$(OSPlatformConfig)\ $(MSBuildThisFileDirectory)src\ 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 9b6b102f93c747..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 @@ -21,7 +21,7 @@ runtimes\$(PackageTargetRuntime)\native - + 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 4bd63c1b81c3c6..4f45e4bca6dc56 100644 --- a/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj +++ b/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj @@ -73,7 +73,7 @@ - + $(DefineConstants);_LOGGING $(DefineConstants);CODE_ANALYSIS @@ -302,8 +302,8 @@ - + !Exists('$(ArtifactsObjDir)coreclr\Eventing\$(Platform)\$(Configuration)\NativeRuntimeEventSource.cs')"/> + src\System\Diagnostics\Eventing\Generated\NativeRuntimeEventSource.cs diff --git a/src/coreclr/src/build.proj b/src/coreclr/src/build.proj index e313515f9d7523..fbfe44c1b1c07f 100644 --- a/src/coreclr/src/build.proj +++ b/src/coreclr/src/build.proj @@ -2,7 +2,7 @@ - + @@ -20,7 +20,7 @@ - diff --git a/src/coreclr/src/gc/sample/GCSample.vcxproj b/src/coreclr/src/gc/sample/GCSample.vcxproj index 64ddbf9ebfe52e..98dadcad54e3ca 100644 --- a/src/coreclr/src/gc/sample/GCSample.vcxproj +++ b/src/coreclr/src/gc/sample/GCSample.vcxproj @@ -17,13 +17,13 @@ 10.0 - + Application true v142 Unicode - + Application false v142 @@ -33,20 +33,20 @@ - + - + - + true - + false - + Use Level3 @@ -61,7 +61,7 @@ true - + Level3 Use diff --git a/src/coreclr/src/scripts/scripts.pyproj b/src/coreclr/src/scripts/scripts.pyproj index ce5c6e4b070ada..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} @@ -15,8 +15,8 @@ --man c:\src\coreclr\src\vm\clretwall.man --intermediate c:\work\runtimeeventsource False - - + + 10.0 diff --git a/src/coreclr/src/tools/GCLogParser/parse-hb-log.csproj b/src/coreclr/src/tools/GCLogParser/parse-hb-log.csproj index 6370eb4c091157..940cb96f0ea3bc 100644 --- a/src/coreclr/src/tools/GCLogParser/parse-hb-log.csproj +++ b/src/coreclr/src/tools/GCLogParser/parse-hb-log.csproj @@ -2,7 +2,7 @@ - Debug + Debug AnyCPU {6AE26CD6-C971-48D6-8C03-2FFA272B942C} Exe @@ -13,7 +13,7 @@ true true - + AnyCPU true full @@ -23,7 +23,7 @@ prompt 4 - + AnyCPU pdbonly true @@ -32,7 +32,7 @@ prompt 4 - + true artifacts\x64\Debug\ DEBUG;TRACE @@ -42,7 +42,7 @@ MinimumRecommendedRules.ruleset true - + artifacts\x64\Release\ TRACE true diff --git a/src/coreclr/tests/bringup_runtest.sh b/src/coreclr/tests/bringup_runtest.sh index e682fccd154a30..916589f10c6ff9 100755 --- a/src/coreclr/tests/bringup_runtest.sh +++ b/src/coreclr/tests/bringup_runtest.sh @@ -489,7 +489,7 @@ function create_testhost echo "${dotnetExe} $resetCommandArgs" "${dotnetExe}" $resetCommandArgs - buildCommandArgs=("msbuild ${coreFXTestSetupUtility} /p:OutputPath=${coreFXTestSetupUtilityOutputPath} /p:Platform=${_arch} /p:ConfigurationGroup=Release") + buildCommandArgs=("msbuild ${coreFXTestSetupUtility} /p:OutputPath=${coreFXTestSetupUtilityOutputPath} /p:Platform=${_arch} /p:Configuration=Release") echo "${dotnetExe} $buildCommandArgs" "${dotnetExe}" $buildCommandArgs diff --git a/src/coreclr/tests/build.proj b/src/coreclr/tests/build.proj index 4d4356f09b4f9f..6eb75883490d9f 100644 --- a/src/coreclr/tests/build.proj +++ b/src/coreclr/tests/build.proj @@ -44,7 +44,7 @@ - <_ConfigurationProperties>/p:OSGroup=$(OSGroup) /p:Platform=$(Platform) /p:ConfigurationGroup=$(ConfigurationGroup) + <_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/helixpublishwitharcade.proj b/src/coreclr/tests/helixpublishwitharcade.proj index 6871f0f2ff4a1d..18b2d3f20a12b6 100644 --- a/src/coreclr/tests/helixpublishwitharcade.proj +++ b/src/coreclr/tests/helixpublishwitharcade.proj @@ -17,7 +17,7 @@ <_PropertiesToPass> Platform=$(Platform); OSGroup=$(OSGroup); - ConfigurationGroup=$(ConfigurationGroup); + Configuration=$(Configuration); Creator=$(_Creator); HelixAccessToken=$(_HelixAccessToken); HelixBuild=$(_HelixBuild); @@ -169,16 +169,16 @@ true true $(Platform) - $(ConfigurationGroup) - $(ConfigurationGroup)-$(Scenario) + $(Configuration) + $(Configuration)-$(Scenario) false false false false R2R R2R-CG2 - $(TestRunNamePrefix)$(OSGroup) $(Platform) $(ConfigurationGroup) @ - $(TestRunNamePrefix)$(OSGroup) $(Platform) $(ConfigurationGroup) $(Scenario) @ + $(TestRunNamePrefix)$(OSGroup) $(Platform) $(Configuration) @ + $(TestRunNamePrefix)$(OSGroup) $(Platform) $(Configuration) $(Scenario) @ $([System.TimeSpan]::FromMinutes($(TimeoutPerTestInMinutes)).TotalMilliseconds) true <_XUnitParallelMode>collections diff --git a/src/coreclr/tests/src/Directory.Build.targets b/src/coreclr/tests/src/Directory.Build.targets index a1fd9e039a80cc..cc34690c998fe0 100644 --- a/src/coreclr/tests/src/Directory.Build.targets +++ b/src/coreclr/tests/src/Directory.Build.targets @@ -169,7 +169,7 @@ BeforeTargets="Build" > - + diff --git a/src/coreclr/tests/src/Interop/Interop.settings.targets b/src/coreclr/tests/src/Interop/Interop.settings.targets index be9b2469a60326..c26170bdc793bf 100644 --- a/src/coreclr/tests/src/Interop/Interop.settings.targets +++ b/src/coreclr/tests/src/Interop/Interop.settings.targets @@ -20,7 +20,7 @@ + Condition="'$(TargetsWindows)' == 'true' And ('$(Configuration)' == 'Debug' Or '$(Configuration)' == 'Checked') And '$(CopyDebugCRTDllsToOutputDirectory)' == 'true'" > From 02c124e2aa696905e74f16fd92e845aa11f93d38 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 16 Jan 2020 16:48:47 +0100 Subject: [PATCH 21/21] Cleanup --- src/coreclr/Directory.Build.props | 9 ++++++--- src/coreclr/src/.nuget/packaging.props | 1 - 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/coreclr/Directory.Build.props b/src/coreclr/Directory.Build.props index 60b448e279ef9b..b48e2bb5b44928 100644 --- a/src/coreclr/Directory.Build.props +++ b/src/coreclr/Directory.Build.props @@ -5,6 +5,8 @@ $(__BuildArch) + + x64 arm $(Platform) @@ -19,6 +21,10 @@ Debug Release Checked + + + Debug;Release;Checked + x64;x86;arm;arm64 @@ -26,9 +32,6 @@ Portable true - - Debug;Release;Checked - x64;x86;arm;arm64 false diff --git a/src/coreclr/src/.nuget/packaging.props b/src/coreclr/src/.nuget/packaging.props index 2200e7a629959c..6236a4347e9f8b 100644 --- a/src/coreclr/src/.nuget/packaging.props +++ b/src/coreclr/src/.nuget/packaging.props @@ -5,7 +5,6 @@ $(Platform) - x64 win7 win8 win10