Update .NET version to 10.0 and adjust related configurations

- Updated DOTNET_VERSION in workflows to 10.0
- Changed target framework in test project to net10.0
- Modified global.json to set SDK version to 10.0.100
- Updated PSBuild script for new test command syntax
- Added CLAUDE.md for project guidance and build commands
- Refactored assertions in tests for consistency and clarity

Author: matt-edmondson

.github/workflows/dotnet.yml

@@ -20,7 +20,7 @@ concurrency:
 permissions: read-all
 
 env:
-  DOTNET_VERSION: "9.0" # Only needed for actions/setup-dotnet
+  DOTNET_VERSION: "10.0" # Only needed for actions/setup-dotnet
 
 jobs:
   build:
@@ -96,7 +96,7 @@ jobs:
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         shell: powershell
         run: |
-          .\.sonar\scanner\dotnet-sonarscanner begin /k:"${{ github.repository_owner }}_${{ github.event.repository.name }}" /o:"${{ github.repository_owner }}" /d:sonar.token="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.cs.opencover.reportsPaths="coverage/coverage.opencover.xml" /d:sonar.coverage.exclusions="**/*Test*.cs,**/*.Tests.cs,**/*.Tests/**/*,**/obj/**/*,**/*.dll" /d:sonar.cs.vstest.reportsPaths="coverage/TestResults/**/*.trx"
+          .\.sonar\scanner\dotnet-sonarscanner begin /k:"${{ github.repository_owner }}_${{ github.event.repository.name }}" /o:"${{ github.repository_owner }}" /d:sonar.token="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.cs.vscoveragexml.reportsPaths="coverage/coverage.xml" /d:sonar.coverage.exclusions="**/*Test*.cs,**/*.Tests.cs,**/*.Tests/**/*,**/obj/**/*,**/*.dll" /d:sonar.cs.vstest.reportsPaths="coverage/TestResults/**/*.trx"
 
       - name: Run PSBuild Pipeline
         id: pipeline

.github/workflows/update-sdks.yml

@@ -19,7 +19,7 @@ concurrency:
 permissions: read-all
 
 env:
-  DOTNET_VERSION: "9.0"
+  DOTNET_VERSION: "10.0"
 
 jobs:
   update-sdks:
@@ -257,7 +257,7 @@ jobs:
 
       - name: Run Tests
         if: steps.update_sdks.outputs.has_updates == 'true'
-        run: dotnet test --no-build --configuration Release --logger trx --collect:"XPlat Code Coverage"
+        run: dotnet test --no-build --configuration Release --report-trx
 
       - name: Check for Changes
         if: steps.update_sdks.outputs.has_updates == 'true'

AppDataStorage.Test/AppDataStorage.Test.csproj

@@ -4,15 +4,14 @@
 
   <PropertyGroup>
     <IsTestProject>true</IsTestProject>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <TargetFrameworks></TargetFrameworks>
     <TestingPlatformDotnetTestSupport>true</TestingPlatformDotnetTestSupport>
     <TestingPlatformShowTestsFailure>true</TestingPlatformShowTestsFailure>
     <TestingPlatformShowTestsFailureDetails>true</TestingPlatformShowTestsFailureDetails>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" />
     <ProjectReference Include="..\AppDataStorage\AppDataStorage.csproj" />
     <PackageReference Include="TestableIO.System.IO.Abstractions.TestingHelpers" />
   </ItemGroup>

AppDataStorage.Test/AppDataTests.cs

@@ -2,6 +2,8 @@
 // All rights reserved.
 // Licensed under the MIT license.
 
+[assembly: Parallelize(Scope = ExecutionScope.MethodLevel)]
+
 namespace ktsu.AppDataStorage.Test;
 
 using System;
@@ -158,7 +160,7 @@ private static void VerifyFileContent(AbsoluteFilePath filePath, string expected
 	{
 		Assert.IsTrue(AppData.FileSystem.File.Exists(filePath), "File should exist before reading content.");
 		string actualContent = AppData.FileSystem.File.ReadAllText(filePath);
-		Assert.IsTrue(actualContent.Contains(expectedContent), message);
+		Assert.Contains(expectedContent, actualContent, message);
 	}
 
 	[TestMethod]
@@ -262,7 +264,7 @@ public void TestQueueSaveSetsSaveQueuedTime()
 
 		appData.QueueSave();
 
-		Assert.IsTrue(appData.SaveQueuedTime >= beforeQueueTime, "SaveQueuedTime was not set correctly.");
+		Assert.IsGreaterThanOrEqualTo(beforeQueueTime, appData.SaveQueuedTime, "SaveQueuedTime was not set correctly.");
 	}
 
 	[TestMethod]
