From 7ecbee2f7d05c056ef0948a7efadaf471f3c74b7 Mon Sep 17 00:00:00 2001 From: Brennan Date: Wed, 29 Apr 2015 17:21:04 -0700 Subject: [PATCH] Interfaces->Abstractions --- DataProtection.sln | 4 ++-- .../Properties/AssemblyInfo.cs | 2 +- .../CryptoUtil.cs | 0 .../DataProtectionExtensions.cs | 2 +- .../Error.cs | 2 +- .../IDataProtectionProvider.cs | 0 .../IDataProtector.cs | 0 .../Infrastructure/IApplicationDiscriminator.cs | 0 .../Microsoft.AspNet.DataProtection.Abstractions.xproj} | 0 .../Properties/AssemblyInfo.cs | 2 +- .../Properties/Resources.Designer.cs | 4 ++-- .../Resources.resx | 0 .../WebEncoders.cs | 0 .../project.json | 0 src/Microsoft.AspNet.DataProtection/project.json | 2 +- .../DataProtectionExtensionsTests.cs | 2 +- .../Microsoft.AspNet.DataProtection.Abstractions.Test.xproj} | 0 .../project.json | 2 +- .../project.json | 2 +- 19 files changed, 12 insertions(+), 12 deletions(-) rename src/{Microsoft.AspNet.DataProtection.Interfaces => Microsoft.AspNet.DataProtection.Abstractions}/CryptoUtil.cs (100%) rename src/{Microsoft.AspNet.DataProtection.Interfaces => Microsoft.AspNet.DataProtection.Abstractions}/DataProtectionExtensions.cs (99%) rename src/{Microsoft.AspNet.DataProtection.Interfaces => Microsoft.AspNet.DataProtection.Abstractions}/Error.cs (93%) rename src/{Microsoft.AspNet.DataProtection.Interfaces => Microsoft.AspNet.DataProtection.Abstractions}/IDataProtectionProvider.cs (100%) rename src/{Microsoft.AspNet.DataProtection.Interfaces => Microsoft.AspNet.DataProtection.Abstractions}/IDataProtector.cs (100%) rename src/{Microsoft.AspNet.DataProtection.Interfaces => Microsoft.AspNet.DataProtection.Abstractions}/Infrastructure/IApplicationDiscriminator.cs (100%) rename src/{Microsoft.AspNet.DataProtection.Interfaces/Microsoft.AspNet.DataProtection.Interfaces.xproj => Microsoft.AspNet.DataProtection.Abstractions/Microsoft.AspNet.DataProtection.Abstractions.xproj} (100%) rename src/{Microsoft.AspNet.DataProtection.Interfaces => Microsoft.AspNet.DataProtection.Abstractions}/Properties/AssemblyInfo.cs (80%) rename src/{Microsoft.AspNet.DataProtection.Interfaces => Microsoft.AspNet.DataProtection.Abstractions}/Properties/Resources.Designer.cs (95%) rename src/{Microsoft.AspNet.DataProtection.Interfaces => Microsoft.AspNet.DataProtection.Abstractions}/Resources.resx (100%) rename src/{Microsoft.AspNet.DataProtection.Interfaces => Microsoft.AspNet.DataProtection.Abstractions}/WebEncoders.cs (100%) rename src/{Microsoft.AspNet.DataProtection.Interfaces => Microsoft.AspNet.DataProtection.Abstractions}/project.json (100%) rename test/{Microsoft.AspNet.DataProtection.Interfaces.Test => Microsoft.AspNet.DataProtection.Abstractions.Test}/DataProtectionExtensionsTests.cs (99%) rename test/{Microsoft.AspNet.DataProtection.Interfaces.Test/Microsoft.AspNet.DataProtection.Interfaces.Test.xproj => Microsoft.AspNet.DataProtection.Abstractions.Test/Microsoft.AspNet.DataProtection.Abstractions.Test.xproj} (100%) rename test/{Microsoft.AspNet.DataProtection.Interfaces.Test => Microsoft.AspNet.DataProtection.Abstractions.Test}/project.json (86%) diff --git a/DataProtection.sln b/DataProtection.sln index cf081e45be..32886677e3 100644 --- a/DataProtection.sln +++ b/DataProtection.sln @@ -19,9 +19,9 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Cryptograp EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Cryptography.Internal.Test", "test\Microsoft.AspNet.Cryptography.Internal.Test\Microsoft.AspNet.Cryptography.Internal.Test.xproj", "{37053D5F-5B61-47CE-8B72-298CE007FFB0}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.DataProtection.Interfaces", "src\Microsoft.AspNet.DataProtection.Interfaces\Microsoft.AspNet.DataProtection.Interfaces.xproj", "{4B115BDE-B253-46A6-97BF-A8B37B344FF2}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.DataProtection.Abstractions", "src\Microsoft.AspNet.DataProtection.Abstractions\Microsoft.AspNet.DataProtection.Abstractions.xproj", "{4B115BDE-B253-46A6-97BF-A8B37B344FF2}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.DataProtection.Interfaces.Test", "test\Microsoft.AspNet.DataProtection.Interfaces.Test\Microsoft.AspNet.DataProtection.Interfaces.Test.xproj", "{FF650A69-DEE4-4B36-9E30-264EE7CFB478}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.DataProtection.Abstractions.Test", "test\Microsoft.AspNet.DataProtection.Abstractions.Test\Microsoft.AspNet.DataProtection.Abstractions.Test.xproj", "{FF650A69-DEE4-4B36-9E30-264EE7CFB478}" EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.DataProtection.Test.Shared", "test\Microsoft.AspNet.DataProtection.Test.Shared\Microsoft.AspNet.DataProtection.Test.Shared.xproj", "{4F14BA2A-4F04-4676-8586-EC380977EE2E}" EndProject diff --git a/src/Microsoft.AspNet.Cryptography.Internal/Properties/AssemblyInfo.cs b/src/Microsoft.AspNet.Cryptography.Internal/Properties/AssemblyInfo.cs index e0757a8c7e..2eee92352a 100644 --- a/src/Microsoft.AspNet.Cryptography.Internal/Properties/AssemblyInfo.cs +++ b/src/Microsoft.AspNet.Cryptography.Internal/Properties/AssemblyInfo.cs @@ -13,6 +13,6 @@ using System.Runtime.InteropServices; [assembly: InternalsVisibleTo("Microsoft.AspNet.Cryptography.KeyDerivation")] [assembly: InternalsVisibleTo("Microsoft.AspNet.Cryptography.KeyDerivation.Test")] [assembly: InternalsVisibleTo("Microsoft.AspNet.DataProtection")] -[assembly: InternalsVisibleTo("Microsoft.AspNet.DataProtection.Interfaces.Test")] +[assembly: InternalsVisibleTo("Microsoft.AspNet.DataProtection.Abstractions.Test")] [assembly: InternalsVisibleTo("Microsoft.AspNet.DataProtection.Test")] [assembly: AssemblyMetadata("Serviceable", "True")] diff --git a/src/Microsoft.AspNet.DataProtection.Interfaces/CryptoUtil.cs b/src/Microsoft.AspNet.DataProtection.Abstractions/CryptoUtil.cs similarity index 100% rename from src/Microsoft.AspNet.DataProtection.Interfaces/CryptoUtil.cs rename to src/Microsoft.AspNet.DataProtection.Abstractions/CryptoUtil.cs diff --git a/src/Microsoft.AspNet.DataProtection.Interfaces/DataProtectionExtensions.cs b/src/Microsoft.AspNet.DataProtection.Abstractions/DataProtectionExtensions.cs similarity index 99% rename from src/Microsoft.AspNet.DataProtection.Interfaces/DataProtectionExtensions.cs rename to src/Microsoft.AspNet.DataProtection.Abstractions/DataProtectionExtensions.cs index 76693edd73..ca2229de33 100644 --- a/src/Microsoft.AspNet.DataProtection.Interfaces/DataProtectionExtensions.cs +++ b/src/Microsoft.AspNet.DataProtection.Abstractions/DataProtectionExtensions.cs @@ -7,7 +7,7 @@ using System.ComponentModel; using System.Diagnostics; using System.Security.Cryptography; using Microsoft.AspNet.DataProtection.Infrastructure; -using Microsoft.AspNet.DataProtection.Interfaces; +using Microsoft.AspNet.DataProtection.Abstractions; using Microsoft.Framework.Internal; #if DNX451 || DNXCORE50 // [[ISSUE1400]] Replace with DNX_ANY when it becomes available diff --git a/src/Microsoft.AspNet.DataProtection.Interfaces/Error.cs b/src/Microsoft.AspNet.DataProtection.Abstractions/Error.cs similarity index 93% rename from src/Microsoft.AspNet.DataProtection.Interfaces/Error.cs rename to src/Microsoft.AspNet.DataProtection.Abstractions/Error.cs index e479a1b833..119aab9bd3 100644 --- a/src/Microsoft.AspNet.DataProtection.Interfaces/Error.cs +++ b/src/Microsoft.AspNet.DataProtection.Abstractions/Error.cs @@ -3,7 +3,7 @@ using System; using System.Security.Cryptography; -using Microsoft.AspNet.DataProtection.Interfaces; +using Microsoft.AspNet.DataProtection.Abstractions; namespace Microsoft.AspNet.DataProtection { diff --git a/src/Microsoft.AspNet.DataProtection.Interfaces/IDataProtectionProvider.cs b/src/Microsoft.AspNet.DataProtection.Abstractions/IDataProtectionProvider.cs similarity index 100% rename from src/Microsoft.AspNet.DataProtection.Interfaces/IDataProtectionProvider.cs rename to src/Microsoft.AspNet.DataProtection.Abstractions/IDataProtectionProvider.cs diff --git a/src/Microsoft.AspNet.DataProtection.Interfaces/IDataProtector.cs b/src/Microsoft.AspNet.DataProtection.Abstractions/IDataProtector.cs similarity index 100% rename from src/Microsoft.AspNet.DataProtection.Interfaces/IDataProtector.cs rename to src/Microsoft.AspNet.DataProtection.Abstractions/IDataProtector.cs diff --git a/src/Microsoft.AspNet.DataProtection.Interfaces/Infrastructure/IApplicationDiscriminator.cs b/src/Microsoft.AspNet.DataProtection.Abstractions/Infrastructure/IApplicationDiscriminator.cs similarity index 100% rename from src/Microsoft.AspNet.DataProtection.Interfaces/Infrastructure/IApplicationDiscriminator.cs rename to src/Microsoft.AspNet.DataProtection.Abstractions/Infrastructure/IApplicationDiscriminator.cs diff --git a/src/Microsoft.AspNet.DataProtection.Interfaces/Microsoft.AspNet.DataProtection.Interfaces.xproj b/src/Microsoft.AspNet.DataProtection.Abstractions/Microsoft.AspNet.DataProtection.Abstractions.xproj similarity index 100% rename from src/Microsoft.AspNet.DataProtection.Interfaces/Microsoft.AspNet.DataProtection.Interfaces.xproj rename to src/Microsoft.AspNet.DataProtection.Abstractions/Microsoft.AspNet.DataProtection.Abstractions.xproj diff --git a/src/Microsoft.AspNet.DataProtection.Interfaces/Properties/AssemblyInfo.cs b/src/Microsoft.AspNet.DataProtection.Abstractions/Properties/AssemblyInfo.cs similarity index 80% rename from src/Microsoft.AspNet.DataProtection.Interfaces/Properties/AssemblyInfo.cs rename to src/Microsoft.AspNet.DataProtection.Abstractions/Properties/AssemblyInfo.cs index b25fbe06e2..2164560251 100644 --- a/src/Microsoft.AspNet.DataProtection.Interfaces/Properties/AssemblyInfo.cs +++ b/src/Microsoft.AspNet.DataProtection.Abstractions/Properties/AssemblyInfo.cs @@ -6,5 +6,5 @@ using System.Reflection; using System.Runtime.CompilerServices; // for unit testing -[assembly: InternalsVisibleTo("Microsoft.AspNet.DataProtection.Interfaces.Test")] +[assembly: InternalsVisibleTo("Microsoft.AspNet.DataProtection.Abstractions.Test")] [assembly: AssemblyMetadata("Serviceable", "True")] diff --git a/src/Microsoft.AspNet.DataProtection.Interfaces/Properties/Resources.Designer.cs b/src/Microsoft.AspNet.DataProtection.Abstractions/Properties/Resources.Designer.cs similarity index 95% rename from src/Microsoft.AspNet.DataProtection.Interfaces/Properties/Resources.Designer.cs rename to src/Microsoft.AspNet.DataProtection.Abstractions/Properties/Resources.Designer.cs index c0b13a79e6..c89ea1509b 100644 --- a/src/Microsoft.AspNet.DataProtection.Interfaces/Properties/Resources.Designer.cs +++ b/src/Microsoft.AspNet.DataProtection.Abstractions/Properties/Resources.Designer.cs @@ -1,5 +1,5 @@ // -namespace Microsoft.AspNet.DataProtection.Interfaces +namespace Microsoft.AspNet.DataProtection.Abstractions { using System.Globalization; using System.Reflection; @@ -8,7 +8,7 @@ namespace Microsoft.AspNet.DataProtection.Interfaces internal static class Resources { private static readonly ResourceManager _resourceManager - = new ResourceManager("Microsoft.AspNet.DataProtection.Interfaces.Resources", typeof(Resources).GetTypeInfo().Assembly); + = new ResourceManager("Microsoft.AspNet.DataProtection.Abstractions.Resources", typeof(Resources).GetTypeInfo().Assembly); /// /// The payload was invalid. diff --git a/src/Microsoft.AspNet.DataProtection.Interfaces/Resources.resx b/src/Microsoft.AspNet.DataProtection.Abstractions/Resources.resx similarity index 100% rename from src/Microsoft.AspNet.DataProtection.Interfaces/Resources.resx rename to src/Microsoft.AspNet.DataProtection.Abstractions/Resources.resx diff --git a/src/Microsoft.AspNet.DataProtection.Interfaces/WebEncoders.cs b/src/Microsoft.AspNet.DataProtection.Abstractions/WebEncoders.cs similarity index 100% rename from src/Microsoft.AspNet.DataProtection.Interfaces/WebEncoders.cs rename to src/Microsoft.AspNet.DataProtection.Abstractions/WebEncoders.cs diff --git a/src/Microsoft.AspNet.DataProtection.Interfaces/project.json b/src/Microsoft.AspNet.DataProtection.Abstractions/project.json similarity index 100% rename from src/Microsoft.AspNet.DataProtection.Interfaces/project.json rename to src/Microsoft.AspNet.DataProtection.Abstractions/project.json diff --git a/src/Microsoft.AspNet.DataProtection/project.json b/src/Microsoft.AspNet.DataProtection/project.json index 60b6bf893d..9d0fc06edc 100644 --- a/src/Microsoft.AspNet.DataProtection/project.json +++ b/src/Microsoft.AspNet.DataProtection/project.json @@ -3,7 +3,7 @@ "description": "ASP.NET 5 logic to protect and unprotect data, similar to DPAPI.", "dependencies": { "Microsoft.AspNet.Cryptography.Internal": "1.0.0-*", - "Microsoft.AspNet.DataProtection.Interfaces": "1.0.0-*", + "Microsoft.AspNet.DataProtection.Abstractions": "1.0.0-*", "Microsoft.AspNet.DataProtection.Shared": { "type": "build", "version": "" }, "Microsoft.Framework.DependencyInjection.Interfaces": "1.0.0-*", "Microsoft.Framework.Logging.Interfaces": "1.0.0-*", diff --git a/test/Microsoft.AspNet.DataProtection.Interfaces.Test/DataProtectionExtensionsTests.cs b/test/Microsoft.AspNet.DataProtection.Abstractions.Test/DataProtectionExtensionsTests.cs similarity index 99% rename from test/Microsoft.AspNet.DataProtection.Interfaces.Test/DataProtectionExtensionsTests.cs rename to test/Microsoft.AspNet.DataProtection.Abstractions.Test/DataProtectionExtensionsTests.cs index 42deb31f55..47c7013539 100644 --- a/test/Microsoft.AspNet.DataProtection.Interfaces.Test/DataProtectionExtensionsTests.cs +++ b/test/Microsoft.AspNet.DataProtection.Abstractions.Test/DataProtectionExtensionsTests.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.Security.Cryptography; using System.Text; using Microsoft.AspNet.DataProtection.Infrastructure; -using Microsoft.AspNet.DataProtection.Interfaces; +using Microsoft.AspNet.DataProtection.Abstractions; using Microsoft.AspNet.Testing; using Microsoft.Framework.Runtime; using Moq; diff --git a/test/Microsoft.AspNet.DataProtection.Interfaces.Test/Microsoft.AspNet.DataProtection.Interfaces.Test.xproj b/test/Microsoft.AspNet.DataProtection.Abstractions.Test/Microsoft.AspNet.DataProtection.Abstractions.Test.xproj similarity index 100% rename from test/Microsoft.AspNet.DataProtection.Interfaces.Test/Microsoft.AspNet.DataProtection.Interfaces.Test.xproj rename to test/Microsoft.AspNet.DataProtection.Abstractions.Test/Microsoft.AspNet.DataProtection.Abstractions.Test.xproj diff --git a/test/Microsoft.AspNet.DataProtection.Interfaces.Test/project.json b/test/Microsoft.AspNet.DataProtection.Abstractions.Test/project.json similarity index 86% rename from test/Microsoft.AspNet.DataProtection.Interfaces.Test/project.json rename to test/Microsoft.AspNet.DataProtection.Abstractions.Test/project.json index b1010674f5..5651458299 100644 --- a/test/Microsoft.AspNet.DataProtection.Interfaces.Test/project.json +++ b/test/Microsoft.AspNet.DataProtection.Abstractions.Test/project.json @@ -1,7 +1,7 @@ { "dependencies": { "Microsoft.AspNet.Cryptography.Internal": "1.0.0-*", - "Microsoft.AspNet.DataProtection.Interfaces": "1.0.0-*", + "Microsoft.AspNet.DataProtection.Abstractions": "1.0.0-*", "Microsoft.AspNet.Testing": "1.0.0-*", "Moq": "4.2.1312.1622", "xunit.runner.aspnet": "2.0.0-aspnet-*" diff --git a/test/Microsoft.AspNet.DataProtection.Extensions.Test/project.json b/test/Microsoft.AspNet.DataProtection.Extensions.Test/project.json index bcc0e2decf..50d98f9f25 100644 --- a/test/Microsoft.AspNet.DataProtection.Extensions.Test/project.json +++ b/test/Microsoft.AspNet.DataProtection.Extensions.Test/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "Microsoft.AspNet.DataProtection.Interfaces": "1.0.0-*", + "Microsoft.AspNet.DataProtection.Abstractions": "1.0.0-*", "Microsoft.AspNet.DataProtection.Extensions": "1.0.0-*", "Microsoft.AspNet.Testing": "1.0.0-*", "Moq": "4.2.1312.1622",