Feat: Package Updates

AnnaSasDev · AnnaSasDev · commit 4234144be128 · 2025-01-20T16:42:01.000+01:00
diff --git a/src/CodeOfChaos.Types.DataSeeder/CodeOfChaos.Types.DataSeeder.csproj b/src/CodeOfChaos.Types.DataSeeder/CodeOfChaos.Types.DataSeeder.csproj
@@ -34,8 +34,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.1" />
+        <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.1" />
     </ItemGroup>
 
 </Project>
diff --git a/src/CodeOfChaos.Types.TypedValueStore/IValueContainer.cs b/src/CodeOfChaos.Types.TypedValueStore/IValueContainer.cs
@@ -12,4 +12,6 @@ public interface IValueContainer {
     
     bool TryGetAsValue<T>([NotNullWhen(true)] out T? output) where T : notnull;
     T GetAsValue<T>() where T : notnull;
+    
+    object? GetBoxedValue();
 }
diff --git a/src/CodeOfChaos.Types.TypedValueStore/TypedValueStore.cs b/src/CodeOfChaos.Types.TypedValueStore/TypedValueStore.cs
@@ -206,14 +206,15 @@ public bool TryUpdate<T>(TKey key, T newValue) where T : notnull =>
     /// </summary>
     /// <param name="other">The TypedValueStore to compare with the current TypedValueStore.</param>
     /// <returns>true if the specified TypedValueStore is equal to the current TypedValueStore; otherwise, false.</returns>
-    public bool Equals(TypedValueStore<TKey> other) {
+    public bool Equals(TypedValueStore<TKey>? other) {
+        if (other is null) return false;
+        if (ReferenceEquals(this, other)) return true;
         if (other._storage.Count != _storage.Count) return false;
 
+        // Check if all key-value pairs are equal
         foreach (KeyValuePair<TKey, IValueContainer> kvp in _storage) {
-            if (!other._storage.TryGetValue(kvp.Key, out IValueContainer? otherValue) ||
-                !Equals(kvp.Value, otherValue)) {
-                return false;
-            }
+            if (!other._storage.TryGetValue(kvp.Key, out IValueContainer? otherValue)) return false;
+            if (!Equals(kvp.Value.GetBoxedValue(), otherValue.GetBoxedValue())) return false;
         }
 
         return true;
diff --git a/src/CodeOfChaos.Types.TypedValueStore/ValueContainer.cs b/src/CodeOfChaos.Types.TypedValueStore/ValueContainer.cs
@@ -22,13 +22,12 @@ public bool TryGetAsValue<T1>([NotNullWhen(true)] out T1? output) where T1 : not
         }
     }
     
-    // ReSharper disable once ConvertSwitchStatementToSwitchExpression
     public T1 GetAsValue<T1>() where T1 : notnull {
-        switch (Value) {
-            case T1 castedValue:
-                return castedValue;
-            default:
-                throw new InvalidCastException($"Value of type {UnderlyingType} cannot be casted to {typeof(T1)}");
-        }
+        return Value switch {
+            T1 castedValue => castedValue,
+            _ => throw new InvalidCastException($"Value of type {UnderlyingType} cannot be casted to {typeof(T1)}")
+        };
     }
+    
+    public object? GetBoxedValue() => Value;
 }
diff --git a/src/CodeOfChaos.Types/CodeOfChaos.Types.csproj b/src/CodeOfChaos.Types/CodeOfChaos.Types.csproj
@@ -33,12 +33,12 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="AterraEngine.Unions" Version="2.7.1" />
-        <PackageReference Include="AterraEngine.Unions.Generators" Version="2.7.1">
+        <PackageReference Include="AterraEngine.Unions" Version="3.6.0" />
+        <PackageReference Include="AterraEngine.Unions.Generators" Version="3.6.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="CodeOfChaos.Extensions" Version="0.28.2" />
+        <PackageReference Include="CodeOfChaos.Extensions" Version="0.30.0" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/Tools.CodeOfChaos.Types/Tools.CodeOfChaos.Types.csproj b/src/Tools.CodeOfChaos.Types/Tools.CodeOfChaos.Types.csproj
@@ -9,7 +9,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="CodeOfChaos.CliArgsParser.Library" Version="4.3.4" />
+        <PackageReference Include="CodeOfChaos.CliArgsParser.Library" Version="4.4.0" />
     </ItemGroup>
 
 </Project>
diff --git a/tests/Benchmarks.CodeOfChaos.Types.TypedValueStore/Benchmarks.CodeOfChaos.Types.TypedValueStore.csproj b/tests/Benchmarks.CodeOfChaos.Types.TypedValueStore/Benchmarks.CodeOfChaos.Types.TypedValueStore.csproj
@@ -9,6 +9,7 @@
 
     <ItemGroup>
       <PackageReference Include="BenchmarkDotNet" Version="0.14.0" />
