diff --git a/IISIntegration.sln b/IISIntegration.sln index 635cd9fb47..e282d6cf49 100644 --- a/IISIntegration.sln +++ b/IISIntegration.sln @@ -1,4 +1,4 @@ - + Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 VisualStudioVersion = 14.0.24720.0 @@ -11,13 +11,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution NuGet.Config = NuGet.Config EndProjectSection EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.IISPlatformHandler", "src\Microsoft.AspNet.IISPlatformHandler\Microsoft.AspNet.IISPlatformHandler.xproj", "{ABE53415-83CE-4AF0-AF67-E52160C7862B}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.IISPlatformHandler", "src\Microsoft.AspNetCore.IISPlatformHandler\Microsoft.AspNetCore.IISPlatformHandler.xproj", "{ABE53415-83CE-4AF0-AF67-E52160C7862B}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{EF30B533-D715-421A-92B7-92FEF460AC9C}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.IISPlatformHandler.Tests", "test\Microsoft.AspNet.IISPlatformHandler.Tests\Microsoft.AspNet.IISPlatformHandler.Tests.xproj", "{FBBBE015-1CE3-454B-9647-23F8073FB7AB}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.IISPlatformHandler.Tests", "test\Microsoft.AspNetCore.IISPlatformHandler.Tests\Microsoft.AspNetCore.IISPlatformHandler.Tests.xproj", "{FBBBE015-1CE3-454B-9647-23F8073FB7AB}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.IISPlatformHandler.FunctionalTests", "test\Microsoft.AspNet.IISPlatformHandler.FunctionalTests\Microsoft.AspNet.IISPlatformHandler.FunctionalTests.xproj", "{A83A33D1-3D29-403C-9750-5811AC7B4025}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.IISPlatformHandler.FunctionalTests", "test\Microsoft.AspNetCore.IISPlatformHandler.FunctionalTests\Microsoft.AspNetCore.IISPlatformHandler.FunctionalTests.xproj", "{A83A33D1-3D29-403C-9750-5811AC7B4025}" EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "TestSites", "test\TestSites\TestSites.xproj", "{E27453AD-9CA0-49A2-94FA-96337D77677D}" EndProject diff --git a/samples/IISSample/Startup.cs b/samples/IISSample/Startup.cs index 684080703b..9a0c8d63bc 100644 --- a/samples/IISSample/Startup.cs +++ b/samples/IISSample/Startup.cs @@ -1,8 +1,8 @@ using System; using System.Collections; -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.Logging; namespace IISSample diff --git a/samples/IISSample/hosting.json b/samples/IISSample/hosting.json index f8ef14574d..6a93dbafa8 100644 --- a/samples/IISSample/hosting.json +++ b/samples/IISSample/hosting.json @@ -1,3 +1,3 @@ -{ - "server": "Microsoft.AspNet.Server.Kestrel" +{ + "server": "Microsoft.AspNetCore.Server.Kestrel" } diff --git a/samples/IISSample/project.json b/samples/IISSample/project.json index 5912601362..d9e42fd437 100644 --- a/samples/IISSample/project.json +++ b/samples/IISSample/project.json @@ -1,8 +1,8 @@ { "version": "1.0.0-*", "dependencies": { - "Microsoft.AspNet.IISPlatformHandler": "1.0.0-*", - "Microsoft.AspNet.Server.Kestrel": "1.0.0-*", + "Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*", + "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", "Microsoft.Extensions.Logging.Console": "1.0.0-*" }, "compilationOptions": { diff --git a/src/Microsoft.AspNetCore.IISPlatformHandler/AuthenticationHandler.cs b/src/Microsoft.AspNetCore.IISPlatformHandler/AuthenticationHandler.cs index 9526f6635b..cc14028ffc 100644 --- a/src/Microsoft.AspNetCore.IISPlatformHandler/AuthenticationHandler.cs +++ b/src/Microsoft.AspNetCore.IISPlatformHandler/AuthenticationHandler.cs @@ -1,16 +1,16 @@ -// 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; using System.Linq; using System.Security.Claims; using System.Threading.Tasks; -using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Http; -using Microsoft.AspNet.Http.Authentication; -using Microsoft.AspNet.Http.Features.Authentication; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Http.Authentication; +using Microsoft.AspNetCore.Http.Features.Authentication; -namespace Microsoft.AspNet.IISPlatformHandler +namespace Microsoft.AspNetCore.IISPlatformHandler { internal class AuthenticationHandler : IAuthenticationHandler { diff --git a/src/Microsoft.AspNetCore.IISPlatformHandler/ForwardedTlsConnectionFeature.cs b/src/Microsoft.AspNetCore.IISPlatformHandler/ForwardedTlsConnectionFeature.cs index c877568492..af78d0716d 100644 --- a/src/Microsoft.AspNetCore.IISPlatformHandler/ForwardedTlsConnectionFeature.cs +++ b/src/Microsoft.AspNetCore.IISPlatformHandler/ForwardedTlsConnectionFeature.cs @@ -1,15 +1,15 @@ -// 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; using System.Security.Cryptography.X509Certificates; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNet.Http.Features; +using Microsoft.AspNetCore.Http.Features; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Primitives; -namespace Microsoft.AspNet.IISPlatformHandler +namespace Microsoft.AspNetCore.IISPlatformHandler { internal class ForwardedTlsConnectionFeature : ITlsConnectionFeature { diff --git a/src/Microsoft.AspNetCore.IISPlatformHandler/IISPlatformHandlerAddressExtensions.cs b/src/Microsoft.AspNetCore.IISPlatformHandler/IISPlatformHandlerAddressExtensions.cs index 913bd2a57f..51a3b6180c 100644 --- a/src/Microsoft.AspNetCore.IISPlatformHandler/IISPlatformHandlerAddressExtensions.cs +++ b/src/Microsoft.AspNetCore.IISPlatformHandler/IISPlatformHandlerAddressExtensions.cs @@ -1,9 +1,9 @@ -// 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; -namespace Microsoft.AspNet.Hosting +namespace Microsoft.AspNetCore.Hosting { public static class IISPlatformHandlerAddressExtensions { diff --git a/src/Microsoft.AspNetCore.IISPlatformHandler/IISPlatformHandlerDefaults.cs b/src/Microsoft.AspNetCore.IISPlatformHandler/IISPlatformHandlerDefaults.cs index 2ca6f40588..dff42a06e3 100644 --- a/src/Microsoft.AspNetCore.IISPlatformHandler/IISPlatformHandlerDefaults.cs +++ b/src/Microsoft.AspNetCore.IISPlatformHandler/IISPlatformHandlerDefaults.cs @@ -1,7 +1,7 @@ -// 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. -namespace Microsoft.AspNet.IISPlatformHandler +namespace Microsoft.AspNetCore.IISPlatformHandler { public class IISPlatformHandlerDefaults { diff --git a/src/Microsoft.AspNetCore.IISPlatformHandler/IISPlatformHandlerMiddleware.cs b/src/Microsoft.AspNetCore.IISPlatformHandler/IISPlatformHandlerMiddleware.cs index 6c729fd762..94fb121b98 100644 --- a/src/Microsoft.AspNetCore.IISPlatformHandler/IISPlatformHandlerMiddleware.cs +++ b/src/Microsoft.AspNetCore.IISPlatformHandler/IISPlatformHandlerMiddleware.cs @@ -5,17 +5,17 @@ using System; using System.Globalization; using System.Security.Principal; using System.Threading.Tasks; -using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Http; -using Microsoft.AspNet.Http.Features; -using Microsoft.AspNet.Http.Features.Authentication; -using Microsoft.AspNet.Http.Features.Authentication.Internal; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Http.Features; +using Microsoft.AspNetCore.Http.Features.Authentication; +using Microsoft.AspNetCore.Http.Features.Authentication.Internal; using Microsoft.Extensions.Internal; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using Microsoft.Extensions.Primitives; -namespace Microsoft.AspNet.IISPlatformHandler +namespace Microsoft.AspNetCore.IISPlatformHandler { public class IISPlatformHandlerMiddleware { diff --git a/src/Microsoft.AspNetCore.IISPlatformHandler/IISPlatformHandlerMiddlewareExtensions.cs b/src/Microsoft.AspNetCore.IISPlatformHandler/IISPlatformHandlerMiddlewareExtensions.cs index 0fd8b5f428..35cb3253df 100644 --- a/src/Microsoft.AspNetCore.IISPlatformHandler/IISPlatformHandlerMiddlewareExtensions.cs +++ b/src/Microsoft.AspNetCore.IISPlatformHandler/IISPlatformHandlerMiddlewareExtensions.cs @@ -1,11 +1,11 @@ -// 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; -using Microsoft.AspNet.IISPlatformHandler; +using Microsoft.AspNetCore.IISPlatformHandler; using Microsoft.Extensions.Options; -namespace Microsoft.AspNet.Builder +namespace Microsoft.AspNetCore.Builder { public static class IISPlatformHandlerMiddlewareExtensions { diff --git a/src/Microsoft.AspNetCore.IISPlatformHandler/IISPlatformHandlerOptions.cs b/src/Microsoft.AspNetCore.IISPlatformHandler/IISPlatformHandlerOptions.cs index 6a309e91f4..1c1602f283 100644 --- a/src/Microsoft.AspNetCore.IISPlatformHandler/IISPlatformHandlerOptions.cs +++ b/src/Microsoft.AspNetCore.IISPlatformHandler/IISPlatformHandlerOptions.cs @@ -1,11 +1,11 @@ -// 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.Collections.Generic; -using Microsoft.AspNet.Http.Authentication; -using Microsoft.AspNet.IISPlatformHandler; +using Microsoft.AspNetCore.Http.Authentication; +using Microsoft.AspNetCore.IISPlatformHandler; -namespace Microsoft.AspNet.Builder +namespace Microsoft.AspNetCore.Builder { public class IISPlatformHandlerOptions { diff --git a/src/Microsoft.AspNetCore.IISPlatformHandler/Microsoft.AspNetCore.IISPlatformHandler.xproj b/src/Microsoft.AspNetCore.IISPlatformHandler/Microsoft.AspNetCore.IISPlatformHandler.xproj index 69ed25477d..6ac1949334 100644 --- a/src/Microsoft.AspNetCore.IISPlatformHandler/Microsoft.AspNetCore.IISPlatformHandler.xproj +++ b/src/Microsoft.AspNetCore.IISPlatformHandler/Microsoft.AspNetCore.IISPlatformHandler.xproj @@ -1,4 +1,4 @@ - + 14.0 @@ -7,7 +7,7 @@ abe53415-83ce-4af0-af67-e52160c7862b - Microsoft.AspNet.IISPlatformHandler + Microsoft.AspNetCore.IISPlatformHandler ..\..\artifacts\obj\$(MSBuildProjectName) ..\..\artifacts\bin\$(MSBuildProjectName)\ diff --git a/src/Microsoft.AspNetCore.IISPlatformHandler/NativeMethods.cs b/src/Microsoft.AspNetCore.IISPlatformHandler/NativeMethods.cs index 3454add20c..f7fd88619a 100644 --- a/src/Microsoft.AspNetCore.IISPlatformHandler/NativeMethods.cs +++ b/src/Microsoft.AspNetCore.IISPlatformHandler/NativeMethods.cs @@ -1,10 +1,10 @@ -// 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; using System.Runtime.InteropServices; -namespace Microsoft.AspNet.IISPlatformHandler +namespace Microsoft.AspNetCore.IISPlatformHandler { internal class NativeMethods { diff --git a/src/Microsoft.AspNetCore.IISPlatformHandler/project.json b/src/Microsoft.AspNetCore.IISPlatformHandler/project.json index a06a24d4eb..7a03687fb4 100644 --- a/src/Microsoft.AspNetCore.IISPlatformHandler/project.json +++ b/src/Microsoft.AspNetCore.IISPlatformHandler/project.json @@ -10,9 +10,9 @@ "url": "git://github.com/aspnet/IISIntegration" }, "dependencies": { - "Microsoft.AspNet.Hosting.Abstractions": "1.0.0-*", - "Microsoft.AspNet.Http": "1.0.0-*", - "Microsoft.AspNet.Http.Extensions": "1.0.0-*", + "Microsoft.AspNetCore.Hosting.Abstractions": "1.0.0-*", + "Microsoft.AspNetCore.Http": "1.0.0-*", + "Microsoft.AspNetCore.Http.Extensions": "1.0.0-*", "Microsoft.Extensions.Logging.Abstractions": "1.0.0-*", "Microsoft.Extensions.Options": "1.0.0-*", "Microsoft.Extensions.SecurityHelper.Sources": { diff --git a/src/dotnet-publish-iis/Program.cs b/src/dotnet-publish-iis/Program.cs index e053b87227..45a599b845 100644 --- a/src/dotnet-publish-iis/Program.cs +++ b/src/dotnet-publish-iis/Program.cs @@ -1,10 +1,10 @@ -// 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; using Microsoft.Extensions.CommandLineUtils; -namespace Microsoft.AspNet.Tools.PublishIIS +namespace Microsoft.AspNetCore.Tools.PublishIIS { public class Program { diff --git a/src/dotnet-publish-iis/PublishIISCommand.cs b/src/dotnet-publish-iis/PublishIISCommand.cs index 7d5720c8d3..05e05f52b4 100644 --- a/src/dotnet-publish-iis/PublishIISCommand.cs +++ b/src/dotnet-publish-iis/PublishIISCommand.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.IO; @@ -7,7 +7,7 @@ using System.Xml.Linq; using Microsoft.Extensions.Configuration; using Microsoft.DotNet.ProjectModel; -namespace Microsoft.AspNet.Tools.PublishIIS +namespace Microsoft.AspNetCore.Tools.PublishIIS { public class PublishIISCommand { diff --git a/src/dotnet-publish-iis/WebConfigTransform.cs b/src/dotnet-publish-iis/WebConfigTransform.cs index 4e6ec51cc9..40e5509acd 100644 --- a/src/dotnet-publish-iis/WebConfigTransform.cs +++ b/src/dotnet-publish-iis/WebConfigTransform.cs @@ -6,7 +6,7 @@ using System.IO; using System.Linq; using System.Xml.Linq; -namespace Microsoft.AspNet.Tools.PublishIIS +namespace Microsoft.AspNetCore.Tools.PublishIIS { public static class WebConfigTransform { diff --git a/test/Microsoft.AspNetCore.IISPlatformHandler.FunctionalTests/HelloWorldTest.cs b/test/Microsoft.AspNetCore.IISPlatformHandler.FunctionalTests/HelloWorldTest.cs index d58f670499..2434a7d6eb 100644 --- a/test/Microsoft.AspNetCore.IISPlatformHandler.FunctionalTests/HelloWorldTest.cs +++ b/test/Microsoft.AspNetCore.IISPlatformHandler.FunctionalTests/HelloWorldTest.cs @@ -5,13 +5,13 @@ using System; using System.IO; using System.Net.Http; using System.Threading.Tasks; -using Microsoft.AspNet.Server.Testing; -using Microsoft.AspNet.Testing.xunit; +using Microsoft.AspNetCore.Server.Testing; +using Microsoft.AspNetCore.Testing.xunit; using Microsoft.Extensions.Logging; using Xunit; using Xunit.Sdk; -namespace Microsoft.AspNet.IISPlatformHandler.FunctionalTests +namespace Microsoft.AspNetCore.IISPlatformHandler.FunctionalTests { // Uses ports ranging 5061 - 5069. public class HelloWorldTests diff --git a/test/Microsoft.AspNetCore.IISPlatformHandler.FunctionalTests/Helpers.cs b/test/Microsoft.AspNetCore.IISPlatformHandler.FunctionalTests/Helpers.cs index f25190a14b..eae3d1ea06 100644 --- a/test/Microsoft.AspNetCore.IISPlatformHandler.FunctionalTests/Helpers.cs +++ b/test/Microsoft.AspNetCore.IISPlatformHandler.FunctionalTests/Helpers.cs @@ -3,7 +3,7 @@ using System.IO; -namespace Microsoft.AspNet.IISPlatformHandler.FunctionalTests +namespace Microsoft.AspNetCore.IISPlatformHandler.FunctionalTests { public class Helpers { diff --git a/test/Microsoft.AspNetCore.IISPlatformHandler.FunctionalTests/HttpsTest.cs b/test/Microsoft.AspNetCore.IISPlatformHandler.FunctionalTests/HttpsTest.cs index 6d2d7e0895..3f7da0cc1e 100644 --- a/test/Microsoft.AspNetCore.IISPlatformHandler.FunctionalTests/HttpsTest.cs +++ b/test/Microsoft.AspNetCore.IISPlatformHandler.FunctionalTests/HttpsTest.cs @@ -6,13 +6,13 @@ using System.IO; using System.Net.Http; using System.Security.Cryptography.X509Certificates; using System.Threading.Tasks; -using Microsoft.AspNet.Server.Testing; -using Microsoft.AspNet.Testing.xunit; +using Microsoft.AspNetCore.Server.Testing; +using Microsoft.AspNetCore.Testing.xunit; using Microsoft.Extensions.Logging; using Xunit; using Xunit.Sdk; -namespace Microsoft.AspNet.IISPlatformHandler.FunctionalTests +namespace Microsoft.AspNetCore.IISPlatformHandler.FunctionalTests { // IisExpress preregisteres 44300-44399 ports. public class HttpsTest diff --git a/test/Microsoft.AspNetCore.IISPlatformHandler.FunctionalTests/Microsoft.AspNetCore.IISPlatformHandler.FunctionalTests.xproj b/test/Microsoft.AspNetCore.IISPlatformHandler.FunctionalTests/Microsoft.AspNetCore.IISPlatformHandler.FunctionalTests.xproj index d131a7a65f..c56a5b59ec 100644 --- a/test/Microsoft.AspNetCore.IISPlatformHandler.FunctionalTests/Microsoft.AspNetCore.IISPlatformHandler.FunctionalTests.xproj +++ b/test/Microsoft.AspNetCore.IISPlatformHandler.FunctionalTests/Microsoft.AspNetCore.IISPlatformHandler.FunctionalTests.xproj @@ -1,4 +1,4 @@ - + 14.0 @@ -7,7 +7,7 @@ a83a33d1-3d29-403c-9750-5811ac7b4025 - Microsoft.AspNet.PlatformHandler.FunctionalTests + Microsoft.AspNetCore.PlatformHandler.FunctionalTests ..\..\artifacts\obj\$(MSBuildProjectName) ..\..\artifacts\bin\$(MSBuildProjectName)\ diff --git a/test/Microsoft.AspNetCore.IISPlatformHandler.FunctionalTests/NtlmAuthentationTest.cs b/test/Microsoft.AspNetCore.IISPlatformHandler.FunctionalTests/NtlmAuthentationTest.cs index 99c7b34b2a..6374ba58ef 100644 --- a/test/Microsoft.AspNetCore.IISPlatformHandler.FunctionalTests/NtlmAuthentationTest.cs +++ b/test/Microsoft.AspNetCore.IISPlatformHandler.FunctionalTests/NtlmAuthentationTest.cs @@ -6,13 +6,13 @@ using System.IO; using System.Net; using System.Net.Http; using System.Threading.Tasks; -using Microsoft.AspNet.Server.Testing; -using Microsoft.AspNet.Testing.xunit; +using Microsoft.AspNetCore.Server.Testing; +using Microsoft.AspNetCore.Testing.xunit; using Microsoft.Extensions.Logging; using Xunit; using Xunit.Sdk; -namespace Microsoft.AspNet.IISPlatformHandler.FunctionalTests +namespace Microsoft.AspNetCore.IISPlatformHandler.FunctionalTests { // Uses ports ranging 5050 - 5060. public class NtlmAuthenticationTests diff --git a/test/Microsoft.AspNetCore.IISPlatformHandler.FunctionalTests/project.json b/test/Microsoft.AspNetCore.IISPlatformHandler.FunctionalTests/project.json index 07663dee48..ad3f466882 100644 --- a/test/Microsoft.AspNetCore.IISPlatformHandler.FunctionalTests/project.json +++ b/test/Microsoft.AspNetCore.IISPlatformHandler.FunctionalTests/project.json @@ -6,7 +6,7 @@ "test": "xunit.runner.aspnet" }, "dependencies": { - "Microsoft.AspNet.Server.Testing": "1.0.0-*", + "Microsoft.AspNetCore.Server.Testing": "1.0.0-*", "Microsoft.Extensions.Logging.Console": "1.0.0-*", "xunit.runner.aspnet": "2.0.0-aspnet-*" }, diff --git a/test/Microsoft.AspNetCore.IISPlatformHandler.Tests/HttpPlatformHandlerMiddlewareTests.cs b/test/Microsoft.AspNetCore.IISPlatformHandler.Tests/HttpPlatformHandlerMiddlewareTests.cs index ab6231ac54..eef9c303b7 100644 --- a/test/Microsoft.AspNetCore.IISPlatformHandler.Tests/HttpPlatformHandlerMiddlewareTests.cs +++ b/test/Microsoft.AspNetCore.IISPlatformHandler.Tests/HttpPlatformHandlerMiddlewareTests.cs @@ -1,15 +1,15 @@ -// 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.Net.Http; using System.Threading.Tasks; -using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Hosting; -using Microsoft.AspNet.Http.Features.Authentication; -using Microsoft.AspNet.TestHost; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Http.Features.Authentication; +using Microsoft.AspNetCore.TestHost; using Xunit; -namespace Microsoft.AspNet.IISPlatformHandler +namespace Microsoft.AspNetCore.IISPlatformHandler { public class HttpPlatformHandlerMiddlewareTests { @@ -26,7 +26,7 @@ namespace Microsoft.AspNet.IISPlatformHandler { var auth = (IHttpAuthenticationFeature)context.Features[typeof(IHttpAuthenticationFeature)]; Assert.NotNull(auth); - Assert.Equal("Microsoft.AspNet.IISPlatformHandler.AuthenticationHandler", auth.Handler.GetType().FullName); + Assert.Equal("Microsoft.AspNetCore.IISPlatformHandler.AuthenticationHandler", auth.Handler.GetType().FullName); assertsExecuted = true; return Task.FromResult(0); }); diff --git a/test/Microsoft.AspNetCore.IISPlatformHandler.Tests/Microsoft.AspNetCore.IISPlatformHandler.Tests.xproj b/test/Microsoft.AspNetCore.IISPlatformHandler.Tests/Microsoft.AspNetCore.IISPlatformHandler.Tests.xproj index e8cfa355aa..5f56bca6ba 100644 --- a/test/Microsoft.AspNetCore.IISPlatformHandler.Tests/Microsoft.AspNetCore.IISPlatformHandler.Tests.xproj +++ b/test/Microsoft.AspNetCore.IISPlatformHandler.Tests/Microsoft.AspNetCore.IISPlatformHandler.Tests.xproj @@ -1,4 +1,4 @@ - + 14.0 @@ -7,7 +7,7 @@ fbbbe015-1ce3-454b-9647-23f8073fb7ab - Microsoft.AspNet.PipelineHandler.Tests + Microsoft.AspNetCore.PipelineHandler.Tests ..\..\artifacts\obj\$(MSBuildProjectName) ..\..\artifacts\bin\$(MSBuildProjectName)\ diff --git a/test/Microsoft.AspNetCore.IISPlatformHandler.Tests/project.json b/test/Microsoft.AspNetCore.IISPlatformHandler.Tests/project.json index a5a8ecc4e0..5589ef735f 100644 --- a/test/Microsoft.AspNetCore.IISPlatformHandler.Tests/project.json +++ b/test/Microsoft.AspNetCore.IISPlatformHandler.Tests/project.json @@ -1,8 +1,8 @@ -{ +{ "version": "1.0.0-*", "dependencies": { - "Microsoft.AspNet.IISPlatformHandler": "1.0.0-*", - "Microsoft.AspNet.TestHost": "1.0.0-*", + "Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*", + "Microsoft.AspNetCore.TestHost": "1.0.0-*", "xunit.runner.aspnet": "2.0.0-aspnet-*" }, "commands": { diff --git a/test/TestSites/Program.cs b/test/TestSites/Program.cs index 4a38cf50a2..e468a20a85 100644 --- a/test/TestSites/Program.cs +++ b/test/TestSites/Program.cs @@ -1,7 +1,7 @@ -// 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 Microsoft.AspNet.Hosting; +using Microsoft.AspNetCore.Hosting; namespace TestSites { diff --git a/test/TestSites/StartupHelloWorld.cs b/test/TestSites/StartupHelloWorld.cs index 55f4833df3..b49729a343 100644 --- a/test/TestSites/StartupHelloWorld.cs +++ b/test/TestSites/StartupHelloWorld.cs @@ -1,8 +1,8 @@ // 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.Builder; -using Microsoft.AspNet.Http; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Logging; namespace TestSites diff --git a/test/TestSites/StartupHttpsHelloWorld.cs b/test/TestSites/StartupHttpsHelloWorld.cs index b15975e2aa..22ba71998e 100644 --- a/test/TestSites/StartupHttpsHelloWorld.cs +++ b/test/TestSites/StartupHttpsHelloWorld.cs @@ -1,8 +1,8 @@ // 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.Builder; -using Microsoft.AspNet.Http; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Logging; namespace TestSites diff --git a/test/TestSites/StartupNtlmAuthentication.cs b/test/TestSites/StartupNtlmAuthentication.cs index f950786272..86f9b8623a 100644 --- a/test/TestSites/StartupNtlmAuthentication.cs +++ b/test/TestSites/StartupNtlmAuthentication.cs @@ -3,9 +3,9 @@ using System; using System.Security.Principal; -using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Http; -using Microsoft.AspNet.Http.Authentication; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Http.Authentication; using Microsoft.Extensions.Logging; using Xunit; diff --git a/test/TestSites/hosting.json b/test/TestSites/hosting.json index f8ef14574d..6a93dbafa8 100644 --- a/test/TestSites/hosting.json +++ b/test/TestSites/hosting.json @@ -1,3 +1,3 @@ -{ - "server": "Microsoft.AspNet.Server.Kestrel" +{ + "server": "Microsoft.AspNetCore.Server.Kestrel" } diff --git a/test/TestSites/project.json b/test/TestSites/project.json index 1deaee70fb..46fe943692 100644 --- a/test/TestSites/project.json +++ b/test/TestSites/project.json @@ -1,10 +1,10 @@ { "version": "1.0.0-*", "dependencies": { - "Microsoft.AspNet.IISPlatformHandler": "1.0.0-*", - "Microsoft.AspNet.Server.Kestrel": "1.0.0-*", - "Microsoft.AspNet.Server.WebListener": "1.0.0-*", - "Microsoft.AspNet.WebUtilities": "1.0.0-*", + "Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*", + "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", + "Microsoft.AspNetCore.Server.WebListener": "1.0.0-*", + "Microsoft.AspNetCore.WebUtilities": "1.0.0-*", "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0-*", "Microsoft.Extensions.Configuration.Json": "1.0.0-*", "Microsoft.Extensions.Logging.Console": "1.0.0-*", diff --git a/test/dotnet-publish-iis.Tests/PublishIISCommandFacts.cs b/test/dotnet-publish-iis.Tests/PublishIISCommandFacts.cs index 152b6e3473..7f37b72aa1 100644 --- a/test/dotnet-publish-iis.Tests/PublishIISCommandFacts.cs +++ b/test/dotnet-publish-iis.Tests/PublishIISCommandFacts.cs @@ -1,10 +1,10 @@ -using Xunit; +using Xunit; using System.IO; using System.Linq; using System.Xml.Linq; using System; -namespace Microsoft.AspNet.Tools.PublishIIS.Tests +namespace Microsoft.AspNetCore.Tools.PublishIIS.Tests { public class PublishIISCommandFacts { diff --git a/test/dotnet-publish-iis.Tests/WebConfigTransformFacts.cs b/test/dotnet-publish-iis.Tests/WebConfigTransformFacts.cs index 44775a2eb8..e1aeddb3b0 100644 --- a/test/dotnet-publish-iis.Tests/WebConfigTransformFacts.cs +++ b/test/dotnet-publish-iis.Tests/WebConfigTransformFacts.cs @@ -2,7 +2,7 @@ using Xunit; using System.Linq; using System.Xml.Linq; -namespace Microsoft.AspNet.Tools.PublishIIS.Tests +namespace Microsoft.AspNetCore.Tools.PublishIIS.Tests { public class WebConfigTransformFacts {