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 - 214ca6db481923aa49bac2d2b75b9aca4041b304 - - - https://github.com/dotnet/runtime - 214ca6db481923aa49bac2d2b75b9aca4041b304 - https://github.com/dotnet/runtime 214ca6db481923aa49bac2d2b75b9aca4041b304 diff --git a/eng/Versions.props b/eng/Versions.props index 9d4b272c6686f..2a45d875c7e82 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 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/libraries/externals.csproj b/src/libraries/externals.csproj index 415545b533e76..a2fbff29ec060 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,23 @@ - + - - - + + + + + + Condition="Exists('$(DotNetHostBinDir)') and '$(TestNativeAot)' != 'true'"> true @@ -48,22 +45,7 @@ - - - - - - - - - - - - - @@ -78,7 +60,7 @@ SkipUnchangedFiles="true" UseHardlinksIfPossible="$(UseHardlink)" /> - + +