From e228a66da11e9690ea2309e41a24d8246301b63d Mon Sep 17 00:00:00 2001
From: Marko Lahma <marko.lahma@gmail.com>
Date: Sat, 3 Aug 2024 22:02:54 +0300
Subject: [PATCH] Make JetBrains.Annotations a private reference

* only reference STJ on netstandard
---
 build/_build.csproj                                           | 1 +
 source/Nuke.Build.Shared/Nuke.Build.Shared.csproj             | 3 ++-
 source/Nuke.Build.Tests/Nuke.Build.Tests.csproj               | 4 ++++
 source/Nuke.Build/Nuke.Build.csproj                           | 1 +
 source/Nuke.Common.Tests/Nuke.Common.Tests.csproj             | 4 ++++
 source/Nuke.Common/Nuke.Common.csproj                         | 1 +
 source/Nuke.Components/Nuke.Components.csproj                 | 4 ++++
 source/Nuke.GlobalTool/Nuke.GlobalTool.csproj                 | 1 +
 source/Nuke.MSBuildTasks/Nuke.MSBuildTasks.csproj             | 1 +
 source/Nuke.ProjectModel/Nuke.ProjectModel.csproj             | 1 +
 source/Nuke.SolutionModel/Nuke.SolutionModel.csproj           | 4 ++++
 source/Nuke.SourceGenerators/Nuke.SourceGenerators.csproj     | 1 +
 source/Nuke.Tooling.Generator/Nuke.Tooling.Generator.csproj   | 1 +
 source/Nuke.Tooling/Nuke.Tooling.csproj                       | 1 +
 .../Nuke.Utilities.IO.Compression.csproj                      | 1 +
 .../Nuke.Utilities.IO.Globbing.csproj                         | 1 +
 source/Nuke.Utilities.Net/Nuke.Utilities.Net.csproj           | 1 -
 source/Nuke.Utilities.Tests/Nuke.Utilities.Tests.csproj       | 4 ++++
 .../Nuke.Utilities.Text.Json/Nuke.Utilities.Text.Json.csproj  | 1 +
 .../Nuke.Utilities.Text.Yaml/Nuke.Utilities.Text.Yaml.csproj  | 1 +
 source/Nuke.Utilities/Nuke.Utilities.csproj                   | 2 +-
 21 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/build/_build.csproj b/build/_build.csproj
index 8de4e02f5..59d78dba3 100644
--- a/build/_build.csproj
+++ b/build/_build.csproj
@@ -53,6 +53,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="JetBrains.Annotations"  Version="2023.3.0" PrivateAssets="all" />
     <PackageReference Include="linqtotwitter" Version="6.15.0" />
     <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.0.1" />
     <PackageDownload Include="Codecov.Tool" Version="[1.13.0]" />
diff --git a/source/Nuke.Build.Shared/Nuke.Build.Shared.csproj b/source/Nuke.Build.Shared/Nuke.Build.Shared.csproj
index 5925ae70e..7a14c5a43 100644
--- a/source/Nuke.Build.Shared/Nuke.Build.Shared.csproj
+++ b/source/Nuke.Build.Shared/Nuke.Build.Shared.csproj
@@ -9,7 +9,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Text.Json" />
+    <PackageReference Include="JetBrains.Annotations" PrivateAssets="all" />
+    <PackageReference Include="System.Text.Json" Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))" />
   </ItemGroup>
 
 </Project>
diff --git a/source/Nuke.Build.Tests/Nuke.Build.Tests.csproj b/source/Nuke.Build.Tests/Nuke.Build.Tests.csproj
index 4ba2b3ec9..f52067f60 100644
--- a/source/Nuke.Build.Tests/Nuke.Build.Tests.csproj
+++ b/source/Nuke.Build.Tests/Nuke.Build.Tests.csproj
@@ -8,4 +8,8 @@
     <ProjectReference Include="..\Nuke.Build\Nuke.Build.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="JetBrains.Annotations" />
