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

Fix HttpAbstractions dependency issues.

This commit is contained in:
Chris Ross 2014-05-06 10:39:14 -07:00
parent f66a0cb429
commit 0c48454ad2
17 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
DiagnosticsPages.sln
View File

@ -27,6 +27,7 @@ Global
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{C5F59CBA-DF2D-4983-8CBB-11B6AF21B416}.Debug|Any CPU.ActiveCfg = Debug|x86
{C5F59CBA-DF2D-4983-8CBB-11B6AF21B416}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{C5F59CBA-DF2D-4983-8CBB-11B6AF21B416}.Debug|Mixed Platforms.Build.0 = Debug|x86
{C5F59CBA-DF2D-4983-8CBB-11B6AF21B416}.Debug|x86.ActiveCfg = Debug|x86
{C5F59CBA-DF2D-4983-8CBB-11B6AF21B416}.Debug|x86.Build.0 = Debug|x86
{C5F59CBA-DF2D-4983-8CBB-11B6AF21B416}.Release|Any CPU.ActiveCfg = Release|x86
@ -46,6 +47,7 @@ Global
{68A1F0E1-ECCE-46D1-B20F-C43EE5B097DE}.Release|x86.Build.0 = Release|x86
{589AC17F-9455-4764-8F82-FCD2AE58DA14}.Debug|Any CPU.ActiveCfg = Debug|x86
{589AC17F-9455-4764-8F82-FCD2AE58DA14}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{589AC17F-9455-4764-8F82-FCD2AE58DA14}.Debug|Mixed Platforms.Build.0 = Debug|x86
{589AC17F-9455-4764-8F82-FCD2AE58DA14}.Debug|x86.ActiveCfg = Debug|x86
{589AC17F-9455-4764-8F82-FCD2AE58DA14}.Debug|x86.Build.0 = Debug|x86
{589AC17F-9455-4764-8F82-FCD2AE58DA14}.Release|Any CPU.ActiveCfg = Release|x86
@ -55,6 +57,7 @@ Global
{589AC17F-9455-4764-8F82-FCD2AE58DA14}.Release|x86.Build.0 = Release|x86
{4D4A785A-ECB9-4916-A88F-0FD306EE3B74}.Debug|Any CPU.ActiveCfg = Debug|x86
{4D4A785A-ECB9-4916-A88F-0FD306EE3B74}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{4D4A785A-ECB9-4916-A88F-0FD306EE3B74}.Debug|Mixed Platforms.Build.0 = Debug|x86
{4D4A785A-ECB9-4916-A88F-0FD306EE3B74}.Debug|x86.ActiveCfg = Debug|x86
{4D4A785A-ECB9-4916-A88F-0FD306EE3B74}.Debug|x86.Build.0 = Debug|x86
{4D4A785A-ECB9-4916-A88F-0FD306EE3B74}.Release|Any CPU.ActiveCfg = Release|x86

3
samples/ErrorPageSample/Startup.cs
View File

@ -1,6 +1,5 @@
using System;
using Microsoft.AspNet;
using Microsoft.AspNet.Abstractions;
using Microsoft.AspNet.Builder;
namespace ErrorPageSample
{

2
samples/ErrorPageSample/project.json
View File

@ -4,7 +4,7 @@
"Helios" : "0.1-alpha-*",
"Microsoft.AspNet.Diagnostics": "",
"Microsoft.AspNet.HttpFeature": "0.1-alpha-*",
"Microsoft.AspNet.Abstractions": "0.1-alpha-*",
"Microsoft.AspNet.Http": "0.1-alpha-*",
"Microsoft.AspNet.Server.WebListener": "0.1-alpha-*",
"Microsoft.AspNet.Hosting": "0.1-alpha-*"
},

2
samples/WelcomePageSample/Startup.cs
View File

@ -1,5 +1,5 @@
using Microsoft.AspNet;
using Microsoft.AspNet.Abstractions;
using Microsoft.AspNet.Builder;
namespace WelcomePageSample
{

2
samples/WelcomePageSample/project.json
View File

@ -4,7 +4,7 @@
"Helios" : "0.1-alpha-*",
"Microsoft.AspNet.Diagnostics": "",
"Microsoft.AspNet.HttpFeature": "0.1-alpha-*",
"Microsoft.AspNet.Abstractions": "0.1-alpha-*",
"Microsoft.AspNet.Http": "0.1-alpha-*",
"Microsoft.AspNet.Server.WebListener": "0.1-alpha-*",
"Microsoft.AspNet.Hosting": "0.1-alpha-*"
},

