Support for Visual Studio 2019 / MSBuild 16.0 (#23)

jeffkl · web-flow · commit 23c5840729bc · 2018-12-13T14:23:47.000-08:00
diff --git a/src/MSBuildProjectCreator/MSBuildAssemblyResolver.cs b/src/MSBuildProjectCreator/MSBuildAssemblyResolver.cs
@@ -17,15 +17,21 @@ public static class MSBuildAssemblyResolver
             () =>
             {
                 string visualStudioDirectory;
+                string msbuildVersionDirectory = Environment.GetEnvironmentVariable("VISUALSTUDIOVERSION") ?? "15.0";
+
+                if (Version.TryParse(msbuildVersionDirectory, out Version visualStudioVersion) && visualStudioVersion.Major >= 16)
+                {
+                    msbuildVersionDirectory = "Current";
+                }
 
                 if (!String.IsNullOrWhiteSpace(visualStudioDirectory = Environment.GetEnvironmentVariable("VSINSTALLDIR")))
                 {
-                    return Path.Combine(visualStudioDirectory, "MSBuild", "15.0", "Bin");
+                    return Path.Combine(visualStudioDirectory, "MSBuild", msbuildVersionDirectory, "Bin");
                 }
 
                 if (!String.IsNullOrWhiteSpace(visualStudioDirectory = Environment.GetEnvironmentVariable("VSAPPIDDIR")))
                 {
-                    return Path.Combine(visualStudioDirectory, "..", "..", "MSBuild", "15.0", "Bin");
+                    return Path.GetFullPath(Path.Combine(visualStudioDirectory, "..", "..", "MSBuild", msbuildVersionDirectory, "Bin"));
                 }
 
                 foreach (string path in (Environment.GetEnvironmentVariable("PATH") ?? String.Empty).Split(PathSplitChars, StringSplitOptions.RemoveEmptyEntries))

Original file line number	Diff line number	Diff line change
`@@ -17,15 +17,21 @@ public static class MSBuildAssemblyResolver`
`17`	`17`	`() =>`
`18`	`18`	`{`
`19`	`19`	`string visualStudioDirectory;`
	`20`	`+ string msbuildVersionDirectory = Environment.GetEnvironmentVariable("VISUALSTUDIOVERSION") ?? "15.0";`
	`21`	`+`
	`22`	`+ if (Version.TryParse(msbuildVersionDirectory, out Version visualStudioVersion) && visualStudioVersion.Major >= 16)`
	`23`	`+ {`
	`24`	`+ msbuildVersionDirectory = "Current";`
	`25`	`+ }`
`20`	`26`
`21`	`27`	`if (!String.IsNullOrWhiteSpace(visualStudioDirectory = Environment.GetEnvironmentVariable("VSINSTALLDIR")))`
`22`	`28`	`{`
`23`		`- return Path.Combine(visualStudioDirectory, "MSBuild", "15.0", "Bin");`
	`29`	`+ return Path.Combine(visualStudioDirectory, "MSBuild", msbuildVersionDirectory, "Bin");`
`24`	`30`	`}`
`25`	`31`
`26`	`32`	`if (!String.IsNullOrWhiteSpace(visualStudioDirectory = Environment.GetEnvironmentVariable("VSAPPIDDIR")))`
`27`	`33`	`{`
`28`		`- return Path.Combine(visualStudioDirectory, "..", "..", "MSBuild", "15.0", "Bin");`
	`34`	`+ return Path.GetFullPath(Path.Combine(visualStudioDirectory, "..", "..", "MSBuild", msbuildVersionDirectory, "Bin"));`
`29`	`35`	`}`
`30`	`36`
`31`	`37`	`foreach (string path in (Environment.GetEnvironmentVariable("PATH") ?? String.Empty).Split(PathSplitChars, StringSplitOptions.RemoveEmptyEntries))`