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

Merge remote-tracking branch 'origin/release/2.1' into rybrande/DevMerge

This commit is contained in:
Ryan Brandenburg 2018-03-23 10:46:23 -07:00
parent bb89551d0d 1bac12716d
commit d63e43fd20
7 changed files with 7 additions and 1462 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Microsoft.AspNetCore.Hosting.Abstractions/baseline.netcore.json
View File

@ -1,5 +1,5 @@
{ {
"AssemblyIdentity": "Microsoft.AspNetCore.Hosting.Abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60", "AssemblyIdentity": "Microsoft.AspNetCore.Hosting.Abstractions, Version=2.0.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
"Types": [ "Types": [
{ {
"Name": "Microsoft.AspNetCore.Hosting.EnvironmentName", "Name": "Microsoft.AspNetCore.Hosting.EnvironmentName",

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

@ -1,5 +1,5 @@
{ {
"AssemblyIdentity": "Microsoft.AspNetCore.Hosting.Server.Abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60", "AssemblyIdentity": "Microsoft.AspNetCore.Hosting.Server.Abstractions, Version=2.0.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
"Types": [ "Types": [
{ {
"Name": "Microsoft.AspNetCore.Hosting.Server.IHttpApplication<T0>", "Name": "Microsoft.AspNetCore.Hosting.Server.IHttpApplication<T0>",

2
src/Microsoft.AspNetCore.Hosting.WindowsServices/baseline.netframework.json
View File

@ -1,5 +1,5 @@
{ {
"AssemblyIdentity": "Microsoft.AspNetCore.Hosting.WindowsServices, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60", "AssemblyIdentity": "Microsoft.AspNetCore.Hosting.WindowsServices, Version=2.0.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
"Types": [ "Types": [
{ {
"Name": "Microsoft.AspNetCore.Hosting.WindowsServices.WebHostService", "Name": "Microsoft.AspNetCore.Hosting.WindowsServices.WebHostService",

2
src/Microsoft.AspNetCore.Hosting/baseline.netcore.json
View File

@ -1,5 +1,5 @@
{ {
"AssemblyIdentity": "Microsoft.AspNetCore.Hosting, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60", "AssemblyIdentity": "Microsoft.AspNetCore.Hosting, Version=2.0.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
"Types": [ "Types": [
{ {
"Name": "Microsoft.AspNetCore.Hosting.ConventionBasedStartup", "Name": "Microsoft.AspNetCore.Hosting.ConventionBasedStartup",

1457
src/Microsoft.AspNetCore.Server.IntegrationTesting/baseline.netcore.json
View File

File diff suppressed because it is too large Load Diff

2
src/Microsoft.AspNetCore.TestHost/baseline.netcore.json
View File

@ -1,5 +1,5 @@
{ {
"AssemblyIdentity": "Microsoft.AspNetCore.TestHost, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60", "AssemblyIdentity": "Microsoft.AspNetCore.TestHost, Version=2.0.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
"Types": [ "Types": [
{ {
"Name": "Microsoft.AspNetCore.TestHost.ClientHandler", "Name": "Microsoft.AspNetCore.TestHost.ClientHandler",

2
src/Microsoft.Extensions.Hosting.Abstractions/baseline.netcore.json
View File

@ -1,5 +1,5 @@
{ {
"AssemblyIdentity": "Microsoft.Extensions.Hosting.Abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60", "AssemblyIdentity": "Microsoft.Extensions.Hosting.Abstractions, Version=2.0.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
"Types": [ "Types": [
{ {
"Name": "Microsoft.Extensions.Hosting.IHostedService", "Name": "Microsoft.Extensions.Hosting.IHostedService",