From f78907b964a8fd3e3d0d2d3c92c21caa55d7cf0f Mon Sep 17 00:00:00 2001
From: Jerome Haltom <jhaltom@alethic.solutions>
Date: Mon, 30 Dec 2024 22:50:08 -0600
Subject: [PATCH] Split ImageRuntime into ImageBinRuntime, so we can deal with
 native libs separately from binaries. Hard code javac-ref RIDs to those that
 are explicitely supported to build IKVM on.

---
 Directory.Build.props                         |  4 ++++
 IKVM.deps.targets                             |  1 +
 src/IKVM.Image-bin/IKVM.Image-bin.csproj      |  4 ++--
 .../IKVM.Image.JDK-bin.csproj                 |  2 +-
 src/IKVM.Image.JDK/IKVM.Image.JDK.csproj      | 22 +++++++++----------
 .../IKVM.Image.JRE-bin.csproj                 |  2 +-
 src/IKVM.Image.JRE/IKVM.Image.JRE.csproj      | 22 +++++++++----------
 src/jar/jar.csproj                            |  2 +-
 src/jarsigner/jarsigner.csproj                |  2 +-
 src/java/java.csproj                          |  2 +-
 src/javac-ref/javac-ref.csproj                |  2 +-
 src/javac/javac.csproj                        |  2 +-
 src/javadoc/javadoc.csproj                    |  2 +-
 src/javah/javah.csproj                        |  2 +-
 src/javap/javap.csproj                        |  2 +-
 src/jdeps/jdeps.csproj                        |  2 +-
 src/keytool/keytool.csproj                    |  2 +-
 src/native2ascii/native2ascii.csproj          |  2 +-
 src/orbd/orbd.csproj                          |  2 +-
 src/policytool/policytool.csproj              |  2 +-
 src/rmic/rmic.csproj                          |  2 +-
 src/schemagen/schemagen.csproj                |  2 +-
 src/wsgen/wsgen.csproj                        |  2 +-
 src/wsimport/wsimport.csproj                  |  2 +-
 src/xjc/xjc.csproj                            |  2 +-
 25 files changed, 49 insertions(+), 44 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index e5d8ceb30..3ed0c3108 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -4,6 +4,8 @@
         <EnabledRuntimes Condition=" '$(EnabledRuntimes)' == '' ">$(SupportedRuntimes)</EnabledRuntimes>
         <SupportedImageRuntimes>win-x64;win-x86;win-arm64;linux-x64;linux-arm;linux-arm64;linux-musl-x64;linux-musl-arm;linux-musl-arm64;osx-x64;osx-arm64;android-arm64</SupportedImageRuntimes>
         <EnabledImageRuntimes Condition=" '$(EnabledImageRuntimes)' == '' ">$(SupportedImageRuntimes)</EnabledImageRuntimes>
+        <SupportedImageBinRuntimes>win-x64;win-x86;win-arm64;linux-x64;linux-arm;linux-arm64;linux-musl-x64;linux-musl-arm;linux-musl-arm64;osx-x64;osx-arm64</SupportedImageBinRuntimes>
+        <EnabledImageBinRuntimes Condition=" '$(EnabledImageBinRuntimes)' == '' ">$(SupportedImageBinRuntimes)</EnabledImageBinRuntimes>
         <SupportedToolRuntimes>win-x64;win-arm64;linux-x64;linux-arm;linux-arm64;linux-musl-x64;linux-musl-arm;linux-musl-arm64;osx-x64;osx-arm64</SupportedToolRuntimes>
         <EnabledToolRuntimes Condition=" '$(EnabledToolRuntimes)' == '' ">$(SupportedToolRuntimes)</EnabledToolRuntimes>
 
@@ -11,6 +13,8 @@
         <_EnabledRuntimes>;$(EnabledRuntimes);</_EnabledRuntimes>
         <_SupportedImageRuntimes>;$(SupportedImageRuntimes);</_SupportedImageRuntimes>
         <_EnabledImageRuntimes>;$(EnabledImageRuntimes);</_EnabledImageRuntimes>
+        <_SupportedImageBinRuntimes>;$(SupportedImageBinRuntimes);</_SupportedImageBinRuntimes>
+        <_EnabledImageBinRuntimes>;$(EnabledImageBinRuntimes);</_EnabledImageBinRuntimes>
         <_SupportedToolRuntimes>;$(SupportedToolRuntimes);</_SupportedToolRuntimes>
         <_EnabledToolRuntimes>;$(EnabledToolRuntimes);</_EnabledToolRuntimes>
     </PropertyGroup>
diff --git a/IKVM.deps.targets b/IKVM.deps.targets
index 05a473980..e6d44de93 100644
--- a/IKVM.deps.targets
+++ b/IKVM.deps.targets
@@ -11,6 +11,7 @@
     <Choose>
         <When Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net461'))">
             <ItemGroup>
