Split ImageRuntime into ImageBinRuntime, so we can deal with native l…

…ibs separately from binaries. Hard code javac-ref RIDs to those that are explicitely supported to build IKVM on.
ikvmnet · Dec 31, 2024 · f78907b · f78907b
1 parent 6b524e8
commit f78907b
Show file tree

Hide file tree

Showing 25 changed files with 49 additions and 44 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -4,13 +4,17 @@
         <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>
 
         <_SupportedRuntimes>;$(SupportedRuntimes);</_SupportedRuntimes>
         <_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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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>