Fix MSBuild project evaluation

nuke-build · Jul 9, 2020 · 118af17 · 118af17
1 parent 145b96e
commit 118af17
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 37 deletions.
diff --git a/build/_build.csproj b/build/_build.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <Import Project="..\source\Nuke.Common\Nuke.Common.props" />
 

diff --git a/source/Nuke.Common/Nuke.Common.csproj b/source/Nuke.Common/Nuke.Common.csproj
@@ -16,10 +16,11 @@
     <PackageReference Include="Glob" Version="1.1.5" />
     <PackageReference Include="JetBrains.Annotations" Version="2019.1.3" />
     <PackageReference Include="Microsoft.Azure.KeyVault" Version="3.0.4" />
-    <PackageReference Include="Microsoft.Build" Version="16.3.0" />
-    <PackageReference Include="Microsoft.Build.Framework" Version="16.3.0" />
-    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="16.3.0" />
-    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.3.0" />
+    <PackageReference Include="Microsoft.Build" Version="16.3.0" ExcludeAssets="runtime" />
+    <PackageReference Include="Microsoft.Build.Framework" Version="16.3.0" ExcludeAssets="runtime" />
+    <PackageReference Include="Microsoft.Build.Locator" Version="1.2.6" />
+    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="16.3.0" ExcludeAssets="runtime" />
+    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.3.0" ExcludeAssets="runtime" />
     <PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="5.2.4" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="NuGet.Packaging" Version="5.3.1" />

diff --git a/source/Nuke.Common/ProjectModel/ProjectModelTasks.cs b/source/Nuke.Common/ProjectModel/ProjectModelTasks.cs
@@ -7,6 +7,7 @@
 using System.Linq;
 using JetBrains.Annotations;
 using Microsoft.Build.Evaluation;
+using Microsoft.Build.Locator;
 using Nuke.Common.IO;
 using Nuke.Common.Tooling;
 using Nuke.Common.Utilities;
@@ -17,6 +18,27 @@ namespace Nuke.Common.ProjectModel
     [PublicAPI]
     public static class ProjectModelTasks
     {
+        static ProjectModelTasks()
+        {
+            try
+            {
+                MSBuildLocator.RegisterDefaults();
+            }
+            catch (Exception exception)
+            {
+                Logger.Warn(exception);
+
+                var dotnet = ToolPathResolver.TryGetEnvironmentExecutable("DOTNET_EXE") ??
+                             ToolPathResolver.GetPathExecutable("dotnet");
+                var output = ProcessTasks.StartProcess(dotnet, "--info", logOutput: false).AssertZeroExitCode().Output;
+                var basePath = (AbsolutePath) output
+                    .Select(x => x.Text.Trim())
+                    .Single(x => x.StartsWith("Base Path:"))
+                    .TrimStart("Base Path:").Trim();
+                MSBuildLocator.RegisterMSBuildPath(basePath);
+            }
+        }
+
         public static Solution CreateSolution(string fileName = null, params Solution[] solutions)
         {
             return CreateSolution(fileName, solutions, folderNameProvider: null);
@@ -84,48 +106,38 @@ public static Microsoft.Build.Evaluation.Project ParseProject(
             string configuration = null,
             string targetFramework = null)
         {
-            var msbuildPath = Environment.GetEnvironmentVariable("MSBUILD_EXE_PATH");
-
-            try
-            {
-                if (string.IsNullOrEmpty(msbuildPath))
-                    Environment.SetEnvironmentVariable("MSBUILD_EXE_PATH", s_msbuildPathResolver.Value);
-
-                var projectCollection = new ProjectCollection();
-                var projectRoot = Microsoft.Build.Construction.ProjectRootElement.Open(projectFile, projectCollection, preserveFormatting: true);
-                var msbuildProject = Microsoft.Build.Evaluation.Project.FromProjectRootElement(projectRoot, new Microsoft.Build.Definition.ProjectOptions
+            var projectCollection = new ProjectCollection();
+            var projectRoot = Microsoft.Build.Construction.ProjectRootElement.Open(projectFile, projectCollection, preserveFormatting: true);
+            var msbuildProject = Microsoft.Build.Evaluation.Project.FromProjectRootElement(
+                projectRoot,
+                new Microsoft.Build.Definition.ProjectOptions
                 {
                     GlobalProperties = GetProperties(configuration, targetFramework),
                     ToolsVersion = projectCollection.DefaultToolsVersion,
                     ProjectCollection = projectCollection
                 });
 
-                var targetFrameworks = msbuildProject.AllEvaluatedItems
-                    .Where(x => x.ItemType == "_TargetFrameworks")
-                    .Select(x => x.EvaluatedInclude)
-                    .OrderBy(x => x).ToList();
-
-                if (targetFramework == null && targetFrameworks.Count > 1)
-                {
-                    projectCollection.UnloadProject(msbuildProject);
-                    targetFramework = targetFrameworks.First();
+            var targetFrameworks = msbuildProject.AllEvaluatedItems
+                .Where(x => x.ItemType == "_TargetFrameworks")
+                .Select(x => x.EvaluatedInclude)
+                .OrderBy(x => x).ToList();
 
-                    Logger.Warn($"Project '{projectFile}' has multiple target frameworks ({targetFrameworks.JoinComma()}).");
-                    Logger.Warn($"Evaluating using '{targetFramework}'...");
+            if (targetFramework == null && targetFrameworks.Count > 1)
+            {
+                projectCollection.UnloadProject(msbuildProject);
+                targetFramework = targetFrameworks.First();
 
-                    msbuildProject = new Microsoft.Build.Evaluation.Project(
-                        projectFile,
-                        GetProperties(configuration, targetFramework),
-                        projectCollection.DefaultToolsVersion,
-                        projectCollection);
-                }
+                Logger.Warn($"Project '{projectFile}' has multiple target frameworks ({targetFrameworks.JoinComma()}).");
+                Logger.Warn($"Evaluating using '{targetFramework}'...");
 
-                return msbuildProject;
-            }
-            finally
-            {
-                Environment.SetEnvironmentVariable("MSBUILD_EXE_PATH", msbuildPath);
+                msbuildProject = new Microsoft.Build.Evaluation.Project(
+                    projectFile,
+                    GetProperties(configuration, targetFramework),
+                    projectCollection.DefaultToolsVersion,
+                    projectCollection);
             }
+
+            return msbuildProject;
         }
 
         private static Dictionary<string, string> GetProperties([CanBeNull] string configuration, [CanBeNull] string targetFramework)