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

Identify riscv64 as valid arch #18247

Merged
merged 5 commits into from
Jan 19, 2024
Merged

Identify riscv64 as valid arch #18247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6e0f96c
Identify riscv64 as valid arch
am11 Jan 14, 2024
33db280
Update GenerateBundledVersions.targets
am11 Jan 14, 2024
a2a128f
Make GenerateBundledVersions.targets more consistent
akoeplinger Jan 19, 2024
d741be0
Update GenerateBundledVersions.targets
akoeplinger Jan 19, 2024
8df94c7
Merge branch 'main' into main
akoeplinger Jan 19, 2024
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 src/SourceBuild/content/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
<TargetArchitecture Condition="'$(TargetArchitecture)' == '' and '$(BuildArchitecture)' == 'armv6'">armv6</TargetArchitecture>
<TargetArchitecture Condition="'$(TargetArchitecture)' == '' and '$(BuildArchitecture)' == 'armel'">armel</TargetArchitecture>
<TargetArchitecture Condition="'$(TargetArchitecture)' == '' and '$(BuildArchitecture)' == 'arm64'">arm64</TargetArchitecture>
<TargetArchitecture Condition="'$(TargetArchitecture)' == '' and '$(BuildArchitecture)' == 'riscv64'">riscv64</TargetArchitecture>
<TargetArchitecture Condition="'$(TargetArchitecture)' == '' and '$(BuildArchitecture)' == 'loongarch64'">loongarch64</TargetArchitecture>
<TargetArchitecture Condition="'$(TargetArchitecture)' == '' and '$(BuildArchitecture)' == 's390x'">s390x</TargetArchitecture>
<TargetArchitecture Condition="'$(TargetArchitecture)' == '' and '$(BuildArchitecture)' == 'ppc64le'">ppc64le</TargetArchitecture>
Expand Down
6 changes: 3 additions & 3 deletions src/SourceBuild/content/eng/tools/init-build.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,9 @@
<ArmEnvironmentVariables Condition="'$(Platform)' == 'armel'">ROOTFS_DIR=$(ArtifactsObjDir)crossrootfs/armel</ArmEnvironmentVariables>
</PropertyGroup>

<Exec Command="$(ArmEnvironmentVariables) $(RepositoryEngineeringDir)cross/build-rootfs.sh"
Condition="$(TargetArchitecture.Contains('arm')) and '$(TargetArchitecture)' != 'armel' and '$(BuildArchitecture)' != 'arm64' and '$(BuildArchitecture)' != 'arm'" />
<Exec Command="$(ArmEnvironmentVariables) $(RepositoryEngineeringDir)cross/armel/tizen-build-rootfs.sh"
<Exec Command="$(ArmEnvironmentVariables) $(RepositoryEngineeringDir)common/cross/build-rootfs.sh"
Condition="'$(TargetArchitecture)' != 'armel' and '$(BuildArchitecture)' != '$(TargetArchitecture)'" />
<Exec Command="$(ArmEnvironmentVariables) $(RepositoryEngineeringDir)common/cross/armel/tizen-build-rootfs.sh"
Condition="'$(TargetArchitecture)' == 'armel'" />
</Target>

Expand Down
64 changes: 43 additions & 21 deletions src/redist/targets/GenerateBundledVersions.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,10 +205,6 @@
linux-ppc64le;
"/>

<Net80AppHostRids Include="
@(Net70AppHostRids);
" />

<Net70RuntimePackRids Include="
@(Net60RuntimePackRids);
linux-bionic-arm;
Expand All @@ -218,21 +214,34 @@
linux-ppc64le;
" />

<Net80RuntimePackRids Include="
@(Net70RuntimePackRids);
<Net80AppHostRids Include="
@(Net70AppHostRids);
" />

<Net80AppHostRids Remove="win-arm" />

<NetCoreAppHostRids Include="
@(Net80AppHostRids);
<Net80RuntimePackRids Include="
@(Net70RuntimePackRids);
" />

