build: Clean up unused project references

4 months ago · 4dc026ec94
parent 8cf15365df
commit 4dc026ec94
16 changed files with 41 additions and 29 deletions
--- a/Directory.Build.props
+++ b/Directory.Build.props
@ -6,7 +6,9 @@
    <ImplicitUsings>enable</ImplicitUsings>
    <DebugType>embedded</DebugType>
    <AnalysisMode>AllEnabledByDefault</AnalysisMode>
-    <GitVersionBaseDirectory>$(MSBuildThisFileDirectory)</GitVersionBaseDirectory>
+    <RepositoryRoot>$(MSBuildThisFileDirectory)</RepositoryRoot>
+    <TestDirectory>$(RepositoryRoot)tests\</TestDirectory>
+    <GitVersionBaseDirectory>$(RepositoryRoot)</GitVersionBaseDirectory>
    <!--<DisableGitVersionTask>true</DisableGitVersionTask>-->
  </PropertyGroup>

@ -23,4 +25,24 @@
  <ItemGroup Condition="!$(ProjectName.EndsWith('.Tests'))">
    <InternalsVisibleTo Include="$(AssemblyName).Tests" />
  </ItemGroup>
+
+  <!-- ReferenceTrimmer - run build with /p:EnableReferenceTrimmer=true to enable -->
+  <PropertyGroup Label="ReferenceTrimmer">
+    <EnableReferenceTrimmer Condition=" '$(EnableReferenceTrimmer)' == '' ">false</EnableReferenceTrimmer>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(EnableReferenceTrimmer)' == 'true' and '$(GenerateDocumentationFile)' != 'true' " Label="ReferenceTrimmer">
+    <!-- Documentation file generation is required for more accurate C# detection. -->
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+
+    <!-- Suppress XML doc comment issues to avoid errors during ReferenceTrimmer:
+         - CS0419: Ambiguous reference in cref attribute
+         - CS1570: XML comment has badly formed XML
+         - CS1573: Parameter has no matching param tag in the XML comment
+         - CS1574: XML comment has cref attribute that could not be resolved
+         - CS1584: XML comment has syntactically incorrect cref attribute
+         - CS1591: Missing XML comment for publicly visible type or member
+         - SA1602: Enumeration items should be documented
+    -->
+    <NoWarn>$(NoWarn);419;1570;1573;1574;1584;1591;SA1602</NoWarn>
+  </PropertyGroup>
 </Project>
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@ -2,8 +2,4 @@
  <ItemGroup Condition="$(ProjectName.EndsWith('.Tests'))">
    <None Remove="TestResults/**/*" />
  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Update="JetBrains.Annotations" PrivateAssets="All" />
-  </ItemGroup>
 </Project>
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@ -15,8 +15,7 @@
    <PackageVersion Include="CliWrap" Version="3.6.6" />
    <PackageVersion Include="FluentValidation" Version="11.9.1" />
    <PackageVersion Include="Flurl.Http" Version="4.0.2" />
-    <PackageVersion Include="GitVersion.MsBuild" Version="6.0.0-beta.7" />
-    <PackageVersion Include="JetBrains.Annotations" Version="2023.3.0" />
+    <PackageVersion Include="GitVersion.MsBuild" Version="6.0.0-beta.7" PrivateAssets="All" />
    <PackageVersion Include="MudBlazor" Version="6.19.1" />
    <PackageVersion Include="ReactiveUI.Blazor" Version="20.1.1" />
    <PackageVersion Include="Serilog" Version="3.1.1" />
@ -39,6 +38,12 @@
    <PackageVersion Include="YamlDotNet" Version="15.1.4" />
  </ItemGroup>
  <!-- Unit Test Packages -->
+  <!--
+    Note that GlobalPackageReference doesn't work for test dependencies. Has something to do with
+    the way IncludeAssets doesn't work with assemblies, only build and analyzer related packages.
+
+    See: https://github.com/NuGet/docs.microsoft.com-nuget/issues/3108
+  -->
  <ItemGroup>
    <PackageVersion Include="AgileObjects.ReadableExpressions" Version="4.1.1" />
    <PackageVersion Include="AutofacContrib.NSubstitute" Version="7.0.0" />
