Moved ikvm.properties file stuff into separate file, so we can includ…

…e it directly. And do so.
ikvmnet · Jan 8, 2025 · ad399f5 · ad399f5
1 parent 3c67b44
commit ad399f5
Show file tree

Hide file tree

Showing 31 changed files with 80 additions and 35 deletions.
diff --git a/src/IKVM.Benchmarks.Java/IKVM.Benchmarks.Java.csproj b/src/IKVM.Benchmarks.Java/IKVM.Benchmarks.Java.csproj
@@ -16,5 +16,6 @@
 
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM.NET.Sdk\Sdk\Sdk.targets" />
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM\buildTransitive\IKVM.targets" />
+    <Import Project="$(MSBuildThisFileDirectory)..\IKVM.Image\buildTransitive\IKVM.Image.properties.targets" />
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM.MSBuild\buildTransitive\IKVM.MSBuild.targets" />
 </Project>
diff --git a/src/IKVM.Benchmarks/IKVM.Benchmarks.csproj b/src/IKVM.Benchmarks/IKVM.Benchmarks.csproj
@@ -25,5 +25,6 @@
 
     <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM\buildTransitive\IKVM.targets" />
+    <Import Project="$(MSBuildThisFileDirectory)..\IKVM.Image\buildTransitive\IKVM.Image.properties.targets" />
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM.MSBuild\buildTransitive\IKVM.MSBuild.targets" />
 </Project>
diff --git a/src/IKVM.ConsoleApp/IKVM.ConsoleApp.csproj b/src/IKVM.ConsoleApp/IKVM.ConsoleApp.csproj
@@ -20,5 +20,6 @@
 
     <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM\buildTransitive\IKVM.targets" />
+    <Import Project="$(MSBuildThisFileDirectory)..\IKVM.Image\buildTransitive\IKVM.Image.properties.targets" />
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM.MSBuild\buildTransitive\IKVM.MSBuild.targets" />
 </Project>
diff --git a/src/IKVM.Image/buildTransitive/IKVM.Image.properties.targets b/src/IKVM.Image/buildTransitive/IKVM.Image.properties.targets
@@ -0,0 +1,42 @@
+<Project>
+    <PropertyGroup>
+        <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    </PropertyGroup>
+
+    <PropertyGroup>
+        <IkvmImageTargetPath Condition=" '$(IkvmImageTargetPath)' == '' ">ikvm</IkvmImageTargetPath>
+        <IkvmPropertiesFileName Condition=" '$(IkvmPropertiesFileName)' == '' ">ikvm.properties</IkvmPropertiesFileName>
+        <CopyIkvmImageItemToOutputDirectory Condition=" '$(CopyIkvmImageItemToOutputDirectory)' == '' ">PreserveNewest</CopyIkvmImageItemToOutputDirectory>
+        <CopyIkvmImageItemToPublishDirectory Condition=" '$(CopyIkvmImageItemToPublishDirectory)' == '' "></CopyIkvmImageItemToPublishDirectory>
+        <CopyIkvmPropertiesFileToOutputDirectory Condition=" '$(CopyIkvmPropertiesFileToOutputDirectory)' == '' ">PreserveNewest</CopyIkvmPropertiesFileToOutputDirectory>
+        <CopyIkvmPropertiesFileToPublishDirectory Condition=" '$(CopyIkvmPropertiesFileToPublishDirectory)' == '' "></CopyIkvmPropertiesFileToPublishDirectory>
+    </PropertyGroup>
+
+    <Target Name="WriteIkvmPropertiesFile">
+        <ItemGroup>
+            <_IkvmPropertiesFileLine Include="ikvm.home.root=$(IkvmImageTargetPath)" />
+        </ItemGroup>
+        <MakeDir Directories="$(IntermediateOutputPath)" Condition="!Exists('$(IntermediateOutputPath)')" />
+        <WriteLinesToFile Lines="@(_IkvmPropertiesFileLine)" File="$(IntermediateOutputPath)$(IkvmPropertiesFileName)" Overwrite="true" WriteOnlyWhenDifferent="true" />
+    </Target>
+
+    <Target Name="IncludeIkvmPropertiesFile" DependsOnTargets="WriteIkvmPropertiesFile" BeforeTargets="_GetPackageFiles;AssignLinkMetadata;AssignTargetPaths">
+        <ItemGroup>
+            <None Include="$(IntermediateOutputPath)$(IkvmPropertiesFileName)" Condition="Exists('$(IntermediateOutputPath)$(IkvmPropertiesFileName)')">
+                <CopyToOutputDirectory>$(CopyIkvmPropertiesFileToOutputDirectory)</CopyToOutputDirectory>
+                <CopyToPublishDirectory>$(CopyIkvmPropertiesFileToPublishDirectory)</CopyToPublishDirectory>
+                <TargetPath>$(IkvmPropertiesFileName)</TargetPath>
+                <Link>$(IkvmPropertiesFileName)</Link>
+            </None>
+        </ItemGroup>
+    </Target>
+
+    <PropertyGroup>
+        <AssignTargetPathsDependsOn>
+            WriteIkvmPropertiesFile;
+            IncludeIkvmPropertiesFile;
+            $(AssignTargetPathsDependsOn);
+        </AssignTargetPathsDependsOn>
+    </PropertyGroup>
+
+</Project>
diff --git a/src/IKVM.Image/buildTransitive/IKVM.Image.targets b/src/IKVM.Image/buildTransitive/IKVM.Image.targets
@@ -8,14 +8,7 @@
         <IkvmImageAvailableRuntimeIdentifiers Include="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-x64;android-arm64" />
     </ItemGroup>
 
