Merge pull request #114 from Nexus-Mods/update-and-cleanup

Update and cleanup
Nexus-Mods · Nov 13, 2024 · f4a11ce · f4a11ce
2 parents 00ddc0c + 7f080c0
commit f4a11ce
Show file tree

Hide file tree

Showing 17 changed files with 180 additions and 189 deletions.
diff --git a/.github/workflows/dotnet-build-and-test.yaml b/.github/workflows/dotnet-build-and-test.yaml
@@ -16,4 +16,4 @@ on:
 
 jobs:
   build-and-test:
-    uses: Nexus-Mods/NexusMods.App.Meta/.github/workflows/dotnet-build-and-test-with-osx.yaml@9c4844439c53f8b8b9f64fb707c91b469238b15e
+    uses: Nexus-Mods/NexusMods.App.Meta/.github/workflows/dotnet-build-and-test-with-osx.yaml@main
diff --git a/CVE.Ignore.props b/CVE.Ignore.props
@@ -0,0 +1,9 @@
+<Project>
+    <ItemGroup>
+        <!-- Suppress advisories that are not relevant to this project. Be sure to include a reason for each suppression. -->
+        <NuGetAuditSuppress Include="https://github.com/advisories/GHSA-7jgj-8wvc-jh57"  Reason="Only affects .NET Core platforms, not .NET 8+, and this project targets .NET 8+"/>
+        <NuGetAuditSuppress Include="https://github.com/advisories/GHSA-8g4q-xg66-9fp4" Reason="Possible source of DoS, but this is a test project and does not accept input from untrusted sources."/>
+        <NuGetAuditSuppress Include="https://github.com/advisories/GHSA-cmhx-cq75-c4mj" Reason="Possible source of DoS, but this is a test project and does not accept input from untrusted sources."/>
+        <NuGetAuditSuppress Include="https://github.com/advisories/GHSA-hh2w-p6rv-4g7w" Reason="Possible source of DoS, but this is a test project and does not accept input from untrusted sources."/>
+    </ItemGroup>
+</Project>
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <IsPackable>false</IsPackable>
     </PropertyGroup>
 
@@ -19,8 +19,4 @@
         <!-- SYSLIB1006: Multiple logging methods cannot use the same event ID -->
         <NoWarn>$(NoWarn);SYSLIB1006</NoWarn>
     </PropertyGroup>
-
-    <ItemGroup>
-        <PackageReference Include="JetBrains.Annotations" Version="2023.*" PrivateAssets="all" />
-    </ItemGroup>
 </Project>
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -0,0 +1,50 @@
+<Project>
+  <ItemGroup>
+    <PackageVersion Include="DynamicData" Version="9.0.4" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="9.0.0" />
+    <PackageVersion Include="Reloaded.Memory" Version="9.4.2" />
+    <PackageVersion Include="RocksDB" Version="9.4.0.50294" />
+    <PackageVersion Include="System.Reactive" Version="6.0.1" />
+    <PackageVersion Include="TransparentValueObjects" Version="1.0.2" PrivateAssets="all" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
+    <PackageVersion Include="JetBrains.Annotations" Version="2024.3.0" />
+    <PackageVersion Include="JetBrains.Profiler.Api" Version="1.4.8" />
+    <PackageVersion Include="Argon" Version="0.24.2" />
+    <PackageVersion Include="FluentAssertions.OneOf" Version="0.0.5" />
+    <PackageVersion Include="NexusMods.Paths" Version="0.15.0" />
+    <PackageVersion Include="R3" Version="1.2.9" />
+    <PackageVersion Include="System.IO.Hashing" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="all" />
+    <PackageVersion Include="Weave" Version="2.1.0" OutputItemType="Analyzer" ReferenceOutputAssembly="false">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageVersion>
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" />
+    <PackageVersion Include="System.CodeDom" Version="9.0.0" />
+    <PackageVersion Include="Verify" Version="28.2.1" />
+    <PackageVersion Include="Verify.SourceGenerators" Version="2.5.0" />
+    <PackageVersion Include="Verify.Xunit" Version="28.2.1" />
+    <PackageVersion Include="FluentAssertions" Version="6.12.2" />
+    <PackageVersion Include="FluentAssertions.Analyzers" Version="0.34.1" PrivateAssets="all" OutputItemType="Analyzer" ReferenceOutputAssembly="false">
+      <IncludeAssets>runtime; build; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageVersion>
+    <PackageVersion Include="xunit" Version="2.9.2" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" PrivateAssets="all" OutputItemType="Analyzer" ReferenceOutputAssembly="false">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageVersion>
+    <PackageVersion Include="Xunit.SkippableFact" Version="1.4.13" />
+    <PackageVersion Include="NexusMods.Hashing.xxHash3" Version="3.0.3" />
+    <PackageVersion Include="Xunit.DependencyInjection" Version="9.6.0" />
+    <PackageVersion Include="Xunit.DependencyInjection.SkippableFact" Version="9.0.0" />
+    <PackageVersion Include="Xunit.DependencyInjection.Logging" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageVersion Include="coverlet.collector" Version="6.0.2" PrivateAssets="all" OutputItemType="Analyzer" ReferenceOutputAssembly="false">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageVersion>
+    <PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" PrivateAssets="all" OutputItemType="Analyzer" ReferenceOutputAssembly="false">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageVersion>
+    <PackageVersion Include="BenchmarkDotNet" Version="0.14.0" />
+  </ItemGroup>
+</Project>
diff --git a/NuGet.Build.props b/NuGet.Build.props
@@ -12,6 +12,8 @@
         <PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
         <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
 
