Merge pull request #59 from Nexus-Mods/cpm

Use CPM and net8
Nexus-Mods · Nov 12, 2024 · 786075a · 786075a
2 parents 371b035 + 79f5f4c
commit 786075a
Show file tree

Hide file tree

Showing 14 changed files with 65 additions and 55 deletions.
diff --git a/.github/workflows/compare-to-meta.yaml b/.github/workflows/compare-to-meta.yaml
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@main
+    uses: Nexus-Mods/NexusMods.App.Meta/.github/workflows/dotnet-build-and-test-with-osx.yaml@ae64a3be780a74e94b59ee463a413083013c8b0c
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
-        <IsPackable>false</IsPackable>
+        <TargetFramework>net8.0</TargetFramework>
+        <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     </PropertyGroup>
 
     <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
@@ -21,6 +21,6 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="JetBrains.Annotations" Version="2023.*" PrivateAssets="all" />
+        <PackageReference Include="JetBrains.Annotations" PrivateAssets="all" />
     </ItemGroup>
 </Project>
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -0,0 +1,29 @@
+<Project>
+  <ItemGroup>
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
+    <PackageVersion Include="Reloaded.Memory" Version="9.4.2" />
+    <PackageVersion Include="Reloaded.Memory.Extensions" Version="9.4.2" />
+    <PackageVersion Include="TransparentValueObjects" Version="1.0.1" />
+    <PackageVersion Include="BenchmarkDotNet" Version="0.14.0" />
+    <PackageVersion Include="NexusMods.Archives.Nx" Version="0.6.1" />
+    <PackageVersion Include="JetBrains.Annotations" Version="2024.3.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageVersion Include="coverlet.collector" Version="6.0.2" />
+    <PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" />
+    <PackageVersion Include="AutoFixture" Version="4.18.1" />
+    <PackageVersion Include="AutoFixture.Xunit2" Version="4.18.1" />
+    <PackageVersion Include="FluentAssertions" Version="6.12.2" />
+    <PackageVersion Include="FluentAssertions.OneOf" Version="0.0.5" />
+    <PackageVersion Include="FluentAssertions.Analyzers" Version="0.34.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageVersion>
+    <PackageVersion Include="xunit" Version="2.9.2" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
+    <PackageVersion Include="Xunit.SkippableFact" Version="1.4.13" />
+    <PackageVersion Include="Xunit.DependencyInjection" Version="9.6.0" />
+    <PackageVersion Include="Xunit.DependencyInjection.Logging" Version="9.0.0" />
+    <PackageVersion Include="Xunit.DependencyInjection.SkippableFact" Version="9.0.0" />
+    <PackageVersion Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
+  </ItemGroup>
+</Project>
diff --git a/NexusMods.Paths.sln b/NexusMods.Paths.sln
@@ -12,6 +12,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".solutionItems", ".solution
 		NuGet.Build.props = NuGet.Build.props
 		icon.png = icon.png
 		mkdocs.yml = mkdocs.yml
+		Directory.Packages.props = Directory.Packages.props
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{0377EBE6-F147-4233-86AD-32C821B9567E}"

diff --git a/NuGet.Build.props b/NuGet.Build.props
@@ -31,8 +31,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/extern/meta b/extern/meta
diff --git a/src/Extensions/NexusMods.Paths.Extensions.Nx/NexusMods.Paths.Extensions.Nx.csproj b/src/Extensions/NexusMods.Paths.Extensions.Nx/NexusMods.Paths.Extensions.Nx.csproj
@@ -6,11 +6,10 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="NexusMods.Archives.Nx" Version="0.5.0" />
+        <PackageReference Include="NexusMods.Archives.Nx" />
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\..\NexusMods.Paths\NexusMods.Paths.csproj" />
+        <ProjectReference Include="..\..\NexusMods.Paths\NexusMods.Paths.csproj" />
     </ItemGroup>
-
 </Project>
diff --git a/src/NexusMods.Paths.Benchmarks/NexusMods.Paths.Benchmarks.csproj b/src/NexusMods.Paths.Benchmarks/NexusMods.Paths.Benchmarks.csproj
@@ -2,18 +2,15 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net8.0</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="BenchmarkDotNet" Version="0.13.8" />
+      <PackageReference Include="BenchmarkDotNet" />
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\NexusMods.Paths\NexusMods.Paths.csproj" />
+        <ProjectReference Include="..\NexusMods.Paths\NexusMods.Paths.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/src/NexusMods.Paths.TestingHelpers/NexusMods.Paths.TestingHelpers.csproj b/src/NexusMods.Paths.TestingHelpers/NexusMods.Paths.TestingHelpers.csproj
@@ -2,7 +2,7 @@
     <Import Project="$([MSBuild]::GetPathOfFileAbove('NuGet.Build.props', '$(MSBuildThisFileDirectory)../'))" />
 
     <ItemGroup>
