From 018a252560e6412b05586cd999866205b8d45e42 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 30 Sep 2018 12:10:12 -0700 Subject: [PATCH 1/3] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 34 +++++++++++++++++----------------- korebuild-lock.txt | 4 ++-- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 5827c261..9e5db070 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -3,27 +3,27 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.2.0-preview1-20180918.1 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 + 2.2.0-preview1-20180928.5 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 2.3.2 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 3.14.2 2.0.9 2.1.3 - 2.2.0-preview2-26905-02 + 2.2.0-preview3-26927-02 15.6.1 4.5.0 4.7.49 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 8491de70..05076800 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-20180918.1 -commithash:ad5e3fc53442741a0dd49bce437d2ac72f4b5800 +version:2.2.0-preview1-20180928.5 +commithash:43faa29f679f47b88689d645b39e6be5e0055d70 From 3acb4dd4e9a8dd55fc7a936bbe5659ab934b2310 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 7 Oct 2018 19:10:34 +0000 Subject: [PATCH 2/3] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 34 +++++++++++++++++----------------- korebuild-lock.txt | 4 ++-- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 9e5db070..697407ea 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -3,27 +3,27 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.2.0-preview1-20180928.5 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 + 2.2.0-preview2-20181004.6 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 2.3.2 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 3.14.2 2.0.9 2.1.3 - 2.2.0-preview3-26927-02 + 2.2.0-preview3-27001-02 15.6.1 4.5.0 4.7.49 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 05076800..3e92dd55 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-20180928.5 -commithash:43faa29f679f47b88689d645b39e6be5e0055d70 +version:2.2.0-preview2-20181004.6 +commithash:c04c4b2f5018632647f96210ab01876661302dac From 3f5f419df8094be0203298a8001f721517d18a2c Mon Sep 17 00:00:00 2001 From: BrennanConroy Date: Wed, 10 Oct 2018 16:40:52 -0700 Subject: [PATCH 3/3] Add Redis 2.0 package (#325) --- DataProtection.sln | 44 +++--- build/dependencies.props | 1 + samples/Redis/Program.cs | 3 +- samples/Redis/Redis.csproj | 4 +- .../baseline.netcore.json | 140 ------------------ ....DataProtection.StackExchangeRedis.csproj} | 2 +- .../RedisDataProtectionBuilderExtensions.cs | 17 ++- .../RedisXmlRepository.cs | 4 +- .../DataProtectionRedisTests.cs | 2 +- ...Protection.StackExchangeRedis.Test.csproj} | 2 +- ...edisDataProtectionBuilderExtensionsTest.cs | 4 +- .../TestRedisServer.cs | 0 .../TestRedisServerIsAvailableAttribute.cs | 0 .../testconfig.json | 0 14 files changed, 43 insertions(+), 180 deletions(-) delete mode 100644 src/Microsoft.AspNetCore.DataProtection.Redis/baseline.netcore.json rename src/{Microsoft.AspNetCore.DataProtection.Redis/Microsoft.AspNetCore.DataProtection.Redis.csproj => Microsoft.AspNetCore.DataProtection.StackExchangeRedis/Microsoft.AspNetCore.DataProtection.StackExchangeRedis.csproj} (82%) rename src/{Microsoft.AspNetCore.DataProtection.Redis => Microsoft.AspNetCore.DataProtection.StackExchangeRedis}/RedisDataProtectionBuilderExtensions.cs (73%) rename src/{Microsoft.AspNetCore.DataProtection.Redis => Microsoft.AspNetCore.DataProtection.StackExchangeRedis}/RedisXmlRepository.cs (94%) rename test/{Microsoft.AspNetCore.DataProtection.Redis.Test => Microsoft.AspNetCore.DataProtection.StackExchangeRedis.Test}/DataProtectionRedisTests.cs (98%) rename test/{Microsoft.AspNetCore.DataProtection.Redis.Test/Microsoft.AspNetCore.DataProtection.Redis.Test.csproj => Microsoft.AspNetCore.DataProtection.StackExchangeRedis.Test/Microsoft.AspNetCore.DataProtection.StackExchangeRedis.Test.csproj} (91%) rename test/{Microsoft.AspNetCore.DataProtection.Redis.Test => Microsoft.AspNetCore.DataProtection.StackExchangeRedis.Test}/RedisDataProtectionBuilderExtensionsTest.cs (88%) rename test/{Microsoft.AspNetCore.DataProtection.Redis.Test => Microsoft.AspNetCore.DataProtection.StackExchangeRedis.Test}/TestRedisServer.cs (100%) rename test/{Microsoft.AspNetCore.DataProtection.Redis.Test => Microsoft.AspNetCore.DataProtection.StackExchangeRedis.Test}/TestRedisServerIsAvailableAttribute.cs (100%) rename test/{Microsoft.AspNetCore.DataProtection.Redis.Test => Microsoft.AspNetCore.DataProtection.StackExchangeRedis.Test}/testconfig.json (100%) diff --git a/DataProtection.sln b/DataProtection.sln index 7fb7eb05..3e9512f1 100644 --- a/DataProtection.sln +++ b/DataProtection.sln @@ -53,14 +53,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.DataPr EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.DataProtection.Extensions", "src\Microsoft.AspNetCore.DataProtection.Extensions\Microsoft.AspNetCore.DataProtection.Extensions.csproj", "{BF8681DB-C28B-441F-BD92-0DCFE9537A9F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.DataProtection.Redis", "src\Microsoft.AspNetCore.DataProtection.Redis\Microsoft.AspNetCore.DataProtection.Redis.csproj", "{0508ADB0-9D2E-4506-9AA3-C15D7BEAE7C9}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.DataProtection.AzureStorage", "src\Microsoft.AspNetCore.DataProtection.AzureStorage\Microsoft.AspNetCore.DataProtection.AzureStorage.csproj", "{CC799B57-81E2-4F45-8A32-0D5F49753C3F}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AzureBlob", "samples\AzureBlob\AzureBlob.csproj", "{B07435B3-CD81-4E3B-88A5-6384821E1C01}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.DataProtection.Redis.Test", "test\Microsoft.AspNetCore.DataProtection.Redis.Test\Microsoft.AspNetCore.DataProtection.Redis.Test.csproj", "{ABCF00E5-5B2F-469C-90DC-908C5A04C08D}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.DataProtection.AzureStorage.Test", "test\Microsoft.AspNetCore.DataProtection.AzureStorage.Test\Microsoft.AspNetCore.DataProtection.AzureStorage.Test.csproj", "{8C41240E-48F8-402F-9388-74CFE27F4D76}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Redis", "samples\Redis\Redis.csproj", "{24AAEC96-DF46-4F61-B2FF-3D5E056685D9}" @@ -83,6 +79,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.DataPr EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EntityFrameworkCoreSample", "samples\EntityFrameworkCoreSample\EntityFrameworkCoreSample.csproj", "{22BA4EAB-641E-42B2-BB37-9C3BCFD99F76}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.DataProtection.StackExchangeRedis", "src\Microsoft.AspNetCore.DataProtection.StackExchangeRedis\Microsoft.AspNetCore.DataProtection.StackExchangeRedis.csproj", "{57713B23-CCAB-44DB-A08D-55F9D236D05B}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.DataProtection.StackExchangeRedis.Test", "test\Microsoft.AspNetCore.DataProtection.StackExchangeRedis.Test\Microsoft.AspNetCore.DataProtection.StackExchangeRedis.Test.csproj", "{33BB1B86-64BF-45BB-A334-3E1A4802253C}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -175,14 +175,6 @@ Global {BF8681DB-C28B-441F-BD92-0DCFE9537A9F}.Release|Any CPU.Build.0 = Release|Any CPU {BF8681DB-C28B-441F-BD92-0DCFE9537A9F}.Release|x86.ActiveCfg = Release|Any CPU {BF8681DB-C28B-441F-BD92-0DCFE9537A9F}.Release|x86.Build.0 = Release|Any CPU - {0508ADB0-9D2E-4506-9AA3-C15D7BEAE7C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0508ADB0-9D2E-4506-9AA3-C15D7BEAE7C9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0508ADB0-9D2E-4506-9AA3-C15D7BEAE7C9}.Debug|x86.ActiveCfg = Debug|Any CPU - {0508ADB0-9D2E-4506-9AA3-C15D7BEAE7C9}.Debug|x86.Build.0 = Debug|Any CPU - {0508ADB0-9D2E-4506-9AA3-C15D7BEAE7C9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0508ADB0-9D2E-4506-9AA3-C15D7BEAE7C9}.Release|Any CPU.Build.0 = Release|Any CPU - {0508ADB0-9D2E-4506-9AA3-C15D7BEAE7C9}.Release|x86.ActiveCfg = Release|Any CPU - {0508ADB0-9D2E-4506-9AA3-C15D7BEAE7C9}.Release|x86.Build.0 = Release|Any CPU {CC799B57-81E2-4F45-8A32-0D5F49753C3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CC799B57-81E2-4F45-8A32-0D5F49753C3F}.Debug|Any CPU.Build.0 = Debug|Any CPU {CC799B57-81E2-4F45-8A32-0D5F49753C3F}.Debug|x86.ActiveCfg = Debug|Any CPU @@ -199,14 +191,6 @@ Global {B07435B3-CD81-4E3B-88A5-6384821E1C01}.Release|Any CPU.Build.0 = Release|Any CPU {B07435B3-CD81-4E3B-88A5-6384821E1C01}.Release|x86.ActiveCfg = Release|Any CPU {B07435B3-CD81-4E3B-88A5-6384821E1C01}.Release|x86.Build.0 = Release|Any CPU - {ABCF00E5-5B2F-469C-90DC-908C5A04C08D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ABCF00E5-5B2F-469C-90DC-908C5A04C08D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ABCF00E5-5B2F-469C-90DC-908C5A04C08D}.Debug|x86.ActiveCfg = Debug|Any CPU - {ABCF00E5-5B2F-469C-90DC-908C5A04C08D}.Debug|x86.Build.0 = Debug|Any CPU - {ABCF00E5-5B2F-469C-90DC-908C5A04C08D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ABCF00E5-5B2F-469C-90DC-908C5A04C08D}.Release|Any CPU.Build.0 = Release|Any CPU - {ABCF00E5-5B2F-469C-90DC-908C5A04C08D}.Release|x86.ActiveCfg = Release|Any CPU - {ABCF00E5-5B2F-469C-90DC-908C5A04C08D}.Release|x86.Build.0 = Release|Any CPU {8C41240E-48F8-402F-9388-74CFE27F4D76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8C41240E-48F8-402F-9388-74CFE27F4D76}.Debug|Any CPU.Build.0 = Debug|Any CPU {8C41240E-48F8-402F-9388-74CFE27F4D76}.Debug|x86.ActiveCfg = Debug|Any CPU @@ -295,6 +279,22 @@ Global {22BA4EAB-641E-42B2-BB37-9C3BCFD99F76}.Release|Any CPU.Build.0 = Release|Any CPU {22BA4EAB-641E-42B2-BB37-9C3BCFD99F76}.Release|x86.ActiveCfg = Release|Any CPU {22BA4EAB-641E-42B2-BB37-9C3BCFD99F76}.Release|x86.Build.0 = Release|Any CPU + {57713B23-CCAB-44DB-A08D-55F9D236D05B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {57713B23-CCAB-44DB-A08D-55F9D236D05B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {57713B23-CCAB-44DB-A08D-55F9D236D05B}.Debug|x86.ActiveCfg = Debug|Any CPU + {57713B23-CCAB-44DB-A08D-55F9D236D05B}.Debug|x86.Build.0 = Debug|Any CPU + {57713B23-CCAB-44DB-A08D-55F9D236D05B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {57713B23-CCAB-44DB-A08D-55F9D236D05B}.Release|Any CPU.Build.0 = Release|Any CPU + {57713B23-CCAB-44DB-A08D-55F9D236D05B}.Release|x86.ActiveCfg = Release|Any CPU + {57713B23-CCAB-44DB-A08D-55F9D236D05B}.Release|x86.Build.0 = Release|Any CPU + {33BB1B86-64BF-45BB-A334-3E1A4802253C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {33BB1B86-64BF-45BB-A334-3E1A4802253C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {33BB1B86-64BF-45BB-A334-3E1A4802253C}.Debug|x86.ActiveCfg = Debug|Any CPU + {33BB1B86-64BF-45BB-A334-3E1A4802253C}.Debug|x86.Build.0 = Debug|Any CPU + {33BB1B86-64BF-45BB-A334-3E1A4802253C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {33BB1B86-64BF-45BB-A334-3E1A4802253C}.Release|Any CPU.Build.0 = Release|Any CPU + {33BB1B86-64BF-45BB-A334-3E1A4802253C}.Release|x86.ActiveCfg = Release|Any CPU + {33BB1B86-64BF-45BB-A334-3E1A4802253C}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -311,10 +311,8 @@ Global {E3552DEB-4173-43AE-BF69-3C10DFF3BAB6} = {5FCB2DA3-5395-47F5-BCEE-E0EA319448EA} {04AA8E60-A053-4D50-89FE-E76C3DF45200} = {60336AB3-948D-4D15-A5FB-F32A2B91E814} {BF8681DB-C28B-441F-BD92-0DCFE9537A9F} = {5FCB2DA3-5395-47F5-BCEE-E0EA319448EA} - {0508ADB0-9D2E-4506-9AA3-C15D7BEAE7C9} = {5FCB2DA3-5395-47F5-BCEE-E0EA319448EA} {CC799B57-81E2-4F45-8A32-0D5F49753C3F} = {5FCB2DA3-5395-47F5-BCEE-E0EA319448EA} {B07435B3-CD81-4E3B-88A5-6384821E1C01} = {5A3A5DE3-49AD-431C-971D-B01B62D94AE2} - {ABCF00E5-5B2F-469C-90DC-908C5A04C08D} = {60336AB3-948D-4D15-A5FB-F32A2B91E814} {8C41240E-48F8-402F-9388-74CFE27F4D76} = {60336AB3-948D-4D15-A5FB-F32A2B91E814} {24AAEC96-DF46-4F61-B2FF-3D5E056685D9} = {5A3A5DE3-49AD-431C-971D-B01B62D94AE2} {32CF970B-E2F1-4CD9-8DB3-F5715475373A} = {5A3A5DE3-49AD-431C-971D-B01B62D94AE2} @@ -326,6 +324,8 @@ Global {06728BF2-C5EB-44C7-9F30-14FAA5649E14} = {60336AB3-948D-4D15-A5FB-F32A2B91E814} {3E4CA7FE-741B-4C78-A775-220E0E3C1B03} = {5FCB2DA3-5395-47F5-BCEE-E0EA319448EA} {22BA4EAB-641E-42B2-BB37-9C3BCFD99F76} = {5A3A5DE3-49AD-431C-971D-B01B62D94AE2} + {57713B23-CCAB-44DB-A08D-55F9D236D05B} = {5FCB2DA3-5395-47F5-BCEE-E0EA319448EA} + {33BB1B86-64BF-45BB-A334-3E1A4802253C} = {60336AB3-948D-4D15-A5FB-F32A2B91E814} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {DD305D75-BD1B-43AE-BF04-869DA6A0858F} diff --git a/build/dependencies.props b/build/dependencies.props index 697407ea..df63bb10 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -29,6 +29,7 @@ 4.7.49 2.0.3 1.2.6 + 2.0.513 4.5.0 4.5.0 8.1.4 diff --git a/samples/Redis/Program.cs b/samples/Redis/Program.cs index aa1cdf51..57d910ae 100644 --- a/samples/Redis/Program.cs +++ b/samples/Redis/Program.cs @@ -3,6 +3,7 @@ using System; using Microsoft.AspNetCore.DataProtection; +using Microsoft.AspNetCore.DataProtection.StackExchangeRedis; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using StackExchange.Redis; @@ -20,7 +21,7 @@ namespace RedisSample using (var services = new ServiceCollection() .AddLogging(o => o.AddConsole().SetMinimumLevel(LogLevel.Debug)) .AddDataProtection() - .PersistKeysToRedis(redis, "DataProtection-Keys") + .PersistKeysToStackExchangeRedis(redis, "DataProtection-Keys") .Services .BuildServiceProvider()) { diff --git a/samples/Redis/Redis.csproj b/samples/Redis/Redis.csproj index 072dc402..39ba0fae 100644 --- a/samples/Redis/Redis.csproj +++ b/samples/Redis/Redis.csproj @@ -1,4 +1,4 @@ - + net461;netcoreapp2.2 @@ -6,7 +6,7 @@ - + diff --git a/src/Microsoft.AspNetCore.DataProtection.Redis/baseline.netcore.json b/src/Microsoft.AspNetCore.DataProtection.Redis/baseline.netcore.json deleted file mode 100644 index 3a7f2aba..00000000 --- a/src/Microsoft.AspNetCore.DataProtection.Redis/baseline.netcore.json +++ /dev/null @@ -1,140 +0,0 @@ -{ - "AssemblyIdentity": "Microsoft.AspNetCore.DataProtection.Redis, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60", - "Types": [ - { - "Name": "Microsoft.AspNetCore.DataProtection.RedisDataProtectionBuilderExtensions", - "Visibility": "Public", - "Kind": "Class", - "Abstract": true, - "Static": true, - "Sealed": true, - "ImplementedInterfaces": [], - "Members": [ - { - "Kind": "Method", - "Name": "PersistKeysToRedis", - "Parameters": [ - { - "Name": "builder", - "Type": "Microsoft.AspNetCore.DataProtection.IDataProtectionBuilder" - }, - { - "Name": "databaseFactory", - "Type": "System.Func" - }, - { - "Name": "key", - "Type": "StackExchange.Redis.RedisKey" - } - ], - "ReturnType": "Microsoft.AspNetCore.DataProtection.IDataProtectionBuilder", - "Static": true, - "Extension": true, - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "PersistKeysToRedis", - "Parameters": [ - { - "Name": "builder", - "Type": "Microsoft.AspNetCore.DataProtection.IDataProtectionBuilder" - }, - { - "Name": "connectionMultiplexer", - "Type": "StackExchange.Redis.IConnectionMultiplexer" - } - ], - "ReturnType": "Microsoft.AspNetCore.DataProtection.IDataProtectionBuilder", - "Static": true, - "Extension": true, - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "PersistKeysToRedis", - "Parameters": [ - { - "Name": "builder", - "Type": "Microsoft.AspNetCore.DataProtection.IDataProtectionBuilder" - }, - { - "Name": "connectionMultiplexer", - "Type": "StackExchange.Redis.IConnectionMultiplexer" - }, - { - "Name": "key", - "Type": "StackExchange.Redis.RedisKey" - } - ], - "ReturnType": "Microsoft.AspNetCore.DataProtection.IDataProtectionBuilder", - "Static": true, - "Extension": true, - "Visibility": "Public", - "GenericParameter": [] - } - ], - "GenericParameters": [] - }, - { - "Name": "Microsoft.AspNetCore.DataProtection.RedisXmlRepository", - "Visibility": "Public", - "Kind": "Class", - "ImplementedInterfaces": [ - "Microsoft.AspNetCore.DataProtection.Repositories.IXmlRepository" - ], - "Members": [ - { - "Kind": "Method", - "Name": "GetAllElements", - "Parameters": [], - "ReturnType": "System.Collections.Generic.IReadOnlyCollection", - "Sealed": true, - "Virtual": true, - "ImplementedInterface": "Microsoft.AspNetCore.DataProtection.Repositories.IXmlRepository", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "StoreElement", - "Parameters": [ - { - "Name": "element", - "Type": "System.Xml.Linq.XElement" - }, - { - "Name": "friendlyName", - "Type": "System.String" - } - ], - "ReturnType": "System.Void", - "Sealed": true, - "Virtual": true, - "ImplementedInterface": "Microsoft.AspNetCore.DataProtection.Repositories.IXmlRepository", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Constructor", - "Name": ".ctor", - "Parameters": [ - { - "Name": "databaseFactory", - "Type": "System.Func" - }, - { - "Name": "key", - "Type": "StackExchange.Redis.RedisKey" - } - ], - "Visibility": "Public", - "GenericParameter": [] - } - ], - "GenericParameters": [] - } - ] -} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.DataProtection.Redis/Microsoft.AspNetCore.DataProtection.Redis.csproj b/src/Microsoft.AspNetCore.DataProtection.StackExchangeRedis/Microsoft.AspNetCore.DataProtection.StackExchangeRedis.csproj similarity index 82% rename from src/Microsoft.AspNetCore.DataProtection.Redis/Microsoft.AspNetCore.DataProtection.Redis.csproj rename to src/Microsoft.AspNetCore.DataProtection.StackExchangeRedis/Microsoft.AspNetCore.DataProtection.StackExchangeRedis.csproj index cab777d5..1aa6874f 100644 --- a/src/Microsoft.AspNetCore.DataProtection.Redis/Microsoft.AspNetCore.DataProtection.Redis.csproj +++ b/src/Microsoft.AspNetCore.DataProtection.StackExchangeRedis/Microsoft.AspNetCore.DataProtection.StackExchangeRedis.csproj @@ -13,7 +13,7 @@ - + diff --git a/src/Microsoft.AspNetCore.DataProtection.Redis/RedisDataProtectionBuilderExtensions.cs b/src/Microsoft.AspNetCore.DataProtection.StackExchangeRedis/RedisDataProtectionBuilderExtensions.cs similarity index 73% rename from src/Microsoft.AspNetCore.DataProtection.Redis/RedisDataProtectionBuilderExtensions.cs rename to src/Microsoft.AspNetCore.DataProtection.StackExchangeRedis/RedisDataProtectionBuilderExtensions.cs index 97593cbb..ead1b37d 100644 --- a/src/Microsoft.AspNetCore.DataProtection.Redis/RedisDataProtectionBuilderExtensions.cs +++ b/src/Microsoft.AspNetCore.DataProtection.StackExchangeRedis/RedisDataProtectionBuilderExtensions.cs @@ -5,13 +5,14 @@ using System; using StackExchange.Redis; using Microsoft.AspNetCore.DataProtection.KeyManagement; using Microsoft.Extensions.DependencyInjection; +using Microsoft.AspNetCore.DataProtection.StackExchangeRedis; namespace Microsoft.AspNetCore.DataProtection { /// /// Contains Redis-specific extension methods for modifying a . /// - public static class RedisDataProtectionBuilderExtensions + public static class StackExchangeRedisDataProtectionBuilderExtensions { private const string DataProtectionKeysName = "DataProtection-Keys"; @@ -22,7 +23,7 @@ namespace Microsoft.AspNetCore.DataProtection /// The delegate used to create instances. /// The used to store key list. /// A reference to the after this operation has completed. - public static IDataProtectionBuilder PersistKeysToRedis(this IDataProtectionBuilder builder, Func databaseFactory, RedisKey key) + public static IDataProtectionBuilder PersistKeysToStackExchangeRedis(this IDataProtectionBuilder builder, Func databaseFactory, RedisKey key) { if (builder == null) { @@ -32,7 +33,7 @@ namespace Microsoft.AspNetCore.DataProtection { throw new ArgumentNullException(nameof(databaseFactory)); } - return PersistKeysToRedisInternal(builder, databaseFactory, key); + return PersistKeysToStackExchangeRedisInternal(builder, databaseFactory, key); } /// @@ -41,9 +42,9 @@ namespace Microsoft.AspNetCore.DataProtection /// The builder instance to modify. /// The for database access. /// A reference to the after this operation has completed. - public static IDataProtectionBuilder PersistKeysToRedis(this IDataProtectionBuilder builder, IConnectionMultiplexer connectionMultiplexer) + public static IDataProtectionBuilder PersistKeysToStackExchangeRedis(this IDataProtectionBuilder builder, IConnectionMultiplexer connectionMultiplexer) { - return PersistKeysToRedis(builder, connectionMultiplexer, DataProtectionKeysName); + return PersistKeysToStackExchangeRedis(builder, connectionMultiplexer, DataProtectionKeysName); } /// @@ -53,7 +54,7 @@ namespace Microsoft.AspNetCore.DataProtection /// The for database access. /// The used to store key list. /// A reference to the after this operation has completed. - public static IDataProtectionBuilder PersistKeysToRedis(this IDataProtectionBuilder builder, IConnectionMultiplexer connectionMultiplexer, RedisKey key) + public static IDataProtectionBuilder PersistKeysToStackExchangeRedis(this IDataProtectionBuilder builder, IConnectionMultiplexer connectionMultiplexer, RedisKey key) { if (builder == null) { @@ -63,10 +64,10 @@ namespace Microsoft.AspNetCore.DataProtection { throw new ArgumentNullException(nameof(connectionMultiplexer)); } - return PersistKeysToRedisInternal(builder, () => connectionMultiplexer.GetDatabase(), key); + return PersistKeysToStackExchangeRedisInternal(builder, () => connectionMultiplexer.GetDatabase(), key); } - private static IDataProtectionBuilder PersistKeysToRedisInternal(IDataProtectionBuilder builder, Func databaseFactory, RedisKey key) + private static IDataProtectionBuilder PersistKeysToStackExchangeRedisInternal(IDataProtectionBuilder builder, Func databaseFactory, RedisKey key) { builder.Services.Configure(options => { diff --git a/src/Microsoft.AspNetCore.DataProtection.Redis/RedisXmlRepository.cs b/src/Microsoft.AspNetCore.DataProtection.StackExchangeRedis/RedisXmlRepository.cs similarity index 94% rename from src/Microsoft.AspNetCore.DataProtection.Redis/RedisXmlRepository.cs rename to src/Microsoft.AspNetCore.DataProtection.StackExchangeRedis/RedisXmlRepository.cs index 87a9338f..2665fd14 100644 --- a/src/Microsoft.AspNetCore.DataProtection.Redis/RedisXmlRepository.cs +++ b/src/Microsoft.AspNetCore.DataProtection.StackExchangeRedis/RedisXmlRepository.cs @@ -8,12 +8,12 @@ using System.Xml.Linq; using StackExchange.Redis; using Microsoft.AspNetCore.DataProtection.Repositories; -namespace Microsoft.AspNetCore.DataProtection +namespace Microsoft.AspNetCore.DataProtection.StackExchangeRedis { /// /// An XML repository backed by a Redis list entry. /// - public class RedisXmlRepository: IXmlRepository + public class RedisXmlRepository : IXmlRepository { private readonly Func _databaseFactory; private readonly RedisKey _key; diff --git a/test/Microsoft.AspNetCore.DataProtection.Redis.Test/DataProtectionRedisTests.cs b/test/Microsoft.AspNetCore.DataProtection.StackExchangeRedis.Test/DataProtectionRedisTests.cs similarity index 98% rename from test/Microsoft.AspNetCore.DataProtection.Redis.Test/DataProtectionRedisTests.cs rename to test/Microsoft.AspNetCore.DataProtection.StackExchangeRedis.Test/DataProtectionRedisTests.cs index c6bdad14..a204050a 100644 --- a/test/Microsoft.AspNetCore.DataProtection.Redis.Test/DataProtectionRedisTests.cs +++ b/test/Microsoft.AspNetCore.DataProtection.StackExchangeRedis.Test/DataProtectionRedisTests.cs @@ -13,7 +13,7 @@ using StackExchange.Redis; using Xunit; using Xunit.Abstractions; -namespace Microsoft.AspNetCore.DataProtection +namespace Microsoft.AspNetCore.DataProtection.StackExchangeRedis { public class DataProtectionRedisTests { diff --git a/test/Microsoft.AspNetCore.DataProtection.Redis.Test/Microsoft.AspNetCore.DataProtection.Redis.Test.csproj b/test/Microsoft.AspNetCore.DataProtection.StackExchangeRedis.Test/Microsoft.AspNetCore.DataProtection.StackExchangeRedis.Test.csproj similarity index 91% rename from test/Microsoft.AspNetCore.DataProtection.Redis.Test/Microsoft.AspNetCore.DataProtection.Redis.Test.csproj rename to test/Microsoft.AspNetCore.DataProtection.StackExchangeRedis.Test/Microsoft.AspNetCore.DataProtection.StackExchangeRedis.Test.csproj index 5b229672..87f9f318 100644 --- a/test/Microsoft.AspNetCore.DataProtection.Redis.Test/Microsoft.AspNetCore.DataProtection.Redis.Test.csproj +++ b/test/Microsoft.AspNetCore.DataProtection.StackExchangeRedis.Test/Microsoft.AspNetCore.DataProtection.StackExchangeRedis.Test.csproj @@ -16,7 +16,7 @@ - + diff --git a/test/Microsoft.AspNetCore.DataProtection.Redis.Test/RedisDataProtectionBuilderExtensionsTest.cs b/test/Microsoft.AspNetCore.DataProtection.StackExchangeRedis.Test/RedisDataProtectionBuilderExtensionsTest.cs similarity index 88% rename from test/Microsoft.AspNetCore.DataProtection.Redis.Test/RedisDataProtectionBuilderExtensionsTest.cs rename to test/Microsoft.AspNetCore.DataProtection.StackExchangeRedis.Test/RedisDataProtectionBuilderExtensionsTest.cs index a3d8f82e..2b4c2865 100644 --- a/test/Microsoft.AspNetCore.DataProtection.Redis.Test/RedisDataProtectionBuilderExtensionsTest.cs +++ b/test/Microsoft.AspNetCore.DataProtection.StackExchangeRedis.Test/RedisDataProtectionBuilderExtensionsTest.cs @@ -8,7 +8,7 @@ using Moq; using StackExchange.Redis; using Xunit; -namespace Microsoft.AspNetCore.DataProtection.Redis +namespace Microsoft.AspNetCore.DataProtection.StackExchangeRedis { public class RedisDataProtectionBuilderExtensionsTest { @@ -21,7 +21,7 @@ namespace Microsoft.AspNetCore.DataProtection.Redis var builder = serviceCollection.AddDataProtection(); // Act - builder.PersistKeysToRedis(connection); + builder.PersistKeysToStackExchangeRedis(connection); var services = serviceCollection.BuildServiceProvider(); // Assert diff --git a/test/Microsoft.AspNetCore.DataProtection.Redis.Test/TestRedisServer.cs b/test/Microsoft.AspNetCore.DataProtection.StackExchangeRedis.Test/TestRedisServer.cs similarity index 100% rename from test/Microsoft.AspNetCore.DataProtection.Redis.Test/TestRedisServer.cs rename to test/Microsoft.AspNetCore.DataProtection.StackExchangeRedis.Test/TestRedisServer.cs diff --git a/test/Microsoft.AspNetCore.DataProtection.Redis.Test/TestRedisServerIsAvailableAttribute.cs b/test/Microsoft.AspNetCore.DataProtection.StackExchangeRedis.Test/TestRedisServerIsAvailableAttribute.cs similarity index 100% rename from test/Microsoft.AspNetCore.DataProtection.Redis.Test/TestRedisServerIsAvailableAttribute.cs rename to test/Microsoft.AspNetCore.DataProtection.StackExchangeRedis.Test/TestRedisServerIsAvailableAttribute.cs diff --git a/test/Microsoft.AspNetCore.DataProtection.Redis.Test/testconfig.json b/test/Microsoft.AspNetCore.DataProtection.StackExchangeRedis.Test/testconfig.json similarity index 100% rename from test/Microsoft.AspNetCore.DataProtection.Redis.Test/testconfig.json rename to test/Microsoft.AspNetCore.DataProtection.StackExchangeRedis.Test/testconfig.json