diff --git a/src/Microsoft.AspNet.Hosting.Abstractions/EnvironmentName.cs b/src/Microsoft.AspNetCore.Hosting.Abstractions/EnvironmentName.cs similarity index 100% rename from src/Microsoft.AspNet.Hosting.Abstractions/EnvironmentName.cs rename to src/Microsoft.AspNetCore.Hosting.Abstractions/EnvironmentName.cs diff --git a/src/Microsoft.AspNet.Hosting.Abstractions/HostingEnvironmentExtensions.cs b/src/Microsoft.AspNetCore.Hosting.Abstractions/HostingEnvironmentExtensions.cs similarity index 100% rename from src/Microsoft.AspNet.Hosting.Abstractions/HostingEnvironmentExtensions.cs rename to src/Microsoft.AspNetCore.Hosting.Abstractions/HostingEnvironmentExtensions.cs diff --git a/src/Microsoft.AspNet.Hosting.Abstractions/IApplicationLifetime.cs b/src/Microsoft.AspNetCore.Hosting.Abstractions/IApplicationLifetime.cs similarity index 100% rename from src/Microsoft.AspNet.Hosting.Abstractions/IApplicationLifetime.cs rename to src/Microsoft.AspNetCore.Hosting.Abstractions/IApplicationLifetime.cs diff --git a/src/Microsoft.AspNet.Hosting.Abstractions/IHostingEnvironment.cs b/src/Microsoft.AspNetCore.Hosting.Abstractions/IHostingEnvironment.cs similarity index 100% rename from src/Microsoft.AspNet.Hosting.Abstractions/IHostingEnvironment.cs rename to src/Microsoft.AspNetCore.Hosting.Abstractions/IHostingEnvironment.cs diff --git a/src/Microsoft.AspNet.Hosting.Abstractions/IStartupFilter.cs b/src/Microsoft.AspNetCore.Hosting.Abstractions/IStartupFilter.cs similarity index 100% rename from src/Microsoft.AspNet.Hosting.Abstractions/IStartupFilter.cs rename to src/Microsoft.AspNetCore.Hosting.Abstractions/IStartupFilter.cs diff --git a/src/Microsoft.AspNet.Hosting.Abstractions/IWebHost.cs b/src/Microsoft.AspNetCore.Hosting.Abstractions/IWebHost.cs similarity index 100% rename from src/Microsoft.AspNet.Hosting.Abstractions/IWebHost.cs rename to src/Microsoft.AspNetCore.Hosting.Abstractions/IWebHost.cs diff --git a/src/Microsoft.AspNet.Hosting.Abstractions/IWebHostBuilder.cs b/src/Microsoft.AspNetCore.Hosting.Abstractions/IWebHostBuilder.cs similarity index 100% rename from src/Microsoft.AspNet.Hosting.Abstractions/IWebHostBuilder.cs rename to src/Microsoft.AspNetCore.Hosting.Abstractions/IWebHostBuilder.cs diff --git a/src/Microsoft.AspNet.Hosting.Abstractions/Microsoft.AspNet.Hosting.Abstractions.xproj b/src/Microsoft.AspNetCore.Hosting.Abstractions/Microsoft.AspNetCore.Hosting.Abstractions.xproj similarity index 100% rename from src/Microsoft.AspNet.Hosting.Abstractions/Microsoft.AspNet.Hosting.Abstractions.xproj rename to src/Microsoft.AspNetCore.Hosting.Abstractions/Microsoft.AspNetCore.Hosting.Abstractions.xproj diff --git a/src/Microsoft.AspNet.Hosting.Abstractions/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.Hosting.Abstractions/Properties/AssemblyInfo.cs similarity index 100% rename from src/Microsoft.AspNet.Hosting.Abstractions/Properties/AssemblyInfo.cs rename to src/Microsoft.AspNetCore.Hosting.Abstractions/Properties/AssemblyInfo.cs diff --git a/src/Microsoft.AspNet.Hosting.Abstractions/WebHostDefaults.cs b/src/Microsoft.AspNetCore.Hosting.Abstractions/WebHostDefaults.cs similarity index 100% rename from src/Microsoft.AspNet.Hosting.Abstractions/WebHostDefaults.cs rename to src/Microsoft.AspNetCore.Hosting.Abstractions/WebHostDefaults.cs diff --git a/src/Microsoft.AspNet.Hosting.Abstractions/project.json b/src/Microsoft.AspNetCore.Hosting.Abstractions/project.json similarity index 100% rename from src/Microsoft.AspNet.Hosting.Abstractions/project.json rename to src/Microsoft.AspNetCore.Hosting.Abstractions/project.json diff --git a/src/Microsoft.AspNet.Hosting.Server.Abstractions/IHttpApplication.cs b/src/Microsoft.AspNetCore.Hosting.Server.Abstractions/IHttpApplication.cs similarity index 100% rename from src/Microsoft.AspNet.Hosting.Server.Abstractions/IHttpApplication.cs rename to src/Microsoft.AspNetCore.Hosting.Server.Abstractions/IHttpApplication.cs diff --git a/src/Microsoft.AspNet.Hosting.Server.Abstractions/IServer.cs b/src/Microsoft.AspNetCore.Hosting.Server.Abstractions/IServer.cs similarity index 100% rename from src/Microsoft.AspNet.Hosting.Server.Abstractions/IServer.cs rename to src/Microsoft.AspNetCore.Hosting.Server.Abstractions/IServer.cs diff --git a/src/Microsoft.AspNet.Hosting.Server.Abstractions/IServerAddressesFeature.cs b/src/Microsoft.AspNetCore.Hosting.Server.Abstractions/IServerAddressesFeature.cs similarity index 100% rename from src/Microsoft.AspNet.Hosting.Server.Abstractions/IServerAddressesFeature.cs rename to src/Microsoft.AspNetCore.Hosting.Server.Abstractions/IServerAddressesFeature.cs diff --git a/src/Microsoft.AspNet.Hosting.Server.Abstractions/IServerFactory.cs b/src/Microsoft.AspNetCore.Hosting.Server.Abstractions/IServerFactory.cs similarity index 100% rename from src/Microsoft.AspNet.Hosting.Server.Abstractions/IServerFactory.cs rename to src/Microsoft.AspNetCore.Hosting.Server.Abstractions/IServerFactory.cs diff --git a/src/Microsoft.AspNet.Hosting.Server.Abstractions/Microsoft.AspNet.Hosting.Server.Abstractions.xproj b/src/Microsoft.AspNetCore.Hosting.Server.Abstractions/Microsoft.AspNetCore.Hosting.Server.Abstractions.xproj similarity index 100% rename from src/Microsoft.AspNet.Hosting.Server.Abstractions/Microsoft.AspNet.Hosting.Server.Abstractions.xproj rename to src/Microsoft.AspNetCore.Hosting.Server.Abstractions/Microsoft.AspNetCore.Hosting.Server.Abstractions.xproj diff --git a/src/Microsoft.AspNet.Hosting.Server.Abstractions/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.Hosting.Server.Abstractions/Properties/AssemblyInfo.cs similarity index 100% rename from src/Microsoft.AspNet.Hosting.Server.Abstractions/Properties/AssemblyInfo.cs rename to src/Microsoft.AspNetCore.Hosting.Server.Abstractions/Properties/AssemblyInfo.cs diff --git a/src/Microsoft.AspNet.Hosting.Server.Abstractions/project.json b/src/Microsoft.AspNetCore.Hosting.Server.Abstractions/project.json similarity index 100% rename from src/Microsoft.AspNet.Hosting.Server.Abstractions/project.json rename to src/Microsoft.AspNetCore.Hosting.Server.Abstractions/project.json diff --git a/src/Microsoft.AspNet.Hosting.WindowsServices/Microsoft.AspNet.Hosting.WindowsServices.xproj b/src/Microsoft.AspNetCore.Hosting.WindowsServices/Microsoft.AspNetCore.Hosting.WindowsServices.xproj similarity index 97% rename from src/Microsoft.AspNet.Hosting.WindowsServices/Microsoft.AspNet.Hosting.WindowsServices.xproj rename to src/Microsoft.AspNetCore.Hosting.WindowsServices/Microsoft.AspNetCore.Hosting.WindowsServices.xproj index 39ccb16031..8131586c81 100644 --- a/src/Microsoft.AspNet.Hosting.WindowsServices/Microsoft.AspNet.Hosting.WindowsServices.xproj +++ b/src/Microsoft.AspNetCore.Hosting.WindowsServices/Microsoft.AspNetCore.Hosting.WindowsServices.xproj @@ -1,19 +1,19 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 03148731-ea95-40a2-bae8-a12315ea1748 - Microsoft.AspNet.Hosting.WindowsServices - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ - - - 2.0 - - - + + + + 14.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + + 03148731-ea95-40a2-bae8-a12315ea1748 + Microsoft.AspNet.Hosting.WindowsServices + ..\..\artifacts\obj\$(MSBuildProjectName) + ..\..\artifacts\bin\$(MSBuildProjectName)\ + + + 2.0 + + + \ No newline at end of file diff --git a/src/Microsoft.AspNet.Hosting.WindowsServices/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.Hosting.WindowsServices/Properties/AssemblyInfo.cs similarity index 100% rename from src/Microsoft.AspNet.Hosting.WindowsServices/Properties/AssemblyInfo.cs rename to src/Microsoft.AspNetCore.Hosting.WindowsServices/Properties/AssemblyInfo.cs diff --git a/src/Microsoft.AspNet.Hosting.WindowsServices/WebHostService.cs b/src/Microsoft.AspNetCore.Hosting.WindowsServices/WebHostService.cs similarity index 100% rename from src/Microsoft.AspNet.Hosting.WindowsServices/WebHostService.cs rename to src/Microsoft.AspNetCore.Hosting.WindowsServices/WebHostService.cs diff --git a/src/Microsoft.AspNet.Hosting.WindowsServices/WebHostWindowsServiceExtensions.cs b/src/Microsoft.AspNetCore.Hosting.WindowsServices/WebHostWindowsServiceExtensions.cs similarity index 100% rename from src/Microsoft.AspNet.Hosting.WindowsServices/WebHostWindowsServiceExtensions.cs rename to src/Microsoft.AspNetCore.Hosting.WindowsServices/WebHostWindowsServiceExtensions.cs diff --git a/src/Microsoft.AspNet.Hosting.WindowsServices/project.json b/src/Microsoft.AspNetCore.Hosting.WindowsServices/project.json similarity index 96% rename from src/Microsoft.AspNet.Hosting.WindowsServices/project.json rename to src/Microsoft.AspNetCore.Hosting.WindowsServices/project.json index 3da4890272..91b2eb21c2 100644 --- a/src/Microsoft.AspNet.Hosting.WindowsServices/project.json +++ b/src/Microsoft.AspNetCore.Hosting.WindowsServices/project.json @@ -1,22 +1,22 @@ -{ - "version": "1.0.0-*", - "description": "ASP.NET 5 core hosting infrastructure and startup logic for web applications running within a Windows service.", - "repository": { - "type": "git", - "url": "git://github.com/aspnet/hosting" - }, - "compilationOptions": { - "warningsAsErrors": true, - "keyFile": "../../tools/Key.snk" - }, - "dependencies": { - "Microsoft.AspNet.Hosting": "1.0.0-*" - }, - "frameworks": { - "net451": { - "frameworkAssemblies": { - "System.ServiceProcess": "" - } - } - } -} +{ + "version": "1.0.0-*", + "description": "ASP.NET 5 core hosting infrastructure and startup logic for web applications running within a Windows service.", + "repository": { + "type": "git", + "url": "git://github.com/aspnet/hosting" + }, + "compilationOptions": { + "warningsAsErrors": true, + "keyFile": "../../tools/Key.snk" + }, + "dependencies": { + "Microsoft.AspNet.Hosting": "1.0.0-*" + }, + "frameworks": { + "net451": { + "frameworkAssemblies": { + "System.ServiceProcess": "" + } + } + } +} diff --git a/src/Microsoft.AspNet.Hosting/Builder/ApplicationBuilderFactory.cs b/src/Microsoft.AspNetCore.Hosting/Builder/ApplicationBuilderFactory.cs similarity index 100% rename from src/Microsoft.AspNet.Hosting/Builder/ApplicationBuilderFactory.cs rename to src/Microsoft.AspNetCore.Hosting/Builder/ApplicationBuilderFactory.cs diff --git a/src/Microsoft.AspNet.Hosting/Builder/IApplicationBuilderFactory.cs b/src/Microsoft.AspNetCore.Hosting/Builder/IApplicationBuilderFactory.cs similarity index 100% rename from src/Microsoft.AspNet.Hosting/Builder/IApplicationBuilderFactory.cs rename to src/Microsoft.AspNetCore.Hosting/Builder/IApplicationBuilderFactory.cs diff --git a/src/Microsoft.AspNet.Hosting/Internal/ApplicationLifetime.cs b/src/Microsoft.AspNetCore.Hosting/Internal/ApplicationLifetime.cs similarity index 100% rename from src/Microsoft.AspNet.Hosting/Internal/ApplicationLifetime.cs rename to src/Microsoft.AspNetCore.Hosting/Internal/ApplicationLifetime.cs diff --git a/src/Microsoft.AspNet.Hosting/Internal/AutoRequestServicesStartupFilter.cs b/src/Microsoft.AspNetCore.Hosting/Internal/AutoRequestServicesStartupFilter.cs similarity index 100% rename from src/Microsoft.AspNet.Hosting/Internal/AutoRequestServicesStartupFilter.cs rename to src/Microsoft.AspNetCore.Hosting/Internal/AutoRequestServicesStartupFilter.cs diff --git a/src/Microsoft.AspNet.Hosting/Internal/HostingApplication.cs b/src/Microsoft.AspNetCore.Hosting/Internal/HostingApplication.cs similarity index 100% rename from src/Microsoft.AspNet.Hosting/Internal/HostingApplication.cs rename to src/Microsoft.AspNetCore.Hosting/Internal/HostingApplication.cs diff --git a/src/Microsoft.AspNet.Hosting/Internal/HostingEnvironment.cs b/src/Microsoft.AspNetCore.Hosting/Internal/HostingEnvironment.cs similarity index 100% rename from src/Microsoft.AspNet.Hosting/Internal/HostingEnvironment.cs rename to src/Microsoft.AspNetCore.Hosting/Internal/HostingEnvironment.cs diff --git a/src/Microsoft.AspNet.Hosting/Internal/HostingEnvironmentExtensions.cs b/src/Microsoft.AspNetCore.Hosting/Internal/HostingEnvironmentExtensions.cs similarity index 100% rename from src/Microsoft.AspNet.Hosting/Internal/HostingEnvironmentExtensions.cs rename to src/Microsoft.AspNetCore.Hosting/Internal/HostingEnvironmentExtensions.cs diff --git a/src/Microsoft.AspNet.Hosting/Internal/HostingLoggerExtensions.cs b/src/Microsoft.AspNetCore.Hosting/Internal/HostingLoggerExtensions.cs similarity index 100% rename from src/Microsoft.AspNet.Hosting/Internal/HostingLoggerExtensions.cs rename to src/Microsoft.AspNetCore.Hosting/Internal/HostingLoggerExtensions.cs diff --git a/src/Microsoft.AspNet.Hosting/Internal/LoggerEventIds.cs b/src/Microsoft.AspNetCore.Hosting/Internal/LoggerEventIds.cs similarity index 100% rename from src/Microsoft.AspNet.Hosting/Internal/LoggerEventIds.cs rename to src/Microsoft.AspNetCore.Hosting/Internal/LoggerEventIds.cs diff --git a/src/Microsoft.AspNet.Hosting/Internal/NullFileProvider.cs b/src/Microsoft.AspNetCore.Hosting/Internal/NullFileProvider.cs similarity index 100% rename from src/Microsoft.AspNet.Hosting/Internal/NullFileProvider.cs rename to src/Microsoft.AspNetCore.Hosting/Internal/NullFileProvider.cs diff --git a/src/Microsoft.AspNet.Hosting/Internal/RequestServicesContainerFeature.cs b/src/Microsoft.AspNetCore.Hosting/Internal/RequestServicesContainerFeature.cs similarity index 100% rename from src/Microsoft.AspNet.Hosting/Internal/RequestServicesContainerFeature.cs rename to src/Microsoft.AspNetCore.Hosting/Internal/RequestServicesContainerFeature.cs diff --git a/src/Microsoft.AspNet.Hosting/Internal/RequestServicesContainerMiddleware.cs b/src/Microsoft.AspNetCore.Hosting/Internal/RequestServicesContainerMiddleware.cs similarity index 100% rename from src/Microsoft.AspNet.Hosting/Internal/RequestServicesContainerMiddleware.cs rename to src/Microsoft.AspNetCore.Hosting/Internal/RequestServicesContainerMiddleware.cs diff --git a/src/Microsoft.AspNet.Hosting/Internal/WebHost.cs b/src/Microsoft.AspNetCore.Hosting/Internal/WebHost.cs similarity index 100% rename from src/Microsoft.AspNet.Hosting/Internal/WebHost.cs rename to src/Microsoft.AspNetCore.Hosting/Internal/WebHost.cs diff --git a/src/Microsoft.AspNet.Hosting/Internal/WebHostOptions.cs b/src/Microsoft.AspNetCore.Hosting/Internal/WebHostOptions.cs similarity index 100% rename from src/Microsoft.AspNet.Hosting/Internal/WebHostOptions.cs rename to src/Microsoft.AspNetCore.Hosting/Internal/WebHostOptions.cs diff --git a/src/Microsoft.AspNet.Hosting/Microsoft.AspNet.Hosting.xproj b/src/Microsoft.AspNetCore.Hosting/Microsoft.AspNetCore.Hosting.xproj similarity index 100% rename from src/Microsoft.AspNet.Hosting/Microsoft.AspNet.Hosting.xproj rename to src/Microsoft.AspNetCore.Hosting/Microsoft.AspNetCore.Hosting.xproj diff --git a/src/Microsoft.AspNet.Hosting/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.Hosting/Properties/AssemblyInfo.cs similarity index 100% rename from src/Microsoft.AspNet.Hosting/Properties/AssemblyInfo.cs rename to src/Microsoft.AspNetCore.Hosting/Properties/AssemblyInfo.cs diff --git a/src/Microsoft.AspNet.Hosting/Server/IServerLoader.cs b/src/Microsoft.AspNetCore.Hosting/Server/IServerLoader.cs similarity index 100% rename from src/Microsoft.AspNet.Hosting/Server/IServerLoader.cs rename to src/Microsoft.AspNetCore.Hosting/Server/IServerLoader.cs diff --git a/src/Microsoft.AspNet.Hosting/Server/ServerLoader.cs b/src/Microsoft.AspNetCore.Hosting/Server/ServerLoader.cs similarity index 100% rename from src/Microsoft.AspNet.Hosting/Server/ServerLoader.cs rename to src/Microsoft.AspNetCore.Hosting/Server/ServerLoader.cs diff --git a/src/Microsoft.AspNet.Hosting/Startup/ConfigureDelegate.cs b/src/Microsoft.AspNetCore.Hosting/Startup/ConfigureDelegate.cs similarity index 100% rename from src/Microsoft.AspNet.Hosting/Startup/ConfigureDelegate.cs rename to src/Microsoft.AspNetCore.Hosting/Startup/ConfigureDelegate.cs diff --git a/src/Microsoft.AspNet.Hosting/Startup/ConfigureServicesDelegate.cs b/src/Microsoft.AspNetCore.Hosting/Startup/ConfigureServicesDelegate.cs similarity index 100% rename from src/Microsoft.AspNet.Hosting/Startup/ConfigureServicesDelegate.cs rename to src/Microsoft.AspNetCore.Hosting/Startup/ConfigureServicesDelegate.cs diff --git a/src/Microsoft.AspNet.Hosting/Startup/IStartupLoader.cs b/src/Microsoft.AspNetCore.Hosting/Startup/IStartupLoader.cs similarity index 100% rename from src/Microsoft.AspNet.Hosting/Startup/IStartupLoader.cs rename to src/Microsoft.AspNetCore.Hosting/Startup/IStartupLoader.cs diff --git a/src/Microsoft.AspNet.Hosting/Startup/StartupExceptionPage.cs b/src/Microsoft.AspNetCore.Hosting/Startup/StartupExceptionPage.cs similarity index 100% rename from src/Microsoft.AspNet.Hosting/Startup/StartupExceptionPage.cs rename to src/Microsoft.AspNetCore.Hosting/Startup/StartupExceptionPage.cs diff --git a/src/Microsoft.AspNet.Hosting/Startup/StartupLoader.cs b/src/Microsoft.AspNetCore.Hosting/Startup/StartupLoader.cs similarity index 100% rename from src/Microsoft.AspNet.Hosting/Startup/StartupLoader.cs rename to src/Microsoft.AspNetCore.Hosting/Startup/StartupLoader.cs diff --git a/src/Microsoft.AspNet.Hosting/Startup/StartupMethods.cs b/src/Microsoft.AspNetCore.Hosting/Startup/StartupMethods.cs similarity index 100% rename from src/Microsoft.AspNet.Hosting/Startup/StartupMethods.cs rename to src/Microsoft.AspNetCore.Hosting/Startup/StartupMethods.cs diff --git a/src/Microsoft.AspNet.Hosting/WebHostBuilder.cs b/src/Microsoft.AspNetCore.Hosting/WebHostBuilder.cs similarity index 100% rename from src/Microsoft.AspNet.Hosting/WebHostBuilder.cs rename to src/Microsoft.AspNetCore.Hosting/WebHostBuilder.cs diff --git a/src/Microsoft.AspNet.Hosting/WebHostBuilderExtensions.cs b/src/Microsoft.AspNetCore.Hosting/WebHostBuilderExtensions.cs similarity index 100% rename from src/Microsoft.AspNet.Hosting/WebHostBuilderExtensions.cs rename to src/Microsoft.AspNetCore.Hosting/WebHostBuilderExtensions.cs diff --git a/src/Microsoft.AspNet.Hosting/WebHostConfiguration.cs b/src/Microsoft.AspNetCore.Hosting/WebHostConfiguration.cs similarity index 100% rename from src/Microsoft.AspNet.Hosting/WebHostConfiguration.cs rename to src/Microsoft.AspNetCore.Hosting/WebHostConfiguration.cs diff --git a/src/Microsoft.AspNet.Hosting/WebHostExtensions.cs b/src/Microsoft.AspNetCore.Hosting/WebHostExtensions.cs similarity index 100% rename from src/Microsoft.AspNet.Hosting/WebHostExtensions.cs rename to src/Microsoft.AspNetCore.Hosting/WebHostExtensions.cs diff --git a/src/Microsoft.AspNet.Hosting/compiler/resources/GenericError.html b/src/Microsoft.AspNetCore.Hosting/compiler/resources/GenericError.html similarity index 100% rename from src/Microsoft.AspNet.Hosting/compiler/resources/GenericError.html rename to src/Microsoft.AspNetCore.Hosting/compiler/resources/GenericError.html diff --git a/src/Microsoft.AspNet.Hosting/compiler/resources/GenericError_Exception.html b/src/Microsoft.AspNetCore.Hosting/compiler/resources/GenericError_Exception.html similarity index 100% rename from src/Microsoft.AspNet.Hosting/compiler/resources/GenericError_Exception.html rename to src/Microsoft.AspNetCore.Hosting/compiler/resources/GenericError_Exception.html diff --git a/src/Microsoft.AspNet.Hosting/compiler/resources/GenericError_Footer.html b/src/Microsoft.AspNetCore.Hosting/compiler/resources/GenericError_Footer.html similarity index 100% rename from src/Microsoft.AspNet.Hosting/compiler/resources/GenericError_Footer.html rename to src/Microsoft.AspNetCore.Hosting/compiler/resources/GenericError_Footer.html diff --git a/src/Microsoft.AspNet.Hosting/compiler/resources/GenericError_Message.html b/src/Microsoft.AspNetCore.Hosting/compiler/resources/GenericError_Message.html similarity index 100% rename from src/Microsoft.AspNet.Hosting/compiler/resources/GenericError_Message.html rename to src/Microsoft.AspNetCore.Hosting/compiler/resources/GenericError_Message.html diff --git a/src/Microsoft.AspNet.Hosting/project.json b/src/Microsoft.AspNetCore.Hosting/project.json similarity index 100% rename from src/Microsoft.AspNet.Hosting/project.json rename to src/Microsoft.AspNetCore.Hosting/project.json diff --git a/src/Microsoft.AspNet.Server.Testing/Common/DeploymentParameters.cs b/src/Microsoft.AspNetCore.Server.Testing/Common/DeploymentParameters.cs similarity index 100% rename from src/Microsoft.AspNet.Server.Testing/Common/DeploymentParameters.cs rename to src/Microsoft.AspNetCore.Server.Testing/Common/DeploymentParameters.cs diff --git a/src/Microsoft.AspNet.Server.Testing/Common/DeploymentResult.cs b/src/Microsoft.AspNetCore.Server.Testing/Common/DeploymentResult.cs similarity index 100% rename from src/Microsoft.AspNet.Server.Testing/Common/DeploymentResult.cs rename to src/Microsoft.AspNetCore.Server.Testing/Common/DeploymentResult.cs diff --git a/src/Microsoft.AspNet.Server.Testing/Common/DotnetArchitecture.cs b/src/Microsoft.AspNetCore.Server.Testing/Common/DotnetArchitecture.cs similarity index 100% rename from src/Microsoft.AspNet.Server.Testing/Common/DotnetArchitecture.cs rename to src/Microsoft.AspNetCore.Server.Testing/Common/DotnetArchitecture.cs diff --git a/src/Microsoft.AspNet.Server.Testing/Common/DotnetFlavor.cs b/src/Microsoft.AspNetCore.Server.Testing/Common/DotnetFlavor.cs similarity index 100% rename from src/Microsoft.AspNet.Server.Testing/Common/DotnetFlavor.cs rename to src/Microsoft.AspNetCore.Server.Testing/Common/DotnetFlavor.cs diff --git a/src/Microsoft.AspNet.Server.Testing/Common/RetryHelper.cs b/src/Microsoft.AspNetCore.Server.Testing/Common/RetryHelper.cs similarity index 100% rename from src/Microsoft.AspNet.Server.Testing/Common/RetryHelper.cs rename to src/Microsoft.AspNetCore.Server.Testing/Common/RetryHelper.cs diff --git a/src/Microsoft.AspNet.Server.Testing/Common/ServerType.cs b/src/Microsoft.AspNetCore.Server.Testing/Common/ServerType.cs similarity index 100% rename from src/Microsoft.AspNet.Server.Testing/Common/ServerType.cs rename to src/Microsoft.AspNetCore.Server.Testing/Common/ServerType.cs diff --git a/src/Microsoft.AspNet.Server.Testing/Common/TestUriHelper.cs b/src/Microsoft.AspNetCore.Server.Testing/Common/TestUriHelper.cs similarity index 100% rename from src/Microsoft.AspNet.Server.Testing/Common/TestUriHelper.cs rename to src/Microsoft.AspNetCore.Server.Testing/Common/TestUriHelper.cs diff --git a/src/Microsoft.AspNet.Server.Testing/Deployers/ApplicationDeployer.cs b/src/Microsoft.AspNetCore.Server.Testing/Deployers/ApplicationDeployer.cs similarity index 100% rename from src/Microsoft.AspNet.Server.Testing/Deployers/ApplicationDeployer.cs rename to src/Microsoft.AspNetCore.Server.Testing/Deployers/ApplicationDeployer.cs diff --git a/src/Microsoft.AspNet.Server.Testing/Deployers/ApplicationDeployerFactory.cs b/src/Microsoft.AspNetCore.Server.Testing/Deployers/ApplicationDeployerFactory.cs similarity index 100% rename from src/Microsoft.AspNet.Server.Testing/Deployers/ApplicationDeployerFactory.cs rename to src/Microsoft.AspNetCore.Server.Testing/Deployers/ApplicationDeployerFactory.cs diff --git a/src/Microsoft.AspNet.Server.Testing/Deployers/IApplicationDeployer.cs b/src/Microsoft.AspNetCore.Server.Testing/Deployers/IApplicationDeployer.cs similarity index 100% rename from src/Microsoft.AspNet.Server.Testing/Deployers/IApplicationDeployer.cs rename to src/Microsoft.AspNetCore.Server.Testing/Deployers/IApplicationDeployer.cs diff --git a/src/Microsoft.AspNet.Server.Testing/Deployers/IISDeployer.cs b/src/Microsoft.AspNetCore.Server.Testing/Deployers/IISDeployer.cs similarity index 100% rename from src/Microsoft.AspNet.Server.Testing/Deployers/IISDeployer.cs rename to src/Microsoft.AspNetCore.Server.Testing/Deployers/IISDeployer.cs diff --git a/src/Microsoft.AspNet.Server.Testing/Deployers/IISExpressDeployer.cs b/src/Microsoft.AspNetCore.Server.Testing/Deployers/IISExpressDeployer.cs similarity index 100% rename from src/Microsoft.AspNet.Server.Testing/Deployers/IISExpressDeployer.cs rename to src/Microsoft.AspNetCore.Server.Testing/Deployers/IISExpressDeployer.cs diff --git a/src/Microsoft.AspNet.Server.Testing/Deployers/SelfHostDeployer.cs b/src/Microsoft.AspNetCore.Server.Testing/Deployers/SelfHostDeployer.cs similarity index 100% rename from src/Microsoft.AspNet.Server.Testing/Deployers/SelfHostDeployer.cs rename to src/Microsoft.AspNetCore.Server.Testing/Deployers/SelfHostDeployer.cs diff --git a/src/Microsoft.AspNet.Server.Testing/Microsoft.AspNet.Server.Testing.xproj b/src/Microsoft.AspNetCore.Server.Testing/Microsoft.AspNetCore.Server.Testing.xproj similarity index 100% rename from src/Microsoft.AspNet.Server.Testing/Microsoft.AspNet.Server.Testing.xproj rename to src/Microsoft.AspNetCore.Server.Testing/Microsoft.AspNetCore.Server.Testing.xproj diff --git a/src/Microsoft.AspNet.Server.Testing/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.Server.Testing/Properties/AssemblyInfo.cs similarity index 100% rename from src/Microsoft.AspNet.Server.Testing/Properties/AssemblyInfo.cs rename to src/Microsoft.AspNetCore.Server.Testing/Properties/AssemblyInfo.cs diff --git a/src/Microsoft.AspNet.Server.Testing/project.json b/src/Microsoft.AspNetCore.Server.Testing/project.json similarity index 100% rename from src/Microsoft.AspNet.Server.Testing/project.json rename to src/Microsoft.AspNetCore.Server.Testing/project.json diff --git a/src/Microsoft.AspNet.Server.Testing/xunit/SkipIfCurrentRuntimeIsCoreClr.cs b/src/Microsoft.AspNetCore.Server.Testing/xunit/SkipIfCurrentRuntimeIsCoreClr.cs similarity index 100% rename from src/Microsoft.AspNet.Server.Testing/xunit/SkipIfCurrentRuntimeIsCoreClr.cs rename to src/Microsoft.AspNetCore.Server.Testing/xunit/SkipIfCurrentRuntimeIsCoreClr.cs diff --git a/src/Microsoft.AspNet.Server.Testing/xunit/SkipIfIISVariationsNotEnabledAttribute.cs b/src/Microsoft.AspNetCore.Server.Testing/xunit/SkipIfIISVariationsNotEnabledAttribute.cs similarity index 100% rename from src/Microsoft.AspNet.Server.Testing/xunit/SkipIfIISVariationsNotEnabledAttribute.cs rename to src/Microsoft.AspNetCore.Server.Testing/xunit/SkipIfIISVariationsNotEnabledAttribute.cs diff --git a/src/Microsoft.AspNet.Server.Testing/xunit/SkipOn32BitOSAttribute.cs b/src/Microsoft.AspNetCore.Server.Testing/xunit/SkipOn32BitOSAttribute.cs similarity index 100% rename from src/Microsoft.AspNet.Server.Testing/xunit/SkipOn32BitOSAttribute.cs rename to src/Microsoft.AspNetCore.Server.Testing/xunit/SkipOn32BitOSAttribute.cs diff --git a/src/Microsoft.AspNet.TestHost/ClientHandler.cs b/src/Microsoft.AspNetCore.TestHost/ClientHandler.cs similarity index 100% rename from src/Microsoft.AspNet.TestHost/ClientHandler.cs rename to src/Microsoft.AspNetCore.TestHost/ClientHandler.cs diff --git a/src/Microsoft.AspNet.TestHost/Microsoft.AspNet.TestHost.xproj b/src/Microsoft.AspNetCore.TestHost/Microsoft.AspNetCore.TestHost.xproj similarity index 100% rename from src/Microsoft.AspNet.TestHost/Microsoft.AspNet.TestHost.xproj rename to src/Microsoft.AspNetCore.TestHost/Microsoft.AspNetCore.TestHost.xproj diff --git a/src/Microsoft.AspNet.TestHost/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.TestHost/Properties/AssemblyInfo.cs similarity index 100% rename from src/Microsoft.AspNet.TestHost/Properties/AssemblyInfo.cs rename to src/Microsoft.AspNetCore.TestHost/Properties/AssemblyInfo.cs diff --git a/src/Microsoft.AspNet.TestHost/RequestBuilder.cs b/src/Microsoft.AspNetCore.TestHost/RequestBuilder.cs similarity index 100% rename from src/Microsoft.AspNet.TestHost/RequestBuilder.cs rename to src/Microsoft.AspNetCore.TestHost/RequestBuilder.cs diff --git a/src/Microsoft.AspNet.TestHost/RequestFeature.cs b/src/Microsoft.AspNetCore.TestHost/RequestFeature.cs similarity index 100% rename from src/Microsoft.AspNet.TestHost/RequestFeature.cs rename to src/Microsoft.AspNetCore.TestHost/RequestFeature.cs diff --git a/src/Microsoft.AspNet.TestHost/ResponseFeature.cs b/src/Microsoft.AspNetCore.TestHost/ResponseFeature.cs similarity index 100% rename from src/Microsoft.AspNet.TestHost/ResponseFeature.cs rename to src/Microsoft.AspNetCore.TestHost/ResponseFeature.cs diff --git a/src/Microsoft.AspNet.TestHost/ResponseStream.cs b/src/Microsoft.AspNetCore.TestHost/ResponseStream.cs similarity index 100% rename from src/Microsoft.AspNet.TestHost/ResponseStream.cs rename to src/Microsoft.AspNetCore.TestHost/ResponseStream.cs diff --git a/src/Microsoft.AspNet.TestHost/TestServer.cs b/src/Microsoft.AspNetCore.TestHost/TestServer.cs similarity index 100% rename from src/Microsoft.AspNet.TestHost/TestServer.cs rename to src/Microsoft.AspNetCore.TestHost/TestServer.cs diff --git a/src/Microsoft.AspNet.TestHost/TestWebSocket.cs b/src/Microsoft.AspNetCore.TestHost/TestWebSocket.cs similarity index 100% rename from src/Microsoft.AspNet.TestHost/TestWebSocket.cs rename to src/Microsoft.AspNetCore.TestHost/TestWebSocket.cs diff --git a/src/Microsoft.AspNet.TestHost/WebSocketClient.cs b/src/Microsoft.AspNetCore.TestHost/WebSocketClient.cs similarity index 100% rename from src/Microsoft.AspNet.TestHost/WebSocketClient.cs rename to src/Microsoft.AspNetCore.TestHost/WebSocketClient.cs diff --git a/src/Microsoft.AspNet.TestHost/project.json b/src/Microsoft.AspNetCore.TestHost/project.json similarity index 100% rename from src/Microsoft.AspNet.TestHost/project.json rename to src/Microsoft.AspNetCore.TestHost/project.json diff --git a/test/Microsoft.AspNet.Hosting.Tests/Fakes/FakeOptions.cs b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/FakeOptions.cs similarity index 100% rename from test/Microsoft.AspNet.Hosting.Tests/Fakes/FakeOptions.cs rename to test/Microsoft.AspNetCore.Hosting.Tests/Fakes/FakeOptions.cs diff --git a/test/Microsoft.AspNet.Hosting.Tests/Fakes/FakeService.cs b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/FakeService.cs similarity index 100% rename from test/Microsoft.AspNet.Hosting.Tests/Fakes/FakeService.cs rename to test/Microsoft.AspNetCore.Hosting.Tests/Fakes/FakeService.cs diff --git a/test/Microsoft.AspNet.Hosting.Tests/Fakes/IFactoryService.cs b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/IFactoryService.cs similarity index 100% rename from test/Microsoft.AspNet.Hosting.Tests/Fakes/IFactoryService.cs rename to test/Microsoft.AspNetCore.Hosting.Tests/Fakes/IFactoryService.cs diff --git a/test/Microsoft.AspNet.Hosting.Tests/Fakes/IFakeEveryService.cs b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/IFakeEveryService.cs similarity index 100% rename from test/Microsoft.AspNet.Hosting.Tests/Fakes/IFakeEveryService.cs rename to test/Microsoft.AspNetCore.Hosting.Tests/Fakes/IFakeEveryService.cs diff --git a/test/Microsoft.AspNet.Hosting.Tests/Fakes/IFakeScopedService.cs b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/IFakeScopedService.cs similarity index 100% rename from test/Microsoft.AspNet.Hosting.Tests/Fakes/IFakeScopedService.cs rename to test/Microsoft.AspNetCore.Hosting.Tests/Fakes/IFakeScopedService.cs diff --git a/test/Microsoft.AspNet.Hosting.Tests/Fakes/IFakeService.cs b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/IFakeService.cs similarity index 100% rename from test/Microsoft.AspNet.Hosting.Tests/Fakes/IFakeService.cs rename to test/Microsoft.AspNetCore.Hosting.Tests/Fakes/IFakeService.cs diff --git a/test/Microsoft.AspNet.Hosting.Tests/Fakes/IFakeServiceInstance.cs b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/IFakeServiceInstance.cs similarity index 100% rename from test/Microsoft.AspNet.Hosting.Tests/Fakes/IFakeServiceInstance.cs rename to test/Microsoft.AspNetCore.Hosting.Tests/Fakes/IFakeServiceInstance.cs diff --git a/test/Microsoft.AspNet.Hosting.Tests/Fakes/IFakeSingletonService.cs b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/IFakeSingletonService.cs similarity index 100% rename from test/Microsoft.AspNet.Hosting.Tests/Fakes/IFakeSingletonService.cs rename to test/Microsoft.AspNetCore.Hosting.Tests/Fakes/IFakeSingletonService.cs diff --git a/test/Microsoft.AspNet.Hosting.Tests/Fakes/IFakeStartupCallback.cs b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/IFakeStartupCallback.cs similarity index 100% rename from test/Microsoft.AspNet.Hosting.Tests/Fakes/IFakeStartupCallback.cs rename to test/Microsoft.AspNetCore.Hosting.Tests/Fakes/IFakeStartupCallback.cs diff --git a/test/Microsoft.AspNet.Hosting.Tests/Fakes/INonexistentService.cs b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/INonexistentService.cs similarity index 100% rename from test/Microsoft.AspNet.Hosting.Tests/Fakes/INonexistentService.cs rename to test/Microsoft.AspNetCore.Hosting.Tests/Fakes/INonexistentService.cs diff --git a/test/Microsoft.AspNet.Hosting.Tests/Fakes/RuntimeEnvironment.cs b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/RuntimeEnvironment.cs similarity index 100% rename from test/Microsoft.AspNet.Hosting.Tests/Fakes/RuntimeEnvironment.cs rename to test/Microsoft.AspNetCore.Hosting.Tests/Fakes/RuntimeEnvironment.cs diff --git a/test/Microsoft.AspNet.Hosting.Tests/Fakes/Startup.cs b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/Startup.cs similarity index 100% rename from test/Microsoft.AspNet.Hosting.Tests/Fakes/Startup.cs rename to test/Microsoft.AspNetCore.Hosting.Tests/Fakes/Startup.cs diff --git a/test/Microsoft.AspNet.Hosting.Tests/Fakes/StartupBase.cs b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupBase.cs similarity index 100% rename from test/Microsoft.AspNet.Hosting.Tests/Fakes/StartupBase.cs rename to test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupBase.cs diff --git a/test/Microsoft.AspNet.Hosting.Tests/Fakes/StartupBoom.cs b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupBoom.cs similarity index 100% rename from test/Microsoft.AspNet.Hosting.Tests/Fakes/StartupBoom.cs rename to test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupBoom.cs diff --git a/test/Microsoft.AspNet.Hosting.Tests/Fakes/StartupConfigureServicesThrows.cs b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupConfigureServicesThrows.cs similarity index 100% rename from test/Microsoft.AspNet.Hosting.Tests/Fakes/StartupConfigureServicesThrows.cs rename to test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupConfigureServicesThrows.cs diff --git a/test/Microsoft.AspNet.Hosting.Tests/Fakes/StartupConfigureThrows.cs b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupConfigureThrows.cs similarity index 100% rename from test/Microsoft.AspNet.Hosting.Tests/Fakes/StartupConfigureThrows.cs rename to test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupConfigureThrows.cs diff --git a/test/Microsoft.AspNet.Hosting.Tests/Fakes/StartupCtorThrows.cs b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupCtorThrows.cs similarity index 100% rename from test/Microsoft.AspNet.Hosting.Tests/Fakes/StartupCtorThrows.cs rename to test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupCtorThrows.cs diff --git a/test/Microsoft.AspNet.Hosting.Tests/Fakes/StartupNoServices.cs b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupNoServices.cs similarity index 100% rename from test/Microsoft.AspNet.Hosting.Tests/Fakes/StartupNoServices.cs rename to test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupNoServices.cs diff --git a/test/Microsoft.AspNet.Hosting.Tests/Fakes/StartupPrivateConfigure.cs b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupPrivateConfigure.cs similarity index 100% rename from test/Microsoft.AspNet.Hosting.Tests/Fakes/StartupPrivateConfigure.cs rename to test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupPrivateConfigure.cs diff --git a/test/Microsoft.AspNet.Hosting.Tests/Fakes/StartupStaticCtorThrows.cs b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupStaticCtorThrows.cs similarity index 100% rename from test/Microsoft.AspNet.Hosting.Tests/Fakes/StartupStaticCtorThrows.cs rename to test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupStaticCtorThrows.cs diff --git a/test/Microsoft.AspNet.Hosting.Tests/Fakes/StartupThrowTypeLoadException.cs b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupThrowTypeLoadException.cs similarity index 100% rename from test/Microsoft.AspNet.Hosting.Tests/Fakes/StartupThrowTypeLoadException.cs rename to test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupThrowTypeLoadException.cs diff --git a/test/Microsoft.AspNet.Hosting.Tests/Fakes/StartupTwoConfigureServices.cs b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupTwoConfigureServices.cs similarity index 100% rename from test/Microsoft.AspNet.Hosting.Tests/Fakes/StartupTwoConfigureServices.cs rename to test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupTwoConfigureServices.cs diff --git a/test/Microsoft.AspNet.Hosting.Tests/Fakes/StartupTwoConfigures.cs b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupTwoConfigures.cs similarity index 100% rename from test/Microsoft.AspNet.Hosting.Tests/Fakes/StartupTwoConfigures.cs rename to test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupTwoConfigures.cs diff --git a/test/Microsoft.AspNet.Hosting.Tests/Fakes/StartupWithConfigureServices.cs b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupWithConfigureServices.cs similarity index 100% rename from test/Microsoft.AspNet.Hosting.Tests/Fakes/StartupWithConfigureServices.cs rename to test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupWithConfigureServices.cs diff --git a/test/Microsoft.AspNet.Hosting.Tests/Fakes/StartupWithConfigureServicesNotResolved.cs b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupWithConfigureServicesNotResolved.cs similarity index 100% rename from test/Microsoft.AspNet.Hosting.Tests/Fakes/StartupWithConfigureServicesNotResolved.cs rename to test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupWithConfigureServicesNotResolved.cs diff --git a/test/Microsoft.AspNet.Hosting.Tests/Fakes/StartupWithHostingEnvironment.cs b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupWithHostingEnvironment.cs similarity index 100% rename from test/Microsoft.AspNet.Hosting.Tests/Fakes/StartupWithHostingEnvironment.cs rename to test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupWithHostingEnvironment.cs diff --git a/test/Microsoft.AspNet.Hosting.Tests/Fakes/StartupWithNullConfigureServices.cs b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupWithNullConfigureServices.cs similarity index 100% rename from test/Microsoft.AspNet.Hosting.Tests/Fakes/StartupWithNullConfigureServices.cs rename to test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupWithNullConfigureServices.cs diff --git a/test/Microsoft.AspNet.Hosting.Tests/Fakes/StartupWithServices.cs b/test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupWithServices.cs similarity index 100% rename from test/Microsoft.AspNet.Hosting.Tests/Fakes/StartupWithServices.cs rename to test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupWithServices.cs diff --git a/test/Microsoft.AspNet.Hosting.Tests/HostingEnvironmentExtensionsTests.cs b/test/Microsoft.AspNetCore.Hosting.Tests/HostingEnvironmentExtensionsTests.cs similarity index 100% rename from test/Microsoft.AspNet.Hosting.Tests/HostingEnvironmentExtensionsTests.cs rename to test/Microsoft.AspNetCore.Hosting.Tests/HostingEnvironmentExtensionsTests.cs diff --git a/test/Microsoft.AspNet.Hosting.Tests/Microsoft.AspNet.Hosting.Tests.xproj b/test/Microsoft.AspNetCore.Hosting.Tests/Microsoft.AspNetCore.Hosting.Tests.xproj similarity index 100% rename from test/Microsoft.AspNet.Hosting.Tests/Microsoft.AspNet.Hosting.Tests.xproj rename to test/Microsoft.AspNetCore.Hosting.Tests/Microsoft.AspNetCore.Hosting.Tests.xproj diff --git a/test/Microsoft.AspNet.Hosting.Tests/StartupManagerTests.cs b/test/Microsoft.AspNetCore.Hosting.Tests/StartupManagerTests.cs similarity index 100% rename from test/Microsoft.AspNet.Hosting.Tests/StartupManagerTests.cs rename to test/Microsoft.AspNetCore.Hosting.Tests/StartupManagerTests.cs diff --git a/test/Microsoft.AspNet.Hosting.Tests/WebHostBuilderTests.cs b/test/Microsoft.AspNetCore.Hosting.Tests/WebHostBuilderTests.cs similarity index 100% rename from test/Microsoft.AspNet.Hosting.Tests/WebHostBuilderTests.cs rename to test/Microsoft.AspNetCore.Hosting.Tests/WebHostBuilderTests.cs diff --git a/test/Microsoft.AspNet.Hosting.Tests/WebHostConfigurationsTests.cs b/test/Microsoft.AspNetCore.Hosting.Tests/WebHostConfigurationsTests.cs similarity index 100% rename from test/Microsoft.AspNet.Hosting.Tests/WebHostConfigurationsTests.cs rename to test/Microsoft.AspNetCore.Hosting.Tests/WebHostConfigurationsTests.cs diff --git a/test/Microsoft.AspNet.Hosting.Tests/WebHostTests.cs b/test/Microsoft.AspNetCore.Hosting.Tests/WebHostTests.cs similarity index 100% rename from test/Microsoft.AspNet.Hosting.Tests/WebHostTests.cs rename to test/Microsoft.AspNetCore.Hosting.Tests/WebHostTests.cs diff --git a/test/Microsoft.AspNet.Hosting.Tests/project.json b/test/Microsoft.AspNetCore.Hosting.Tests/project.json similarity index 100% rename from test/Microsoft.AspNet.Hosting.Tests/project.json rename to test/Microsoft.AspNetCore.Hosting.Tests/project.json diff --git a/test/Microsoft.AspNet.Hosting.Tests/testroot/TextFile.txt b/test/Microsoft.AspNetCore.Hosting.Tests/testroot/TextFile.txt similarity index 100% rename from test/Microsoft.AspNet.Hosting.Tests/testroot/TextFile.txt rename to test/Microsoft.AspNetCore.Hosting.Tests/testroot/TextFile.txt diff --git a/test/Microsoft.AspNet.Hosting.Tests/testroot/wwwroot/README b/test/Microsoft.AspNetCore.Hosting.Tests/testroot/wwwroot/README similarity index 100% rename from test/Microsoft.AspNet.Hosting.Tests/testroot/wwwroot/README rename to test/Microsoft.AspNetCore.Hosting.Tests/testroot/wwwroot/README diff --git a/test/Microsoft.AspNet.TestHost.Tests/ClientHandlerTests.cs b/test/Microsoft.AspNetCore.TestHost.Tests/ClientHandlerTests.cs similarity index 100% rename from test/Microsoft.AspNet.TestHost.Tests/ClientHandlerTests.cs rename to test/Microsoft.AspNetCore.TestHost.Tests/ClientHandlerTests.cs diff --git a/test/Microsoft.AspNet.TestHost.Tests/Microsoft.AspNet.TestHost.Tests.xproj b/test/Microsoft.AspNetCore.TestHost.Tests/Microsoft.AspNetCore.TestHost.Tests.xproj similarity index 100% rename from test/Microsoft.AspNet.TestHost.Tests/Microsoft.AspNet.TestHost.Tests.xproj rename to test/Microsoft.AspNetCore.TestHost.Tests/Microsoft.AspNetCore.TestHost.Tests.xproj diff --git a/test/Microsoft.AspNet.TestHost.Tests/Properties/AssemblyInfo.cs b/test/Microsoft.AspNetCore.TestHost.Tests/Properties/AssemblyInfo.cs similarity index 100% rename from test/Microsoft.AspNet.TestHost.Tests/Properties/AssemblyInfo.cs rename to test/Microsoft.AspNetCore.TestHost.Tests/Properties/AssemblyInfo.cs diff --git a/test/Microsoft.AspNet.TestHost.Tests/RequestBuilderTests.cs b/test/Microsoft.AspNetCore.TestHost.Tests/RequestBuilderTests.cs similarity index 100% rename from test/Microsoft.AspNet.TestHost.Tests/RequestBuilderTests.cs rename to test/Microsoft.AspNetCore.TestHost.Tests/RequestBuilderTests.cs diff --git a/test/Microsoft.AspNet.TestHost.Tests/ResponseFeatureTests.cs b/test/Microsoft.AspNetCore.TestHost.Tests/ResponseFeatureTests.cs similarity index 100% rename from test/Microsoft.AspNet.TestHost.Tests/ResponseFeatureTests.cs rename to test/Microsoft.AspNetCore.TestHost.Tests/ResponseFeatureTests.cs diff --git a/test/Microsoft.AspNet.TestHost.Tests/TestClientTests.cs b/test/Microsoft.AspNetCore.TestHost.Tests/TestClientTests.cs similarity index 100% rename from test/Microsoft.AspNet.TestHost.Tests/TestClientTests.cs rename to test/Microsoft.AspNetCore.TestHost.Tests/TestClientTests.cs diff --git a/test/Microsoft.AspNet.TestHost.Tests/TestServerTests.cs b/test/Microsoft.AspNetCore.TestHost.Tests/TestServerTests.cs similarity index 100% rename from test/Microsoft.AspNet.TestHost.Tests/TestServerTests.cs rename to test/Microsoft.AspNetCore.TestHost.Tests/TestServerTests.cs diff --git a/test/Microsoft.AspNet.TestHost.Tests/project.json b/test/Microsoft.AspNetCore.TestHost.Tests/project.json similarity index 100% rename from test/Microsoft.AspNet.TestHost.Tests/project.json rename to test/Microsoft.AspNetCore.TestHost.Tests/project.json