From c4277b99ef2b623dca6ed2c1427890855e3deced Mon Sep 17 00:00:00 2001 From: Andy Gocke Date: Mon, 18 Jul 2022 11:27:40 -0700 Subject: [PATCH] Always use live host (#71725) Eliminates package dependency on the host during build and test. This change adds steps to various build pipelines to build the host where they wouldn't before. It also stops us from building the Microsoft.NETCore.{DotnetHost,DotNetHostPolicy,DotNetHostResolver}, since those weren't necessary beyond this internal usage. --- eng/Subsets.props | 5 ++-- eng/Version.Details.xml | 8 ------- eng/Versions.props | 2 -- 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 ++++--------------- 11 files changed, 20 insertions(+), 101 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 fc751194d2459..39ecf822395bc 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+ - https://github.com/dotnet/runtime - 1967649721058a457157d4321af3e6fceaa5441b - - - https://github.com/dotnet/runtime - 1967649721058a457157d4321af3e6fceaa5441b - https://github.com/dotnet/runtime 1967649721058a457157d4321af3e6fceaa5441b diff --git a/eng/Versions.props b/eng/Versions.props index 27c391875d161..49b36949e354f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -73,8 +73,6 @@ 6.0.0-preview.1.102 7.0.0-preview.7.22358.7 - 7.0.0-preview.7.22358.7 - 7.0.0-preview.7.22358.7 3.1.0 7.0.0-preview.7.22358.7 diff --git a/eng/liveBuilds.targets b/eng/liveBuilds.targets index fcda36b713b24..be20c6f295177 100644 --- a/eng/liveBuilds.targets +++ b/eng/liveBuilds.targets @@ -118,6 +118,16 @@ + + + + true + + + true + + + diff --git a/eng/pipelines/libraries/run-test-job.yml b/eng/pipelines/libraries/run-test-job.yml index c6fbe831a4d9b..0d18eda1283f9 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 9d5a87980d421..0000000000000 --- 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 7eb288ae2ba37..0000000000000 --- 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 2991a01cf40d5..0000000000000 --- 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 9a6e896b59f87..ded4836a568ef 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 cce7d6aa54bb8..230e91e97e457 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 @@ -53,12 +53,6 @@ - - - - - - diff --git a/src/libraries/externals.csproj b/src/libraries/externals.csproj index 415545b533e76..7774650719390 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)" /> -