From 02119180c440b82448b6986854009f7f2f71e318 Mon Sep 17 00:00:00 2001
From: Jerome Haltom <jhaltom@alethic.solutions>
Date: Tue, 9 Jul 2024 11:04:47 -0500
Subject: [PATCH] Remove net8 version of tools. Simply won't fit into package.
 We really should externalize JavaCompiler.

---
 src/IKVM.MSBuild/IKVM.MSBuild.msbuildproj           | 13 ++++++-------
 .../buildTransitive/IKVM.MSBuild.Tasks.targets      |  2 --
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/IKVM.MSBuild/IKVM.MSBuild.msbuildproj b/src/IKVM.MSBuild/IKVM.MSBuild.msbuildproj
index d8b02c8e8..38c5c8e86 100644
--- a/src/IKVM.MSBuild/IKVM.MSBuild.msbuildproj
+++ b/src/IKVM.MSBuild/IKVM.MSBuild.msbuildproj
@@ -33,13 +33,6 @@
             <PublishPackagePath>tasks\net6.0</PublishPackagePath>
             <Pack>true</Pack>
         </PublishProjectReference>
-        <PublishProjectReference Include="..\IKVM.MSBuild.Tasks\IKVM.MSBuild.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">
@@ -52,4 +45,10 @@
         </ItemGroup>
     </Target>
 
+    <Target Name="ExcludePdbFiles" AfterTargets="_GetPackageFiles">
+        <ItemGroup>
+            <_PackageFiles Remove="@(_PackageFiles->WithMetadataValue('Extension', '.pdb'))" />
+        </ItemGroup>
+    </Target>
+
 </Project>
diff --git a/src/IKVM.MSBuild/buildTransitive/IKVM.MSBuild.Tasks.targets b/src/IKVM.MSBuild/buildTransitive/IKVM.MSBuild.Tasks.targets
index 0c11cabbc..7ef638cf4 100644
--- a/src/IKVM.MSBuild/buildTransitive/IKVM.MSBuild.Tasks.targets
+++ b/src/IKVM.MSBuild/buildTransitive/IKVM.MSBuild.Tasks.targets
@@ -6,8 +6,6 @@
     <PropertyGroup>
         <MSBuildRuntimeVersion Condition=" '$(MSBuildRuntimeVersion)' == '' ">$([System.Runtime.InteropServices.RuntimeInformation]:: FrameworkDescription.ToString())</MSBuildRuntimeVersion>
         <IkvmMSBuildTaskFolder Condition=" '$(MSBuildRuntimeType)' == 'Core' ">net6.0</IkvmMSBuildTaskFolder>
-        <IkvmMSBuildTaskFolder Condition=" '$(MSBuildRuntimeType)' == 'Core' And $(MSBuildRuntimeVersion.StartsWith('.NET 8')) ">net8.0</IkvmMSBuildTaskFolder>
-        <IkvmMSBuildTaskFolder Condition=" '$(MSBuildRuntimeType)' == 'Core' And $(MSBuildRuntimeVersion.StartsWith('.NET 9')) ">net8.0</IkvmMSBuildTaskFolder>
         <IkvmMSBuildTaskFolder Condition=" '$(MSBuildRuntimeType)' != 'Core' ">net472</IkvmMSBuildTaskFolder>
         <IkvmMSBuildTaskFactory Condition=" '$(MSBuildRuntimeType)' == 'Core' "></IkvmMSBuildTaskFactory>
         <IkvmMSBuildTaskFactory Condition=" '$(MSBuildRuntimeType)' != 'Core' ">TaskHostFactory</IkvmMSBuildTaskFactory>