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

Add macOS RIDs to code which adds ILAsm/ILDAsm dependency (#17385)

Browse source 
Co-authored-by: Michael Simons <msimons@microsoft.com>
This commit is contained in:
Jo Shields 2023-09-20 12:33:17 -04:00 • committed by GitHub
parent dbeae1ac71
commit b2928a69f5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

46
src/SourceBuild/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj
View file

@ -19,10 +19,12 @@
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<LinuxRid Include="linux-x64" /> <UnixRid Include="linux-x64" />
<LinuxRid Include="linux-musl-x64" /> <UnixRid Include="linux-musl-x64" />
<LinuxRid Include="linux-arm64" /> <UnixRid Include="linux-arm64" />
<LinuxRid Include="linux-musl-arm64" /> <UnixRid Include="linux-musl-arm64" />
<UnixRid Include="osx-x64" />
<UnixRid Include="osx-arm64" />
</ItemGroup> </ItemGroup>
<!-- These packages will be replaced with ms-built packages downloaded from official package feeds--> <!-- These packages will be replaced with ms-built packages downloaded from official package feeds-->
@ -51,44 +53,44 @@
AfterTargets="CollectPackageDownloads" AfterTargets="CollectPackageDownloads"
Returns="@(PackageDownload)"> Returns="@(PackageDownload)">
<ItemGroup> <ItemGroup>
<!-- Generate a cross-product between runtime packs and Linux RIDs --> <!-- Generate a cross-product between runtime packs and Unix RIDs -->
<RuntimePackWithLinuxRid Include="@(RuntimePack)"> <RuntimePackWithUnixRid Include="@(RuntimePack)">
<LinuxRid>%(LinuxRid.Identity)</LinuxRid> <UnixRid>%(UnixRid.Identity)</UnixRid>
</RuntimePackWithLinuxRid> </RuntimePackWithUnixRid>
<!-- Generate a cross-product between portable packages and Linux RIDs --> <!-- Generate a cross-product between portable packages and Unix RIDs -->
<PortablePackageWithLinuxRid Include="@(PortablePackage)"> <PortablePackageWithUnixRid Include="@(PortablePackage)">
<LinuxRid>%(LinuxRid.Identity)</LinuxRid> <UnixRid>%(UnixRid.Identity)</UnixRid>
</PortablePackageWithLinuxRid> </PortablePackageWithUnixRid>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<!-- <!--
Generate package names for runtime packs by concatenating the base name with the Linux RID Generate package names for runtime packs by concatenating the base name with the Unix RID
(e.g. Microsoft.Aspnetcore.App.Runtime.linux-x64) (e.g. Microsoft.Aspnetcore.App.Runtime.linux-x64)
--> -->
<PackageWithName Include="@(RuntimePackWithLinuxRid)"> <PackageWithName Include="@(RuntimePackWithUnixRid)">
<PackageName>%(RuntimePackWithLinuxRid.Identity).%(RuntimePackWithLinuxRid.LinuxRid)</PackageName> <PackageName>%(RuntimePackWithUnixRid.Identity).%(RuntimePackWithUnixRid.UnixRid)</PackageName>
</PackageWithName> </PackageWithName>
<!-- <!--
Include the base name of each portable package (e.g. Microsoft.NETCore.ILAsm) Include the base name of each portable package (e.g. Microsoft.NETCore.ILAsm)
Exclude any that are native packages. Exclude any that are native packages.
--> -->
<PackageWithName Include="@(PortablePackageWithLinuxRid)" Condition=" '%(PortablePackageWithLinuxRid.IsNative)' != 'true' "> <PackageWithName Include="@(PortablePackageWithUnixRid)" Condition=" '%(PortablePackageWithUnixRid.IsNative)' != 'true' ">
<PackageName>%(PortablePackageWithLinuxRid.Identity)</PackageName> <PackageName>%(PortablePackageWithUnixRid.Identity)</PackageName>
</PackageWithName> </PackageWithName>
<!-- <!--
Generate Linux RID package names for portable packages by concatenating the base name with the Linux RID Generate Unix RID package names for portable packages by concatenating the base name with the Unix RID
(e.g. runtime.linux-x64.Microsoft.NETCore.ILAsm) (e.g. runtime.linux-x64.Microsoft.NETCore.ILAsm)
Do this for two groups: native and non-native packages. They have different naming conventions. Do this for two groups: native and non-native packages. They have different naming conventions.
--> -->
<PackageWithName Include="@(PortablePackageWithLinuxRid)" Condition=" '%(PortablePackageWithLinuxRid.IsNative)' != 'true' "> <PackageWithName Include="@(PortablePackageWithUnixRid)" Condition=" '%(PortablePackageWithUnixRid.IsNative)' != 'true' ">
<PackageName>runtime.%(PortablePackageWithLinuxRid.LinuxRid).%(PortablePackageWithLinuxRid.Identity)</PackageName> <PackageName>runtime.%(PortablePackageWithUnixRid.UnixRid).%(PortablePackageWithUnixRid.Identity)</PackageName>
</PackageWithName> </PackageWithName>
<PackageWithName Include="@(PortablePackageWithLinuxRid)" Condition=" '%(PortablePackageWithLinuxRid.IsNative)' == 'true' "> <PackageWithName Include="@(PortablePackageWithUnixRid)" Condition=" '%(PortablePackageWithUnixRid.IsNative)' == 'true' ">
<PackageName>runtime.%(PortablePackageWithLinuxRid.LinuxRid).runtime.native.%(PortablePackageWithLinuxRid.Identity)</PackageName> <PackageName>runtime.%(PortablePackageWithUnixRid.UnixRid).runtime.native.%(PortablePackageWithUnixRid.Identity)</PackageName>
</PackageWithName> </PackageWithName>
</ItemGroup> </ItemGroup>