Skip to content

File tree

3 files changed

+11
-5
lines changed

3 files changed

+11
-5
lines changed
 

‎Directory.Build.props

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<Architecture Condition="'$(Architecture)' == '' AND '$(BuildArchitecture)' == 's390x'">$(BuildArchitecture)</Architecture>
88
<Architecture Condition="'$(Architecture)' == '' AND '$(BuildArchitecture)' == 'ppc64le'">$(BuildArchitecture)</Architecture>
99
<Architecture Condition="'$(Architecture)' == '' AND '$(BuildArchitecture)' == 'loongarch64'">$(BuildArchitecture)</Architecture>
10+
<Architecture Condition="'$(Architecture)' == '' AND '$(BuildArchitecture)' == 'riscv64'">$(BuildArchitecture)</Architecture>
1011
<Architecture Condition="'$(Architecture)' == ''">x64</Architecture>
1112

1213
<!--

‎src/redist/targets/Crossgen.targets

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
<Project>
22

3-
<!-- Crossgen is currently not supported on the s390x, ppc64le architecture as using mono instead of CoreCLR.
4-
Neither crossgen2 nor mono is supported on the loongarch64 architecture at present. -->
3+
<!-- Crossgen is currently not supported on the s390x, ppc64le architecture as using mono instead of CoreCLR. -->
54
<Target Name="CrossgenLayout"
6-
Condition="'$(DISABLE_CROSSGEN)' == '' AND '$(Architecture)' != 's390x' AND '$(Architecture)' != 'ppc64le' AND '$(Architecture)' != 'loongarch64' AND !('$(CROSSBUILD)' == 'true' AND '$(DotNetBuild)' == 'true')"
5+
Condition="'$(DISABLE_CROSSGEN)' == '' AND '$(Architecture)' != 's390x' AND '$(Architecture)' != 'ppc64le' AND !('$(CROSSBUILD)' == 'true' AND '$(DotNetBuild)' == 'true')"
76
DependsOnTargets="SetSdkBrandingInfo">
87
<PropertyGroup>
98
<RuntimeNETCoreAppPackageName>microsoft.netcore.app.runtime.$(SharedFrameworkRid)</RuntimeNETCoreAppPackageName>

‎src/redist/targets/GenerateBundledVersions.targets

+8-2
Original file line numberDiff line numberDiff line change
@@ -232,12 +232,14 @@
232232
@(Net80AppHostRids);
233233
linux-riscv64;
234234
linux-musl-riscv64;
235+
linux-musl-loongarch64;
235236
" />
236237

237238
<Net90RuntimePackRids Include="
238239
@(Net80RuntimePackRids);
239240
linux-riscv64;
240241
linux-musl-riscv64;
242+
linux-musl-loongarch64
241243
" />
242244

243245
<NetCoreAppHostRids Include="@(Net90AppHostRids)" />
@@ -306,6 +308,8 @@
306308
@(Net80MonoRuntimePackRids);
307309
linux-riscv64;
308310
linux-musl-riscv64;
311+
linux-loongarch64;
312+
linux-musl-loongarch64;
309313
" />
310314

311315
<MonoRuntimePackRids Include="@(Net90MonoRuntimePackRids)" />
@@ -350,7 +354,9 @@
350354
<Net90Crossgen2SupportedRids Include="
351355
@(Net80Crossgen2SupportedRids);
352356
linux-riscv64;
353-
linux-musl-riscv64
357+
linux-musl-riscv64;
358+
linux-loongarch64;
359+
linux-musl-loongarch64;
354360
" />
355361

356362
<Crossgen2SupportedRids Include="@(Net90Crossgen2SupportedRids);" />
@@ -426,7 +432,7 @@
426432
<AspNetCore70RuntimePackRids Include="@(AspNetCore60RuntimePackRids);linux-ppc64le" />
427433
<AspNetCore80RuntimePackRids Include="@(AspNetCore70RuntimePackRids);freebsd-x64;freebsd-arm64" />
428434
<AspNetCore80RuntimePackRids Remove="win-arm" />
429-
<AspNetCore90RuntimePackRids Include="@(AspNetCore80RuntimePackRids);linux-riscv64;linux-musl-riscv64" />
435+
<AspNetCore90RuntimePackRids Include="@(AspNetCore80RuntimePackRids);linux-riscv64;linux-musl-riscv64;linux-loongarch64;linux-musl-loongarch64;" />
430436
<AspNetCoreRuntimePackRids Include="@(AspNetCore90RuntimePackRids)" />
431437

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

0 commit comments

Comments
 (0)
Please sign in to comment.