-    <PropertyGroup>
-        <IkvmImageTargetPath Condition=" '$(IkvmImageTargetPath)' == '' ">ikvm</IkvmImageTargetPath>
-        <IkvmPropertiesFileName Condition=" '$(IkvmPropertiesFileName)' == '' ">ikvm.properties</IkvmPropertiesFileName>
-        <CopyIkvmImageItemToOutputDirectory Condition=" '$(CopyIkvmImageItemToOutputDirectory)' == '' ">PreserveNewest</CopyIkvmImageItemToOutputDirectory>
-        <CopyIkvmImageItemToPublishDirectory Condition=" '$(CopyIkvmImageItemToPublishDirectory)' == '' "></CopyIkvmImageItemToPublishDirectory>
-        <CopyIkvmPropertiesFileToOutputDirectory Condition=" '$(CopyIkvmPropertiesFileToOutputDirectory)' == '' ">PreserveNewest</CopyIkvmPropertiesFileToOutputDirectory>
-        <CopyIkvmPropertiesFileToPublishDirectory Condition=" '$(CopyIkvmPropertiesFileToPublishDirectory)' == '' "></CopyIkvmPropertiesFileToPublishDirectory>
-    </PropertyGroup>
+    <Import Project="IKVM.Image.properties.targets" />
 
     <Choose>
         <When Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net461'))">
@@ -146,6 +139,13 @@
         </Task>
     </UsingTask>
 
+    <PropertyGroup>
+        <GetIkvmImageItemsOutputItemsDependsOn>
+            $(GetIkvmImageItemsOutputItemsDependsOn);
+            ExpandIkvmImageItems;
+        </GetIkvmImageItemsOutputItemsDependsOn>
+    </PropertyGroup>
+
     <Target Name="GetIkvmImageItemsOutputItems" BeforeTargets="_GetPackageFiles;AssignLinkMetadata;AssignTargetPaths" DependsOnTargets="$(GetIkvmImageItemsOutputItemsDependsOn)">
         <_FilterIkvmImageItems Items="@(_IkvmImageItemExpanded)">
             <Output TaskParameter="Items" ItemName="_IkvmImageItemFiltered" />
@@ -158,31 +158,6 @@
         </ItemGroup>
     </Target>
 
