Skip to content

Commit f76045c

Browse files
authored
Remove DotNetHost, DotNetHostPolicy, and DotNetHostResolver packages (#91655)
1 parent a7f7d9e commit f76045c

7 files changed

Lines changed: 0 additions & 145 deletions

File tree

Directory.Build.targets

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -214,19 +214,6 @@
214214
<SharedFrameworkNugetVersion>$(ProductVersion)</SharedFrameworkNugetVersion>
215215
<NuGetVersion>$(SharedFrameworkNugetVersion)</NuGetVersion>
216216
<InstallersRelativePath>Runtime/$(SharedFrameworkNugetVersion)/</InstallersRelativePath>
217-
218-
<!--
219-
By default, we are always building the nuget packages for HostPolicy, HostFXR and
220-
Dotnet/AppHost. Thus, the properties (below) are always set to $(ProductVersion).
221-
However, there are scenarios when only some of these components will change (e.g. during
222-
servicing, we may only change HostPolicy but not HostFXR and Dotnet/AppHost). In such cases,
223-
pass the appropriate version value(s) as argument to the build command in order to override;
224-
e.g. 'build -p:HostPolicyVersion=x.y.z ...'
225-
-->
226-
<HostVersion Condition="'$(HostVersion)' == ''">$(ProductVersion)</HostVersion>
227-
<AppHostVersion Condition="'$(AppHostVersion)' == ''">$(ProductVersion)</AppHostVersion>
228-
<HostResolverVersion Condition="'$(HostResolverVersion)' == ''">$(ProductVersion)</HostResolverVersion>
229-
<HostPolicyVersion Condition="'$(HostPolicyVersion)' == ''">$(ProductVersion)</HostPolicyVersion>
230217
</PropertyGroup>
231218
</Target>
232219
</Project>

src/installer/pkg/projects/Directory.Build.targets

Lines changed: 0 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -16,71 +16,7 @@
1616
<SymbolPackageOutputPath>$(PackageOutputPath)</SymbolPackageOutputPath>
1717
</PropertyGroup>
1818

19-
<!--
20-
We should not build some pkgproj in source-build (i.e. targeting-pack).
21-
-->
22-
<Target Name="GetSourceBuildSkipBuildProps"
23-
Condition="'$(DotNetBuildFromSource)' == 'true' and '$(AlwaysBuildEvenInSourceBuild)' != 'true'"
24-
BeforeTargets="GetSkipBuildProps">
25-
<PropertyGroup Condition="'$(FrameworkPackType)' == 'targeting'">
26-
<SkipBuild>true</SkipBuild>
27-
</PropertyGroup>
28-
</Target>
29-
30-
<!--
31-
For any Dependency items with a VersionProp, set it to the property by that name given by the
32-
version generation target. For any with a VersionFromProject, query the ProductVersion from that
33-
project file and use it as the dependency's version.
34-
-->
35-
<Target Name="SetCustomPackageDependencyVersions"
36-
BeforeTargets="GetPackageDependencies"
37-
DependsOnTargets="GetProductVersions">
38-
<!--
39-
Generate a VersionProp name for each dependency with VersionFromProject. The batched MSBuild
40-
task then generates the property, which is picked up by the VersionProp implementation.
41-
42-
Using PropertyName rather than ItemName on the MSBuild task avoids the difficulty in
43-
reattaching the separate list of items back into the original Dependency items without any
44-
reasonable Join operation available.
45-
-->
46-
<ItemGroup>
47-
<Dependency
48-
VersionProp="_VersionProp_$([System.String]::new('%(Dependency.Identity)').Replace('.', '_'))"
49-
Condition="'%(Dependency.VersionFromProject)' != ''" />
50-
</ItemGroup>
51-
52-
<MSBuild
53-
Condition="'%(Dependency.VersionFromProject)' != ''"
54-
Projects="%(Dependency.VersionFromProject)"
55-
Targets="ReturnProductVersion">
56-
<Output TaskParameter="TargetOutputs" PropertyName="%(Dependency.VersionProp)" />
57-
</MSBuild>
58-
59-
<!-- Use batching to use the value of an arbitrary property as the version. -->
60-
<ItemGroup>
61-
<Dependency Version="$(%(Dependency.VersionProp))" Condition="'%(Dependency.VersionProp)' != ''" />
62-
</ItemGroup>
63-
</Target>
64-
65-
<!--
66-
If the project is configured to use a shipped package version, set it. Use a target because we
67-
need the versions from GetProductVersions.
68-
-->
69-
<Target Name="SetSpecificPackageVersion"
70-
Condition="'$(VersionProp)' != ''"
71-
BeforeTargets="GenerateNuSpec"
72-
DependsOnTargets="GetProductVersions">
73-
<!-- Use item metadata: $(%(foo)) works, $($(foo)) doesn't. -->
74-
<ItemGroup>
75-
<VersionPropItem Include="$(VersionProp)" />
76-
</ItemGroup>
77-
<PropertyGroup>
78-
<Version>$(%(VersionPropItem.Identity))</Version>
79-
</PropertyGroup>
80-
</Target>
81-
8219
<Target Name="SetTargetBasedPackageVersion"
83-
Condition="'$(VersionProp)' == ''"
8420
BeforeTargets="GenerateNuSpec"
8521
DependsOnTargets="GetProductVersions">
8622
<PropertyGroup>
@@ -118,12 +54,6 @@
11854
</ItemGroup>
11955
</Target>
12056

121-
<Target Name="SetupFindSiblingSymbolFilesByNameForSymbolPackage">
122-
<ItemGroup>
123-
<FindSiblingSymbolsForFile Include="@(File)" />
124-
</ItemGroup>
125-
</Target>
126-
12757
<!--
12858
Ensures package reports dir exists, to work around the issue in VerifyClosure task:
12959
https://github.com/dotnet/arcade/issues/6090

src/installer/pkg/projects/Microsoft.NETCore.DotNetAppHost/Microsoft.NETCore.DotNetAppHost.pkgproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<VersionProp>AppHostVersion</VersionProp>
43
<PackageDescription>Provides the .NET app bootstrapper intended for use in the application directory</PackageDescription>
54
</PropertyGroup>
65

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

Lines changed: 0 additions & 17 deletions
This file was deleted.

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

Lines changed: 0 additions & 19 deletions
This file was deleted.

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

Lines changed: 0 additions & 22 deletions
This file was deleted.
Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
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" />
74
<ProjectReference Include="@(ProjectReference)" AdditionalProperties="PackageTargetRuntime=$(OutputRID)" />
85
</ItemGroup>
96
</Project>

0 commit comments

Comments
 (0)