Merge pull request #2202 from Cosifne/internal/release/8.x

Merge Internal/release/8.x to release/8.x

Author: Cosifne

Directory.Packages.props

@@ -37,6 +37,7 @@
     <PackageVersion Include="NuGet.Versioning" Version="$(NuGetVersion)" />
     <PackageVersion Include="System.CommandLine" Version="$(SystemCommandLineVersion)" />
     <PackageVersion Include="System.CommandLine.Rendering" Version="$(SystemCommandLineRenderingVersion)" />
+    <PackageVersion Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
   </ItemGroup>
 
 </Project>

eng/SourceBuildPrebuiltBaseline.xml

@@ -10,6 +10,7 @@
          When a newer version is picked up, the intermediate should be utilized. -->
     <UsagePattern IdentityGlob="Microsoft.CodeAnalysis.AnalyzerUtilities/*3.3.0*" />
 
+    <UsagePattern IdentityGlob="System.Text.Json/8.0*" />
     <!-- Transitive dependency of Roslyn -->
     <UsagePattern IdentityGlob="Microsoft.Build/17.7.2" />
     <UsagePattern IdentityGlob="Microsoft.Build.Framework/17.7.2" />

eng/Version.Details.xml

@@ -31,9 +31,9 @@
       <Uri>https://github.com/dotnet/msbuild</Uri>
       <Sha>d6990bcfaf520c0d215a194fad0617f7efad68b4</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis" Version="4.10.0-3.24230.3">
+    <Dependency Name="Microsoft.CodeAnalysis" Version="4.8.0-7.24225.6">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>abc35d6d16eb3c0c0aafd67734f01217047a3c90</Sha>
+      <Sha>de75b3c77d41c21562fc2e9dbcc26b2268c80b26</Sha>
       <SourceBuild RepoName="roslyn" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.23502.1">

eng/Versions.props

@@ -31,10 +31,11 @@
     <!-- 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.10.0-3.24230.3</MicrosoftCodeAnalysisVersion>
+    <MicrosoftCodeAnalysisVersion>4.8.0-7.24225.6</MicrosoftCodeAnalysisVersion>
     <!-- roslyn-sdk -->
     <MicrosoftCodeAnalysisAnalyzerTestingVersion>1.1.2-beta1.22216.1</MicrosoftCodeAnalysisAnalyzerTestingVersion>
     <!-- runtime -->
+    <SystemTextJsonVersion>8.0.4</SystemTextJsonVersion>
     <MicrosoftBclAsyncInterfacesVersion>8.0.0</MicrosoftBclAsyncInterfacesVersion>
     <MicrosoftExtensionsFileSystemGlobbingVersion>8.0.0</MicrosoftExtensionsFileSystemGlobbingVersion>
     <MicrosoftExtensionsLoggingVersion>8.0.0</MicrosoftExtensionsLoggingVersion>

global.json

@@ -10,4 +10,4 @@
   "msbuild-sdks": {
     "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24225.1"
   }
-}
+}

src/dotnet-format.csproj

@@ -48,6 +48,8 @@
 
     <PackageReference Include="System.CommandLine" />
     <PackageReference Include="System.CommandLine.Rendering" />
+
+    <PackageReference Include="System.Text.Json" ExcludeAssets="Runtime" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup>