Skip to content

Commit 63692cd

Browse files
agockeagocke
authored
Revert "Always use live host (#71725)" (#72628)
This reverts commit c4277b9.
1 parent cd24e18 commit 63692cd

File tree

11 files changed

+101
-20
lines changed

11 files changed

+101
-20
lines changed

‎eng/Subsets.props‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
</PropertyGroup>
5252

5353
<PropertyGroup>
54-
<DefaultCoreClrSubsets>clr.native+linuxdac+clr.corelib+clr.tools+clr.nativecorelib+clr.packages+clr.nativeaotlibs+clr.crossarchtools+host</DefaultCoreClrSubsets>
54+
<DefaultCoreClrSubsets>clr.native+linuxdac+clr.corelib+clr.tools+clr.nativecorelib+clr.packages+clr.nativeaotlibs+clr.crossarchtools</DefaultCoreClrSubsets>
5555
<!-- Even on platforms that do not support the CoreCLR runtime, we still want to build ilasm/ildasm. -->
5656
<DefaultCoreClrSubsets Condition="'$(PrimaryRuntimeFlavor)' != 'CoreCLR'">clr.iltools+clr.packages</DefaultCoreClrSubsets>
5757

@@ -61,8 +61,7 @@
6161
<DefaultMonoSubsets Condition="'$(MonoAOTEnableLLVM)' == 'true' and '$(MonoAOTLLVMDir)' == ''">mono.llvm+</DefaultMonoSubsets>
6262
<DefaultMonoSubsets Condition="'$(TargetOS)' == 'Browser'">$(DefaultMonoSubsets)mono.wasmruntime+</DefaultMonoSubsets>
6363
<DefaultMonoSubsets Condition="'$(MonoCrossAOTTargetOS)' != ''">$(DefaultMonoSubsets)mono.aotcross+</DefaultMonoSubsets>
64-
<DefaultMonoSubsets>$(DefaultMonoSubsets)mono.runtime+mono.corelib+mono.packages+</DefaultMonoSubsets>
65-
<DefaultMonoSubsets Condition="'$(TargetsMobile)' != 'true'">$(DefaultMonoSubsets)host+</DefaultMonoSubsets>
64+
<DefaultMonoSubsets>$(DefaultMonoSubsets)mono.runtime+mono.corelib+mono.packages</DefaultMonoSubsets>
6665

6766
<DefaultLibrariesSubsets Condition="'$(BuildTargetFramework)' == '$(NetCoreAppCurrent)' or
6867
'$(BuildTargetFramework)' == '' or

‎eng/Version.Details.xml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,14 @@
214214
<Uri>https://github.com/dotnet/runtime</Uri>
215215
<Sha>1967649721058a457157d4321af3e6fceaa5441b</Sha>
216216
</Dependency>
217+
<Dependency Name="Microsoft.NETCore.DotNetHost" Version="7.0.0-preview.7.22358.7">
218+
<Uri>https://github.com/dotnet/runtime</Uri>
219+
<Sha>1967649721058a457157d4321af3e6fceaa5441b</Sha>
220+
</Dependency>
221+
<Dependency Name="Microsoft.NETCore.DotNetHostPolicy" Version="7.0.0-preview.7.22358.7">
222+
<Uri>https://github.com/dotnet/runtime</Uri>
223+
<Sha>1967649721058a457157d4321af3e6fceaa5441b</Sha>
224+
</Dependency>
217225
<Dependency Name="runtime.native.System.IO.Ports" Version="7.0.0-preview.7.22358.7">
218226
<Uri>https://github.com/dotnet/runtime</Uri>
219227
<Sha>1967649721058a457157d4321af3e6fceaa5441b</Sha>

‎eng/Versions.props‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,8 @@
7474
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
7575
<!-- Installer dependencies -->
7676
<MicrosoftNETCoreAppRuntimewinx64Version>7.0.0-preview.7.22358.7</MicrosoftNETCoreAppRuntimewinx64Version>
77+
<MicrosoftNETCoreDotNetHostVersion>7.0.0-preview.7.22358.7</MicrosoftNETCoreDotNetHostVersion>
78+
<MicrosoftNETCoreDotNetHostPolicyVersion>7.0.0-preview.7.22358.7</MicrosoftNETCoreDotNetHostPolicyVersion>
7779
<MicrosoftExtensionsDependencyModelVersion>3.1.0</MicrosoftExtensionsDependencyModelVersion>
7880
<!-- CoreClr dependencies -->
7981
<MicrosoftNETCoreILAsmVersion>7.0.0-preview.7.22358.7</MicrosoftNETCoreILAsmVersion>

‎eng/liveBuilds.targets‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -118,16 +118,6 @@
118118
<MonoIncludeFiles Include="$(MonoArtifactsPath)\include\**\*.*" />
119119
</ItemGroup>
120120

121-
<!-- Host files. Mobile uses a different hosting model, so we don't include the .NET host components there. -->
122-
<ItemGroup Condition="'$(TargetsMobile)' != 'true' and Exists('$(DotNetHostBinDir)')">
123-
<RuntimeFiles Include="$(DotNetHostBinDir)\$(LibPrefix)hostpolicy$(LibSuffix)">
124-
<IsNative>true</IsNative>
125-
</RuntimeFiles>
126-
<RuntimeFiles Include="$(DotNetHostBinDir)\$(LibPrefix)hostfxr$(LibSuffix)">
127-
<IsNative>true</IsNative>
128-
</RuntimeFiles>
129-
</ItemGroup>
130-
131121
<Error Condition="'@(RuntimeFiles)' == ''" Text="The '$(RuntimeFlavor)' subset must be built before building this project." />
132122
</Target>
133123

‎eng/pipelines/libraries/run-test-job.yml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,13 @@ jobs:
3232
osGroup: ${{ parameters.osGroup }}
3333
osSubgroup: ${{ parameters.osSubgroup }}
3434
archType: ${{ parameters.archType }}
35-
crossBuild: ${{ parameters.crossBuild }}
3635
framework: ${{ parameters.framework }}
3736
isOfficialBuild: ${{ parameters.isOfficialBuild }}
3837
liveRuntimeBuildConfig: ${{ parameters.liveRuntimeBuildConfig }}
3938
runtimeFlavor: ${{ parameters.runtimeFlavor }}
4039
runtimeVariant: ${{ parameters.runtimeVariant }}
4140
timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
42-
container: ${{ parameters.container }}
41+
container: '' # we just send to helix, no need to use a container.
4342
condition: ${{ parameters.condition }}
4443
testScope: ${{ parameters.testScope }}
4544
runTests: true
@@ -90,7 +89,7 @@ jobs:
9089

9190
- ${{ if ne(parameters.liveRuntimeBuildConfig, '') }}:
9291
- script: $(_buildScript)
93-
-subset host+libs.pretest
92+
-subset libs.pretest
9493
$(_buildArguments)
9594
/p:RuntimeFlavor=${{ parameters.runtimeFlavor }}
9695
/bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/overrideRuntimeFromLiveDrop.binlog

‎src/installer/pkg/projects/Microsoft.NETCore.DotNetHost/Microsoft.NETCore.DotNetHost.pkgproj‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<VersionProp>HostVersion</VersionProp>
5+
<InstallerName>dotnet-host</InstallerName>
6+
<PackageDescription>Provides an executable implementation of the Microsoft DotNet Framework and SDK launcher module</PackageDescription>
7+
</PropertyGroup>
8+
9+
<ItemGroup Condition="'$(PackageTargetRuntime)' != ''">
10+
<NativeBinary Include="$(DotNetHostBinDir)/dotnet$(ExeSuffix)" />
11+
<File Include="@(NativeBinary)">
12+
<TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath>
13+
<IsNative>true</IsNative>
14+
</File>
15+
</ItemGroup>
16+
17+
</Project>

‎src/installer/pkg/projects/Microsoft.NETCore.DotNetHostPolicy/Microsoft.NETCore.DotNetHostPolicy.pkgproj‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<VersionProp>HostPolicyVersion</VersionProp>
5+
<PackageDescription>Provides a CoreCLR hosting policy implementation -- configuration settings, assembly paths and assembly servicing</PackageDescription>
6+
</PropertyGroup>
7+
8+
<ItemGroup>
9+
<Dependency Include="Microsoft.NETCore.DotNetHostResolver" VersionProp="HostResolverVersion" />
10+
</ItemGroup>
11+
12+
<ItemGroup Condition="'$(PackageTargetRuntime)' != ''">
13+
<NativeBinary Include="$(DotNetHostBinDir)/$(LibPrefix)hostpolicy$(LibSuffix)"/>
14+
<File Include="@(NativeBinary)">
15+
<TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath>
16+
<IsNative>true</IsNative>
17+
</File>
18+
</ItemGroup>
19+
</Project>

‎src/installer/pkg/projects/Microsoft.NETCore.DotNetHostResolver/Microsoft.NETCore.DotNetHostResolver.pkgproj‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<VersionProp>HostResolverVersion</VersionProp>
5+
<InstallerName>dotnet-hostfxr</InstallerName>
6+
<InstallerName Condition="'$(PgoInstrument)' != ''">$(InstallerName)-pgo</InstallerName>
7+
<PackageDescription>Provides an implementation of framework resolution strategy used by Microsoft.NETCore.DotNetHost</PackageDescription>
8+
</PropertyGroup>
9+
10+
<ItemGroup>
11+
<Dependency Include="Microsoft.NETCore.DotNetAppHost" VersionProp="AppHostVersion" />
12+
</ItemGroup>
13+
14+
<ItemGroup Condition="'$(PackageTargetRuntime)' != ''">
15+
<NativeBinary Include="$(DotNetHostBinDir)/$(LibPrefix)hostfxr$(LibSuffix)"/>
16+
<File Include="@(NativeBinary)">
17+
<TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath>
18+
<IsNative>true</IsNative>
19+
</File>
20+
</ItemGroup>
21+
22+
</Project>

‎src/installer/pkg/projects/host-packages.proj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
<Project Sdk="Microsoft.Build.Traversal" DefaultTargets="Pack">
22
<ItemGroup>
33
<ProjectReference Include="Microsoft.NETCore.DotNetAppHost\Microsoft.NETCore.DotNetAppHost.pkgproj" />
4+
<ProjectReference Include="Microsoft.NETCore.DotNetHost\Microsoft.NETCore.DotNetHost.pkgproj" />
5+
<ProjectReference Include="Microsoft.NETCore.DotNetHostPolicy\Microsoft.NETCore.DotNetHostPolicy.pkgproj" />
6+
<ProjectReference Include="Microsoft.NETCore.DotNetHostResolver\Microsoft.NETCore.DotNetHostResolver.pkgproj" />
47
<ProjectReference Include="@(ProjectReference)" AdditionalProperties="PackageTargetRuntime=$(OutputRid)" />
58
</ItemGroup>
69
</Project>

‎src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,12 @@
5353
</ItemGroup>
5454
</Target>
5555

56+
<!-- Mobile uses a different hosting model, so we don't include the .NET host components. -->
57+
<ItemGroup Condition="'$(TargetsMobile)' != 'true'">
58+
<NativeRuntimeAsset Include="$(DotNetHostBinDir)/$(LibPrefix)hostpolicy$(LibSuffix)" />
59+
<NativeRuntimeAsset Include="$(DotNetHostBinDir)/$(LibPrefix)hostfxr$(LibSuffix)" PackOnly="true" />
60+
</ItemGroup>
61+
5662
<Target Name="AddRuntimeFilesToPackage" DependsOnTargets="ResolveRuntimeFilesFromLocalBuild">
5763
<ItemGroup>
5864
<RuntimeFiles Condition="'%(RuntimeFiles.IsNative)' == 'true'">

0 commit comments

Comments
 (0)