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

Merge branch 'release/2.1' into dev

This commit is contained in:
Nate McMaster 2018-03-23 09:24:25 -07:00
parent d91857e33d 3486906b2e
commit c9526b21a0
No known key found for this signature in database
GPG Key ID: A778D9601BD78810
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/artifacts.props
View File

@ -125,7 +125,7 @@
<PackageArtifact Include="Microsoft.AspNetCore.NodeServices" Category="ship" AppMetapackage="true" AllMetapackage="true"/>
<PackageArtifact Include="Microsoft.AspNetCore.NodeServices.Sockets" Category="noship" />
<PackageArtifact Include="Microsoft.AspNetCore.Owin" Category="ship" AppMetapackage="true" AllMetapackage="true"/>
<PackageArtifact Include="Microsoft.AspNetCore.Protocols.Abstractions" Category="ship" AppMetapackage="true" AllMetapackage="true" />
<PackageArtifact Include="Microsoft.AspNetCore.Connections.Abstractions" Category="ship" AppMetapackage="true" AllMetapackage="true" />
<PackageArtifact Include="Microsoft.AspNetCore.Proxy" Category="noship" />
<PackageArtifact Include="Microsoft.AspNetCore.RangeHelper.Sources" Category="noship" />
<PackageArtifact Include="Microsoft.AspNetCore.Razor" Category="ship" AppMetapackage="true" AllMetapackage="true"/>

2
modules/KestrelHttpServer

@ -1 +1 @@
Subproject commit 12abcd2f68fe99a0e24b16540b955db2d91f3d78
Subproject commit 967b0dd0a4fa16a6a2ed1002914fe5a7b00e5883

2
modules/SignalR

@ -1 +1 @@
Subproject commit 7479f92303ae5c5348801c675d9be83b6f37ebc0
Subproject commit 290f18ac760af99e9402f21568f0d06261f8e69b