@@ -427,7 +429,7 @@ public void TestAppDataSerializationIncludesFields()
 		using TestAppData appData = new();
 		string json = JsonSerializer.Serialize(appData, AppData.JsonSerializerOptions);
 
-		Assert.IsTrue(json.Contains("\"Data\""), "Serialized JSON should include fields.");
+		Assert.Contains("\"Data\"", json, "Serialized JSON should include fields.");
 	}
 
 	[TestMethod]
@@ -641,7 +643,7 @@ public void TestQueueSaveStaticMethod()
 		TestAppData.QueueSave();
 
 		TestAppData appData = TestAppData.Get();
-		Assert.IsTrue(appData.SaveQueuedTime >= beforeQueueTime, "SaveQueuedTime was not set correctly.");
+		Assert.IsGreaterThanOrEqualTo(beforeQueueTime, appData.SaveQueuedTime, "SaveQueuedTime was not set correctly.");
 	}
 
 	[TestMethod]
@@ -726,7 +728,7 @@ public void TestJsonSerializerOptionsConfiguration()
 		Assert.IsTrue(options.WriteIndented, "Should have WriteIndented set to true");
 		Assert.IsTrue(options.IncludeFields, "Should have IncludeFields set to true");
 		Assert.IsNotNull(options.ReferenceHandler, "Should have ReferenceHandler configured");
-		Assert.IsTrue(options.Converters.Count > 0, "Should have converters configured");
+		Assert.IsNotEmpty(options.Converters, "Should have converters configured");
 	}
 
 	[TestMethod]
@@ -751,7 +753,7 @@ public void TestBackupFileRecoveryWithTimestamp()
 
 		// Check that a timestamped backup exists
 		string[] timestampedBackups = AppData.FileSystem.Directory.GetFiles(appData.FilePath.DirectoryPath.ToString(), "*.bk.*");
-		Assert.IsTrue(timestampedBackups.Length > 0, "Should have created a timestamped backup");
+		Assert.IsNotEmpty(timestampedBackups, "Should have created a timestamped backup");
 	}
 
 	[TestMethod]
@@ -801,8 +803,8 @@ public void TestMultipleInstancesWithDifferentFileNames()
 		appData2.Save();
 
 		Assert.AreNotEqual(appData1.FilePath, appData2.FilePath, "Instances should have different file paths");
-		Assert.IsTrue(appData1.FilePath.ToString().Contains("file1.json"), "First instance should use custom filename");
-		Assert.IsTrue(appData2.FilePath.ToString().Contains("file2.json"), "Second instance should use custom filename");
+		Assert.Contains("file1.json", appData1.FilePath.ToString(), "First instance should use custom filename");
+		Assert.Contains("file2.json", appData2.FilePath.ToString(), "Second instance should use custom filename");
 	}
 
 	[TestMethod]
@@ -879,7 +881,7 @@ public void TestConcurrentAccess()
 			thread.Join(TimeSpan.FromSeconds(30)); // Timeout after 30 seconds
 		}
 
-		Assert.AreEqual(0, exceptions.Count, $"No exceptions should occur during concurrent access. Exceptions: {string.Join(", ", exceptions.Select(e => e.Message))}");
+		Assert.IsEmpty(exceptions, $"No exceptions should occur during concurrent access. Exceptions: {string.Join(", ", exceptions.Select(e => e.Message))}");
 	}
 
 	[TestMethod]
@@ -986,7 +988,7 @@ public void TestFileSystemPropertyThreadSafety()
 			thread.Join();
 		}
 
-		Assert.AreEqual(3, fileSystemInstances.Count, "Each thread should access FileSystem");
+		Assert.HasCount(3, fileSystemInstances, "Each thread should access FileSystem");
 	}
 
 	[TestMethod]
@@ -1079,8 +1081,8 @@ public void TestSaveUpdatesLastSaveTime()
 		appData.Save();
 
 		DateTime afterSave = DateTime.UtcNow;