-        <PackageReference Include="AutoFixture.Xunit2" Version="4.18.*" />
+        <PackageReference Include="AutoFixture.Xunit2" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/NexusMods.Paths/NexusMods.Paths.csproj b/src/NexusMods.Paths/NexusMods.Paths.csproj
@@ -6,9 +6,9 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
-        <PackageReference Include="Reloaded.Memory" Version="9.4.1" />
-        <PackageReference Include="TransparentValueObjects" PrivateAssets="all" OutputItemType="Analyzer" ReferenceOutputAssembly="false" Version="1.0.1" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
+        <PackageReference Include="Reloaded.Memory"/>
+        <PackageReference Include="TransparentValueObjects" PrivateAssets="all" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/NexusMods.Paths/RelativePath.cs b/src/NexusMods.Paths/RelativePath.cs
@@ -194,7 +194,8 @@ public RelativePath[] GetParts()
             return Array.Empty<RelativePath>();
 
         // Count the number of parts in the path based on the directory separator character
-        var partCount = path.Count(PathHelpers.DirectorySeparatorChar); // This operation is SIMD accelerated
+        // ReSharper disable once RedundantNameQualifier
+        var partCount = Reloaded.Memory.Extensions.SpanExtensions.Count(path, PathHelpers.DirectorySeparatorChar);
 
         // Allocate an array to hold the parts
         var parts = GC.AllocateUninitializedArray<RelativePath>(partCount + 1);

diff --git a/src/NexusMods.Paths/Utilities/PathHelpers.cs b/src/NexusMods.Paths/Utilities/PathHelpers.cs
@@ -97,7 +97,8 @@ public static bool IsSanitized(ReadOnlySpan<char> path, IOSInformation os, bool
         if (path.DangerousGetReferenceAt(path.Length - 1) == DirectorySeparatorChar) return false;
 
         // Paths on Windows that use backwards slashes '\' instead of forward ones are invalid.
-        if (path.Count('\\') != 0) return false;
+        // ReSharper disable once RedundantNameQualifier
+        if (Reloaded.Memory.Extensions.SpanExtensions.Count(path, '\\') != 0) return false;
 
         // Everything else is valid.
         return true;
@@ -124,7 +125,8 @@ public static string Sanitize(ReadOnlySpan<char> path, IOSInformation os)
         if (IsSanitized(path, os)) return path.ToString();
 
         // Paths without backslashes only need to be checked for trailing directory separators.
-        if (path.Count('\\') == 0) return RemoveTrailingDirectorySeparator(path).ToString();
+        // ReSharper disable once RedundantNameQualifier
+        if (Reloaded.Memory.Extensions.SpanExtensions.Count(path, '\\') == 0) return RemoveTrailingDirectorySeparator(path).ToString();
 
         // Paths with backslashes instead of forward slashes need to be fixed.
         var buffer = path.Length > 512
@@ -547,7 +549,8 @@ public static string ReplaceExtension(string oldPath, string newExtension)
     public static int GetDirectoryDepth(ReadOnlySpan<char> path, IOSInformation os)
     {
         DebugAssertIsSanitized(path, os);
-        return path.Count(DirectorySeparatorChar);
+        // ReSharper disable once RedundantNameQualifier
+        return Reloaded.Memory.Extensions.SpanExtensions.Count(path, DirectorySeparatorChar);
     }
 
     /// <summary>

diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
@@ -7,43 +7,38 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Moq" Version="4.*" />
+        <PackageReference Include="AutoFixture" />
+        <PackageReference Include="AutoFixture.Xunit2"/>
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="AutoFixture" Version="4.*" />
-        <PackageReference Include="AutoFixture.AutoMoq" Version="4.*" />
-        <PackageReference Include="AutoFixture.Xunit2" Version="4.*" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <PackageReference Include="FluentAssertions" Version="6.*" />
-        <PackageReference Include="FluentAssertions.OneOf" Version="0.0.5" />
-        <PackageReference Include="FluentAssertions.Analyzers" Version="0.18.0">
+        <PackageReference Include="FluentAssertions" />
+        <PackageReference Include="FluentAssertions.OneOf"/>
+        <PackageReference Include="FluentAssertions.Analyzers" >
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="xunit" Version="2.4.*" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.*">
+        <PackageReference Include="xunit" />
+        <PackageReference Include="xunit.runner.visualstudio">
             <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.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.*">
+        <PackageReference Include="Microsoft.NET.Test.Sdk" />
+        <PackageReference Include="coverlet.collector">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="GitHubActionsTestLogger" Version="2.*">
+        <PackageReference Include="GitHubActionsTestLogger">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>