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

[RISC-V] Fix HostActivation.Tests unknown-rid #110687

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open

[RISC-V] Fix HostActivation.Tests unknown-rid #110687

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
725cb51
add riscv64 RID
sirntar Nov 19, 2024
291f186
Merge branch 'main' into host-tests
sirntar Dec 13, 2024
b609f45
Merge branch 'main' into host-tests
sirntar Dec 20, 2024
445a265
apply review comments
sirntar Dec 20, 2024
ac29f02
remove ganges in runtime.json
sirntar Dec 20, 2024
14176b4
Merge branch 'main' into host-tests
sirntar Dec 20, 2024
da258c1
remove changes in System.IO.Ports.sln
sirntar Dec 20, 2024
499f379
Update runtime.json
sirntar Dec 21, 2024
0971dcf
Merge branch 'main' into host-tests
sirntar Dec 23, 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/installer/pkg/projects/Microsoft.DotNet.ILCompiler/ILCompilerRIDs.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<OfficialBuildRID Include="linux-arm" Platform="arm" />
<OfficialBuildRID Include="linux-musl-arm64" Platform="arm64" />
<OfficialBuildRID Include="linux-arm64" Platform="arm64" />
<OfficialBuildRID Include="linux-riscv64" Platform="riscv64" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This gets included on the last line.

I think we can delete freebsd from this list as well. @dotnet/runtime-infrastructure does anyone remember if having community-platforms in this list necessary? See line 16 onwards. IIUC, freebsd later gets excluded in src/installer/pkg/projects/Directory.Build.props because it is not an official RID.

