Allow IkvmToolReference to specify a hard coded TFM. Use for javac. T…

…his allows javac to run on Unix without Mono.
ikvmnet · Mar 21, 2024 · 74487d1 · 74487d1
1 parent a574f89
commit 74487d1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -97,7 +97,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <IkvmToolReference Include="$(MSBuildThisFileDirectory)src\javac-ref\javac-ref.msbuildproj" IsJavaCompiler="true" />
+        <IkvmToolReference Include="$(MSBuildThisFileDirectory)src\javac-ref\javac-ref.msbuildproj" IsJavaCompiler="true" TargetFramework="net8.0" />
         <IkvmToolReference Include="$(MSBuildThisFileDirectory)src\ikvmc\ikvmc.csproj" IsIkvmCompiler="true" />
         <IkvmToolReference Include="$(MSBuildThisFileDirectory)src\ikvmstub\ikvmstub.csproj" IsIkvmExporter="true" />
     </ItemGroup>

diff --git a/src/IKVM.MSBuild/buildTransitive/IKVM.MSBuild.IkvmToolReference.targets b/src/IKVM.MSBuild/buildTransitive/IKVM.MSBuild.IkvmToolReference.targets
@@ -11,6 +11,7 @@
         <ItemGroup>
             <_IkvmToolReferenceToConfigure Include="@(IkvmToolReference)">
                 <SetTargetFramework>TargetFramework=$(IkvmToolFramework)</SetTargetFramework>
+                <SetTargetFramework Condition=" '%(IkvmToolReference.TargetFramework)' != '' ">%(IkvmToolReference.TargetFramework)</SetTargetFramework>
                 <SetRuntimeIdentifier>RuntimeIdentifier=$(IkvmToolRuntime)</SetRuntimeIdentifier>
             </_IkvmToolReferenceToConfigure>
         </ItemGroup>

diff --git a/src/IKVM.MSBuild/buildTransitive/IKVM.MSBuild.targets b/src/IKVM.MSBuild/buildTransitive/IKVM.MSBuild.targets
@@ -7,6 +7,7 @@
         <IkvmToolFramework Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'netstandard1.0'))">net8.0</IkvmToolFramework>
         <IkvmToolFramework Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net461'))">net472</IkvmToolFramework>
         <IkvmToolFramework Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'netcoreapp3.1'))">net8.0</IkvmToolFramework>
+        <IkvmJavaFramework>net8.0</IkvmJavaFramework>
         <IkvmToolRuntime Condition="$([MSBuild]::IsOSPlatform('Windows')) And '$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)' == 'X86'">win-x86</IkvmToolRuntime>
         <IkvmToolRuntime Condition="$([MSBuild]::IsOSPlatform('Windows')) And '$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)' == 'X64'">win-x64</IkvmToolRuntime>
         <IkvmToolRuntime Condition="$([MSBuild]::IsOSPlatform('Windows')) And '$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)' == 'ARM64'">win-arm64</IkvmToolRuntime>