Merge pull request #401 from ikvmnet/net6

.NET 6.0
ikvmnet · Aug 6, 2023 · ae6e9d9 · ae6e9d9
2 parents 1c070a9 + 05a40a1
commit ae6e9d9
Show file tree

Hide file tree

Showing 188 changed files with 1,483 additions and 792 deletions.
diff --git a/.github/workflows/IKVM.yml b/.github/workflows/IKVM.yml
@@ -404,8 +404,8 @@ jobs:
         - IKVM.ByteCode.Tests
         - IKVM.Tests
         - IKVM.Java.Tests
-        - IKVM.Tools.Importer.Tests
         - IKVM.Tools.Exporter.Tests
+        - IKVM.Tools.Importer.Tests
         - IKVM.Tools.Tests
         - IKVM.JTReg.TestAdapter.Tests
         - IKVM.OpenJDK.Tests?TestPartition=0
@@ -418,78 +418,44 @@ jobs:
         - IKVM.OpenJDK.Tests?TestPartition=7
         tfm:
         - net461
-        - netcoreapp3.1
         - net6.0
-        - net7.0
         sys:
         - windows
         - linux
         exclude:
         - tfm: net461
           sys: linux
-        - run: IKVM.Java.Tests
-          tfm: net6.0
-        - run: IKVM.Tools.Exporter.Tests
-          tfm: net6.0
-        - run: IKVM.Tools.Importer.Tests
-          tfm: net6.0
-        - run: IKVM.OpenJDK.Tests?TestPartition=0
-          tfm: net6.0
-        - run: IKVM.OpenJDK.Tests?TestPartition=1
-          tfm: net6.0
-        - run: IKVM.OpenJDK.Tests?TestPartition=2
-          tfm: net6.0
-        - run: IKVM.OpenJDK.Tests?TestPartition=3
-          tfm: net6.0
-        - run: IKVM.OpenJDK.Tests?TestPartition=4
-          tfm: net6.0
-        - run: IKVM.OpenJDK.Tests?TestPartition=5
-          tfm: net6.0
-        - run: IKVM.OpenJDK.Tests?TestPartition=6
-          tfm: net6.0
-        - run: IKVM.OpenJDK.Tests?TestPartition=7
-          tfm: net6.0
-        - run: IKVM.Java.Tests
-          tfm: net7.0
         - run: IKVM.Tools.Exporter.Tests
-          tfm: net7.0
+          tfm: net461
         - run: IKVM.Tools.Importer.Tests
-          tfm: net7.0
-        - run: IKVM.OpenJDK.Tests?TestPartition=0
-          tfm: net7.0
-        - run: IKVM.OpenJDK.Tests?TestPartition=1
-          tfm: net7.0
-        - run: IKVM.OpenJDK.Tests?TestPartition=2
-          tfm: net7.0
-        - run: IKVM.OpenJDK.Tests?TestPartition=3
-          tfm: net7.0
-        - run: IKVM.OpenJDK.Tests?TestPartition=4
-          tfm: net7.0
-        - run: IKVM.OpenJDK.Tests?TestPartition=5
-          tfm: net7.0
-        - run: IKVM.OpenJDK.Tests?TestPartition=6
-          tfm: net7.0
-        - run: IKVM.OpenJDK.Tests?TestPartition=7
-          tfm: net7.0
+          tfm: net461
+        - run: IKVM.Tools.Tests
+          tfm: net461
         include:
-        - run: IKVM.MSBuild.Tasks.Tests
-          tfm: net472
+        - run: IKVM.ByteCode.Tests
+          tfm: netcoreapp3.1
           sys: windows
-        - run: IKVM.MSBuild.Tasks.Tests
+        - run: IKVM.ByteCode.Tests
+          tfm: netcoreapp3.1
+          sys: linux
+        - run: IKVM.Java.Tests
           tfm: netcoreapp3.1
           sys: windows
