From 3ae9639b0b3a5c63e824ed09813f5e2038d6a58a Mon Sep 17 00:00:00 2001
From: Robert Dailey <rcdailey@gmail.com>
Date: Sat, 15 May 2021 14:30:58 -0500
Subject: [PATCH] build: rearrange build props/targets

---
 src/Directory.Build.props   | 24 ++++++++++++------------
 src/Directory.Build.targets | 12 +++---------
 2 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 14d51333..21dc35c4 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -21,24 +21,24 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Nerdbank.GitVersioning" Condition=" '$(DisableNbgv)' != 'true' " />
-    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" />
-    <PackageReference Include="JetBrains.Annotations" />
+    <PackageReference Include="JetBrains.Annotations" PrivateAssets="All"/>
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" PrivateAssets="All"/>
+    <PackageReference Include="Nerdbank.GitVersioning" PrivateAssets="All" Condition=" '$(DisableNbgv)' != 'true' "/>
   </ItemGroup>
 
   <ItemGroup Condition="$(ProjectName.EndsWith('.Tests'))">
-    <PackageReference Include="NUnit" />
-    <PackageReference Include="NUnit.Analyzers" />
-    <PackageReference Include="NUnit3TestAdapter" />
-    <PackageReference Include="NSubstitute" />
-    <PackageReference Include="NSubstitute.Analyzers.CSharp" />
-    <PackageReference Include="FluentAssertions" />
-    <PackageReference Include="FluentAssertions.Json" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="AutofacContrib.NSubstitute" />
+    <PackageReference Include="FluentAssertions.Json" />
+    <PackageReference Include="FluentAssertions" />
     <PackageReference Include="GitHubActionsTestLogger" />
-    <PackageReference Include="Serilog.Sinks.TestCorrelator" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="NSubstitute.Analyzers.CSharp" />
+    <PackageReference Include="NSubstitute" />
+    <PackageReference Include="NUnit.Analyzers" />
+    <PackageReference Include="NUnit" />
+    <PackageReference Include="NUnit3TestAdapter" />
     <PackageReference Include="Serilog.Sinks.NUnit" />
+    <PackageReference Include="Serilog.Sinks.TestCorrelator" />
   </ItemGroup>
 
   <ItemGroup Condition="$(ProjectName.EndsWith('.Tests'))">
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
index 10f4dc42..c064ddce 100644
--- a/src/Directory.Build.targets
+++ b/src/Directory.Build.targets
@@ -22,15 +22,9 @@
     <PackageReference Update="CliFx" Version="2.*" />
     <PackageReference Update="Flurl.Http" Version="3.*" />
     <PackageReference Update="Flurl" Version="3.*" />
-    <PackageReference Update="JetBrains.Annotations" Version="*">
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Update="Microsoft.CodeAnalysis.NetAnalyzers" Version="5.*">
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Update="Nerdbank.GitVersioning" Version="3.*">
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
+    <PackageReference Update="JetBrains.Annotations" Version="*"/>
+    <PackageReference Update="Microsoft.CodeAnalysis.NetAnalyzers" Version="5.*"/>
+    <PackageReference Update="Nerdbank.GitVersioning" Version="3.*"/>
     <PackageReference Update="Serilog.Sinks.Console" Version="3.*" />
     <PackageReference Update="Serilog" Version="2.*" />
     <PackageReference Update="System.Data.HashFunction.FNV" Version="2.*" />