Switch back to pregenerated file. Need to come up with some way to fi…

…x publish conflict issue.
ikvmnet · Jan 9, 2025 · 191e807 · 191e807
1 parent 2162775
commit 191e807
Show file tree

Hide file tree

Showing 32 changed files with 27 additions and 73 deletions.
diff --git a/src/IKVM.Benchmarks.Java/IKVM.Benchmarks.Java.csproj b/src/IKVM.Benchmarks.Java/IKVM.Benchmarks.Java.csproj
@@ -16,6 +16,5 @@
 
     <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,6 +25,5 @@
 
     <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,6 +20,5 @@
 
     <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
diff --git a/src/IKVM.Image/buildTransitive/IKVM.Image.targets b/src/IKVM.Image/buildTransitive/IKVM.Image.targets
@@ -8,7 +8,14 @@
         <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>
 
-    <Import Project="IKVM.Image.properties.targets" />
+    <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>
 
     <Choose>
         <When Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net461'))">
@@ -177,4 +184,22 @@
         </AssignTargetPathsDependsOn>
     </PropertyGroup>
 
+    <Target Name="IncludeIkvmPropertiesFile" BeforeTargets="_GetPackageFiles;AssignLinkMetadata;AssignTargetPaths">
+        <ItemGroup>
+            <None Include="$(MSBuildThisFileDirectory)$(IkvmPropertiesFileName)">
+                <CopyToOutputDirectory>$(CopyIkvmPropertiesFileToOutputDirectory)</CopyToOutputDirectory>
+                <CopyToPublishDirectory>$(CopyIkvmPropertiesFileToPublishDirectory)</CopyToPublishDirectory>
+                <TargetPath>$(IkvmPropertiesFileName)</TargetPath>
+                <Pack>false</Pack>
+            </None>
+        </ItemGroup>
+    </Target>
+
+    <PropertyGroup>
+        <AssignTargetPathsDependsOn>
+            IncludeIkvmPropertiesFile;
+            $(AssignTargetPathsDependsOn);
+        </AssignTargetPathsDependsOn>
+    </PropertyGroup>
+
 </Project>
diff --git a/src/IKVM.Image/buildTransitive/ikvm.properties b/src/IKVM.Image/buildTransitive/ikvm.properties
@@ -0,0 +1 @@
+ikvm.home=..
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,6 +42,5 @@
 
     <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,7 +45,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/IKVM.JTReg.TestAdapter.csproj b/src/IKVM.JTReg.TestAdapter/IKVM.JTReg.TestAdapter.csproj
@@ -24,6 +24,5 @@
 
     <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,6 +12,5 @@
 
     <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,6 +18,5 @@
 
     <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,6 +24,5 @@
 
     <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,6 +52,5 @@
 
     <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,6 +202,5 @@
 
     <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,6 +17,5 @@
     <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,6 +17,5 @@
     <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,6 +17,5 @@
 
     <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,7 +23,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" />
 
     <!-- javac-ref uses the javac executable from JAVA_HOME: bootstrap -->

diff --git a/src/javac/javac.csproj b/src/javac/javac.csproj
@@ -18,6 +18,5 @@
 
     <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,6 +18,5 @@
 
     <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,6 +18,5 @@
 
     <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,6 +18,5 @@
 
     <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,6 +18,5 @@
 
     <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,6 +18,5 @@
 
     <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
@@ -18,7 +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/orbd/orbd.csproj b/src/orbd/orbd.csproj
@@ -18,6 +18,5 @@
 
     <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,7 +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/rmic/rmic.csproj b/src/rmic/rmic.csproj
@@ -18,7 +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/schemagen/schemagen.csproj b/src/schemagen/schemagen.csproj
@@ -18,7 +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/wsgen/wsgen.csproj b/src/wsgen/wsgen.csproj
@@ -18,7 +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/wsimport/wsimport.csproj b/src/wsimport/wsimport.csproj
@@ -18,7 +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/xjc/xjc.csproj b/src/xjc/xjc.csproj
@@ -18,6 +18,5 @@
 
     <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>