From 4f96d9aa7d97845ac974b1125f8a244798bf82d8 Mon Sep 17 00:00:00 2001
From: jlewin <lewin76@gmail.com>
Date: Mon, 24 Jun 2019 13:32:27 -0700
Subject: [PATCH] Update RoslynLocalizeDetector

---
 Tools/RoslynLocalizeDetector/Program.cs       | 21 ++++++-------------
 .../RoslynLocalizeDetector.csproj             | 10 ++++-----
 2 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/Tools/RoslynLocalizeDetector/Program.cs b/Tools/RoslynLocalizeDetector/Program.cs
index 1f26950b9..fa994433c 100644
--- a/Tools/RoslynLocalizeDetector/Program.cs
+++ b/Tools/RoslynLocalizeDetector/Program.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.IO;
 using System.Linq;
+using Microsoft.Build.Locator;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.MSBuild;
@@ -14,25 +15,15 @@ namespace RoslynLocalizeDetector
 	{
 		static void Main(string[] args)
 		{
-			// ** Only works if run from VSDev Command prompt **
-			//
-			//var instances = MSBuildLocator.QueryVisualStudioInstances().ToList();
-			//var instanceToUse = instances.First(a => a.Version.Major == 15);
-			//Environment.SetEnvironmentVariable("VSINSTALLDIR", instanceToUse.VisualStudioRootPath);
-
-			Environment.SetEnvironmentVariable("VSINSTALLDIR", @"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community");
-			Environment.SetEnvironmentVariable("VisualStudioVersion", "15.0");
+			MSBuildLocator.RegisterDefaults();
 
 			string matterControlRoot = GetMatterControlDirectory();
 
-			var properties = new Dictionary<string, string>
+			var workspace = MSBuildWorkspace.Create(new Dictionary<string, string>
 			{
-			   { "Configuration", "Debug" },
-				{"Platform", "AnyCPU" }
-			};
-			//var workspace = MSBuildWorkspace.Create(properties);
-			var workspace = MSBuildWorkspace.Create();
-
+				["Configuration"] = "Debug",
+				["Platform"] = "AnyCPU"
+			});
 			workspace.WorkspaceFailed += (s, e) => Console.WriteLine(e.Diagnostic.Message);
 			workspace.LoadMetadataForReferencedProjects = true;
 
diff --git a/Tools/RoslynLocalizeDetector/RoslynLocalizeDetector.csproj b/Tools/RoslynLocalizeDetector/RoslynLocalizeDetector.csproj
index 5c629accd..8ebdbbfe6 100644
--- a/Tools/RoslynLocalizeDetector/RoslynLocalizeDetector.csproj
+++ b/Tools/RoslynLocalizeDetector/RoslynLocalizeDetector.csproj
@@ -1,17 +1,17 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net471</TargetFramework>
+    <TargetFramework>net472</TargetFramework>
     <AssemblyName>RoslynLocalizeDetector</AssemblyName>
     <RootNamespace>RoslynLocalizeDetector</RootNamespace>
     <StartupObject></StartupObject>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Build" Version="15.9.20" />
-    <PackageReference Include="Microsoft.Build.MSBuildLocator" Version="1.0.1-preview-g6cd9a57801" />
-    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="15.9.20" />
+    <PackageReference Include="Microsoft.Build" Version="15.9.20" ExcludeAssets="runtime" />
+    <PackageReference Include="Microsoft.Build.Locator" Version="1.2.2" />
+    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="16.1.76" ExcludeAssets="runtime" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="2.8.2" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
   </ItemGroup>