+        <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+
         <!-- This is the URL to the main project, not the individual package. -->
         <PackageProjectUrl>https://github.com/Nexus-Mods/NexusMods.App</PackageProjectUrl>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -31,8 +33,4 @@
         <None Include="$(MSBuildThisFileDirectory)icon.png" Pack="true" PackagePath="assets" />
         <None Include="$(MSBuildThisFileDirectory)README.md" Pack="true" PackagePath="docs" />
     </ItemGroup>
-
-    <ItemGroup>
-        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.*" PrivateAssets="all" />
-    </ItemGroup>
 </Project>
diff --git a/benchmarks/NexusMods.MnemonicDB.Benchmarks/NexusMods.MnemonicDB.Benchmarks.csproj b/benchmarks/NexusMods.MnemonicDB.Benchmarks/NexusMods.MnemonicDB.Benchmarks.csproj
@@ -1,22 +1,27 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
+    <Import Project="$([MSBuild]::GetPathOfFileAbove('CVE.Ignore.props', '$(MSBuildThisFileDirectory)../'))"/>
+
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
+        <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="BenchmarkDotNet" Version="0.14.0" />
-        <PackageReference Include="JetBrains.Profiler.Api" Version="1.4.8" />
-        <PackageReference Update="JetBrains.Annotations" Version="2024.3.0" />
+        <PackageReference Include="BenchmarkDotNet"/>
+        <PackageReference Include="JetBrains.Profiler.Api"/>
+        <PackageReference Update="JetBrains.Annotations"/>
     </ItemGroup>
 
     <ItemGroup>
         <ProjectReference Include="..\..\src\NexusMods.MnemonicDB.Abstractions\NexusMods.MnemonicDB.Abstractions.csproj"/>
         <ProjectReference Include="..\..\src\NexusMods.MnemonicDB\NexusMods.MnemonicDB.csproj"/>
         <ProjectReference Include="..\..\tests\NexusMods.MnemonicDB.TestModel\NexusMods.MnemonicDB.TestModel.csproj"/>
     </ItemGroup>
+
+
 
 </Project>
diff --git a/benchmarks/OneBillionDatomsTest/OneBillionDatomsTest.csproj b/benchmarks/OneBillionDatomsTest/OneBillionDatomsTest.csproj
@@ -1,8 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
+    <Import Project="$([MSBuild]::GetPathOfFileAbove('CVE.Ignore.props', '$(MSBuildThisFileDirectory)../'))"/>
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
     </PropertyGroup>

diff --git a/src/NexusMods.MnemonicDB.Abstractions/NexusMods.MnemonicDB.Abstractions.csproj b/src/NexusMods.MnemonicDB.Abstractions/NexusMods.MnemonicDB.Abstractions.csproj
@@ -5,13 +5,14 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="DynamicData" Version="9.0.4" />
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
-        <PackageReference Include="NexusMods.Paths" Version="0.11.0" />
-        <PackageReference Include="R3" Version="1.2.9" />
-        <PackageReference Include="System.IO.Hashing" Version="8.0.0" />
-        <PackageReference Include="TransparentValueObjects" Version="1.0.1" PrivateAssets="all" OutputItemType="Analyzer" ReferenceOutputAssembly="false"/>
-        <PackageReference Update="JetBrains.Annotations" Version="2024.3.0" />
+        <PackageReference Include="DynamicData"/>
+        <PackageReference Include="JetBrains.Annotations" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions"/>
+        <PackageReference Include="NexusMods.Paths"/>
+        <PackageReference Include="R3"/>
+        <PackageReference Include="System.IO.Hashing"/>
+        <PackageReference Include="TransparentValueObjects"/>
+        <PackageReference Update="JetBrains.Annotations"/>
         <ProjectReference Include="..\..\src\NexusMods.MnemonicDB.SourceGenerator\NexusMods.MnemonicDB.SourceGenerator.csproj"  OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
     </ItemGroup>
 

