From 66b94c995807fbc6da0a44dd5fcf64636c3965e0 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Mon, 15 Mar 2021 00:34:39 +0100 Subject: [PATCH 1/9] Stop reading TargetFramework prop in props files The TargetFramework property isn't expected to be set in props files before a project's body is evaluated. Don't let BuildTargetFramework property fallback to TargetFramework as BTF's sole intent is to convey the TargetFramework to filter to and not the current selected TargetFramework. Reduce usage of BTF so that it is only used in places where code is actually conditioned on filtering. --- Build.proj | 1 + eng/Subsets.props | 7 ++++-- eng/illink.targets | 8 +++--- src/libraries/Directory.Build.props | 14 +---------- src/libraries/Directory.Build.targets | 8 +++++- src/libraries/Native/build-native.proj | 10 +++----- src/libraries/Native/native-binplace.proj | 2 +- src/libraries/pretest.proj | 2 +- src/libraries/sendtohelix.proj | 30 ++++++++++++----------- src/libraries/shims/ApiCompat.proj | 2 +- src/libraries/shims/Directory.Build.props | 5 ++-- src/libraries/shims/netfxreference.props | 2 +- src/libraries/src.proj | 4 +-- 13 files changed, 46 insertions(+), 49 deletions(-) diff --git a/Build.proj b/Build.proj index 44da6d66f9942..e99130ab7518a 100644 --- a/Build.proj +++ b/Build.proj @@ -1,6 +1,7 @@ + BuildTargetFramework=$([MSBuild]::ValueOrDefault('$(BuildTargetFramework)', '$(NetCoreAppCurrent)')) diff --git a/eng/Subsets.props b/eng/Subsets.props index f53c5f411dd1f..e1fe595ea8bb1 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/illink.targets b/eng/illink.targets index 81761a70c6d9f..91962a1676ede 100644 --- a/eng/illink.targets +++ b/eng/illink.targets @@ -47,7 +47,7 @@ - $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'ILLinkTrimAssembly', '$(NetCoreAppCurrent)-$(TargetOS)-$(Configuration)-$(TargetArchitecture)')) + $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'ILLinkTrimAssembly', '$(NetCoreAppCurrentBuildSettings)')) $(ILLinkTrimAssemblyArtifactsRootDir)suppressions-xmls\ $(ILLinkTrimAssemblyArtifactsRootDir)oob-suppressions-xmls\ $(ILLinkTrimAssemblyRuntimePackSuppressionsXmlsDir) @@ -58,15 +58,15 @@ Must be enabled by setting BinPlaceILLinkTrimAssembly=true --> - + $(ILLinkTrimAssemblyArtifactsRootDir)trimmed TrimmedItem - + $(ILLinkTrimAssemblyArtifactsRootDir)reports TrimmingReport - + $(ILLinkTrimAssemblyArtifactsRootDir)pretrimmed PreTrimmedItem diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props index 2f7da34e51c0d..64089b0eb432b 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')) @@ -80,8 +72,7 @@ true - true + '$(BuildTargetFramework)' == ''">true @@ -148,9 +139,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..8a2fc9d2a198d 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('$(TestHostRootPath)', 'shared', '$(MicrosoftNetCoreAppFrameworkName)', '$(ProductVersion)')) + $(TargetsForTfmSpecificContentInPackage);LibIntellisenseDocs $(PackageOutputPath) + $(NoWarn);nullable $(NoWarn);nullable;CA1052 + Condition="'$(BuildingNETCoreAppVertical)' == 'true'"> $(NETCoreAppTestSharedFrameworkPath) $(NETCoreAppTestSharedFrameworkPath) diff --git a/src/libraries/Native/build-native.proj b/src/libraries/Native/build-native.proj index edba5f1fbddb7..cdd2cbaad6835 100644 --- a/src/libraries/Native/build-native.proj +++ b/src/libraries/Native/build-native.proj @@ -3,14 +3,11 @@ $(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) - + + 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/pretest.proj b/src/libraries/pretest.proj index bccc988a0fbf0..b428f2cef9900 100644 --- a/src/libraries/pretest.proj +++ b/src/libraries/pretest.proj @@ -86,7 +86,7 @@ AfterTargets="BuildExternalsProject" Inputs="$(NETCoreAppTestSharedFrameworkPath)*.*" Outputs="$(NETCoreAppTestSharedFrameworkPath)$(MicrosoftNetCoreAppFrameworkName).deps.json" - Condition="'$(BinPlaceTestSharedFramework)' == 'true'"> + Condition="'$(BuildingNETCoreAppVertical)' == 'true'"> @@ -84,7 +84,7 @@ $(TestArchiveRuntimeRoot)test-runtime-$(BuildSettings).zip + '$(BuildTargetFramework)' == '$(NetCoreAppCurrent)'">$(TestArchiveRuntimeRoot)test-runtime-$(NetCoreAppCurrentBuildSettings).zip $(TestArchiveRuntimeRoot)packages-testPayload-$(Configuration).zip @@ -133,17 +133,19 @@ - - - <_RuntimeInputs Include="$(TestHostRootPath)**/*.dll" /> + + + + <_RuntimeInput Include="$(TestHostRootPath)**\*.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="$(TestHostRootPath)**\*.cmd" /> + <_RuntimeInput Condition=" '$(Scenarios)' != '' and '$(TargetsWindows)' != 'true' " Include="$(TestHostRootPath)**\*.sh" /> + + @@ -160,8 +162,8 @@ - $([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..71d3409049925 100644 --- a/src/libraries/src.proj +++ b/src/libraries/src.proj @@ -47,8 +47,8 @@ Properties="$(TraversalGlobalProperties)" /> - + Date: Tue, 18 May 2021 13:41:04 +0200 Subject: [PATCH 2/9] Allow traversal project filtering anywhere in the tree --- Build.proj | 5 ----- Directory.Build.props | 5 ++++- eng/TraversalSdk.AfterProps.props | 8 ++++++++ 3 files changed, 12 insertions(+), 6 deletions(-) create mode 100644 eng/TraversalSdk.AfterProps.props diff --git a/Build.proj b/Build.proj index e99130ab7518a..28444c19ca67a 100644 --- a/Build.proj +++ b/Build.proj @@ -1,10 +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/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)')) + + + From fbebf839c69c4cb1ecfbf7d42e7c3252cc978fdb Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 18 May 2021 13:41:14 +0200 Subject: [PATCH 3/9] Remove unnecessary global property passed through --- src/coreclr/.nuget/coreclr-packages.proj | 4 ---- src/installer/pkg/projects/host-packages.proj | 4 ---- src/libraries/libraries-packages.proj | 1 - src/mono/nuget/mono-packages.proj | 4 ---- 4 files changed, 13 deletions(-) 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/libraries-packages.proj b/src/libraries/libraries-packages.proj index d9344744abdc1..023b57e37c136 100644 --- a/src/libraries/libraries-packages.proj +++ b/src/libraries/libraries-packages.proj @@ -1,7 +1,6 @@ - BuildAllProjects=true $(AdditionalBuildTargetFrameworks);package-$(Configuration) diff --git a/src/mono/nuget/mono-packages.proj b/src/mono/nuget/mono-packages.proj index 49a81da6fcee5..9403ca9fb34bf 100644 --- a/src/mono/nuget/mono-packages.proj +++ b/src/mono/nuget/mono-packages.proj @@ -1,8 +1,4 @@ - - BuildAllProjects=true - - From 95191e8ff68b4ce8f96e5838c1c6534dfdab424c Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 18 May 2021 13:50:41 +0200 Subject: [PATCH 4/9] Fix illinking --- eng/illink.targets | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/illink.targets b/eng/illink.targets index 91962a1676ede..6c2d95c847723 100644 --- a/eng/illink.targets +++ b/eng/illink.targets @@ -47,6 +47,7 @@ + $(NetCoreAppCurrent)-$(TargetOS)-$(Configuration)-$(TargetArchitecture) $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'ILLinkTrimAssembly', '$(NetCoreAppCurrentBuildSettings)')) $(ILLinkTrimAssemblyArtifactsRootDir)suppressions-xmls\ $(ILLinkTrimAssemblyArtifactsRootDir)oob-suppressions-xmls\ From d7c3e5024fbd841abeef4c39450a13286ab6d02b Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 18 May 2021 16:28:53 +0200 Subject: [PATCH 5/9] React to prop moves --- eng/pipelines/libraries/helix.yml | 2 +- eng/testing/coverage.targets | 2 +- eng/testing/runsettings.targets | 2 +- eng/testing/tests.targets | 2 +- src/libraries/Directory.Build.targets | 8 +-- .../System.Resources.Extensions.Tests.csproj | 2 +- src/libraries/externals.csproj | 6 +- src/libraries/pretest.proj | 6 +- src/libraries/sendtohelix.proj | 58 ++++++++----------- src/libraries/sendtohelixhelp.proj | 4 +- 10 files changed, 42 insertions(+), 50 deletions(-) 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/libraries/Directory.Build.targets b/src/libraries/Directory.Build.targets index 8a2fc9d2a198d..5e7b81e5a712e 100644 --- a/src/libraries/Directory.Build.targets +++ b/src/libraries/Directory.Build.targets @@ -14,8 +14,8 @@ $(NetCoreAppCurrent)-$(TargetOS)-$(Configuration)-$(TargetArchitecture) $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'native', '$(NetCoreAppCurrentBuildSettings)')) - $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'testhost', '$(NetCoreAppCurrentBuildSettings)')) - $([MSBuild]::NormalizeDirectory('$(TestHostRootPath)', 'shared', '$(MicrosoftNetCoreAppFrameworkName)', '$(ProductVersion)')) + $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'testhost', '$(NetCoreAppCurrentBuildSettings)')) + $([MSBuild]::NormalizeDirectory('$(NetCoreAppCurrentTestHostPath)', 'shared', '$(MicrosoftNetCoreAppFrameworkName)', '$(ProductVersion)')) $(TargetsForTfmSpecificContentInPackage);LibIntellisenseDocs $(PackageOutputPath) @@ -104,8 +104,8 @@ - $(NETCoreAppTestSharedFrameworkPath) - $(NETCoreAppTestSharedFrameworkPath) + $(NetCoreAppCurrentTestHostSharedFrameworkPath) + $(NetCoreAppCurrentTestHostSharedFrameworkPath) 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 @@ - + - diff --git a/src/libraries/sendtohelix.proj b/src/libraries/sendtohelix.proj index dd184fe7f1c28..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=$(BuildTargetFramework)-$(TargetOS)-$(Configuration)-$(TargetArchitecture) + BuildTargetFramework=$(BuildTargetFramework) - - @@ -54,7 +61,7 @@ - $(MSBuildProjectDirectory)\sendtohelixhelp.proj + $(MSBuildThisFileDirectory)sendtohelixhelp.proj @@ -79,21 +86,6 @@ - true - $([MSBuild]::ValueOrDefault('$(BuildTargetFramework)', '$(NetCoreAppCurrent)')) - - - $(TestArchiveRuntimeRoot)test-runtime-$(NetCoreAppCurrentBuildSettings).zip - $(TestArchiveRuntimeRoot)packages-testPayload-$(Configuration).zip - - - - - SetStressModes_$(Scenario).cmd - SetStressModes_$(Scenario).sh @@ -102,7 +94,7 @@ - $(TestHostRootPath)$(TestEnvFileName) + $(NetCoreAppCurrentTestHostPath)$(TestEnvFileName) @@ -139,11 +131,11 @@ if a dll is updated, the folder's timestamp is not updated, therefore skipped. --> - <_RuntimeInput Include="$(TestHostRootPath)**\*.dll" /> + <_RuntimeInput Include="$(NetCoreAppCurrentTestHostPath)**\*.dll" /> - <_RuntimeInput Condition=" '$(Scenarios)' != '' and '$(TargetsWindows)' == 'true' " Include="$(TestHostRootPath)**\*.cmd" /> - <_RuntimeInput 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" /> @@ -157,7 +149,7 @@ @@ -176,7 +168,7 @@ - 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)- From fcdbb01db1486d34d69075d9b970c04ee0f85394 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 18 May 2021 18:23:36 +0200 Subject: [PATCH 6/9] Update build-native.proj --- src/libraries/Native/build-native.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libraries/Native/build-native.proj b/src/libraries/Native/build-native.proj index 7a7ca2c35c4ef..7e4927a8a2837 100644 --- a/src/libraries/Native/build-native.proj +++ b/src/libraries/Native/build-native.proj @@ -3,7 +3,7 @@ $(ArtifactsObjDir)_version.h $(ArtifactsObjDir)_version.c - <_BuildNativeArgs>$(TargetArchitecture) $(Configuration) outconfig $(NetCoreAppCurrent)-$(TargetOS)-$(Configuration)-$(TargetArchitecture) -os $(TargetOS) /p:OfficialBuildId=$(OfficialBuildId) + <_BuildNativeArgs>$(TargetArchitecture) $(Configuration) outconfig $(NetCoreAppCurrent)-$(TargetOS)-$(Configuration)-$(TargetArchitecture) -os $(TargetOS) /p:OfficialBuildId=\"$(OfficialBuildId)\" From 4aadc81a135ed7e8d598548a8931f5835ea0ce36 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 18 May 2021 18:55:50 +0200 Subject: [PATCH 7/9] Update build-native.proj --- src/libraries/Native/build-native.proj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libraries/Native/build-native.proj b/src/libraries/Native/build-native.proj index 7e4927a8a2837..61a9706569fc1 100644 --- a/src/libraries/Native/build-native.proj +++ b/src/libraries/Native/build-native.proj @@ -3,7 +3,8 @@ $(ArtifactsObjDir)_version.h $(ArtifactsObjDir)_version.c - <_BuildNativeArgs>$(TargetArchitecture) $(Configuration) outconfig $(NetCoreAppCurrent)-$(TargetOS)-$(Configuration)-$(TargetArchitecture) -os $(TargetOS) /p:OfficialBuildId=\"$(OfficialBuildId)\" + /p:OfficialBuildId="$(OfficialBuildId)" + <_BuildNativeArgs>$(TargetArchitecture) $(Configuration) outconfig $(NetCoreAppCurrent)-$(TargetOS)-$(Configuration)-$(TargetArchitecture) -os $(TargetOS)$(OfficialBuildIdArg) From d0138ed210b2af93a1238041da818cb515992407 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 19 May 2021 10:27:27 +0200 Subject: [PATCH 8/9] Update build-native.proj --- src/libraries/Native/build-native.proj | 1 - 1 file changed, 1 deletion(-) diff --git a/src/libraries/Native/build-native.proj b/src/libraries/Native/build-native.proj index 939f4cb807aeb..6fb1d6e5dfc84 100644 --- a/src/libraries/Native/build-native.proj +++ b/src/libraries/Native/build-native.proj @@ -3,7 +3,6 @@ $(ArtifactsObjDir)_version.h $(ArtifactsObjDir)_version.c - /p:OfficialBuildId="$(OfficialBuildId)" <_BuildNativeArgs>$(TargetArchitecture) $(Configuration) outconfig $(NetCoreAppCurrent)-$(TargetOS)-$(Configuration)-$(TargetArchitecture) -os $(TargetOS) <_BuildNativeArgs Condition="'$(OfficialBuildId)' != ''">$(_BuildNativeArgs) /p:OfficialBuildId="$(OfficialBuildId)" From db68e313d771598d410dd63b67e657b0e2862cac Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 19 May 2021 16:01:11 +0200 Subject: [PATCH 9/9] Remove BuildingNetCoreAppVertical prop --- src/libraries/Directory.Build.props | 5 ----- src/libraries/Directory.Build.targets | 4 ++-- src/libraries/pretest.proj | 8 ++++---- src/libraries/ref.proj | 4 ++-- src/libraries/src.proj | 4 ++-- 5 files changed, 10 insertions(+), 15 deletions(-) diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props index 64089b0eb432b..44936579a6083 100644 --- a/src/libraries/Directory.Build.props +++ b/src/libraries/Directory.Build.props @@ -70,11 +70,6 @@ - - true - - diff --git a/src/libraries/Directory.Build.targets b/src/libraries/Directory.Build.targets index 5e7b81e5a712e..2694b72673132 100644 --- a/src/libraries/Directory.Build.targets +++ b/src/libraries/Directory.Build.targets @@ -83,7 +83,7 @@ + Condition="'$(BuildTargetFramework)' == '$(NetCoreAppCurrent)' or '$(BuildTargetFramework)' == ''"> $(NETCoreAppPackageRuntimePath) $(NETCoreAppPackageRefPath) $(NETCoreAppPackageRuntimePath) @@ -103,7 +103,7 @@ + Condition="'$(BuildTargetFramework)' == '$(NetCoreAppCurrent)' or '$(BuildTargetFramework)' == ''"> $(NetCoreAppCurrentTestHostSharedFrameworkPath) $(NetCoreAppCurrentTestHostSharedFrameworkPath) diff --git a/src/libraries/pretest.proj b/src/libraries/pretest.proj index 73db7c842419b..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)' == ''"> + Condition="'$(BuildTargetFramework)' == '$(NetCoreAppCurrent)' or '$(BuildTargetFramework)' == ''"> + 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/src.proj b/src/libraries/src.proj index 71d3409049925..5862082f7e3ef 100644 --- a/src/libraries/src.proj +++ b/src/libraries/src.proj @@ -17,7 +17,7 @@ @@ -48,7 +48,7 @@ + Condition="'$(BuildTargetFramework)' == '$(NetCoreAppCurrent)' or '$(BuildTargetFramework)' == ''" />