Merge develop.

ikvmnet · Jun 29, 2024 · 126832c · 126832c
2 parents 5cf357b + 003496b
commit 126832c
Show file tree

Hide file tree

Showing 16 changed files with 311 additions and 209 deletions.
diff --git a/.github/workflows/IKVM.yml b/.github/workflows/IKVM.yml
@@ -535,7 +535,7 @@ jobs:
       matrix: ${{ fromJSON(needs.test-vars.outputs.matrix) }}
     name: Test (${{ matrix.run }}:${{ matrix.tfm }}:${{ matrix.sys }})
     timeout-minutes: 240
-    runs-on: ${{ fromJSON('{"win-x86":["windows-2022"],"win-x64":["windows-2022"],"linux-x64":["ubuntu-22.04"],"osx-x64":["macos-12"],"osx-arm64":["macos-14"]}')[matrix.sys] }}
+    runs-on: ${{ fromJSON('{"win-x86":["windows-2022"],"win-x64":["windows-2022"],"linux-x64":["ubuntu-22.04"],"osx-x64":["macos-13"],"osx-arm64":["macos-14"]}')[matrix.sys] }}
     steps:
     - name: Free Disk Space (Linux)
       if: runner.os == 'Linux'

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -6,7 +6,7 @@
         <EnabledToolRuntimes Condition=" '$(EnabledToolRuntimes)' == '' ">$(SupportedToolRuntimes)</EnabledToolRuntimes>
         <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</SupportedImageRuntimes>
         <EnabledImageRuntimes Condition=" '$(EnabledImageRuntimes)' == '' ">$(SupportedImageRuntimes)</EnabledImageRuntimes>
-        
+
         <_SupportedRuntimes>;$(SupportedRuntimes);</_SupportedRuntimes>
         <_EnabledRuntimes>;$(EnabledRuntimes);</_EnabledRuntimes>
         <_SupportedToolRuntimes>;$(SupportedToolRuntimes);</_SupportedToolRuntimes>
@@ -21,7 +21,7 @@
         <OpenJdkMinorVersion>8</OpenJdkMinorVersion>
         <OpenJdkMicroVersion>0</OpenJdkMicroVersion>
         <OpenJdkUpdateVersion>275</OpenJdkUpdateVersion>
-        <OpenJdkBuildNumber>ga</OpenJdkBuildNumber>
+        <OpenJdkBuildNumber>b01</OpenJdkBuildNumber>
         <OpenJdkVersion>OpenJDK $(OpenJdkMinorVersion)u$(OpenJdkUpdateVersion) $(OpenJdkBuildNumber)</OpenJdkVersion>
         <OpenJdkFullVersion>$(OpenJdkMajorVersion).$(OpenJdkMinorVersion).$(OpenJdkMicroVersion)_$(OpenJdkUpdateVersion)-$(OpenJdkBuildNumber)</OpenJdkFullVersion>
         <OpenJdkVendor>Oracle</OpenJdkVendor>
@@ -63,7 +63,7 @@
         <IncludeSymbols>true</IncludeSymbols>
         <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     </PropertyGroup>
-    
+
     <PropertyGroup Label="Build Info">
         <LangVersion Condition=" '$(LangVersion)' == '' ">10.0</LangVersion>
         <NoWarn>$(NoWarn);1591;1573;CS8002;NU5100;NU5118;NU5128;MSB3245;NETSDK1023</NoWarn>
@@ -97,7 +97,7 @@
         <IkvmToolReference Include="$(MSBuildThisFileDirectory)src\ikvmc\ikvmc.csproj" IsIkvmCompiler="true" />
         <IkvmToolReference Include="$(MSBuildThisFileDirectory)src\ikvmstub\ikvmstub.csproj" IsIkvmExporter="true" />
     </ItemGroup>