+                <Reference Include="System" />
                 <Reference Include="System.Configuration" />
                 <Reference Include="System.IO.Compression" />
                 <Reference Include="System.Security" />
diff --git a/src/IKVM.Image-bin/IKVM.Image-bin.csproj b/src/IKVM.Image-bin/IKVM.Image-bin.csproj
index 6ecc4a6dc..abc699869 100644
--- a/src/IKVM.Image-bin/IKVM.Image-bin.csproj
+++ b/src/IKVM.Image-bin/IKVM.Image-bin.csproj
@@ -46,7 +46,7 @@
     <Target Name="GetDotNetClangProjectReferencesByRuntime" Inputs="@(DotNetClangProjectReference)" Outputs="%(DotNetClangProjectReference.Identity)\null" BeforeTargets="AssignClangProjectConfiguration">
         <PropertyGroup>
             <__SupportedRuntimes>%(DotNetClangProjectReference.SupportedRuntimes)</__SupportedRuntimes>
-            <__SupportedRuntimes Condition=" '$(__SupportedRuntimes)' == '' ">$(_SupportedRuntimes)</__SupportedRuntimes>
+            <__SupportedRuntimes Condition=" '$(__SupportedRuntimes)' == '' ">$(_SupportedImageRuntimes)</__SupportedRuntimes>
         </PropertyGroup>
         <ItemGroup>
             <__SupportedRuntimes Include="$(__SupportedRuntimes)" />
@@ -56,7 +56,7 @@
             <_ReferencedClangProjectReference Include="@(DotNetClangProjectReference)">
                 <RuntimeIdentifier>%(__SupportedRuntimes.Identity)</RuntimeIdentifier>
             </_ReferencedClangProjectReference>
-            <ClangProjectReference Include="@(_ReferencedClangProjectReference)" Condition="$(_EnabledRuntimes.Contains(';%(RuntimeIdentifier);'))">
+            <ClangProjectReference Include="@(_ReferencedClangProjectReference)" Condition="$(_EnabledImageRuntimes.Contains(';%(RuntimeIdentifier);'))">
                 <RuntimeIdentifier>%(RuntimeIdentifier)</RuntimeIdentifier>
             </ClangProjectReference>
         </ItemGroup>
diff --git a/src/IKVM.Image.JDK-bin/IKVM.Image.JDK-bin.csproj b/src/IKVM.Image.JDK-bin/IKVM.Image.JDK-bin.csproj
index 3d0cbd503..42eeae37b 100644
--- a/src/IKVM.Image.JDK-bin/IKVM.Image.JDK-bin.csproj
+++ b/src/IKVM.Image.JDK-bin/IKVM.Image.JDK-bin.csproj
@@ -2,7 +2,7 @@
     
     <PropertyGroup>
         <TargetFrameworks>net472;net6.0;net8.0</TargetFrameworks>
-        <RuntimeIdentifiers>$(_SupportedImageRuntimes)</RuntimeIdentifiers>
+        <RuntimeIdentifiers>$(_SupportedImageBinRuntimes)</RuntimeIdentifiers>
         <ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
         <DisableCopyToOutputDirectory>true</DisableCopyToOutputDirectory>
     </PropertyGroup>
diff --git a/src/IKVM.Image.JDK/IKVM.Image.JDK.csproj b/src/IKVM.Image.JDK/IKVM.Image.JDK.csproj
index 73c152c6d..5d05c4ca9 100644
--- a/src/IKVM.Image.JDK/IKVM.Image.JDK.csproj
+++ b/src/IKVM.Image.JDK/IKVM.Image.JDK.csproj
@@ -12,17 +12,17 @@
     <ItemGroup>
         <ProjectReference Include="..\IKVM.Image\IKVM.Image.csproj" ReferenceOutputAssembly="true" />
         <ProjectReference Include="..\IKVM.Image.JRE\IKVM.Image.JRE.csproj" ReferenceOutputAssembly="true" />