<OfficialBuildRID Include="linux-musl-x64" Platform="x64" />
<OfficialBuildRID Include="linux-x64" Platform="x64" />
<OfficialBuildRID Include="osx-x64" Platform="x64" />
Expand Down
3 changes: 3 additions & 0 deletions src/installer/pkg/projects/netcoreappRIDs.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@
<OfficialBuildRID Include="linux-arm64">
<Platform>arm64</Platform>
</OfficialBuildRID>
<OfficialBuildRID Include="linux-riscv64">
sirntar marked this conversation as resolved.
Show resolved Hide resolved
<Platform>riscv64</Platform>
</OfficialBuildRID>
<OfficialBuildRID Include="linux-musl-arm">
<Platform>arm</Platform>
</OfficialBuildRID>
Expand Down
2 changes: 1 addition & 1 deletion src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.MonoCrossAOT.sfxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<SharedFrameworkName>Microsoft.NETCore.App.MonoCrossAOT</SharedFrameworkName>
<OverridePackageId>Microsoft.NETCore.App.Runtime.AOT.$(RuntimeIdentifier).Cross.$(TargetCrossRid)</OverridePackageId>
<SharedFrameworkHostFileNameOverride>monocrossaot</SharedFrameworkHostFileNameOverride>
<RuntimeIdentifiers>linux-x64;linux-arm64;linux-musl-x64;linux-musl-arm64;osx-x64;osx-arm64;win-x64;win-arm64</RuntimeIdentifiers>
<RuntimeIdentifiers>linux-x64;linux-arm64;linux-riscv64;linux-musl-x64;linux-musl-arm64;osx-x64;osx-arm64;win-x64;win-arm64</RuntimeIdentifiers>
sirntar marked this conversation as resolved.
Show resolved Hide resolved
<GenerateInstallers>false</GenerateInstallers>
<PublishReadyToRun>false</PublishReadyToRun>
<HostJsonTargetPath>tools/</HostJsonTargetPath>
Expand Down
1 change: 1 addition & 0 deletions src/installer/tests/TestUtils/NetCoreAppBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,6 +356,7 @@ public NetCoreAppBuilder WithStandardRuntimeFallbacks()
.WithRuntimeFallbacks("win-x86", "win", "any")
.WithRuntimeFallbacks("win", "any")
.WithRuntimeFallbacks("linux-arm64", "linux", "any")
.WithRuntimeFallbacks("linux-riscv64", "linux", "any")
sirntar marked this conversation as resolved.
Show resolved Hide resolved
.WithRuntimeFallbacks("linux-x64", "linux", "any")
.WithRuntimeFallbacks("linux-musl-arm64", "linux-musl", "linux", "any")
.WithRuntimeFallbacks("linux-musl-x64", "linux-musl", "linux", "any")
Expand Down
5 changes: 5 additions & 0 deletions src/libraries/Microsoft.NETCore.Platforms/src/PortableRuntimeIdentifierGraph.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,11 @@
"unix"
]
},
"unix-riscv64": {
sirntar marked this conversation as resolved.
Show resolved Hide resolved
"#import": [
"unix"
]
},
"unix-armel": {
"#import": [
"unix"
Expand Down
94 changes: 94 additions & 0 deletions src/libraries/Microsoft.NETCore.Platforms/src/runtime.json
View file
Open in desktop
sirntar marked this conversation as resolved.
Show resolved Hide resolved
sirntar marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -1156,6 +1156,12 @@
"linux-arm64"
]
},
"debian-riscv64": {
"#import": [
"debian",
"linux-riscv64"
]
},
"debian-armel": {
"#import": [
"debian",
Expand Down Expand Up @@ -1261,6 +1267,12 @@
"debian-arm64"
]
},
"debian.12-riscv64": {
"#import": [
"debian.12",
"debian-riscv64"
]
},
"debian.12-armel": {
"#import": [
"debian.12",
Expand Down Expand Up @@ -1371,6 +1383,12 @@
"linux-arm64"
]
},
"fedora-riscv64": {
"#import": [
"fedora",
"linux-riscv64"
]
},
"fedora-x64": {
"#import": [
"fedora",
Expand Down Expand Up @@ -1660,6 +1678,12 @@
"fedora-arm64"
]
},
"fedora.39-riscv64": {
"#import": [
"fedora.39",
"fedora-riscv64"
]
},
"fedora.39-x64": {
"#import": [
"fedora.39",
Expand Down Expand Up @@ -3259,6 +3283,12 @@
"linux-arm64"
]
},
"tizen-riscv64": {
"#import": [
"tizen",
"linux-riscv64"
]
},
"tizen-armel": {
"#import": [
"tizen",
Expand All @@ -3282,6 +3312,12 @@
"tizen-arm64"
]
},
"tizen.4.0.0-riscv64": {
"#import": [
"tizen.4.0.0",
"tizen-riscv64"
]
},
"tizen.4.0.0-armel": {
"#import": [
"tizen.4.0.0",
Expand All @@ -3305,6 +3341,12 @@
"tizen.4.0.0-arm64"
]
},
"tizen.5.0.0-riscv64": {
"#import": [
"tizen.5.0.0",
"tizen.4.0.0-riscv64"
]
},
"tizen.5.0.0-armel": {
"#import": [
"tizen.5.0.0",
Expand All @@ -3328,6 +3370,12 @@
"tizen.5.0.0-arm64"
]
},
"tizen.5.5.0-riscv64": {
"#import": [
"tizen.5.5.0",
"tizen.5.0.0-riscv64"
]
},
"tizen.5.5.0-armel": {
"#import": [
"tizen.5.5.0",
Expand All @@ -3351,6 +3399,12 @@
"tizen.5.5.0-arm64"
]
},
"tizen.6.0.0-riscv64": {
"#import": [
"tizen.6.0.0",
"tizen.5.5.0-riscv64"
]
},
"tizen.6.0.0-armel": {
"#import": [
"tizen.6.0.0",
Expand All @@ -3374,6 +3428,12 @@
"tizen.6.0.0-arm64"
]
},
"tizen.6.5.0-riscv64": {
"#import": [
"tizen.6.5.0",
"tizen.6.0.0-riscv64"
]
},
"tizen.6.5.0-armel": {
"#import": [
"tizen.6.5.0",
Expand All @@ -3397,6 +3457,12 @@
"tizen.6.5.0-arm64"
]
},
"tizen.7.0.0-riscv64": {
"#import": [
"tizen.7.0.0",
"tizen.6.5.0-riscv64"
]
},
"tizen.7.0.0-armel": {
"#import": [
"tizen.7.0.0",
Expand Down Expand Up @@ -3664,6 +3730,12 @@
"debian-arm64"
]
},
"ubuntu-riscv64": {
"#import": [
"ubuntu",
"debian-riscv64"
]
},
"ubuntu-x64": {
"#import": [
"ubuntu",
Expand Down Expand Up @@ -4191,6 +4263,12 @@
"ubuntu-arm64"
]
},
"ubuntu.23.04-riscv64": {
"#import": [
"ubuntu.23.04",
"ubuntu-riscv64"
]
},
"ubuntu.23.04-x64": {
"#import": [
"ubuntu.23.04",
Expand Down Expand Up @@ -4232,6 +4310,17 @@
"ubuntu-x86"
]
},
"ubuntu.24.04": {
"#import": [
"ubuntu"
]
},
"ubuntu.24.04-riscv64": {
"#import": [
"ubuntu.24.04",
"ubuntu-riscv64"
]
},
"unix": {
"#import": [
"any"
Expand All @@ -4247,6 +4336,11 @@
"unix"
]
},
"unix-riscv64": {
"#import": [
"unix"
]
},
"unix-armel": {
"#import": [
"unix"
Expand Down
6 changes: 6 additions & 0 deletions src/libraries/System.IO.Ports/System.IO.Ports.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "runtime.linux-arm.runtime.n
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "runtime.linux-arm64.runtime.native.System.IO.Ports", "pkg\runtime.linux-arm64.runtime.native.System.IO.Ports.proj", "{6D0F59C8-8EEC-457E-8916-E0108DAA2E9C}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "runtime.linux-riscv64.runtime.native.System.IO.Ports", "pkg\runtime.linux-riscv64.runtime.native.System.IO.Ports.proj", "{7c53024b-abd5-198f-f081-4fc48db2ca36}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "runtime.linux-bionic-arm64.runtime.native.System.IO.Ports", "pkg\runtime.linux-bionic-arm64.runtime.native.System.IO.Ports.proj", "{75326DCA-5991-4F58-87C4-48BA3C71FC92}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "runtime.linux-bionic-x64.runtime.native.System.IO.Ports", "pkg\runtime.linux-bionic-x64.runtime.native.System.IO.Ports.proj", "{E77C4ED8-597B-4C93-8EA1-D28FA427C284}"
Expand Down Expand Up @@ -115,6 +117,10 @@ Global
{6D0F59C8-8EEC-457E-8916-E0108DAA2E9C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6D0F59C8-8EEC-457E-8916-E0108DAA2E9C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6D0F59C8-8EEC-457E-8916-E0108DAA2E9C}.Release|Any CPU.Build.0 = Release|Any CPU
{7c53024b-abd5-198f-f081-4fc48db2ca36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7c53024b-abd5-198f-f081-4fc48db2ca36}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7c53024b-abd5-198f-f081-4fc48db2ca36}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7c53024b-abd5-198f-f081-4fc48db2ca36}.Release|Any CPU.Build.0 = Release|Any CPU
{75326DCA-5991-4F58-87C4-48BA3C71FC92}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{75326DCA-5991-4F58-87C4-48BA3C71FC92}.Debug|Any CPU.Build.0 = Debug|Any CPU
{75326DCA-5991-4F58-87C4-48BA3C71FC92}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down
3 changes: 3 additions & 0 deletions src/libraries/System.IO.Ports/pkg/runtime.linux-riscv64.runtime.native.System.IO.Ports.proj
View file
Open in desktop
sirntar marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<Project>
<Import Project="runtime.native.System.IO.Ports.props" />
</Project>