From 0de9300d716f0f9f950123969a998d4b77a05c7d Mon Sep 17 00:00:00 2001
From: Zoltan Csizmadia <Zoltan.Csizmadia@vericast.com>
Date: Tue, 12 Nov 2024 14:35:30 -0600
Subject: [PATCH] .NET 9 GA

---
 .github/workflows/codeql-csharp-analysis.yml | 1 -
 .github/workflows/test-lang-csharp-ARM.yml   | 2 --
 .github/workflows/test-lang-csharp.yml       | 2 --
 .github/workflows/test-lang-java.yml         | 1 -
 lang/csharp/common.props                     | 9 ++++-----
 lang/csharp/versions.props                   | 5 +----
 6 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/codeql-csharp-analysis.yml b/.github/workflows/codeql-csharp-analysis.yml
index 9507ddc62f4..d9f535e42d9 100644
--- a/.github/workflows/codeql-csharp-analysis.yml
+++ b/.github/workflows/codeql-csharp-analysis.yml
@@ -68,7 +68,6 @@ jobs:
           7.0.x
           8.0.x
           9.0.x
-        dotnet-quality: 'preview'
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
diff --git a/.github/workflows/test-lang-csharp-ARM.yml b/.github/workflows/test-lang-csharp-ARM.yml
index 951728aee0d..6e06042cd76 100644
--- a/.github/workflows/test-lang-csharp-ARM.yml
+++ b/.github/workflows/test-lang-csharp-ARM.yml
@@ -50,7 +50,6 @@ jobs:
             7.0.x
             8.0.x
             9.0.x
-          dotnet-quality: 'preview'
 
       - uses: actions/cache@v4
         with:
@@ -82,7 +81,6 @@ jobs:
             7.0.x
             8.0.x
             9.0.x
-          dotnet-quality: 'preview'
 
       - name: Cache Local Maven Repository
         uses: actions/cache@v4
diff --git a/.github/workflows/test-lang-csharp.yml b/.github/workflows/test-lang-csharp.yml
index eee56a8ebaa..14188840041 100644
--- a/.github/workflows/test-lang-csharp.yml
+++ b/.github/workflows/test-lang-csharp.yml
@@ -50,7 +50,6 @@ jobs:
             7.0.x
             8.0.x
             9.0.x
-          dotnet-quality: 'preview'
 
       - uses: actions/cache@v4
         with:
@@ -82,7 +81,6 @@ jobs:
             7.0.x
             8.0.x
             9.0.x
-          dotnet-quality: 'preview'
 
       - name: Cache Local Maven Repository
         uses: actions/cache@v4
diff --git a/.github/workflows/test-lang-java.yml b/.github/workflows/test-lang-java.yml
index 8350d62abef..15ce3f739ec 100644
--- a/.github/workflows/test-lang-java.yml
+++ b/.github/workflows/test-lang-java.yml
@@ -135,7 +135,6 @@ jobs:
             7.0.x
             8.0.x
             9.0.x
-          dotnet-quality: 'preview'
 
       - name: 'Create Interop Data Directory'
         working-directory: .
diff --git a/lang/csharp/common.props b/lang/csharp/common.props
index 55985448c45..2a910fc59bf 100644
--- a/lang/csharp/common.props
+++ b/lang/csharp/common.props
@@ -80,11 +80,10 @@
     <EditorConfigFiles Condition="'$(IsTestProject)' == 'true'" Include="$(MSBuildThisFileDirectory)/CodeAnalysis.test.globalconfig" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(RunAnalyzers)' != 'false'">
-    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="$(MicrosoftCodeAnalysisNetAnalyzersVersion)" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="$(MicrosoftCodeAnalysisCSharpCodeStyleVersion)" PrivateAssets="all" />
-    <PackageReference Include="StyleCop.Analyzers" Version="$(StyleCopAnalyzersVersion)" PrivateAssets="all" />
-  </ItemGroup>
+  <PropertyGroup Condition="'$(RunAnalyzers)' != 'false'">
+    <EnableNETAnalyzers>true</EnableNETAnalyzers>
+    <AnalysisLevel>latest</AnalysisLevel>
+  </PropertyGroup>
 
   <Target Name="PrintVersionInfo">
     <Message Importance="high" Text="VersionPrefix: $(VersionPrefix)" />
diff --git a/lang/csharp/versions.props b/lang/csharp/versions.props
index 5b2fd638f4d..edab74dd716 100644
--- a/lang/csharp/versions.props
+++ b/lang/csharp/versions.props
@@ -27,7 +27,7 @@
   -->
   <PropertyGroup Label="Latest Package Versions">
     <NewtonsoftJsonVersion>13.0.3</NewtonsoftJsonVersion>
-    <SystemCodeDomVersion>9.0.0-rc.2.24473.5</SystemCodeDomVersion>
+    <SystemCodeDomVersion>9.0.0</SystemCodeDomVersion>
     <SystemReflectionVersion>4.3.0</SystemReflectionVersion>
     <SystemReflectionEmitILGenerationVersion>4.7.0</SystemReflectionEmitILGenerationVersion>
     <SystemReflectionEmitLightweightVersion>4.7.0</SystemReflectionEmitLightweightVersion>
@@ -65,12 +65,9 @@
     <MicrosoftBuildUtilitiesCoreVersion>17.12.6</MicrosoftBuildUtilitiesCoreVersion>
     <MicrosoftCodeAnalysisVersion>4.11.0</MicrosoftCodeAnalysisVersion>
     <MicrosoftCodeAnalysisCSharpVersion>4.11.0</MicrosoftCodeAnalysisCSharpVersion>
-    <MicrosoftCodeAnalysisCSharpCodeStyleVersion>4.11.0</MicrosoftCodeAnalysisCSharpCodeStyleVersion>
-    <MicrosoftCodeAnalysisNetAnalyzersVersion>9.0.0-preview.24454.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
     <MicrosoftNETTestSdkVersion>17.8.0</MicrosoftNETTestSdkVersion>
     <NUnitVersion>3.14.0</NUnitVersion>
     <NUnitConsoleRunnerVersion>3.16.3</NUnitConsoleRunnerVersion>
     <NUnit3TestAdapterVersion>4.5.0</NUnit3TestAdapterVersion>
-    <StyleCopAnalyzersVersion>1.1.118</StyleCopAnalyzersVersion>
   </PropertyGroup>
 </Project>