<Net80RuntimePackRids Remove="win-arm" />

<NetCoreRuntimePackRids Include="
<Net90AppHostRids Include="
@(Net80AppHostRids);
linux-riscv64;
linux-musl-riscv64;
" />

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

<NetCoreAppHostRids Include="@(Net90AppHostRids)" />

<NetCoreRuntimePackRids Include="@(Net90RuntimePackRids)" />

<!--
In source-build, we build the current RID from source, which may be
non-portable and/or not an official RID.
Expand Down Expand Up @@ -276,18 +285,22 @@
<Net60MonoRuntimePackRids Remove="tizen.4.0.0-armel;tizen.5.0.0-armel" />

<Net70MonoRuntimePackRids Include="
@(Net60MonoRuntimePackRids);
" />
@(Net60MonoRuntimePackRids);
" />

<Net80MonoRuntimePackRids Include="
@(Net70MonoRuntimePackRids);
" />
@(Net70MonoRuntimePackRids);
" />

<Net80MonoRuntimePackRids Remove="win-arm" />

<MonoRuntimePackRids Include="
@(Net80MonoRuntimePackRids);
" />
<Net90MonoRuntimePackRids Include="
@(Net80MonoRuntimePackRids);
linux-riscv64;
linux-musl-riscv64;
" />

<MonoRuntimePackRids Remove="win-arm" />
<MonoRuntimePackRids Include="@(Net90MonoRuntimePackRids)" />

<AspNetCore30RuntimePackRids Include="
win-x64;
Expand Down Expand Up @@ -320,9 +333,15 @@

<Net80Crossgen2SupportedRids Include="@(Net70Crossgen2SupportedRids)" />

<Crossgen2SupportedRids Include="@(Net80Crossgen2SupportedRids)" />
<Net80Crossgen2SupportedRids Remove="win-arm" />

<Crossgen2SupportedRids Remove="win-arm" />
<Net90Crossgen2SupportedRids Include="
@(Net80Crossgen2SupportedRids);
linux-riscv64;
linux-musl-riscv64
" />

<Crossgen2SupportedRids Include="@(Net90Crossgen2SupportedRids);" />

<Net70ILCompilerSupportedRids Include="
linux-arm64;
Expand Down Expand Up @@ -359,7 +378,7 @@
"
/>

<NativeAOTRuntimePackRids Include="
<Net90NativeAOTRuntimePackRids Include="
@(Net80NativeAOTRuntimePackRids);
linux-x64;
linux-arm64;
Expand All @@ -372,13 +391,16 @@
"
/>

<NativeAOTRuntimePackRids Include="@(Net90NativeAOTRuntimePackRids)" />

<AspNetCore31RuntimePackRids Include="@(AspNetCore30RuntimePackRids)" />
<AspNetCore50RuntimePackRids Include="@(AspNetCore31RuntimePackRids);linux-musl-arm;win-arm64" />
<AspNetCore60RuntimePackRids Include="@(AspNetCore50RuntimePackRids);osx-arm64;linux-s390x;linux-loongarch64" />
<AspNetCore70RuntimePackRids Include="@(AspNetCore60RuntimePackRids);linux-ppc64le" />
<AspNetCore80RuntimePackRids Include="@(AspNetCore70RuntimePackRids)" />
<AspNetCore80RuntimePackRids Remove="win-arm" />
<AspNetCoreRuntimePackRids Include="@(AspNetCore80RuntimePackRids)" />
<AspNetCore90RuntimePackRids Include="@(AspNetCore80RuntimePackRids);linux-riscv64;linux-musl-riscv64" />
<AspNetCoreRuntimePackRids Include="@(AspNetCore90RuntimePackRids)" />

<WindowsDesktop30RuntimePackRids Include="win-x64;win-x86" />
<WindowsDesktop31RuntimePackRids Include="@(WindowsDesktop30RuntimePackRids)" />
Expand Down