-        <ProjectReference Include="..\IKVM.Image.JDK.runtime.win-x64\IKVM.Image.JDK.runtime.win-x64.csproj" ReferenceOutputAssembly="true" Condition="$(_EnabledImageRuntimes.Contains(';win-x64;'))" />
-        <ProjectReference Include="..\IKVM.Image.JDK.runtime.win-x86\IKVM.Image.JDK.runtime.win-x86.csproj" ReferenceOutputAssembly="true" Condition="$(_EnabledImageRuntimes.Contains(';win-x86;'))" />
-        <ProjectReference Include="..\IKVM.Image.JDK.runtime.win-arm64\IKVM.Image.JDK.runtime.win-arm64.csproj" ReferenceOutputAssembly="true" Condition="$(_EnabledImageRuntimes.Contains(';win-arm64;'))" />
-        <ProjectReference Include="..\IKVM.Image.JDK.runtime.linux-x64\IKVM.Image.JDK.runtime.linux-x64.csproj" ReferenceOutputAssembly="true" Condition="$(_EnabledImageRuntimes.Contains(';linux-x64;'))" />
-        <ProjectReference Include="..\IKVM.Image.JDK.runtime.linux-arm\IKVM.Image.JDK.runtime.linux-arm.csproj" ReferenceOutputAssembly="true" Condition="$(_EnabledImageRuntimes.Contains(';linux-arm;'))" />
-        <ProjectReference Include="..\IKVM.Image.JDK.runtime.linux-arm64\IKVM.Image.JDK.runtime.linux-arm64.csproj" ReferenceOutputAssembly="true" Condition="$(_EnabledImageRuntimes.Contains(';linux-arm64;'))" />
-        <ProjectReference Include="..\IKVM.Image.JDK.runtime.linux-musl-x64\IKVM.Image.JDK.runtime.linux-musl-x64.csproj" ReferenceOutputAssembly="true" Condition="$(_EnabledImageRuntimes.Contains(';linux-musl-x64;'))" />
-        <ProjectReference Include="..\IKVM.Image.JDK.runtime.linux-musl-arm\IKVM.Image.JDK.runtime.linux-musl-arm.csproj" ReferenceOutputAssembly="true" Condition="$(_EnabledImageRuntimes.Contains(';linux-musl-arm;'))" />
-        <ProjectReference Include="..\IKVM.Image.JDK.runtime.linux-musl-arm64\IKVM.Image.JDK.runtime.linux-musl-arm64.csproj" ReferenceOutputAssembly="true" Condition="$(_EnabledImageRuntimes.Contains(';linux-musl-arm64;'))" />
-        <ProjectReference Include="..\IKVM.Image.JDK.runtime.osx-x64\IKVM.Image.JDK.runtime.osx-x64.csproj" ReferenceOutputAssembly="true" Condition="$(_EnabledImageRuntimes.Contains(';osx-x64;'))" />
-        <ProjectReference Include="..\IKVM.Image.JDK.runtime.osx-arm64\IKVM.Image.JDK.runtime.osx-arm64.csproj" ReferenceOutputAssembly="true" Condition="$(_EnabledImageRuntimes.Contains(';osx-arm64;'))" />
+        <ProjectReference Include="..\IKVM.Image.JDK.runtime.win-x64\IKVM.Image.JDK.runtime.win-x64.csproj" ReferenceOutputAssembly="true" Condition="$(_EnabledImageBinRuntimes.Contains(';win-x64;'))" />
+        <ProjectReference Include="..\IKVM.Image.JDK.runtime.win-x86\IKVM.Image.JDK.runtime.win-x86.csproj" ReferenceOutputAssembly="true" Condition="$(_EnabledImageBinRuntimes.Contains(';win-x86;'))" />
+        <ProjectReference Include="..\IKVM.Image.JDK.runtime.win-arm64\IKVM.Image.JDK.runtime.win-arm64.csproj" ReferenceOutputAssembly="true" Condition="$(_EnabledImageBinRuntimes.Contains(';win-arm64;'))" />
+        <ProjectReference Include="..\IKVM.Image.JDK.runtime.linux-x64\IKVM.Image.JDK.runtime.linux-x64.csproj" ReferenceOutputAssembly="true" Condition="$(_EnabledImageBinRuntimes.Contains(';linux-x64;'))" />
+        <ProjectReference Include="..\IKVM.Image.JDK.runtime.linux-arm\IKVM.Image.JDK.runtime.linux-arm.csproj" ReferenceOutputAssembly="true" Condition="$(_EnabledImageBinRuntimes.Contains(';linux-arm;'))" />
+        <ProjectReference Include="..\IKVM.Image.JDK.runtime.linux-arm64\IKVM.Image.JDK.runtime.linux-arm64.csproj" ReferenceOutputAssembly="true" Condition="$(_EnabledImageBinRuntimes.Contains(';linux-arm64;'))" />
+        <ProjectReference Include="..\IKVM.Image.JDK.runtime.linux-musl-x64\IKVM.Image.JDK.runtime.linux-musl-x64.csproj" ReferenceOutputAssembly="true" Condition="$(_EnabledImageBinRuntimes.Contains(';linux-musl-x64;'))" />
+        <ProjectReference Include="..\IKVM.Image.JDK.runtime.linux-musl-arm\IKVM.Image.JDK.runtime.linux-musl-arm.csproj" ReferenceOutputAssembly="true" Condition="$(_EnabledImageBinRuntimes.Contains(';linux-musl-arm;'))" />
+        <ProjectReference Include="..\IKVM.Image.JDK.runtime.linux-musl-arm64\IKVM.Image.JDK.runtime.linux-musl-arm64.csproj" ReferenceOutputAssembly="true" Condition="$(_EnabledImageBinRuntimes.Contains(';linux-musl-arm64;'))" />
+        <ProjectReference Include="..\IKVM.Image.JDK.runtime.osx-x64\IKVM.Image.JDK.runtime.osx-x64.csproj" ReferenceOutputAssembly="true" Condition="$(_EnabledImageBinRuntimes.Contains(';osx-x64;'))" />
+        <ProjectReference Include="..\IKVM.Image.JDK.runtime.osx-arm64\IKVM.Image.JDK.runtime.osx-arm64.csproj" ReferenceOutputAssembly="true" Condition="$(_EnabledImageBinRuntimes.Contains(';osx-arm64;'))" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/IKVM.Image.JRE-bin/IKVM.Image.JRE-bin.csproj b/src/IKVM.Image.JRE-bin/IKVM.Image.JRE-bin.csproj
index c55072e37..32326b15f 100644
--- a/src/IKVM.Image.JRE-bin/IKVM.Image.JRE-bin.csproj
+++ b/src/IKVM.Image.JRE-bin/IKVM.Image.JRE-bin.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <TargetFrameworks>net472;net6.0;net8.0</TargetFrameworks>
-        <RuntimeIdentifiers>$(_SupportedImageRuntimes)</RuntimeIdentifiers>
+        <RuntimeIdentifiers>$(_SupportedImageBinRuntimes)</RuntimeIdentifiers>
         <ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
         <DisableCopyToOutputDirectory>true</DisableCopyToOutputDirectory>
     </PropertyGroup>