+  </ItemGroup>
+
 </Project>
diff --git a/source/Nuke.Build/Nuke.Build.csproj b/source/Nuke.Build/Nuke.Build.csproj
index 94c5801ed..37ab74186 100644
--- a/source/Nuke.Build/Nuke.Build.csproj
+++ b/source/Nuke.Build/Nuke.Build.csproj
@@ -17,6 +17,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="JetBrains.Annotations" PrivateAssets="all" />
     <PackageReference Include="Microsoft.ApplicationInsights" />
     <PackageReference Include="Microsoft.Extensions.DependencyModel" />
     <PackageReference Include="NJsonSchema" />
diff --git a/source/Nuke.Common.Tests/Nuke.Common.Tests.csproj b/source/Nuke.Common.Tests/Nuke.Common.Tests.csproj
index 75b2a2fb8..3c495f232 100644
--- a/source/Nuke.Common.Tests/Nuke.Common.Tests.csproj
+++ b/source/Nuke.Common.Tests/Nuke.Common.Tests.csproj
@@ -8,4 +8,8 @@
     <ProjectReference Include="..\Nuke.Common\Nuke.Common.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="JetBrains.Annotations" />
+  </ItemGroup>
+
 </Project>
diff --git a/source/Nuke.Common/Nuke.Common.csproj b/source/Nuke.Common/Nuke.Common.csproj
index 0ab89aea1..2bc5de6b5 100644
--- a/source/Nuke.Common/Nuke.Common.csproj
+++ b/source/Nuke.Common/Nuke.Common.csproj
@@ -27,6 +27,7 @@
     <PackageReference Include="Azure.Security.KeyVault.Certificates" />
     <PackageReference Include="Azure.Security.KeyVault.Keys" />
     <PackageReference Include="Azure.Security.KeyVault.Secrets" />
+    <PackageReference Include="JetBrains.Annotations" PrivateAssets="all" />
     <PackageReference Include="Octokit" />
   </ItemGroup>
 
diff --git a/source/Nuke.Components/Nuke.Components.csproj b/source/Nuke.Components/Nuke.Components.csproj
index 890d2cbdc..d758954e7 100644
--- a/source/Nuke.Components/Nuke.Components.csproj
+++ b/source/Nuke.Components/Nuke.Components.csproj
@@ -8,4 +8,8 @@
     <ProjectReference Include="..\Nuke.Common\Nuke.Common.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="JetBrains.Annotations" PrivateAssets="all" />
+  </ItemGroup>
+
 </Project>
diff --git a/source/Nuke.GlobalTool/Nuke.GlobalTool.csproj b/source/Nuke.GlobalTool/Nuke.GlobalTool.csproj
index a47a42bc8..5f716ada6 100644
--- a/source/Nuke.GlobalTool/Nuke.GlobalTool.csproj
+++ b/source/Nuke.GlobalTool/Nuke.GlobalTool.csproj
@@ -14,6 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="JetBrains.Annotations" PrivateAssets="all" />
     <PackageReference Include="matkoch.spectre.console" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" />
     <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" />
diff --git a/source/Nuke.MSBuildTasks/Nuke.MSBuildTasks.csproj b/source/Nuke.MSBuildTasks/Nuke.MSBuildTasks.csproj
index e2e4b0b6b..04061a02c 100644
--- a/source/Nuke.MSBuildTasks/Nuke.MSBuildTasks.csproj
+++ b/source/Nuke.MSBuildTasks/Nuke.MSBuildTasks.csproj
@@ -11,6 +11,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="JetBrains.Annotations" PrivateAssets="all" />
     <PackageReference Include="NuGet.Packaging" />
   </ItemGroup>
 