@ -65,4 +70,10 @@
    <PackageVersion Include="System.Net.Http" Version="4.3.4" />
    <PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
  </ItemGroup>
-</Project>
+  <!-- Global Package References -->
+  <ItemGroup>
+    <GlobalPackageReference Include="ReferenceTrimmer" Version="3.3.6" />
+    <!-- Cannot use the official Jetbrains.Annotations package because it doesn't work with GlobalPackageReference -->
+    <GlobalPackageReference Include="Rocket.Surgery.MSBuild.JetBrains.Annotations" Version="1.2.1" />
+  </ItemGroup>
+</Project>
--- a/src/Recyclarr.Cli/Recyclarr.Cli.csproj
+++ b/src/Recyclarr.Cli/Recyclarr.Cli.csproj
@ -8,7 +8,6 @@
    <PackageReference Include="Autofac" />
    <PackageReference Include="Autofac.Extras.AggregateService" />
    <PackageReference Include="Autofac.Extras.Ordering" />
-    <PackageReference Include="JetBrains.Annotations" />
    <PackageReference Include="Serilog" />
    <PackageReference Include="Serilog.Expressions" />
    <PackageReference Include="Serilog.Sinks.Console" />
@ -25,9 +24,7 @@

  <!-- Following found during vulerabilities Code Scan  -->
  <ItemGroup>
-    <PackageReference Include="GitVersion.MsBuild" PrivateAssets="All" />
-    <PackageReference Include="System.Net.Http" />
-    <PackageReference Include="System.Text.RegularExpressions" />
+    <PackageReference Include="GitVersion.MsBuild" />
  </ItemGroup>

  <ItemGroup>
--- a/src/Recyclarr.Common/Recyclarr.Common.csproj
+++ b/src/Recyclarr.Common/Recyclarr.Common.csproj
@ -2,14 +2,11 @@
  <ItemGroup>
    <PackageReference Include="Autofac" />
    <PackageReference Include="FluentValidation" />
-    <PackageReference Include="Flurl.Http" />
-    <PackageReference Include="JetBrains.Annotations" />
    <PackageReference Include="Serilog" />
    <PackageReference Include="Spectre.Console" />
    <PackageReference Include="System.Reactive" />
    <PackageReference Include="TestableIO.System.IO.Abstractions.Extensions" />
    <PackageReference Include="TestableIO.System.IO.Abstractions.Wrappers" />
    <PackageReference Include="TestableIO.System.IO.Abstractions" />
-    <PackageReference Include="YamlDotNet" />
  </ItemGroup>
 </Project>
--- a/src/Recyclarr.Config/Recyclarr.Config.csproj
+++ b/src/Recyclarr.Config/Recyclarr.Config.csproj
@ -4,7 +4,6 @@
    <PackageReference Include="AutoMapper" />
    <PackageReference Include="AutoMapper.Contrib.Autofac.DependencyInjection" />
    <PackageReference Include="FluentValidation" />
-    <PackageReference Include="JetBrains.Annotations" />
    <PackageReference Include="SuperLinq" />
    <PackageReference Include="YamlDotNet" />
  </ItemGroup>
--- a/src/Recyclarr.Gui/Recyclarr.Gui.csproj
+++ b/src/Recyclarr.Gui/Recyclarr.Gui.csproj
@ -6,8 +6,7 @@
    <PackageReference Include="Autofac" />
    <PackageReference Include="Autofac.Extensions.DependencyInjection" />
    <PackageReference Include="AutofacSerilogIntegration" />
-    <PackageReference Include="GitVersion.MsBuild" PrivateAssets="All" />
-    <PackageReference Include="JetBrains.Annotations" />
+    <PackageReference Include="GitVersion.MsBuild" />
    <PackageReference Include="MudBlazor" />
    <PackageReference Include="ReactiveUI.Blazor" />
    <PackageReference Include="Serilog" />
