Skip to content

Commit

Permalink
Use correct bits to compile take #3
Browse files Browse the repository at this point in the history
  • Loading branch information
davidwrighton authored and dougbu committed May 24, 2021
1 parent 0fe88e7 commit 97e1133
Showing 1 changed file with 2 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -112,14 +112,14 @@ This package is an internal implementation of the .NET Core SDK and is not meant
<RuntimePackageRootVariableName>PkgMicrosoft_NETCore_App_Runtime_$(RuntimeIdentifier)</RuntimePackageRootVariableName>

<BuildOsName>$(TargetOsName)</BuildOsName>
<BuildOsName Condition="'$(TargetOsName)' == 'linux-musl' and '$(BuildArchitecture)'!='x64'">linux</BuildOsName>
<!-- linux-musl-arm and linux-musl-arm64 are built on an Ubuntu container with cross compilation tools. linux-musl-x64 is built in an alpine container -->
<BuildOsName Condition="'$(TargetOsName)' == 'linux-musl' and '$(TargetArchitecture)'!='x64'">linux</BuildOsName>
<Crossgen2PackageRootVariableName>PkgMicrosoft_NETCore_App_Crossgen2_$(BuildOsName)-$(BuildArchitecture)</Crossgen2PackageRootVariableName>

<AssetTargetFallback>$(AssetTargetFallback);native,Version=0.0</AssetTargetFallback>

<NativePlatform>$(TargetArchitecture)</NativePlatform>
<NativePlatform Condition=" '$(NativePlatform)' == 'x86' ">Win32</NativePlatform>

</PropertyGroup>

<ItemGroup>
Expand Down Expand Up @@ -474,7 +474,6 @@ This package is an internal implementation of the .NET Core SDK and is not meant
Command="&quot;$(CrossgenToolPath)&quot; $(Crossgen2Args) -o:&quot;$(TargetDir)%(FileName)%(Extension)&quot; &quot;%(IntermediateCrossgenAssembly.Identity)&quot;"
IgnoreStandardErrorWarningFormat="true"
StandardOutputImportance="High" />

</Target>

<!--
Expand Down

0 comments on commit 97e1133

Please sign in to comment.