Update IKVM to 8.7.4.

Move test projects to net8.0.
ikvmnet · Jan 27, 2024 · b1b8389 · b1b8389
1 parent 21bae61
commit b1b8389
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 6 deletions.
diff --git a/.github/workflows/IKVM.Maven.yml b/.github/workflows/IKVM.Maven.yml
@@ -145,14 +145,15 @@ jobs:
         - net48
         - net6.0
         - net7.0
+        - net8.0
         exclude:
         - tfm: net48
           sys: linux-x64
         - tfm: net48
           sys: osx-x64
         include:
         - run: IKVM.Maven.Sdk.Tests
-          tfm: net7.0
+          tfm: net8.0
           sys: win-x64
     name: Test (${{ matrix.run }}:${{ matrix.tfm }}:${{ matrix.sys }})
     timeout-minutes: 240

diff --git a/global.json b/global.json
@@ -4,6 +4,6 @@
         "rollForward": "latestFeature"
     },
     "msbuild-sdks": {
-        "IKVM.NET.Sdk": "8.7.3"
+        "IKVM.NET.Sdk": "8.7.4"
     }
 }
diff --git a/src/IKVM.Maven.Sdk.Tasks.Tests/IKVM.Maven.Sdk.Tasks.Tests.csproj b/src/IKVM.Maven.Sdk.Tasks.Tests/IKVM.Maven.Sdk.Tasks.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>net48;net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net48;net6.0;net7.0;net8.0</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/src/IKVM.Maven.Sdk.Tasks/IKVM.Maven.Sdk.Tasks.csproj b/src/IKVM.Maven.Sdk.Tasks/IKVM.Maven.Sdk.Tasks.csproj
@@ -8,7 +8,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="IKVM" Version="8.7.3" />
+        <PackageReference Include="IKVM" Version="8.7.4" />
         <PackageReference Include="Microsoft.Bcl.HashCode" Version="1.1.1" />
         <PackageReference Include="Microsoft.Build" Version="16.9.0" PrivateAssets="All" />
         <PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.9.0" PrivateAssets="All" />

diff --git a/src/IKVM.Maven.Sdk.Tests/IKVM.Maven.Sdk.Tests.csproj b/src/IKVM.Maven.Sdk.Tests/IKVM.Maven.Sdk.Tests.csproj
@@ -2,7 +2,7 @@
     <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
 
     <PropertyGroup>
-        <TargetFrameworks>net7.0</TargetFrameworks>
+        <TargetFrameworks>net8.0</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/src/IKVM.Maven.Sdk.Tests/ProjectTests.cs b/src/IKVM.Maven.Sdk.Tests/ProjectTests.cs
@@ -134,6 +134,17 @@ public static void ClassCleanup()
         [DataRow(EnvironmentPreference.Core, "net7.0", "linux-musl-arm64", "{0}", "lib{0}.so")]
         [DataRow(EnvironmentPreference.Core, "net7.0", "osx-x64", "{0}", "lib{0}.dylib")]
         [DataRow(EnvironmentPreference.Core, "net7.0", "osx-arm64", "{0}", "lib{0}.dylib")]
+        [DataRow(EnvironmentPreference.Core, "net8.0", "win-x86", "{0}.exe", "{0}.dll")]
+        [DataRow(EnvironmentPreference.Core, "net8.0", "win-x64", "{0}.exe", "{0}.dll")]
+        [DataRow(EnvironmentPreference.Core, "net8.0", "win-arm64", "{0}.exe", "{0}.dll")]
+        [DataRow(EnvironmentPreference.Core, "net8.0", "linux-x64", "{0}", "lib{0}.so")]
+        [DataRow(EnvironmentPreference.Core, "net8.0", "linux-arm", "{0}", "lib{0}.so")]
+        [DataRow(EnvironmentPreference.Core, "net8.0", "linux-arm64", "{0}", "lib{0}.so")]
+        [DataRow(EnvironmentPreference.Core, "net8.0", "linux-musl-x64", "{0}", "lib{0}.so")]
+        [DataRow(EnvironmentPreference.Core, "net8.0", "linux-musl-arm", "{0}", "lib{0}.so")]
+        [DataRow(EnvironmentPreference.Core, "net8.0", "linux-musl-arm64", "{0}", "lib{0}.so")]
+        [DataRow(EnvironmentPreference.Core, "net8.0", "osx-x64", "{0}", "lib{0}.dylib")]
+        [DataRow(EnvironmentPreference.Core, "net8.0", "osx-arm64", "{0}", "lib{0}.dylib")]
         [DataRow(EnvironmentPreference.Framework, "net472", "win-x86", "{0}.exe", "{0}.dll")]
         [DataRow(EnvironmentPreference.Framework, "net472", "win-x64", "{0}.exe", "{0}.dll")]
         [DataRow(EnvironmentPreference.Framework, "net48", "win-x86", "{0}.exe", "{0}.dll")]
