diff --git a/DataProtection.sln b/DataProtection.sln index 20808113c9..6d0da99c3c 100644 --- a/DataProtection.sln +++ b/DataProtection.sln @@ -34,7 +34,7 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.DataPr EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.DataProtection.Redis", "src\Microsoft.AspNetCore.DataProtection.Redis\Microsoft.AspNetCore.DataProtection.Redis.xproj", "{0508ADB0-9D2E-4506-9AA3-C15D7BEAE7C9}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.DataProtection.Azure.Blob", "src\Microsoft.AspNetCore.DataProtection.Azure.Blob\Microsoft.AspNetCore.DataProtection.Azure.Blob.xproj", "{CC799B57-81E2-4F45-8A32-0D5F49753C3F}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.DataProtection.Azure.Storage", "src\Microsoft.AspNetCore.DataProtection.Azure.Storage\Microsoft.AspNetCore.DataProtection.Azure.Storage.xproj", "{CC799B57-81E2-4F45-8A32-0D5F49753C3F}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{5A3A5DE3-49AD-431C-971D-B01B62D94AE2}" EndProject @@ -48,7 +48,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution NuGet.config = NuGet.config EndProjectSection EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.DataProtection.Azure.Blob.Test", "test\Microsoft.AspNetCore.DataProtection.Azure.Blob.Test\Microsoft.AspNetCore.DataProtection.Azure.Blob.Test.xproj", "{8C41240E-48F8-402F-9388-74CFE27F4D76}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.DataProtection.Azure.Storage.Test", "test\Microsoft.AspNetCore.DataProtection.Azure.Storage.Test\Microsoft.AspNetCore.DataProtection.Azure.Storage.Test.xproj", "{8C41240E-48F8-402F-9388-74CFE27F4D76}" EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Redis", "samples\Redis\Redis.xproj", "{24AAEC96-DF46-4F61-B2FF-3D5E056685D9}" EndProject diff --git a/NuGetPackageVerifier.json b/NuGetPackageVerifier.json index 96174b2f82..6d2fed16b0 100644 --- a/NuGetPackageVerifier.json +++ b/NuGetPackageVerifier.json @@ -8,7 +8,7 @@ "Microsoft.AspNetCore.Cryptography.KeyDerivation": { }, "Microsoft.AspNetCore.DataProtection": { }, "Microsoft.AspNetCore.DataProtection.Abstractions": { }, - "Microsoft.AspNetCore.DataProtection.Azure.Blob": { }, + "Microsoft.AspNetCore.DataProtection.Azure.Storage": { }, "Microsoft.AspNetCore.DataProtection.Extensions": { }, "Microsoft.AspNetCore.DataProtection.Redis": { }, "Microsoft.AspNetCore.DataProtection.SystemWeb": { } diff --git a/samples/AzureBlob/Program.cs b/samples/AzureBlob/Program.cs index 45a69fb10c..d67432adac 100644 --- a/samples/AzureBlob/Program.cs +++ b/samples/AzureBlob/Program.cs @@ -3,7 +3,6 @@ using Microsoft.AspNetCore.DataProtection; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Microsoft.WindowsAzure.Storage; -using Microsoft.AspNetCore.DataProtection.Azure.Blob; namespace AzureBlob { diff --git a/samples/AzureBlob/project.json b/samples/AzureBlob/project.json index d4b49083a1..011a94e67a 100644 --- a/samples/AzureBlob/project.json +++ b/samples/AzureBlob/project.json @@ -6,7 +6,7 @@ "dependencies": { "Microsoft.AspNetCore.DataProtection": "1.1.0-*", - "Microsoft.AspNetCore.DataProtection.Azure.Blob": "0.1.0-*", + "Microsoft.AspNetCore.DataProtection.Azure.Storage": "1.0.0-*", "Microsoft.Extensions.DependencyInjection": "1.1.0-*", "Microsoft.Extensions.Logging": "1.1.0-*", "Microsoft.Extensions.Logging.Console": "1.1.0-*", diff --git a/src/Microsoft.AspNetCore.DataProtection.Azure.Blob/AzureBlobXmlRepository.cs b/src/Microsoft.AspNetCore.DataProtection.Azure.Storage/AzureBlobXmlRepository.cs similarity index 99% rename from src/Microsoft.AspNetCore.DataProtection.Azure.Blob/AzureBlobXmlRepository.cs rename to src/Microsoft.AspNetCore.DataProtection.Azure.Storage/AzureBlobXmlRepository.cs index 0020fdc693..f24f5c7669 100644 --- a/src/Microsoft.AspNetCore.DataProtection.Azure.Blob/AzureBlobXmlRepository.cs +++ b/src/Microsoft.AspNetCore.DataProtection.Azure.Storage/AzureBlobXmlRepository.cs @@ -15,7 +15,7 @@ using Microsoft.AspNetCore.DataProtection.Repositories; using Microsoft.WindowsAzure.Storage; using Microsoft.WindowsAzure.Storage.Blob; -namespace Microsoft.AspNetCore.DataProtection.Azure.Blob +namespace Microsoft.AspNetCore.DataProtection.Azure.Storage { /// /// An which is backed by Azure Blob Storage. diff --git a/src/Microsoft.AspNetCore.DataProtection.Azure.Blob/AzureDataProtectionBuilderExtensions.cs b/src/Microsoft.AspNetCore.DataProtection.Azure.Storage/AzureDataProtectionBuilderExtensions.cs similarity index 98% rename from src/Microsoft.AspNetCore.DataProtection.Azure.Blob/AzureDataProtectionBuilderExtensions.cs rename to src/Microsoft.AspNetCore.DataProtection.Azure.Storage/AzureDataProtectionBuilderExtensions.cs index 0c5ac7299c..ebf54579f1 100644 --- a/src/Microsoft.AspNetCore.DataProtection.Azure.Blob/AzureDataProtectionBuilderExtensions.cs +++ b/src/Microsoft.AspNetCore.DataProtection.Azure.Storage/AzureDataProtectionBuilderExtensions.cs @@ -2,13 +2,14 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using Microsoft.AspNetCore.DataProtection.Azure.Storage; using Microsoft.AspNetCore.DataProtection.Repositories; using Microsoft.Extensions.DependencyInjection; using Microsoft.WindowsAzure.Storage; using Microsoft.WindowsAzure.Storage.Auth; using Microsoft.WindowsAzure.Storage.Blob; -namespace Microsoft.AspNetCore.DataProtection.Azure.Blob +namespace Microsoft.AspNetCore.DataProtection { /// /// Contains Azure-specific extension methods for modifying a diff --git a/src/Microsoft.AspNetCore.DataProtection.Azure.Blob/Microsoft.AspNetCore.DataProtection.Azure.Blob.xproj b/src/Microsoft.AspNetCore.DataProtection.Azure.Storage/Microsoft.AspNetCore.DataProtection.Azure.Storage.xproj similarity index 91% rename from src/Microsoft.AspNetCore.DataProtection.Azure.Blob/Microsoft.AspNetCore.DataProtection.Azure.Blob.xproj rename to src/Microsoft.AspNetCore.DataProtection.Azure.Storage/Microsoft.AspNetCore.DataProtection.Azure.Storage.xproj index 10f72048c6..0645a6ffb2 100644 --- a/src/Microsoft.AspNetCore.DataProtection.Azure.Blob/Microsoft.AspNetCore.DataProtection.Azure.Blob.xproj +++ b/src/Microsoft.AspNetCore.DataProtection.Azure.Storage/Microsoft.AspNetCore.DataProtection.Azure.Storage.xproj @@ -7,11 +7,10 @@ cc799b57-81e2-4f45-8a32-0d5f49753c3f - Microsoft.AspNetCore.DataProtection.Azure + Microsoft.AspNetCore.DataProtection.Azure.Storage .\obj .\bin\ - 2.0 diff --git a/src/Microsoft.AspNetCore.DataProtection.Azure.Blob/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.DataProtection.Azure.Storage/Properties/AssemblyInfo.cs similarity index 100% rename from src/Microsoft.AspNetCore.DataProtection.Azure.Blob/Properties/AssemblyInfo.cs rename to src/Microsoft.AspNetCore.DataProtection.Azure.Storage/Properties/AssemblyInfo.cs diff --git a/src/Microsoft.AspNetCore.DataProtection.Azure.Blob/project.json b/src/Microsoft.AspNetCore.DataProtection.Azure.Storage/project.json similarity index 90% rename from src/Microsoft.AspNetCore.DataProtection.Azure.Blob/project.json rename to src/Microsoft.AspNetCore.DataProtection.Azure.Storage/project.json index 27d11056c3..7dcdcd9179 100644 --- a/src/Microsoft.AspNetCore.DataProtection.Azure.Blob/project.json +++ b/src/Microsoft.AspNetCore.DataProtection.Azure.Storage/project.json @@ -1,5 +1,5 @@ { - "version": "0.1.0-*", + "version": "1.0.0-*", "description": "Microsoft Azure Blob storrage support as key store.", "packOptions": { "repository": { @@ -15,7 +15,7 @@ }, "dependencies": { "Microsoft.AspNetCore.DataProtection": "1.1.0-*", - "WindowsAzure.Storage": "7.0.2-preview" + "WindowsAzure.Storage": "7.2.1" }, "frameworks": { "net451": {}, diff --git a/src/Microsoft.AspNetCore.DataProtection.Redis/RedisDataProtectionBuilderExtensions.cs b/src/Microsoft.AspNetCore.DataProtection.Redis/RedisDataProtectionBuilderExtensions.cs index 2974d23ce9..f18e0536b7 100644 --- a/src/Microsoft.AspNetCore.DataProtection.Redis/RedisDataProtectionBuilderExtensions.cs +++ b/src/Microsoft.AspNetCore.DataProtection.Redis/RedisDataProtectionBuilderExtensions.cs @@ -4,7 +4,6 @@ using System; using StackExchange.Redis; using Microsoft.AspNetCore.DataProtection.Repositories; -using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; namespace Microsoft.AspNetCore.DataProtection diff --git a/test/Microsoft.AspNetCore.DataProtection.Azure.Blob.Test/AzureBlobXmlRepositoryTests.cs b/test/Microsoft.AspNetCore.DataProtection.Azure.Storage.Test/AzureBlobXmlRepositoryTests.cs similarity index 97% rename from test/Microsoft.AspNetCore.DataProtection.Azure.Blob.Test/AzureBlobXmlRepositoryTests.cs rename to test/Microsoft.AspNetCore.DataProtection.Azure.Storage.Test/AzureBlobXmlRepositoryTests.cs index fefee2dad1..520b273d29 100644 --- a/test/Microsoft.AspNetCore.DataProtection.Azure.Blob.Test/AzureBlobXmlRepositoryTests.cs +++ b/test/Microsoft.AspNetCore.DataProtection.Azure.Storage.Test/AzureBlobXmlRepositoryTests.cs @@ -6,13 +6,13 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Xml.Linq; -using Microsoft.AspNetCore.DataProtection.Azure.Blob; +using Microsoft.AspNetCore.DataProtection.Azure.Storage; using Microsoft.WindowsAzure.Storage; using Microsoft.WindowsAzure.Storage.Blob; using Moq; using Xunit; -namespace Microsoft.AspNetCore.DataProtection.Azure.Test +namespace Microsoft.AspNetCore.DataProtection.Azure.Storage.Test { public class AzureBlobXmlRepositoryTests { diff --git a/test/Microsoft.AspNetCore.DataProtection.Azure.Blob.Test/Microsoft.AspNetCore.DataProtection.Azure.Blob.Test.xproj b/test/Microsoft.AspNetCore.DataProtection.Azure.Storage.Test/Microsoft.AspNetCore.DataProtection.Azure.Storage.Test.xproj similarity index 91% rename from test/Microsoft.AspNetCore.DataProtection.Azure.Blob.Test/Microsoft.AspNetCore.DataProtection.Azure.Blob.Test.xproj rename to test/Microsoft.AspNetCore.DataProtection.Azure.Storage.Test/Microsoft.AspNetCore.DataProtection.Azure.Storage.Test.xproj index 5f0d8f3acc..efc577930b 100644 --- a/test/Microsoft.AspNetCore.DataProtection.Azure.Blob.Test/Microsoft.AspNetCore.DataProtection.Azure.Blob.Test.xproj +++ b/test/Microsoft.AspNetCore.DataProtection.Azure.Storage.Test/Microsoft.AspNetCore.DataProtection.Azure.Storage.Test.xproj @@ -7,7 +7,7 @@ 8c41240e-48f8-402f-9388-74cfe27f4d76 - Microsoft.AspNetCore.DataProtection.Azure.Test + Microsoft.AspNetCore.DataProtection.Azure.Storage.Test .\obj .\bin\ diff --git a/test/Microsoft.AspNetCore.DataProtection.Azure.Blob.Test/project.json b/test/Microsoft.AspNetCore.DataProtection.Azure.Storage.Test/project.json similarity index 92% rename from test/Microsoft.AspNetCore.DataProtection.Azure.Blob.Test/project.json rename to test/Microsoft.AspNetCore.DataProtection.Azure.Storage.Test/project.json index 8ca8ffc9fa..2215160a64 100644 --- a/test/Microsoft.AspNetCore.DataProtection.Azure.Blob.Test/project.json +++ b/test/Microsoft.AspNetCore.DataProtection.Azure.Storage.Test/project.json @@ -2,7 +2,7 @@ "dependencies": { "dotnet-test-xunit": "2.2.0-*", "Microsoft.AspNetCore.DataProtection": "1.1.0-*", - "Microsoft.AspNetCore.DataProtection.Azure.Blob": "0.1.0-*", + "Microsoft.AspNetCore.DataProtection.Azure.Storage": "1.0.0-*", "Microsoft.AspNetCore.Testing": "1.1.0-*", "Microsoft.Extensions.DependencyInjection": "1.1.0-*", "xunit": "2.2.0-*",