Skip to content

Commit df4091f

Browse files
authored
Remove app host packages for different archs from packs folder (#46911)
1 parent b9afc54 commit df4091f

File tree

1 file changed

+0
-33
lines changed

1 file changed

+0
-33
lines changed

src/Installer/redist-installer/targets/GenerateLayout.targets

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -112,16 +112,6 @@
112112
<CombinedSharedHostAndFrameworkArchive>$(NetRuntimeDownloadDirectory)/combinedSharedHostAndFrameworkArchive$(ArchiveExtension)</CombinedSharedHostAndFrameworkArchive>
113113
</PropertyGroup>
114114

115-
<PropertyGroup Condition="$([MSBuild]::IsOSPlatform('WINDOWS')) And !$(Architecture.StartsWith('arm'))">
116-
<AlternateAppHostRid>win-$(AlternateArchitecture)</AlternateAppHostRid>
117-
<Arm64AppHostRid>win-arm64</Arm64AppHostRid>
118-
</PropertyGroup>
119-
120-
<PropertyGroup Condition="$([MSBuild]::IsOSPlatform('WINDOWS')) And '$(Architecture)' == 'arm64'">
121-
<AlternateAppHostRid>win-x86</AlternateAppHostRid>
122-
<x64AppHostRid>win-x64</x64AppHostRid>
123-
</PropertyGroup>
124-
125115
<ItemGroup>
126116
<BundledLayoutComponent Include="CombinedSharedHostAndFrameworkArchive">
127117
<BaseUrl>$(NetRuntimeRootUrl)</BaseUrl>
@@ -157,29 +147,6 @@
157147
<RelativeLayoutPath>packs/%(PackageName)/%(PackageVersion)</RelativeLayoutPath>
158148
</BundledLayoutPackage>
159149

160-
<!-- These apphost packages come from different verticals and require a join inside the VMR. Disable for now:
161-
https://github.com/dotnet/source-build/issues/4114 -->
162-
<BundledLayoutPackage Include="MicrosoftNetCoreAppHostPackNupkg_Alternate" Condition="'$(AlternateAppHostRid)' != '' and '$(DotNetBuild)' != 'true'">
163-
<PackageName>Microsoft.NETCore.App.Host.$(AlternateAppHostRid)</PackageName>
164-
<PackageVersion>$(MicrosoftNETCoreAppHostPackageVersion)</PackageVersion>
165-
<TargetFramework>$(TargetFramework)</TargetFramework>
166-
<RelativeLayoutPath>packs/%(PackageName)/%(PackageVersion)</RelativeLayoutPath>
167-
</BundledLayoutPackage>
168-
169-
<BundledLayoutPackage Include="MicrosoftNetCoreAppHostPackNupkg_Arm64" Condition="'$(Arm64AppHostRid)' != '' and '$(DotNetBuild)' != 'true'">
170-
<PackageName>Microsoft.NETCore.App.Host.$(Arm64AppHostRid)</PackageName>
171-
<PackageVersion>$(MicrosoftNETCoreAppHostPackageVersion)</PackageVersion>
172-
<TargetFramework>$(TargetFramework)</TargetFramework>
173-
<RelativeLayoutPath>packs/%(PackageName)/%(PackageVersion)</RelativeLayoutPath>
174-
</BundledLayoutPackage>
175-
176-
<BundledLayoutPackage Include="MicrosoftNetCoreAppHostPackNupkg_x64" Condition="'$(x64AppHostRid)' != '' and '$(DotNetBuild)' != 'true'">
177-
<PackageName>Microsoft.NETCore.App.Host.$(x64AppHostRid)</PackageName>
178-
<PackageVersion>$(MicrosoftNETCoreAppHostPackageVersion)</PackageVersion>
179-
<TargetFramework>$(TargetFramework)</TargetFramework>
180-
<RelativeLayoutPath>packs/%(PackageName)/%(PackageVersion)</RelativeLayoutPath>
181-
</BundledLayoutPackage>
182-
183150
<BundledLayoutPackage Include="MicrosoftNetCoreAppRuntimePackNupkg" Condition="'$(BundleRuntimePacks)' == 'true'">
184151
<PackageName>Microsoft.NETCore.App.Runtime.$(SharedFrameworkRid)</PackageName>
185152
<PackageVersion>$(MicrosoftNETCoreAppRuntimePackageVersion)</PackageVersion>

0 commit comments

Comments
 (0)