Update BuildBoss to handle the new msbuild references.

333fred · May 12, 2022 · a262f14 · a262f14
1 parent a3f5a47
commit a262f14
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/Tools/BuildBoss/ProjectCheckerUtil.cs b/src/Tools/BuildBoss/ProjectCheckerUtil.cs
@@ -133,7 +133,7 @@ private bool CheckPackageReferences(TextWriter textWriter)
                 if (!allowedPackageVersions.Contains(packageRef.Version))
                 {
                     textWriter.WriteLine($"PackageReference {packageRef.Name} has incorrect version {packageRef.Version}");
-                    textWriter.WriteLine($"Allowed values are " + string.Join(" or", allowedPackageVersions));
+                    textWriter.WriteLine($"Allowed values are " + string.Join(" or ", allowedPackageVersions));
                     allGood = false;
                 }
             }
@@ -158,6 +158,13 @@ private IEnumerable<string> GetAllowedPackageReferenceVersions(PackageReference
                 yield return $"$({name}Version)";
                 yield return $"$({name}FixedVersion)";
                 yield return $"$(RefOnly{name}Version)";
+
+                // These two projects have a direct or indirect dependency on both MSBuild and MS.VS.Shell.15.0. Our normal MSBuild
+                // version is 16.5.0, but MS.VS.Shell has a dependency on 17.1.0. For these projects, we allow an additional version.
+                if (name.StartsWith("MicrosoftBuild") && (ProjectFilePath.Contains("Roslyn.Compilers.Extension.csproj") || ProjectFilePath.Contains("IdeBenchmarks.csproj")))
+                {
+                    yield return $"$(RefOnly{name}Version_WithShellDependency)";
+                }
             }
         }