Merge pull request #27 from SchwabenCode/feature/update-nuget-refs

SchwabenCode · Jan 16, 2025 · 251fd16 · 251fd16
2 parents 4ea5490 + 2c319ef
commit 251fd16
Show file tree

Hide file tree

Showing 24 changed files with 117 additions and 130 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -25,7 +25,17 @@ jobs:
         with:
           fetch-depth: 0 # avoid shallow clone so nbgv can do its work.
 
-      - name: 'Install .NET SDK'
+      - name: Setup .NET SDK 7.x
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: '7.x'
+
+      - name: Setup .NET SDK 8.x
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: '8.x'
+
+      - name: 'Install .NET Global.json SDK' # is always the latest
         uses: actions/setup-dotnet@v4
         with:
           global-json-file: ./global.json

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -25,7 +25,7 @@
     </PropertyGroup>
 
     <PropertyGroup Label="Project">
-        <TargetFrameworks>net7.0-windows;net8.0-windows</TargetFrameworks>
+        <TargetFrameworks>net7.0-windows;net8.0-windows;net9.0-windows</TargetFrameworks>
         <RootNamespace>$(GlobalNamespacePrefix).$(MSBuildProjectName)</RootNamespace>
         <AssemblyName>$(GlobalAssemblyNamePrefix).$(MSBuildProjectName)</AssemblyName>
     </PropertyGroup>

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -1,52 +1,46 @@
 <Project>
-    <PropertyGroup>
-        <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-    </PropertyGroup>
-
-    <ItemGroup Label=".NET">
-        <PackageVersion Include="System.Net.Http" Version="4.3.4" />
-        <PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
-        <PackageVersion Include="T4.Build" Version="0.2.4" PrivateAssets="All" />
-    </ItemGroup>
-
-    <ItemGroup Label="Analyzers">
-        <PackageVersion Include="Roslynator.Analyzers" Version="4.3.0">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-        </PackageVersion>
-        <PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.5.0" />
-        <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.5.0" />
-        <PackageVersion Include="Meziantou.Analyzer" Version="2.0.149">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-        </PackageVersion>
-    </ItemGroup>
-
-    <ItemGroup Label="DevOps">
-        <PackageVersion Include="Nerdbank.GitVersioning" Version="3.6.133">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-        </PackageVersion>
-    </ItemGroup>
-
-    <ItemGroup Label="Tests">
-        <PackageVersion Include="Moq" Version="4.20.70" />
-        <PackageVersion Include="MSTest.TestFramework" Version="3.5.1" />
-        <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-        <PackageVersion Include="FluentAssertions" Version="6.12.0" />
-        <PackageVersion Include="NSubstitute" Version="5.0.0" />
-        <PackageVersion Include="xunit" Version="2.6.3" />
-        <PackageVersion Include="xunit.runner.console" Version="2.6.3">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageVersion>
-        <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.5">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageVersion>
-        <PackageVersion Include="coverlet.msbuild" Version="6.0.0">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-        </PackageVersion>
-    </ItemGroup>
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+  </PropertyGroup>
+  <ItemGroup Label=".NET">
+    <PackageVersion Include="System.Net.Http" Version="4.3.4" />
+    <PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
+    <PackageVersion Include="T4.Build" Version="0.2.5" PrivateAssets="All" />
+  </ItemGroup>
+  <ItemGroup Label="Analyzers">
+    <PackageVersion Include="Roslynator.Analyzers" Version="4.3.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageVersion>
+    <PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.5.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.5.0" />
+    <PackageVersion Include="Meziantou.Analyzer" Version="2.0.149">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageVersion>
+  </ItemGroup>
+  <ItemGroup Label="DevOps">
+    <PackageVersion Include="Nerdbank.GitVersioning" Version="3.6.133">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageVersion>
+  </ItemGroup>
+  <ItemGroup Label="Tests">
+    <PackageVersion Include="MSTest.TestFramework" Version="3.5.1" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageVersion Include="NSubstitute" Version="5.3.0" />
+    <PackageVersion Include="xunit" Version="2.9.3" />
+    <PackageVersion Include="xunit.runner.console" Version="2.9.3">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageVersion>
+    <PackageVersion Include="xunit.runner.visualstudio" Version="3.0.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageVersion>
+    <PackageVersion Include="coverlet.msbuild" Version="6.0.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageVersion>
+  </ItemGroup>
 </Project>