diff --git a/src/IKVM.Image.JRE/IKVM.Image.JRE.csproj b/src/IKVM.Image.JRE/IKVM.Image.JRE.csproj
index 8df99ca15..c2e05b80a 100644
--- a/src/IKVM.Image.JRE/IKVM.Image.JRE.csproj
+++ b/src/IKVM.Image.JRE/IKVM.Image.JRE.csproj
@@ -10,17 +10,17 @@
 
     <ItemGroup>
         <ProjectReference Include="..\IKVM.Image\IKVM.Image.csproj" ReferenceOutputAssembly="true" />
-        <ProjectReference Include="..\IKVM.Image.JRE.runtime.win-x64\IKVM.Image.JRE.runtime.win-x64.csproj" ReferenceOutputAssembly="true" Condition="$(_EnabledImageRuntimes.Contains(';win-x64;'))" />
-        <ProjectReference Include="..\IKVM.Image.JRE.runtime.win-x86\IKVM.Image.JRE.runtime.win-x86.csproj" ReferenceOutputAssembly="true" Condition="$(_EnabledImageRuntimes.Contains(';win-x86;'))" />
-        <ProjectReference Include="..\IKVM.Image.JRE.runtime.win-arm64\IKVM.Image.JRE.runtime.win-arm64.csproj" ReferenceOutputAssembly="true" Condition="$(_EnabledImageRuntimes.Contains(';win-arm64;'))" />
-        <ProjectReference Include="..\IKVM.Image.JRE.runtime.linux-x64\IKVM.Image.JRE.runtime.linux-x64.csproj" ReferenceOutputAssembly="true" Condition="$(_EnabledImageRuntimes.Contains(';linux-x64;'))" />
-        <ProjectReference Include="..\IKVM.Image.JRE.runtime.linux-arm\IKVM.Image.JRE.runtime.linux-arm.csproj" ReferenceOutputAssembly="true" Condition="$(_EnabledImageRuntimes.Contains(';linux-arm;'))" />
-        <ProjectReference Include="..\IKVM.Image.JRE.runtime.linux-arm64\IKVM.Image.JRE.runtime.linux-arm64.csproj" ReferenceOutputAssembly="true" Condition="$(_EnabledImageRuntimes.Contains(';linux-arm64;'))" />
-        <ProjectReference Include="..\IKVM.Image.JRE.runtime.linux-musl-x64\IKVM.Image.JRE.runtime.linux-musl-x64.csproj" ReferenceOutputAssembly="true" Condition="$(_EnabledImageRuntimes.Contains(';linux-musl-x64;'))" />
-        <ProjectReference Include="..\IKVM.Image.JRE.runtime.linux-musl-arm\IKVM.Image.JRE.runtime.linux-musl-arm.csproj" ReferenceOutputAssembly="true" Condition="$(_EnabledImageRuntimes.Contains(';linux-musl-arm;'))" />
-        <ProjectReference Include="..\IKVM.Image.JRE.runtime.linux-musl-arm64\IKVM.Image.JRE.runtime.linux-musl-arm64.csproj" ReferenceOutputAssembly="true" Condition="$(_EnabledImageRuntimes.Contains(';linux-musl-arm64;'))" />
-        <ProjectReference Include="..\IKVM.Image.JRE.runtime.osx-x64\IKVM.Image.JRE.runtime.osx-x64.csproj" ReferenceOutputAssembly="true" Condition="$(_EnabledImageRuntimes.Contains(';osx-x64;'))" />
-        <ProjectReference Include="..\IKVM.Image.JRE.runtime.osx-arm64\IKVM.Image.JRE.runtime.osx-arm64.csproj" ReferenceOutputAssembly="true" Condition="$(_EnabledImageRuntimes.Contains(';osx-arm64;'))" />
+        <ProjectReference Include="..\IKVM.Image.JRE.runtime.win-x64\IKVM.Image.JRE.runtime.win-x64.csproj" ReferenceOutputAssembly="true" Condition="$(_EnabledImageBinRuntimes.Contains(';win-x64;'))" />
+        <ProjectReference Include="..\IKVM.Image.JRE.runtime.win-x86\IKVM.Image.JRE.runtime.win-x86.csproj" ReferenceOutputAssembly="true" Condition="$(_EnabledImageBinRuntimes.Contains(';win-x86;'))" />
+        <ProjectReference Include="..\IKVM.Image.JRE.runtime.win-arm64\IKVM.Image.JRE.runtime.win-arm64.csproj" ReferenceOutputAssembly="true" Condition="$(_EnabledImageBinRuntimes.Contains(';win-arm64;'))" />
+        <ProjectReference Include="..\IKVM.Image.JRE.runtime.linux-x64\IKVM.Image.JRE.runtime.linux-x64.csproj" ReferenceOutputAssembly="true" Condition="$(_EnabledImageBinRuntimes.Contains(';linux-x64;'))" />
+        <ProjectReference Include="..\IKVM.Image.JRE.runtime.linux-arm\IKVM.Image.JRE.runtime.linux-arm.csproj" ReferenceOutputAssembly="true" Condition="$(_EnabledImageBinRuntimes.Contains(';linux-arm;'))" />
+        <ProjectReference Include="..\IKVM.Image.JRE.runtime.linux-arm64\IKVM.Image.JRE.runtime.linux-arm64.csproj" ReferenceOutputAssembly="true" Condition="$(_EnabledImageBinRuntimes.Contains(';linux-arm64;'))" />
+        <ProjectReference Include="..\IKVM.Image.JRE.runtime.linux-musl-x64\IKVM.Image.JRE.runtime.linux-musl-x64.csproj" ReferenceOutputAssembly="true" Condition="$(_EnabledImageBinRuntimes.Contains(';linux-musl-x64;'))" />
+        <ProjectReference Include="..\IKVM.Image.JRE.runtime.linux-musl-arm\IKVM.Image.JRE.runtime.linux-musl-arm.csproj" ReferenceOutputAssembly="true" Condition="$(_EnabledImageBinRuntimes.Contains(';linux-musl-arm;'))" />
+        <ProjectReference Include="..\IKVM.Image.JRE.runtime.linux-musl-arm64\IKVM.Image.JRE.runtime.linux-musl-arm64.csproj" ReferenceOutputAssembly="true" Condition="$(_EnabledImageBinRuntimes.Contains(';linux-musl-arm64;'))" />
+        <ProjectReference Include="..\IKVM.Image.JRE.runtime.osx-x64\IKVM.Image.JRE.runtime.osx-x64.csproj" ReferenceOutputAssembly="true" Condition="$(_EnabledImageBinRuntimes.Contains(';osx-x64;'))" />
+        <ProjectReference Include="..\IKVM.Image.JRE.runtime.osx-arm64\IKVM.Image.JRE.runtime.osx-arm64.csproj" ReferenceOutputAssembly="true" Condition="$(_EnabledImageBinRuntimes.Contains(';osx-arm64;'))" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/jar/jar.csproj b/src/jar/jar.csproj
index 1990ad9e4..0ce320f65 100644
--- a/src/jar/jar.csproj
+++ b/src/jar/jar.csproj
@@ -6,7 +6,7 @@
     <PropertyGroup>
         <OutputType>Exe</OutputType>
         <TargetFrameworks>net472;net6.0;net8.0</TargetFrameworks>
