Skip to content

Commit

Permalink
Fix Platform setting in mono nuget Directory.Build.props (#32491)
Browse files Browse the repository at this point in the history
Otherwise doing `./mono.sh -pack` didn't work since it'd use amd64 instead of x64.
We copied much of this logic from coreclr so I assume this is specific to their build, but I still don't fully understand every bit.
  • Loading branch information
akoeplinger authored Feb 18, 2020
1 parent 446c224 commit 6c3b8ad
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/mono/netcore/nuget/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -181,14 +181,14 @@
<BuildRID Include="@(OfficialBuildRID)" Exclude="$(PackageRID)"/>
<BuildRID Include="$(PackageRID)"
Condition="'$(_isSupportedOSGroup)' == 'true'">
<Platform Condition="'$(ArchGroup)' == 'x64'">amd64</Platform>
<Platform Condition="'$(ArchGroup)' == 'x64'">x64</Platform>
<Platform Condition="'$(ArchGroup)' != 'x64'">$(ArchGroup)</Platform>
</BuildRID>
</ItemGroup>

<ItemGroup>
<_project Include="@(BuildRID)">
<Platform Condition="'%(Platform)' == ''">amd64</Platform>
<Platform Condition="'%(Platform)' == ''">x64</Platform>
<PackageTargetRuntime>%(Identity)</PackageTargetRuntime>
<AdditionalProperties>PackageTargetRuntime=%(Identity);Platform=%(Platform)</AdditionalProperties>
</_project>
Expand Down

0 comments on commit 6c3b8ad

Please sign in to comment.