From de15874f9871e2a59fb6ccaf126f2928e43f884f Mon Sep 17 00:00:00 2001
From: Matt Kotsenas <Matt.Kotsenas@gmail.com>
Date: Thu, 6 Jun 2024 14:13:14 -0700
Subject: [PATCH] Extract code analysis to its own build slice and update
 analyzers to latest versions (#60)

* Move CodeAnalysis to own build slice and fix duplicate and missing references

* Update analyzers to latest versions
---
 Directory.Build.props                         |  1 +
 Directory.Build.targets                       |  1 +
 Directory.Packages.props                      |  5 +---
 .../Moq.Analyzers.Test.csproj                 |  9 ------
 Source/Moq.Analyzers/Moq.Analyzers.csproj     |  4 +++
 build/targets/codeanalysis/CodeAnalysis.props | 28 +++++++++++++++++
 .../targets/codeanalysis/CodeAnalysis.targets |  2 ++
 build/targets/codeanalysis/Packages.props     |  8 +++++
 build/targets/compiler/Compiler.props         | 30 +------------------
 9 files changed, 46 insertions(+), 42 deletions(-)
 create mode 100644 build/targets/codeanalysis/CodeAnalysis.props
 create mode 100644 build/targets/codeanalysis/CodeAnalysis.targets
 create mode 100644 build/targets/codeanalysis/Packages.props

diff --git a/Directory.Build.props b/Directory.Build.props
index 226a1b2c..00850170 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -8,4 +8,5 @@
   <Import Project="build/targets/reproducible/Reproducible.props" />
   <Import Project="build/targets/versioning/Versioning.props" />
   <Import Project="build/targets/tests/Tests.props" />
+  <Import Project="build/targets/codeanalysis/CodeAnalysis.props" />
 </Project>
diff --git a/Directory.Build.targets b/Directory.Build.targets
index d05e476b..02c2c40a 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -4,4 +4,5 @@
   <Import Project="build/targets/reproducible/Reproducible.targets" />
   <Import Project="build/targets/versioning/Versioning.targets" />
   <Import Project="build/targets/tests/Tests.targets" />
+  <Import Project="build/targets/codeanalysis/CodeAnalysis.targets" />
 </Project>
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 39041d11..9bf954a5 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -4,16 +4,13 @@
     <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
   </PropertyGroup>
   <Import Project="build/targets/reproducible/Packages.props" />
+  <Import Project="build/targets/codeanalysis/Packages.props" />
   <ItemGroup>
     <PackageVersion Include="GetPackFromProject" Version="1.0.6" />
-    <PackageVersion Include="Meziantou.Analyzer" Version="2.0.155" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="2.9.3" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="2.6.1" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
     <PackageVersion Include="Moq" Version="4.8.2" />
     <PackageVersion Include="Nerdbank.GitVersioning" Version="3.6.133" />
-    <PackageVersion Include="Roslynator.Analyzers" Version="2.1.0" />
-    <PackageVersion Include="StyleCop.Analyzers" Version="1.1.118" />
     <PackageVersion Include="Verify.Nupkg" Version="1.1.5" />
     <PackageVersion Include="Verify.Xunit" Version="24.2.0" />
     <PackageVersion Include="xunit" Version="2.8.1" />
diff --git a/Source/Moq.Analyzers.Test/Moq.Analyzers.Test.csproj b/Source/Moq.Analyzers.Test/Moq.Analyzers.Test.csproj
index b4e3a49d..8469f274 100644
--- a/Source/Moq.Analyzers.Test/Moq.Analyzers.Test.csproj
+++ b/Source/Moq.Analyzers.Test/Moq.Analyzers.Test.csproj
@@ -19,17 +19,8 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" />
     <PackageReference Include="Moq" />
-    <PackageReference Include="Roslynator.Analyzers">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="StyleCop.Analyzers">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
     <PackageReference Include="Verify.Nupkg" />
     <PackageReference Include="Verify.Xunit" />
     <PackageReference Include="xunit" />
diff --git a/Source/Moq.Analyzers/Moq.Analyzers.csproj b/Source/Moq.Analyzers/Moq.Analyzers.csproj
index 9b38f42a..d5a79f8c 100644
--- a/Source/Moq.Analyzers/Moq.Analyzers.csproj
+++ b/Source/Moq.Analyzers/Moq.Analyzers.csproj
@@ -22,6 +22,10 @@
     <DevelopmentDependency>true</DevelopmentDependency>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" PrivateAssets="all" />
+  </ItemGroup>
+
   <ItemGroup>
     <Compile Update="Resources.Designer.cs" DesignTime="True" AutoGen="True" DependentUpon="Resources.resx" />
     <EmbeddedResource Update="Resources.resx" Generator="ResXFileCodeGenerator" LastGenOutput="Resources.Designer.cs" />
diff --git a/build/targets/codeanalysis/CodeAnalysis.props b/build/targets/codeanalysis/CodeAnalysis.props
new file mode 100644
index 00000000..e78f5421
--- /dev/null
+++ b/build/targets/codeanalysis/CodeAnalysis.props
@@ -0,0 +1,28 @@
+<Project>
+  <PropertyGroup>
+    <EnableNETAnalyzers>true</EnableNETAnalyzers>
+    <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
+    <AnalysisMode>preview</AnalysisMode>
+    <WarningLevel>9999</WarningLevel>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <AdditionalFiles Include="$(RepoRoot)/Source/stylecop.json" Visible="false" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Meziantou.Analyzer">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" PrivateAssets="all" />
+    <PackageReference Include="Roslynator.Analyzers">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="StyleCop.Analyzers">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+</Project>
diff --git a/build/targets/codeanalysis/CodeAnalysis.targets b/build/targets/codeanalysis/CodeAnalysis.targets
new file mode 100644
index 00000000..8c119d54
--- /dev/null
+++ b/build/targets/codeanalysis/CodeAnalysis.targets
@@ -0,0 +1,2 @@
+<Project>
+</Project>
diff --git a/build/targets/codeanalysis/Packages.props b/build/targets/codeanalysis/Packages.props
new file mode 100644
index 00000000..19c793af
--- /dev/null
+++ b/build/targets/codeanalysis/Packages.props
@@ -0,0 +1,8 @@
+<Project>
+  <ItemGroup>
+    <PackageVersion Include="Meziantou.Analyzer" Version="2.0.155" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
+    <PackageVersion Include="Roslynator.Analyzers" Version="4.12.4" />
+    <PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
+  </ItemGroup>
+</Project>
diff --git a/build/targets/compiler/Compiler.props b/build/targets/compiler/Compiler.props
index a1bb0de5..2cab0aac 100644
--- a/build/targets/compiler/Compiler.props
+++ b/build/targets/compiler/Compiler.props
@@ -1,35 +1,7 @@
 <Project>
-  <PropertyGroup Label="Language options">
+  <PropertyGroup>
     <ImplicitUsings>enable</ImplicitUsings>
     <LangVersion>12.0</LangVersion>
     <Nullable>enable</Nullable>
   </PropertyGroup>
-
-  <PropertyGroup Label="Code analysis">
-    <EnableNETAnalyzers>true</EnableNETAnalyzers>
-    <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
-    <AnalysisMode>preview</AnalysisMode>
-    <WarningLevel>9999</WarningLevel>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <AdditionalFiles Include="$(RepoRoot)/Source/stylecop.json" />
-  </ItemGroup>
-
-  <ItemGroup>
-      <PackageReference Include="Meziantou.Analyzer">
-          <PrivateAssets>all</PrivateAssets>
-          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      </PackageReference>
-      <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" PrivateAssets="all" />
-      <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" PrivateAssets="all" />
-      <PackageReference Include="Roslynator.Analyzers">
-          <PrivateAssets>all</PrivateAssets>
-          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      </PackageReference>
-      <PackageReference Include="StyleCop.Analyzers">
-          <PrivateAssets>all</PrivateAssets>
-          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      </PackageReference>
-  </ItemGroup>
 </Project>