Remove net8 version of tools. Simply won't fit into package. We reall…

…y should externalize JavaCompiler.
iterate-ch · Jul 9, 2024 · 0211918 · 0211918
1 parent c20e36b
commit 0211918
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git 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
@@ -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>