diff --git a/global.json b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "9.0.100-preview.7.24407.12"
+    "version": "9.0.102"
   }
 }
diff --git a/src/QuickIO/QuickIODirectory_Attributes.cs b/src/QuickIO/QuickIODirectory_Attributes.cs
@@ -1,4 +1,3 @@
-
 // ------------------------------------------------------------------------------
 // <auto-generated>
 // This code was generated by a T4 template.

diff --git a/src/QuickIO/QuickIODirectory_Attributes_Async.cs b/src/QuickIO/QuickIODirectory_Attributes_Async.cs
@@ -1,4 +1,3 @@
-
 // ------------------------------------------------------------------------------
 // <auto-generated>
 // This code was generated by a T4 template.

diff --git a/src/QuickIO/QuickIODirectory_FileTime.cs b/src/QuickIO/QuickIODirectory_FileTime.cs
@@ -1,4 +1,3 @@
-
 // ------------------------------------------------------------------------------
 // <auto-generated>
 // This code was generated by a T4 template.

diff --git a/src/QuickIO/QuickIODirectory_FileTime_Async.cs b/src/QuickIO/QuickIODirectory_FileTime_Async.cs
@@ -1,4 +1,3 @@
-
 // ------------------------------------------------------------------------------
 // <auto-generated>
 // This code was generated by a T4 template.

diff --git a/src/QuickIO/QuickIODirectory_Root.cs b/src/QuickIO/QuickIODirectory_Root.cs
@@ -1,4 +1,3 @@
-
 // ------------------------------------------------------------------------------
 // <auto-generated>
 // This code was generated by a T4 template.

diff --git a/src/QuickIO/QuickIODirectory_Root_Async.cs b/src/QuickIO/QuickIODirectory_Root_Async.cs
@@ -1,4 +1,3 @@
-
 // ------------------------------------------------------------------------------
 // <auto-generated>
 // This code was generated by a T4 template.

diff --git a/src/QuickIO/QuickIOFile_Attributes.cs b/src/QuickIO/QuickIOFile_Attributes.cs
@@ -1,4 +1,3 @@
-
 // ------------------------------------------------------------------------------
 // <auto-generated>
 // This code was generated by a T4 template.

diff --git a/src/QuickIO/QuickIOFile_Attributes_Async.cs b/src/QuickIO/QuickIOFile_Attributes_Async.cs
@@ -1,4 +1,3 @@
-
 // ------------------------------------------------------------------------------
 // <auto-generated>
 // This code was generated by a T4 template.

diff --git a/src/QuickIO/QuickIOFile_FileTime.cs b/src/QuickIO/QuickIOFile_FileTime.cs
@@ -1,4 +1,3 @@
-
 // ------------------------------------------------------------------------------
 // <auto-generated>
 // This code was generated by a T4 template.

diff --git a/src/QuickIO/QuickIOFile_FileTime_Async.cs b/src/QuickIO/QuickIOFile_FileTime_Async.cs
@@ -1,4 +1,3 @@
-
 // ------------------------------------------------------------------------------
 // <auto-generated>
 // This code was generated by a T4 template.

diff --git a/src/QuickIO/QuickIOFile_Root.cs b/src/QuickIO/QuickIOFile_Root.cs
@@ -1,4 +1,3 @@
-
 // ------------------------------------------------------------------------------
 // <auto-generated>
 // This code was generated by a T4 template.

diff --git a/src/QuickIO/QuickIOFile_Root_Async.cs b/src/QuickIO/QuickIOFile_Root_Async.cs
@@ -1,4 +1,3 @@
-
 // ------------------------------------------------------------------------------
 // <auto-generated>
 // This code was generated by a T4 template.

diff --git a/tests/QuickIO.IntegrationTests/QuickIO.IntegrationTests.csproj b/tests/QuickIO.IntegrationTests/QuickIO.IntegrationTests.csproj
@@ -4,7 +4,6 @@
         <PackageReference Include="System.Net.Http" />
         <PackageReference Include="System.Text.RegularExpressions" />
 
-        <PackageReference Include="Moq" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" />
         <PackageReference Include="xunit" />
         <PackageReference Include="xunit.runner.console">
@@ -15,7 +14,6 @@
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="FluentAssertions" />
         <PackageReference Include="NSubstitute" />
     </ItemGroup>
 