-    <PropertyGroup>
-        <GetIkvmImageItemsOutputItemsDependsOn>
-            $(GetIkvmImageItemsOutputItemsDependsOn);
-            ExpandIkvmImageItems;
-        </GetIkvmImageItemsOutputItemsDependsOn>
-    </PropertyGroup>
-
-    <Target Name="WriteIkvmPropertiesFile">
-        <ItemGroup>
-            <_IkvmPropertiesFileLine Include="ikvm.home.root=$(IkvmImageTargetPath)" />
-        </ItemGroup>
-        <WriteLinesToFile Lines="@(_IkvmPropertiesFileLine)" File="$(IntermediateOutputPath)$(IkvmPropertiesFileName)" Overwrite="true" WriteOnlyWhenDifferent="true" />
-    </Target>
-
-    <Target Name="IncludeIkvmPropertiesFile" DependsOnTargets="WriteIkvmPropertiesFile" BeforeTargets="_GetPackageFiles;AssignLinkMetadata;AssignTargetPaths">
-        <ItemGroup>
-            <None Include="$(IntermediateOutputPath)$(IkvmPropertiesFileName)" Condition="Exists('$(IntermediateOutputPath)$(IkvmPropertiesFileName)')">
-                <CopyToOutputDirectory>$(CopyIkvmPropertiesFileToOutputDirectory)</CopyToOutputDirectory>
-                <CopyToPublishDirectory>$(CopyIkvmPropertiesFileToPublishDirectory)</CopyToPublishDirectory>
-                <TargetPath>$(IkvmPropertiesFileName)</TargetPath>
-                <Link>$(IkvmPropertiesFileName)</Link>
-            </None>
-        </ItemGroup>
-    </Target>
-
     <PropertyGroup>
         <CollectIkvmImageItemsOutputItemsDependsOn>
             ExpandIkvmImageItems;
@@ -198,8 +173,6 @@
     <PropertyGroup>
         <AssignTargetPathsDependsOn>
             CollectIkvmImageItemsOutputItems;
-            WriteIkvmPropertiesFile;
-            IncludeIkvmPropertiesFile;
             $(AssignTargetPathsDependsOn);
         </AssignTargetPathsDependsOn>
     </PropertyGroup>

diff --git a/src/IKVM.JTReg.TestAdapter.Core/IKVM.JTReg.TestAdapter.Core.csproj b/src/IKVM.JTReg.TestAdapter.Core/IKVM.JTReg.TestAdapter.Core.csproj
@@ -42,5 +42,6 @@
 
     <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM\buildTransitive\IKVM.targets" />
+    <Import Project="$(MSBuildThisFileDirectory)..\IKVM.Image\buildTransitive\IKVM.Image.properties.targets" />
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM.MSBuild\buildTransitive\IKVM.MSBuild.targets" />
 </Project>
diff --git a/src/IKVM.JTReg.TestAdapter.Tests/IKVM.JTReg.TestAdapter.Tests.csproj b/src/IKVM.JTReg.TestAdapter.Tests/IKVM.JTReg.TestAdapter.Tests.csproj
@@ -45,6 +45,7 @@
 
     <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM\buildTransitive\IKVM.targets" />
+    <Import Project="$(MSBuildThisFileDirectory)..\IKVM.Image\buildTransitive\IKVM.Image.properties.targets" />
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM.MSBuild\buildTransitive\IKVM.MSBuild.targets" />
 
 </Project>
diff --git a/src/IKVM.JTReg.TestAdapter/IKVM.JTReg.TestAdapter.csproj b/src/IKVM.JTReg.TestAdapter/IKVM.JTReg.TestAdapter.csproj
@@ -24,5 +24,6 @@
 
     <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM\buildTransitive\IKVM.targets" />
+    <Import Project="$(MSBuildThisFileDirectory)..\IKVM.Image\buildTransitive\IKVM.Image.properties.targets" />
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM.MSBuild\buildTransitive\IKVM.MSBuild.targets" />
 </Project>