+        - run: IKVM.Java.Tests
+          tfm: netcoreapp3.1
+          sys: linux
+        - run: IKVM.JTReg.TestAdapter.Tests
+          tfm: net7.0
+          sys: windows
+        - run: IKVM.JTReg.TestAdapter.Tests
+          tfm: net7.0
+          sys: linux
         - run: IKVM.MSBuild.Tasks.Tests
-          tfm: net6.0
+          tfm: net472
           sys: windows
         - run: IKVM.MSBuild.Tasks.Tests
           tfm: net7.0
           sys: windows
-        - run: IKVM.MSBuild.Tasks.Tests
-          tfm: netcoreapp3.1
-          sys: linux
-        - run: IKVM.MSBuild.Tasks.Tests
-          tfm: net6.0
-          sys: linux
         - run: IKVM.MSBuild.Tasks.Tests
           tfm: net7.0
           sys: linux
@@ -505,6 +471,27 @@ jobs:
         - run: IKVM.NET.Sdk.Tests
           tfm: net7.0
           sys: linux
+        - run: IKVM.Tests
+          tfm: net7.0
+          sys: windows
+        - run: IKVM.Tests
+          tfm: net7.0
+          sys: linux
+        - run: IKVM.Tools.Exporter.Tests
+          tfm: net472
+          sys: windows
+        - run: IKVM.Tools.Importer.Tests
+          tfm: net472
+          sys: windows
+        - run: IKVM.Tools.Tests
+          tfm: net472
+          sys: windows
+        - run: IKVM.Tools.Tests
+          tfm: net7.0
+          sys: windows
+        - run: IKVM.Tools.Tests
+          tfm: net7.0
+          sys: linux
     name: Test (${{ matrix.run }}:${{ matrix.tfm }}:${{ matrix.sys }})
     needs:
     - build-ikvm

diff --git a/ext/helloworld/net461/HelloWorldDotNet.deps.json b/ext/helloworld/net461/HelloWorldDotNet.deps.json
@@ -0,0 +1,23 @@
+{
+  "runtimeTarget": {
+    "name": ".NETCoreApp,Version=v3.1",
+    "signature": ""
+  },
+  "compilationOptions": {},
+  "targets": {
+    ".NETCoreApp,Version=v3.1": {
+      "HelloWorldDotNet/1.0.0": {
+        "runtime": {
+          "HelloWorldDotNet.dll": {}
+        }
+      }
+    }
+  },
+  "libraries": {
+    "HelloWorldDotNet/1.0.0": {
+      "type": "project",
+      "serviceable": false,
+      "sha512": ""
+    }
+  }
+}
diff --git a/ext/helloworld/net461/HelloWorldDotNet.dll b/ext/helloworld/net461/HelloWorldDotNet.dll
diff --git a/ext/helloworld/net6.0/HelloWorldDotNet.deps.json b/ext/helloworld/net6.0/HelloWorldDotNet.deps.json
@@ -0,0 +1,23 @@
+{
+  "runtimeTarget": {
+    "name": ".NETCoreApp,Version=v3.1",
+    "signature": ""
+  },
+  "compilationOptions": {},
+  "targets": {
+    ".NETCoreApp,Version=v3.1": {
+      "HelloWorldDotNet/1.0.0": {
+        "runtime": {
+          "HelloWorldDotNet.dll": {}
+        }
+      }
+    }
+  },
+  "libraries": {
+    "HelloWorldDotNet/1.0.0": {
+      "type": "project",
+      "serviceable": false,
+      "sha512": ""
+    }
+  }
+}
diff --git a/ext/helloworld/net6.0/HelloWorldDotNet.dll b/ext/helloworld/net6.0/HelloWorldDotNet.dll
diff --git a/ext/helloworld/netcoreapp3.1/HelloWorldDotNet.deps.json b/ext/helloworld/netcoreapp3.1/HelloWorldDotNet.deps.json
@@ -0,0 +1,23 @@
+{
+  "runtimeTarget": {
+    "name": ".NETCoreApp,Version=v3.1",
+    "signature": ""
+  },
+  "compilationOptions": {},
+  "targets": {
+    ".NETCoreApp,Version=v3.1": {
+      "HelloWorldDotNet/1.0.0": {
+        "runtime": {
+          "HelloWorldDotNet.dll": {}
+        }
+      }
+    }
+  },
+  "libraries": {
+    "HelloWorldDotNet/1.0.0": {
+      "type": "project",
+      "serviceable": false,
+      "sha512": ""
+    }
+  }
+}
diff --git a/ext/helloworld/netcoreapp3.1/HelloWorldDotNet.dll b/ext/helloworld/netcoreapp3.1/HelloWorldDotNet.dll
diff --git a/src/IKVM.ByteCode/msbuild.binlog b/src/IKVM.ByteCode/msbuild.binlog
diff --git a/src/IKVM.Image.JDK-bin/IKVM.Image.JDK-bin.csproj b/src/IKVM.Image.JDK-bin/IKVM.Image.JDK-bin.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.Build.NoTargets">
     <PropertyGroup>
