Latest IKVM.

ikvmnet · Jul 5, 2024 · fd6fcd3 · fd6fcd3
1 parent 21e79a0
commit fd6fcd3
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 11 deletions.
diff --git 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
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>net472;net6.0</TargetFrameworks>
+        <TargetFrameworks>net472;net6.0;net8.0</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>
         <InternalsVisibleTo Include="IKVM.Maven.Sdk.Tasks.Tests" />
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="IKVM" Version="8.9.0-dev.403" />
+        <PackageReference Include="IKVM" Version="8.9.0-dev.430" />
         <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/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
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.Build.NoTargets/3.5.6">
 
     <PropertyGroup>
-        <TargetFrameworks>net472;net6.0</TargetFrameworks>
+        <TargetFrameworks>net472;net6.0;net8.0</TargetFrameworks>
         <IncludeBuildOutput>true</IncludeBuildOutput>
         <NoWarn>$(NoWarn);NU5100;NU5128</NoWarn>
         <IncludeBuildOutput>false</IncludeBuildOutput>
@@ -20,7 +20,7 @@
 
     <ItemGroup>
         <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="all" />
-        <PackageReference Include="IKVM" Version="8.9.0-dev.403" />
+        <PackageReference Include="IKVM" Version="8.9.0-dev.430" />
     </ItemGroup>
 
     <ItemGroup>
@@ -47,6 +47,13 @@
             <PublishPackagePath>tasks\net6.0</PublishPackagePath>
             <Pack>true</Pack>
         </PublishProjectReference>
+        <PublishProjectReference Include="..\IKVM.Maven.Sdk.Tasks\IKVM.Maven.Sdk.Tasks.csproj">
+            <SetTargetFramework>TargetFramework=net8.0</SetTargetFramework>
+            <PublishTargetPath Condition=" '$(TargetFramework)' == 'net8.0' ">tasks</PublishTargetPath>
+            <CopyToOutputDirectory Condition=" '$(TargetFramework)' == 'net8.0' ">PreserveNewest</CopyToOutputDirectory>
+            <PublishPackagePath>tasks\net8.0</PublishPackagePath>
+            <Pack>true</Pack>
+        </PublishProjectReference>
     </ItemGroup>
 
     <Target Name="MakeGeneratedPropsFile" Outputs="$(IntermediateOutputPath)generated.props" BeforeTargets="_GetPackageFiles">

diff --git a/src/IKVM.Maven.Sdk/buildTransitive/IKVM.Maven.Sdk.props b/src/IKVM.Maven.Sdk/buildTransitive/IKVM.Maven.Sdk.props
@@ -10,18 +10,21 @@
     </PropertyGroup>
 
     <PropertyGroup>
+        <MSBuildRuntimeVersion Condition=" '$(MSBuildRuntimeVersion)' == '' ">$([System.Runtime.InteropServices.RuntimeInformation]:: FrameworkDescription.ToString())</MSBuildRuntimeVersion>
         <IkvmMavenSdkTaskFolder Condition=" '$(MSBuildRuntimeType)' == 'Core' ">net6.0</IkvmMavenSdkTaskFolder>
+        <IkvmMavenSdkTaskFolder Condition=" '$(MSBuildRuntimeType)' == 'Core' And $(MSBuildRuntimeVersion.StartsWith('.NET 8')) ">net8.0</IkvmMavenSdkTaskFolder>
+        <IkvmMavenSdkTaskFolder Condition=" '$(MSBuildRuntimeType)' == 'Core' And $(MSBuildRuntimeVersion.StartsWith('.NET 9')) ">net8.0</IkvmMavenSdkTaskFolder>
         <IkvmMavenSdkTaskFolder Condition=" '$(MSBuildRuntimeType)' != 'Core' ">net472</IkvmMavenSdkTaskFolder>
-        <IkvmMavenSdkTaskFactory Condition=" '$(MSBuildRuntimeType)' == 'Core' ">TaskHostFactory</IkvmMavenSdkTaskFactory>
+        <IkvmMavenSdkTaskFactory Condition=" '$(MSBuildRuntimeType)' == 'Core' "></IkvmMavenSdkTaskFactory>
         <IkvmMavenSdkTaskFactory Condition=" '$(MSBuildRuntimeType)' != 'Core' ">TaskHostFactory</IkvmMavenSdkTaskFactory>
         <IkvmMavenSdkTaskAssembly>$(IkvmMavenSdkDir)tasks\$(IkvmMavenSdkTaskFolder)\IKVM.Maven.Sdk.Tasks.dll</IkvmMavenSdkTaskAssembly>
     </PropertyGroup>
 
-    <UsingTask TaskName="MavenReferenceItemImport" AssemblyFile="$(IkvmMavenSdkTaskAssembly)" TaskFactory="$(IkvmMavenSdkTaskFactory)" />
-    <UsingTask TaskName="MavenReferenceItemPrepare" AssemblyFile="$(IkvmMavenSdkTaskAssembly)" TaskFactory="$(IkvmMavenSdkTaskFactory)" />
-    <UsingTask TaskName="MavenReferenceItemResolve" AssemblyFile="$(IkvmMavenSdkTaskAssembly)" TaskFactory="$(IkvmMavenSdkTaskFactory)" />
-    <UsingTask TaskName="MavenReferenceItemInstall" AssemblyFile="$(IkvmMavenSdkTaskAssembly)" TaskFactory="$(IkvmMavenSdkTaskFactory)" />
-    <UsingTask TaskName="MavenWriteProjectObjectModelFile" AssemblyFile="$(IkvmMavenSdkTaskAssembly)" TaskFactory="$(IkvmMavenSdkTaskFactory)" />
+    <UsingTask TaskName="MavenReferenceItemImport" AssemblyFile="$(IkvmMavenSdkTaskAssembly)" TaskFactory="$(IkvmMavenSdkTaskFactory)" Condition="Exists('$(IkvmMavenSdkTaskAssembly)')" />
+    <UsingTask TaskName="MavenReferenceItemPrepare" AssemblyFile="$(IkvmMavenSdkTaskAssembly)" TaskFactory="$(IkvmMavenSdkTaskFactory)" Condition="Exists('$(IkvmMavenSdkTaskAssembly)')" />
+    <UsingTask TaskName="MavenReferenceItemResolve" AssemblyFile="$(IkvmMavenSdkTaskAssembly)" TaskFactory="$(IkvmMavenSdkTaskFactory)" Condition="Exists('$(IkvmMavenSdkTaskAssembly)')" />
+    <UsingTask TaskName="MavenReferenceItemInstall" AssemblyFile="$(IkvmMavenSdkTaskAssembly)" TaskFactory="$(IkvmMavenSdkTaskFactory)" Condition="Exists('$(IkvmMavenSdkTaskAssembly)')" />
+    <UsingTask TaskName="MavenWriteProjectObjectModelFile" AssemblyFile="$(IkvmMavenSdkTaskAssembly)" TaskFactory="$(IkvmMavenSdkTaskFactory)" Condition="Exists('$(IkvmMavenSdkTaskAssembly)')" />
 
     <ItemDefinitionGroup>
         <MavenReference>