Skip to content

Commit 3535b83

Browse files
author
John Luo
authored
Merge pull request #31205 from dotnet-maestro-bot/merge/release/6.0-preview3-to-main
[automated] Merge branch 'release/6.0-preview3' => 'main'
2 parents 3ef51fb + 4ce1f2c commit 3535b83

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

Directory.Build.targets

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,7 @@
7979
<PropertyGroup>
8080
<!-- When OnlyPackPlatformSpecificPackages is set, only produce packages for projects which set RuntimeIdentifier. -->
8181
<!-- Keep this below where we set "IsPackageInThisPatch" -->
82-
<!-- Do not apply this logic to App.Ref and App.Ref.Internal, it's packability is determined by IsTargetingPackBuilding -->
83-
<IsPackable Condition=" '$(MSBuildProjectName)' != 'Microsoft.AspNetCore.App.Ref' AND '$(MSBuildProjectName)' != 'Microsoft.AspNetCore.App.Ref.Internal' AND '$(OnlyPackPlatformSpecificPackages)' == 'true' AND '$(RuntimeIdentifier)' == '' ">false</IsPackable>
82+
<IsPackable Condition=" '$(OnlyPackPlatformSpecificPackages)' == 'true' AND '$(RuntimeIdentifier)' == '' ">false</IsPackable>
8483
</PropertyGroup>
8584

8685
<PropertyGroup>

eng/Build.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@
9595
</ItemGroup>
9696

9797
<ItemGroup Condition=" '$(BuildInstallers)' == 'true' AND '$(TargetOsName)' == 'win' AND '$(TargetArchitecture)' == 'arm64' ">
98-
<!-- We don't build the bundle here because we'd have to bundle the x86 installer which gets built in a different leg.
99-
Instead we only provide the ARM64 MSI-->
98+
<!-- We don't build the targeting pack installer here because it's built in the x86/x64 leg.
99+
Instead we only provide the ARM64 SharedFramework MSI-->
100100

101101
<!-- Build the SharedFramework wixlib -->
102102
<ProjectToBuild Include="$(RepoRoot)src\Installers\Windows\SharedFrameworkLib\SharedFrameworkLib.wixproj" AdditionalProperties="Platform=arm64" />

0 commit comments

Comments
 (0)