Merge pull request #2155 from dotnet/darc-release/8.x-71513a49-1224-4…

…8cd-a8f0-eb83bcdd1a53 [release/8.x] Update dependencies from dotnet/roslyn
dotnet · May 7, 2024 · 32b81fa · 32b81fa
2 parents ef9242a + fafcc19
commit 32b81fa
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 14 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -23,7 +23,6 @@
     <PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic" Version="$(MicrosoftCodeAnalysisVersion)" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="$(MicrosoftCodeAnalysisVersion)" />
     <PackageVersion Include="Microsoft.CodeAnalysis" Version="$(MicrosoftCodeAnalysisVersion)" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.ExternalAccess.RazorCompiler" Version="$(MicrosoftCodeAnalysisVersion)" />
     <PackageVersion Include="Microsoft.DiaSymReader" Version="$(MicrosoftDiaSymReaderVersion)" />
     <PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="$(MicrosoftExtensionsFileSystemGlobbingVersion)" />
     <PackageVersion Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingVersion)" />

diff --git 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. -->
     <UsagePattern IdentityGlob="Microsoft.CodeAnalysis.AnalyzerUtilities/*3.3.0*" />
+
+    <!-- Transitive dependency of Roslyn -->
+    <UsagePattern IdentityGlob="Microsoft.Build/17.7.2" />
+    <UsagePattern IdentityGlob="Microsoft.Build.Framework/17.7.2" />
+    <UsagePattern IdentityGlob="Microsoft.Build.Tasks.Core/17.7.2" />
+    <UsagePattern IdentityGlob="Microsoft.Build.Utilities.Core/17.7.2" />
+    <UsagePattern IdentityGlob="Microsoft.NET.StringTools/17.7.2" />
+    <UsagePattern IdentityGlob="System.Configuration.ConfigurationManager/7.0*" />
+    <UsagePattern IdentityGlob="System.Diagnostics.EventLog/7.0*" />
+    <UsagePattern IdentityGlob="System.Reflection.MetadataLoadContext/7.0*" />
+    <UsagePattern IdentityGlob="System.Security.Cryptography.ProtectedData/7.0*" />
   </IgnorePatterns>
   <Usages>
     <Usage Id="System.Composition" Version="7.0.0" />

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -5,9 +5,35 @@
       <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">
+    <!-- Necessary for source-build. This allows the live version of the package to be used by source-build. -->
+    <Dependency Name="Microsoft.Build.Tasks.Core" Version="17.7.2">
+      <Uri>https://github.com/dotnet/msbuild</Uri>
+      <Sha>d6990bcfaf520c0d215a194fad0617f7efad68b4</Sha>
+    </Dependency>
+    <!-- Necessary for source-build. This allows the live version of the package to be used by source-build. -->
+    <Dependency Name="Microsoft.Build" Version="17.7.2">
+      <Uri>https://github.com/dotnet/msbuild</Uri>
+      <Sha>d6990bcfaf520c0d215a194fad0617f7efad68b4</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.Build.Framework" Version="17.7.2">
+      <Uri>https://github.com/dotnet/msbuild</Uri>
+      <Sha>d6990bcfaf520c0d215a194fad0617f7efad68b4</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.Build.Tasks.Core" Version="17.7.2">
+      <Uri>https://github.com/dotnet/msbuild</Uri>
+      <Sha>d6990bcfaf520c0d215a194fad0617f7efad68b4</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.Build.Utilities.Core" Version="17.7.2">
+      <Uri>https://github.com/dotnet/msbuild</Uri>
+      <Sha>d6990bcfaf520c0d215a194fad0617f7efad68b4</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.NET.StringTools" Version="17.7.2">
+      <Uri>https://github.com/dotnet/msbuild</Uri>
+      <Sha>d6990bcfaf520c0d215a194fad0617f7efad68b4</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.CodeAnalysis" Version="4.10.0-3.24230.3">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>263571123fc3dc4a638e071234ac9fbf91913962</Sha>
+      <Sha>abc35d6d16eb3c0c0aafd67734f01217047a3c90</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
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <MajorVersion>8</MajorVersion>
-    <MinorVersion>0</MinorVersion>
+    <MinorVersion>3</MinorVersion>
     <!-- Build release-only package. -->
     <PreReleaseVersionLabel />
     <!--
@@ -24,14 +24,14 @@
     <!-- corefx -->
     <MicrosoftVisualBasicVersion>10.3.0</MicrosoftVisualBasicVersion>
     <!-- msbuild -->
-    <MicrosoftBuildVersion>17.3.2</MicrosoftBuildVersion>
+    <MicrosoftBuildVersion>17.7.2</MicrosoftBuildVersion>
     <!-- netstandard -->
     <NETStandardLibraryVersion>2.0.3</NETStandardLibraryVersion>
     <!-- nuget -->
     <!-- 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.10.0-3.24230.3</MicrosoftCodeAnalysisVersion>
     <!-- roslyn-sdk -->
     <MicrosoftCodeAnalysisAnalyzerTestingVersion>1.1.2-beta1.22216.1</MicrosoftCodeAnalysisAnalyzerTestingVersion>
     <!-- runtime -->

diff --git a/src/dotnet-format.csproj b/src/dotnet-format.csproj
@@ -35,9 +35,6 @@
     <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" />
     <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" />
 
-    <!-- Included with Microsoft.CodeAnalysis.dll for Razor support -->
-    <PackageReference Include="Microsoft.CodeAnalysis.ExternalAccess.RazorCompiler" ExcludeAssets="compile" />
-
     <!-- Loaded dynamically -->
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Features" />
     <PackageReference Include="Microsoft.CodeAnalysis.Features" />

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