-        <TargetFrameworks>net461;netcoreapp3.1</TargetFrameworks>
+        <TargetFrameworks>net461;net6.0</TargetFrameworks>
         <RuntimeIdentifiers>$(_SupportedImageRuntimes)</RuntimeIdentifiers>
         <ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
     </PropertyGroup>

diff --git a/src/IKVM.Image.JDK.runtime.linux-arm/IKVM.Image.JDK.runtime.linux-arm.csproj b/src/IKVM.Image.JDK.runtime.linux-arm/IKVM.Image.JDK.runtime.linux-arm.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.Build.NoTargets">
     <PropertyGroup>
-        <TargetFrameworks>net461;netcoreapp3.1</TargetFrameworks>
+        <TargetFrameworks>net461;net6.0</TargetFrameworks>
         <PackageLicenseFile>LICENSE.md</PackageLicenseFile>
         <PackageReadmeFile>README.md</PackageReadmeFile>
         <Description>IKVM JDK Runtime Image</Description>
@@ -25,9 +25,9 @@
             <ProjectPackagePath>ikvm\net461\linux-arm\bin</ProjectPackagePath>
         </PublishProjectReference>
         <PublishProjectReference Include="..\IKVM.Image.JDK-bin\IKVM.Image.JDK-bin.csproj">
-            <SetTargetFramework>TargetFramework=netcoreapp3.1</SetTargetFramework>
+            <SetTargetFramework>TargetFramework=net6.0</SetTargetFramework>
             <SetRuntimeIdentifier>RuntimeIdentifier=linux-arm</SetRuntimeIdentifier>
-            <ProjectPackagePath>ikvm\netcoreapp3.1\linux-arm\bin</ProjectPackagePath>
+            <ProjectPackagePath>ikvm\net6.0\linux-arm\bin</ProjectPackagePath>
         </PublishProjectReference>
     </ItemGroup>
 

diff --git a/src/IKVM.Image.JDK.runtime.linux-arm/buildTransitive/IKVM.Image.JDK.runtime.linux-arm.props b/src/IKVM.Image.JDK.runtime.linux-arm/buildTransitive/IKVM.Image.JDK.runtime.linux-arm.props
@@ -9,8 +9,8 @@
             <RuntimeIdentifier>linux-arm</RuntimeIdentifier>
             <ImagePath>%(RecursiveDir)%(FileName)%(Extension)</ImagePath>
         </IkvmImageItem>
-        <IkvmImageItem Include="$(MSBuildThisFileDirectory)..\ikvm\netcoreapp3.1\linux-arm\**\*">
-            <TargetFramework>netcoreapp3.1</TargetFramework>
+        <IkvmImageItem Include="$(MSBuildThisFileDirectory)..\ikvm\net6.0\linux-arm\**\*">
+            <TargetFramework>net6.0</TargetFramework>
             <RuntimeIdentifier>linux-arm</RuntimeIdentifier>
             <ImagePath>%(RecursiveDir)%(FileName)%(Extension)</ImagePath>
         </IkvmImageItem>