diff --git a/src/IKVM.Java.Extensions/IKVM.Java.Extensions.csproj b/src/IKVM.Java.Extensions/IKVM.Java.Extensions.csproj
@@ -12,5 +12,6 @@
 
     <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM\buildTransitive\IKVM.targets" />
+    <Import Project="$(MSBuildThisFileDirectory)..\IKVM.Image\buildTransitive\IKVM.Image.properties.targets" />
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM.MSBuild\buildTransitive\IKVM.MSBuild.targets" />
 </Project>
diff --git a/src/IKVM.Java.Tests.Util/IKVM.Java.Tests.Util.csproj b/src/IKVM.Java.Tests.Util/IKVM.Java.Tests.Util.csproj
@@ -18,5 +18,6 @@
 
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM.NET.Sdk\Sdk\Sdk.targets" />
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM\buildTransitive\IKVM.targets" />
+    <Import Project="$(MSBuildThisFileDirectory)..\IKVM.Image\buildTransitive\IKVM.Image.properties.targets" />
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM.MSBuild\buildTransitive\IKVM.MSBuild.targets" />
 </Project>
diff --git a/src/IKVM.Java.Tests/IKVM.Java.Tests.csproj b/src/IKVM.Java.Tests/IKVM.Java.Tests.csproj
@@ -24,5 +24,6 @@
 
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM.NET.Sdk\Sdk\Sdk.targets" />
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM\buildTransitive\IKVM.targets" />
+    <Import Project="$(MSBuildThisFileDirectory)..\IKVM.Image\buildTransitive\IKVM.Image.properties.targets" />
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM.MSBuild\buildTransitive\IKVM.MSBuild.targets" />
 </Project>
diff --git a/src/IKVM.MSBuild.Tasks/IKVM.MSBuild.Tasks.csproj b/src/IKVM.MSBuild.Tasks/IKVM.MSBuild.Tasks.csproj
@@ -52,5 +52,6 @@
 
     <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM\buildTransitive\IKVM.targets" />
+    <Import Project="$(MSBuildThisFileDirectory)..\IKVM.Image\buildTransitive\IKVM.Image.properties.targets" />
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM.MSBuild\buildTransitive\IKVM.MSBuild.targets" />
 </Project>
diff --git a/src/IKVM.Tests/IKVM.Tests.csproj b/src/IKVM.Tests/IKVM.Tests.csproj
@@ -202,5 +202,6 @@
 
     <Import Sdk="MSTest.Sdk" Project="Sdk.targets" />
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM\buildTransitive\IKVM.targets" />
+    <Import Project="$(MSBuildThisFileDirectory)..\IKVM.Image\buildTransitive\IKVM.Image.properties.targets" />
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM.MSBuild\buildTransitive\IKVM.MSBuild.targets" />
 </Project>
diff --git a/src/jar/jar.csproj b/src/jar/jar.csproj
@@ -17,5 +17,6 @@
     <Import Project="$(MSBuildThisFileDirectory)..\..\IKVM.refs.targets" />
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM.NET.Sdk\Sdk\Sdk.targets" />
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM\buildTransitive\IKVM.targets" />
+    <Import Project="$(MSBuildThisFileDirectory)..\IKVM.Image\buildTransitive\IKVM.Image.properties.targets" />
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM.MSBuild\buildTransitive\IKVM.MSBuild.targets" />
 </Project>
diff --git a/src/jarsigner/jarsigner.csproj b/src/jarsigner/jarsigner.csproj
@@ -17,5 +17,6 @@
     <Import Project="$(MSBuildThisFileDirectory)..\..\IKVM.refs.targets" />
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM.NET.Sdk\Sdk\Sdk.targets" />
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM\buildTransitive\IKVM.targets" />
+    <Import Project="$(MSBuildThisFileDirectory)..\IKVM.Image\buildTransitive\IKVM.Image.properties.targets" />
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM.MSBuild\buildTransitive\IKVM.MSBuild.targets" />
 </Project>