diff --git a/src/NexusMods.MnemonicDB.SourceGenerator/NexusMods.MnemonicDB.SourceGenerator.csproj b/src/NexusMods.MnemonicDB.SourceGenerator/NexusMods.MnemonicDB.SourceGenerator.csproj
@@ -8,13 +8,10 @@
         <InternalsVisibleTo>NexusMods.MnemonicDB.SourceGenerator.Tests</InternalsVisibleTo>
     </PropertyGroup>
     <ItemGroup>
-        <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" />
-        <PackageReference Include="System.CodeDom" Version="8.0.0" />
-        <PackageReference Include="Weave" Version="2.1.0"   OutputItemType="Analyzer" ReferenceOutputAssembly="false"  >
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
-        <PackageReference Update="JetBrains.Annotations" Version="2024.3.0" />
+        <PackageReference Include="Microsoft.CodeAnalysis.CSharp"/>
+        <PackageReference Include="System.CodeDom"/>
+        <PackageReference Include="Weave"/>
+        <PackageReference Include="JetBrains.Annotations"/>
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/NexusMods.MnemonicDB/NexusMods.MnemonicDB.csproj b/src/NexusMods.MnemonicDB/NexusMods.MnemonicDB.csproj
@@ -1,17 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
+    <Import Project="$([MSBuild]::GetPathOfFileAbove('NuGet.Build.props', '$(MSBuildThisFileDirectory)../'))"/>
     <PropertyGroup>
         <RootNamespace>NexusMods.MnemonicDB</RootNamespace>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     </PropertyGroup>
     <ItemGroup>
-        <PackageReference Include="DynamicData" Version="9.0.4" />
-        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
-        <PackageReference Include="Microsoft.Extensions.ObjectPool" Version="8.0.10" />
-        <PackageReference Include="Reloaded.Memory" Version="9.4.2" />
-        <PackageReference Include="RocksDB" Version="9.4.0.50294" />
-        <PackageReference Include="System.Reactive" Version="6.0.1" />
-        <PackageReference Include="TransparentValueObjects" Version="1.0.1" PrivateAssets="all" OutputItemType="Analyzer" ReferenceOutputAssembly="false"/>
-        <PackageReference Update="JetBrains.Annotations" Version="2024.3.0" />
+        <PackageReference Include="DynamicData"/>
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions"/>
+        <PackageReference Include="Microsoft.Extensions.ObjectPool"/>
+        <PackageReference Include="Reloaded.Memory"/>
+        <PackageReference Include="RocksDB"/>
+        <PackageReference Include="System.Reactive"/>
+        <PackageReference Include="TransparentValueObjects"/>
+        <PackageReference Include="JetBrains.Annotations"/>
+        <PackageReference Include="NexusMods.Paths"/>
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\NexusMods.MnemonicDB.Abstractions\NexusMods.MnemonicDB.Abstractions.csproj"/>
@@ -22,5 +25,4 @@
           <DependentUpon>DatomStore.cs</DependentUpon>
         </Compile>
     </ItemGroup>
-    <Import Project="$([MSBuild]::GetPathOfFileAbove('NuGet.Build.props', '$(MSBuildThisFileDirectory)../'))"/>
 </Project>
diff --git a/src/NexusMods.MnemonicDB/Storage/RocksDbBackend/Backend.cs b/src/NexusMods.MnemonicDB/Storage/RocksDbBackend/Backend.cs
@@ -7,6 +7,9 @@
 
 namespace NexusMods.MnemonicDB.Storage.RocksDbBackend;
 