diff --git a/src/IKVM.Image.JDK.runtime.linux-arm/lib/net6.0/_._ b/src/IKVM.Image.JDK.runtime.linux-arm/lib/net6.0/_._
@@ -0,0 +1 @@
+
diff --git a/src/IKVM.Image.JDK.runtime.linux-arm64/IKVM.Image.JDK.runtime.linux-arm64.csproj b/src/IKVM.Image.JDK.runtime.linux-arm64/IKVM.Image.JDK.runtime.linux-arm64.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.Build.NoTargets">
     <PropertyGroup>
-        <TargetFrameworks>net461;netcoreapp3.1</TargetFrameworks>
+        <TargetFrameworks>net461;net6.0</TargetFrameworks>
         <PackageLicenseFile>LICENSE.md</PackageLicenseFile>
         <PackageReadmeFile>README.md</PackageReadmeFile>
         <Description>IKVM JDK Runtime Image</Description>
@@ -20,13 +20,13 @@
 
     <ItemGroup Condition=" '$(TargetFramework)' == '' ">
         <PublishProjectReference Include="..\IKVM.Image.JDK-bin\IKVM.Image.JDK-bin.csproj">
-            <SetTargetFramework>TargetFramework=netcoreapp3.1</SetTargetFramework>
+            <SetTargetFramework>TargetFramework=net6.0</SetTargetFramework>
             <SetRuntimeIdentifier>RuntimeIdentifier=linux-arm64</SetRuntimeIdentifier>
-            <ProjectPackagePath>ikvm\netcoreapp3.1\linux-arm64\bin</ProjectPackagePath>
+            <ProjectPackagePath>ikvm\net6.0\linux-arm64\bin</ProjectPackagePath>
         </PublishProjectReference>
     </ItemGroup>
 
-    <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
+    <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
         <PublishProjectReference Include="..\IKVM.Image.JDK-bin\IKVM.Image.JDK-bin.csproj">
             <SetTargetFramework>TargetFramework=$(TargetFramework)</SetTargetFramework>
             <SetRuntimeIdentifier>RuntimeIdentifier=linux-arm64</SetRuntimeIdentifier>

diff --git a/...VM.Image.JDK.runtime.linux-arm64/buildTransitive/IKVM.Image.JDK.runtime.linux-arm64.props b/...VM.Image.JDK.runtime.linux-arm64/buildTransitive/IKVM.Image.JDK.runtime.linux-arm64.props
@@ -9,8 +9,8 @@
             <RuntimeIdentifier>linux-arm64</RuntimeIdentifier>
             <ImagePath>%(RecursiveDir)%(FileName)%(Extension)</ImagePath>
         </IkvmImageItem>
-        <IkvmImageItem Include="$(MSBuildThisFileDirectory)..\ikvm\netcoreapp3.1\linux-arm64\**\*">
-            <TargetFramework>netcoreapp3.1</TargetFramework>
+        <IkvmImageItem Include="$(MSBuildThisFileDirectory)..\ikvm\net6.0\linux-arm64\**\*">
+            <TargetFramework>net6.0</TargetFramework>
             <RuntimeIdentifier>linux-arm64</RuntimeIdentifier>
             <ImagePath>%(RecursiveDir)%(FileName)%(Extension)</ImagePath>
         </IkvmImageItem>

diff --git a/src/IKVM.Image.JDK.runtime.linux-arm64/lib/net6.0/_._ b/src/IKVM.Image.JDK.runtime.linux-arm64/lib/net6.0/_._
@@ -0,0 +1 @@
+
diff --git a/src/IKVM.Image.JDK.runtime.linux-musl-arm/IKVM.Image.JDK.runtime.linux-musl-arm.csproj b/src/IKVM.Image.JDK.runtime.linux-musl-arm/IKVM.Image.JDK.runtime.linux-musl-arm.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.Build.NoTargets">
     <PropertyGroup>
