Fixes

Updated version to 7.0.0-preview-0003
zinofi · Nov 6, 2024 · 33fdd74 · 33fdd74
1 parent 6dfd9d0
commit 33fdd74
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/AspNetCore/src/Umbrella.AspNetCore.Blazor/Components/Grid/UmbrellaGrid.razor.cs b/AspNetCore/src/Umbrella.AspNetCore.Blazor/Components/Grid/UmbrellaGrid.razor.cs
@@ -769,7 +769,7 @@ static IReadOnlyCollection<T> EnsureCollection<T>(List<T>? coll)
 						url = Navigation.GetUriWithQueryParameters(url, new Dictionary<string, object?>
 						{
 #if NET8_0_OR_GREATER
-							[FiltersQueryStringParamKey] = JsonSerializer.Serialize(dicFilters, typeof(UmbrellaKeyValuePair<,>), UmbrellaKeyValuePairJsonSerializerContext.Default)
+							[FiltersQueryStringParamKey] = JsonSerializer.Serialize(dicFilters, UmbrellaKeyValuePairJsonSerializerContext.Default.IEnumerableUmbrellaKeyValuePairStringString)
 #else
 							[FiltersQueryStringParamKey] = JsonSerializer.Serialize(dicFilters, _jsonSerializerOptions)
 #endif

diff --git a/Core/src/Umbrella.Utilities/Primitives/UmbrellaKeyValuePair.cs b/Core/src/Umbrella.Utilities/Primitives/UmbrellaKeyValuePair.cs
@@ -1,8 +1,5 @@
 using System.Runtime.InteropServices;
-
-#if NET8_0_OR_GREATER
 using System.Text.Json.Serialization;
-#endif
 
 namespace Umbrella.Utilities.Primitives;
 
@@ -20,14 +17,13 @@ namespace Umbrella.Utilities.Primitives;
 [StructLayout(LayoutKind.Auto)]
 public readonly record struct UmbrellaKeyValuePair<TKey, TValue>(TKey Key, TValue Value);
 
-#if NET8_0_OR_GREATER
 /// <summary>
 /// A <see cref="JsonSerializerContext" /> for use with the <see cref="UmbrellaKeyValuePair{TKey, TValue}"/> type.
 /// </summary>
 [JsonSourceGenerationOptions(PropertyNamingPolicy = JsonKnownNamingPolicy.CamelCase)]
-[JsonSerializable(typeof(UmbrellaKeyValuePair<,>))]
+[JsonSerializable(typeof(UmbrellaKeyValuePair<string, string>))]
 [JsonSerializable(typeof(List<UmbrellaKeyValuePair<string, string>>))]
+[JsonSerializable(typeof(IEnumerable<UmbrellaKeyValuePair<string, string>>))]
 public partial class UmbrellaKeyValuePairJsonSerializerContext : JsonSerializerContext
 {
-}
-#endif
+}
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
 	<PropertyGroup>
-		<Version>7.0.0-preview-0002</Version>
+		<Version>7.0.0-preview-0003</Version>
 
 		<Nullable>enable</Nullable>
 		<WarningsAsErrors>nullable</WarningsAsErrors>