mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Move NetCore.App item back to previous location

Browse source
This commit is contained in:
Drew Scoggins 2023-01-30 10:55:02 -08:00
parent c1a4771218
commit 5c969ccd3f
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/redist/targets/GenerateLayout.targets
View file

@ -129,6 +129,13 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<BundledLayoutComponent Include="CombinedSharedHostAndFrameworkArchive">
<BaseUrl>$(CoreSetupRootUrl)$(CoreSetupBlobVersion)</BaseUrl>
<BaseUrl Condition=" '$(DotNetBuildFromSource)' == 'true' AND '$(DotNetBuildFromSourceFlavor)' == 'Product' ">$(CoreSetupRootUrl)</BaseUrl>
<DownloadFileName>$(CombinedFrameworkHostArchiveFileName)</DownloadFileName>
<RelativeLayoutPath></RelativeLayoutPath>
</BundledLayoutComponent>
<BundledLayoutPackage Include="MicrosoftNetCoreAppTargetingPackNupkg"> <BundledLayoutPackage Include="MicrosoftNetCoreAppTargetingPackNupkg">
<PackageName>Microsoft.NETCore.App.Ref</PackageName> <PackageName>Microsoft.NETCore.App.Ref</PackageName>
<PackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</PackageVersion> <PackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</PackageVersion>
@ -323,6 +330,7 @@
<PackageVersion>$(MicrosoftWindowsDesktopAppRefPackageVersion)</PackageVersion> <PackageVersion>$(MicrosoftWindowsDesktopAppRefPackageVersion)</PackageVersion>
<TargetFramework>$(TargetFramework)</TargetFramework> <TargetFramework>$(TargetFramework)</TargetFramework>
<RelativeLayoutPath>packs/%(PackageName)/%(PackageVersion)</RelativeLayoutPath> <RelativeLayoutPath>packs/%(PackageName)/%(PackageVersion)</RelativeLayoutPath>
<DirectoriesToCopy>shared/Microsoft.WindowsDesktop.App</DirectoriesToCopy>
</BundledLayoutPackage> </BundledLayoutPackage>
<BundledLayoutComponent Include="WinFormsAndWpfSharedFxArchiveFile"> <BundledLayoutComponent Include="WinFormsAndWpfSharedFxArchiveFile">
@ -337,15 +345,6 @@
</BundledInstallerComponent> </BundledInstallerComponent>
</ItemGroup> </ItemGroup>
<ItemGroup>
<BundledLayoutComponent Include="CombinedSharedHostAndFrameworkArchive">
<BaseUrl>$(CoreSetupRootUrl)$(CoreSetupBlobVersion)</BaseUrl>
<BaseUrl Condition=" '$(DotNetBuildFromSource)' == 'true' AND '$(DotNetBuildFromSourceFlavor)' == 'Product' ">$(CoreSetupRootUrl)</BaseUrl>
<DownloadFileName>$(CombinedFrameworkHostArchiveFileName)</DownloadFileName>
<RelativeLayoutPath></RelativeLayoutPath>
</BundledLayoutComponent>
</ItemGroup>
</Target> </Target>
<Target Name="DownloadBundledComponents" DependsOnTargets="SetupBundledComponents"> <Target Name="DownloadBundledComponents" DependsOnTargets="SetupBundledComponents">