-        <RuntimeIdentifiers>$(_SupportedImageRuntimes)</RuntimeIdentifiers>
+        <RuntimeIdentifiers>$(_SupportedImageBinRuntimes)</RuntimeIdentifiers>
         <SelfContained>true</SelfContained>
         <StartupObject>sun.tools.jar.Main</StartupObject>
         <RootNamespace>ikvm.tools.jar</RootNamespace>
diff --git a/src/jarsigner/jarsigner.csproj b/src/jarsigner/jarsigner.csproj
index 06e618bcb..7078ca0a3 100644
--- a/src/jarsigner/jarsigner.csproj
+++ b/src/jarsigner/jarsigner.csproj
@@ -6,7 +6,7 @@
     <PropertyGroup>
         <OutputType>Exe</OutputType>
         <TargetFrameworks>net472;net6.0;net8.0</TargetFrameworks>
-        <RuntimeIdentifiers>$(_SupportedImageRuntimes)</RuntimeIdentifiers>
+        <RuntimeIdentifiers>$(_SupportedImageBinRuntimes)</RuntimeIdentifiers>
         <SelfContained>true</SelfContained>
         <StartupObject>sun.security.tools.jarsigner.Main</StartupObject>
         <RootNamespace>ikvm.tools.jarsigner</RootNamespace>
