Skip to content

Commit

Permalink
Merge pull request #31205 from dotnet-maestro-bot/merge/release/6.0-p…
Browse files Browse the repository at this point in the history
…review3-to-main

[automated] Merge branch 'release/6.0-preview3' => 'main'
  • Loading branch information
John Luo authored Mar 24, 2021
2 parents 3ef51fb + 4ce1f2c commit 3535b83
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
3 changes: 1 addition & 2 deletions Directory.Build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,7 @@
<PropertyGroup>
<!-- When OnlyPackPlatformSpecificPackages is set, only produce packages for projects which set RuntimeIdentifier. -->
<!-- Keep this below where we set "IsPackageInThisPatch" -->
<!-- Do not apply this logic to App.Ref and App.Ref.Internal, it's packability is determined by IsTargetingPackBuilding -->
<IsPackable Condition=" '$(MSBuildProjectName)' != 'Microsoft.AspNetCore.App.Ref' AND '$(MSBuildProjectName)' != 'Microsoft.AspNetCore.App.Ref.Internal' AND '$(OnlyPackPlatformSpecificPackages)' == 'true' AND '$(RuntimeIdentifier)' == '' ">false</IsPackable>
<IsPackable Condition=" '$(OnlyPackPlatformSpecificPackages)' == 'true' AND '$(RuntimeIdentifier)' == '' ">false</IsPackable>
</PropertyGroup>

<PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions eng/Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@
</ItemGroup>

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

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

0 comments on commit 3535b83

Please sign in to comment.