From a6fd3290e702b63a3e09244d70bbfc1fd8341ab0 Mon Sep 17 00:00:00 2001 From: Andy Gocke Date: Thu, 21 Jul 2022 17:11:07 -0700 Subject: [PATCH 01/11] Revert "Revert "Always use live host (#71725)" (#72628)" This reverts commit 63692cd725a2bf36e896c78f9709c5474af0b6c1. --- eng/Subsets.props | 5 ++-- eng/liveBuilds.targets | 10 ++++++++ eng/pipelines/libraries/run-test-job.yml | 5 ++-- .../Microsoft.NETCore.DotNetHost.pkgproj | 17 ------------- ...Microsoft.NETCore.DotNetHostPolicy.pkgproj | 19 --------------- ...crosoft.NETCore.DotNetHostResolver.pkgproj | 22 ----------------- src/installer/pkg/projects/host-packages.proj | 3 --- .../Microsoft.NETCore.App.Runtime.props | 6 ----- src/libraries/externals.csproj | 24 ++++--------------- 9 files changed, 20 insertions(+), 91 deletions(-) delete mode 100644 src/installer/pkg/projects/Microsoft.NETCore.DotNetHost/Microsoft.NETCore.DotNetHost.pkgproj delete mode 100644 src/installer/pkg/projects/Microsoft.NETCore.DotNetHostPolicy/Microsoft.NETCore.DotNetHostPolicy.pkgproj delete mode 100644 src/installer/pkg/projects/Microsoft.NETCore.DotNetHostResolver/Microsoft.NETCore.DotNetHostResolver.pkgproj diff --git a/eng/Subsets.props b/eng/Subsets.props index fc751194d2459e..39ecf822395bc8 100644 --- a/eng/Subsets.props +++ b/eng/Subsets.props @@ -51,7 +51,7 @@ - clr.native+linuxdac+clr.corelib+clr.tools+clr.nativecorelib+clr.packages+clr.nativeaotlibs+clr.crossarchtools + clr.native+linuxdac+clr.corelib+clr.tools+clr.nativecorelib+clr.packages+clr.nativeaotlibs+clr.crossarchtools+host clr.iltools+clr.packages @@ -61,7 +61,8 @@ mono.llvm+ $(DefaultMonoSubsets)mono.wasmruntime+ $(DefaultMonoSubsets)mono.aotcross+ - $(DefaultMonoSubsets)mono.runtime+mono.corelib+mono.packages + $(DefaultMonoSubsets)mono.runtime+mono.corelib+mono.packages+ + $(DefaultMonoSubsets)host+ + + + + true + + + true + + + diff --git a/eng/pipelines/libraries/run-test-job.yml b/eng/pipelines/libraries/run-test-job.yml index c6fbe831a4d9bd..0d18eda1283f9b 100644 --- a/eng/pipelines/libraries/run-test-job.yml +++ b/eng/pipelines/libraries/run-test-job.yml @@ -32,13 +32,14 @@ jobs: osGroup: ${{ parameters.osGroup }} osSubgroup: ${{ parameters.osSubgroup }} archType: ${{ parameters.archType }} + crossBuild: ${{ parameters.crossBuild }} framework: ${{ parameters.framework }} isOfficialBuild: ${{ parameters.isOfficialBuild }} liveRuntimeBuildConfig: ${{ parameters.liveRuntimeBuildConfig }} runtimeFlavor: ${{ parameters.runtimeFlavor }} runtimeVariant: ${{ parameters.runtimeVariant }} timeoutInMinutes: ${{ parameters.timeoutInMinutes }} - container: '' # we just send to helix, no need to use a container. + container: ${{ parameters.container }} condition: ${{ parameters.condition }} testScope: ${{ parameters.testScope }} runTests: true @@ -89,7 +90,7 @@ jobs: - ${{ if ne(parameters.liveRuntimeBuildConfig, '') }}: - script: $(_buildScript) - -subset libs.pretest + -subset host+libs.pretest $(_buildArguments) /p:RuntimeFlavor=${{ parameters.runtimeFlavor }} /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/overrideRuntimeFromLiveDrop.binlog diff --git a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHost/Microsoft.NETCore.DotNetHost.pkgproj b/src/installer/pkg/projects/Microsoft.NETCore.DotNetHost/Microsoft.NETCore.DotNetHost.pkgproj deleted file mode 100644 index 9d5a87980d421c..00000000000000 --- a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHost/Microsoft.NETCore.DotNetHost.pkgproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - HostVersion - dotnet-host - Provides an executable implementation of the Microsoft DotNet Framework and SDK launcher module - - - - - - runtimes/$(PackageTargetRuntime)/native - true - - - - diff --git a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostPolicy/Microsoft.NETCore.DotNetHostPolicy.pkgproj b/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostPolicy/Microsoft.NETCore.DotNetHostPolicy.pkgproj deleted file mode 100644 index 7eb288ae2ba371..00000000000000 --- a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostPolicy/Microsoft.NETCore.DotNetHostPolicy.pkgproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - HostPolicyVersion - Provides a CoreCLR hosting policy implementation -- configuration settings, assembly paths and assembly servicing - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - true - - - diff --git a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostResolver/Microsoft.NETCore.DotNetHostResolver.pkgproj b/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostResolver/Microsoft.NETCore.DotNetHostResolver.pkgproj deleted file mode 100644 index 2991a01cf40d52..00000000000000 --- a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostResolver/Microsoft.NETCore.DotNetHostResolver.pkgproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - HostResolverVersion - dotnet-hostfxr - $(InstallerName)-pgo - Provides an implementation of framework resolution strategy used by Microsoft.NETCore.DotNetHost - - - - - - - - - - runtimes/$(PackageTargetRuntime)/native - true - - - - diff --git a/src/installer/pkg/projects/host-packages.proj b/src/installer/pkg/projects/host-packages.proj index 9a6e896b59f87f..ded4836a568efd 100644 --- a/src/installer/pkg/projects/host-packages.proj +++ b/src/installer/pkg/projects/host-packages.proj @@ -1,9 +1,6 @@ - - - diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props index 368726644a6385..f9bd09eae85d6a 100644 --- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props @@ -56,12 +56,6 @@ - - - - - - diff --git a/src/libraries/externals.csproj b/src/libraries/externals.csproj index 415545b533e76a..7774650719390c 100644 --- a/src/libraries/externals.csproj +++ b/src/libraries/externals.csproj @@ -1,7 +1,5 @@  - - $(PackageRID) true $(NetCoreAppCurrent) @@ -9,7 +7,6 @@ true false true - true @@ -21,23 +18,16 @@ - + - - - - - + Condition="Exists('$(DotNetHostBinDir)') and '$(TestNativeAot)' != 'true'"> true @@ -48,13 +38,7 @@ - - - - - - + @@ -78,7 +62,7 @@ SkipUnchangedFiles="true" UseHardlinksIfPossible="$(UseHardlink)" /> - Date: Fri, 29 Jul 2022 16:34:29 -0700 Subject: [PATCH 02/11] Change RuntimeFiles to NativeRuntimeAssets --- dotnet.sh | 1 + eng/liveBuilds.targets | 8 ++------ src/coreclr/tools/aot/crossgen2/crossgen2.props | 2 -- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/dotnet.sh b/dotnet.sh index a612ebac1ce1e4..0bff75a4dce3f7 100755 --- a/dotnet.sh +++ b/dotnet.sh @@ -23,5 +23,6 @@ source $scriptroot/eng/common/tools.sh InitializeDotNetCli true # Install __dotnetDir=${_InitializeDotNetCli} +export DOTNET_ROOT=${__dotnetDir} dotnetPath=${__dotnetDir}/dotnet ${dotnetPath} "$@" diff --git a/eng/liveBuilds.targets b/eng/liveBuilds.targets index 75d7bf6cb40a26..e28fae3c57dece 100644 --- a/eng/liveBuilds.targets +++ b/eng/liveBuilds.targets @@ -120,12 +120,8 @@ - - true - - - true - + + diff --git a/src/coreclr/tools/aot/crossgen2/crossgen2.props b/src/coreclr/tools/aot/crossgen2/crossgen2.props index 4fd71a9573f841..b7aa445890d07e 100644 --- a/src/coreclr/tools/aot/crossgen2/crossgen2.props +++ b/src/coreclr/tools/aot/crossgen2/crossgen2.props @@ -13,8 +13,6 @@ false Debug;Release;Checked true - - link From c65146ddfdfa483192fcadabc28527e1a6516228 Mon Sep 17 00:00:00 2001 From: Andy Gocke Date: Fri, 29 Jul 2022 17:47:33 -0700 Subject: [PATCH 03/11] Revert removal of host packages --- .../Microsoft.NETCore.DotNetHost.pkgproj | 17 ++++++++++++++ ...Microsoft.NETCore.DotNetHostPolicy.pkgproj | 19 ++++++++++++++++ ...crosoft.NETCore.DotNetHostResolver.pkgproj | 22 +++++++++++++++++++ src/installer/pkg/projects/host-packages.proj | 3 +++ 4 files changed, 61 insertions(+) create mode 100644 src/installer/pkg/projects/Microsoft.NETCore.DotNetHost/Microsoft.NETCore.DotNetHost.pkgproj create mode 100644 src/installer/pkg/projects/Microsoft.NETCore.DotNetHostPolicy/Microsoft.NETCore.DotNetHostPolicy.pkgproj create mode 100644 src/installer/pkg/projects/Microsoft.NETCore.DotNetHostResolver/Microsoft.NETCore.DotNetHostResolver.pkgproj diff --git a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHost/Microsoft.NETCore.DotNetHost.pkgproj b/src/installer/pkg/projects/Microsoft.NETCore.DotNetHost/Microsoft.NETCore.DotNetHost.pkgproj new file mode 100644 index 00000000000000..9d5a87980d421c --- /dev/null +++ b/src/installer/pkg/projects/Microsoft.NETCore.DotNetHost/Microsoft.NETCore.DotNetHost.pkgproj @@ -0,0 +1,17 @@ + + + + HostVersion + dotnet-host + Provides an executable implementation of the Microsoft DotNet Framework and SDK launcher module + + + + + + runtimes/$(PackageTargetRuntime)/native + true + + + + diff --git a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostPolicy/Microsoft.NETCore.DotNetHostPolicy.pkgproj b/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostPolicy/Microsoft.NETCore.DotNetHostPolicy.pkgproj new file mode 100644 index 00000000000000..7eb288ae2ba371 --- /dev/null +++ b/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostPolicy/Microsoft.NETCore.DotNetHostPolicy.pkgproj @@ -0,0 +1,19 @@ + + + + HostPolicyVersion + Provides a CoreCLR hosting policy implementation -- configuration settings, assembly paths and assembly servicing + + + + + + + + + + runtimes/$(PackageTargetRuntime)/native + true + + + diff --git a/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostResolver/Microsoft.NETCore.DotNetHostResolver.pkgproj b/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostResolver/Microsoft.NETCore.DotNetHostResolver.pkgproj new file mode 100644 index 00000000000000..2991a01cf40d52 --- /dev/null +++ b/src/installer/pkg/projects/Microsoft.NETCore.DotNetHostResolver/Microsoft.NETCore.DotNetHostResolver.pkgproj @@ -0,0 +1,22 @@ + + + + HostResolverVersion + dotnet-hostfxr + $(InstallerName)-pgo + Provides an implementation of framework resolution strategy used by Microsoft.NETCore.DotNetHost + + + + + + + + + + runtimes/$(PackageTargetRuntime)/native + true + + + + diff --git a/src/installer/pkg/projects/host-packages.proj b/src/installer/pkg/projects/host-packages.proj index ded4836a568efd..9a6e896b59f87f 100644 --- a/src/installer/pkg/projects/host-packages.proj +++ b/src/installer/pkg/projects/host-packages.proj @@ -1,6 +1,9 @@ + + + From e11c11adbf29925bd4acd1964110fa1d4251447d Mon Sep 17 00:00:00 2001 From: Andy Gocke Date: Fri, 29 Jul 2022 17:49:21 -0700 Subject: [PATCH 04/11] Move NativeRuntimeAssets back to package --- eng/liveBuilds.targets | 6 ------ .../Microsoft.NETCore.App.Runtime.props | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/liveBuilds.targets b/eng/liveBuilds.targets index e28fae3c57dece..44a60fce233cbb 100644 --- a/eng/liveBuilds.targets +++ b/eng/liveBuilds.targets @@ -118,12 +118,6 @@ - - - - - - diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props index f9bd09eae85d6a..368726644a6385 100644 --- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props @@ -56,6 +56,12 @@ + + + + + + From fdbfb3ab1dc2735f7d7f607bd313f9be32d9cf62 Mon Sep 17 00:00:00 2001 From: Andy Gocke Date: Fri, 29 Jul 2022 20:49:39 -0700 Subject: [PATCH 05/11] Copy host to runtime pack in externals --- .../linker/SupportFiles/Directory.Build.props | 1 - src/libraries/externals.csproj | 18 +++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/eng/testing/linker/SupportFiles/Directory.Build.props b/eng/testing/linker/SupportFiles/Directory.Build.props index c3be2bf7d265ab..186c8529b33949 100644 --- a/eng/testing/linker/SupportFiles/Directory.Build.props +++ b/eng/testing/linker/SupportFiles/Directory.Build.props @@ -3,7 +3,6 @@ true true true - link link false true diff --git a/src/libraries/externals.csproj b/src/libraries/externals.csproj index 7774650719390c..f77046305793dc 100644 --- a/src/libraries/externals.csproj +++ b/src/libraries/externals.csproj @@ -24,6 +24,13 @@ Version="$(MicrosoftDiaSymReaderNativeVersion)" /> + + + + + + + - - - - - - - + + From de13e7b0dd9b92eec92d8c14aeb3727adba360cc Mon Sep 17 00:00:00 2001 From: Andy Gocke Date: Sat, 30 Jul 2022 00:51:52 -0700 Subject: [PATCH 06/11] Only copy host files if they are built --- src/libraries/externals.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libraries/externals.csproj b/src/libraries/externals.csproj index f77046305793dc..65fe4132ceafff 100644 --- a/src/libraries/externals.csproj +++ b/src/libraries/externals.csproj @@ -74,8 +74,8 @@ AfterTargets="AfterResolveReferences" Condition="'$(RuntimeFlavor)' != 'Mono' and '$(TestNativeAot)' != 'true'"> - - + + From 0a65adfd489e59b4eccd4edb5d3c991b575e5261 Mon Sep 17 00:00:00 2001 From: Andy Gocke Date: Sat, 30 Jul 2022 09:21:35 -0700 Subject: [PATCH 07/11] Typo --- src/libraries/externals.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libraries/externals.csproj b/src/libraries/externals.csproj index 65fe4132ceafff..a2fbff29ec0609 100644 --- a/src/libraries/externals.csproj +++ b/src/libraries/externals.csproj @@ -45,7 +45,7 @@ - From 9d7f755b19296b23469d28477484f6c292d0dff8 Mon Sep 17 00:00:00 2001 From: Andy Gocke Date: Sat, 30 Jul 2022 17:51:31 -0700 Subject: [PATCH 08/11] Revert unintentional change --- dotnet.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/dotnet.sh b/dotnet.sh index 0bff75a4dce3f7..a612ebac1ce1e4 100755 --- a/dotnet.sh +++ b/dotnet.sh @@ -23,6 +23,5 @@ source $scriptroot/eng/common/tools.sh InitializeDotNetCli true # Install __dotnetDir=${_InitializeDotNetCli} -export DOTNET_ROOT=${__dotnetDir} dotnetPath=${__dotnetDir}/dotnet ${dotnetPath} "$@" From 236153e2817c0a5cec9b9c3d0ef4ab08ff7d8b24 Mon Sep 17 00:00:00 2001 From: Andy Gocke Date: Sat, 30 Jul 2022 17:53:00 -0700 Subject: [PATCH 09/11] Remove TrimmerDefaultAction changes --- eng/testing/linker/SupportFiles/Directory.Build.props | 1 + src/coreclr/tools/aot/crossgen2/crossgen2.props | 2 ++ 2 files changed, 3 insertions(+) diff --git a/eng/testing/linker/SupportFiles/Directory.Build.props b/eng/testing/linker/SupportFiles/Directory.Build.props index 186c8529b33949..81ee96e3832fbc 100644 --- a/eng/testing/linker/SupportFiles/Directory.Build.props +++ b/eng/testing/linker/SupportFiles/Directory.Build.props @@ -4,6 +4,7 @@ true true link + link false true true diff --git a/src/coreclr/tools/aot/crossgen2/crossgen2.props b/src/coreclr/tools/aot/crossgen2/crossgen2.props index b7aa445890d07e..4fd71a9573f841 100644 --- a/src/coreclr/tools/aot/crossgen2/crossgen2.props +++ b/src/coreclr/tools/aot/crossgen2/crossgen2.props @@ -13,6 +13,8 @@ false Debug;Release;Checked true + + link From 1f3177cf6ae7d950be5bb6a55a1ab479171382b6 Mon Sep 17 00:00:00 2001 From: Andy Gocke Date: Sat, 30 Jul 2022 17:55:22 -0700 Subject: [PATCH 10/11] Accidental re-order --- eng/testing/linker/SupportFiles/Directory.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/testing/linker/SupportFiles/Directory.Build.props b/eng/testing/linker/SupportFiles/Directory.Build.props index 81ee96e3832fbc..c3be2bf7d265ab 100644 --- a/eng/testing/linker/SupportFiles/Directory.Build.props +++ b/eng/testing/linker/SupportFiles/Directory.Build.props @@ -3,8 +3,8 @@ true true true - link link + link false true true From d657c56231b868e03995b630c52d822f040b0011 Mon Sep 17 00:00:00 2001 From: Andy Gocke Date: Mon, 1 Aug 2022 14:20:15 -0700 Subject: [PATCH 11/11] Remove package subscriptions --- eng/Version.Details.xml | 8 -------- eng/Versions.props | 2 -- 2 files changed, 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1f73bb1e416fd5..b49c5339d4d81e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -210,14 +210,6 @@ https://github.com/dotnet/runtime 214ca6db481923aa49bac2d2b75b9aca4041b304 - - https://github.com/dotnet/runtime - 214ca6db481923aa49bac2d2b75b9aca4041b304 - - - https://github.com/dotnet/runtime - 214ca6db481923aa49bac2d2b75b9aca4041b304 - https://github.com/dotnet/runtime 214ca6db481923aa49bac2d2b75b9aca4041b304 diff --git a/eng/Versions.props b/eng/Versions.props index cec00875b841a5..0933a79bd3ba91 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -74,8 +74,6 @@ 6.0.0-preview.1.102 7.0.0-rc.1.22374.4 - 7.0.0-rc.1.22374.4 - 7.0.0-rc.1.22374.4 6.0.0 7.0.0-rc.1.22374.4