A little cleanup

phmonte · Oct 30, 2020 · 98abb3c · 98abb3c
1 parent e7582eb
commit 98abb3c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/ReleaseNotes.md b/ReleaseNotes.md
@@ -1,4 +1,7 @@
-# 3.0.2
+# 3.1.0
+
+- Added `SourceFiles` and `References` for F# projects (#146, thanks @dukedagmor)
+- Fixed an inconsistency between Buildalyzer and MSBuild by adding a trailing directory separator to the solution path (#147, #148, thanks @laurenceSaes)
 
 # 3.0.1
 

diff --git a/src/Buildalyzer/Logging/EventProcessor.cs b/src/Buildalyzer/Logging/EventProcessor.cs
@@ -116,7 +116,7 @@ private void MessageRaised(object sender, BuildMessageEventArgs e)
         {
             // Process the command line arguments for the Fsc task
             AnalyzerResult result = _currentResult.Count == 0 ? null : _currentResult.Peek();
-            if (e.SenderName.Equals("Fsc", StringComparison.OrdinalIgnoreCase) && !string.IsNullOrWhiteSpace(e.Message) && _targetStack.Any(x => x.TargetName == "CoreCompile") && _currentResult.Count != 0)
+            if (e.SenderName?.Equals("Fsc", StringComparison.OrdinalIgnoreCase) == true && !string.IsNullOrWhiteSpace(e.Message) && _targetStack.Any(x => x.TargetName == "CoreCompile") && _currentResult.Count != 0)
             {
                 result.ProcessFscCommandLine(e.Message);
             }

diff --git a/src/Buildalyzer/ProjectAnalyzer.cs b/src/Buildalyzer/ProjectAnalyzer.cs
@@ -209,6 +209,12 @@ private string GetCommand(BuildEnvironment buildEnvironment, string targetFramew
                 // Setting the TargetFramework MSBuild property tells MSBuild which target framework to use for the outer build
                 effectiveGlobalProperties[MsBuildProperties.TargetFramework] = targetFramework;
             }
+            if (Path.GetExtension(ProjectFile.Path).Equals(".fsproj", StringComparison.OrdinalIgnoreCase)
+                && effectiveGlobalProperties.ContainsKey(MsBuildProperties.SkipCompilerExecution))
+            {
+                // We can't skip the compiler for design-time builds in F# (it causes strange errors regarding file copying)
+                effectiveGlobalProperties.Remove(MsBuildProperties.SkipCompilerExecution);
+            }
             string propertyArgument = effectiveGlobalProperties.Count == 0 ? string.Empty : $"/property:{string.Join(";", effectiveGlobalProperties.Select(x => $"{x.Key}={FormatArgument(x.Value)}"))}";
 
             // Get the target argument (/target)