Skip to content

Commit

Permalink
Update, cleanup, switch to .NET 9
Browse files Browse the repository at this point in the history
  • Loading branch information
halgari committed Nov 13, 2024
1 parent 40e9590 commit 8831515
Show file tree
Hide file tree
Showing 10 changed files with 52 additions and 53 deletions.
9 changes: 9 additions & 0 deletions CVE.Ignore.props
Original file line number Diff line number Diff line change
@@ -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>
6 changes: 1 addition & 5 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>

Expand All @@ -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>
12 changes: 12 additions & 0 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<Project>

<ItemGroup>

<PackageVersion Include="DynamicData" Version="9.0.4" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
Expand All @@ -9,6 +11,10 @@
<PackageVersion Include="System.Reactive" Version="6.0.1" />
<PackageVersion Include="TransparentValueObjects" Version="1.0.1" 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.11.0" />
<PackageVersion Include="R3" Version="1.2.9" />
<PackageVersion Include="System.IO.Hashing" Version="8.0.0" />
Expand All @@ -19,6 +25,7 @@
</PackageVersion>
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" />
<PackageVersion Include="System.CodeDom" Version="8.0.0" />
<PackageVersion Include="Verify" Version="28.2.1" />
<PackageVersion Include="Verify.SourceGenerators" Version="2.5.0" />
<PackageVersion Include="Verify.Xunit" Version="28.2.0" />
<PackageVersion Include="FluentAssertions" Version="6.12.2" />
Expand All @@ -30,12 +37,17 @@
<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.0.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.13.1" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -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>
3 changes: 2 additions & 1 deletion benchmarks/OneBillionDatomsTest/OneBillionDatomsTest.csproj
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

<ItemGroup>
<PackageReference Include="DynamicData"/>
<PackageReference Include="JetBrains.Annotations" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions"/>
<PackageReference Include="NexusMods.Paths"/>
<PackageReference Include="R3"/>
Expand Down
39 changes: 14 additions & 25 deletions tests/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -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>
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
<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"/>
<PackageReference Include="Verify.SourceGenerators"/>
<PackageReference Include="Verify.Xunit"/>
<PackageReference Remove="Xunit.DependencyInjection"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,7 @@
<RootNamespace>NexusMods.MnemonicDB.Storage.Tests</RootNamespace>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>


<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>

<IsPackable>false</IsPackable>
<IsTestProject>true</IsTestProject>
</PropertyGroup>


<ItemGroup>
<ProjectReference Include="..\..\src\NexusMods.MnemonicDB\NexusMods.MnemonicDB.csproj" />
<ProjectReference Include="..\NexusMods.MnemonicDB.TestModel\NexusMods.MnemonicDB.TestModel.csproj"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\NexusMods.MnemonicDB.Abstractions\NexusMods.MnemonicDB.Abstractions.csproj"/>
<ProjectReference Include="..\..\src\NexusMods.MnemonicDB.SourceGenerator\NexusMods.MnemonicDB.SourceGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
Expand Down

0 comments on commit 8831515

Please sign in to comment.