Fix support for MSBuild 15 (#334)

microsoft · Feb 23, 2022 · 8ba9b23 · 8ba9b23
1 parent f7a0759
commit 8ba9b23
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/src/Microsoft.VisualStudio.SlnGen.Tool/Microsoft.VisualStudio.SlnGen.Tool.csproj b/src/Microsoft.VisualStudio.SlnGen.Tool/Microsoft.VisualStudio.SlnGen.Tool.csproj
@@ -14,6 +14,14 @@
                  StrongName="StrongName" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\Microsoft.VisualStudio.SlnGen\Microsoft.VisualStudio.SlnGen.csproj"
+                      SetTargetFramework="TargetFramework=net461"
+                      IncludeAssets="None"
+                      OutputItemType="SlnGenBuildOutput"
+                      PrivateAssets="All"
+                      ReferenceOutputAssembly="false"
+                      SkipGetTargetFrameworkProperties="true"
+                      TargetFramework="net461" />
     <ProjectReference Include="..\Microsoft.VisualStudio.SlnGen\Microsoft.VisualStudio.SlnGen.csproj"
                       SetTargetFramework="TargetFramework=net472"
                       IncludeAssets="None"

diff --git a/src/Microsoft.VisualStudio.SlnGen.Tool/Program.cs b/src/Microsoft.VisualStudio.SlnGen.Tool/Program.cs
@@ -76,6 +76,21 @@ public static int Main(string[] args)
                             return -1;
                     }
                 }
+                else
+                {
+                    FileVersionInfo msBuildVersionInfo = FileVersionInfo.GetVersionInfo(developmentEnvironment.MSBuildExe.FullName);
+
+                    switch (msBuildVersionInfo.FileMajorPart)
+                    {
+                        case 15:
+                            framework = "net461";
+                            break;
+
+                        default:
+                            framework = "net472";
+                            break;
+                    }
+                }
 
                 FileInfo slnGenFileInfo = new FileInfo(Path.Combine(thisAssemblyFileInfo.DirectoryName!, "..", thisAssemblyFileInfo.DirectoryName!.EndsWith("any") ? ".." : string.Empty, "slngen", framework, useDotnet ? "slngen.dll" : "slngen.exe"));