diff --git a/source/Nuke.ProjectModel/Nuke.ProjectModel.csproj b/source/Nuke.ProjectModel/Nuke.ProjectModel.csproj
index 0d21f36d4..675d5c255 100644
--- a/source/Nuke.ProjectModel/Nuke.ProjectModel.csproj
+++ b/source/Nuke.ProjectModel/Nuke.ProjectModel.csproj
@@ -11,6 +11,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="JetBrains.Annotations" PrivateAssets="all" />
     <PackageReference Include="Microsoft.Build.Locator" />
     <PackageReference Include="Microsoft.Build" ExcludeAssets="runtime" />
     <PackageReference Include="Microsoft.Build.Framework" ExcludeAssets="runtime" />
diff --git a/source/Nuke.SolutionModel/Nuke.SolutionModel.csproj b/source/Nuke.SolutionModel/Nuke.SolutionModel.csproj
index f8330fbed..5eb5e0b48 100644
--- a/source/Nuke.SolutionModel/Nuke.SolutionModel.csproj
+++ b/source/Nuke.SolutionModel/Nuke.SolutionModel.csproj
@@ -8,4 +8,8 @@
     <ProjectReference Include="..\Nuke.Utilities\Nuke.Utilities.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="JetBrains.Annotations" PrivateAssets="all" />
+  </ItemGroup>
+
 </Project>
diff --git a/source/Nuke.SourceGenerators/Nuke.SourceGenerators.csproj b/source/Nuke.SourceGenerators/Nuke.SourceGenerators.csproj
index 3d4e219a5..1a132f515 100644
--- a/source/Nuke.SourceGenerators/Nuke.SourceGenerators.csproj
+++ b/source/Nuke.SourceGenerators/Nuke.SourceGenerators.csproj
@@ -19,6 +19,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="JetBrains.Annotations" PrivateAssets="all" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" VersionOverride="4.7.0" PrivateAssets="all" />
     <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" PrivateAssets="all" />
     <PackageReference Include="Newtonsoft.Json" PrivateAssets="all" GeneratePathProperty="true" />
diff --git a/source/Nuke.Tooling.Generator/Nuke.Tooling.Generator.csproj b/source/Nuke.Tooling.Generator/Nuke.Tooling.Generator.csproj
index 089faf871..618ba9b51 100644
--- a/source/Nuke.Tooling.Generator/Nuke.Tooling.Generator.csproj
+++ b/source/Nuke.Tooling.Generator/Nuke.Tooling.Generator.csproj
@@ -7,6 +7,7 @@
 
   <ItemGroup>
     <PackageReference Include="HtmlAgilityPack" />
+    <PackageReference Include="JetBrains.Annotations" PrivateAssets="all" />
     <PackageReference Include="Newtonsoft.Json" />
     <PackageReference Include="Humanizer" />
     <PackageReference Include="Serilog" />
diff --git a/source/Nuke.Tooling/Nuke.Tooling.csproj b/source/Nuke.Tooling/Nuke.Tooling.csproj
index e6e3083d2..bee28fa4d 100644
--- a/source/Nuke.Tooling/Nuke.Tooling.csproj
+++ b/source/Nuke.Tooling/Nuke.Tooling.csproj
@@ -9,6 +9,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="JetBrains.Annotations" PrivateAssets="all" />
     <PackageReference Include="Newtonsoft.Json" />
     <PackageReference Include="NuGet.Packaging" />
     <PackageReference Include="Serilog" />
diff --git a/source/Nuke.Utilities.IO.Compression/Nuke.Utilities.IO.Compression.csproj b/source/Nuke.Utilities.IO.Compression/Nuke.Utilities.IO.Compression.csproj
index 7fe82a8c6..cf1b0829c 100644
--- a/source/Nuke.Utilities.IO.Compression/Nuke.Utilities.IO.Compression.csproj
+++ b/source/Nuke.Utilities.IO.Compression/Nuke.Utilities.IO.Compression.csproj
@@ -9,6 +9,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="JetBrains.Annotations" PrivateAssets="all" />
     <PackageReference Include="SharpZipLib" />
   </ItemGroup>
 
