Merge branch 'main' into develop

iterate-ch · May 18, 2024 · 30ba2f5 · 30ba2f5
2 parents 6d48ab7 + 7ac6c53
commit 30ba2f5
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 52 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -102,4 +102,15 @@
         <IkvmToolReference Include="$(MSBuildThisFileDirectory)src\ikvmstub\ikvmstub.csproj" IsIkvmExporter="true" />
     </ItemGroup>
 
+    <ItemGroup>
+        <PackageReference Include="IKVM.Core.MSBuild" Version="0.1.93">
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+            <PrivateAssets>all</PrivateAssets>
+        </PackageReference>
+        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+    </ItemGroup>
+
 </Project>
diff --git a/Directory.Packages.props b/Directory.Packages.props
diff --git 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

diff --git a/src/IKVM.Runtime/LibJVM.cs b/src/IKVM.Runtime/LibJVM.cs
@@ -69,7 +69,7 @@ internal unsafe class LibJvm
             _Set_JNI_GetCreatedJavaVMs = Marshal.GetDelegateForFunctionPointer<Set_JNI_GetCreatedJavaVMsDelegate>(Handle.GetExport("Set_JNI_GetCreatedJavaVMs", sizeof(nint)).Handle);
             _Set_JNI_CreateJavaVM = Marshal.GetDelegateForFunctionPointer<Set_JNI_CreateJavaVMDelegate>(Handle.GetExport("Set_JNI_CreateJavaVM", sizeof(nint)).Handle);
 
-            _Set_IKVM_ThrowException = Marshal.GetDelegateForFunctionPointer<Set_IKVM_ThrowExceptionDelegate>(Handle.GetExport("Set_IKVM_ThrowException", sizeof(nint) + sizeof(nint)).Handle);
+            _Set_IKVM_ThrowException = Marshal.GetDelegateForFunctionPointer<Set_IKVM_ThrowExceptionDelegate>(Handle.GetExport("Set_IKVM_ThrowException", sizeof(nint)).Handle);
             _JVM_LoadLibrary = Marshal.GetDelegateForFunctionPointer<JVM_LoadLibraryDelegate>(Handle.GetExport("JVM_LoadLibrary", sizeof(nint)).Handle);
             _JVM_UnloadLibrary = Marshal.GetDelegateForFunctionPointer<JVM_UnloadLibraryDelegate>(Handle.GetExport("JVM_UnloadLibrary", sizeof(nint)).Handle);
             _JVM_FindLibraryEntry = Marshal.GetDelegateForFunctionPointer<JVM_FindLibraryEntryDelegate>(Handle.GetExport("JVM_FindLibraryEntry", sizeof(nint) + sizeof(nint)).Handle);