Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Align riscv64 and loongarch64 checks #19469

Merged
merged 1 commit into from
Apr 15, 2024
Merged

Align riscv64 and loongarch64 checks #19469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<Architecture Condition="'$(Architecture)' == '' AND '$(BuildArchitecture)' == 's390x'">$(BuildArchitecture)</Architecture>
<Architecture Condition="'$(Architecture)' == '' AND '$(BuildArchitecture)' == 'ppc64le'">$(BuildArchitecture)</Architecture>
<Architecture Condition="'$(Architecture)' == '' AND '$(BuildArchitecture)' == 'loongarch64'">$(BuildArchitecture)</Architecture>
<Architecture Condition="'$(Architecture)' == '' AND '$(BuildArchitecture)' == 'riscv64'">$(BuildArchitecture)</Architecture>
<Architecture Condition="'$(Architecture)' == ''">x64</Architecture>

<!--
Expand Down
5 changes: 2 additions & 3 deletions src/redist/targets/Crossgen.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
<Project>

<!-- Crossgen is currently not supported on the s390x, ppc64le architecture as using mono instead of CoreCLR.
Neither crossgen2 nor mono is supported on the loongarch64 architecture at present. -->
<!-- Crossgen is currently not supported on the s390x, ppc64le architecture as using mono instead of CoreCLR. -->
<Target Name="CrossgenLayout"
Condition="'$(DISABLE_CROSSGEN)' == '' AND '$(Architecture)' != 's390x' AND '$(Architecture)' != 'ppc64le' AND '$(Architecture)' != 'loongarch64' AND !('$(CROSSBUILD)' == 'true' AND '$(DotNetBuild)' == 'true')"
Condition="'$(DISABLE_CROSSGEN)' == '' AND '$(Architecture)' != 's390x' AND '$(Architecture)' != 'ppc64le' AND !('$(CROSSBUILD)' == 'true' AND '$(DotNetBuild)' == 'true')"
DependsOnTargets="SetSdkBrandingInfo">
<PropertyGroup>
<RuntimeNETCoreAppPackageName>microsoft.netcore.app.runtime.$(SharedFrameworkRid)</RuntimeNETCoreAppPackageName>
Expand Down
10 changes: 8 additions & 2 deletions src/redist/targets/GenerateBundledVersions.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,12 +232,14 @@
@(Net80AppHostRids);
linux-riscv64;
linux-musl-riscv64;
linux-musl-loongarch64;
" />

<Net90RuntimePackRids Include="
@(Net80RuntimePackRids);
linux-riscv64;
linux-musl-riscv64;
linux-musl-loongarch64
" />

<NetCoreAppHostRids Include="@(Net90AppHostRids)" />
Expand Down Expand Up @@ -306,6 +308,8 @@
@(Net80MonoRuntimePackRids);
linux-riscv64;
linux-musl-riscv64;
linux-loongarch64;
linux-musl-loongarch64;
" />

<MonoRuntimePackRids Include="@(Net90MonoRuntimePackRids)" />
Expand Down Expand Up @@ -350,7 +354,9 @@
<Net90Crossgen2SupportedRids Include="
@(Net80Crossgen2SupportedRids);
linux-riscv64;
linux-musl-riscv64
linux-musl-riscv64;
linux-loongarch64;
linux-musl-loongarch64;
" />

<Crossgen2SupportedRids Include="@(Net90Crossgen2SupportedRids);" />
Expand Down Expand Up @@ -426,7 +432,7 @@
<AspNetCore70RuntimePackRids Include="@(AspNetCore60RuntimePackRids);linux-ppc64le" />
<AspNetCore80RuntimePackRids Include="@(AspNetCore70RuntimePackRids);freebsd-x64;freebsd-arm64" />
<AspNetCore80RuntimePackRids Remove="win-arm" />
<AspNetCore90RuntimePackRids Include="@(AspNetCore80RuntimePackRids);linux-riscv64;linux-musl-riscv64" />
<AspNetCore90RuntimePackRids Include="@(AspNetCore80RuntimePackRids);linux-riscv64;linux-musl-riscv64;linux-loongarch64;linux-musl-loongarch64;" />
<AspNetCoreRuntimePackRids Include="@(AspNetCore90RuntimePackRids)" />

<WindowsDesktop30RuntimePackRids Include="win-x64;win-x86" />
Expand Down