From 1a6a837d8cffee60ca72189987e8ed4fd1090a4f Mon Sep 17 00:00:00 2001
From: Stephen Cleary <github.ourteddybear@xoxy.net>
Date: Sat, 2 Dec 2023 09:29:37 -0500
Subject: [PATCH] Update common templates.

---
 src/Directory.Build.props  | 10 +++-------
 test/Directory.Build.props | 11 ++++++-----
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 1b7687a..1967703 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -1,6 +1,7 @@
 <Project>
   <!--
-      Directory.Build.props (src) v2.1
+      Directory.Build.props (src) v2.2
+      - 2.2 Migrate from FxCopAnalyzers to NetAnalyzers.
       - 2.1 Specify LangVersion (required by Nullable for most libraries).
       - 2.0 Move project-specific properties to `project.props`.
       - 1.1 Remove workaround for .NET SDK bug that was necesary for coverlet to work.
@@ -15,16 +16,11 @@
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <AnalysisMode>AllEnabledByDefault</AnalysisMode>
   </PropertyGroup>
   <PropertyGroup Condition="'$(CI)'=='true'">
     <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
   </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
 
   <!-- Package settings -->
   <PropertyGroup>
diff --git a/test/Directory.Build.props b/test/Directory.Build.props
index 610d85e..5c42e39 100644
--- a/test/Directory.Build.props
+++ b/test/Directory.Build.props
@@ -1,6 +1,7 @@
 <Project>
   <!--
-      Directory.Build.props (test) v1.0
+      Directory.Build.props (test) v1.1
+      - 1.1 Updates.
       - 1.0 Initial release.
   -->
 
@@ -9,13 +10,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
+    <PackageReference Include="xunit" Version="2.4.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="1.3.0">
+    <PackageReference Include="coverlet.collector" Version="3.2.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>