Skip to content
This repository was archived by the owner on Nov 21, 2018. It is now read-only.

Commit d9661ed

Browse files
JunTaoLuoJunTaoLuo
committed
Un-revert changes for static WebHost API
Keeping the same netstandard1.3 TFM so as to not break apps targeting net46.
1 parent 10775ad commit d9661ed

File tree

13 files changed

+372
-8
lines changed

13 files changed

+372
-8
lines changed

‎MetaPackages.sln

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{F92CB7A1
2020
build\repo.targets = build\repo.targets
2121
EndProjectSection
2222
EndProject
23+
2324
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.RuntimeStore", "src\Microsoft.AspNetCore.RuntimeStore\Microsoft.AspNetCore.RuntimeStore.csproj", "{A4585E19-FC49-43B4-9416-0BD3120EAD32}"
2425
EndProject
26+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{192F583C-C4CA-43E5-B31C-D21B7806E274}"
27+
EndProject
28+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleApp", "samples\SampleApp\SampleApp.csproj", "{AF5BB04E-92F7-4737-8B98-F86F6244FAB2}"
29+
EndProject
2530
Global
2631
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2732
Debug|Any CPU = Debug|Any CPU
@@ -36,6 +41,10 @@ Global
3641
{CC8F551E-213A-45E8-AECA-507C4DB4F164}.Debug|Any CPU.Build.0 = Debug|Any CPU
3742
{CC8F551E-213A-45E8-AECA-507C4DB4F164}.Release|Any CPU.ActiveCfg = Release|Any CPU
3843
{CC8F551E-213A-45E8-AECA-507C4DB4F164}.Release|Any CPU.Build.0 = Release|Any CPU
44+
{AF5BB04E-92F7-4737-8B98-F86F6244FAB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
45+
{AF5BB04E-92F7-4737-8B98-F86F6244FAB2}.Debug|Any CPU.Build.0 = Debug|Any CPU
46+
{AF5BB04E-92F7-4737-8B98-F86F6244FAB2}.Release|Any CPU.ActiveCfg = Release|Any CPU
47+
{AF5BB04E-92F7-4737-8B98-F86F6244FAB2}.Release|Any CPU.Build.0 = Release|Any CPU
3948
{A4585E19-FC49-43B4-9416-0BD3120EAD32}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4049
{A4585E19-FC49-43B4-9416-0BD3120EAD32}.Debug|Any CPU.Build.0 = Debug|Any CPU
4150
{A4585E19-FC49-43B4-9416-0BD3120EAD32}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -48,6 +57,7 @@ Global
4857
{6F3D43F7-9546-4B41-AF04-CF4708B62051} = {ED834E68-51C3-4ADE-ACC8-6BA6D4207C09}
4958
{CC8F551E-213A-45E8-AECA-507C4DB4F164} = {ED834E68-51C3-4ADE-ACC8-6BA6D4207C09}
5059
{F92CB7A1-C38E-408C-A7EC-A5C040D041E1} = {97D53BEB-A511-4FBE-B784-AB407D9A219F}
60+
{AF5BB04E-92F7-4737-8B98-F86F6244FAB2} = {192F583C-C4CA-43E5-B31C-D21B7806E274}
5161
{A4585E19-FC49-43B4-9416-0BD3120EAD32} = {ED834E68-51C3-4ADE-ACC8-6BA6D4207C09}
5262
EndGlobalSection
5363
EndGlobal

‎build/Key.snk

596 Bytes
Binary file not shown.

‎build/common.props

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66
<Product>Microsoft ASP.NET Core</Product>
77
<RepositoryUrl>https://github.com/aspnet/MetaPackages</RepositoryUrl>
88
<RepositoryType>git</RepositoryType>
9+
<GenerateUserSecretsAttribute>false</GenerateUserSecretsAttribute>
10+
<AssemblyOriginatorKeyFile>..\..\build\Key.snk</AssemblyOriginatorKeyFile>
11+
<SignAssembly>true</SignAssembly>
12+
<PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
913
<VersionSuffix Condition="'$(VersionSuffix)'!='' AND '$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
1014

1115
<!-- Pin versions to work around CLI bug -->
@@ -20,17 +24,20 @@
2024
<ItemGroup Condition="'$(TargetFrameworkIdentifier)'=='.NETFramework' AND '$(OutputType)'=='library'">
2125
<PackageReference Include="NETStandard.Library" Version="$(NetStandardImplicitPackageVersion)" />
2226
</ItemGroup>
23-
27+
2428
<ItemGroup>
2529
<!-- set PrivateAssets=None to ensure that all assets, including Build and Analyzer, are included in the nuspec -->
2630
<MetaPackagePackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="$(AspNetCoreVersion)" PrivateAssets="None" />
2731
<MetaPackagePackageReference Include="Microsoft.AspNetCore.Hosting" Version="$(AspNetCoreVersion)" PrivateAssets="None" />
2832
<MetaPackagePackageReference Include="Microsoft.AspNetCore.Routing" Version="$(AspNetCoreVersion)" PrivateAssets="None" />
2933
<MetaPackagePackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="$(AspNetCoreVersion)" PrivateAssets="None" />
3034
<MetaPackagePackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(AspNetCoreVersion)" PrivateAssets="None" />
35+
<MetaPackagePackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Https" Version="$(AspNetCoreVersion)" PrivateAssets="None" />
3136
<MetaPackagePackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(AspNetCoreVersion)" PrivateAssets="None" />
3237
<MetaPackagePackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="$(AspNetCoreVersion)" PrivateAssets="None" />
3338
<MetaPackagePackageReference Include="Microsoft.Extensions.Configuration.Json" Version="$(AspNetCoreVersion)" PrivateAssets="None" />
39+
<MetaPackagePackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="$(AspNetCoreVersion)" PrivateAssets="None" />
40+
<MetaPackagePackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="$(AspNetCoreVersion)" PrivateAssets="None" />
3441
<MetaPackagePackageReference Include="Microsoft.Extensions.Logging" Version="$(AspNetCoreVersion)" PrivateAssets="None" />
3542
<MetaPackagePackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(AspNetCoreVersion)" PrivateAssets="None" />
3643
<MetaPackagePackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="$(AspNetCoreVersion)" PrivateAssets="None" />
@@ -100,7 +107,6 @@
100107
<FullMetaPackagePackageReference Include="Microsoft.AspNetCore.Routing.Abstractions" Version="$(AspNetCoreVersion)" PrivateAssets="None" />
101108
<FullMetaPackagePackageReference Include="Microsoft.AspNetCore.Server.HttpSys" Version="$(AspNetCoreVersion)" PrivateAssets="None" />
102109
<FullMetaPackagePackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Core" Version="$(AspNetCoreVersion)" PrivateAssets="None" />
103-
<FullMetaPackagePackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Https" Version="$(AspNetCoreVersion)" PrivateAssets="None" />
104110
<FullMetaPackagePackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions" Version="$(AspNetCoreVersion)" PrivateAssets="None" />
105111
<FullMetaPackagePackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" Version="$(AspNetCoreVersion)" PrivateAssets="None" />
106112
<FullMetaPackagePackageReference Include="Microsoft.AspNetCore.Session" Version="$(AspNetCoreVersion)" PrivateAssets="None" />
@@ -129,10 +135,8 @@
129135
<FullMetaPackagePackageReference Include="Microsoft.Extensions.Configuration" Version="$(AspNetCoreVersion)" PrivateAssets="None" />
130136
<FullMetaPackagePackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="$(AspNetCoreVersion)" PrivateAssets="None" />
131137
<FullMetaPackagePackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="$(AspNetCoreVersion)" PrivateAssets="None" />
132-
<FullMetaPackagePackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="$(AspNetCoreVersion)" PrivateAssets="None" />
133138
<FullMetaPackagePackageReference Include="Microsoft.Extensions.Configuration.DockerSecrets" Version="$(AspNetCoreVersion)" PrivateAssets="None" />
134139
<FullMetaPackagePackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="$(AspNetCoreVersion)" PrivateAssets="None" />
135-
<FullMetaPackagePackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="$(AspNetCoreVersion)" PrivateAssets="None" />
136140
<FullMetaPackagePackageReference Include="Microsoft.Extensions.Configuration.Xml" Version="$(AspNetCoreVersion)" PrivateAssets="None" />
137141
<FullMetaPackagePackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(AspNetCoreVersion)" PrivateAssets="None" />
138142
<FullMetaPackagePackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(AspNetCoreVersion)" PrivateAssets="None" />

‎build/dependencies.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@
55
<CoreFxVersion>4.3.0</CoreFxVersion>
66
<InternalAspNetCoreSdkVersion>2.0.0-*</InternalAspNetCoreSdkVersion>
77
<NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion>
8+
<RuntimeFrameworkVersion>2.0.0-*</RuntimeFrameworkVersion>
89
</PropertyGroup>
910
</Project>

‎samples/SampleApp/Program.cs

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
// Copyright (c) .NET Foundation. All rights reserved.
2+
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
3+
4+
using System;
5+
using Microsoft.AspNetCore;
6+
using Microsoft.AspNetCore.Hosting;
7+
using Microsoft.AspNetCore.Http;
8+
using Microsoft.AspNetCore.Routing;
9+
10+
namespace SampleApp
11+
{
12+
public class Program
13+
{
14+
public static void Main(string[] args)
15+
{
16+
HelloWorld();
17+
18+
CustomUrl();
19+
20+
CustomRouter();
21+
22+
StartupClass(args);
23+
}
24+
25+
private static void HelloWorld()
26+
{
27+
using (WebHost.Start(context => context.Response.WriteAsync("Hello, World!")))
28+
{
29+
//host.WaitForShutdown(); // TODO: https://github.com/aspnet/Hosting/issues/1022
30+
Console.WriteLine("Running HelloWorld: Press any key to shutdown and start the next sample...");
31+
Console.ReadKey();
32+
}
33+
}
34+
35+
private static void CustomUrl()
36+
{
37+
// Changing the listening URL
38+
using (WebHost.Start("http://localhost:8080", context => context.Response.WriteAsync("Hello, World!")))
39+
{
40+
//host.WaitForShutdown(); // TODO: https://github.com/aspnet/Hosting/issues/1022
41+
Console.WriteLine("Running CustomUrl: Press any key to shutdown and start the next sample...");
42+
Console.ReadKey();
43+
}
44+
}
45+
46+
private static void CustomRouter()
47+
{
48+
// Using a router
49+
using (WebHost.Start(router => router
50+
.MapGet("hello/{name}", (req, res, data) => res.WriteAsync($"Hello, {data.Values["name"]}"))
51+
.MapGet("goodbye/{name}", (req, res, data) => res.WriteAsync($"Goodbye, {data.Values["name"]}"))
52+
.MapGet("throw/{message?}", (req, res, data) => throw new Exception((string)data.Values["message"] ?? "Uh oh!"))
53+
.MapGet("{greeting}/{name}", (req, res, data) => res.WriteAsync($"{data.Values["greeting"]}, {data.Values["name"]}"))
54+
.MapGet("", (req, res, data) => res.WriteAsync($"Hello, World!"))))
55+
{
56+
//host.WaitForShutdown(); // TODO: https://github.com/aspnet/Hosting/issues/1022
57+
Console.WriteLine("Running CustomRouter: Press any key to shutdown and start the next sample...");
58+
Console.ReadKey();
59+
}
60+
}
61+
62+
private static void StartupClass(string[] args)
63+
{
64+
// Using defaults with a Startup class
65+
using (var host = WebHost.CreateDefaultBuilder(args)
66+
.UseStartup<Startup>()
67+
.Build())
68+
{
69+
host.Run();
70+
}
71+
}
72+
}
73+
}

‎samples/SampleApp/Properties/launchSettings.json

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{
2+
"iisSettings": {
3+
"windowsAuthentication": false,
4+
"anonymousAuthentication": true,
5+
"iisExpress": {
6+
"applicationUrl": "http://localhost:53432/",
7+
"sslPort": 0
8+
}
9+
},
10+
"profiles": {
11+
"IIS Express": {
12+
"commandName": "IISExpress",
13+
"launchBrowser": true,
14+
"environmentVariables": {
15+
"ASPNETCORE_ENVIRONMENT": "Development"
16+
}
17+
},
18+
"SampleApp": {
19+
"commandName": "Project",
20+
"launchBrowser": true,
21+
"environmentVariables": {
22+
"ASPNETCORE_ENVIRONMENT": "Development"
23+
},
24+
"applicationUrl": "http://localhost:53433"
25+
}
26+
}
27+
}

‎samples/SampleApp/SampleApp.csproj

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<Project Sdk="Microsoft.NET.Sdk.Web">
2+
3+
<Import Project="..\..\build\common.props" />
4+
5+
<PropertyGroup>
6+
<TargetFramework>netcoreapp2.0</TargetFramework>
7+
<UserSecretsId>aspnetcore-MetaPackagesSampleApp-20170406180413</UserSecretsId>
8+
</PropertyGroup>
9+
10+
<ItemGroup>
11+
<Folder Include="wwwroot\" />
12+
</ItemGroup>
13+
14+
<ItemGroup>
15+
<ProjectReference Include="..\..\src\Microsoft.AspNetCore\Microsoft.AspNetCore.csproj" />
16+
</ItemGroup>
17+
18+
</Project>

‎samples/SampleApp/Startup.cs

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
// Copyright (c) .NET Foundation. All rights reserved.
2+
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
3+
4+
using Microsoft.AspNetCore.Builder;
5+
using Microsoft.AspNetCore.Hosting;
6+
using Microsoft.AspNetCore.Http;
7+
using Microsoft.Extensions.DependencyInjection;
8+
9+
namespace SampleApp
10+
{
11+
public class Startup
12+
{
13+
public void ConfigureServices(IServiceCollection services)
14+
{
15+
16+
}
17+
18+
public void Configure(IApplicationBuilder app, IHostingEnvironment env)
19+
{
20+
app.Run(async (context) =>
21+
{
22+
await context.Response.WriteAsync($"Hello from {nameof(Startup)}!");
23+
});
24+
}
25+
}
26+
}

‎src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<TargetFramework>netstandard1.6</TargetFramework>
88
<PackageTags>aspnetcore</PackageTags>
99
<Description>Microsoft.AspNetCore.All</Description>
10-
<GenerateUserSecretsAttribute>false</GenerateUserSecretsAttribute>
10+
<EnableApiCheck>false</EnableApiCheck>
1111
</PropertyGroup>
1212

1313
<ItemGroup>

‎src/Microsoft.AspNetCore.RuntimeStore/Microsoft.AspNetCore.RuntimeStore.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212

1313
<Target Name="CollectDeps" DependsOnTargets="Restore;RunResolvePackageDependencies">
1414
<ItemGroup>
15-
<DepsFiles Include="%(FileDefinitions.ResolvedPath)" Condition="$([System.Text.RegularExpressions.Regex]::IsMatch('%(Identity)', '.*?\.HostingStartup\.deps\.json')) "/>
15+
<DepsFiles Include="%(FileDefinitions.ResolvedPath)" Condition="$([System.Text.RegularExpressions.Regex]::IsMatch('%(Identity)', '.*?\.HostingStartup\.deps\.json')) " />
1616
</ItemGroup>
17-
17+
1818
<Copy SourceFiles="@(DepsFiles)" DestinationFolder="$(DepsOutputPath)\Microsoft.NETCore.App\2.0.0\" />
1919
</Target>
2020
</Project>

‎src/Microsoft.AspNetCore/Microsoft.AspNetCore.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@
33
<Import Project="..\..\build\common.props" />
44

55
<PropertyGroup>
6-
<IncludeBuildOutput>false</IncludeBuildOutput>
76
<TargetFramework>netstandard1.3</TargetFramework>
87
<PackageTags>aspnetcore</PackageTags>
98
<Description>Microsoft.AspNetCore</Description>
9+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
10+
<EnableApiCheck>false</EnableApiCheck>
1011
</PropertyGroup>
1112

1213
<ItemGroup>

0 commit comments

Comments
 (0)