diff --git a/src/java/java.csproj b/src/java/java.csproj
@@ -17,5 +17,6 @@
 
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM.NET.Sdk\Sdk\Sdk.targets" />
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM\buildTransitive\IKVM.targets" />
+    <Import Project="$(MSBuildThisFileDirectory)..\IKVM.Image\buildTransitive\IKVM.Image.properties.targets" />
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM.MSBuild\buildTransitive\IKVM.MSBuild.targets" />
 </Project>
diff --git a/src/javac-ref/javac-ref.csproj b/src/javac-ref/javac-ref.csproj
@@ -23,6 +23,7 @@
 
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM.NET.Sdk\Sdk\Sdk.targets" />
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM\buildTransitive\IKVM.targets" />
+    <Import Project="$(MSBuildThisFileDirectory)..\IKVM.Image\buildTransitive\IKVM.Image.properties.targets" />
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM.MSBuild\buildTransitive\IKVM.MSBuild.targets" />
 
     <!-- javac-ref uses the javac executable from JAVA_HOME: bootstrap -->

diff --git a/src/javac/javac.csproj b/src/javac/javac.csproj
@@ -18,5 +18,6 @@
 
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM.NET.Sdk\Sdk\Sdk.targets" />
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM\buildTransitive\IKVM.targets" />
+    <Import Project="$(MSBuildThisFileDirectory)..\IKVM.Image\buildTransitive\IKVM.Image.properties.targets" />
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM.MSBuild\buildTransitive\IKVM.MSBuild.targets" />
 </Project>
diff --git a/src/javadoc/javadoc.csproj b/src/javadoc/javadoc.csproj
@@ -18,5 +18,6 @@
 
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM.NET.Sdk\Sdk\Sdk.targets" />
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM\buildTransitive\IKVM.targets" />
+    <Import Project="$(MSBuildThisFileDirectory)..\IKVM.Image\buildTransitive\IKVM.Image.properties.targets" />
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM.MSBuild\buildTransitive\IKVM.MSBuild.targets" />
 </Project>
diff --git a/src/javah/javah.csproj b/src/javah/javah.csproj
@@ -18,5 +18,6 @@
 
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM.NET.Sdk\Sdk\Sdk.targets" />
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM\buildTransitive\IKVM.targets" />
+    <Import Project="$(MSBuildThisFileDirectory)..\IKVM.Image\buildTransitive\IKVM.Image.properties.targets" />
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM.MSBuild\buildTransitive\IKVM.MSBuild.targets" />
 </Project>
diff --git a/src/javap/javap.csproj b/src/javap/javap.csproj
@@ -18,5 +18,6 @@
 
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM.NET.Sdk\Sdk\Sdk.targets" />
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM\buildTransitive\IKVM.targets" />
+    <Import Project="$(MSBuildThisFileDirectory)..\IKVM.Image\buildTransitive\IKVM.Image.properties.targets" />
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM.MSBuild\buildTransitive\IKVM.MSBuild.targets" />
 </Project>
diff --git a/src/jdeps/jdeps.csproj b/src/jdeps/jdeps.csproj
@@ -18,5 +18,6 @@
 
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM.NET.Sdk\Sdk\Sdk.targets" />
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM\buildTransitive\IKVM.targets" />
+    <Import Project="$(MSBuildThisFileDirectory)..\IKVM.Image\buildTransitive\IKVM.Image.properties.targets" />
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM.MSBuild\buildTransitive\IKVM.MSBuild.targets" />
 </Project>
diff --git a/src/keytool/keytool.csproj b/src/keytool/keytool.csproj
@@ -18,5 +18,6 @@
 
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM.NET.Sdk\Sdk\Sdk.targets" />
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM\buildTransitive\IKVM.targets" />
+    <Import Project="$(MSBuildThisFileDirectory)..\IKVM.Image\buildTransitive\IKVM.Image.properties.targets" />
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM.MSBuild\buildTransitive\IKVM.MSBuild.targets" />
 </Project>
diff --git a/src/native2ascii/native2ascii.csproj b/src/native2ascii/native2ascii.csproj
@@ -15,8 +15,10 @@
 
     <Import Project="$(MSBuildThisFileDirectory)..\..\IKVM.deps.targets" />
     <Import Project="$(MSBuildThisFileDirectory)..\..\IKVM.refs.targets" />