-		Assert.IsTrue(appData.LastSaveTime >= beforeSave, "LastSaveTime should be updated after save");
-		Assert.IsTrue(appData.LastSaveTime <= afterSave, "LastSaveTime should not be in the future");
+		Assert.IsGreaterThanOrEqualTo(beforeSave, appData.LastSaveTime, "LastSaveTime should be updated after save");
+		Assert.IsLessThanOrEqualTo(afterSave, appData.LastSaveTime, "LastSaveTime should not be in the future");
 	}
 
 	[TestMethod]
@@ -1136,7 +1138,7 @@ public void TestTimestampedBackupWithMultipleCollisions()
 
 		// Verify that a uniquely timestamped backup was created
 		List<string> backupFiles = [.. (AppData.FileSystem as MockFileSystem)?.AllFiles.Where(f => f.Contains(".bk.")) ?? []];
-		Assert.IsTrue(backupFiles.Count > 3, "Should create a unique timestamped backup");
+		Assert.IsGreaterThan(3, backupFiles.Count, "Should create a unique timestamped backup");
 	}
 
 	[TestMethod]
@@ -1308,8 +1310,7 @@ public void TestFileSystemEdgeCaseEmptyPaths()
 		AppData.EnsureDirectoryExists(AbsoluteFilePath.Create(string.Empty));
 		AppData.EnsureDirectoryExists(AbsoluteDirectoryPath.Create(string.Empty));
 
-		// Should not throw and handle gracefully
-		Assert.IsTrue(true); // If we get here, the method handled empty paths correctly
+		// Should not throw and handle gracefully - if we get here, the method handled empty paths correctly
 	}
 
 	[TestMethod]
@@ -1325,8 +1326,8 @@ public void TestFileNameGenerationEdgeCases()
 		// Test with complex class names
 		using VeryLongComplexClassNameForTestingAppData appData = new();
 		string fileName = appData.FileName.ToString();
-		Assert.IsTrue(fileName.Contains("very_long_complex_class_name_for_testing_app_data"));
-		Assert.IsTrue(fileName.EndsWith(".json"));
+		Assert.Contains("very_long_complex_class_name_for_testing_app_data", fileName);
+		Assert.EndsWith(".json", fileName);
 	}
 
 	[TestMethod]
@@ -1340,8 +1341,7 @@ public void TestDisposeMultipleTimesWithSaveQueued()
 		appData.Dispose();
 		appData.Dispose();
 
-		// Should handle multiple disposes gracefully
-		Assert.IsTrue(true);
+		// Should handle multiple disposes gracefully - if we get here, the method succeeded
 	}
 
 	[TestMethod]
@@ -1370,9 +1370,9 @@ public void TestComplexDirectoryNestingWithSpecialCharacters()
 		appData.Data = "Complex path test";
 		appData.Save();
 
-		Assert.IsTrue(appData.FilePath.ToString().Contains("level1"));
-		Assert.IsTrue(appData.FilePath.ToString().Contains("level4_with_underscores"));
-		Assert.IsTrue(appData.FilePath.ToString().Contains("file with spaces & special chars.json"));
+		Assert.Contains("level1", appData.FilePath.ToString());
+		Assert.Contains("level4_with_underscores", appData.FilePath.ToString());
+		Assert.Contains("file with spaces & special chars.json", appData.FilePath.ToString());
 	}
 
 	[TestMethod]
@@ -1400,10 +1400,10 @@ public void TestAppDomainPathGeneration()
 		string appDataPath = AppData.AppDataPath.ToString();
 		string fullPath = AppData.Path.ToString();
 
-		Assert.IsFalse(string.IsNullOrEmpty(appDomain));
-		Assert.IsFalse(string.IsNullOrEmpty(appDataPath));
-		Assert.IsTrue(fullPath.Contains(appDomain));
-		Assert.IsTrue(fullPath.Contains(appDataPath));
+		Assert.IsNotEmpty(appDomain);
+		Assert.IsNotEmpty(appDataPath);
+		Assert.Contains(appDomain, fullPath);
+		Assert.Contains(appDataPath, fullPath);
 	}
 }
 

AppDataStorage/AppData.cs

@@ -2,6 +2,10 @@
 // All rights reserved.
 // Licensed under the MIT license.
 
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("ktsu.AppDataStorage.Test")]
+
 namespace ktsu.AppDataStorage;
 
 using System.IO.Abstractions;