-        <TargetFrameworks>net461;netcoreapp3.1</TargetFrameworks>
+        <TargetFrameworks>net461;net6.0</TargetFrameworks>
         <PackageLicenseFile>LICENSE.md</PackageLicenseFile>
         <PackageReadmeFile>README.md</PackageReadmeFile>
         <Description>IKVM JDK Runtime Image</Description>
@@ -25,9 +25,9 @@
             <ProjectPackagePath>ikvm\net461\linux-musl-arm\bin</ProjectPackagePath>
         </PublishProjectReference>
         <PublishProjectReference Include="..\IKVM.Image.JDK-bin\IKVM.Image.JDK-bin.csproj">
-            <SetTargetFramework>TargetFramework=netcoreapp3.1</SetTargetFramework>
+            <SetTargetFramework>TargetFramework=net6.0</SetTargetFramework>
             <SetRuntimeIdentifier>RuntimeIdentifier=linux-musl-arm</SetRuntimeIdentifier>
-            <ProjectPackagePath>ikvm\netcoreapp3.1\linux-musl-arm\bin</ProjectPackagePath>
+            <ProjectPackagePath>ikvm\net6.0\linux-musl-arm\bin</ProjectPackagePath>
         </PublishProjectReference>
     </ItemGroup>
 

diff --git a/...ge.JDK.runtime.linux-musl-arm/buildTransitive/IKVM.Image.JDK.runtime.linux-musl-arm.props b/...ge.JDK.runtime.linux-musl-arm/buildTransitive/IKVM.Image.JDK.runtime.linux-musl-arm.props
@@ -9,8 +9,8 @@
             <RuntimeIdentifier>linux-musl-arm</RuntimeIdentifier>
             <ImagePath>%(RecursiveDir)%(FileName)%(Extension)</ImagePath>
         </IkvmImageItem>
-        <IkvmImageItem Include="$(MSBuildThisFileDirectory)..\ikvm\netcoreapp3.1\linux-musl-arm\**\*">
-            <TargetFramework>netcoreapp3.1</TargetFramework>
+        <IkvmImageItem Include="$(MSBuildThisFileDirectory)..\ikvm\net6.0\linux-musl-arm\**\*">
+            <TargetFramework>net6.0</TargetFramework>
             <RuntimeIdentifier>linux-musl-arm</RuntimeIdentifier>
             <ImagePath>%(RecursiveDir)%(FileName)%(Extension)</ImagePath>
         </IkvmImageItem>

diff --git a/src/IKVM.Image.JDK.runtime.linux-musl-arm/lib/net6.0/_._ b/src/IKVM.Image.JDK.runtime.linux-musl-arm/lib/net6.0/_._
@@ -0,0 +1 @@
+
diff --git a/src/IKVM.Image.JDK.runtime.linux-musl-arm64/IKVM.Image.JDK.runtime.linux-musl-arm64.csproj b/src/IKVM.Image.JDK.runtime.linux-musl-arm64/IKVM.Image.JDK.runtime.linux-musl-arm64.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.Build.NoTargets">
     <PropertyGroup>
-        <TargetFrameworks>net461;netcoreapp3.1</TargetFrameworks>
+        <TargetFrameworks>net461;net6.0</TargetFrameworks>
         <PackageLicenseFile>LICENSE.md</PackageLicenseFile>
         <PackageReadmeFile>README.md</PackageReadmeFile>
         <Description>IKVM JDK Runtime Image</Description>
@@ -20,13 +20,13 @@
 
     <ItemGroup Condition=" '$(TargetFramework)' == '' ">
         <PublishProjectReference Include="..\IKVM.Image.JDK-bin\IKVM.Image.JDK-bin.csproj">
-            <SetTargetFramework>TargetFramework=netcoreapp3.1</SetTargetFramework>
+            <SetTargetFramework>TargetFramework=net6.0</SetTargetFramework>
             <SetRuntimeIdentifier>RuntimeIdentifier=linux-musl-arm64</SetRuntimeIdentifier>