+
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM.NET.Sdk\Sdk\Sdk.targets" />
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM\buildTransitive\IKVM.targets" />
+    <Import Project="$(MSBuildThisFileDirectory)..\IKVM.Image\buildTransitive\IKVM.Image.properties.targets" />
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM.MSBuild\buildTransitive\IKVM.MSBuild.targets" />
 </Project>
 
diff --git a/src/orbd/orbd.csproj b/src/orbd/orbd.csproj
@@ -18,5 +18,6 @@
 
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM.NET.Sdk\Sdk\Sdk.targets" />
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM\buildTransitive\IKVM.targets" />
+    <Import Project="$(MSBuildThisFileDirectory)..\IKVM.Image\buildTransitive\IKVM.Image.properties.targets" />
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM.MSBuild\buildTransitive\IKVM.MSBuild.targets" />
 </Project>
diff --git a/src/policytool/policytool.csproj b/src/policytool/policytool.csproj
@@ -18,6 +18,7 @@
 
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM.NET.Sdk\Sdk\Sdk.targets" />
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM\buildTransitive\IKVM.targets" />
+    <Import Project="$(MSBuildThisFileDirectory)..\IKVM.Image\buildTransitive\IKVM.Image.properties.targets" />
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM.MSBuild\buildTransitive\IKVM.MSBuild.targets" />
 </Project>
 
diff --git a/src/rmic/rmic.csproj b/src/rmic/rmic.csproj
@@ -18,6 +18,7 @@
 
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM.NET.Sdk\Sdk\Sdk.targets" />
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM\buildTransitive\IKVM.targets" />
+    <Import Project="$(MSBuildThisFileDirectory)..\IKVM.Image\buildTransitive\IKVM.Image.properties.targets" />
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM.MSBuild\buildTransitive\IKVM.MSBuild.targets" />
 </Project>
 
diff --git a/src/schemagen/schemagen.csproj b/src/schemagen/schemagen.csproj
@@ -18,6 +18,7 @@
 
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM.NET.Sdk\Sdk\Sdk.targets" />
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM\buildTransitive\IKVM.targets" />
+    <Import Project="$(MSBuildThisFileDirectory)..\IKVM.Image\buildTransitive\IKVM.Image.properties.targets" />
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM.MSBuild\buildTransitive\IKVM.MSBuild.targets" />
 </Project>
 
diff --git a/src/wsgen/wsgen.csproj b/src/wsgen/wsgen.csproj
@@ -18,6 +18,7 @@
 
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM.NET.Sdk\Sdk\Sdk.targets" />
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM\buildTransitive\IKVM.targets" />
+    <Import Project="$(MSBuildThisFileDirectory)..\IKVM.Image\buildTransitive\IKVM.Image.properties.targets" />
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM.MSBuild\buildTransitive\IKVM.MSBuild.targets" />
 </Project>
 
diff --git a/src/wsimport/wsimport.csproj b/src/wsimport/wsimport.csproj
@@ -18,6 +18,7 @@
 
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM.NET.Sdk\Sdk\Sdk.targets" />
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM\buildTransitive\IKVM.targets" />
+    <Import Project="$(MSBuildThisFileDirectory)..\IKVM.Image\buildTransitive\IKVM.Image.properties.targets" />
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM.MSBuild\buildTransitive\IKVM.MSBuild.targets" />
 </Project>
 
diff --git a/src/xjc/xjc.csproj b/src/xjc/xjc.csproj
@@ -18,5 +18,6 @@
 
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM.NET.Sdk\Sdk\Sdk.targets" />
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM\buildTransitive\IKVM.targets" />
+    <Import Project="$(MSBuildThisFileDirectory)..\IKVM.Image\buildTransitive\IKVM.Image.properties.targets" />
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM.MSBuild\buildTransitive\IKVM.MSBuild.targets" />
 </Project>