2
src/Microsoft.AspNet.Diagnostics/DiagnosticsPageExtensions.cs
View File

@ -5,7 +5,7 @@ using System;
using Microsoft.AspNet.Abstractions;
using Microsoft.AspNet.Diagnostics;
namespace Microsoft.AspNet
namespace Microsoft.AspNet.Builder
{
/// <summary>
/// IBuilder extensions for the DiagnosticsPageMiddleware.

3
src/Microsoft.AspNet.Diagnostics/DiagnosticsPageMiddleware.cs
View File

@ -4,8 +4,9 @@
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using Microsoft.AspNet.Builder;
using Microsoft.AspNet.Diagnostics.Views;
using Microsoft.AspNet.Abstractions;
using Microsoft.AspNet.Http;
namespace Microsoft.AspNet.Diagnostics
{

2
src/Microsoft.AspNet.Diagnostics/DiagnosticsPageOptions.cs
View File

@ -2,7 +2,7 @@
#if DEBUG
using Microsoft.AspNet.Abstractions;
using Microsoft.AspNet.Http;
namespace Microsoft.AspNet.Diagnostics
{

4
src/Microsoft.AspNet.Diagnostics/ErrorPageExtensions.cs
View File

@ -1,10 +1,10 @@
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
using System;
using Microsoft.AspNet.Abstractions;
using Microsoft.AspNet.Diagnostics;
using Microsoft.AspNet.Http;
namespace Microsoft.AspNet
namespace Microsoft.AspNet.Builder
{
/// <summary>
/// IBuilder extension methods for the ErrorPageMiddleware.

3
src/Microsoft.AspNet.Diagnostics/ErrorPageMiddleware.cs
View File

@ -7,8 +7,9 @@ using System.Globalization;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.AspNet.Builder;
using Microsoft.AspNet.Diagnostics.Views;
using Microsoft.AspNet.Abstractions;
using Microsoft.AspNet.Http;
namespace Microsoft.AspNet.Diagnostics
{

2
src/Microsoft.AspNet.Diagnostics/Views/BaseView.cs
View File

@ -1,11 +1,11 @@
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
using Microsoft.AspNet.Abstractions;
using System;
using System.Globalization;
using System.IO;
using System.Net;
using System.Threading.Tasks;
using Microsoft.AspNet.Http;
namespace Microsoft.AspNet.Diagnostics.Views
{

2
src/Microsoft.AspNet.Diagnostics/Views/ErrorDetails.cs
View File

@ -16,8 +16,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace Microsoft.AspNet.Diagnostics.Views
{

2
src/Microsoft.AspNet.Diagnostics/Views/ErrorPageModel.cs
View File

@ -1,8 +1,8 @@
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
using Microsoft.AspNet.Abstractions;
using System;
using System.Collections.Generic;
using Microsoft.AspNet.Http;
namespace Microsoft.AspNet.Diagnostics.Views
{

4
src/Microsoft.AspNet.Diagnostics/WelcomePageExtensions.cs
View File

@ -1,10 +1,10 @@
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
using System;
using Microsoft.AspNet.Abstractions;
using Microsoft.AspNet.Http;
using Microsoft.AspNet.Diagnostics;
namespace Microsoft.AspNet
namespace Microsoft.AspNet.Builder
{
/// <summary>
/// IBuilder extensions for the WelcomePageMiddleware.

3
src/Microsoft.AspNet.Diagnostics/WelcomePageMiddleware.cs
View File

@ -4,7 +4,8 @@ using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using Microsoft.AspNet.Diagnostics.Views;
using Microsoft.AspNet.Abstractions;
using Microsoft.AspNet.Builder;
using Microsoft.AspNet.Http;
namespace Microsoft.AspNet.Diagnostics
{

2
src/Microsoft.AspNet.Diagnostics/WelcomePageOptions.cs
View File

@ -1,6 +1,6 @@
// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
using Microsoft.AspNet.Abstractions;
using Microsoft.AspNet.Http;
namespace Microsoft.AspNet.Diagnostics
{

2
src/Microsoft.AspNet.Diagnostics/project.json
View File

@ -3,7 +3,7 @@
"dependencies": {
"Microsoft.AspNet.DependencyInjection": "0.1-alpha-*",
"Microsoft.AspNet.PipelineCore": "0.1-alpha-*",
"Microsoft.AspNet.Abstractions": "0.1-alpha-*",
"Microsoft.AspNet.Http": "0.1-alpha-*",
"Microsoft.AspNet.FeatureModel": "0.1-alpha-*"
},
"configurations": {