diff --git a/tests/QuickIO.UnitTests/QuickIO.UnitTests.csproj b/tests/QuickIO.UnitTests/QuickIO.UnitTests.csproj
@@ -3,8 +3,7 @@
     <ItemGroup>
         <PackageReference Include="System.Net.Http" />
         <PackageReference Include="System.Text.RegularExpressions" />
-
-        <PackageReference Include="Moq" />
+
         <PackageReference Include="Microsoft.NET.Test.Sdk" />
         <PackageReference Include="xunit" />
         <PackageReference Include="xunit.runner.console">
@@ -15,33 +14,32 @@
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="FluentAssertions" />
         <PackageReference Include="NSubstitute" />
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\..\src\QuickIO\QuickIO.csproj" />
+        <ProjectReference Include="..\..\src\QuickIO\QuickIO.csproj" />
     </ItemGroup>
 
     <ItemGroup>
-      <None Update="TestFiles\DirTimeTest\File.txt">
-        <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      </None>
-      <None Update="TestFiles\HiddenFile.txt">
-        <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      </None>
-      <None Update="TestFiles\Overwrites\Test.txt">
-        <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      </None>
-      <None Update="TestFiles\Overwrites\TestDir\Test.txt">
-        <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      </None>
-      <None Update="TestFiles\ReadonlyFile.txt">
-        <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      </None>
-      <None Update="TestFiles\Test.txt">
-        <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      </None>
+        <None Update="TestFiles\DirTimeTest\File.txt">
+            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+        </None>
+        <None Update="TestFiles\HiddenFile.txt">
+            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+        </None>
+        <None Update="TestFiles\Overwrites\Test.txt">
+            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+        </None>
+        <None Update="TestFiles\Overwrites\TestDir\Test.txt">
+            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+        </None>
+        <None Update="TestFiles\ReadonlyFile.txt">
+            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+        </None>
+        <None Update="TestFiles\Test.txt">
+            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+        </None>
     </ItemGroup>
 
 </Project>
diff --git a/tests/QuickIO.UnitTests/QuickIO_Directory_Enumeration_Tests.cs b/tests/QuickIO.UnitTests/QuickIO_Directory_Enumeration_Tests.cs
@@ -1,5 +1,4 @@
 using System.Diagnostics;
-using FluentAssertions;
 using Xunit;
 
 namespace SchwabenCode.QuickIO.UnitTests;
@@ -96,7 +95,7 @@ public void Directory_AttrFail_Test()
     {
         string testfile = Path.Combine( Path.GetFullPath( "TestFiles/" ), "AttrFail_" + Path.GetRandomFileName( ) );
 
-        Action act = () => QuickIODirectory.GetAttributes(testfile).HasFlag(FileAttributes.Hidden);
-        act.Should().Throw<PathNotFoundException>();
+        Assert.Throws<PathNotFoundException>(() => QuickIODirectory.GetAttributes(testfile).HasFlag(FileAttributes.Hidden));
     }
 }
+
diff --git a/tests/QuickIO.UnitTests/QuickIO_Directory_Tests.cs b/tests/QuickIO.UnitTests/QuickIO_Directory_Tests.cs
@@ -1,5 +1,4 @@
-using FluentAssertions;
-using Xunit;
+using Xunit;
 
 namespace SchwabenCode.QuickIO.UnitTests;
 
@@ -69,16 +68,16 @@ public void Directory_Exists_Test()
     [Fact]
     public void Directory_SetWriteTime_Test()
     {
-        string currentDirc = Path.GetFullPath( "TestFiles/DirTimeTest" );
-        QuickIODirectoryInfo dirInfo = new( currentDirc );
+        string currentDirc = Path.GetFullPath("TestFiles/DirTimeTest");
+        QuickIODirectoryInfo dirInfo = new(currentDirc);
 
-        DateTime newTime = DateTime.Now.AddDays( -1 );
+        DateTime newTime = DateTime.Now.AddDays(-1);
 
         QuickIODirectory.SetAllFileTimesUtc(dirInfo, newTime, newTime, newTime);
 
-        QuickIODirectory.GetLastWriteTime(dirInfo).Should().Be(newTime);
-        QuickIODirectory.GetLastAccessTime(dirInfo).Should().Be(newTime);
-        QuickIODirectory.GetCreationTime(dirInfo).Should().Be(newTime);
+        Assert.Equal(newTime, QuickIODirectory.GetLastWriteTime(dirInfo));
+        Assert.Equal(newTime, QuickIODirectory.GetLastAccessTime(dirInfo));
+        Assert.Equal(newTime, QuickIODirectory.GetCreationTime(dirInfo));
     }
 
     // TODO

