Fix .NET Core functionality (#30)

Get .NET Core path from `dotnet --info`

Author: jeffkl

Directory.Build.rsp

@@ -1,4 +1,5 @@
 /Restore
 /ConsoleLoggerParameters:Verbosity=Minimal;Summary
 /MaxCPUCount
-/NodeReuse:false
+/NodeReuse:false
+/RestoreProperty:NuGetInteractive=true

azure-pipelines.yml

@@ -22,13 +22,23 @@ steps:
   displayName: 'Set BuildConfiguration to Release for tagged commits'
   condition: and(succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/tags/v'))
 
-- task: MSBuild@1
+- task: VSBuild@1
   displayName: 'Build Solution'
+  continueOnError: true
   inputs:
-    solution: 'MSBuildProjectCreator.sln'
+    solution: '*.sln'
     platform: '$(BuildPlatform)'
     configuration: '$(BuildConfiguration)'
 
+- task: VSBuild@1
+  displayName: 'Retry Build Solution With Binary Logger'
+  condition: succeededOrFailed()
+  inputs:
+    solution: '*.sln'
+    platform: '$(BuildPlatform)'
+    configuration: '$(BuildConfiguration)'
+    msbuildArgs: '/bl:$(Build.SourcesDirectory)artifacts\msbuild.binlog'
+
 - task: VSTest@2
   displayName: 'Run Unit Tests'
   inputs:
@@ -42,4 +52,6 @@ steps:
   displayName: 'Publish Artifacts'
   inputs:
     artifactName: 'drop'
-    targetPath: 'artifacts'
+    targetPath: 'artifacts'
+  condition: succeededOrFailed()
+    

src/MSBuildProjectCreator.UnitTests/MSBuildProjectCreator.UnitTests.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net46</TargetFramework>
+    <TargetFrameworks>netcoreapp2.1;net472</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <AssemblyName>Microsoft.Build.Utilities.ProjectCreation.UnitTests</AssemblyName>
     <RootNamespace>Microsoft.Build.Utilities.ProjectCreation.UnitTests</RootNamespace>
@@ -11,7 +11,7 @@
     <PackageReference Include="Shouldly" />
     <PackageReference Include="xunit" />
     <PackageReference Include="xunit.runner.visualstudio" />
-  
+
     <ProjectReference Include="..\MSBuildProjectCreator\MSBuildProjectCreator.csproj" />
   </ItemGroup>
 </Project>

src/MSBuildProjectCreator/MSBuildAssemblyResolver.cs

@@ -3,10 +3,15 @@
 // Licensed under the MIT license.
 
 using System;
+using System.Diagnostics;
 using System.IO;
+#if !NETCORE
 using System.Linq;
+#endif
 using System.Reflection;
-#if NET46
+using System.Text.RegularExpressions;
+using System.Threading;
+#if !NETCORE
 using Microsoft.VisualStudio.Setup.Configuration;
 #endif
 
@@ -17,9 +22,26 @@ namespace Microsoft.Build.Utilities.ProjectCreation
     /// </summary>
     public static class MSBuildAssemblyResolver
     {
+#if NETCORE
+        private static readonly Regex DotNetBasePathRegex = new Regex(@"^ Base Path:\s+(?<Path>.*)$");
+#endif
+
         private static readonly Lazy<string> MSBuildDirectoryLazy = new Lazy<string>(
             () =>
             {
+#if NETCORE
+                string basePath;
+
+                if (!string.IsNullOrWhiteSpace(basePath = GetDotNetBasePath()))
+                {
+                    return basePath;
+                }
+
+                if (!string.IsNullOrWhiteSpace(basePath = Environment.GetEnvironmentVariable("MSBuildExtensionsPath")))
+                {
+                    return basePath;
+                }
+#else
                 string visualStudioDirectory;
 
                 if (!string.IsNullOrWhiteSpace(visualStudioDirectory = Environment.GetEnvironmentVariable("VSINSTALLDIR")))
@@ -39,7 +61,7 @@ public static class MSBuildAssemblyResolver
                         return path;
                     }
                 }
-#if NET46
+
                 if (!string.IsNullOrWhiteSpace(visualStudioDirectory = MSBuildAssemblyResolver.GetPathOfFirstInstalledVisualStudioInstance()))
                 {
                     return visualStudioDirectory;
@@ -81,6 +103,91 @@ public static Assembly AssemblyResolve(object sender, ResolveEventArgs args)
             return !assemblyName.FullName.Equals(AssemblyName.GetAssemblyName(fileInfo.FullName).FullName) ? null : Assembly.LoadFrom(fileInfo.FullName);
         }
 
+#if NETCORE
+
+        private static string GetDotNetBasePath()
+        {
+            string basePath = null;
+
+            using (ManualResetEvent processExited = new ManualResetEvent(false))
+            using (Process process = new Process
+            {
+                EnableRaisingEvents = true,
+                StartInfo = new ProcessStartInfo
+                {
+                    Arguments = "--info",
+                    CreateNoWindow = true,
+                    FileName = "dotnet",
+                    UseShellExecute = false,
+                    RedirectStandardError = true,
+                    RedirectStandardInput = true,
+                    RedirectStandardOutput = true,
+                    WorkingDirectory = Environment.CurrentDirectory,
+                },
+            })
+            {
+                process.StartInfo.EnvironmentVariables["DOTNET_CLI_UI_LANGUAGE"] = "en-US";
+
+                process.ErrorDataReceived += (sender, args) => { };
+
+                process.OutputDataReceived += (sender, args) =>
+                {
+                    if (!String.IsNullOrWhiteSpace(args?.Data))
+                    {
+                        Match match = DotNetBasePathRegex.Match(args.Data);
+
+                        if (match.Success && match.Groups["Path"].Success)
+                        {
+                            basePath = match.Groups["Path"].Value.Trim();
+                        }
+                    }
+                };
+
+                process.Exited += (sender, args) => { processExited.Set(); };
+
+                try
+                {
+                    if (!process.Start())
+                    {
+                        return null;
+                    }
+                }
+                catch
+                {
+                    return null;
+                }
+
+                process.StandardInput.Close();
+
+                process.BeginErrorReadLine();
+                process.BeginOutputReadLine();
+
+                switch (WaitHandle.WaitAny(new WaitHandle[] { processExited }, TimeSpan.FromSeconds(5)))
+                {
+                    case WaitHandle.WaitTimeout:
+                        break;
+
+                    case 0:
+                        break;
+                }
+
+                if (!process.HasExited)
+                {
+                    try
+                    {
+                        process.Kill();
+                    }
+                    catch
+                    {
+                    }
+                }
+
+                return basePath;
+            }
+        }
+
+#endif
+
         private static string GetMSBuildVersionDirectory(string version)
         {
             if (Version.TryParse(version, out Version visualStudioVersion) && visualStudioVersion.Major >= 16)
@@ -91,7 +198,7 @@ private static string GetMSBuildVersionDirectory(string version)
             return version;
         }
 
-#if NET46
+#if !NETCORE
         private static string GetPathOfFirstInstalledVisualStudioInstance()
         {
             Tuple<Version, string> highestVersion = null;

src/MSBuildProjectCreator/MSBuildProjectCreator.csproj

@@ -8,6 +8,7 @@
     <ArtifactsPath>..\..\artifacts\$(MSBuildProjectName)</ArtifactsPath>
     <CopyArtifactsAfterTargets>Pack</CopyArtifactsAfterTargets>
     <DefaultArtifactsFileMatch>*nupkg</DefaultArtifactsFileMatch>
+    <DefineConstants Condition="'$(TargetFramework)' == 'netstandard2.0' Or '$(TargetFramework)' == 'netcoreapp2.1'">$(DefineConstants);NETCORE</DefineConstants>
   </PropertyGroup>
 
   <PropertyGroup Label="Package properties">
@@ -23,15 +24,15 @@
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' Or '$(TargetFramework)' == 'net46'">
-    <PackageReference Include="Microsoft.Build" VersionOverride="15.9.20" />
+    <PackageReference Include="Microsoft.Build" ExcludeAssets="Runtime" VersionOverride="15.9.20" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1' Or '$(TargetFramework)' == 'net472'">
     <PackageReference Include="Microsoft.Build" ExcludeAssets="Runtime" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net46' Or '$(TargetFramework)' == 'net472'">
-    <PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Condition="'$(TargetFramework)' == 'net46'" />
+    <PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" />
   </ItemGroup>
 
   <ItemGroup>