From ecebd97b6cecf7dc8c71b08e79d61c4f8b26c97a Mon Sep 17 00:00:00 2001
From: Curtis Wensley <curtis.wensley@gmail.com>
Date: Fri, 17 Nov 2023 10:36:57 -0800
Subject: [PATCH] Get rid of MSBuildTaskHelper and always use
 RoslynCodeTaskFactory

---
 build/Common.Build.targets              |  5 ++--
 build/Common.Mac.targets                |  1 -
 build/MSBuildTaskHelper.props           | 39 -------------------------
 build/Utilities.targets                 |  5 ++--
 src/Eto.Mac/Eto.Mac64.csproj            |  2 --
 src/Eto.Mac/Eto.XamMac2.csproj          |  1 -
 src/Eto.Mac/Eto.macOS.csproj            |  1 -
 src/Eto.Mac/build/Mac.props             |  2 --
 src/Eto.Mac/build/Mac.targets           | 11 ++-----
 test/Eto.Test.Mac/Eto.Test.Mac64.csproj |  1 -
 10 files changed, 6 insertions(+), 62 deletions(-)
 delete mode 100644 build/MSBuildTaskHelper.props

diff --git a/build/Common.Build.targets b/build/Common.Build.targets
index 942960d8aa..9deb9b320b 100644
--- a/build/Common.Build.targets
+++ b/build/Common.Build.targets
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   
-  <Import Project="$(MSBuildThisFileDirectory)MSBuildTaskHelper.props" Condition="'$(MSBuildTaskHelpersImported)'!='true'"/>
-  <UsingTask TaskName="_GetCommonFiles" TaskFactory="$(MSBuildTaskFactoryType)" AssemblyFile="$(MSBuildTasksAssemblyFile)">
+  <UsingTask TaskName="_GetCommonFiles" TaskFactory="RoslynCodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll">
     <ParameterGroup>
       <Files ParameterType="Microsoft.Build.Framework.ITaskItem[]" Required="true" />
       <Names ParameterType="Microsoft.Build.Framework.ITaskItem[]" Required="true" />
@@ -135,7 +134,7 @@
 
 <UsingTask
   TaskName="GetMetadata"
-  TaskFactory="$(MSBuildTaskFactoryType)" AssemblyFile="$(MSBuildTasksAssemblyFile)">
+  TaskFactory="RoslynCodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll">
   <ParameterGroup>
     <ItemGroup ParameterType="Microsoft.Build.Framework.ITaskItem[]" Required="true" />
     <Output Output="true" />
diff --git a/build/Common.Mac.targets b/build/Common.Mac.targets
index 9056bc7c64..d7c37a73f6 100644
--- a/build/Common.Mac.targets
+++ b/build/Common.Mac.targets
@@ -3,7 +3,6 @@
 
   <!-- Include this file if you want to reference Eto.Mac64.csproj directly vs. using the nuget package -->
 
-  <Import Project="$(MSBuildThisFileDirectory)MSBuildTaskHelper.props" Condition="'$(MSBuildTaskHelpersImported)'!='true'"/>
   <Import Project="$(MSBuildThisFileDirectory)..\src\Eto.Mac\build\Mac.props" />
   <Import Project="$(MSBuildThisFileDirectory)..\src\Eto.Mac\build\Mac.targets" />
 
diff --git a/build/MSBuildTaskHelper.props b/build/MSBuildTaskHelper.props
deleted file mode 100644
index e302bc0d28..0000000000
--- a/build/MSBuildTaskHelper.props
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project>
-  <!-- 
-    Prevent multiple import 
-    
-    Import as follows (if in same directory):
-    <Import Project="$(MSBuildThisFileDirectory)MSBuildTaskHelper.props" Condition="'$(MSBuildTaskHelpersImported)'!='true'"/>
-  -->
-  <PropertyGroup Label="MSBuildTaskHelpersImported">
-    <MSBuildTaskHelpersImported>true</MSBuildTaskHelpersImported>
-  </PropertyGroup>
-  
-  <PropertyGroup Label="MSBuildTasksAssemblyFile" Condition="'$(MSBuildTasksAssemblyFile)'=='' Or !Exists('$(MSBuildTasksAssemblyFile)')">
-    <MSBuildTasksAssemblyFile>$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll</MSBuildTasksAssemblyFile>
-    <MSBuildTasksAssemblyFile Condition="!Exists('$(MSBuildTasksAssemblyFile)')">$(MSBuildToolsPath)\Microsoft.Build.Tasks.v12.0.dll</MSBuildTasksAssemblyFile>
-    <MSBuildTasksAssemblyFile Condition="!Exists('$(MSBuildTasksAssemblyFile)')">$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll</MSBuildTasksAssemblyFile>
-    <MSBuildTasksAssemblyFile Condition="!Exists('$(MSBuildTasksAssemblyFile)')">$(MSBuildFrameworkToolsPath)\Microsoft.Build.Tasks.v4.0.dll</MSBuildTasksAssemblyFile>
-  </PropertyGroup>
-
-  <PropertyGroup Label="MSBuildTaskFactoryType">
-    <MSBuildTaskFactoryType>CodeTaskFactory</MSBuildTaskFactoryType>
-    <MSBuildTaskFactoryType Condition="'$(MSBuildRuntimeType)'=='Core'">RoslynCodeTaskFactory</MSBuildTaskFactoryType>
-  </PropertyGroup>
-  
-  <!--
-      Future:
-  
-      RoslynCodeTaskFactory was introduced into MSBuild version 16.0
-      Fallback to older CodeTaskFactory when using older version of MSBuild.
-      
-      Mono on Mac claims version 16.0.40, but does not support RoslynCodeTaskFactory
-  -->
-  <!--
-  <PropertyGroup>
-    <MSBuildTaskFactoryType>RoslynCodeTaskFactory</MSBuildTaskFactoryType>
-    <MSBuildTaskFactoryType Condition="$([System.Version]::Parse('$(MSBuildVersion)')) &lt; $([System.Version]::Parse('16.0'))">CodeTaskFactory</MSBuildTaskFactoryType>
-  </PropertyGroup>
-  -->
-</Project>
\ No newline at end of file
diff --git a/build/Utilities.targets b/build/Utilities.targets
index ce02ca2a56..327d44cb3b 100644
--- a/build/Utilities.targets
+++ b/build/Utilities.targets
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildThisFileDirectory)MSBuildTaskHelper.props" Condition="'$(MSBuildTaskHelpersImported)'!='true'"/>
 
-  <UsingTask TaskName="FileUpdate" TaskFactory="$(MSBuildTaskFactoryType)" AssemblyFile="$(MSBuildTasksAssemblyFile)">
+  <UsingTask TaskName="FileUpdate" TaskFactory="RoslynCodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll">
     <ParameterGroup>
       <Files ParameterType="Microsoft.Build.Framework.ITaskItem[]" Required="true" />
       <Pattern ParameterType="System.String" Required="true" />
@@ -111,7 +110,7 @@ public class FileUpdate : Task
 ]]>      </Code>
     </Task>
   </UsingTask>
-  <UsingTask TaskName="IncrementVersion" TaskFactory="$(MSBuildTaskFactoryType)" AssemblyFile="$(MSBuildTasksAssemblyFile)">
+  <UsingTask TaskName="IncrementVersion" TaskFactory="RoslynCodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll">
     <ParameterGroup>
       <Version ParameterType="System.String" Required="true" />
       <Increment ParameterType="System.String" />
