From df49d6bdfb14f26e6f1bff907d55fa7f227684fc Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Sat, 18 May 2024 13:21:25 -0500 Subject: [PATCH 1/2] Correctly document size of Set_IKVM_ThrowException. Should fix #525. --- src/IKVM.Runtime/LibJVM.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/IKVM.Runtime/LibJVM.cs b/src/IKVM.Runtime/LibJVM.cs index 2d4da2976..92e3e17ee 100644 --- a/src/IKVM.Runtime/LibJVM.cs +++ b/src/IKVM.Runtime/LibJVM.cs @@ -71,7 +71,7 @@ internal unsafe class LibJvm _Set_JNI_GetCreatedJavaVMs = Marshal.GetDelegateForFunctionPointer(Handle.GetExport("Set_JNI_GetCreatedJavaVMs", sizeof(nint)).Handle); _Set_JNI_CreateJavaVM = Marshal.GetDelegateForFunctionPointer(Handle.GetExport("Set_JNI_CreateJavaVM", sizeof(nint)).Handle); - _Set_IKVM_ThrowException = Marshal.GetDelegateForFunctionPointer(Handle.GetExport("Set_IKVM_ThrowException", sizeof(nint) + sizeof(nint)).Handle); + _Set_IKVM_ThrowException = Marshal.GetDelegateForFunctionPointer(Handle.GetExport("Set_IKVM_ThrowException", sizeof(nint)).Handle); _JVM_LoadLibrary = Marshal.GetDelegateForFunctionPointer(Handle.GetExport("JVM_LoadLibrary", sizeof(nint)).Handle); _JVM_UnloadLibrary = Marshal.GetDelegateForFunctionPointer(Handle.GetExport("JVM_UnloadLibrary", sizeof(nint)).Handle); _JVM_FindLibraryEntry = Marshal.GetDelegateForFunctionPointer(Handle.GetExport("JVM_FindLibraryEntry", sizeof(nint) + sizeof(nint)).Handle); From 7ac6c53f43cdf149765d2b1f741f614afd0560b9 Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Sat, 18 May 2024 14:15:46 -0500 Subject: [PATCH 2/2] Remove PackageVersion stuff for now. Including the tags breaks new SDK or soemthing. --- Directory.Build.props | 11 +++++++++ Directory.Packages.props | 50 ---------------------------------------- IKVM.sln | 1 - 3 files changed, 11 insertions(+), 51 deletions(-) delete mode 100644 Directory.Packages.props diff --git a/Directory.Build.props b/Directory.Build.props index 1e76f7caa..0b58f39e4 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -102,4 +102,15 @@ + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + diff --git a/Directory.Packages.props b/Directory.Packages.props deleted file mode 100644 index 628af6c7a..000000000 --- a/Directory.Packages.props +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - diff --git a/IKVM.sln b/IKVM.sln index 83a5d3fdc..cfec4f3b1 100644 --- a/IKVM.sln +++ b/IKVM.sln @@ -21,7 +21,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution CONTRIBUTING.md = CONTRIBUTING.md Directory.Build.props = Directory.Build.props Directory.Build.targets = Directory.Build.targets - Directory.Packages.props = Directory.Packages.props GitVersion.yml = GitVersion.yml global.json = global.json IKVM.deps.targets = IKVM.deps.targets