+/// <summary>
+/// Backend for the RocksDB storage engine.
+/// </summary>
 public class Backend : IStoreBackend
 {
     internal RocksDb? Db = null!;

diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
@@ -1,41 +1,30 @@
 <Project>
     <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
-
+    <Import Project="$([MSBuild]::GetPathOfFileAbove('CVE.Ignore.props', '$(MSBuildThisFileDirectory)../'))" />
     <PropertyGroup>
         <IsPackable>false</IsPackable>
         <IsTestProject>true</IsTestProject>
+        <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="FluentAssertions" Version="6.*" />
-        <PackageReference Include="FluentAssertions.OneOf" Version="0.0.5" />
-        <PackageReference Include="FluentAssertions.Analyzers" Version="0.18.0">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
+        <PackageReference Include="FluentAssertions" />
+        <PackageReference Include="FluentAssertions.OneOf" />
+        <PackageReference Include="FluentAssertions.Analyzers"/>
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="xunit" Version="2.9.*" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.8.*">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
-        <PackageReference Include="Xunit.SkippableFact" Version="1.4.*" />
-        <PackageReference Include="Xunit.DependencyInjection" Version="8.*" />
-        <PackageReference Include="Xunit.DependencyInjection.Logging" Version="8.*" />
-        <PackageReference Include="Xunit.DependencyInjection.SkippableFact" Version="8.*" />
+        <PackageReference Include="xunit"/>
+        <PackageReference Include="xunit.runner.visualstudio"/>
+        <PackageReference Include="Xunit.SkippableFact"/>
+        <PackageReference Include="Xunit.DependencyInjection"/>
+        <PackageReference Include="Xunit.DependencyInjection.Logging"/>
+        <PackageReference Include="Xunit.DependencyInjection.SkippableFact"/>
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.*" />
-        <PackageReference Include="coverlet.collector" Version="6.*">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
-        <PackageReference Include="GitHubActionsTestLogger" Version="2.*">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
+        <PackageReference Include="Microsoft.NET.Test.Sdk"/>
+        <PackageReference Include="coverlet.collector"/>
+        <PackageReference Include="GitHubActionsTestLogger"/>
     </ItemGroup>
 </Project>
diff --git a/...usMods.MnemonicDB.SourceGenerator.Tests/NexusMods.MnemonicDB.SourceGenerator.Tests.csproj b/...usMods.MnemonicDB.SourceGenerator.Tests/NexusMods.MnemonicDB.SourceGenerator.Tests.csproj
@@ -1,35 +1,25 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
     <ItemGroup>
         <ProjectReference Include="..\..\src\NexusMods.MnemonicDB.Abstractions\NexusMods.MnemonicDB.Abstractions.csproj" />
         <ProjectReference Include="..\..\src\NexusMods.MnemonicDB.SourceGenerator\NexusMods.MnemonicDB.SourceGenerator.csproj" />
     </ItemGroup>
+
     <ItemGroup>
-        <PackageReference Include="Verify.SourceGenerators" Version="2.5.0" />
-        <PackageReference Include="Verify.Xunit" Version="28.2.0" />
-
+        <PackageReference Include="Verify"/>
+        <PackageReference Include="Verify.SourceGenerators"/>
+        <PackageReference Include="Verify.Xunit"/>
         <PackageReference Remove="Xunit.DependencyInjection"/>
         <PackageReference Remove="Xunit.DependencyInjection.Logging"/>
         <PackageReference Remove="Xunit.DependencyInjection.SkippableFact"/>
-        <PackageReference Update="JetBrains.Annotations" Version="2024.3.0" />
-        <PackageReference Update="FluentAssertions" Version="6.12.2" />
-        <PackageReference Update="FluentAssertions.Analyzers" Version="0.34.1">
-          <PrivateAssets>all</PrivateAssets>
-          <IncludeAssets>runtime; build; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
-        <PackageReference Update="xunit" Version="2.9.2" />
-        <PackageReference Update="xunit.runner.visualstudio" Version="2.8.2">
-          <PrivateAssets>all</PrivateAssets>
-          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
-        <PackageReference Update="Xunit.SkippableFact" Version="1.4.13" />
-        <PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.11.1" />
-        <PackageReference Update="coverlet.collector" Version="6.0.2">
-          <PrivateAssets>all</PrivateAssets>
-          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
-        <PackageReference Update="GitHubActionsTestLogger" Version="2.4.1">
-          <PrivateAssets>all</PrivateAssets>
-          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
+        <PackageReference Update="JetBrains.Annotations"/>
+        <PackageReference Update="FluentAssertions"/>
+        <PackageReference Update="FluentAssertions.Analyzers"/>
+        <PackageReference Update="xunit"/>
+        <PackageReference Update="xunit.runner.visualstudio"/>
+        <PackageReference Update="Xunit.SkippableFact"/>
+        <PackageReference Update="Microsoft.NET.Test.Sdk"/>
+        <PackageReference Update="coverlet.collector"/>
+        <PackageReference Update="GitHubActionsTestLogger" />
     </ItemGroup>
 </Project>