From 445a265c1fecc12df8f1cec261b9a8a4bf6f8338 Mon Sep 17 00:00:00 2001
From: Tymoteusz Wenerski <t.wenerski@partner.samsung.com>
Date: Fri, 20 Dec 2024 14:48:29 +0100
Subject: [PATCH] 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 @@
     <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" />
     <OfficialBuildRID Include="linux-musl-x64" Platform="x64" />
     <OfficialBuildRID Include="linux-x64" Platform="x64" />
     <OfficialBuildRID Include="osx-x64" Platform="x64" />
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 @@
     <OfficialBuildRID Include="linux-arm64">
       <Platform>arm64</Platform>
     </OfficialBuildRID>
-    <OfficialBuildRID Include="linux-riscv64">
-      <Platform>riscv64</Platform>
-    </OfficialBuildRID>
     <OfficialBuildRID Include="linux-musl-arm">
       <Platform>arm</Platform>
     </OfficialBuildRID>
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 @@
     <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-riscv64;linux-musl-x64;linux-musl-arm64;osx-x64;osx-arm64;win-x64;win-arm64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>linux-x64;linux-arm64;linux-musl-x64;linux-musl-arm64;osx-x64;osx-arm64;win-x64;win-arm64</RuntimeIdentifiers>
     <GenerateInstallers>false</GenerateInstallers>
     <PublishReadyToRun>false</PublishReadyToRun>
     <HostJsonTargetPath>tools/</HostJsonTargetPath>
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 @@
-<Project>
-  <Import Project="runtime.native.System.IO.Ports.props" />
-</Project>
\ No newline at end of file