diff --git a/global.json b/global.json index dcf8d16..7c508a4 100644 --- a/global.json +++ b/global.json @@ -4,6 +4,6 @@ "rollForward": "latestFeature" }, "msbuild-sdks": { - "IKVM.NET.Sdk": "8.9.0-dev.403" + "IKVM.NET.Sdk": "8.9.0-dev.430" } } diff --git a/src/IKVM.Maven.Sdk.Tasks/IKVM.Maven.Sdk.Tasks.csproj b/src/IKVM.Maven.Sdk.Tasks/IKVM.Maven.Sdk.Tasks.csproj index 8c918fa..fa629b5 100644 --- a/src/IKVM.Maven.Sdk.Tasks/IKVM.Maven.Sdk.Tasks.csproj +++ b/src/IKVM.Maven.Sdk.Tasks/IKVM.Maven.Sdk.Tasks.csproj @@ -1,6 +1,6 @@  - net472;net6.0 + net472;net6.0;net8.0 @@ -8,7 +8,7 @@ - + diff --git a/src/IKVM.Maven.Sdk.Tests/PackProjectTests.cs b/src/IKVM.Maven.Sdk.Tests/PackProjectTests.cs index 5d7e8ba..3519663 100644 --- a/src/IKVM.Maven.Sdk.Tests/PackProjectTests.cs +++ b/src/IKVM.Maven.Sdk.Tests/PackProjectTests.cs @@ -40,6 +40,8 @@ public static void Init(TestContext context) if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) == false) return; + Environment.SetEnvironmentVariable("MSBUILDDEBUGONSTART", "1"); + // properties to load into test build Properties = File.ReadAllLines("IKVM.Maven.Sdk.Tests.properties").Select(i => i.Split('=', 2)).ToDictionary(i => i[0], i => i[1]); @@ -57,8 +59,11 @@ public static void Init(TestContext context) // other required sub directories NuGetPackageRoot = Path.Combine(TempRoot, "nuget", "packages"); + Directory.CreateDirectory(NuGetPackageRoot); IkvmCachePath = Path.Combine(TempRoot, "ikvm", "cache"); + Directory.CreateDirectory(IkvmCachePath); IkvmExportCachePath = Path.Combine(TempRoot, "ikvm", "expcache"); + Directory.CreateDirectory(IkvmExportCachePath); // nuget.config file that defines package sources new XDocument( diff --git a/src/IKVM.Maven.Sdk/IKVM.Maven.Sdk.csproj b/src/IKVM.Maven.Sdk/IKVM.Maven.Sdk.csproj index 1ccc8b0..feb4de7 100644 --- a/src/IKVM.Maven.Sdk/IKVM.Maven.Sdk.csproj +++ b/src/IKVM.Maven.Sdk/IKVM.Maven.Sdk.csproj @@ -1,7 +1,7 @@  - net472;net6.0 + net472;net6.0;net8.0 true $(NoWarn);NU5100;NU5128 false @@ -20,7 +20,7 @@ - + @@ -47,6 +47,13 @@ tasks\net6.0 true + + TargetFramework=net8.0 + tasks + PreserveNewest + tasks\net8.0 + true + diff --git a/src/IKVM.Maven.Sdk/buildTransitive/IKVM.Maven.Sdk.props b/src/IKVM.Maven.Sdk/buildTransitive/IKVM.Maven.Sdk.props index d952e40..6e580e3 100644 --- a/src/IKVM.Maven.Sdk/buildTransitive/IKVM.Maven.Sdk.props +++ b/src/IKVM.Maven.Sdk/buildTransitive/IKVM.Maven.Sdk.props @@ -10,18 +10,21 @@ + $([System.Runtime.InteropServices.RuntimeInformation]:: FrameworkDescription.ToString()) net6.0 + net8.0 + net8.0 net472 - TaskHostFactory + TaskHostFactory $(IkvmMavenSdkDir)tasks\$(IkvmMavenSdkTaskFolder)\IKVM.Maven.Sdk.Tasks.dll - - - - - + + + + +