From 4c3e3b33e8aab3b84b576a9539196b9a01620dde Mon Sep 17 00:00:00 2001
From: wtgodbe <wigodbe@microsoft.com>
Date: Wed, 8 Jan 2025 10:10:47 -0800
Subject: [PATCH 1/2] Pin to S.T.J 8.0.5 in Analyzers

---
 eng/Versions.props                                             | 1 +
 .../src/Analyzers/Microsoft.AspNetCore.App.Analyzers.csproj    | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/eng/Versions.props b/eng/Versions.props
index 9a3eb69bd0cb..43d8995f2816 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -205,6 +205,7 @@
     <!-- Build tool dependencies -->
     <MicrosoftVSSDKBuildToolsVersion>15.9.3032</MicrosoftVSSDKBuildToolsVersion>
     <RepoTasksSystemSecurityCryptographyXmlVersion>8.0.0</RepoTasksSystemSecurityCryptographyXmlVersion>
+    <AnalyzersSystemTextJsonVersion>8.0.5</AnalyzersSystemTextJsonVersion>
     <!-- Stable dotnet/corefx packages no longer updated for .NET Core 3 -->
     <MicrosoftCSharpVersion>4.7.0</MicrosoftCSharpVersion>
     <MicrosoftWin32RegistryVersion>5.0.0</MicrosoftWin32RegistryVersion>
diff --git a/src/Framework/AspNetCoreAnalyzers/src/Analyzers/Microsoft.AspNetCore.App.Analyzers.csproj b/src/Framework/AspNetCoreAnalyzers/src/Analyzers/Microsoft.AspNetCore.App.Analyzers.csproj
index 97439d9a3d20..0114eedab818 100644
--- a/src/Framework/AspNetCoreAnalyzers/src/Analyzers/Microsoft.AspNetCore.App.Analyzers.csproj
+++ b/src/Framework/AspNetCoreAnalyzers/src/Analyzers/Microsoft.AspNetCore.App.Analyzers.csproj
@@ -9,12 +9,15 @@
     <RootNamespace>Microsoft.AspNetCore.Analyzers</RootNamespace>
     <SuppressNullableAttributesImport>true</SuppressNullableAttributesImport>
     <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
+    <DisablePackageReferenceRestrictions>true</DisablePackageReferenceRestrictions>
   </PropertyGroup>
 
   <ItemGroup>
     <Reference Include="Microsoft.CodeAnalysis.CSharp" PrivateAssets="All" />
     <Reference Include="Microsoft.CodeAnalysis.ExternalAccess.AspNetCore" />
 
+    <PackageReference Include="System.Text.Json" Version="$(AnalyzersSystemTextJsonVersion)" />
+
     <InternalsVisibleTo Include="Microsoft.AspNetCore.App.Analyzers.Test" />
     <InternalsVisibleTo Include="Microsoft.AspNetCore.App.CodeFixes" />
   </ItemGroup>

From ade691d0970d63468848943ee2c9d4f92826a833 Mon Sep 17 00:00:00 2001
From: William Godbe <wigodbe@microsoft.com>
Date: Wed, 8 Jan 2025 10:30:57 -0800
Subject: [PATCH 2/2] Update SourceBuildPrebuiltBaseline.xml

---
 eng/SourceBuildPrebuiltBaseline.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml
index 8e86375464ef..16f073c688e5 100644
--- a/eng/SourceBuildPrebuiltBaseline.xml
+++ b/eng/SourceBuildPrebuiltBaseline.xml
@@ -41,9 +41,11 @@
     <UsagePattern IdentityGlob="Microsoft.DiaSymReader/*2.0.0*" />
 
     <!-- Transitive dependency of Roslyn dependencies. -->
-    <UsagePattern IdentityGlob="System.Text.Json/8.0.0*" />
     <UsagePattern IdentityGlob="System.Text.Encodings.Web/8.0.0*" />
 
+    <!-- Pinned to circumvent CG alert from Roslyn -->
+    <UsagePattern IdentityGlob="System.Text.Json/8.0.5*" />
+
     <!-- Transitive dependency of System.Security.Cryptography.Pkcs.5.0.*. -->
     <UsagePattern IdentityGlob="System.Formats.Asn1/6.0.0" />
   </IgnorePatterns>