diff --git a/src/Eto.Mac/Eto.Mac64.csproj b/src/Eto.Mac/Eto.Mac64.csproj
index c72ef78c91..b63143c338 100644
--- a/src/Eto.Mac/Eto.Mac64.csproj
+++ b/src/Eto.Mac/Eto.Mac64.csproj
@@ -77,8 +77,6 @@ You do not need to use any of the classes of this assembly (unless customizing t
     <None Include="build\*" Exclude="build\Mac.*" Pack="True" PackagePath="build" />
     <None Include="build\Mac.targets" Pack="True" PackagePath="build\$(PackageId).targets" />
     <None Include="build\Mac.props" Pack="True" PackagePath="build\$(PackageId).props" />
-    
-    <None Include="..\..\build\MSBuildTaskHelper.props" Pack="True" PackagePath="build" />
   </ItemGroup>
   
   <Target Name="CopyProjectReferencesToPackage" DependsOnTargets="ResolveReferences">
diff --git a/src/Eto.Mac/Eto.XamMac2.csproj b/src/Eto.Mac/Eto.XamMac2.csproj
index a38b5d953c..a1c8807a57 100644
--- a/src/Eto.Mac/Eto.XamMac2.csproj
+++ b/src/Eto.Mac/Eto.XamMac2.csproj
@@ -66,7 +66,6 @@ You do not need to use any of the classes of this assembly (unless customizing t
     <None Include="build\*" Exclude="build\Mac.*" Pack="True" PackagePath="build" />
     <None Include="build\Mac.targets" Pack="True" PackagePath="build\Eto.Platform.XamMac2.targets" />
     <None Include="build\Mac.props" Pack="True" PackagePath="build\Eto.Platform.XamMac2.props" />
-    <None Include="..\..\build\MSBuildTaskHelper.props" Pack="True" PackagePath="build" />
   </ItemGroup>
   
   <Import Project="..\..\build\Xamarin.Mac.targets" Condition="!$(TargetFramework.Contains('-macos'))" />
diff --git a/src/Eto.Mac/Eto.macOS.csproj b/src/Eto.Mac/Eto.macOS.csproj
index 8999a28084..caedf5dcb6 100644
--- a/src/Eto.Mac/Eto.macOS.csproj
+++ b/src/Eto.Mac/Eto.macOS.csproj
@@ -63,7 +63,6 @@ You do not need to use any of the classes of this assembly (unless customizing t
     <None Include="build\*" Exclude="build\Mac.*" Pack="True" PackagePath="build" />
     <None Include="build\Mac.targets" Pack="True" PackagePath="build\Eto.Platform.macOS.targets" />
     <None Include="build\Mac.props" Pack="True" PackagePath="build\Eto.Platform.macOS.props" />
-    <None Include="..\..\build\MSBuildTaskHelper.props" Pack="True" PackagePath="build" />
   </ItemGroup>
   
   <Target Name="CheckSDKVersion" BeforeTargets="BeforeBuild">
diff --git a/src/Eto.Mac/build/Mac.props b/src/Eto.Mac/build/Mac.props
index ddf33d46ac..1cb59b3a16 100644
--- a/src/Eto.Mac/build/Mac.props
+++ b/src/Eto.Mac/build/Mac.props
@@ -19,8 +19,6 @@
     <DebugType Condition="$(MacDebugEmbedded) == 'True'">embedded</DebugType>
   </PropertyGroup>
   
-  <Import Project="$(MSBuildThisFileDirectory)MSBuildTaskHelper.props" Condition="'$(MSBuildTaskHelpersImported)'!='true'"/>
-
   <PropertyGroup Condition="$(IsMac) == 'True'">
     <MacBuildDmgDependsOnTargets>MacCreateDmg;MacBeautifyDmg</MacBuildDmgDependsOnTargets>
     <MacCodeSignDependsOnTargets>MacCodeSignApp;MacCodeSignDmg</MacCodeSignDependsOnTargets>
diff --git a/src/Eto.Mac/build/Mac.targets b/src/Eto.Mac/build/Mac.targets
index 2889c61df3..1198a31de9 100644
--- a/src/Eto.Mac/build/Mac.targets
+++ b/src/Eto.Mac/build/Mac.targets
@@ -74,15 +74,8 @@
     <RemoveDir Directories="$(OutputAppPath)"/>
   </Target>
 
-  <PropertyGroup Condition="'$(MSBuildTaskFactoryType)'=='CodeTaskFactory'">
-      <_UpdatePListReference>System.Xml</_UpdatePListReference>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(MSBuildTaskFactoryType)'!='CodeTaskFactory'">
-      <_UpdatePListReference>netstandard</_UpdatePListReference>
-  </PropertyGroup>
-
   <!-- Task to update the plist file with new values -->
-  <UsingTask TaskName="UpdatePList" TaskFactory="$(MSBuildTaskFactoryType)"  AssemblyFile="$(MSBuildTasksAssemblyFile)">
+  <UsingTask TaskName="UpdatePList" TaskFactory="RoslynCodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll">
     <ParameterGroup>
       <PListFile ParameterType="System.String" Required="true" />
       <TargetFileName ParameterType="System.String" Required="true" />
@@ -92,7 +85,7 @@
       <IconFile ParameterType="System.String" Output="true" />
     </ParameterGroup>
     <Task>
-      <Reference Include="$(_UpdatePListReference)"/>
+      <Reference Include="netstandard"/>
       <Code Type="Class" Language="cs"><![CDATA[
     using System;
     using System.IO;
diff --git a/test/Eto.Test.Mac/Eto.Test.Mac64.csproj b/test/Eto.Test.Mac/Eto.Test.Mac64.csproj
index a5a65e7a2d..b34c4238db 100644
--- a/test/Eto.Test.Mac/Eto.Test.Mac64.csproj
+++ b/test/Eto.Test.Mac/Eto.Test.Mac64.csproj
@@ -2,7 +2,6 @@
   
   <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />
   
-  <Import Project="..\..\build\MSBuildTaskHelper.props" Condition="'$(MSBuildTaskHelpersImported)'!='true'" />
   <Import Project="..\..\src\Eto.Mac\build\Mac.props" Condition="'$(ExcludeRestorePackageImports)' != 'true'" />
   
   <PropertyGroup>