diff --git a/eng/Subsets.props b/eng/Subsets.props index 39ecf822395bc8..fc751194d2459e 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+host + clr.native+linuxdac+clr.corelib+clr.tools+clr.nativecorelib+clr.packages+clr.nativeaotlibs+clr.crossarchtools clr.iltools+clr.packages @@ -61,8 +61,7 @@ mono.llvm+ $(DefaultMonoSubsets)mono.wasmruntime+ $(DefaultMonoSubsets)mono.aotcross+ - $(DefaultMonoSubsets)mono.runtime+mono.corelib+mono.packages+ - $(DefaultMonoSubsets)host+ + $(DefaultMonoSubsets)mono.runtime+mono.corelib+mono.packages + 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 7d0ad9844b0a7d..0ccedcd2b7c2e7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -74,6 +74,8 @@ 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 be20c6f295177e..fcda36b713b240 100644 --- a/eng/liveBuilds.targets +++ b/eng/liveBuilds.targets @@ -118,16 +118,6 @@ - - - - true - - - true - - - diff --git a/eng/pipelines/libraries/run-test-job.yml b/eng/pipelines/libraries/run-test-job.yml index 0d18eda1283f9b..c6fbe831a4d9bd 100644 --- a/eng/pipelines/libraries/run-test-job.yml +++ b/eng/pipelines/libraries/run-test-job.yml @@ -32,14 +32,13 @@ 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: ${{ parameters.container }} + container: '' # we just send to helix, no need to use a container. condition: ${{ parameters.condition }} testScope: ${{ parameters.testScope }} runTests: true @@ -90,7 +89,7 @@ jobs: - ${{ if ne(parameters.liveRuntimeBuildConfig, '') }}: - script: $(_buildScript) - -subset host+libs.pretest + -subset 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 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 @@ + + + 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 230e91e97e4578..cce7d6aa54bb88 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,6 +53,12 @@ + + + + + + diff --git a/src/libraries/externals.csproj b/src/libraries/externals.csproj index 7774650719390c..415545b533e76a 100644 --- a/src/libraries/externals.csproj +++ b/src/libraries/externals.csproj @@ -1,5 +1,7 @@  + + $(PackageRID) true $(NetCoreAppCurrent) @@ -7,6 +9,7 @@ true false true + true @@ -18,16 +21,23 @@ - + + + + + + + Condition="'$(TestNativeAot)' != 'true'"> true @@ -38,7 +48,13 @@ - + + + + + + @@ -62,7 +78,7 @@ SkipUnchangedFiles="true" UseHardlinksIfPossible="$(UseHardlink)" /> -