diff --git a/Directory.Packages.props b/Directory.Packages.props
index 7ffe4dc800..a08d20a2c3 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -23,7 +23,6 @@
-
diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml
index 4818d6bd9c..8b316b5003 100644
--- a/eng/SourceBuildPrebuiltBaseline.xml
+++ b/eng/SourceBuildPrebuiltBaseline.xml
@@ -9,6 +9,17 @@
This version does not have source build intermediate.
When a newer version is picked up, the intermediate should be utilized. -->
+
+
+
+
+
+
+
+
+
+
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index e8576be2c0..3da4eeb7cb 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -5,9 +5,35 @@
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
5535e31a712343a63f5d7d796cd874e563e5ac14
-
+
+
+ https://github.com/dotnet/msbuild
+ d6990bcfaf520c0d215a194fad0617f7efad68b4
+
+
+
+ https://github.com/dotnet/msbuild
+ d6990bcfaf520c0d215a194fad0617f7efad68b4
+
+
+ https://github.com/dotnet/msbuild
+ d6990bcfaf520c0d215a194fad0617f7efad68b4
+
+
+ https://github.com/dotnet/msbuild
+ d6990bcfaf520c0d215a194fad0617f7efad68b4
+
+
+ https://github.com/dotnet/msbuild
+ d6990bcfaf520c0d215a194fad0617f7efad68b4
+
+
+ https://github.com/dotnet/msbuild
+ d6990bcfaf520c0d215a194fad0617f7efad68b4
+
+
https://github.com/dotnet/roslyn
- 263571123fc3dc4a638e071234ac9fbf91913962
+ abc35d6d16eb3c0c0aafd67734f01217047a3c90
diff --git a/eng/Versions.props b/eng/Versions.props
index 5677936087..396fec3bb3 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -1,7 +1,7 @@
8
- 0
+ 3
10.3.0
- 17.3.2
+ 17.7.2
2.0.3
6.8.1-rc.2
- 4.8.0-7.24067.24
+ 4.10.0-3.24230.3
1.1.2-beta1.22216.1
diff --git a/src/dotnet-format.csproj b/src/dotnet-format.csproj
index 33d61d02a1..3bd97b3f83 100644
--- a/src/dotnet-format.csproj
+++ b/src/dotnet-format.csproj
@@ -35,9 +35,6 @@
-
-
-
diff --git a/tests/Utilities/MSBuildRegistrar.cs b/tests/Utilities/MSBuildRegistrar.cs
index db71158834..c2e0a362d7 100644
--- a/tests/Utilities/MSBuildRegistrar.cs
+++ b/tests/Utilities/MSBuildRegistrar.cs
@@ -21,11 +21,18 @@ public static string RegisterInstance()
{
if (Interlocked.Exchange(ref s_registered, 1) == 0)
{
- var msBuildInstance = Build.Locator.MSBuildLocator.QueryVisualStudioInstances().First();
- s_msBuildPath = Path.EndsInDirectorySeparator(msBuildInstance.MSBuildPath)
- ? msBuildInstance.MSBuildPath
- : msBuildInstance.MSBuildPath + Path.DirectorySeparatorChar;
- Build.Locator.MSBuildLocator.RegisterMSBuildPath(s_msBuildPath);
+ if (Build.Locator.MSBuildLocator.CanRegister)
+ {
+ var msBuildInstance = Build.Locator.MSBuildLocator.QueryVisualStudioInstances().First();
+ s_msBuildPath = Path.EndsInDirectorySeparator(msBuildInstance.MSBuildPath)
+ ? msBuildInstance.MSBuildPath
+ : msBuildInstance.MSBuildPath + Path.DirectorySeparatorChar;
+ Build.Locator.MSBuildLocator.RegisterMSBuildPath(s_msBuildPath);
+ }
+ else
+ {
+ s_msBuildPath = "MSBuild could not be registered.";
+ }
}
return s_msBuildPath!;