diff --git a/NuGetPackageVerifier.json b/NuGetPackageVerifier.json index a925467083..0611a268af 100644 --- a/NuGetPackageVerifier.json +++ b/NuGetPackageVerifier.json @@ -9,7 +9,7 @@ "StrictSemanticVersionValidationRule" ], "packages": { - "Microsoft.AspNet.Session": { } + "Microsoft.AspNetCore.Session": { } } }, "Default": { // Rules to run for packages not listed in any other set. diff --git a/Session.sln b/Session.sln index c1c9671948..ea16779ff6 100644 --- a/Session.sln +++ b/Session.sln @@ -1,4 +1,4 @@ - + Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 VisualStudioVersion = 14.0.22625.0 @@ -7,9 +7,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{E9D63F97-6 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A189F10C-3A9C-4F81-83D0-32E5FE50DAD8}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Session", "src\Microsoft.AspNet.Session\Microsoft.AspNet.Session.xproj", "{71802736-F640-4733-9671-02D267EDD76A}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Session", "src\Microsoft.AspNetCore.Session\Microsoft.AspNetCore.Session.xproj", "{71802736-F640-4733-9671-02D267EDD76A}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Session.Tests", "test\Microsoft.AspNet.Session.Tests\Microsoft.AspNet.Session.Tests.xproj", "{8C131A0A-BC1A-4CF3-8B77-8813FBFE5639}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Session.Tests", "test\Microsoft.AspNetCore.Session.Tests\Microsoft.AspNetCore.Session.Tests.xproj", "{8C131A0A-BC1A-4CF3-8B77-8813FBFE5639}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{94E80ED2-9F27-40AC-A9EF-C707BDFAA3BE}" EndProject diff --git a/samples/SessionSample/Startup.cs b/samples/SessionSample/Startup.cs index 154124cf6a..64d1de4638 100644 --- a/samples/SessionSample/Startup.cs +++ b/samples/SessionSample/Startup.cs @@ -2,9 +2,9 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Hosting; -using Microsoft.AspNet.Http; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Http; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; diff --git a/samples/SessionSample/hosting.json b/samples/SessionSample/hosting.json index f8ef14574d..6a93dbafa8 100644 --- a/samples/SessionSample/hosting.json +++ b/samples/SessionSample/hosting.json @@ -1,3 +1,3 @@ -{ - "server": "Microsoft.AspNet.Server.Kestrel" +{ + "server": "Microsoft.AspNetCore.Server.Kestrel" } diff --git a/samples/SessionSample/project.json b/samples/SessionSample/project.json index 238b600e10..0385620785 100644 --- a/samples/SessionSample/project.json +++ b/samples/SessionSample/project.json @@ -6,9 +6,9 @@ "web": "SessionSample" }, "dependencies": { - "Microsoft.AspNet.IISPlatformHandler": "1.0.0-*", - "Microsoft.AspNet.Server.Kestrel": "1.0.0-*", - "Microsoft.AspNet.Session": "1.0.0-*", + "Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*", + "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", + "Microsoft.AspNetCore.Session": "1.0.0-*", "Microsoft.Extensions.Caching.Memory": "1.0.0-*", "Microsoft.Extensions.Caching.Redis": "1.0.0-*", "Microsoft.Extensions.Caching.SqlServer": "1.0.0-*", diff --git a/src/Microsoft.AspNetCore.Session/DistributedSession.cs b/src/Microsoft.AspNetCore.Session/DistributedSession.cs index 04c2c3aed1..2a06b62075 100644 --- a/src/Microsoft.AspNetCore.Session/DistributedSession.cs +++ b/src/Microsoft.AspNetCore.Session/DistributedSession.cs @@ -7,11 +7,11 @@ using System.IO; using System.Linq; using System.Text; using System.Threading.Tasks; -using Microsoft.AspNet.Http.Features; +using Microsoft.AspNetCore.Http.Features; using Microsoft.Extensions.Caching.Distributed; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNet.Session +namespace Microsoft.AspNetCore.Session { public class DistributedSession : ISession { diff --git a/src/Microsoft.AspNetCore.Session/DistributedSessionStore.cs b/src/Microsoft.AspNetCore.Session/DistributedSessionStore.cs index 27b3b88372..7605dd1d77 100644 --- a/src/Microsoft.AspNetCore.Session/DistributedSessionStore.cs +++ b/src/Microsoft.AspNetCore.Session/DistributedSessionStore.cs @@ -2,11 +2,11 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNet.Http.Features; +using Microsoft.AspNetCore.Http.Features; using Microsoft.Extensions.Caching.Distributed; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNet.Session +namespace Microsoft.AspNetCore.Session { public class DistributedSessionStore : ISessionStore { diff --git a/src/Microsoft.AspNetCore.Session/ISessionStore.cs b/src/Microsoft.AspNetCore.Session/ISessionStore.cs index 14d22d9af7..68a62aeb63 100644 --- a/src/Microsoft.AspNetCore.Session/ISessionStore.cs +++ b/src/Microsoft.AspNetCore.Session/ISessionStore.cs @@ -2,9 +2,9 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNet.Http.Features; +using Microsoft.AspNetCore.Http.Features; -namespace Microsoft.AspNet.Session +namespace Microsoft.AspNetCore.Session { public interface ISessionStore { diff --git a/src/Microsoft.AspNetCore.Session/Properties/Resources.Designer.cs b/src/Microsoft.AspNetCore.Session/Properties/Resources.Designer.cs index 4ee53d8b6c..d071f6b698 100644 --- a/src/Microsoft.AspNetCore.Session/Properties/Resources.Designer.cs +++ b/src/Microsoft.AspNetCore.Session/Properties/Resources.Designer.cs @@ -1,5 +1,5 @@ // -namespace Microsoft.AspNet.Session +namespace Microsoft.AspNetCore.Session { using System.Globalization; using System.Reflection; @@ -8,7 +8,7 @@ namespace Microsoft.AspNet.Session internal static class Resources { private static readonly ResourceManager _resourceManager - = new ResourceManager("Microsoft.AspNet.Session.Resources", typeof(Resources).GetTypeInfo().Assembly); + = new ResourceManager("Microsoft.AspNetCore.Session.Resources", typeof(Resources).GetTypeInfo().Assembly); /// /// The key cannot be longer than '{0}' when encoded with UTF-8. diff --git a/src/Microsoft.AspNetCore.Session/SessionDefaults.cs b/src/Microsoft.AspNetCore.Session/SessionDefaults.cs index 1fb6859cab..31c8748dc4 100644 --- a/src/Microsoft.AspNetCore.Session/SessionDefaults.cs +++ b/src/Microsoft.AspNetCore.Session/SessionDefaults.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -namespace Microsoft.AspNet.Session +namespace Microsoft.AspNetCore.Session { /// /// Represents defaults for the Session. diff --git a/src/Microsoft.AspNetCore.Session/SessionFeature.cs b/src/Microsoft.AspNetCore.Session/SessionFeature.cs index 6fba066552..9a46919896 100644 --- a/src/Microsoft.AspNetCore.Session/SessionFeature.cs +++ b/src/Microsoft.AspNetCore.Session/SessionFeature.cs @@ -1,9 +1,9 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNet.Http.Features; +using Microsoft.AspNetCore.Http.Features; -namespace Microsoft.AspNet.Session +namespace Microsoft.AspNetCore.Session { public class SessionFeature : ISessionFeature { diff --git a/src/Microsoft.AspNetCore.Session/SessionMiddleware.cs b/src/Microsoft.AspNetCore.Session/SessionMiddleware.cs index f0d00838f9..a97177ed93 100644 --- a/src/Microsoft.AspNetCore.Session/SessionMiddleware.cs +++ b/src/Microsoft.AspNetCore.Session/SessionMiddleware.cs @@ -4,13 +4,13 @@ using System; using System.Security.Cryptography; using System.Threading.Tasks; -using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Http; -using Microsoft.AspNet.Http.Features; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Http.Features; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; -namespace Microsoft.AspNet.Session +namespace Microsoft.AspNetCore.Session { /// /// Enables the session state for the application. diff --git a/src/Microsoft.AspNetCore.Session/SessionMiddlewareExtensions.cs b/src/Microsoft.AspNetCore.Session/SessionMiddlewareExtensions.cs index 08fea0017c..c273124379 100644 --- a/src/Microsoft.AspNetCore.Session/SessionMiddlewareExtensions.cs +++ b/src/Microsoft.AspNetCore.Session/SessionMiddlewareExtensions.cs @@ -2,10 +2,10 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNet.Session; +using Microsoft.AspNetCore.Session; using Microsoft.Extensions.Options; -namespace Microsoft.AspNet.Builder +namespace Microsoft.AspNetCore.Builder { /// /// Extension methods for adding the to an application. diff --git a/src/Microsoft.AspNetCore.Session/SessionOptions.cs b/src/Microsoft.AspNetCore.Session/SessionOptions.cs index 2f6fe56d58..12caa678ad 100644 --- a/src/Microsoft.AspNetCore.Session/SessionOptions.cs +++ b/src/Microsoft.AspNetCore.Session/SessionOptions.cs @@ -2,9 +2,9 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNet.Session; +using Microsoft.AspNetCore.Session; -namespace Microsoft.AspNet.Builder +namespace Microsoft.AspNetCore.Builder { /// /// Represents the session state options for the application. diff --git a/src/Microsoft.AspNetCore.Session/SessionServiceCollectionExtensions.cs b/src/Microsoft.AspNetCore.Session/SessionServiceCollectionExtensions.cs index 2abcd0d668..8f0d184d58 100644 --- a/src/Microsoft.AspNetCore.Session/SessionServiceCollectionExtensions.cs +++ b/src/Microsoft.AspNetCore.Session/SessionServiceCollectionExtensions.cs @@ -2,8 +2,8 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Session; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Session; namespace Microsoft.Extensions.DependencyInjection { diff --git a/src/Microsoft.AspNetCore.Session/SipHash.cs b/src/Microsoft.AspNetCore.Session/SipHash.cs index 18afddf1e9..bad98fcab3 100644 --- a/src/Microsoft.AspNetCore.Session/SipHash.cs +++ b/src/Microsoft.AspNetCore.Session/SipHash.cs @@ -1,7 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -namespace Microsoft.AspNet.Session +namespace Microsoft.AspNetCore.Session { // A byte[] equality comparer based on the SipHash-2-4 algorithm. Key differences: // (a) we output 32-bit hashes instead of 64-bit hashes, and @@ -9,7 +9,7 @@ namespace Microsoft.AspNet.Session // and aren't returned to user code. // // Derived from the implementation in SignalR and modified to address byte[] instead of string. This derived version is not for cryptographic use, just hash codes. - // https://github.com/aspnet/SignalR-Server/blob/75f74169c81a51780f195d06b798302b2d76dbde/src/Microsoft.AspNet.SignalR.Server/Infrastructure/SipHashBasedStringEqualityComparer.cs + // https://github.com/aspnet/SignalR-Server/blob/75f74169c81a51780f195d06b798302b2d76dbde/src/Microsoft.AspNetCore.SignalR.Server/Infrastructure/SipHashBasedStringEqualityComparer.cs // Derivative work of https://github.com/tanglebones/ch-siphash. internal static class SipHash { diff --git a/src/Microsoft.AspNetCore.Session/project.json b/src/Microsoft.AspNetCore.Session/project.json index 5cf014b90a..a625347596 100644 --- a/src/Microsoft.AspNetCore.Session/project.json +++ b/src/Microsoft.AspNetCore.Session/project.json @@ -6,7 +6,7 @@ "url": "git://github.com/aspnet/session" }, "dependencies": { - "Microsoft.AspNet.Http.Abstractions": "1.0.0-*", + "Microsoft.AspNetCore.Http.Abstractions": "1.0.0-*", "Microsoft.Extensions.Caching.Abstractions": "1.0.0-*", "Microsoft.Extensions.Logging.Abstractions": "1.0.0-*", "Microsoft.Extensions.Options": "1.0.0-*" diff --git a/test/Microsoft.AspNetCore.Session.Tests/SessionTests.cs b/test/Microsoft.AspNetCore.Session.Tests/SessionTests.cs index 2903e7214c..2df22a23f4 100644 --- a/test/Microsoft.AspNetCore.Session.Tests/SessionTests.cs +++ b/test/Microsoft.AspNetCore.Session.Tests/SessionTests.cs @@ -6,11 +6,11 @@ using System.Collections.Generic; using System.Linq; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Hosting; -using Microsoft.AspNet.Http; -using Microsoft.AspNet.Http.Features; -using Microsoft.AspNet.TestHost; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Http.Features; +using Microsoft.AspNetCore.TestHost; using Microsoft.Extensions.Caching.Distributed; using Microsoft.Extensions.Caching.Memory; using Microsoft.Extensions.DependencyInjection; @@ -20,7 +20,7 @@ using Microsoft.Extensions.Logging.Testing; using Microsoft.Net.Http.Headers; using Xunit; -namespace Microsoft.AspNet.Session +namespace Microsoft.AspNetCore.Session { public class SessionTests { diff --git a/test/Microsoft.AspNetCore.Session.Tests/TestExtensions.cs b/test/Microsoft.AspNetCore.Session.Tests/TestExtensions.cs index f14be16e54..ddd2152589 100644 --- a/test/Microsoft.AspNetCore.Session.Tests/TestExtensions.cs +++ b/test/Microsoft.AspNetCore.Session.Tests/TestExtensions.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.Linq; using Microsoft.Extensions.Logging.Testing; -namespace Microsoft.AspNet.Session +namespace Microsoft.AspNetCore.Session { public static class TestExtensions { diff --git a/test/Microsoft.AspNetCore.Session.Tests/project.json b/test/Microsoft.AspNetCore.Session.Tests/project.json index 1d8bcbbc30..08aba5bc99 100644 --- a/test/Microsoft.AspNetCore.Session.Tests/project.json +++ b/test/Microsoft.AspNetCore.Session.Tests/project.json @@ -1,7 +1,7 @@ { "dependencies": { - "Microsoft.AspNet.Session": "1.0.0-*", - "Microsoft.AspNet.TestHost": "1.0.0-*", + "Microsoft.AspNetCore.Session": "1.0.0-*", + "Microsoft.AspNetCore.TestHost": "1.0.0-*", "Microsoft.Extensions.Caching.Memory": "1.0.0-*", "Microsoft.Extensions.Logging.Testing": "1.0.0-*", "xunit": "2.1.0"