+      <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.1" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/tests/Benchmarks.CodeOfChaos.Types.TypedValueStore/ValueContainerBenchmarks.cs b/tests/Benchmarks.CodeOfChaos.Types.TypedValueStore/ValueContainerBenchmarks.cs
@@ -65,12 +65,8 @@ public readonly record struct NewValueContainer<T>(T Value) {
 
     public bool TryGetAsValue<T1>([NotNullWhen(true)] out T1? output) where T1 : notnull {
         switch (Value) {
-            case T1 castedValue:
-                output = castedValue;
-                return true;
-            default:
-                output = default;
-                return false;
+            case T1 castedValue: return (output = castedValue) is not null;
+            default: return (output = default) is not null;
         }
     }
 }
diff --git a/tests/Tests.CodeOfChaos.Types.DataSeeder/Tests.CodeOfChaos.Types.DataSeeder.csproj b/tests/Tests.CodeOfChaos.Types.DataSeeder/Tests.CodeOfChaos.Types.DataSeeder.csproj
@@ -12,9 +12,9 @@
 
     <ItemGroup>
         <PackageReference Include="JetBrains.Annotations" Version="2024.3.0"/>
-        <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0"/>
+        <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.1" />
         <PackageReference Include="Moq" Version="4.20.72"/>
-        <PackageReference Include="TUnit" Version="0.6.15"/>
+        <PackageReference Include="TUnit" Version="0.6.154" />
         <PackageReference Include="Bogus" Version="35.6.1"/>
     </ItemGroup>
 
diff --git a/tests/Tests.CodeOfChaos.Types.TypedValueStore/Tests.CodeOfChaos.Types.TypedValueStore.csproj b/tests/Tests.CodeOfChaos.Types.TypedValueStore/Tests.CodeOfChaos.Types.TypedValueStore.csproj
@@ -14,7 +14,7 @@
     <ItemGroup>
         <PackageReference Include="JetBrains.Annotations" Version="2024.3.0"/>
         <PackageReference Include="Moq" Version="4.20.72"/>
-        <PackageReference Include="TUnit" Version="0.6.15"/>
+        <PackageReference Include="TUnit" Version="0.6.154" />
         <PackageReference Include="Bogus" Version="35.6.1"/>
     </ItemGroup>
 
diff --git a/tests/Tests.CodeOfChaos.Types/Tests.CodeOfChaos.Types.csproj b/tests/Tests.CodeOfChaos.Types/Tests.CodeOfChaos.Types.csproj
@@ -13,7 +13,7 @@
     <ItemGroup>
         <PackageReference Include="JetBrains.Annotations" Version="2024.3.0"/>
         <PackageReference Include="Moq" Version="4.20.72"/>
-        <PackageReference Include="TUnit" Version="0.6.15"/>
+        <PackageReference Include="TUnit" Version="0.6.154" />
         <PackageReference Include="Bogus" Version="35.6.1"/>
     </ItemGroup>
 

Original file line number	Diff line number	Diff line change
`@@ -12,4 +12,6 @@ public interface IValueContainer {`
`12`	`12`
`13`	`13`	`bool TryGetAsValue<T>([NotNullWhen(true)] out T? output) where T : notnull;`
`14`	`14`	`T GetAsValue<T>() where T : notnull;`
	`15`	`+`
	`16`	`+ object? GetBoxedValue();`
`15`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,13 +22,12 @@ public bool TryGetAsValue<T1>([NotNullWhen(true)] out T1? output) where T1 : not`
`22`	`22`	`}`
`23`	`23`	`}`
`24`	`24`
`25`		`- // ReSharper disable once ConvertSwitchStatementToSwitchExpression`
`26`	`25`	`public T1 GetAsValue<T1>() where T1 : notnull {`
`27`		`- switch (Value) {`
`28`		`- case T1 castedValue:`
`29`		`- return castedValue;`
`30`		`- default:`
`31`		`- throw new InvalidCastException($"Value of type {UnderlyingType} cannot be casted to {typeof(T1)}");`
`32`		`- }`
	`26`	`+ return Value switch {`
	`27`	`+ T1 castedValue => castedValue,`
	`28`	`+ _ => throw new InvalidCastException($"Value of type {UnderlyingType} cannot be casted to {typeof(T1)}")`
	`29`	`+ };`
`33`	`30`	`}`
	`31`	`+`
	`32`	`+ public object? GetBoxedValue() => Value;`
`34`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,12 +65,8 @@ public readonly record struct NewValueContainer<T>(T Value) {`
`65`	`65`
`66`	`66`	`public bool TryGetAsValue<T1>([NotNullWhen(true)] out T1? output) where T1 : notnull {`
`67`	`67`	`switch (Value) {`
`68`		`- case T1 castedValue:`
`69`		`- output = castedValue;`
`70`		`- return true;`
`71`		`- default:`
`72`		`- output = default;`
`73`		`- return false;`
	`68`	`+ case T1 castedValue: return (output = castedValue) is not null;`
	`69`	`+ default: return (output = default) is not null;`
`74`	`70`	`}`
`75`	`71`	`}`
`76`	`72`	`}`