diff --git a/src/java/java.csproj b/src/java/java.csproj
index 50c47c7c4..8a7055af2 100644
--- a/src/java/java.csproj
+++ b/src/java/java.csproj
@@ -6,7 +6,7 @@
     <PropertyGroup>
         <OutputType>Exe</OutputType>
         <TargetFrameworks>net472;net6.0;net8.0</TargetFrameworks>
-        <RuntimeIdentifiers>$(_SupportedImageRuntimes)</RuntimeIdentifiers>
+        <RuntimeIdentifiers>$(_SupportedImageBinRuntimes)</RuntimeIdentifiers>
         <SelfContained>true</SelfContained>
         <RootNamespace>ikvm.tools.java</RootNamespace>
         <ApplicationManifest>app.manifest</ApplicationManifest>
diff --git a/src/javac-ref/javac-ref.csproj b/src/javac-ref/javac-ref.csproj
index 4b232be5d..cacafc352 100644
--- a/src/javac-ref/javac-ref.csproj
+++ b/src/javac-ref/javac-ref.csproj
@@ -7,7 +7,7 @@
         <OutputType>Exe</OutputType>
         <AssemblyName>javac</AssemblyName>
         <TargetFrameworks>net8.0;net472;net6.0;</TargetFrameworks>
-        <RuntimeIdentifiers>$(_SupportedImageRuntimes)</RuntimeIdentifiers>
+        <RuntimeIdentifiers>win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64;osx-arm64</RuntimeIdentifiers>
         <PublishReadyToRun>true</PublishReadyToRun>
         <SelfContained>true</SelfContained>
         <StartupObject>com.sun.tools.javac.Main</StartupObject>
diff --git a/src/javac/javac.csproj b/src/javac/javac.csproj
index b9c781086..e560227b7 100644
--- a/src/javac/javac.csproj
+++ b/src/javac/javac.csproj
@@ -6,7 +6,7 @@
     <PropertyGroup>
         <OutputType>Exe</OutputType>
         <TargetFrameworks>net472;net6.0;net8.0</TargetFrameworks>
-        <RuntimeIdentifiers>$(_SupportedImageRuntimes)</RuntimeIdentifiers>
+        <RuntimeIdentifiers>$(_SupportedImageBinRuntimes)</RuntimeIdentifiers>
         <SelfContained>true</SelfContained>
         <StartupObject>com.sun.tools.javac.Main</StartupObject>
         <RootNamespace>ikvm.tools.javac</RootNamespace>
diff --git a/src/javadoc/javadoc.csproj b/src/javadoc/javadoc.csproj
index 6b1b7248c..5a41e4363 100644
--- a/src/javadoc/javadoc.csproj
+++ b/src/javadoc/javadoc.csproj
@@ -6,7 +6,7 @@
     <PropertyGroup>
         <OutputType>Exe</OutputType>
         <TargetFrameworks>net472;net6.0;net8.0</TargetFrameworks>
-        <RuntimeIdentifiers>$(_SupportedImageRuntimes)</RuntimeIdentifiers>
+        <RuntimeIdentifiers>$(_SupportedImageBinRuntimes)</RuntimeIdentifiers>
         <SelfContained>true</SelfContained>
         <StartupObject>com.sun.tools.javadoc.Main</StartupObject>
         <RootNamespace>ikvm.tools.javadoc</RootNamespace>
diff --git a/src/javah/javah.csproj b/src/javah/javah.csproj
index 5026edd65..eb1f9a6e2 100644
--- a/src/javah/javah.csproj
+++ b/src/javah/javah.csproj
@@ -6,7 +6,7 @@
     <PropertyGroup>
         <OutputType>Exe</OutputType>
         <TargetFrameworks>net472;net6.0;net8.0</TargetFrameworks>
-        <RuntimeIdentifiers>$(_SupportedImageRuntimes)</RuntimeIdentifiers>
+        <RuntimeIdentifiers>$(_SupportedImageBinRuntimes)</RuntimeIdentifiers>
         <SelfContained>true</SelfContained>
         <StartupObject>com.sun.tools.javah.Main</StartupObject>
         <RootNamespace>ikvm.tools.javah</RootNamespace>