@@ -160,6 +171,17 @@ public static void ClassCleanup()
         [DataRow(EnvironmentPreference.Framework, "net7.0", "linux-musl-arm64", "{0}", "lib{0}.so")]
         [DataRow(EnvironmentPreference.Framework, "net7.0", "osx-x64", "{0}", "lib{0}.dylib")]
         [DataRow(EnvironmentPreference.Framework, "net7.0", "osx-arm64", "{0}", "lib{0}.dylib")]
+        [DataRow(EnvironmentPreference.Framework, "net8.0", "win-x86", "{0}.exe", "{0}.dll")]
+        [DataRow(EnvironmentPreference.Framework, "net8.0", "win-x64", "{0}.exe", "{0}.dll")]
+        [DataRow(EnvironmentPreference.Framework, "net8.0", "win-arm64", "{0}.exe", "{0}.dll")]
+        [DataRow(EnvironmentPreference.Framework, "net8.0", "linux-x64", "{0}", "lib{0}.so")]
+        [DataRow(EnvironmentPreference.Framework, "net8.0", "linux-arm", "{0}", "lib{0}.so")]
+        [DataRow(EnvironmentPreference.Framework, "net8.0", "linux-arm64", "{0}", "lib{0}.so")]
+        [DataRow(EnvironmentPreference.Framework, "net8.0", "linux-musl-x64", "{0}", "lib{0}.so")]
+        [DataRow(EnvironmentPreference.Framework, "net8.0", "linux-musl-arm", "{0}", "lib{0}.so")]
+        [DataRow(EnvironmentPreference.Framework, "net8.0", "linux-musl-arm64", "{0}", "lib{0}.so")]
+        [DataRow(EnvironmentPreference.Framework, "net8.0", "osx-x64", "{0}", "lib{0}.dylib")]
+        [DataRow(EnvironmentPreference.Framework, "net8.0", "osx-arm64", "{0}", "lib{0}.dylib")]
         public void CanBuildProject(EnvironmentPreference env, string tfm, string rid, string exe, string lib)
         {
             // skip framework tests for non-Windows platforms

diff --git a/src/dist-tests/dist-tests.csproj b/src/dist-tests/dist-tests.csproj
@@ -9,7 +9,8 @@
         <TestTarget Include="IKVM.Maven.Sdk.Tasks.Tests|net48" ProjectName="IKVM.Maven.Sdk.Tasks.Tests" TargetFramework="net48" />
         <TestTarget Include="IKVM.Maven.Sdk.Tasks.Tests|net6.0" ProjectName="IKVM.Maven.Sdk.Tasks.Tests" TargetFramework="net6.0" />
         <TestTarget Include="IKVM.Maven.Sdk.Tasks.Tests|net7.0" ProjectName="IKVM.Maven.Sdk.Tasks.Tests" TargetFramework="net7.0" />
-        <TestTarget Include="IKVM.Maven.Sdk.Tests|net7.0" ProjectName="IKVM.Maven.Sdk.Tests" TargetFramework="net7.0" />
+        <TestTarget Include="IKVM.Maven.Sdk.Tasks.Tests|net8.0" ProjectName="IKVM.Maven.Sdk.Tasks.Tests" TargetFramework="net8.0" />
+        <TestTarget Include="IKVM.Maven.Sdk.Tests|net8.0" ProjectName="IKVM.Maven.Sdk.Tests" TargetFramework="net8.0" />
     </ItemGroup>
 
     <!-- Runs once per TFM/RID combination to generate individual output. -->