Merge pull request #2161 from dotnet/darc-release/8.0.2xx-6b42d183-31…

…3c-4efb-a91a-dfb009594e1f [release/8.0.2xx] Update dependencies from dotnet/roslyn
dotnet · May 7, 2024 · 33d73cb · 33d73cb
2 parents 71e9dee + b3a44b9
commit 33d73cb
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -5,9 +5,9 @@
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
       <Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis" Version="4.8.0-7.24067.24">
+    <Dependency Name="Microsoft.CodeAnalysis" Version="4.9.2-3.24171.17">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>263571123fc3dc4a638e071234ac9fbf91913962</Sha>
+      <Sha>a74310032037a8df19d3516256edb6738be9e817</Sha>
       <SourceBuild RepoName="roslyn" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.23502.1">

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -31,7 +31,7 @@
     <!-- In order tests against the same version of NuGet as the SDK. We have to set this to match. -->
     <NuGetVersion>6.8.1-rc.2</NuGetVersion>
     <!-- roslyn -->
-    <MicrosoftCodeAnalysisVersion>4.8.0-7.24067.24</MicrosoftCodeAnalysisVersion>
+    <MicrosoftCodeAnalysisVersion>4.9.2-3.24171.17</MicrosoftCodeAnalysisVersion>
     <!-- roslyn-sdk -->
     <MicrosoftCodeAnalysisAnalyzerTestingVersion>1.1.2-beta1.22216.1</MicrosoftCodeAnalysisAnalyzerTestingVersion>
     <!-- runtime -->

diff --git 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!;