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

Merge remote-tracking branch 'origin/release' into rybrande/dev

This commit is contained in:
Ryan Brandenburg 2016-04-26 10:18:48 -07:00
parent 0788edbd4b e915f36748
commit 39f4b1fd91
60 changed files with 142 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
samples/ActionConstraintSample.Web/Startup.cs
View File

@ -1,6 +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.
using System.IO;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.DependencyInjection;
@ -30,6 +31,7 @@ namespace ActionConstraintSample.Web
public static void Main(string[] args)
{
var host = new WebHostBuilder()
.UseContentRoot(Directory.GetCurrentDirectory())
.UseDefaultHostingConfiguration(args)
.UseIISIntegration()
.UseKestrel()

2
samples/ActionConstraintSample.Web/project.json
View File

@ -10,7 +10,7 @@
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*"
},
"frameworks": {
"net451": {},
"net451": { },
"netcoreapp1.0": {
"imports": [
"dnxcore50",

2
samples/CustomRouteSample.Web/Startup.cs
View File

@ -1,6 +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.
using System.IO;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.DependencyInjection;
@ -27,6 +28,7 @@ namespace CustomRouteSample.Web
public static void Main(string[] args)
{
var host = new WebHostBuilder()
.UseContentRoot(Directory.GetCurrentDirectory())
.UseDefaultHostingConfiguration(args)
.UseIISIntegration()
.UseKestrel()

2
samples/CustomRouteSample.Web/project.json
View File

@ -10,7 +10,7 @@
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*"
},
"frameworks": {
"net451": {},
"net451": { },
"netcoreapp1.0": {
"imports": [
"dnxcore50",

2
samples/EmbeddedViewSample.Web/Startup.cs
View File

@ -1,6 +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.
using System.IO;
using System.Reflection;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
@ -44,6 +45,7 @@ namespace EmbeddedViewSample.Web
public static void Main(string[] args)
{
var host = new WebHostBuilder()
.UseContentRoot(Directory.GetCurrentDirectory())
.UseDefaultHostingConfiguration(args)
.UseIISIntegration()
.UseKestrel()

2
samples/EmbeddedViewSample.Web/project.json
View File

@ -12,7 +12,7 @@
"Microsoft.Extensions.FileProviders.Embedded": "1.0.0-*"
},
"frameworks": {
"net451": {},
"net451": { },
"netcoreapp1.0": {
"imports": [
"dnxcore50",

2
samples/FormatFilterSample.Web/Startup.cs
View File

@ -1,6 +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.
using System.IO;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Mvc;
@ -40,6 +41,7 @@ namespace FormatFilterSample.Web
public static void Main(string[] args)
{
var host = new WebHostBuilder()
.UseContentRoot(Directory.GetCurrentDirectory())
.UseDefaultHostingConfiguration(args)
.UseIISIntegration()
.UseKestrel()

2
samples/FormatFilterSample.Web/project.json
View File

@ -11,7 +11,7 @@
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*"
},
"frameworks": {
"net451": {},
"net451": { },
"netcoreapp1.0": {
"imports": [
"dnxcore50",

4
samples/InlineConstraintSample.Web/Startup.cs
View File

@ -2,6 +2,7 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System.Collections.Generic;
using System.IO;
using InlineConstraintSample.Web.Constraints;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
@ -14,7 +15,7 @@ namespace InlineConstraintSample.Web
{
public void ConfigureServices(IServiceCollection services)
{
services.AddRouting( routeOptions =>
services.AddRouting(routeOptions =>
{
routeOptions.ConstraintMap.Add("IsbnDigitScheme10", typeof(IsbnDigitScheme10Constraint));
routeOptions.ConstraintMap.Add("IsbnDigitScheme13", typeof(IsbnDigitScheme13Constraint));
@ -39,6 +40,7 @@ namespace InlineConstraintSample.Web
public static void Main(string[] args)
{
var host = new WebHostBuilder()
.UseContentRoot(Directory.GetCurrentDirectory())
.UseDefaultHostingConfiguration(args)
.UseIISIntegration()
.UseKestrel()

2
samples/InlineConstraintSample.Web/project.json
View File

@ -10,7 +10,7 @@
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*"
},
"frameworks": {
"net451": {},
"net451": { },
"netcoreapp1.0": {
"imports": [
"dnxcore50",

2
samples/JsonPatchSample.Web/Startup.cs
View File

@ -1,6 +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.
using System.IO;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.DependencyInjection;
@ -25,6 +26,7 @@ namespace JsonPatchSample.Web
public static void Main(string[] args)
{
var host = new WebHostBuilder()
.UseContentRoot(Directory.GetCurrentDirectory())
.UseDefaultHostingConfiguration(args)
.UseIISIntegration()
.UseKestrel()

3
samples/JsonPatchSample.Web/project.json
View File

@ -10,7 +10,7 @@
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*"
},
"frameworks": {
"net451": {},
"net451": { },
"netcoreapp1.0": {
"imports": [
"dnxcore50",
@ -25,6 +25,7 @@
}
},
"content": [
"wwwroot",
"web.config"
],
"tools": {

2
samples/LocalizationSample.Web/Startup.cs
View File

@ -3,6 +3,7 @@
using System.Collections.Generic;
using System.Globalization;
using System.IO;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Localization;
@ -43,6 +44,7 @@ namespace LocalizationSample.Web
public static void Main(string[] args)
{
var host = new WebHostBuilder()
.UseContentRoot(Directory.GetCurrentDirectory())
.UseDefaultHostingConfiguration(args)
.UseIISIntegration()
.UseKestrel()

2
samples/LocalizationSample.Web/project.json
View File

@ -10,7 +10,7 @@
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*"
},
"frameworks": {
"net451": {},
"net451": { },
"netcoreapp1.0": {
"imports": [
"dnxcore50",

2
samples/MvcSandbox/Startup.cs
View File

@ -34,8 +34,8 @@ namespace MvcSandbox
public static void Main(string[] args)
{
var host = new WebHostBuilder()
.UseDefaultHostingConfiguration(args)
.UseContentRoot(Directory.GetCurrentDirectory())
.UseDefaultHostingConfiguration(args)
.UseIISIntegration()
.UseKestrel()
.UseStartup<Startup>()

11
samples/MvcSandbox/project.json
View File

@ -16,8 +16,17 @@
},
"content": [
"Views",
"web.config"
"web.config",
"wwwroot"
],
"tools": {
"dotnet-razor-tooling": {
"version": "1.0.0-*",
"imports": [
"net45"
]
}
},
"frameworks": {
"net451": { },
"netcoreapp1.0": {

2
samples/MvcSubAreaSample.Web/Startup.cs
View File

@ -2,6 +2,7 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
using System.IO;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Mvc.Razor;
@ -39,6 +40,7 @@ namespace MvcSubAreaSample.Web
public static void Main(string[] args)
{
var host = new WebHostBuilder()
.UseContentRoot(Directory.GetCurrentDirectory())
.UseDefaultHostingConfiguration(args)
.UseIISIntegration()
.UseKestrel()

7
samples/MvcSubAreaSample.Web/project.json
View File

@ -28,12 +28,19 @@
},
"content": [
"Views",
"Areas",
"web.config"
],
"tools": {
"Microsoft.AspNetCore.Server.IISIntegration.Tools": {
"version": "1.0.0-*",
"imports": "portable-net45+wp80+win8+wpa81+dnxcore50"
},
"dotnet-razor-tooling": {
"version": "1.0.0-*",
"imports": [
"net45"
]
}
},
"scripts": {

2
samples/TagHelperSample.Web/Startup.cs
View File

@ -2,6 +2,7 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
using System.IO;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.DependencyInjection;
@ -37,6 +38,7 @@ namespace TagHelperSample.Web
public static void Main(string[] args)
{
var host = new WebHostBuilder()
.UseContentRoot(Directory.GetCurrentDirectory())
.UseDefaultHostingConfiguration(args)
.UseIISIntegration()
.UseKestrel()

8
samples/TagHelperSample.Web/project.json
View File

@ -13,6 +13,14 @@
"Microsoft.AspNetCore.StaticFiles": "1.0.0-*",
"Microsoft.Extensions.Logging.Console": "1.0.0-*"
},
"tools": {
"dotnet-razor-tooling": {
"version": "1.0.0-*",
"imports": [
"net45"
]
}
},
"frameworks": {
"net451": { },
"netcoreapp1.0": {

2
samples/UrlHelperSample.Web/Startup.cs
View File

@ -1,6 +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.
using System.IO;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Mvc.Routing;
@ -38,6 +39,7 @@ namespace UrlHelperSample.Web
public static void Main(string[] args)
{
var host = new WebHostBuilder()
.UseContentRoot(Directory.GetCurrentDirectory())
.UseDefaultHostingConfiguration(args)
.UseStartup<Startup>()
.UseKestrel()

2
samples/UrlHelperSample.Web/project.json
View File

@ -10,7 +10,7 @@
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*"
},
"frameworks": {
"net451": {},
"net451": { },
"netcoreapp1.0": {
"imports": [
"dnxcore50",

2
test/Microsoft.AspNetCore.Mvc.FunctionalTests/project.json
View File

@ -70,7 +70,7 @@
"portable-net451+win8"
]
},
"net451": {}
"net451": { }
},
"exclude": [
"wwwroot",

2
test/WebSites/ApiExplorerWebSite/Startup.cs
View File

@ -1,6 +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.
using System.IO;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Mvc.Formatters;
@ -45,6 +46,7 @@ namespace ApiExplorerWebSite
public static void Main(string[] args)
{
var host = new WebHostBuilder()
.UseContentRoot(Directory.GetCurrentDirectory())
.UseDefaultHostingConfiguration(args)
.UseKestrel()
.UseIISIntegration()

2
test/WebSites/ApiExplorerWebSite/project.json
View File

@ -13,7 +13,7 @@
"Microsoft.AspNetCore.StaticFiles": "1.0.0-*"
},
"frameworks": {
"net451": {},
"net451": { },
"netcoreapp1.0": {
"imports": [
"dnxcore50",

2
test/WebSites/ApplicationModelWebSite/Startup.cs
View File

@ -1,6 +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.
using System.IO;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.DependencyInjection;
@ -35,6 +36,7 @@ namespace ApplicationModelWebSite
public static void Main(string[] args)
{
var host = new WebHostBuilder()
.UseContentRoot(Directory.GetCurrentDirectory())
.UseDefaultHostingConfiguration(args)
.UseStartup<Startup>()
.UseKestrel()

2
test/WebSites/ApplicationModelWebSite/project.json
View File

@ -12,7 +12,7 @@
"Microsoft.AspNetCore.StaticFiles": "1.0.0-*"
},
"frameworks": {
"net451": {},
"net451": { },
"netcoreapp1.0": {
"imports": [
"dnxcore50",

2
test/WebSites/BasicWebSite/Startup.cs
View File

@ -1,6 +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.
using System.IO;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Http;
@ -56,6 +57,7 @@ namespace BasicWebSite
public static void Main(string[] args)
{
var host = new WebHostBuilder()
.UseContentRoot(Directory.GetCurrentDirectory())
.UseDefaultHostingConfiguration(args)
.UseStartup<Startup>()
.UseKestrel()

9
test/WebSites/BasicWebSite/project.json
View File

@ -14,7 +14,7 @@
"Microsoft.AspNetCore.StaticFiles": "1.0.0-*"
},
"frameworks": {
"net451": {},
"net451": { },
"netcoreapp1.0": {
"imports": [
"dnxcore50",
@ -29,6 +29,7 @@
}
},
"content": [
"Areas/Area1/Views",
"Views",
"web.config"
],
@ -36,6 +37,12 @@
"Microsoft.AspNetCore.Server.IISIntegration.Tools": {
"version": "1.0.0-*",
"imports": "portable-net45+wp80+win8+wpa81+dnxcore50"
},
"dotnet-razor-tooling": {
"version": "1.0.0-*",
"imports": [
"net45"
]
}
},
"scripts": {

4
test/WebSites/ControllersFromServicesClassLibrary/project.json
View File

@ -3,13 +3,13 @@
"Microsoft.AspNetCore.Mvc": "1.0.0-*"
},
"frameworks": {
"net451": {},
"net451": { },
"netcoreapp1.0": {
"imports": [
"dnxcore50",
"portable-net451+win8"
],
"dependencies": {}
"dependencies": { }
}
}
}

2
test/WebSites/ControllersFromServicesWebSite/Startup.cs
View File

@ -3,6 +3,7 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Reflection;
using ControllersFromServicesClassLibrary;
@ -62,6 +63,7 @@ namespace ControllersFromServicesWebSite
public static void Main(string[] args)
{
var host = new WebHostBuilder()
.UseContentRoot(Directory.GetCurrentDirectory())
.UseDefaultHostingConfiguration(args)
.UseStartup<Startup>()
.UseKestrel()

8
test/WebSites/ControllersFromServicesWebSite/project.json
View File

@ -13,7 +13,7 @@
"Microsoft.AspNetCore.StaticFiles": "1.0.0-*"
},
"frameworks": {
"net451": {},
"net451": { },
"netcoreapp1.0": {
"imports": [
"dnxcore50",
@ -35,6 +35,12 @@
"Microsoft.AspNetCore.Server.IISIntegration.Tools": {
"version": "1.0.0-*",
"imports": "portable-net45+wp80+win8+wpa81+dnxcore50"
},
"dotnet-razor-tooling": {
"version": "1.0.0-*",
"imports": [
"net45"
]
}
},
"scripts": {

2
test/WebSites/CorsWebSite/Startup.cs
View File

@ -1,6 +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.
using System.IO;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Cors.Infrastructure;
using Microsoft.AspNetCore.Hosting;
@ -81,6 +82,7 @@ namespace CorsWebSite
public static void Main(string[] args)
{
var host = new WebHostBuilder()
.UseContentRoot(Directory.GetCurrentDirectory())
.UseDefaultHostingConfiguration(args)
.UseStartup<Startup>()
.UseKestrel()

8
test/WebSites/CorsWebSite/project.json
View File

@ -3,6 +3,9 @@
"emitEntryPoint": true,
"preserveCompilationContext": true
},
"content": [
"web.config"
],
"dependencies": {
"Microsoft.NETCore.Platforms": "1.0.1-*",
"Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
@ -14,7 +17,7 @@
"Microsoft.AspNetCore.StaticFiles": "1.0.0-*"
},
"frameworks": {
"net451": {},
"net451": { },
"netcoreapp1.0": {
"imports": [
"dnxcore50",
@ -28,9 +31,6 @@
}
}
},
"content": [
"web.config"
],
"tools": {
"Microsoft.AspNetCore.Server.IISIntegration.Tools": {
"version": "1.0.0-*",

2
test/WebSites/ErrorPageMiddlewareWebSite/Startup.cs
View File

@ -1,6 +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.
using System.IO;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.DependencyInjection;
@ -26,6 +27,7 @@ namespace ErrorPageMiddlewareWebSite
public static void Main(string[] args)
{
var host = new WebHostBuilder()
.UseContentRoot(Directory.GetCurrentDirectory())
.UseDefaultHostingConfiguration(args)
.UseStartup<Startup>()
.UseKestrel()

2
test/WebSites/ErrorPageMiddlewareWebSite/project.json
View File

@ -13,7 +13,7 @@
"Microsoft.AspNetCore.StaticFiles": "1.0.0-*"
},
"frameworks": {
"net451": {},
"net451": { },
"netcoreapp1.0": {
"imports": [
"dnxcore50",

2
test/WebSites/FilesWebSite/Startup.cs
View File

@ -1,6 +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.
using System.IO;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.DependencyInjection;
@ -28,6 +29,7 @@ namespace FilesWebSite
public static void Main(string[] args)
{
var host = new WebHostBuilder()
.UseContentRoot(Directory.GetCurrentDirectory())
.UseDefaultHostingConfiguration(args)
.UseStartup<Startup>()
.UseKestrel()

2
test/WebSites/FilesWebSite/project.json
View File

@ -14,7 +14,7 @@
"Microsoft.Extensions.FileProviders.Embedded": "1.0.0-*"
},
"frameworks": {
"net451": {},
"net451": { },
"netcoreapp1.0": {
"imports": [
"dnxcore50",

2
test/WebSites/FiltersWebSite/Startup.cs
View File

@ -1,6 +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.
using System.IO;
using System.Security.Claims;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Builder;
@ -69,6 +70,7 @@ namespace FiltersWebSite
public static void Main(string[] args)
{
var host = new WebHostBuilder()
.UseContentRoot(Directory.GetCurrentDirectory())
.UseDefaultHostingConfiguration(args)
.UseStartup<Startup>()
.UseKestrel()

2
test/WebSites/FiltersWebSite/project.json
View File

@ -14,7 +14,7 @@
"Microsoft.AspNetCore.StaticFiles": "1.0.0-*"
},
"frameworks": {
"net451": {},
"net451": { },
"netcoreapp1.0": {
"imports": [
"dnxcore50",

2
test/WebSites/FormatterWebSite/Startup.cs
View File

@ -1,6 +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.
using System.IO;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
@ -37,6 +38,7 @@ namespace FormatterWebSite
public static void Main(string[] args)
{
var host = new WebHostBuilder()
.UseContentRoot(Directory.GetCurrentDirectory())
.UseDefaultHostingConfiguration(args)
.UseStartup<Startup>()
.UseKestrel()

2
test/WebSites/FormatterWebSite/project.json
View File

@ -13,7 +13,7 @@
"Microsoft.AspNetCore.StaticFiles": "1.0.0-*"
},
"frameworks": {
"net451": {},
"net451": { },
"netcoreapp1.0": {
"imports": [
"dnxcore50",

2
test/WebSites/HtmlGenerationWebSite/Startup.cs
View File

@ -1,6 +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.
using System.IO;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Mvc.TagHelpers;
@ -45,6 +46,7 @@ namespace HtmlGenerationWebSite
public static void Main(string[] args)
{
var host = new WebHostBuilder()
.UseContentRoot(Directory.GetCurrentDirectory())
.UseDefaultHostingConfiguration(args)
.UseStartup<Startup>()
.UseKestrel()

6
test/WebSites/HtmlGenerationWebSite/project.json
View File

@ -34,6 +34,12 @@
"Microsoft.AspNetCore.Server.IISIntegration.Tools": {
"version": "1.0.0-*",
"imports": "portable-net45+wp80+win8+wpa81+dnxcore50"
},
"dotnet-razor-tooling": {
"version": "1.0.0-*",
"imports": [
"net45"
]
}
},
"scripts": {

1
test/WebSites/RazorPageExecutionInstrumentationWebSite/Startup.cs
View File

@ -47,6 +47,7 @@ namespace RazorPageExecutionInstrumentationWebSite
public static void Main(string[] args)
{
var host = new WebHostBuilder()
.UseContentRoot(Directory.GetCurrentDirectory())
.UseDefaultHostingConfiguration(args)
.UseStartup<Startup>()
.UseKestrel()

2
test/WebSites/RazorPageExecutionInstrumentationWebSite/project.json
View File

@ -13,7 +13,7 @@
"Microsoft.Extensions.DiagnosticAdapter": "1.0.0-*"
},
"frameworks": {
"net451": {},
"net451": { },
"netcoreapp1.0": {
"imports": [
"dnxcore50",

2
test/WebSites/RazorWebSite/Startup.cs
View File

@ -3,6 +3,7 @@
using System.Collections.Generic;
using System.Globalization;
using System.IO;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Localization;
@ -64,6 +65,7 @@ namespace RazorWebSite
public static void Main(string[] args)
{
var host = new WebHostBuilder()
.UseContentRoot(Directory.GetCurrentDirectory())
.UseDefaultHostingConfiguration(args)
.UseStartup<Startup>()
.UseKestrel()

9
test/WebSites/RazorWebSite/project.json
View File

@ -3,6 +3,11 @@
"emitEntryPoint": true,
"preserveCompilationContext": true
},
"content": [
"Views",
"Shared-Views",
"web.config"
],
"dependencies": {
"Microsoft.NETCore.Platforms": "1.0.1-*",
"Microsoft.AspNetCore.Localization": "1.0.0-*",
@ -39,10 +44,6 @@
}
}
},
"content": [
"Views",
"web.config"
],
"tools": {
"Microsoft.AspNetCore.Server.IISIntegration.Tools": {
"version": "1.0.0-*",

2
test/WebSites/RoutingWebSite/Startup.cs
View File

@ -1,6 +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.
using System.IO;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Mvc.Infrastructure;
@ -44,6 +45,7 @@ namespace RoutingWebSite
public static void Main(string[] args)
{
var host = new WebHostBuilder()
.UseContentRoot(Directory.GetCurrentDirectory())
.UseDefaultHostingConfiguration(args)
.UseStartup<Startup>()
.UseKestrel()

2
test/WebSites/RoutingWebSite/project.json
View File

@ -12,7 +12,7 @@
"Microsoft.AspNetCore.StaticFiles": "1.0.0-*"
},
"frameworks": {
"net451": {},
"net451": { },
"netcoreapp1.0": {
"imports": [
"dnxcore50",

2
test/WebSites/SimpleWebSite/Startup.cs
View File

@ -1,6 +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.
using System.IO;
using System.Text.Encodings.Web;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
@ -32,6 +33,7 @@ namespace SimpleWebSite
public static void Main(string[] args)
{
var host = new WebHostBuilder()
.UseContentRoot(Directory.GetCurrentDirectory())
.UseDefaultHostingConfiguration(args)
.UseStartup<Startup>()
.UseKestrel()

2
test/WebSites/SimpleWebSite/project.json
View File

@ -10,7 +10,7 @@
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*"
},
"frameworks": {
"net451": {},
"net451": { },
"netcoreapp1.0": {
"imports": [
"dnxcore50",

2
test/WebSites/TagHelpersWebSite/Startup.cs
View File

@ -1,6 +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.
using System.IO;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.DependencyInjection;
@ -25,6 +26,7 @@ namespace TagHelpersWebSite
public static void Main(string[] args)
{
var host = new WebHostBuilder()
.UseContentRoot(Directory.GetCurrentDirectory())
.UseDefaultHostingConfiguration(args)
.UseStartup<Startup>()
.UseKestrel()

6
test/WebSites/TagHelpersWebSite/project.json
View File

@ -36,6 +36,12 @@
"Microsoft.AspNetCore.Server.IISIntegration.Tools": {
"version": "1.0.0-*",
"imports": "portable-net45+wp80+win8+wpa81+dnxcore50"
},
"dotnet-razor-tooling": {
"version": "1.0.0-*",
"imports": [
"net45"
]
}
},
"scripts": {

2
test/WebSites/VersioningWebSite/Startup.cs
View File

@ -1,6 +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.
using System.IO;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Mvc.Infrastructure;
@ -29,6 +30,7 @@ namespace VersioningWebSite
public static void Main(string[] args)
{
var host = new WebHostBuilder()
.UseContentRoot(Directory.GetCurrentDirectory())
.UseDefaultHostingConfiguration(args)
.UseStartup<Startup>()
.UseKestrel()

2
test/WebSites/VersioningWebSite/project.json
View File

@ -12,7 +12,7 @@
"Microsoft.AspNetCore.StaticFiles": "1.0.0-*"
},
"frameworks": {
"net451": {},
"net451": { },
"netcoreapp1.0": {
"imports": [
"dnxcore50",

2
test/WebSites/WebApiCompatShimWebSite/Startup.cs
View File

@ -1,6 +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.
using System.IO;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.DependencyInjection;
@ -36,6 +37,7 @@ namespace WebApiCompatShimWebSite
public static void Main(string[] args)
{
var host = new WebHostBuilder()
.UseContentRoot(Directory.GetCurrentDirectory())
.UseDefaultHostingConfiguration(args)
.UseStartup<Startup>()
.UseKestrel()

2
test/WebSites/WebApiCompatShimWebSite/project.json
View File

@ -13,7 +13,7 @@
"Microsoft.AspNetCore.StaticFiles": "1.0.0-*"
},
"frameworks": {
"net451": {},
"net451": { },
"netcoreapp1.0": {
"imports": [
"dnxcore50",

2
test/WebSites/XmlFormattersWebSite/Startup.cs
View File

@ -1,6 +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.
using System.IO;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Mvc;
@ -80,6 +81,7 @@ namespace XmlFormattersWebSite
public static void Main(string[] args)
{
var host = new WebHostBuilder()
.UseContentRoot(Directory.GetCurrentDirectory())
.UseDefaultHostingConfiguration(args)
.UseStartup<Startup>()
.UseKestrel()

2
test/WebSites/XmlFormattersWebSite/project.json
View File

@ -13,7 +13,7 @@
"Microsoft.AspNetCore.StaticFiles": "1.0.0-*"
},
"frameworks": {
"net451": {},
"net451": { },
"netcoreapp1.0": {
"imports": [
"dnxcore50",