|
112 | 112 | <CombinedSharedHostAndFrameworkArchive>$(NetRuntimeDownloadDirectory)/combinedSharedHostAndFrameworkArchive$(ArchiveExtension)</CombinedSharedHostAndFrameworkArchive>
|
113 | 113 | </PropertyGroup>
|
114 | 114 |
|
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 |
| - |
125 | 115 | <ItemGroup>
|
126 | 116 | <BundledLayoutComponent Include="CombinedSharedHostAndFrameworkArchive">
|
127 | 117 | <BaseUrl>$(NetRuntimeRootUrl)</BaseUrl>
|
|
157 | 147 | <RelativeLayoutPath>packs/%(PackageName)/%(PackageVersion)</RelativeLayoutPath>
|
158 | 148 | </BundledLayoutPackage>
|
159 | 149 |
|
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 |
| - |
183 | 150 | <BundledLayoutPackage Include="MicrosoftNetCoreAppRuntimePackNupkg" Condition="'$(BundleRuntimePacks)' == 'true'">
|
184 | 151 | <PackageName>Microsoft.NETCore.App.Runtime.$(SharedFrameworkRid)</PackageName>
|
185 | 152 | <PackageVersion>$(MicrosoftNETCoreAppRuntimePackageVersion)</PackageVersion>
|
|
0 commit comments