From a953140e51bb5f94f2b75728b0aa9617dc3e4a84 Mon Sep 17 00:00:00 2001
From: nojaf <florian.verdonck@outlook.com>
Date: Mon, 13 Nov 2023 16:20:34 +0100
Subject: [PATCH] =?UTF-8?q?Some=20more=20MSBuild=20magic=20=F0=9F=AA=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../build/FSharp.Analyzers.Build.targets      | 29 +++++++++++--------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/FSharp.Analyzers.Build/build/FSharp.Analyzers.Build.targets b/src/FSharp.Analyzers.Build/build/FSharp.Analyzers.Build.targets
index 4c3768c..db55099 100644
--- a/src/FSharp.Analyzers.Build/build/FSharp.Analyzers.Build.targets
+++ b/src/FSharp.Analyzers.Build/build/FSharp.Analyzers.Build.targets
@@ -1,28 +1,33 @@
 <Project>
-    <Target Name="_AnalyzeFSharpProject">
-        <Message Importance="High" Text="Analyzing $(MSBuildProjectFile)"/>
+    <Target Name="_AnalyzeFSharpProject" DependsOnTargets="SetFSharpAnalyzersOtherFlags">
+        <Error Condition="$(FSharpAnalyzersOtherFlags) == ''" Text="A property FSharpAnalyzersOtherFlags should exists with all the analyzer cli arguments!" />
         <Exec
                 ContinueOnError="true"
-                Command="dotnet fsharp-analyzers --project &quot;$(MSBuildProjectFile)&quot; $(FSharpAnalyzersOtherFlags)">
-            <Output TaskParameter="ExitCode" PropertyName="LastExitCode"/>
-        </Exec>
-        <Error Condition="'$(LastExitCode)' == '-2'" Text="Problems were found $(MSBuildProjectFile)"/>
+                IgnoreExitCode="true"
+                Command="dotnet fsharp-analyzers --project &quot;$(MSBuildProjectFile)&quot; $(FSharpAnalyzersOtherFlags)" />
     </Target>
 
     <Target Name="AnalyzeFSharpProject" DependsOnTargets="_AnalyzeFSharpProject" />
 
+    <Target Name="_SetDesignTimePropertiesForFSharpAnalyzers" BeforeTargets="Restore">
+        <PropertyGroup>
+            <DesignTimeBuild>true</DesignTimeBuild>
+            <ProvideCommandLineArgs>true</ProvideCommandLineArgs>
+            <SkipCompilerExecution>true</SkipCompilerExecution>
+        </PropertyGroup>
+    </Target>
+    
     <Target
             Name="_AnalyzeFSharpProjectUsingFscArgs"
-            DependsOnTargets="Restore;ResolveAssemblyReferencesDesignTime;ResolveProjectReferencesDesignTime;ResolvePackageDependenciesDesignTime;FindReferenceAssembliesForReferences;_GenerateCompileDependencyCache;_ComputeNonExistentFileProperty;BeforeBuild;BeforeCompile;CoreCompile">
+            DependsOnTargets="_SetDesignTimePropertiesForFSharpAnalyzers;Restore;ResolveAssemblyReferencesDesignTime;ResolveProjectReferencesDesignTime;ResolvePackageDependenciesDesignTime;FindReferenceAssembliesForReferences;_GenerateCompileDependencyCache;_ComputeNonExistentFileProperty;BeforeBuild;BeforeCompile;CoreCompile;SetFSharpAnalyzersOtherFlags">
 
-        <Message Importance="normal" Text="fsc arguments: @(FscCommandLineArgs)"/>
+        <Error Condition="$(FSharpAnalyzersOtherFlags) == ''" Text="A property FSharpAnalyzersOtherFlags should exists with all the analyzer cli arguments!" />
+        <Message Importance="low" Text="FSC arguments: @(FscCommandLineArgs)"/>
         <Message Importance="High" Text="Analyzing $(MSBuildProjectFile)"/>
         <Exec
                 ContinueOnError="true"
-                Command="dotnet fsharp-analyzers --fsc-args &quot;@(FscCommandLineArgs)&quot; $(FSharpAnalyzersOtherFlags)">
-            <Output TaskParameter="ExitCode" PropertyName="LastExitCode"/>
-        </Exec>
-        <Error Condition="'$(LastExitCode)' == '-2'" Text="Problems were found $(MSBuildProjectFile)"/>
+                IgnoreExitCode="true"
+                Command="dotnet fsharp-analyzers --fsc-args &quot;@(FscCommandLineArgs)&quot; $(FSharpAnalyzersOtherFlags)" />
     </Target>
     
     <Target Name="AnalyzeFSharpProjectUsingFscArgs" DependsOnTargets="_AnalyzeFSharpProjectUsingFscArgs" />