Merge pull request #91 from Aguafrommars/master

fix 4.0.1
Aguafrommars · Mar 29, 2021 · 8465f5b · 8465f5b
2 parents 85d8d05 + 1d4cd17
commit 8465f5b
Show file tree

Hide file tree

Showing 11 changed files with 39 additions and 32 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -14,13 +14,13 @@ image:
 environment:
   GH_TOKEN: 
     secure: 0NJdORJRFjpB0dwUYv7bVNsbkldkoBhnvWik/CTOwAF/k9kP+/uTWMFnDcpEpt8E
-  donetsdk: 5.0.102
+  donetsdk: 5.0.103
   JAVA_HOME: C:\Program Files\Java\jdk14
 init:
   - cmd: git config --global core.autocrlf true
 install:
   - ps: if ($isWindows) { Install-Product node '' }
-  - sh: wget -q https://packages.microsoft.com/config/ubuntu/16.04/packages-microsoft-prod.deb
+  - sh: wget -q https://packages.microsoft.com/config/ubuntu/18.04/packages-microsoft-prod.deb
   - sh: sudo dpkg -i packages-microsoft-prod.deb
   - sh: sudo apt-get update
   - sh: sudo apt-get -y install apt-transport-https

diff --git a/...ongas.AspNetCore.Authentication.Sample/Aguacongas.AspNetCore.Authentication.Sample.csproj b/...ongas.AspNetCore.Authentication.Sample/Aguacongas.AspNetCore.Authentication.Sample.csproj
@@ -14,12 +14,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.Facebook" Version="5.0.3" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="5.0.3" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="5.0.3" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="5.0.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.3" />
-    <PackageReference Include="Aguacongas.AspNetCore.Authentication.EntityFramework" Version="3.2.2" />
-    <PackageReference Include="Aguacongas.AspNetCore.Authentication.Redis" Version="3.2.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.Facebook" Version="5.0.4" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="5.0.4" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="5.0.4" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="5.0.4" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.4" />
+    <PackageReference Include="Aguacongas.AspNetCore.Authentication.EntityFramework" Version="4.0.0" />
+    <PackageReference Include="Aguacongas.AspNetCore.Authentication.Redis" Version="4.0.0" />
   </ItemGroup>
 </Project>
diff --git a/...uthentication.EntityFramework/Aguacongas.AspNetCore.Authentication.EntityFramework.csproj b/...uthentication.EntityFramework/Aguacongas.AspNetCore.Authentication.EntityFramework.csproj
@@ -28,7 +28,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.4" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...gas.AspNetCore.Authentication.RavenDb/Aguacongas.AspNetCore.Authentication.RavenDb.csproj b/...gas.AspNetCore.Authentication.RavenDb/Aguacongas.AspNetCore.Authentication.RavenDb.csproj
@@ -28,7 +28,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="RavenDB.Client" Version="5.1.4" />
+    <PackageReference Include="RavenDB.Client" Version="5.1.5" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Aguacongas.AspNetCore.Authentication.RavenDb/DynamicProviderStore.cs b/src/Aguacongas.AspNetCore.Authentication.RavenDb/DynamicProviderStore.cs
@@ -130,10 +130,17 @@ public virtual async Task UpdateAsync(TSchemeDefinition definition, Cancellation
 
             data.SerializedOptions = serialized.SerializedOptions;
             data.SerializedHandlerType = serialized.SerializedHandlerType;
+            var handlerType = definition.HandlerType;
+            var options = definition.Options;
+
+            data.HandlerType = null;
+            data.Options = null;
 
-            await _session.StoreAsync(data).ConfigureAwait(false);
             await _session.SaveChangesAsync(cancellationToken).ConfigureAwait(false);
 
+            definition.HandlerType = handlerType;
+            definition.Options = options;
+
             _logger.LogInformation("Scheme {scheme} updated for {handlerType} with options: {options}", definition.Scheme, definition.HandlerType, data.SerializedOptions);
         }
 

diff --git a/...s.AspNetCore.Authentication.TestBase/Aguacongas.AspNetCore.Authentication.TestBase.csproj b/...s.AspNetCore.Authentication.TestBase/Aguacongas.AspNetCore.Authentication.TestBase.csproj
@@ -26,19 +26,19 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="2.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.Facebook" Version="5.0.3" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="5.0.3" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.3" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="5.0.3" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.Facebook" Version="5.0.4" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="5.0.4" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.4" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="5.0.4" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.OAuth" Version="2.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="5.0.3" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.Twitter" Version="5.0.3" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.WsFederation" Version="5.0.3" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="5.0.4" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.Twitter" Version="5.0.4" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.WsFederation" Version="5.0.4" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="5.0.0" />
-    <PackageReference Include="Moq" Version="4.16.0" />
+    <PackageReference Include="Moq" Version="4.16.1" />
     <PackageReference Include="xunit.analyzers" Version="0.10.0" />
     <PackageReference Include="xunit.assert" Version="2.4.1" />
     <PackageReference Include="xunit.core" Version="2.4.1" />

diff --git a/src/Aguacongas.AspNetCore.Authentication/Aguacongas.AspNetCore.Authentication.csproj b/src/Aguacongas.AspNetCore.Authentication/Aguacongas.AspNetCore.Authentication.csproj
@@ -30,7 +30,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Authentication.OAuth" Version="2.2.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="5.0.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
 
 </Project>
diff --git a/...ion.EntityFramework.Test/Aguacongas.AspNetCore.Authentication.EntityFramework.Test.csproj b/...ion.EntityFramework.Test/Aguacongas.AspNetCore.Authentication.EntityFramework.Test.csproj
@@ -7,11 +7,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="3.0.2">
+    <PackageReference Include="coverlet.collector" Version="3.0.3">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.4" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

diff --git a/...Core.Authentication.RavenDb.Test/Aguacongas.AspNetCore.Authentication.RavenDb.Test.csproj b/...Core.Authentication.RavenDb.Test/Aguacongas.AspNetCore.Authentication.RavenDb.Test.csproj
@@ -7,12 +7,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="3.0.2">
+    <PackageReference Include="coverlet.collector" Version="3.0.3">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
-    <PackageReference Include="RavenDB.TestDriver" Version="5.1.4" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
+    <PackageReference Include="RavenDB.TestDriver" Version="5.1.5" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

diff --git a/...pNetCore.Authentication.Redis.Test/Aguacongas.AspNetCore.Authentication.Redis.Test.csproj b/...pNetCore.Authentication.Redis.Test/Aguacongas.AspNetCore.Authentication.Redis.Test.csproj
@@ -7,11 +7,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="3.0.2">
+    <PackageReference Include="coverlet.collector" Version="3.0.3">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

diff --git a/...guacongas.AspNetCore.Authentication.Test/Aguacongas.AspNetCore.Authentication.Test.csproj b/...guacongas.AspNetCore.Authentication.Test/Aguacongas.AspNetCore.Authentication.Test.csproj
@@ -7,13 +7,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="3.0.2">
+    <PackageReference Include="coverlet.collector" Version="3.0.3">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.3" />
-    <PackageReference Include="Moq" Version="4.16.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.4" />
+    <PackageReference Include="Moq" Version="4.16.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>