Merge branch 'develop' into lbuild

ikvmnet · Jun 13, 2024 · cbfa614 · cbfa614
2 parents 5baa65a + a3327e6
commit cbfa614
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 32 deletions.
diff --git a/src/IKVM.Runtime/Java/Externs/java/io/WinNTFileSystem.cs b/src/IKVM.Runtime/Java/Externs/java/io/WinNTFileSystem.cs
@@ -540,40 +540,33 @@ public static string[] list(object self, object f)
 #if FIRST_PASS
             throw new NotImplementedException();
 #else
-            try
+            if (JVM.Vfs.IsPath(((global::java.io.File)f).getPath()))
             {
-                if (JVM.Vfs.IsPath(((global::java.io.File)f).getPath()))
-                {
-                    if (JVM.Vfs.GetEntry(((global::java.io.File)f).getPath()) is VfsDirectory vfs)
-                        return vfs.List();
+                if (JVM.Vfs.GetEntry(((global::java.io.File)f).getPath()) is VfsDirectory vfs)
+                    return vfs.List();
 
-                    return null;
+                return null;
+            }
+            else
+            {
+                __callerID ??= global::ikvm.@internal.CallerID.create(WinNTFileSystemAccessor.Type.TypeHandle);
+                __jniPtr__list ??= Marshal.GetDelegateForFunctionPointer<__jniDelegate__list>(JNIFrame.GetFuncPtr(__callerID, "java/io/WinNTFileSystem", nameof(list), "(Ljava/io/File;)[Ljava/lang/String;"));
+                var jniFrm = new JNIFrame();
+                var jniEnv = jniFrm.Enter(__callerID);
+                try
+                {
+                    return (string[])jniFrm.UnwrapLocalRef(__jniPtr__list(jniEnv, jniFrm.MakeLocalRef(self), jniFrm.MakeLocalRef(f)));
                 }
-                else
+                catch (Exception ex)
                 {
-                    __callerID ??= global::ikvm.@internal.CallerID.create(WinNTFileSystemAccessor.Type.TypeHandle);
-                    __jniPtr__list ??= Marshal.GetDelegateForFunctionPointer<__jniDelegate__list>(JNIFrame.GetFuncPtr(__callerID, "java/io/WinNTFileSystem", nameof(list), "(Ljava/io/File;)[Ljava/lang/String;"));
-                    var jniFrm = new JNIFrame();
-                    var jniEnv = jniFrm.Enter(__callerID);
-                    try
-                    {
-                        return (string[])jniFrm.UnwrapLocalRef(__jniPtr__list(jniEnv, jniFrm.MakeLocalRef(self), jniFrm.MakeLocalRef(f)));
-                    }
-                    catch (Exception ex)
-                    {
-                        System.Console.WriteLine("*** exception in native code ***");
-                        System.Console.WriteLine(ex);
-                        throw;
-                    }
-                    finally
-                    {
-                        jniFrm.Leave();
-                    }
+                    System.Console.WriteLine("*** exception in native code ***");
+                    System.Console.WriteLine(ex);
+                    throw;
+                }
+                finally
+                {
+                    jniFrm.Leave();
                 }
-            }
-            catch (global::java.lang.NegativeArraySizeException e)
-            {
-                throw new global::java.lang.NegativeArraySizeException("listing " + ((global::java.io.File)f).getPath());
             }
 #endif
         }

diff --git a/src/IKVM.Tools.Exporter.Tests/IKVM.Tools.Exporter.Tests.csproj b/src/IKVM.Tools.Exporter.Tests/IKVM.Tools.Exporter.Tests.csproj
@@ -1,8 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="MSTest.Sdk">
     <PropertyGroup>
         <TargetFrameworks>net472;net6.0;net8.0</TargetFrameworks>
         <PreserveCompilationContext>true</PreserveCompilationContext>
         <ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
+        <RunSettingsFilePath>$(MSBuildProjectDirectory)\IKVM.Tools.Exporter.Tests.runsettings</RunSettingsFilePath>
     </PropertyGroup>
 
     <ItemGroup>
@@ -56,4 +57,10 @@
         </IncludeProjectReference>
     </ItemGroup>
 
+    <ItemGroup>
+        <None Update="IKVM.Tools.Exporter.Tests.runsettings">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+    </ItemGroup>
+
 </Project>
diff --git a/src/IKVM.Tools.Exporter.Tests/IKVM.Tools.Exporter.Tests.runsettings b/src/IKVM.Tools.Exporter.Tests/IKVM.Tools.Exporter.Tests.runsettings
@@ -0,0 +1,8 @@
+<RunSettings>
+    <RunConfiguration>
+        <DisableAppDomain>True</DisableAppDomain>
+    </RunConfiguration>
+    <MSTest>
+        <DisableAppDomain>True</DisableAppDomain>
+    </MSTest>
+</RunSettings>
diff --git a/src/IKVM.Tools.Importer.Tests/IKVM.Tools.Importer.Tests.csproj b/src/IKVM.Tools.Importer.Tests/IKVM.Tools.Importer.Tests.csproj
@@ -1,8 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="MSTest.Sdk">
     <PropertyGroup>
         <TargetFrameworks>net472;net6.0;net8.0</TargetFrameworks>
         <PreserveCompilationContext>true</PreserveCompilationContext>
         <ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
+        <RunSettingsFilePath>$(MSBuildProjectDirectory)\IKVM.Tools.Importer.Tests.runsettings</RunSettingsFilePath>
     </PropertyGroup>
 
     <ItemGroup>
@@ -16,7 +17,7 @@
     <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net461'))">
         <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
     </ItemGroup>
-    
+
     <ItemGroup>
         <ProjectReference Include="..\IKVM.Java.Tests.Util\IKVM.Java.Tests.Util.csproj" />
         <ProjectReference Include="..\IKVM.Runtime\IKVM.Runtime.csproj" />
@@ -67,5 +68,11 @@
         </IncludeProjectReference>
     </ItemGroup>
 
+    <ItemGroup>
+        <None Update="IKVM.Tools.Importer.Tests.runsettings">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+    </ItemGroup>
+
     <Import Project="$(MSBuildThisFileDirectory)..\..\IKVM.refs.targets" />
 </Project>
diff --git a/src/IKVM.Tools.Importer.Tests/IKVM.Tools.Importer.Tests.runsettings b/src/IKVM.Tools.Importer.Tests/IKVM.Tools.Importer.Tests.runsettings
@@ -0,0 +1,8 @@
+<RunSettings>
+    <RunConfiguration>
+        <DisableAppDomain>True</DisableAppDomain>
+    </RunConfiguration>
+    <MSTest>
+        <DisableAppDomain>True</DisableAppDomain>
+    </MSTest>
+</RunSettings>