huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename AspNet 5 file contents. 

See https://github.com/aspnet/Announcements/issues/144 for more information.
This commit is contained in:
N. Taylor Mullen 2016-01-22 12:21:40 -08:00
parent c24e0297b2
commit e62ceb8528
123 changed files with 347 additions and 347 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Hosting.sln
View File

@ -1,4 +1,4 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.24720.0
@ -7,30 +7,30 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E0497F39-AFF
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{FEB39027-9158-4DE2-997F-7ADAEF8188D0}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.TestHost.Tests", "test\Microsoft.AspNet.TestHost.Tests\Microsoft.AspNet.TestHost.Tests.xproj", "{0ACB2719-9484-49B5-B8E3-117091192511}"
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.TestHost.Tests", "test\Microsoft.AspNetCore.TestHost.Tests\Microsoft.AspNetCore.TestHost.Tests.xproj", "{0ACB2719-9484-49B5-B8E3-117091192511}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.TestHost", "src\Microsoft.AspNet.TestHost\Microsoft.AspNet.TestHost.xproj", "{1A415A3F-1081-45DB-809B-EE19CEA02DC0}"
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.TestHost", "src\Microsoft.AspNetCore.TestHost\Microsoft.AspNetCore.TestHost.xproj", "{1A415A3F-1081-45DB-809B-EE19CEA02DC0}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Hosting", "src\Microsoft.AspNet.Hosting\Microsoft.AspNet.Hosting.xproj", "{3944F036-7E75-47E8-AA52-C4B89A64EC3A}"
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Hosting", "src\Microsoft.AspNetCore.Hosting\Microsoft.AspNetCore.Hosting.xproj", "{3944F036-7E75-47E8-AA52-C4B89A64EC3A}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Hosting.Tests", "test\Microsoft.AspNet.Hosting.Tests\Microsoft.AspNet.Hosting.Tests.xproj", "{D4F18D58-52B1-435D-A012-10F2CDF158C4}"
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Hosting.Tests", "test\Microsoft.AspNetCore.Hosting.Tests\Microsoft.AspNetCore.Hosting.Tests.xproj", "{D4F18D58-52B1-435D-A012-10F2CDF158C4}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A66E3673-3976-4152-B902-2D0EC1428EA2}"
ProjectSection(SolutionItems) = preProject
global.json = global.json
EndProjectSection
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Hosting.Abstractions", "src\Microsoft.AspNet.Hosting.Abstractions\Microsoft.AspNet.Hosting.Abstractions.xproj", "{BB780FBB-7842-4759-8DE7-96FA2E5571C1}"
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Hosting.Abstractions", "src\Microsoft.AspNetCore.Hosting.Abstractions\Microsoft.AspNetCore.Hosting.Abstractions.xproj", "{BB780FBB-7842-4759-8DE7-96FA2E5571C1}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Hosting.Server.Abstractions", "src\Microsoft.AspNet.Hosting.Server.Abstractions\Microsoft.AspNet.Hosting.Server.Abstractions.xproj", "{FDBBA081-5248-4FC0-9E08-B46BEF3FA438}"
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Hosting.Server.Abstractions", "src\Microsoft.AspNetCore.Hosting.Server.Abstractions\Microsoft.AspNetCore.Hosting.Server.Abstractions.xproj", "{FDBBA081-5248-4FC0-9E08-B46BEF3FA438}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Server.Testing", "src\Microsoft.AspNet.Server.Testing\Microsoft.AspNet.Server.Testing.xproj", "{3DA89347-6731-4366-80C4-548F24E8607B}"
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Server.Testing", "src\Microsoft.AspNetCore.Server.Testing\Microsoft.AspNetCore.Server.Testing.xproj", "{3DA89347-6731-4366-80C4-548F24E8607B}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{9C7520A0-F2EB-411C-8BB2-80B39C937217}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "SampleStartups", "samples\SampleStartups\SampleStartups.xproj", "{485B6745-7648-400A-A969-F68FCF194E46}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Hosting.WindowsServices", "src\Microsoft.AspNet.Hosting.WindowsServices\Microsoft.AspNet.Hosting.WindowsServices.xproj", "{03148731-EA95-40A2-BAE8-A12315EA1748}"
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Hosting.WindowsServices", "src\Microsoft.AspNetCore.Hosting.WindowsServices\Microsoft.AspNetCore.Hosting.WindowsServices.xproj", "{03148731-EA95-40A2-BAE8-A12315EA1748}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution

10
NuGetPackageVerifier.json
View File

