diff --git a/Build.proj b/Build.proj
index 44da6d66f9942..28444c19ca67a 100644
--- a/Build.proj
+++ b/Build.proj
@@ -1,9 +1,5 @@
-
- BuildTargetFramework=$([MSBuild]::ValueOrDefault('$(BuildTargetFramework)', '$(NetCoreAppCurrent)'))
-
-
diff --git a/Directory.Build.props b/Directory.Build.props
index 77b581d19869e..1b44d591a9a70 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -258,7 +258,6 @@
'$(MSBuildProjectExtension)' != '.sfxproj')">false
-
@@ -277,4 +276,8 @@
false
+
+
+ $(RepositoryEngineeringDir)TraversalSdk.AfterProps.props
+
diff --git a/eng/Subsets.props b/eng/Subsets.props
index 22f1f6bb1f477..bf6b25bffc731 100644
--- a/eng/Subsets.props
+++ b/eng/Subsets.props
@@ -49,8 +49,11 @@
$(DefaultMonoSubsets)mono.wasmruntime+
$(DefaultMonoSubsets)mono.aotcross+
$(DefaultMonoSubsets)mono.runtime+mono.corelib+mono.packages
-
- libs.native+libs.ref+libs.src+libs.pretest+libs.packages
+
+ libs.native+
+ $(DefaultLibrariesSubsets)libs.ref+libs.src+libs.pretest+libs.packages
host.native+host.pkg+host.tools+host.tests
diff --git a/eng/TraversalSdk.AfterProps.props b/eng/TraversalSdk.AfterProps.props
new file mode 100644
index 0000000000000..9f3f5fdea7ae9
--- /dev/null
+++ b/eng/TraversalSdk.AfterProps.props
@@ -0,0 +1,8 @@
+
+
+
+
+ BuildTargetFramework=$([MSBuild]::ValueOrDefault('$(BuildTargetFramework)', '$(NetCoreAppCurrent)'))
+
+
+
diff --git a/eng/illink.targets b/eng/illink.targets
index 81761a70c6d9f..6c2d95c847723 100644
--- a/eng/illink.targets
+++ b/eng/illink.targets
@@ -47,7 +47,8 @@
- $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'ILLinkTrimAssembly', '$(NetCoreAppCurrent)-$(TargetOS)-$(Configuration)-$(TargetArchitecture)'))
+ $(NetCoreAppCurrent)-$(TargetOS)-$(Configuration)-$(TargetArchitecture)
+ $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'ILLinkTrimAssembly', '$(NetCoreAppCurrentBuildSettings)'))
$(ILLinkTrimAssemblyArtifactsRootDir)suppressions-xmls\
$(ILLinkTrimAssemblyArtifactsRootDir)oob-suppressions-xmls\
$(ILLinkTrimAssemblyRuntimePackSuppressionsXmlsDir)
@@ -58,15 +59,15 @@
Must be enabled by setting BinPlaceILLinkTrimAssembly=true
-->
-
+
$(ILLinkTrimAssemblyArtifactsRootDir)trimmed
TrimmedItem
-
+
$(ILLinkTrimAssemblyArtifactsRootDir)reports
TrimmingReport
-
+
$(ILLinkTrimAssemblyArtifactsRootDir)pretrimmed
PreTrimmedItem
diff --git a/eng/pipelines/libraries/helix.yml b/eng/pipelines/libraries/helix.yml
index ec6aeea424f75..a8b6517efeb87 100644
--- a/eng/pipelines/libraries/helix.yml
+++ b/eng/pipelines/libraries/helix.yml
@@ -15,7 +15,7 @@ parameters:
scenarios: ''
steps:
- - script: $(_msbuildCommand)
+ - script: $(_msbuildCommand) -restore
$(Build.SourcesDirectory)/src/libraries/sendtohelix.proj
/p:RuntimeFlavor=${{ parameters.runtimeFlavor }}
/p:TargetArchitecture=${{ parameters.archType }}
diff --git a/eng/testing/coverage.targets b/eng/testing/coverage.targets
index 02426851c0bc6..55feba56e7d74 100644
--- a/eng/testing/coverage.targets
+++ b/eng/testing/coverage.targets
@@ -29,7 +29,7 @@
- @(CoverageIncludeDirectory -> '$(TestHostRootPath)%(Identity)', ',')
+ @(CoverageIncludeDirectory -> '$(NetCoreAppCurrentTestHostPath)%(Identity)', ',')
diff --git a/eng/testing/runsettings.targets b/eng/testing/runsettings.targets
index 2fa1901e0489a..b5ff64cc9ea26 100644
--- a/eng/testing/runsettings.targets
+++ b/eng/testing/runsettings.targets
@@ -38,7 +38,7 @@
.Replace('$$DISABLEPARALLELIZATION$$', '$([MSBuild]::ValueOrDefault('$(TestDisableParallelization)', 'false'))')
.Replace('$$DISABLEAPPDOMAIN$$', '$([MSBuild]::ValueOrDefault('$(TestDisableAppDomain)', 'false'))')
.Replace('$$TESTCASEFILTER$$', '$(_testFilter)')
- .Replace('$$DOTNETHOSTPATH$$', '$(TestHostRootPath)$([System.IO.Path]::GetFileName('$(DotNetTool)'))'))
+ .Replace('$$DOTNETHOSTPATH$$', '$(NetCoreAppCurrentTestHostPath)$([System.IO.Path]::GetFileName('$(DotNetTool)'))'))
"$(RunScriptOutputPath)"
$(RunTestsCommand) --runtime-path "$(TestHostRootPath.TrimEnd('\/'))"
+ $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '$(NETCoreAppCurrentVersion)'))">$(RunTestsCommand) --runtime-path "$(NetCoreAppCurrentTestHostPath.TrimEnd('\/'))"
$(RunTestsCommand) --rsp-file "$(TestRspFile)"
"$(RunScriptOutputPath)" $(AssemblyName) $(TargetArchitecture) $(TargetOS.ToLowerInvariant()) $(TestProjectName) $(AdditionalXHarnessArguments)
"$(RunScriptOutputPath)" $(JSEngine) $(AssemblyName).dll $(Scenario)
diff --git a/src/coreclr/.nuget/coreclr-packages.proj b/src/coreclr/.nuget/coreclr-packages.proj
index 2f7d06aa18cca..cef8381866cf1 100644
--- a/src/coreclr/.nuget/coreclr-packages.proj
+++ b/src/coreclr/.nuget/coreclr-packages.proj
@@ -1,8 +1,4 @@
-
- BuildAllProjects=true
-
-
diff --git a/src/installer/pkg/projects/host-packages.proj b/src/installer/pkg/projects/host-packages.proj
index db9a28ff1a04a..9a6e896b59f87 100644
--- a/src/installer/pkg/projects/host-packages.proj
+++ b/src/installer/pkg/projects/host-packages.proj
@@ -1,8 +1,4 @@
-
- BuildAllProjects=true
-
-
diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props
index 2f7da34e51c0d..44936579a6083 100644
--- a/src/libraries/Directory.Build.props
+++ b/src/libraries/Directory.Build.props
@@ -26,13 +26,9 @@
- $([System.Text.RegularExpressions.Regex]::Replace('$(TargetFramework)', '(-[^;]+)', ''))
net45;net451;net452;net46;net461;net462;net47;net471;net472
$(AdditionalBuildTargetFrameworks);netstandard2.0
-
- $(BuildTargetFramework)-$(TargetOS)-$(Configuration)-$(TargetArchitecture)
- $(NetCoreAppCurrent)-$(TargetOS)-$(Configuration)-$(TargetArchitecture)
@@ -59,10 +55,6 @@
-
- <_targetFrameworkValue>$([MSBuild]::ValueOrDefault('$(BuildTargetFramework)', '$(TargetFramework)'))
- <_targetFrameworkValue>$([MSBuild]::ValueOrDefault('$(_targetFrameworkValue)', '$(NetCoreAppCurrent)'))
- $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'native', '$(_targetFrameworkValue)-$(TargetOS)-$(Configuration)-$(TargetArchitecture)'))
$([MSBuild]::NormalizeDirectory('$(LibrariesProjectRoot)', 'pkg'))
@@ -78,12 +70,6 @@
-
- true
- true
-
-
@@ -148,9 +134,6 @@
$(ArtifactsBinDir)pkg\aspnetcoreapp\ref
$(ArtifactsBinDir)pkg\aspnetcoreapp\lib
- $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'testhost', '$(BuildSettings)'))
- $([MSBuild]::NormalizeDirectory('$(TestHostRootPath)', 'shared', '$(MicrosoftNetCoreAppFrameworkName)', '$(ProductVersion)'))
-
$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'microsoft.netcore.app.ref'))
$([MSBuild]::NormalizeDirectory('$(MicrosoftNetCoreAppRefPackDir)', 'ref', '$(NetCoreAppCurrent)'))
$([MSBuild]::NormalizeDirectory('$(MicrosoftNetCoreAppRefPackDir)', 'data'))
diff --git a/src/libraries/Directory.Build.targets b/src/libraries/Directory.Build.targets
index bf72681fcd78e..2694b72673132 100644
--- a/src/libraries/Directory.Build.targets
+++ b/src/libraries/Directory.Build.targets
@@ -12,8 +12,14 @@
+ $(NetCoreAppCurrent)-$(TargetOS)-$(Configuration)-$(TargetArchitecture)
+ $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'native', '$(NetCoreAppCurrentBuildSettings)'))
+ $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'testhost', '$(NetCoreAppCurrentBuildSettings)'))
+ $([MSBuild]::NormalizeDirectory('$(NetCoreAppCurrentTestHostPath)', 'shared', '$(MicrosoftNetCoreAppFrameworkName)', '$(ProductVersion)'))
+
$(TargetsForTfmSpecificContentInPackage);LibIntellisenseDocs
$(PackageOutputPath)
+
$(NoWarn);nullable
$(NoWarn);nullable;CA1052
+ Condition="'$(BuildTargetFramework)' == '$(NetCoreAppCurrent)' or '$(BuildTargetFramework)' == ''">
$(NETCoreAppPackageRuntimePath)
$(NETCoreAppPackageRefPath)
$(NETCoreAppPackageRuntimePath)
@@ -97,9 +103,9 @@
- $(NETCoreAppTestSharedFrameworkPath)
- $(NETCoreAppTestSharedFrameworkPath)
+ Condition="'$(BuildTargetFramework)' == '$(NetCoreAppCurrent)' or '$(BuildTargetFramework)' == ''">
+ $(NetCoreAppCurrentTestHostSharedFrameworkPath)
+ $(NetCoreAppCurrentTestHostSharedFrameworkPath)
diff --git a/src/libraries/Native/build-native.proj b/src/libraries/Native/build-native.proj
index 27138adbcf6c0..6fb1d6e5dfc84 100644
--- a/src/libraries/Native/build-native.proj
+++ b/src/libraries/Native/build-native.proj
@@ -3,15 +3,12 @@
$(ArtifactsObjDir)_version.h
$(ArtifactsObjDir)_version.c
- $(BuildTargetFramework)
- $(NetCoreAppCurrent)
- <_BuildNativeArgs>$(TargetArchitecture) $(Configuration) outconfig $(TargetFramework)-$(TargetOS)-$(Configuration)-$(TargetArchitecture) -os $(TargetOS)
+ <_BuildNativeArgs>$(TargetArchitecture) $(Configuration) outconfig $(NetCoreAppCurrent)-$(TargetOS)-$(Configuration)-$(TargetArchitecture) -os $(TargetOS)
<_BuildNativeArgs Condition="'$(OfficialBuildId)' != ''">$(_BuildNativeArgs) /p:OfficialBuildId="$(OfficialBuildId)"
-
+
+ Condition="$([MSBuild]::IsOsPlatform(Windows))">
<_BuildNativeArgs Condition="'$(Ninja)' == 'false'">$(_BuildNativeArgs) msbuild
diff --git a/src/libraries/Native/native-binplace.proj b/src/libraries/Native/native-binplace.proj
index 4c49de39a4b1e..9d9ee882b1f62 100644
--- a/src/libraries/Native/native-binplace.proj
+++ b/src/libraries/Native/native-binplace.proj
@@ -3,7 +3,7 @@
$(NetCoreAppCurrent)
- $(BuildTargetFramework)
+ $(NetCoreAppCurrent)
false
true
true
diff --git a/src/libraries/System.Resources.Extensions/tests/System.Resources.Extensions.Tests.csproj b/src/libraries/System.Resources.Extensions/tests/System.Resources.Extensions.Tests.csproj
index 65be989ba53a2..bcee4a27b6037 100644
--- a/src/libraries/System.Resources.Extensions/tests/System.Resources.Extensions.Tests.csproj
+++ b/src/libraries/System.Resources.Extensions/tests/System.Resources.Extensions.Tests.csproj
@@ -39,7 +39,7 @@
$(TargetDir)%(Class)%(Identity).exception.txt
- $(TestHostRootPath)dotnet exec --runtimeconfig $(TargetDir)$(TargetName).runtimeconfig.json $(_executor) $(AssemblyName) %(Class) %(Identity) %(ExceptionFile) %(Parameters)
+ $(NetCoreAppCurrentTestHostPath)dotnet exec --runtimeconfig $(TargetDir)$(TargetName).runtimeconfig.json $(_executor) $(AssemblyName) %(Class) %(Identity) %(ExceptionFile) %(Parameters)
diff --git a/src/libraries/externals.csproj b/src/libraries/externals.csproj
index daf84fb3ae2d3..f1a13cb78d375 100644
--- a/src/libraries/externals.csproj
+++ b/src/libraries/externals.csproj
@@ -46,16 +46,16 @@
-
+
- BuildAllProjects=true
$(AdditionalBuildTargetFrameworks);package-$(Configuration)
diff --git a/src/libraries/pretest.proj b/src/libraries/pretest.proj
index bccc988a0fbf0..3e924e083abd5 100644
--- a/src/libraries/pretest.proj
+++ b/src/libraries/pretest.proj
@@ -56,7 +56,7 @@
AfterTargets="BuildExternalsProject"
Inputs="@(SharedFrameworkRuntimeFile)"
Outputs="$(MicrosoftNetCoreAppRuntimePackDir)data\PlatformManifest.txt"
- Condition="'$(BuildingNETCoreAppVertical)' == 'true'">
+ Condition="'$(BuildTargetFramework)' == '$(NetCoreAppCurrent)' or '$(BuildTargetFramework)' == ''">
+ Condition="'$(BuildTargetFramework)' == '$(NetCoreAppCurrent)' or '$(BuildTargetFramework)' == ''">
+ Inputs="$(NetCoreAppCurrentTestHostSharedFrameworkPath)*.*"
+ Outputs="$(NetCoreAppCurrentTestHostSharedFrameworkPath)$(MicrosoftNetCoreAppFrameworkName).deps.json"
+ Condition="'$(BuildTargetFramework)' == '$(NetCoreAppCurrent)' or '$(BuildTargetFramework)' == ''">
-
@@ -125,7 +125,7 @@
AfterTargets="BuildExternalsProject"
Inputs="@(RuntimePackLibFile);@(RuntimePackNativeFile)"
Outputs="$(MicrosoftNetCoreAppRuntimePackDir)data\RuntimeList.xml"
- Condition="'$(BuildingNETCoreAppVertical)' == 'true'">
+ Condition="'$(BuildTargetFramework)' == '$(NetCoreAppCurrent)' or '$(BuildTargetFramework)' == ''">
diff --git a/src/libraries/ref.proj b/src/libraries/ref.proj
index a875a3409a076..e3a63ad2bb848 100644
--- a/src/libraries/ref.proj
+++ b/src/libraries/ref.proj
@@ -14,7 +14,7 @@
+ Condition="'$(BuildTargetFramework)' == '$(NetCoreAppCurrent)' or '$(BuildTargetFramework)' == ''" />
@@ -57,7 +57,7 @@
AfterTargets="BuildGeneratedShims"
Inputs="@(RefPackLibFile)"
Outputs="$(MicrosoftNetCoreAppRefPackDataDir)FrameworkList.xml"
- Condition="'$(BuildingNETCoreAppVertical)' == 'true'">
+ Condition="'$(BuildTargetFramework)' == '$(NetCoreAppCurrent)' or '$(BuildTargetFramework)' == ''">
diff --git a/src/libraries/sendtohelix.proj b/src/libraries/sendtohelix.proj
index 22d2f24fad15e..7640d51fedec7 100644
--- a/src/libraries/sendtohelix.proj
+++ b/src/libraries/sendtohelix.proj
@@ -12,19 +12,29 @@
"correlation payload", which is the set of files used by all Helix submissions
(which we compress into a single file).
-->
+
-
+
+ $(NetCoreAppToolCurrent)
+ $([MSBuild]::ValueOrDefault('$(BuildTargetFramework)', '$(NetCoreAppCurrent)'))
+ true
-
-
+
+ $(TestArchiveRuntimeRoot)test-runtime-$(NetCoreAppCurrentBuildSettings).zip
+ $(TestArchiveRuntimeRoot)packages-testPayload-$(Configuration).zip
+
+
+ SetStressModes_$(Scenario).cmd
+ SetStressModes_$(Scenario).sh
-
+
+
-
<_PropertiesToPass>
RuntimeFlavor=$(RuntimeFlavor);
TargetArchitecture=$(TargetArchitecture);
@@ -35,17 +45,14 @@
Creator=$(Creator);
HelixAccessToken=$(HelixAccessToken);
HelixTargetQueues=$(HelixTargetQueues);
- BuildTargetFramework=$(BuildTargetFramework);
- BuildSettings=$(BuildSettings)
+ BuildTargetFramework=$(BuildTargetFramework)
-
-
@@ -54,7 +61,7 @@
- $(MSBuildProjectDirectory)\sendtohelixhelp.proj
+ $(MSBuildThisFileDirectory)sendtohelixhelp.proj
@@ -79,21 +86,6 @@
- true
- $([MSBuild]::ValueOrDefault('$(BuildTargetFramework)', '$(NetCoreAppCurrent)'))
-
-
- $(TestArchiveRuntimeRoot)test-runtime-$(BuildSettings).zip
- $(TestArchiveRuntimeRoot)packages-testPayload-$(Configuration).zip
-
-
-
-
- SetStressModes_$(Scenario).cmd
- SetStressModes_$(Scenario).sh
@@ -102,7 +94,7 @@
- $(TestHostRootPath)$(TestEnvFileName)
+ $(NetCoreAppCurrentTestHostPath)$(TestEnvFileName)
@@ -133,17 +125,19 @@
-
-
- <_RuntimeInputs Include="$(TestHostRootPath)**/*.dll" />
+
+
+
+ <_RuntimeInput Include="$(NetCoreAppCurrentTestHostPath)**\*.dll" />
-
- <_RuntimeInputs Condition=" '$(Scenarios)' != '' and '$(TargetsWindows)' == 'true' " Include="$(TestHostRootPath)**/*.cmd" />
- <_RuntimeInputs Condition=" '$(Scenarios)' != '' and '$(TargetsWindows)' != 'true' " Include="$(TestHostRootPath)**/*.sh" />
-
+
+ <_RuntimeInput Condition=" '$(Scenarios)' != '' and '$(TargetsWindows)' == 'true' " Include="$(NetCoreAppCurrentTestHostPath)**\*.cmd" />
+ <_RuntimeInput Condition=" '$(Scenarios)' != '' and '$(TargetsWindows)' != 'true' " Include="$(NetCoreAppCurrentTestHostPath)**\*.sh" />
+
+
@@ -155,13 +149,13 @@
-
diff --git a/src/libraries/sendtohelixhelp.proj b/src/libraries/sendtohelixhelp.proj
index f0cbe2dfb77b7..6eb9d125c75c3 100644
--- a/src/libraries/sendtohelixhelp.proj
+++ b/src/libraries/sendtohelixhelp.proj
@@ -41,11 +41,11 @@
$(TargetArchitecture)
- $(BuildSettings)-
+ $(BuildTargetFramework)-$(TargetOS)-$(Configuration)-$(TargetArchitecture)-
$(TestRunNamePrefix)$(TestRunNamePrefixSuffix)-
$(TestRunNamePrefix)$(Scenario)-
diff --git a/src/libraries/shims/ApiCompat.proj b/src/libraries/shims/ApiCompat.proj
index 174f117a991e3..94ded8a0e0562 100644
--- a/src/libraries/shims/ApiCompat.proj
+++ b/src/libraries/shims/ApiCompat.proj
@@ -1,7 +1,7 @@
- $([MSBuild]::ValueOrDefault('$(BuildTargetFramework)', '$(NetCoreAppCurrent)'))
+ $(NetCoreAppCurrent)
false
net5.0
diff --git a/src/libraries/shims/Directory.Build.props b/src/libraries/shims/Directory.Build.props
index 2cae9b2768aee..9bf446de9fe50 100644
--- a/src/libraries/shims/Directory.Build.props
+++ b/src/libraries/shims/Directory.Build.props
@@ -6,7 +6,6 @@
true
true
- $(TargetFramework)
@@ -23,7 +22,9 @@
$(NuGetPackageRoot)netstandard.library.ref\$(NETStandardLibraryRefVersion)\ref\netstandard2.1\
-
+
diff --git a/src/libraries/shims/netfxreference.props b/src/libraries/shims/netfxreference.props
index bde02eac749a6..deed47dc14b1b 100644
--- a/src/libraries/shims/netfxreference.props
+++ b/src/libraries/shims/netfxreference.props
@@ -2,7 +2,7 @@
-
+
diff --git a/src/libraries/src.proj b/src/libraries/src.proj
index dae9e457a0f54..5862082f7e3ef 100644
--- a/src/libraries/src.proj
+++ b/src/libraries/src.proj
@@ -17,7 +17,7 @@
@@ -47,8 +47,8 @@
Properties="$(TraversalGlobalProperties)" />
-
+
-
- BuildAllProjects=true
-
-