diff --git a/src/javap/javap.csproj b/src/javap/javap.csproj
index cd260b8a0..6a0600332 100644
--- a/src/javap/javap.csproj
+++ b/src/javap/javap.csproj
@@ -6,7 +6,7 @@
     <PropertyGroup>
         <OutputType>Exe</OutputType>
         <TargetFrameworks>net472;net6.0;net8.0</TargetFrameworks>
-        <RuntimeIdentifiers>$(_SupportedImageRuntimes)</RuntimeIdentifiers>
+        <RuntimeIdentifiers>$(_SupportedImageBinRuntimes)</RuntimeIdentifiers>
         <SelfContained>true</SelfContained>
         <StartupObject>com.sun.tools.javap.Main</StartupObject>
         <RootNamespace>ikvm.tools.javap</RootNamespace>
diff --git a/src/jdeps/jdeps.csproj b/src/jdeps/jdeps.csproj
index ac11adcbd..654183e60 100644
--- a/src/jdeps/jdeps.csproj
+++ b/src/jdeps/jdeps.csproj
@@ -6,7 +6,7 @@
     <PropertyGroup>
         <OutputType>Exe</OutputType>
         <TargetFrameworks>net472;net6.0;net8.0</TargetFrameworks>
-        <RuntimeIdentifiers>$(_SupportedImageRuntimes)</RuntimeIdentifiers>
+        <RuntimeIdentifiers>$(_SupportedImageBinRuntimes)</RuntimeIdentifiers>
         <SelfContained>true</SelfContained>
         <StartupObject>com.sun.tools.jdeps.Main</StartupObject>
         <RootNamespace>ikvm.tools.jdeps</RootNamespace>
diff --git a/src/keytool/keytool.csproj b/src/keytool/keytool.csproj
index 777170140..6f5ee62c5 100644
--- a/src/keytool/keytool.csproj
+++ b/src/keytool/keytool.csproj
@@ -6,7 +6,7 @@
     <PropertyGroup>
         <OutputType>Exe</OutputType>
         <TargetFrameworks>net472;net6.0;net8.0</TargetFrameworks>
-        <RuntimeIdentifiers>$(_SupportedImageRuntimes)</RuntimeIdentifiers>
+        <RuntimeIdentifiers>$(_SupportedImageBinRuntimes)</RuntimeIdentifiers>
         <SelfContained>true</SelfContained>
         <StartupObject>sun.security.tools.keytool.Main</StartupObject>
         <RootNamespace>ikvm.tools.keytool</RootNamespace>
diff --git a/src/native2ascii/native2ascii.csproj b/src/native2ascii/native2ascii.csproj
index 67d7c0d17..191f3ba83 100644
--- a/src/native2ascii/native2ascii.csproj
+++ b/src/native2ascii/native2ascii.csproj
@@ -6,7 +6,7 @@
     <PropertyGroup>
         <OutputType>Exe</OutputType>
         <TargetFrameworks>net472;net6.0;net8.0</TargetFrameworks>
-        <RuntimeIdentifiers>$(_SupportedImageRuntimes)</RuntimeIdentifiers>
+        <RuntimeIdentifiers>$(_SupportedImageBinRuntimes)</RuntimeIdentifiers>
         <SelfContained>true</SelfContained>
         <StartupObject>sun.tools.native2ascii.Main</StartupObject>
         <RootNamespace>ikvm.tools.native2ascii</RootNamespace>
diff --git a/src/orbd/orbd.csproj b/src/orbd/orbd.csproj
index 6dade1a62..66b548e2c 100644
--- a/src/orbd/orbd.csproj
+++ b/src/orbd/orbd.csproj
@@ -6,7 +6,7 @@
     <PropertyGroup>
         <OutputType>Exe</OutputType>
         <TargetFrameworks>net472;net6.0;net8.0</TargetFrameworks>
-        <RuntimeIdentifiers>$(_SupportedImageRuntimes)</RuntimeIdentifiers>
+        <RuntimeIdentifiers>$(_SupportedImageBinRuntimes)</RuntimeIdentifiers>
         <SelfContained>true</SelfContained>
         <StartupObject>com.sun.corba.se.impl.activation.ORBD</StartupObject>
         <RootNamespace>ikvm.tools.orbd</RootNamespace>
diff --git a/src/policytool/policytool.csproj b/src/policytool/policytool.csproj
index 096516eea..e952ffc28 100644
--- a/src/policytool/policytool.csproj
+++ b/src/policytool/policytool.csproj
@@ -6,7 +6,7 @@
     <PropertyGroup>
         <OutputType>Exe</OutputType>
         <TargetFrameworks>net472;net6.0;net8.0</TargetFrameworks>
