Merge pull request #5 from davidnajar/netstandard2

Changed Fluxor.Persist to netstandard2.0
Tailslide · Feb 16, 2022 · d3187e4 · d3187e4
2 parents 64bf29a + d0992f8
commit d3187e4
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 61 deletions.
diff --git a/Fluxor.Persist.Sample.Shared/Storage/InMemoryStateStorage.cs b/Fluxor.Persist.Sample.Shared/Storage/InMemoryStateStorage.cs
@@ -10,19 +10,19 @@ public class InMemoryStateStorage : IObjectStateStorage
 
         public void ClearStore() => _store.Clear();
 
-        public ValueTask<object> GetStateAsync(string statename)
+        public Task<object> GetStateAsync(string statename)
         {
             if (_store.ContainsKey(statename))
-                return ValueTask.FromResult(_store[statename]);
+                return Task.FromResult(_store[statename]);
             return default;
         }
 
-        public ValueTask StoreStateAsync(string statename, object state)
+        public Task StoreStateAsync(string statename, object state)
         {
             if (_store.ContainsKey(statename))
                 _store.TryRemove(statename, out _);
             _store.TryAdd(statename, state);
-            return ValueTask.CompletedTask;
+            return Task.CompletedTask;
         }
     }
 }
diff --git a/Fluxor.Persist.Sample.Shared/Storage/LocalStateStorage.cs b/Fluxor.Persist.Sample.Shared/Storage/LocalStateStorage.cs
@@ -14,12 +14,12 @@ public LocalStateStorage(ILocalStorageService localStorage)
             LocalStorage = localStorage;
         }
 
-        public async ValueTask<string> GetStateJsonAsync(string statename)
+        public async Task<string> GetStateJsonAsync(string statename)
         {
             return await LocalStorage.GetItemAsStringAsync(statename);
         }
 
-        public async ValueTask StoreStateJsonAsync(string statename, string json)
+        public async Task StoreStateJsonAsync(string statename, string json)
         {
             await LocalStorage.SetItemAsStringAsync(statename, json);
         }

diff --git a/Fluxor.Persist/AssemblyInfo.cs b/Fluxor.Persist/AssemblyInfo.cs
@@ -0,0 +1,8 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace System.Runtime.CompilerServices
+{
+    public class IsExternalInit { }
+}
diff --git a/Fluxor.Persist/Component1.razor b/Fluxor.Persist/Component1.razor
diff --git a/Fluxor.Persist/Component1.razor.css b/Fluxor.Persist/Component1.razor.css
diff --git a/Fluxor.Persist/ExampleJsInterop.cs b/Fluxor.Persist/ExampleJsInterop.cs
diff --git a/Fluxor.Persist/Fluxor.Persist.csproj b/Fluxor.Persist/Fluxor.Persist.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <Description>Persists fluxor packages</Description>
     <Version>2.0.0</Version>
     <Authors>Greg Pringle</Authors>
@@ -13,7 +13,9 @@
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>    
   </PropertyGroup>
-
+	<PropertyGroup>
+		<LangVersion>9.0</LangVersion>
+	</PropertyGroup>
   <ItemGroup>
     <Compile Remove="ExampleJsInterop.cs" />
   </ItemGroup>
@@ -38,6 +40,7 @@
   <ItemGroup>
     <PackageReference Include="Fluxor" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
+    <PackageReference Include="System.Text.Json" Version="6.0.2" />
   </ItemGroup>
 
 </Project>
diff --git a/Fluxor.Persist/Middleware/PersistMiddlewareOptions.cs b/Fluxor.Persist/Middleware/PersistMiddlewareOptions.cs
@@ -66,7 +66,7 @@ private class ListComparer : IEqualityComparer<KeyValuePair<string, bool>>
         {
             public bool Equals(KeyValuePair<string, bool> x, KeyValuePair<string, bool> y) => x.Key.Equals(y.Key);
 
-            public int GetHashCode([DisallowNull] KeyValuePair<string, bool> obj) => obj.Key.GetHashCode();
+            public int GetHashCode( KeyValuePair<string, bool> obj) => !obj.Equals(default(KeyValuePair<string, bool>)) ? obj.Key.GetHashCode():int.MinValue;
         }
     }
 }
diff --git a/Fluxor.Persist/Storage/IObjectStateStorage.cs b/Fluxor.Persist/Storage/IObjectStateStorage.cs
@@ -4,7 +4,7 @@ namespace Fluxor.Persist.Storage
 {
     public interface IObjectStateStorage
     {
-        public ValueTask<object> GetStateAsync(string statename);
-        public ValueTask StoreStateAsync(string statename, object state);
+        public Task<object> GetStateAsync(string statename);
+        public Task StoreStateAsync(string statename, object state);
     }
 }
diff --git a/Fluxor.Persist/Storage/IStringStateStorage.cs b/Fluxor.Persist/Storage/IStringStateStorage.cs
@@ -4,7 +4,7 @@ namespace Fluxor.Persist.Storage
 {
     public interface IStringStateStorage
     {
-        public ValueTask<string> GetStateJsonAsync(string statename);
-        public ValueTask StoreStateJsonAsync(string statename, string json);
+        public Task<string> GetStateJsonAsync(string statename);
+        public Task StoreStateJsonAsync(string statename, string json);
     }
 }