@@ -86,7 +90,7 @@ internal static IFileSystem FileSystem
 	/// <summary>
 	/// The default file system implementation used when no thread-local override is set.
 	/// </summary>
-	private static readonly IFileSystem DefaultFileSystem = new FileSystem();
+	private static IFileSystem DefaultFileSystem { get; } = new FileSystem();
 
 	/// <summary>
 	/// Ensures that the directory for the specified file path exists.
@@ -143,8 +147,8 @@ internal static void EnsureDirectoryExists(AbsoluteDirectoryPath path)
 	/// <exception cref="ArgumentNullException">Thrown when <paramref name="appData"/> or <paramref name="text"/> is null.</exception>
 	public static void WriteText<T>(T appData, string text) where T : AppData<T>, new()
 	{
-		Guard.NotNull(appData);
-		Guard.NotNull(text);
+		Ensure.NotNull(appData);
+		Ensure.NotNull(text);
 
 		lock (AppData<T>.Lock)
 		{
@@ -177,7 +181,7 @@ internal static void EnsureDirectoryExists(AbsoluteDirectoryPath path)
 	/// <exception cref="ArgumentNullException">Thrown when <paramref name="appData"/> is null.</exception>
 	public static string ReadText<T>(T appData) where T : AppData<T>, new()
 	{
-		Guard.NotNull(appData);
+		Ensure.NotNull(appData);
 
 		lock (AppData<T>.Lock)
 		{
@@ -220,7 +224,7 @@ internal static void EnsureDirectoryExists(AbsoluteDirectoryPath path)
 	/// <exception cref="ArgumentNullException">Thrown when <paramref name="appData"/> is null.</exception>
 	public static void QueueSave<T>(this T appData) where T : AppData<T>, new()
 	{
-		Guard.NotNull(appData);
+		Ensure.NotNull(appData);
 
 		lock (AppData<T>.Lock)
 		{
@@ -237,7 +241,7 @@ internal static void EnsureDirectoryExists(AbsoluteDirectoryPath path)
 	/// <exception cref="ArgumentNullException">Thrown when <paramref name="appData"/> is null.</exception>
 	public static void SaveIfRequired<T>(this T appData) where T : AppData<T>, new()
 	{
-		Guard.NotNull(appData);
+		Ensure.NotNull(appData);
 
 		lock (AppData<T>.Lock)
 		{
@@ -270,7 +274,7 @@ internal static void EnsureDirectoryExists(AbsoluteDirectoryPath path)
 	/// </example>
 	public static void ConfigureForTesting(Func<IFileSystem> fileSystemFactory)
 	{
-		Guard.NotNull(fileSystemFactory);
+		Ensure.NotNull(fileSystemFactory);
 
 		// Validate that the factory produces mock/test file systems by testing it once
 		IFileSystem testInstance = fileSystemFactory();
@@ -290,7 +294,7 @@ public static void ConfigureForTesting(Func<IFileSystem> fileSystemFactory)
 	/// <returns>True if the file system is a test/mock implementation; otherwise, false.</returns>
 	private static bool IsTestFileSystem(IFileSystem fileSystem)
 	{
-		Guard.NotNull(fileSystem);
+		Ensure.NotNull(fileSystem);
 
 		Type fileSystemType = fileSystem.GetType();
 

AppDataStorage/AppDataStorage.csproj

@@ -2,13 +2,13 @@
   <Sdk Name="Microsoft.NET.Sdk" />
   <Sdk Name="ktsu.Sdk" />
   <PropertyGroup>
-    <TargetFrameworks>net9.0;net8.0;net7.0;netstandard2.0;netstandard2.1</TargetFrameworks>
+    <TargetFrameworks>net10.0;net9.0;net8.0;net7.0;netstandard2.0;netstandard2.1</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="ktsu.CaseConverter" />
     <PackageReference Include="ktsu.RoundTripStringJsonConverter" />
     <PackageReference Include="ktsu.Semantics.Paths" />
-  <PackageReference Include="Polyfill" />
+    <PackageReference Include="Polyfill" />
     <PackageReference Include="TestableIO.System.IO.Abstractions" />
     <PackageReference Include="TestableIO.System.IO.Abstractions.Wrappers" />
   </ItemGroup>