-            <ProjectPackagePath>ikvm\netcoreapp3.1\linux-musl-arm64\bin</ProjectPackagePath>
+            <ProjectPackagePath>ikvm\net6.0\linux-musl-arm64\bin</ProjectPackagePath>
         </PublishProjectReference>
     </ItemGroup>
 
-    <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
+    <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
         <PublishProjectReference Include="..\IKVM.Image.JDK-bin\IKVM.Image.JDK-bin.csproj">
             <SetTargetFramework>TargetFramework=$(TargetFramework)</SetTargetFramework>
             <SetRuntimeIdentifier>RuntimeIdentifier=linux-musl-arm64</SetRuntimeIdentifier>

diff --git a/...DK.runtime.linux-musl-arm64/buildTransitive/IKVM.Image.JDK.runtime.linux-musl-arm64.props b/...DK.runtime.linux-musl-arm64/buildTransitive/IKVM.Image.JDK.runtime.linux-musl-arm64.props
@@ -4,13 +4,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <IkvmImageItem Include="$(MSBuildThisFileDirectory)..\ikvm\net461\linux-musl-arm64\**\*">
-            <TargetFramework>net461</TargetFramework>
-            <RuntimeIdentifier>linux-musl-arm64</RuntimeIdentifier>
-            <ImagePath>%(RecursiveDir)%(FileName)%(Extension)</ImagePath>
-        </IkvmImageItem>
-        <IkvmImageItem Include="$(MSBuildThisFileDirectory)..\ikvm\netcoreapp3.1\linux-musl-arm64\**\*">
-            <TargetFramework>netcoreapp3.1</TargetFramework>
+        <IkvmImageItem Include="$(MSBuildThisFileDirectory)..\ikvm\net6.0\linux-musl-arm64\**\*">
+            <TargetFramework>net6.0</TargetFramework>
             <RuntimeIdentifier>linux-musl-arm64</RuntimeIdentifier>
             <ImagePath>%(RecursiveDir)%(FileName)%(Extension)</ImagePath>
         </IkvmImageItem>

diff --git a/src/IKVM.Image.JDK.runtime.linux-musl-arm64/lib/net6.0/_._ b/src/IKVM.Image.JDK.runtime.linux-musl-arm64/lib/net6.0/_._
@@ -0,0 +1 @@
+
diff --git a/src/IKVM.Image.JDK.runtime.linux-musl-x64/IKVM.Image.JDK.runtime.linux-musl-x64.csproj b/src/IKVM.Image.JDK.runtime.linux-musl-x64/IKVM.Image.JDK.runtime.linux-musl-x64.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.Build.NoTargets">
     <PropertyGroup>
-        <TargetFrameworks>net461;netcoreapp3.1</TargetFrameworks>
+        <TargetFrameworks>net461;net6.0</TargetFrameworks>
         <PackageLicenseFile>LICENSE.md</PackageLicenseFile>
         <PackageReadmeFile>README.md</PackageReadmeFile>
         <Description>IKVM JDK Runtime Image</Description>
@@ -25,9 +25,9 @@
             <ProjectPackagePath>ikvm\net461\linux-musl-x64\bin</ProjectPackagePath>
         </PublishProjectReference>
         <PublishProjectReference Include="..\IKVM.Image.JDK-bin\IKVM.Image.JDK-bin.csproj">
-            <SetTargetFramework>TargetFramework=netcoreapp3.1</SetTargetFramework>
+            <SetTargetFramework>TargetFramework=net6.0</SetTargetFramework>
             <SetRuntimeIdentifier>RuntimeIdentifier=linux-musl-x64</SetRuntimeIdentifier>
-            <ProjectPackagePath>ikvm\netcoreapp3.1\linux-musl-x64\bin</ProjectPackagePath>
+            <ProjectPackagePath>ikvm\net6.0\linux-musl-x64\bin</ProjectPackagePath>
         </PublishProjectReference>
     </ItemGroup>