diff --git a/Directory.Build.props b/Directory.Build.props index 8580288a38..b1ea81b905 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,8 +1,8 @@ - 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 + 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 $(SupportedRuntimes) - 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 + 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 $(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 $(SupportedImageBinRuntimes) diff --git a/IKVM.sln b/IKVM.sln index 25bf78b273..7d0423b4d3 100644 --- a/IKVM.sln +++ b/IKVM.sln @@ -328,6 +328,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IKVM.Benchmarks.Java", "src EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IKVM.Image.runtime.android-arm64", "src\IKVM.Image.runtime.android-arm64\IKVM.Image.runtime.android-arm64.csproj", "{843B0704-DA5E-4357-B683-3D6F64DEF57B}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IKVM.Image.runtime.android-x64", "src\IKVM.Image.runtime.android-x64\IKVM.Image.runtime.android-x64.csproj", "{BE63E873-381D-423D-93F6-F3B25AEF4C57}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -910,6 +912,10 @@ Global {843B0704-DA5E-4357-B683-3D6F64DEF57B}.Debug|Any CPU.Build.0 = Debug|Any CPU {843B0704-DA5E-4357-B683-3D6F64DEF57B}.Release|Any CPU.ActiveCfg = Release|Any CPU {843B0704-DA5E-4357-B683-3D6F64DEF57B}.Release|Any CPU.Build.0 = Release|Any CPU + {BE63E873-381D-423D-93F6-F3B25AEF4C57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BE63E873-381D-423D-93F6-F3B25AEF4C57}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BE63E873-381D-423D-93F6-F3B25AEF4C57}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BE63E873-381D-423D-93F6-F3B25AEF4C57}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/IKVM.Image.runtime.android-x64/IKVM.Image.runtime.android-x64.csproj b/src/IKVM.Image.runtime.android-x64/IKVM.Image.runtime.android-x64.csproj new file mode 100644 index 0000000000..deb25a21f9 --- /dev/null +++ b/src/IKVM.Image.runtime.android-x64/IKVM.Image.runtime.android-x64.csproj @@ -0,0 +1,16 @@ + + + + + net472;net6.0;net8.0 + LICENSE.md + README.md + IKVM Runtime Image + false + android-x64 + + + + + + diff --git a/src/IKVM.Image.runtime.android-x64/README.md b/src/IKVM.Image.runtime.android-x64/README.md new file mode 100644 index 0000000000..0a3a5b6614 --- /dev/null +++ b/src/IKVM.Image.runtime.android-x64/README.md @@ -0,0 +1,3 @@ +# IKVM.Image + +Native requirements for IKVM.Image. diff --git a/src/IKVM.Image.runtime.android-x64/buildTransitive/IKVM.Image.runtime.android-x64.props b/src/IKVM.Image.runtime.android-x64/buildTransitive/IKVM.Image.runtime.android-x64.props new file mode 100644 index 0000000000..da20c554eb --- /dev/null +++ b/src/IKVM.Image.runtime.android-x64/buildTransitive/IKVM.Image.runtime.android-x64.props @@ -0,0 +1,24 @@ + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + + + + + any + android-x64 + %(RecursiveDir)%(FileName)%(Extension) + + + net6.0 + android-x64 + %(RecursiveDir)%(FileName)%(Extension) + + + net8.0 + android-x64 + %(RecursiveDir)%(FileName)%(Extension) + + + + diff --git a/src/IKVM.Image.runtime.android-x64/lib/net472/_._ b/src/IKVM.Image.runtime.android-x64/lib/net472/_._ new file mode 100644 index 0000000000..5f282702bb --- /dev/null +++ b/src/IKVM.Image.runtime.android-x64/lib/net472/_._ @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/IKVM.Image.runtime.android-x64/lib/net6.0/_._ b/src/IKVM.Image.runtime.android-x64/lib/net6.0/_._ new file mode 100644 index 0000000000..5f282702bb --- /dev/null +++ b/src/IKVM.Image.runtime.android-x64/lib/net6.0/_._ @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/IKVM.Image.runtime.android-x64/lib/net8.0/_._ b/src/IKVM.Image.runtime.android-x64/lib/net8.0/_._ new file mode 100644 index 0000000000..5f282702bb --- /dev/null +++ b/src/IKVM.Image.runtime.android-x64/lib/net8.0/_._ @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/IKVM.Image/IKVM.Image.csproj b/src/IKVM.Image/IKVM.Image.csproj index 17925f663f..e3fba70b59 100644 --- a/src/IKVM.Image/IKVM.Image.csproj +++ b/src/IKVM.Image/IKVM.Image.csproj @@ -23,6 +23,7 @@ + diff --git a/src/IKVM.Image/buildTransitive/IKVM.Image.targets b/src/IKVM.Image/buildTransitive/IKVM.Image.targets index a326018b76..f87d876b65 100644 --- a/src/IKVM.Image/buildTransitive/IKVM.Image.targets +++ b/src/IKVM.Image/buildTransitive/IKVM.Image.targets @@ -5,7 +5,7 @@ - + diff --git a/src/IKVM.Java/IKVM.Java.runtime.props b/src/IKVM.Java/IKVM.Java.runtime.props index 6023c43ac8..7de4381491 100644 --- a/src/IKVM.Java/IKVM.Java.runtime.props +++ b/src/IKVM.Java/IKVM.Java.runtime.props @@ -13,9 +13,9 @@ windows - solaris + solaris windows - linux + linux macosx diff --git a/src/IKVM.MSBuild.Tests/IKVM.MSBuild.Tests.csproj b/src/IKVM.MSBuild.Tests/IKVM.MSBuild.Tests.csproj index 7fbabe8ab8..17e1cb6f30 100644 --- a/src/IKVM.MSBuild.Tests/IKVM.MSBuild.Tests.csproj +++ b/src/IKVM.MSBuild.Tests/IKVM.MSBuild.Tests.csproj @@ -52,6 +52,7 @@ + diff --git a/src/IKVM.NET.Sdk.Tests/IKVM.NET.Sdk.Tests.csproj b/src/IKVM.NET.Sdk.Tests/IKVM.NET.Sdk.Tests.csproj index 85d461bdf0..c903ba3211 100644 --- a/src/IKVM.NET.Sdk.Tests/IKVM.NET.Sdk.Tests.csproj +++ b/src/IKVM.NET.Sdk.Tests/IKVM.NET.Sdk.Tests.csproj @@ -46,6 +46,7 @@ + diff --git a/src/dist-nuget/dist-nuget.csproj b/src/dist-nuget/dist-nuget.csproj index 990788e23e..f1140b3c9b 100644 --- a/src/dist-nuget/dist-nuget.csproj +++ b/src/dist-nuget/dist-nuget.csproj @@ -75,6 +75,9 @@ . + + . + . diff --git a/src/libnet/libnet.clangproj b/src/libnet/libnet.clangproj index 5f7042ed5e..45695dbe87 100644 --- a/src/libnet/libnet.clangproj +++ b/src/libnet/libnet.clangproj @@ -32,7 +32,7 @@ - + diff --git a/targets/lib.props b/targets/lib.props index f90f9c9195..cb5b3a3efd 100644 --- a/targets/lib.props +++ b/targets/lib.props @@ -26,6 +26,7 @@ arm-unknown-linux-musleabihf x86_64-apple-macosx arm64-apple-macosx + x86_64-linux-android arm-linux-androideabi aarch64-linux-android