-        <RuntimeIdentifiers>$(_SupportedImageRuntimes)</RuntimeIdentifiers>
+        <RuntimeIdentifiers>$(_SupportedImageBinRuntimes)</RuntimeIdentifiers>
         <SelfContained>true</SelfContained>
         <StartupObject>sun.security.tools.policytool.PolicyTool</StartupObject>
         <RootNamespace>ikvm.tools.policytool</RootNamespace>
diff --git a/src/rmic/rmic.csproj b/src/rmic/rmic.csproj
index 601f1b5b3..b3fcce810 100644
--- a/src/rmic/rmic.csproj
+++ b/src/rmic/rmic.csproj
@@ -6,7 +6,7 @@
     <PropertyGroup>
         <OutputType>Exe</OutputType>
         <TargetFrameworks>net472;net6.0;net8.0</TargetFrameworks>
-        <RuntimeIdentifiers>$(_SupportedImageRuntimes)</RuntimeIdentifiers>
+        <RuntimeIdentifiers>$(_SupportedImageBinRuntimes)</RuntimeIdentifiers>
         <SelfContained>true</SelfContained>
         <StartupObject>sun.rmi.rmic.Main</StartupObject>
         <RootNamespace>ikvm.tools.rmic</RootNamespace>
diff --git a/src/schemagen/schemagen.csproj b/src/schemagen/schemagen.csproj
index 3968d4048..fdfb5199f 100644
--- a/src/schemagen/schemagen.csproj
+++ b/src/schemagen/schemagen.csproj
@@ -6,7 +6,7 @@
     <PropertyGroup>
         <OutputType>Exe</OutputType>
         <TargetFrameworks>net472;net6.0;net8.0</TargetFrameworks>
-        <RuntimeIdentifiers>$(_SupportedImageRuntimes)</RuntimeIdentifiers>
+        <RuntimeIdentifiers>$(_SupportedImageBinRuntimes)</RuntimeIdentifiers>
         <SelfContained>true</SelfContained>
         <StartupObject>com.sun.tools.internal.jxc.SchemaGenerator</StartupObject>
         <RootNamespace>ikvm.tools.schemagen</RootNamespace>
diff --git a/src/wsgen/wsgen.csproj b/src/wsgen/wsgen.csproj
index d7be74c02..df33e0cbb 100644
--- a/src/wsgen/wsgen.csproj
+++ b/src/wsgen/wsgen.csproj
@@ -6,7 +6,7 @@
     <PropertyGroup>
         <OutputType>Exe</OutputType>
         <TargetFrameworks>net472;net6.0;net8.0</TargetFrameworks>
-        <RuntimeIdentifiers>$(_SupportedImageRuntimes)</RuntimeIdentifiers>
+        <RuntimeIdentifiers>$(_SupportedImageBinRuntimes)</RuntimeIdentifiers>
         <SelfContained>true</SelfContained>
         <StartupObject>com.sun.tools.internal.ws.WsGen</StartupObject>
         <RootNamespace>ikvm.tools.wsgen</RootNamespace>
diff --git a/src/wsimport/wsimport.csproj b/src/wsimport/wsimport.csproj
index ad8abc35e..93e09cf7a 100644
--- a/src/wsimport/wsimport.csproj
+++ b/src/wsimport/wsimport.csproj
@@ -6,7 +6,7 @@
     <PropertyGroup>
         <OutputType>Exe</OutputType>
         <TargetFrameworks>net472;net6.0;net8.0</TargetFrameworks>
-        <RuntimeIdentifiers>$(_SupportedImageRuntimes)</RuntimeIdentifiers>
+        <RuntimeIdentifiers>$(_SupportedImageBinRuntimes)</RuntimeIdentifiers>
         <SelfContained>true</SelfContained>
         <StartupObject>com.sun.tools.internal.ws.WsImport</StartupObject>
         <RootNamespace>ikvm.tools.wsimport</RootNamespace>
diff --git a/src/xjc/xjc.csproj b/src/xjc/xjc.csproj
index c2a3b96bf..71d65d78a 100644
--- a/src/xjc/xjc.csproj
+++ b/src/xjc/xjc.csproj
@@ -6,7 +6,7 @@
     <PropertyGroup>
         <OutputType>Exe</OutputType>
         <TargetFrameworks>net8.0;net472;net6.0;</TargetFrameworks>
-        <RuntimeIdentifiers>$(_SupportedImageRuntimes)</RuntimeIdentifiers>
+        <RuntimeIdentifiers>$(_SupportedImageBinRuntimes)</RuntimeIdentifiers>
         <SelfContained>true</SelfContained>
         <StartupObject>com.sun.tools.internal.xjc.Driver</StartupObject>
         <RootNamespace>ikvm.tools.xjc</RootNamespace>