From 725cb512c4a5d0b32f0ffe2aa56f5c73ef328364 Mon Sep 17 00:00:00 2001 From: Tymoteusz Wenerski Date: Tue, 19 Nov 2024 14:53:14 +0100 Subject: [PATCH 1/5] add riscv64 RID --- .../ILCompilerRIDs.props | 1 + .../pkg/projects/netcoreappRIDs.props | 3 + ...Microsoft.NETCore.App.MonoCrossAOT.sfxproj | 2 +- .../tests/TestUtils/NetCoreAppBuilder.cs | 1 + .../src/PortableRuntimeIdentifierGraph.json | 5 + .../src/runtime.json | 94 +++++++++++++++++++ .../System.IO.Ports/System.IO.Ports.sln | 6 ++ ...iscv64.runtime.native.System.IO.Ports.proj | 3 + 8 files changed, 114 insertions(+), 1 deletion(-) create mode 100644 src/libraries/System.IO.Ports/pkg/runtime.linux-riscv64.runtime.native.System.IO.Ports.proj diff --git a/src/installer/pkg/projects/Microsoft.DotNet.ILCompiler/ILCompilerRIDs.props b/src/installer/pkg/projects/Microsoft.DotNet.ILCompiler/ILCompilerRIDs.props index c6010482efa8a..0a77d0e8a5216 100644 --- a/src/installer/pkg/projects/Microsoft.DotNet.ILCompiler/ILCompilerRIDs.props +++ b/src/installer/pkg/projects/Microsoft.DotNet.ILCompiler/ILCompilerRIDs.props @@ -6,6 +6,7 @@ + diff --git a/src/installer/pkg/projects/netcoreappRIDs.props b/src/installer/pkg/projects/netcoreappRIDs.props index 6c84841697b42..2704d0a672726 100644 --- a/src/installer/pkg/projects/netcoreappRIDs.props +++ b/src/installer/pkg/projects/netcoreappRIDs.props @@ -30,6 +30,9 @@ arm64 + + riscv64 + arm diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.MonoCrossAOT.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.MonoCrossAOT.sfxproj index 74b9b1462dccc..f9073e2357e43 100644 --- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.MonoCrossAOT.sfxproj +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.MonoCrossAOT.sfxproj @@ -7,7 +7,7 @@ Microsoft.NETCore.App.MonoCrossAOT Microsoft.NETCore.App.Runtime.AOT.$(RuntimeIdentifier).Cross.$(TargetCrossRid) monocrossaot - linux-x64;linux-arm64;linux-musl-x64;linux-musl-arm64;osx-x64;osx-arm64;win-x64;win-arm64 + linux-x64;linux-arm64;linux-riscv64;linux-musl-x64;linux-musl-arm64;osx-x64;osx-arm64;win-x64;win-arm64 false false tools/ diff --git a/src/installer/tests/TestUtils/NetCoreAppBuilder.cs b/src/installer/tests/TestUtils/NetCoreAppBuilder.cs index d2099b3ebfc4b..608463ea70055 100644 --- a/src/installer/tests/TestUtils/NetCoreAppBuilder.cs +++ b/src/installer/tests/TestUtils/NetCoreAppBuilder.cs @@ -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") .WithRuntimeFallbacks("linux-x64", "linux", "any") .WithRuntimeFallbacks("linux-musl-arm64", "linux-musl", "linux", "any") .WithRuntimeFallbacks("linux-musl-x64", "linux-musl", "linux", "any") diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/PortableRuntimeIdentifierGraph.json b/src/libraries/Microsoft.NETCore.Platforms/src/PortableRuntimeIdentifierGraph.json index 925b55d9d6c16..7b588842aab32 100644 --- a/src/libraries/Microsoft.NETCore.Platforms/src/PortableRuntimeIdentifierGraph.json +++ b/src/libraries/Microsoft.NETCore.Platforms/src/PortableRuntimeIdentifierGraph.json @@ -397,6 +397,11 @@ "unix" ] }, + "unix-riscv64": { + "#import": [ + "unix" + ] + }, "unix-armel": { "#import": [ "unix" diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json index 64e7c5546b529..477e1ffde7913 100644 --- a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json +++ b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json @@ -1156,6 +1156,12 @@ "linux-arm64" ] }, + "debian-riscv64": { + "#import": [ + "debian", + "linux-riscv64" + ] + }, "debian-armel": { "#import": [ "debian", @@ -1261,6 +1267,12 @@ "debian-arm64" ] }, + "debian.12-riscv64": { + "#import": [ + "debian.12", + "debian-riscv64" + ] + }, "debian.12-armel": { "#import": [ "debian.12", @@ -1371,6 +1383,12 @@ "linux-arm64" ] }, + "fedora-riscv64": { + "#import": [ + "fedora", + "linux-riscv64" + ] + }, "fedora-x64": { "#import": [ "fedora", @@ -1660,6 +1678,12 @@ "fedora-arm64" ] }, + "fedora.39-riscv64": { + "#import": [ + "fedora.39", + "fedora-riscv64" + ] + }, "fedora.39-x64": { "#import": [ "fedora.39", @@ -3259,6 +3283,12 @@ "linux-arm64" ] }, + "tizen-riscv64": { + "#import": [ + "tizen", + "linux-riscv64" + ] + }, "tizen-armel": { "#import": [ "tizen", @@ -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", @@ -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", @@ -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", @@ -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", @@ -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", @@ -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", @@ -3664,6 +3730,12 @@ "debian-arm64" ] }, + "ubuntu-riscv64": { + "#import": [ + "ubuntu", + "debian-riscv64" + ] + }, "ubuntu-x64": { "#import": [ "ubuntu", @@ -4191,6 +4263,12 @@ "ubuntu-arm64" ] }, + "ubuntu.23.04-riscv64": { + "#import": [ + "ubuntu.23.04", + "ubuntu-riscv64" + ] + }, "ubuntu.23.04-x64": { "#import": [ "ubuntu.23.04", @@ -4232,6 +4310,17 @@ "ubuntu-x86" ] }, + "ubuntu.24.04": { + "#import": [ + "ubuntu" + ] + }, + "ubuntu.24.04-riscv64": { + "#import": [ + "ubuntu.24.04", + "ubuntu-riscv64" + ] + }, "unix": { "#import": [ "any" @@ -4247,6 +4336,11 @@ "unix" ] }, + "unix-riscv64": { + "#import": [ + "unix" + ] + }, "unix-armel": { "#import": [ "unix" diff --git a/src/libraries/System.IO.Ports/System.IO.Ports.sln b/src/libraries/System.IO.Ports/System.IO.Ports.sln index 56ce01ae1be11..5b26c0134280b 100644 --- a/src/libraries/System.IO.Ports/System.IO.Ports.sln +++ b/src/libraries/System.IO.Ports/System.IO.Ports.sln @@ -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}" @@ -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 diff --git a/src/libraries/System.IO.Ports/pkg/runtime.linux-riscv64.runtime.native.System.IO.Ports.proj b/src/libraries/System.IO.Ports/pkg/runtime.linux-riscv64.runtime.native.System.IO.Ports.proj new file mode 100644 index 0000000000000..3baf069b7f505 --- /dev/null +++ b/src/libraries/System.IO.Ports/pkg/runtime.linux-riscv64.runtime.native.System.IO.Ports.proj @@ -0,0 +1,3 @@ + + + \ No newline at end of file From 445a265c1fecc12df8f1cec261b9a8a4bf6f8338 Mon Sep 17 00:00:00 2001 From: Tymoteusz Wenerski Date: Fri, 20 Dec 2024 14:48:29 +0100 Subject: [PATCH 2/5] apply review comments --- .../ILCompilerRIDs.props | 1 - .../pkg/projects/netcoreappRIDs.props | 3 - ...Microsoft.NETCore.App.MonoCrossAOT.sfxproj | 2 +- .../tests/TestUtils/NetCoreAppBuilder.cs | 1 + .../src/PortableRuntimeIdentifierGraph.json | 5 - .../src/runtime.json | 106 ------------------ ...iscv64.runtime.native.System.IO.Ports.proj | 3 - 7 files changed, 2 insertions(+), 119 deletions(-) delete mode 100644 src/libraries/System.IO.Ports/pkg/runtime.linux-riscv64.runtime.native.System.IO.Ports.proj diff --git a/src/installer/pkg/projects/Microsoft.DotNet.ILCompiler/ILCompilerRIDs.props b/src/installer/pkg/projects/Microsoft.DotNet.ILCompiler/ILCompilerRIDs.props index 0a77d0e8a5216..c6010482efa8a 100644 --- a/src/installer/pkg/projects/Microsoft.DotNet.ILCompiler/ILCompilerRIDs.props +++ b/src/installer/pkg/projects/Microsoft.DotNet.ILCompiler/ILCompilerRIDs.props @@ -6,7 +6,6 @@ - diff --git a/src/installer/pkg/projects/netcoreappRIDs.props b/src/installer/pkg/projects/netcoreappRIDs.props index 2704d0a672726..6c84841697b42 100644 --- a/src/installer/pkg/projects/netcoreappRIDs.props +++ b/src/installer/pkg/projects/netcoreappRIDs.props @@ -30,9 +30,6 @@ arm64 - - riscv64 - arm diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.MonoCrossAOT.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.MonoCrossAOT.sfxproj index f9073e2357e43..74b9b1462dccc 100644 --- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.MonoCrossAOT.sfxproj +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.MonoCrossAOT.sfxproj @@ -7,7 +7,7 @@ Microsoft.NETCore.App.MonoCrossAOT Microsoft.NETCore.App.Runtime.AOT.$(RuntimeIdentifier).Cross.$(TargetCrossRid) monocrossaot - linux-x64;linux-arm64;linux-riscv64;linux-musl-x64;linux-musl-arm64;osx-x64;osx-arm64;win-x64;win-arm64 + linux-x64;linux-arm64;linux-musl-x64;linux-musl-arm64;osx-x64;osx-arm64;win-x64;win-arm64 false false tools/ diff --git a/src/installer/tests/TestUtils/NetCoreAppBuilder.cs b/src/installer/tests/TestUtils/NetCoreAppBuilder.cs index 608463ea70055..636b8260af6af 100644 --- a/src/installer/tests/TestUtils/NetCoreAppBuilder.cs +++ b/src/installer/tests/TestUtils/NetCoreAppBuilder.cs @@ -359,6 +359,7 @@ public NetCoreAppBuilder WithStandardRuntimeFallbacks() .WithRuntimeFallbacks("linux-riscv64", "linux", "any") .WithRuntimeFallbacks("linux-x64", "linux", "any") .WithRuntimeFallbacks("linux-musl-arm64", "linux-musl", "linux", "any") + .WithRuntimeFallbacks("linux-musl-riscv64", "linux-musl", "linux", "any") .WithRuntimeFallbacks("linux-musl-x64", "linux-musl", "linux", "any") .WithRuntimeFallbacks("linux", "any") .WithRuntimeFallbacks("osx.10.12-x64", "osx-x64", "osx", "any") diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/PortableRuntimeIdentifierGraph.json b/src/libraries/Microsoft.NETCore.Platforms/src/PortableRuntimeIdentifierGraph.json index 7b588842aab32..925b55d9d6c16 100644 --- a/src/libraries/Microsoft.NETCore.Platforms/src/PortableRuntimeIdentifierGraph.json +++ b/src/libraries/Microsoft.NETCore.Platforms/src/PortableRuntimeIdentifierGraph.json @@ -397,11 +397,6 @@ "unix" ] }, - "unix-riscv64": { - "#import": [ - "unix" - ] - }, "unix-armel": { "#import": [ "unix" diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json index 477e1ffde7913..4aaa3c43558a4 100644 --- a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json +++ b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json @@ -1156,12 +1156,6 @@ "linux-arm64" ] }, - "debian-riscv64": { - "#import": [ - "debian", - "linux-riscv64" - ] - }, "debian-armel": { "#import": [ "debian", @@ -1267,12 +1261,6 @@ "debian-arm64" ] }, - "debian.12-riscv64": { - "#import": [ - "debian.12", - "debian-riscv64" - ] - }, "debian.12-armel": { "#import": [ "debian.12", @@ -1383,12 +1371,6 @@ "linux-arm64" ] }, - "fedora-riscv64": { - "#import": [ - "fedora", - "linux-riscv64" - ] - }, "fedora-x64": { "#import": [ "fedora", @@ -1678,12 +1660,6 @@ "fedora-arm64" ] }, - "fedora.39-riscv64": { - "#import": [ - "fedora.39", - "fedora-riscv64" - ] - }, "fedora.39-x64": { "#import": [ "fedora.39", @@ -2153,12 +2129,6 @@ "linux-ppc64le" ] }, - "linux-musl-riscv64": { - "#import": [ - "linux-musl", - "linux-riscv64" - ] - }, "linux-musl-loongarch64": { "#import": [ "linux-musl", @@ -2189,12 +2159,6 @@ "unix-ppc64le" ] }, - "linux-riscv64": { - "#import": [ - "linux", - "unix-riscv64" - ] - }, "linux-s390x": { "#import": [ "linux", @@ -3283,12 +3247,6 @@ "linux-arm64" ] }, - "tizen-riscv64": { - "#import": [ - "tizen", - "linux-riscv64" - ] - }, "tizen-armel": { "#import": [ "tizen", @@ -3312,12 +3270,6 @@ "tizen-arm64" ] }, - "tizen.4.0.0-riscv64": { - "#import": [ - "tizen.4.0.0", - "tizen-riscv64" - ] - }, "tizen.4.0.0-armel": { "#import": [ "tizen.4.0.0", @@ -3341,12 +3293,6 @@ "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", @@ -3370,12 +3316,6 @@ "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", @@ -3399,12 +3339,6 @@ "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", @@ -3428,12 +3362,6 @@ "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", @@ -3457,12 +3385,6 @@ "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", @@ -3730,12 +3652,6 @@ "debian-arm64" ] }, - "ubuntu-riscv64": { - "#import": [ - "ubuntu", - "debian-riscv64" - ] - }, "ubuntu-x64": { "#import": [ "ubuntu", @@ -4263,12 +4179,6 @@ "ubuntu-arm64" ] }, - "ubuntu.23.04-riscv64": { - "#import": [ - "ubuntu.23.04", - "ubuntu-riscv64" - ] - }, "ubuntu.23.04-x64": { "#import": [ "ubuntu.23.04", @@ -4315,12 +4225,6 @@ "ubuntu" ] }, - "ubuntu.24.04-riscv64": { - "#import": [ - "ubuntu.24.04", - "ubuntu-riscv64" - ] - }, "unix": { "#import": [ "any" @@ -4336,11 +4240,6 @@ "unix" ] }, - "unix-riscv64": { - "#import": [ - "unix" - ] - }, "unix-armel": { "#import": [ "unix" @@ -4366,11 +4265,6 @@ "unix" ] }, - "unix-riscv64": { - "#import": [ - "unix" - ] - }, "unix-s390x": { "#import": [ "unix" diff --git a/src/libraries/System.IO.Ports/pkg/runtime.linux-riscv64.runtime.native.System.IO.Ports.proj b/src/libraries/System.IO.Ports/pkg/runtime.linux-riscv64.runtime.native.System.IO.Ports.proj deleted file mode 100644 index 3baf069b7f505..0000000000000 --- a/src/libraries/System.IO.Ports/pkg/runtime.linux-riscv64.runtime.native.System.IO.Ports.proj +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file From ac29f023b68012e9630637d86c657be50e8fc7ee Mon Sep 17 00:00:00 2001 From: Tymoteusz Wenerski Date: Fri, 20 Dec 2024 14:55:42 +0100 Subject: [PATCH 3/5] remove ganges in runtime.json --- src/libraries/Microsoft.NETCore.Platforms/src/runtime.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json index 4aaa3c43558a4..3984f082b9d92 100644 --- a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json +++ b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json @@ -4220,11 +4220,6 @@ "ubuntu-x86" ] }, - "ubuntu.24.04": { - "#import": [ - "ubuntu" - ] - }, "unix": { "#import": [ "any" From da258c1e70c5143097f45cfa65d024ad22cbf8ed Mon Sep 17 00:00:00 2001 From: Tymoteusz Wenerski Date: Fri, 20 Dec 2024 15:02:16 +0100 Subject: [PATCH 4/5] remove changes in System.IO.Ports.sln --- src/libraries/System.IO.Ports/System.IO.Ports.sln | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/libraries/System.IO.Ports/System.IO.Ports.sln b/src/libraries/System.IO.Ports/System.IO.Ports.sln index 5b26c0134280b..56ce01ae1be11 100644 --- a/src/libraries/System.IO.Ports/System.IO.Ports.sln +++ b/src/libraries/System.IO.Ports/System.IO.Ports.sln @@ -13,8 +13,6 @@ 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}" @@ -117,10 +115,6 @@ 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 From 499f379f87b0d728048b25b0cb1e29d4d75b161b Mon Sep 17 00:00:00 2001 From: Tymoteusz Wenerski Date: Sat, 21 Dec 2024 14:15:29 +0100 Subject: [PATCH 5/5] Update runtime.json --- .../src/runtime.json | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json index 3984f082b9d92..64e7c5546b529 100644 --- a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json +++ b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json @@ -2129,6 +2129,12 @@ "linux-ppc64le" ] }, + "linux-musl-riscv64": { + "#import": [ + "linux-musl", + "linux-riscv64" + ] + }, "linux-musl-loongarch64": { "#import": [ "linux-musl", @@ -2159,6 +2165,12 @@ "unix-ppc64le" ] }, + "linux-riscv64": { + "#import": [ + "linux", + "unix-riscv64" + ] + }, "linux-s390x": { "#import": [ "linux", @@ -4260,6 +4272,11 @@ "unix" ] }, + "unix-riscv64": { + "#import": [ + "unix" + ] + }, "unix-s390x": { "#import": [ "unix"