Merge branch 'develop' into lbuild

ikvmnet · Jun 9, 2024 · 4015ef9 · 4015ef9
2 parents 31d78cb + 9415a9c
commit 4015ef9
Show file tree

Hide file tree

Showing 15 changed files with 66 additions and 4,562 deletions.
diff --git a/src/IKVM.Image.runtime.linux-arm/IKVM.Image.runtime.linux-arm.csproj b/src/IKVM.Image.runtime.linux-arm/IKVM.Image.runtime.linux-arm.csproj
@@ -10,6 +10,10 @@
         <ImageRuntimeIdentifier>linux-arm</ImageRuntimeIdentifier>
     </PropertyGroup>
 
+    <ItemGroup>
+      <Folder Include="ikvm\any\lib\" />
+    </ItemGroup>
+
     <Import Sdk="Microsoft.Build.NoTargets" Project="Sdk.targets" />
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM.Image\IKVM.Image.runtime.targets" />
 </Project>

diff --git a/src/IKVM.Image.runtime.linux-arm/ikvm/any/lib/security/java.security b/src/IKVM.Image.runtime.linux-arm/ikvm/any/lib/security/java.security
diff --git a/src/IKVM.Image.runtime.linux-arm64/IKVM.Image.runtime.linux-arm64.csproj b/src/IKVM.Image.runtime.linux-arm64/IKVM.Image.runtime.linux-arm64.csproj
@@ -11,6 +11,10 @@
         <SupportedImageTargetFrameworks>net6.0;net8.0</SupportedImageTargetFrameworks>
     </PropertyGroup>
 
+    <ItemGroup>
+      <Folder Include="ikvm\any\lib\" />
+    </ItemGroup>
+
     <Import Sdk="Microsoft.Build.NoTargets" Project="Sdk.targets" />
     <Import Project="$(MSBuildThisFileDirectory)..\IKVM.Image\IKVM.Image.runtime.targets" />
 </Project>