diff --git a/tests/QuickIO.UnitTests/QuickIO_File_Tests.cs b/tests/QuickIO.UnitTests/QuickIO_File_Tests.cs
@@ -41,7 +41,7 @@ public void File_AppendAllLines_Test()
         Assert.Equal(test[1], result[1]);
 
         // Append
-        QuickIOFile.AppendAllLines(file, new List<string>() { test[2] });
+        QuickIOFile.AppendAllLines(file, [test[2]]);
         Assert.Equal(test[0], result[0]);
         Assert.Equal(test[1], result[1]);
         Assert.Equal(test[2], result[2]);

diff --git a/tests/QuickIO.UnitTests/QuickIO_PathInfo_Tests.cs b/tests/QuickIO.UnitTests/QuickIO_PathInfo_Tests.cs
@@ -1,5 +1,4 @@
-using FluentAssertions;
-using Xunit;
+using Xunit;
 
 namespace SchwabenCode.QuickIO.UnitTests;
 
@@ -9,36 +8,36 @@ public class QuickIO_PathInfo_Tests
     [Fact]
     public void QuickIOPathInfo_Create_Object_CTor_LocalFile_Test()
     {
-        QuickIOPathInfo pathInfo = new( @"C:\temp\file.txt" );
+        QuickIOPathInfo pathInfo = new(@"C:\temp\file.txt");
 
-        pathInfo.FullName.Should().Be(@"C:\temp\file.txt");
-        pathInfo.FullNameUnc.Should().Be(QuickIOPath.UncLocalPathPrefix + @"C:\temp\file.txt");
+        Assert.Equal(@"C:\temp\file.txt", pathInfo.FullName);
+        Assert.Equal(QuickIOPath.UncLocalPathPrefix + @"C:\temp\file.txt", pathInfo.FullNameUnc);
     }
 
     [Fact]
     public void QuickIOPathInfo_Create_Object_CTor_LocalFolder_Test()
     {
-        QuickIOPathInfo pathInfo = new( @"C:\temp" );
+        QuickIOPathInfo pathInfo = new(@"C:\temp");
 
-        pathInfo.FullName.Should().Be(@"C:\temp");
-        pathInfo.FullNameUnc.Should().Be(QuickIOPath.UncLocalPathPrefix + @"C:\temp");
+        Assert.Equal(@"C:\temp", pathInfo.FullName);
+        Assert.Equal(QuickIOPath.UncLocalPathPrefix + @"C:\temp", pathInfo.FullNameUnc);
     }
 
     [Fact]
     public void QuickIOPathInfo_Create_Object_CTor_ShareFile_Test()
     {
-        QuickIOPathInfo pathInfo = new( @"\\server\share\file.txt" );
+        QuickIOPathInfo pathInfo = new(@"\\server\share\file.txt");
 
-        pathInfo.FullName.Should().Be(@"\\server\share\file.txt");
-        pathInfo.FullNameUnc.Should().Be(QuickIOPath.UncSharePathPrefix + @"server\share\file.txt");
+        Assert.Equal(@"\\server\share\file.txt", pathInfo.FullName);
+        Assert.Equal(QuickIOPath.UncSharePathPrefix + @"server\share\file.txt", pathInfo.FullNameUnc);
     }
 
     [Fact]
     public void QuickIOPathInfo_Create_Object_CTor_ShareFolder_Test()
     {
-        QuickIOPathInfo pathInfo = new( @"\\server\share" );
+        QuickIOPathInfo pathInfo = new(@"\\server\share");
 
-        pathInfo.FullName.Should().Be(@"\\server\share");
-        pathInfo.FullNameUnc.Should().Be(QuickIOPath.UncSharePathPrefix + @"server\share");
+        Assert.Equal(@"\\server\share", pathInfo.FullName);
+        Assert.Equal(QuickIOPath.UncSharePathPrefix + @"server\share", pathInfo.FullNameUnc);
     }
 }