-    
+
     <ItemGroup>
         <PackageReference Include="IKVM.Core.MSBuild" Version="0.1.102">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/src/IKVM.ByteCode.Tests/IKVM.ByteCode.Tests.csproj b/src/IKVM.ByteCode.Tests/IKVM.ByteCode.Tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="MSTest.Sdk">
 
     <PropertyGroup>
         <TargetFrameworks>net472;net6.0;net7.0;net8.0</TargetFrameworks>
@@ -7,11 +7,7 @@
 
     <ItemGroup>
         <PackageReference Include="FluentAssertions" Version="5.0.0" />
-        <PackageReference Include="Microsoft.CodeCoverage" Version="17.9.0" />
         <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-        <PackageReference Include="MSTest.TestAdapter" Version="3.2.2" />
-        <PackageReference Include="MSTest.TestFramework" Version="3.2.2" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/IKVM.ConsoleApp/IKVM.ConsoleApp.csproj b/src/IKVM.ConsoleApp/IKVM.ConsoleApp.csproj
@@ -5,7 +5,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFrameworks>net481;;net6.0;net8.0;;</TargetFrameworks>
+        <TargetFrameworks>net481;net6.0;net8.0</TargetFrameworks>
         <LangVersion>11</LangVersion>
         <PlatformTarget>x64</PlatformTarget>
     </PropertyGroup>

diff --git a/src/IKVM.JTReg.TestAdapter.Core/JTRegTestManager.cs b/src/IKVM.JTReg.TestAdapter.Core/JTRegTestManager.cs
@@ -390,7 +390,7 @@ dynamic CreateParameters(dynamic testManager, dynamic testSuite, Func<dynamic, b
             rp.setTestJavaOptions(java.util.Collections.emptyList());
             rp.setFile((java.io.File)wd.getFile("config.jti"));
             rp.setEnvVars(GetEnvVars(debugUri));
-            rp.setConcurrency(Environment.ProcessorCount);
+            rp.setConcurrency(options.Concurrency > 0 ? options.Concurrency : Environment.ProcessorCount);
             rp.setTimeoutFactor(options.TimeoutFactor);
             rp.setRetainArgs(java.util.Collections.singletonList("all"));
             rp.setExcludeLists(excludeFileList.ToArray());

diff --git a/src/IKVM.JTReg.TestAdapter.Core/JTRegTestOptions.cs b/src/IKVM.JTReg.TestAdapter.Core/JTRegTestOptions.cs
@@ -18,6 +18,11 @@ public class JTRegTestOptions
         /// </summary>
         public float TimeoutFactor { get; set; } = 1.0f;
 
+        /// <summary>
+        /// Gets or sets the number of concurrent tests to execute.
+        /// </summary>
+        public int Concurrency { get; set; } = 0;
+
         /// <summary>
         /// Set of relative or absolute file names to add as exclude lists.
         /// </summary>

diff --git a/src/IKVM.JTReg.TestAdapter/JTRegTestOptionsExtensions.cs b/src/IKVM.JTReg.TestAdapter/JTRegTestOptionsExtensions.cs
@@ -17,6 +17,7 @@ public static class JTRegTestOptionsExtensions
         const string JTRegConfigurationElementName = "JTRegConfiguration";
         const string PartitionCountElementName = "PartitionCount";
         const string TimeoutFactorElementName = "TimeoutFactor";
+        const string ConcurrencyElementName = "Concurrency";
         const string ExcludeListFilesElementName = "ExcludeListFile";
         const string AdditionalExcludeListFilesElementName = "AdditionalExcludeListFile";
         const string IncludeListFilesElementName = "IncludeListFile";
@@ -39,6 +40,9 @@ public static JTRegTestOptions ToJTRegOptions(this IRunSettings self)
                 if ((float?)x.Element(TimeoutFactorElementName) is float timeoutFactor)
                     o.TimeoutFactor = timeoutFactor;
 
+                if ((int?)x.Element(ConcurrencyElementName) is int concurrency)
+                    o.Concurrency = concurrency;
+
                 var excludeListFilesElements = x.Elements(ExcludeListFilesElementName);
                 if (excludeListFilesElements != null && excludeListFilesElements.Any())
                 {