changes for CLI issues

Author: taori

src/Generator.Client.CommandLine/Program.cs

@@ -17,6 +17,7 @@ static int Main(string[] args)
 		{
 			try
 			{
+				MSBuildInitializer.Initialize();
 				ServiceLocatorInitializer.Initialize();
 #if DEBUG
 				if (Debugger.IsAttached)

src/Generator.Client.Desktop/App.xaml.cs

@@ -20,6 +20,7 @@ public partial class App : Application
 		protected override void OnStartup(StartupEventArgs e)
 		{
 			CommandManagerDelegate.Instance = new WpfCommandManager();
+			MSBuildInitializer.Initialize();
 			ServiceLocatorInitializer.Initialize();
 			base.OnStartup(e);
 		}

src/Generator.Shared/DependencyInjection/MSBuildInitializer.cs

@@ -0,0 +1,19 @@
+// Copyright 2020 Andreas Müller
+// This file is a part of Amusoft.VisualStudio.TemplateGenerator and is licensed under Apache 2.0
+// See https://github.com/taori/Amusoft.VisualStudio.TemplateGenerator/blob/master/LICENSE for details
+
+using System.Linq;
+using Microsoft.Build.Locator;
+using Microsoft.CodeAnalysis.MSBuild;
+
+namespace Generator.Shared.DependencyInjection
+{
+	public static class MSBuildInitializer
+	{
+		public static void Initialize()
+		{
+			var options = new VisualStudioInstanceQueryOptions(){ DiscoveryTypes = DiscoveryType.VisualStudioSetup};
+			MSBuildLocator.RegisterInstance(MSBuildLocator.QueryVisualStudioInstances(options).FirstOrDefault());
+		}
+	}
+}

src/Generator.Shared/Generator.Shared.csproj

@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net472;netstandard2.0</TargetFrameworks>
+		<!-- <TargetFrameworks>net472;netstandard2.0</TargetFrameworks> -->
+		<TargetFrameworks>net472</TargetFrameworks>
 		<LangVersion>latest</LangVersion>
 	</PropertyGroup>
 
@@ -32,9 +33,10 @@
 
 	<ItemGroup>
 	  <PackageReference Include="JetBrains.Annotations" Version="2018.2.1" />
-	  <PackageReference Include="Microsoft.Build" Version="16.4.0" />
-	  <PackageReference Include="Microsoft.Build.Framework" Version="16.4.0" />
-	  <PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.4.0" />
+
+	  <PackageReference Include="Microsoft.Build" Version="15.9.20" ExcludeAssets="runtime" />
+	  <PackageReference Include="Microsoft.Build.Framework" Version="15.9.20" ExcludeAssets="runtime" />
+	  <PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.9.20" ExcludeAssets="runtime" />
 	  <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="3.4.0" />
 	  <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="3.4.0" />
 	  <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.2.0" />
@@ -45,6 +47,8 @@
 	  <PackageReference Include="System.IO" Version="4.3.0" />
 	  <PackageReference Include="System.IO.Compression.ZipFile" Version="4.3.0" />
 	  <PackageReference Include="System.Reactive" Version="4.1.2" />
+	  <PackageReference Include="Microsoft.Build.Locator" Version="1.2.6" />
+
 	</ItemGroup>
 
 </Project>

src/Generator.Shared/Transformation/SolutionExplorer.cs

@@ -61,7 +61,6 @@ public static string GetAssemblyName(string projectFile)
 				throw new FileNotFoundException(projectFile);
 
 			var evaluationProject = GetEvaluationProject(projectFile);
-			//			var props = evaluationProject.Properties.Where(d => d.EvaluatedValue.Contains("ViewModels")).ToArray();
 			return evaluationProject.GetPropertyValue("RootNamespace") ?? string.Empty;
 		}
 
@@ -150,7 +149,8 @@ private static Microsoft.Build.Evaluation.Project GetEvaluationProject(string pr
 
 			var matchingProject = Microsoft.Build.Evaluation.ProjectCollection.GlobalProjectCollection.LoadedProjects.FirstOrDefault(d => string.Equals(d.FullPath,projectFilePath, StringComparison.OrdinalIgnoreCase) );
 
-			return matchingProject ?? Microsoft.Build.Evaluation.Project.FromFile(projectFilePath, new ProjectOptions());
+			var projectOptions = new ProjectOptions();
+			return matchingProject ?? Microsoft.Build.Evaluation.Project.FromFile(projectFilePath, projectOptions);
 		}
 
 		public IEnumerable<string> GetAllProjectFiles()