@ -9,11 +9,11 @@
"StrictSemanticVersionValidationRule"
],
"packages": {
"Microsoft.AspNet.Hosting": { },
"Microsoft.AspNet.Hosting.Abstractions": { },
"Microsoft.AspNet.Hosting.Server.Abstractions": { },
"Microsoft.AspNet.Server.Testing": { },
"Microsoft.AspNet.TestHost": { }
"Microsoft.AspNetCore.Hosting": { },
"Microsoft.AspNetCore.Hosting.Abstractions": { },
"Microsoft.AspNetCore.Hosting.Server.Abstractions": { },
"Microsoft.AspNetCore.Server.Testing": { },
"Microsoft.AspNetCore.TestHost": { }
}
},
"Default": { // Rules to run for packages not listed in any other set.

8
samples/SampleStartups/StartupBlockingOnStart.cs
View File

@ -1,7 +1,7 @@
using System;
using Microsoft.AspNet.Builder;
using Microsoft.AspNet.Hosting;
using Microsoft.AspNet.Http;
using System;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.DependencyInjection;
// Note that this sample will not run. It is only here to illustrate usage patterns.

6
samples/SampleStartups/StartupConfigureAddresses.cs
View File

@ -1,6 +1,6 @@
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;
// Note that this sample will not run. It is only here to illustrate usage patterns.

8
samples/SampleStartups/StartupExternallyControlled.cs
View File

@ -1,8 +1,8 @@
using System;
using System;
using System.Collections.Generic;
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;
// Note that this sample will not run. It is only here to illustrate usage patterns.

8
samples/SampleStartups/StartupFullControl.cs
View File

@ -1,7 +1,7 @@
using System;
using System;
using System.IO;
using Microsoft.AspNet.Builder;
using Microsoft.AspNet.Hosting;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
@ -14,7 +14,7 @@ namespace SampleStartups
public static void Main(string[] args)
{
var host = new WebHostBuilder()
.UseServer("Microsoft.AspNet.Server.Kestrel") // Set the server manually
.UseServer("Microsoft.AspNetCore.Server.Kestrel") // Set the server manually
.UseApplicationBasePath(Directory.GetCurrentDirectory()) // Override the application base with the current directory
.UseUrls("http://*:1000", "https://*:902")
.UseEnvironment("Development")

6
samples/SampleStartups/StartupHelloWorld.cs
View File

@ -1,6 +1,6 @@
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;
// Note that this sample will not run. It is only here to illustrate usage patterns.

4
samples/SampleStartups/project.json
View File

@ -1,7 +1,7 @@
{
{
"version": "1.0.0-*",
"dependencies": {
"Microsoft.AspNet.Hosting": "1.0.0-*"
"Microsoft.AspNetCore.Hosting": "1.0.0-*"
},
"frameworks": {
"dnx451": { },

2
src/Microsoft.AspNetCore.Hosting.Abstractions/EnvironmentName.cs
View File

@ -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.Hosting
namespace Microsoft.AspNetCore.Hosting
{
/// <summary>
/// Commonly used environment names.

2
src/Microsoft.AspNetCore.Hosting.Abstractions/HostingEnvironmentExtensions.cs
View File

@ -4,7 +4,7 @@
using System;
using System.IO;
namespace Microsoft.AspNet.Hosting
namespace Microsoft.AspNetCore.Hosting
{
/// <summary>
/// Extension methods for <see cref="IHostingEnvironment"/>.

2
src/Microsoft.AspNetCore.Hosting.Abstractions/IApplicationLifetime.cs
View File

@ -3,7 +3,7 @@
using System.Threading;
namespace Microsoft.AspNet.Hosting
namespace Microsoft.AspNetCore.Hosting
{
/// <summary>
/// Allows consumers to perform cleanup during a graceful shutdown.

2
src/Microsoft.AspNetCore.Hosting.Abstractions/IHostingEnvironment.cs
View File

@ -4,7 +4,7 @@
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.FileProviders;
namespace Microsoft.AspNet.Hosting
namespace Microsoft.AspNetCore.Hosting
{
/// <summary>
/// Provides information about the web hosting environment an application is running in.

4
src/Microsoft.AspNetCore.Hosting.Abstractions/IStartupFilter.cs
View File

@ -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.AspNetCore.Builder;
namespace Microsoft.AspNet.Hosting
namespace Microsoft.AspNetCore.Hosting
{
public interface IStartupFilter
{

6
src/Microsoft.AspNetCore.Hosting.Abstractions/IWebHost.cs
View File

@ -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.AspNet.Http.Features;
using Microsoft.AspNetCore.Http.Features;
namespace Microsoft.AspNet.Hosting
namespace Microsoft.AspNetCore.Hosting
{
/// <summary>
/// Represents a configured web host

8
src/Microsoft.AspNetCore.Hosting.Abstractions/IWebHostBuilder.cs
View File

@ -1,14 +1,14 @@
// 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.Collections.Generic;
using Microsoft.AspNet.Builder;
using Microsoft.AspNet.Hosting.Server;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting.Server;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
namespace Microsoft.AspNet.Hosting
namespace Microsoft.AspNetCore.Hosting
{
/// <summary>
/// A builder for <see cref="IWebHost"/>

4
src/Microsoft.AspNetCore.Hosting.Abstractions/WebHostDefaults.cs
View File

@ -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.Hosting
namespace Microsoft.AspNetCore.Hosting
{
public static class WebHostDefaults
{

4
src/Microsoft.AspNetCore.Hosting.Abstractions/project.json
View File

@ -10,8 +10,8 @@
"url": "git://github.com/aspnet/hosting"
},
"dependencies": {
"Microsoft.AspNet.Http.Abstractions": "1.0.0-*",
"Microsoft.AspNet.Hosting.Server.Abstractions": "1.0.0-*",
"Microsoft.AspNetCore.Http.Abstractions": "1.0.0-*",
"Microsoft.AspNetCore.Hosting.Server.Abstractions": "1.0.0-*",
"Microsoft.Extensions.Configuration.Abstractions": "1.0.0-*",
"Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-*",
"Microsoft.Extensions.FileProviders.Abstractions": "1.0.0-*"

6
src/Microsoft.AspNetCore.Hosting.Server.Abstractions/IHttpApplication.cs
View File

@ -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 System.Threading.Tasks;
using Microsoft.AspNet.Http.Features;
using Microsoft.AspNetCore.Http.Features;
namespace Microsoft.AspNet.Hosting.Server
namespace Microsoft.AspNetCore.Hosting.Server
{
/// <summary>
/// Represents an HttpApplication.

6
src/Microsoft.AspNetCore.Hosting.Server.Abstractions/IServer.cs
View File

@ -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.AspNet.Http.Features;
using Microsoft.AspNetCore.Http.Features;
namespace Microsoft.AspNet.Hosting.Server
namespace Microsoft.AspNetCore.Hosting.Server
{
/// <summary>
/// Represents a server.

4
src/Microsoft.AspNetCore.Hosting.Server.Abstractions/IServerAddressesFeature.cs
View File

@ -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.Collections.Generic;
namespace Microsoft.AspNet.Server.Features
namespace Microsoft.AspNetCore.Server.Features
{
public interface IServerAddressesFeature
{

2
src/Microsoft.AspNetCore.Hosting.Server.Abstractions/IServerFactory.cs
View File

@ -3,7 +3,7 @@
using Microsoft.Extensions.Configuration;
namespace Microsoft.AspNet.Hosting.Server
namespace Microsoft.AspNetCore.Hosting.Server
{
/// <summary>
/// Represents a factory for creating servers.

2
src/Microsoft.AspNetCore.Hosting.Server.Abstractions/project.json
View File

@ -10,7 +10,7 @@
"url": "git://github.com/aspnet/hosting"
},
"dependencies": {
"Microsoft.AspNet.Http.Abstractions": "1.0.0-*",
"Microsoft.AspNetCore.Http.Abstractions": "1.0.0-*",
"Microsoft.Extensions.Configuration.Abstractions": "1.0.0-*"
},
"frameworks": {

4
src/Microsoft.AspNetCore.Hosting.WindowsServices/Microsoft.AspNetCore.Hosting.WindowsServices.xproj
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
@ -7,7 +7,7 @@
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>03148731-ea95-40a2-bae8-a12315ea1748</ProjectGuid>
<RootNamespace>Microsoft.AspNet.Hosting.WindowsServices</RootNamespace>
<RootNamespace>Microsoft.AspNetCore.Hosting.WindowsServices</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
</PropertyGroup>

4
src/Microsoft.AspNetCore.Hosting.WindowsServices/WebHostService.cs
View File

@ -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.ServiceProcess;
using Microsoft.Extensions.DependencyInjection;
namespace Microsoft.AspNet.Hosting.WindowsServices
namespace Microsoft.AspNetCore.Hosting.WindowsServices
{
/// <summary>
/// Provides an implementation of a Windows service that hosts ASP.NET.

4
src/Microsoft.AspNetCore.Hosting.WindowsServices/WebHostWindowsServiceExtensions.cs
View File

@ -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.ServiceProcess;
namespace Microsoft.AspNet.Hosting.WindowsServices
namespace Microsoft.AspNetCore.Hosting.WindowsServices
{
/// <summary>
/// Extensions to <see cref="IWebHost" for hosting inside a Windows service. />

4
src/Microsoft.AspNetCore.Hosting.WindowsServices/project.json
View File

@ -1,4 +1,4 @@
{
{
"version": "1.0.0-*",
"description": "ASP.NET 5 core hosting infrastructure and startup logic for web applications running within a Windows service.",
"repository": {
@ -10,7 +10,7 @@
"keyFile": "../../tools/Key.snk"
},
"dependencies": {
"Microsoft.AspNet.Hosting": "1.0.0-*"
"Microsoft.AspNetCore.Hosting": "1.0.0-*"
},
"frameworks": {
"net451": {

8
src/Microsoft.AspNetCore.Hosting/Builder/ApplicationBuilderFactory.cs
View File

@ -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.Builder;
using Microsoft.AspNet.Builder.Internal;
using Microsoft.AspNet.Http.Features;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Builder.Internal;
using Microsoft.AspNetCore.Http.Features;
namespace Microsoft.AspNet.Hosting.Builder
namespace Microsoft.AspNetCore.Hosting.Builder
{
public class ApplicationBuilderFactory : IApplicationBuilderFactory
{

6
src/Microsoft.AspNetCore.Hosting/Builder/IApplicationBuilderFactory.cs
View File

@ -1,10 +1,10 @@
// 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.Features;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Http.Features;
namespace Microsoft.AspNet.Hosting.Builder
namespace Microsoft.AspNetCore.Hosting.Builder
{
public interface IApplicationBuilderFactory
{

2
src/Microsoft.AspNetCore.Hosting/Internal/ApplicationLifetime.cs
View File

@ -4,7 +4,7 @@
using System;
using System.Threading;
namespace Microsoft.AspNet.Hosting.Internal
namespace Microsoft.AspNetCore.Hosting.Internal
{
/// <summary>
/// Allows consumers to perform cleanup during a graceful shutdown.

6
src/Microsoft.AspNetCore.Hosting/Internal/AutoRequestServicesStartupFilter.cs
View File

@ -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.Builder;
using Microsoft.AspNet.Hosting.Startup;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting.Startup;
namespace Microsoft.AspNet.Hosting.Internal
namespace Microsoft.AspNetCore.Hosting.Internal
{
public class AutoRequestServicesStartupFilter : IStartupFilter
{

22
src/Microsoft.AspNetCore.Hosting/Internal/HostingApplication.cs
View File

@ -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.Diagnostics;
using System.Threading.Tasks;
using Microsoft.AspNet.Hosting.Server;
using Microsoft.AspNet.Http;
using Microsoft.AspNet.Http.Features;
using Microsoft.AspNetCore.Hosting.Server;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Http.Features;
using Microsoft.Extensions.Logging;
namespace Microsoft.AspNet.Hosting.Internal
namespace Microsoft.AspNetCore.Hosting.Internal
{
public class HostingApplication : IHttpApplication<HostingApplication.Context>
{
@ -33,14 +33,14 @@ namespace Microsoft.AspNet.Hosting.Internal
public Context CreateContext(IFeatureCollection contextFeatures)
{
var httpContext = _httpContextFactory.Create(contextFeatures);
var diagnoticsEnabled = _diagnosticSource.IsEnabled("Microsoft.AspNet.Hosting.BeginRequest");
var diagnoticsEnabled = _diagnosticSource.IsEnabled("Microsoft.AspNetCore.Hosting.BeginRequest");
var startTimestamp = (diagnoticsEnabled || _logger.IsEnabled(LogLevel.Information)) ? Stopwatch.GetTimestamp() : 0;
var scope = _logger.RequestScope(httpContext);
_logger.RequestStarting(httpContext);
if (diagnoticsEnabled)
{
_diagnosticSource.Write("Microsoft.AspNet.Hosting.BeginRequest", new { httpContext = httpContext, timestamp = startTimestamp });
_diagnosticSource.Write("Microsoft.AspNetCore.Hosting.BeginRequest", new { httpContext = httpContext, timestamp = startTimestamp });
}
return new Context
@ -57,26 +57,26 @@ namespace Microsoft.AspNet.Hosting.Internal
if (exception == null)
{
var diagnoticsEnabled = _diagnosticSource.IsEnabled("Microsoft.AspNet.Hosting.EndRequest");
var diagnoticsEnabled = _diagnosticSource.IsEnabled("Microsoft.AspNetCore.Hosting.EndRequest");
var currentTimestamp = (diagnoticsEnabled || context.StartTimestamp != 0) ? Stopwatch.GetTimestamp() : 0;
_logger.RequestFinished(httpContext, context.StartTimestamp, currentTimestamp);
if (diagnoticsEnabled)
{
_diagnosticSource.Write("Microsoft.AspNet.Hosting.EndRequest", new { httpContext = httpContext, timestamp = currentTimestamp });
_diagnosticSource.Write("Microsoft.AspNetCore.Hosting.EndRequest", new { httpContext = httpContext, timestamp = currentTimestamp });
}
}
else
{
var diagnoticsEnabled = _diagnosticSource.IsEnabled("Microsoft.AspNet.Hosting.UnhandledException");
var diagnoticsEnabled = _diagnosticSource.IsEnabled("Microsoft.AspNetCore.Hosting.UnhandledException");
var currentTimestamp = (diagnoticsEnabled || context.StartTimestamp != 0) ? Stopwatch.GetTimestamp() : 0;
_logger.RequestFinished(httpContext, context.StartTimestamp, currentTimestamp);
if (diagnoticsEnabled)
{
_diagnosticSource.Write("Microsoft.AspNet.Hosting.UnhandledException", new { httpContext = httpContext, timestamp = currentTimestamp, exception = exception });
_diagnosticSource.Write("Microsoft.AspNetCore.Hosting.UnhandledException", new { httpContext = httpContext, timestamp = currentTimestamp, exception = exception });
}
}

4
src/Microsoft.AspNetCore.Hosting/Internal/HostingEnvironment.cs
View File

@ -4,11 +4,11 @@
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.FileProviders;
namespace Microsoft.AspNet.Hosting.Internal
namespace Microsoft.AspNetCore.Hosting.Internal
{
public class HostingEnvironment : IHostingEnvironment
{
public string EnvironmentName { get; set; } = Microsoft.AspNet.Hosting.EnvironmentName.Production;
public string EnvironmentName { get; set; } = Microsoft.AspNetCore.Hosting.EnvironmentName.Production;
public string WebRootPath { get; set; }

4
src/Microsoft.AspNetCore.Hosting/Internal/HostingEnvironmentExtensions.cs
View File

@ -3,11 +3,11 @@
using System;
using System.IO;
using Microsoft.AspNet.Hosting.Internal;
using Microsoft.AspNetCore.Hosting.Internal;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.FileProviders;
namespace Microsoft.AspNet.Hosting.Internal
namespace Microsoft.AspNetCore.Hosting.Internal
{
public static class HostingEnvironmentExtensions
{

6
src/Microsoft.AspNetCore.Hosting/Internal/HostingLoggerExtensions.cs
View File

@ -1,13 +1,13 @@
// 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.Diagnostics;
using System.Collections.Generic;
using Microsoft.AspNet.Http;
using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Logging;
namespace Microsoft.AspNet.Hosting.Internal
namespace Microsoft.AspNetCore.Hosting.Internal
{
internal static class HostingLoggerExtensions
{

4
src/Microsoft.AspNetCore.Hosting/Internal/LoggerEventIds.cs
View File

@ -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.Hosting.Internal
namespace Microsoft.AspNetCore.Hosting.Internal
{
internal static class LoggerEventIds
{

4
src/Microsoft.AspNetCore.Hosting/Internal/NullFileProvider.cs
View File

@ -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;
@ -8,7 +8,7 @@ using System.IO;
using Microsoft.Extensions.FileProviders;
using Microsoft.Extensions.Primitives;
namespace Microsoft.AspNet.Hosting.Internal
namespace Microsoft.AspNetCore.Hosting.Internal
{
internal class NullFileProvider : IFileProvider
{

4
src/Microsoft.AspNetCore.Hosting/Internal/RequestServicesContainerFeature.cs
View File

@ -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.Http.Features.Internal;
using Microsoft.AspNetCore.Http.Features.Internal;
using Microsoft.Extensions.DependencyInjection;
namespace Microsoft.AspNet.Hosting.Internal
namespace Microsoft.AspNetCore.Hosting.Internal
{
public class RequestServicesFeature : IServiceProvidersFeature, IDisposable
{

10
src/Microsoft.AspNetCore.Hosting/Internal/RequestServicesContainerMiddleware.cs
View File

@ -3,13 +3,13 @@
using System;
using System.Threading.Tasks;
using Microsoft.AspNet.Builder;
using Microsoft.AspNet.Http;
using Microsoft.AspNet.Http.Features;
using Microsoft.AspNet.Http.Features.Internal;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Http.Features;
using Microsoft.AspNetCore.Http.Features.Internal;
using Microsoft.Extensions.DependencyInjection;
namespace Microsoft.AspNet.Hosting.Internal
namespace Microsoft.AspNetCore.Hosting.Internal
{
public class RequestServicesContainerMiddleware
{

14
src/Microsoft.AspNetCore.Hosting/Internal/WebHost.cs
View File

@ -6,18 +6,18 @@ using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Threading;
using Microsoft.AspNet.Hosting.Builder;
using Microsoft.AspNet.Hosting.Server;
using Microsoft.AspNet.Hosting.Startup;
using Microsoft.AspNet.Http;
using Microsoft.AspNet.Http.Features;
using Microsoft.AspNet.Server.Features;
using Microsoft.AspNetCore.Hosting.Builder;
using Microsoft.AspNetCore.Hosting.Server;
using Microsoft.AspNetCore.Hosting.Startup;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Http.Features;
using Microsoft.AspNetCore.Server.Features;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.PlatformAbstractions;
namespace Microsoft.AspNet.Hosting.Internal
namespace Microsoft.AspNetCore.Hosting.Internal
{
public class WebHost : IWebHost
{

4
src/Microsoft.AspNetCore.Hosting/Internal/WebHostOptions.cs
View File

@ -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.Configuration;
namespace Microsoft.AspNet.Hosting.Internal
namespace Microsoft.AspNetCore.Hosting.Internal
{
public class WebHostOptions
{

2
src/Microsoft.AspNetCore.Hosting/Properties/AssemblyInfo.cs
View File

@ -6,5 +6,5 @@ using System.Resources;
using System.Runtime.CompilerServices;
[assembly: AssemblyMetadata("Serviceable", "True")]
[assembly: InternalsVisibleTo("Microsoft.AspNet.Hosting.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Hosting.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
[assembly: NeutralResourcesLanguage("en-us")]

2
src/Microsoft.AspNetCore.Hosting/Server/IServerLoader.cs
View File

@ -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.Hosting.Server
namespace Microsoft.AspNetCore.Hosting.Server
{
public interface IServerLoader
{

2
src/Microsoft.AspNetCore.Hosting/Server/ServerLoader.cs
View File

@ -6,7 +6,7 @@ using System.Linq;
using System.Reflection;
using Microsoft.Extensions.DependencyInjection;
namespace Microsoft.AspNet.Hosting.Server
namespace Microsoft.AspNetCore.Hosting.Server
{
public class ServerLoader : IServerLoader
{

4
src/Microsoft.AspNetCore.Hosting/Startup/ConfigureDelegate.cs
View File

@ -3,10 +3,10 @@
using System;
using System.Reflection;
using Microsoft.AspNet.Builder;
using Microsoft.AspNetCore.Builder;
using Microsoft.Extensions.DependencyInjection;
namespace Microsoft.AspNet.Hosting.Startup
namespace Microsoft.AspNetCore.Hosting.Startup
{
// TODO: replace all Action<IApplicationBuilder> eventually with this
public delegate void ConfigureDelegate(IApplicationBuilder builder);

2
src/Microsoft.AspNetCore.Hosting/Startup/ConfigureServicesDelegate.cs
View File

@ -6,7 +6,7 @@ using System.Linq;
using System.Reflection;
using Microsoft.Extensions.DependencyInjection;
namespace Microsoft.AspNet.Hosting.Startup
namespace Microsoft.AspNetCore.Hosting.Startup
{
public class ConfigureServicesBuilder
{

2
src/Microsoft.AspNetCore.Hosting/Startup/IStartupLoader.cs
View File

@ -4,7 +4,7 @@
using System;
using System.Collections.Generic;
namespace Microsoft.AspNet.Hosting.Startup
namespace Microsoft.AspNetCore.Hosting.Startup
{
public interface IStartupLoader
{

2
src/Microsoft.AspNetCore.Hosting/Startup/StartupExceptionPage.cs
View File

@ -15,7 +15,7 @@ using System.Text.Encodings.Web;
using Microsoft.Extensions.Internal;
using Microsoft.Extensions.PlatformAbstractions;
namespace Microsoft.AspNet.Hosting.Startup
namespace Microsoft.AspNetCore.Hosting.Startup
{
internal static class StartupExceptionPage
{

2
src/Microsoft.AspNetCore.Hosting/Startup/StartupLoader.cs
View File

@ -8,7 +8,7 @@ using System.Linq;
using System.Reflection;
using Microsoft.Extensions.DependencyInjection;
namespace Microsoft.AspNet.Hosting.Startup
namespace Microsoft.AspNetCore.Hosting.Startup
{
public class StartupLoader : IStartupLoader
{

4
src/Microsoft.AspNetCore.Hosting/Startup/StartupMethods.cs
View File

@ -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.Builder;
using Microsoft.AspNetCore.Builder;
using Microsoft.Extensions.DependencyInjection;
namespace Microsoft.AspNet.Hosting.Startup
namespace Microsoft.AspNetCore.Hosting.Startup
{
public class StartupMethods
{

18
src/Microsoft.AspNetCore.Hosting/WebHostBuilder.cs
View File

@ -5,20 +5,20 @@ using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Runtime.Versioning;
using Microsoft.AspNet.Builder;
using Microsoft.AspNet.Hosting.Builder;
using Microsoft.AspNet.Hosting.Internal;
using Microsoft.AspNet.Hosting.Server;
using Microsoft.AspNet.Hosting.Startup;
using Microsoft.AspNet.Http;
using Microsoft.AspNet.Http.Internal;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting.Builder;
using Microsoft.AspNetCore.Hosting.Internal;
using Microsoft.AspNetCore.Hosting.Server;
using Microsoft.AspNetCore.Hosting.Startup;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Http.Internal;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.DependencyInjection.Extensions;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.PlatformAbstractions;
namespace Microsoft.AspNet.Hosting
namespace Microsoft.AspNetCore.Hosting
{
/// <summary>
/// A builder for <see cref="IWebHost"/>
@ -210,7 +210,7 @@ namespace Microsoft.AspNet.Hosting
services.AddLogging();
services.AddOptions();
var diagnosticSource = new DiagnosticListener("Microsoft.AspNet");
var diagnosticSource = new DiagnosticListener("Microsoft.AspNetCore");
services.AddSingleton<DiagnosticSource>(diagnosticSource);
services.AddSingleton<DiagnosticListener>(diagnosticSource);

4
src/Microsoft.AspNetCore.Hosting/WebHostBuilderExtensions.cs
View File

@ -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.Hosting.Server;
using Microsoft.AspNetCore.Hosting.Server;
using Microsoft.Extensions.Configuration;
namespace Microsoft.AspNet.Hosting
namespace Microsoft.AspNetCore.Hosting
{
public static class WebHostBuilderExtensions
{

4
src/Microsoft.AspNetCore.Hosting/WebHostConfiguration.cs
View File

@ -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.Collections.Generic;
using Microsoft.Extensions.Configuration;
namespace Microsoft.AspNet.Hosting
namespace Microsoft.AspNetCore.Hosting
{
public class WebHostConfiguration
{

6
src/Microsoft.AspNetCore.Hosting/WebHostExtensions.cs
View File

@ -1,12 +1,12 @@
// 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.Threading;
using Microsoft.AspNet.Server.Features;
using Microsoft.AspNetCore.Server.Features;
using Microsoft.Extensions.DependencyInjection;
namespace Microsoft.AspNet.Hosting
namespace Microsoft.AspNetCore.Hosting
{
public static class WebHostExtensions
{

4
src/Microsoft.AspNetCore.Hosting/compiler/resources/GenericError_Footer.html
View File

@ -1,3 +1,3 @@
<footer>
.NET Framework {0} version {1}&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;DNX {2} version {3}&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;Microsoft.AspNet.Hosting version {4}&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;{5} {6}&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;<a href="http://go.microsoft.com/fwlink/?LinkId=517394">Need help?</a>
<footer>
.NET Framework {0} version {1}&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;DNX {2} version {3}&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;Microsoft.AspNetCore.Hosting version {4}&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;{5} {6}&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;<a href="http://go.microsoft.com/fwlink/?LinkId=517394">Need help?</a>
</footer>

8
src/Microsoft.AspNetCore.Hosting/project.json
View File

@ -10,10 +10,10 @@
"keyFile": "../../tools/Key.snk"
},
"dependencies": {
"Microsoft.AspNet.Hosting.Abstractions": "1.0.0-*",
"Microsoft.AspNet.Hosting.Server.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.Hosting.Server.Abstractions": "1.0.0-*",
"Microsoft.AspNetCore.Http": "1.0.0-*",
"Microsoft.AspNetCore.Http.Extensions": "1.0.0-*",
"Microsoft.Extensions.FileProviders.Physical": "1.0.0-*",
"Microsoft.Extensions.Options": "1.0.0-*",
"Microsoft.Extensions.Configuration": "1.0.0-*",

2
src/Microsoft.AspNetCore.Server.Testing/Common/DeploymentParameters.cs
View File

@ -5,7 +5,7 @@ using System;
using System.Collections.Generic;
using System.IO;
namespace Microsoft.AspNet.Server.Testing
namespace Microsoft.AspNetCore.Server.Testing
{
/// <summary>
/// Parameters to control application deployment.

2
src/Microsoft.AspNetCore.Server.Testing/Common/DeploymentResult.cs
View File

@ -3,7 +3,7 @@
using System.Threading;
namespace Microsoft.AspNet.Server.Testing
namespace Microsoft.AspNetCore.Server.Testing
{
/// <summary>
/// Result of a deployment.

2
src/Microsoft.AspNetCore.Server.Testing/Common/DotnetArchitecture.cs
View File

@ -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.Server.Testing
namespace Microsoft.AspNetCore.Server.Testing
{
public enum RuntimeArchitecture
{

2
src/Microsoft.AspNetCore.Server.Testing/Common/DotnetFlavor.cs
View File

@ -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.Server.Testing
namespace Microsoft.AspNetCore.Server.Testing
{
public enum RuntimeFlavor
{

2
src/Microsoft.AspNetCore.Server.Testing/Common/RetryHelper.cs
View File

@ -8,7 +8,7 @@ using System.Threading;
using System.Threading.Tasks;
using Microsoft.Extensions.Logging;
namespace Microsoft.AspNet.Server.Testing
namespace Microsoft.AspNetCore.Server.Testing
{
public class RetryHelper
{

2
src/Microsoft.AspNetCore.Server.Testing/Common/ServerType.cs
View File

@ -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.Server.Testing
namespace Microsoft.AspNetCore.Server.Testing
{
public enum ServerType
{

4
src/Microsoft.AspNetCore.Server.Testing/Common/TestUriHelper.cs
View File

@ -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 System.Net;
using System.Net.Sockets;
namespace Microsoft.AspNet.Server.Testing.Common
namespace Microsoft.AspNetCore.Server.Testing.Common
{
public static class TestUriHelper
{

4
src/Microsoft.AspNetCore.Server.Testing/Deployers/ApplicationDeployer.cs
View File

@ -6,11 +6,11 @@ using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Threading;
using Microsoft.AspNet.Testing;
using Microsoft.AspNetCore.Testing;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.PlatformAbstractions;
namespace Microsoft.AspNet.Server.Testing
namespace Microsoft.AspNetCore.Server.Testing
{
/// <summary>
/// Abstract base class of all deployers with implementation of some of the common helpers.

2
src/Microsoft.AspNetCore.Server.Testing/Deployers/ApplicationDeployerFactory.cs
View File

@ -4,7 +4,7 @@
using System;
using Microsoft.Extensions.Logging;
namespace Microsoft.AspNet.Server.Testing
namespace Microsoft.AspNetCore.Server.Testing
{
/// <summary>
/// Factory to create an appropriate deployer based on <see cref="DeploymentParameters"/>.

2
src/Microsoft.AspNetCore.Server.Testing/Deployers/IApplicationDeployer.cs
View File

@ -3,7 +3,7 @@
using System;
namespace Microsoft.AspNet.Server.Testing
namespace Microsoft.AspNetCore.Server.Testing
{
/// <summary>
/// Common operations on an application deployer.

4
src/Microsoft.AspNetCore.Server.Testing/Deployers/IISDeployer.cs
View File

@ -6,11 +6,11 @@
using System;
using System.Linq;
using System.Threading;
using Microsoft.AspNet.Server.Testing.Common;
using Microsoft.AspNetCore.Server.Testing.Common;
using Microsoft.Extensions.Logging;
using Microsoft.Web.Administration;
namespace Microsoft.AspNet.Server.Testing
namespace Microsoft.AspNetCore.Server.Testing
{
/// <summary>
/// Deployer for IIS.

4
src/Microsoft.AspNetCore.Server.Testing/Deployers/IISExpressDeployer.cs
View File

@ -6,9 +6,9 @@ using System.Diagnostics;
using System.IO;
using System.Threading;
using Microsoft.Extensions.Logging;
using Microsoft.AspNet.Server.Testing.Common;
using Microsoft.AspNetCore.Server.Testing.Common;
namespace Microsoft.AspNet.Server.Testing
namespace Microsoft.AspNetCore.Server.Testing
{
/// <summary>
/// Deployment helper for IISExpress.

6
src/Microsoft.AspNetCore.Server.Testing/Deployers/SelfHostDeployer.cs
View File

@ -6,9 +6,9 @@ using System.Diagnostics;
using System.IO;
using System.Threading;
using Microsoft.Extensions.Logging;
using Microsoft.AspNet.Server.Testing.Common;
using Microsoft.AspNetCore.Server.Testing.Common;
namespace Microsoft.AspNet.Server.Testing
namespace Microsoft.AspNetCore.Server.Testing
{
/// <summary>
/// Deployer for WebListener and Kestrel.
@ -58,7 +58,7 @@ namespace Microsoft.AspNet.Server.Testing
var dnxPath = Path.Combine(TargetRuntimeBinPath, DnxCommandName);
var dnxArgs = $"-p \"{DeploymentParameters.ApplicationPath}\" {commandName} " +
$"--server.urls {uri} " +
$"--server {(DeploymentParameters.ServerType == ServerType.WebListener ? "Microsoft.AspNet.Server.WebListener" : "Microsoft.AspNet.Server.Kestrel")}";
$"--server {(DeploymentParameters.ServerType == ServerType.WebListener ? "Microsoft.AspNetCore.Server.WebListener" : "Microsoft.AspNetCore.Server.Kestrel")}";
Logger.LogInformation($"Executing {dnxPath} {dnxArgs}");

2
src/Microsoft.AspNetCore.Server.Testing/project.json
View File

@ -10,7 +10,7 @@
"url": "git://github.com/aspnet/hosting"
},
"dependencies": {
"Microsoft.AspNet.Testing": "1.0.0-*",
"Microsoft.AspNetCore.Testing": "1.0.0-*",
"Microsoft.Extensions.Logging.Abstractions": "1.0.0-*",
"Microsoft.Extensions.PlatformAbstractions": "1.0.0-*"
},

4
src/Microsoft.AspNetCore.Server.Testing/xunit/SkipIfCurrentRuntimeIsCoreClr.cs
View File

@ -3,9 +3,9 @@
using System;
using System.Diagnostics;
using Microsoft.AspNet.Testing.xunit;
using Microsoft.AspNetCore.Testing.xunit;
namespace Microsoft.AspNet.Server.Testing
namespace Microsoft.AspNetCore.Server.Testing
{
/// <summary>
/// Skips a test if the DNX used to run the test is CoreClr.

4
src/Microsoft.AspNetCore.Server.Testing/xunit/SkipIfIISVariationsNotEnabledAttribute.cs
View File

@ -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.Testing.xunit;
using Microsoft.AspNetCore.Testing.xunit;
namespace Microsoft.AspNet.Server.Testing
namespace Microsoft.AspNetCore.Server.Testing
{
/// <summary>
/// Skip test if IIS variations are not enabled. To enable set environment variable

4
src/Microsoft.AspNetCore.Server.Testing/xunit/SkipOn32BitOSAttribute.cs
View File

@ -3,9 +3,9 @@
using System;
using System.IO;
using Microsoft.AspNet.Testing.xunit;
using Microsoft.AspNetCore.Testing.xunit;
namespace Microsoft.AspNet.Server.Testing
namespace Microsoft.AspNetCore.Server.Testing
{
/// <summary>
/// Skips a 64 bit test if the current Windows OS is 32-bit.

10
src/Microsoft.AspNetCore.TestHost/ClientHandler.cs
View File

@ -10,12 +10,12 @@ using System.Net;
using System.Net.Http;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.AspNet.Hosting.Server;
using Microsoft.AspNet.Http;
using Microsoft.AspNet.Http.Features;
using Context = Microsoft.AspNet.Hosting.Internal.HostingApplication.Context;
using Microsoft.AspNetCore.Hosting.Server;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Http.Features;
using Context = Microsoft.AspNetCore.Hosting.Internal.HostingApplication.Context;
namespace Microsoft.AspNet.TestHost
namespace Microsoft.AspNetCore.TestHost
{
/// <summary>
/// This adapts HttpRequestMessages to ASP.NET requests, dispatches them through the pipeline, and returns the

6
src/Microsoft.AspNetCore.TestHost/Properties/AssemblyInfo.cs
View File

@ -23,10 +23,10 @@ using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("Microsoft.AspNet.TestHost")]
[assembly: AssemblyTitle("Microsoft.AspNetCore.TestHost")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyProduct("Microsoft.AspNet.TestHost")]
[assembly: AssemblyProduct("Microsoft.AspNetCore.TestHost")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
@ -36,7 +36,7 @@ using System.Runtime.InteropServices;
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("12A3EDBB-65B6-4D47-98FC-2B80CEC71E51")]
[assembly: InternalsVisibleTo("Microsoft.AspNet.TestHost.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
[assembly: InternalsVisibleTo("Microsoft.AspNetCore.TestHost.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
[assembly: AssemblyMetadata("Serviceable", "True")]
[assembly: NeutralResourcesLanguage("en-us")]

2
src/Microsoft.AspNetCore.TestHost/RequestBuilder.cs
View File

@ -6,7 +6,7 @@ using System.IO;
using System.Net.Http;
using System.Threading.Tasks;
namespace Microsoft.AspNet.TestHost
namespace Microsoft.AspNetCore.TestHost
{
/// <summary>
/// Used to construct a HttpRequestMessage object.

8
src/Microsoft.AspNetCore.TestHost/RequestFeature.cs
View File

@ -2,11 +2,11 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System.IO;
using Microsoft.AspNet.Http;
using Microsoft.AspNet.Http.Features;
using Microsoft.AspNet.Http.Internal;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Http.Features;
using Microsoft.AspNetCore.Http.Internal;
namespace Microsoft.AspNet.TestHost
namespace Microsoft.AspNetCore.TestHost
{
internal class RequestFeature : IHttpRequestFeature
{

8
src/Microsoft.AspNetCore.TestHost/ResponseFeature.cs
View File

@ -4,11 +4,11 @@
using System;
using System.IO;
using System.Threading.Tasks;
using Microsoft.AspNet.Http;
using Microsoft.AspNet.Http.Features;
using Microsoft.AspNet.Http.Internal;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Http.Features;
using Microsoft.AspNetCore.Http.Internal;
namespace Microsoft.AspNet.TestHost
namespace Microsoft.AspNetCore.TestHost
{
internal class ResponseFeature : IHttpResponseFeature
{

2
src/Microsoft.AspNetCore.TestHost/ResponseStream.cs
View File

@ -8,7 +8,7 @@ using System.IO;
using System.Threading;
using System.Threading.Tasks;
namespace Microsoft.AspNet.TestHost
namespace Microsoft.AspNetCore.TestHost
{
// This steam accepts writes from the server/app, buffers them internally, and returns the data via Reads
// when requested by the client.

14
src/Microsoft.AspNetCore.TestHost/TestServer.cs
View File

@ -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.Net.Http;
using System.Threading.Tasks;
using Microsoft.AspNet.Hosting;
using Microsoft.AspNet.Hosting.Server;
using Microsoft.AspNet.Http;
using Microsoft.AspNet.Http.Features;
using Context = Microsoft.AspNet.Hosting.Internal.HostingApplication.Context;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Hosting.Server;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Http.Features;
using Context = Microsoft.AspNetCore.Hosting.Internal.HostingApplication.Context;
namespace Microsoft.AspNet.TestHost
namespace Microsoft.AspNetCore.TestHost
{
public class TestServer : IServer
{

4
src/Microsoft.AspNetCore.TestHost/TestWebSocket.cs
View File

@ -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;
@ -8,7 +8,7 @@ using System.Net.WebSockets;
using System.Threading;
using System.Threading.Tasks;
namespace Microsoft.AspNet.TestHost
namespace Microsoft.AspNetCore.TestHost
{
internal class TestWebSocket : WebSocket
{

10
src/Microsoft.AspNetCore.TestHost/WebSocketClient.cs
View File

@ -8,12 +8,12 @@ using System.Net.WebSockets;
using System.Security.Cryptography;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.AspNet.Hosting.Server;
using Microsoft.AspNet.Http;
using Microsoft.AspNet.Http.Features;
using Context = Microsoft.AspNet.Hosting.Internal.HostingApplication.Context;
using Microsoft.AspNetCore.Hosting.Server;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Http.Features;
using Context = Microsoft.AspNetCore.Hosting.Internal.HostingApplication.Context;
namespace Microsoft.AspNet.TestHost
namespace Microsoft.AspNetCore.TestHost
{
public class WebSocketClient
{

2
src/Microsoft.AspNetCore.TestHost/project.json
View File

@ -10,7 +10,7 @@
"url": "git://github.com/aspnet/hosting"
},
"dependencies": {
"Microsoft.AspNet.Hosting": "1.0.0-*"
"Microsoft.AspNetCore.Hosting": "1.0.0-*"
},
"frameworks": {
"net451": {

2
test/Microsoft.AspNetCore.Hosting.Tests/Fakes/FakeOptions.cs
View File

@ -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.Hosting.Fakes
namespace Microsoft.AspNetCore.Hosting.Fakes
{
public class FakeOptions
{

2
test/Microsoft.AspNetCore.Hosting.Tests/Fakes/FakeService.cs
View File

@ -3,7 +3,7 @@
using System;
namespace Microsoft.AspNet.Hosting.Fakes
namespace Microsoft.AspNetCore.Hosting.Fakes
{
public class FakeService : IFakeEveryService, IDisposable
{

2
test/Microsoft.AspNetCore.Hosting.Tests/Fakes/IFactoryService.cs
View File

@ -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.Hosting.Fakes
namespace Microsoft.AspNetCore.Hosting.Fakes
{
public interface IFactoryService
{

2
test/Microsoft.AspNetCore.Hosting.Tests/Fakes/IFakeEveryService.cs
View File

@ -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.Hosting.Fakes
namespace Microsoft.AspNetCore.Hosting.Fakes
{
interface IFakeEveryService :
IFakeScopedService,

2
test/Microsoft.AspNetCore.Hosting.Tests/Fakes/IFakeScopedService.cs
View File

@ -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.Hosting.Fakes
namespace Microsoft.AspNetCore.Hosting.Fakes
{
public interface IFakeScopedService : IFakeService
{

2
test/Microsoft.AspNetCore.Hosting.Tests/Fakes/IFakeService.cs
View File

@ -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.Hosting.Fakes
namespace Microsoft.AspNetCore.Hosting.Fakes
{
public interface IFakeService { }
}

2
test/Microsoft.AspNetCore.Hosting.Tests/Fakes/IFakeServiceInstance.cs
View File

@ -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.Hosting.Fakes
namespace Microsoft.AspNetCore.Hosting.Fakes
{
interface IFakeServiceInstance : IFakeService
{

2
test/Microsoft.AspNetCore.Hosting.Tests/Fakes/IFakeSingletonService.cs
View File

@ -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.Hosting.Fakes
namespace Microsoft.AspNetCore.Hosting.Fakes
{
interface IFakeSingletonService : IFakeService
{

2
test/Microsoft.AspNetCore.Hosting.Tests/Fakes/IFakeStartupCallback.cs
View File

@ -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.Hosting.Fakes
namespace Microsoft.AspNetCore.Hosting.Fakes
{
public interface IFakeStartupCallback
{

2
test/Microsoft.AspNetCore.Hosting.Tests/Fakes/INonexistentService.cs
View File

@ -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.Hosting.Fakes
namespace Microsoft.AspNetCore.Hosting.Fakes
{
public interface INonexistentService
{

4
test/Microsoft.AspNetCore.Hosting.Tests/Fakes/RuntimeEnvironment.cs
View File

@ -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 Microsoft.Extensions.PlatformAbstractions;
namespace Microsoft.AspNet.Hosting.Fakes
namespace Microsoft.AspNetCore.Hosting.Fakes
{
public class RuntimeEnvironment : IRuntimeEnvironment
{

4
test/Microsoft.AspNetCore.Hosting.Tests/Fakes/Startup.cs
View File

@ -1,11 +1,11 @@
// 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.AspNetCore.Builder;
using Microsoft.Extensions.DependencyInjection;
using System;
namespace Microsoft.AspNet.Hosting.Fakes
namespace Microsoft.AspNetCore.Hosting.Fakes
{
public class Startup : StartupBase
{

2
test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupBase.cs
View File

@ -3,7 +3,7 @@
using Microsoft.Extensions.DependencyInjection;
namespace Microsoft.AspNet.Hosting.Fakes
namespace Microsoft.AspNetCore.Hosting.Fakes
{
public class StartupBase
{

2
test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupBoom.cs
View File

@ -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.Hosting.Fakes
namespace Microsoft.AspNetCore.Hosting.Fakes
{
public class StartupBoom
{

4
test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupConfigureServicesThrows.cs
View File

@ -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.Builder;
using Microsoft.AspNetCore.Builder;
using Microsoft.Extensions.DependencyInjection;
namespace Microsoft.AspNet.Hosting.Fakes
namespace Microsoft.AspNetCore.Hosting.Fakes
{
public class StartupConfigureServicesThrows
{

4
test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupConfigureThrows.cs
View File

@ -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.Builder;
using Microsoft.AspNetCore.Builder;
using Microsoft.Extensions.DependencyInjection;
namespace Microsoft.AspNet.Hosting.Fakes
namespace Microsoft.AspNetCore.Hosting.Fakes
{
public class StartupConfigureThrows
{

4
test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupCtorThrows.cs
View File

@ -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.AspNetCore.Builder;
namespace Microsoft.AspNet.Hosting.Fakes
namespace Microsoft.AspNetCore.Hosting.Fakes
{
public class StartupCtorThrows
{

4
test/Microsoft.AspNetCore.Hosting.Tests/Fakes/StartupNoServices.cs
View File

@ -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.Builder;
using Microsoft.AspNetCore.Builder;
namespace Microsoft.AspNet.Hosting.Fakes
namespace Microsoft.AspNetCore.Hosting.Fakes
{
public class StartupNoServices
{

Some files were not shown because too many files have changed in this diff Show More