--- a/src/Recyclarr.Http/Recyclarr.Http.csproj
+++ b/src/Recyclarr.Http/Recyclarr.Http.csproj
@ -2,7 +2,6 @@
  <ItemGroup>
    <PackageReference Include="Autofac" />
    <PackageReference Include="Flurl.Http" />
-    <PackageReference Include="JetBrains.Annotations" />
    <PackageReference Include="Serilog" />
  </ItemGroup>
 </Project>
--- a/src/Recyclarr.Json/Recyclarr.Json.csproj
+++ b/src/Recyclarr.Json/Recyclarr.Json.csproj
@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <ItemGroup>
    <PackageReference Include="Autofac" />
-    <PackageReference Include="JetBrains.Annotations" />
    <PackageReference Include="Serilog" />
    <PackageReference Include="System.Text.Json" />
    <PackageReference Include="SystemTextJson.JsonDiffPatch" />
--- a/src/Recyclarr.Platform/Recyclarr.Platform.csproj
+++ b/src/Recyclarr.Platform/Recyclarr.Platform.csproj
@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <ItemGroup>
+    <PackageReference Include="Autofac" />
    <PackageReference Include="TestableIO.System.IO.Abstractions" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Recyclarr.Common\Recyclarr.Common.csproj" />
+    <PackageReference Include="TestableIO.System.IO.Abstractions.Extensions" />
  </ItemGroup>
 </Project>
--- a/src/Recyclarr.ServarrApi/Recyclarr.ServarrApi.csproj
+++ b/src/Recyclarr.ServarrApi/Recyclarr.ServarrApi.csproj
@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <ItemGroup>
    <PackageReference Include="Flurl.Http" />
-    <PackageReference Include="JetBrains.Annotations" />
    <PackageReference Include="Serilog" />
  </ItemGroup>
  <ItemGroup>
--- a/src/Recyclarr.Settings/Recyclarr.Settings.csproj
+++ b/src/Recyclarr.Settings/Recyclarr.Settings.csproj
@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" />
    <PackageReference Include="Serilog" />
  </ItemGroup>
  <ItemGroup>
--- a/src/Recyclarr.TrashGuide/Recyclarr.TrashGuide.csproj
+++ b/src/Recyclarr.TrashGuide/Recyclarr.TrashGuide.csproj
@ -3,7 +3,6 @@
    <ProjectReference Include="..\Recyclarr.Repo\Recyclarr.Repo.csproj" />
  </ItemGroup>
  <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" />
    <PackageReference Include="SuperLinq" />
    <PackageReference Include="TestableIO.System.IO.Abstractions" />
  </ItemGroup>
--- a/src/Recyclarr.Yaml/Recyclarr.Yaml.csproj
+++ b/src/Recyclarr.Yaml/Recyclarr.Yaml.csproj
@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <ItemGroup>
    <PackageReference Include="Autofac" />
-    <PackageReference Include="JetBrains.Annotations" />
    <PackageReference Include="YamlDotNet" />
  </ItemGroup>
  <ItemGroup>
--- a/tests/Recyclarr.TestLibrary/Recyclarr.TestLibrary.csproj
+++ b/tests/Recyclarr.TestLibrary/Recyclarr.TestLibrary.csproj
@ -3,7 +3,6 @@
    <ProjectReference Include="..\..\src\Recyclarr.Common\Recyclarr.Common.csproj" />
  </ItemGroup>
  <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" />
    <PackageReference Include="Serilog.Sinks.Console" />
  </ItemGroup>
 </Project>
--- a/tests/Recyclarr.Tests.TestLibrary/Recyclarr.Tests.TestLibrary.csproj
+++ b/tests/Recyclarr.Tests.TestLibrary/Recyclarr.Tests.TestLibrary.csproj
@ -2,6 +2,5 @@
  <ItemGroup>
    <ProjectReference Include="..\..\src\Recyclarr.Config\Recyclarr.Config.csproj" />
    <ProjectReference Include="..\..\src\Recyclarr.TrashGuide\Recyclarr.TrashGuide.csproj" />
-    <ProjectReference Include="..\Recyclarr.TestLibrary\Recyclarr.TestLibrary.csproj" />
  </ItemGroup>
 </Project>