diff --git a/source/Nuke.Utilities.IO.Globbing/Nuke.Utilities.IO.Globbing.csproj b/source/Nuke.Utilities.IO.Globbing/Nuke.Utilities.IO.Globbing.csproj
index a43acbc68..6e6c18a50 100644
--- a/source/Nuke.Utilities.IO.Globbing/Nuke.Utilities.IO.Globbing.csproj
+++ b/source/Nuke.Utilities.IO.Globbing/Nuke.Utilities.IO.Globbing.csproj
@@ -10,6 +10,7 @@
 
   <ItemGroup>
     <PackageReference Include="Glob" />
+    <PackageReference Include="JetBrains.Annotations" PrivateAssets="all" />
   </ItemGroup>
 
 </Project>
diff --git a/source/Nuke.Utilities.Net/Nuke.Utilities.Net.csproj b/source/Nuke.Utilities.Net/Nuke.Utilities.Net.csproj
index 6f3aeb095..938d355f1 100644
--- a/source/Nuke.Utilities.Net/Nuke.Utilities.Net.csproj
+++ b/source/Nuke.Utilities.Net/Nuke.Utilities.Net.csproj
@@ -10,7 +10,6 @@
 
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" />
-    <PackageReference Include="System.Net.Http" />
   </ItemGroup>
 
 </Project>
diff --git a/source/Nuke.Utilities.Tests/Nuke.Utilities.Tests.csproj b/source/Nuke.Utilities.Tests/Nuke.Utilities.Tests.csproj
index 5842a1073..451723651 100644
--- a/source/Nuke.Utilities.Tests/Nuke.Utilities.Tests.csproj
+++ b/source/Nuke.Utilities.Tests/Nuke.Utilities.Tests.csproj
@@ -12,4 +12,8 @@
     <ProjectReference Include="..\Nuke.Utilities.Text.Yaml\Nuke.Utilities.Text.Yaml.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="JetBrains.Annotations" PrivateAssets="all" />
+  </ItemGroup>
+
 </Project>
diff --git a/source/Nuke.Utilities.Text.Json/Nuke.Utilities.Text.Json.csproj b/source/Nuke.Utilities.Text.Json/Nuke.Utilities.Text.Json.csproj
index 938d355f1..e5ed2b70a 100644
--- a/source/Nuke.Utilities.Text.Json/Nuke.Utilities.Text.Json.csproj
+++ b/source/Nuke.Utilities.Text.Json/Nuke.Utilities.Text.Json.csproj
@@ -9,6 +9,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="JetBrains.Annotations" PrivateAssets="all" />
     <PackageReference Include="Newtonsoft.Json" />
   </ItemGroup>
 
diff --git a/source/Nuke.Utilities.Text.Yaml/Nuke.Utilities.Text.Yaml.csproj b/source/Nuke.Utilities.Text.Yaml/Nuke.Utilities.Text.Yaml.csproj
index aefd1f0b9..ab6a36dc3 100644
--- a/source/Nuke.Utilities.Text.Yaml/Nuke.Utilities.Text.Yaml.csproj
+++ b/source/Nuke.Utilities.Text.Yaml/Nuke.Utilities.Text.Yaml.csproj
@@ -9,6 +9,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="JetBrains.Annotations" PrivateAssets="all" />
     <PackageReference Include="YamlDotNet" />
   </ItemGroup>
 
diff --git a/source/Nuke.Utilities/Nuke.Utilities.csproj b/source/Nuke.Utilities/Nuke.Utilities.csproj
index c4ed59fc1..9557e6e2e 100644
--- a/source/Nuke.Utilities/Nuke.Utilities.csproj
+++ b/source/Nuke.Utilities/Nuke.Utilities.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" />
+    <PackageReference Include="JetBrains.Annotations" PrivateAssets="all" />
   </ItemGroup>
 
 </Project>