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

Fixup references and the sample

This commit is contained in:
David Fowler 2014-10-05 11:26:15 -07:00
parent b5df3eb1d5
commit 72c32367a4
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
KestrelHttpServer.sln
View File

@ -1,7 +1,7 @@
 
Microsoft Visual Studio Solution File, Format Version 12.00 Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14 # Visual Studio 14
VisualStudioVersion = 14.0.22013.1 VisualStudioVersion = 14.0.22111.0
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Server.Kestrel", "src\Microsoft.AspNet.Server.Kestrel\Microsoft.AspNet.Server.Kestrel.kproj", "{F510611A-3BEE-4B88-A613-5F4A74ED82A1}" Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Server.Kestrel", "src\Microsoft.AspNet.Server.Kestrel\Microsoft.AspNet.Server.Kestrel.kproj", "{F510611A-3BEE-4B88-A613-5F4A74ED82A1}"
EndProject EndProject
@ -19,6 +19,12 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "SampleApp", "samples\Sample
EndProject EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Kestrel", "src\Kestrel\Kestrel.kproj", "{30B7617E-58EF-4382-B3EA-5B2E718CF1A6}" Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Kestrel", "src\Kestrel\Kestrel.kproj", "{30B7617E-58EF-4382-B3EA-5B2E718CF1A6}"
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2D5D5227-4DBD-499A-96B1-76A36B03B750}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{D3273454-EA07-41D2-BF0B-FCC3675C2483}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{8A3D00B8-1CCF-4BE6-A060-11104CE2D9CE}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
@ -45,4 +51,10 @@ Global
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
EndGlobalSection EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{F510611A-3BEE-4B88-A613-5F4A74ED82A1} = {2D5D5227-4DBD-499A-96B1-76A36B03B750}
{37F3BFB2-6454-49E5-9D7F-581BF755CCFE} = {D3273454-EA07-41D2-BF0B-FCC3675C2483}
{2C3CB3DC-EEBF-4F52-9E1C-4F2F972E76C3} = {8A3D00B8-1CCF-4BE6-A060-11104CE2D9CE}
{30B7617E-58EF-4382-B3EA-5B2E718CF1A6} = {2D5D5227-4DBD-499A-96B1-76A36B03B750}
EndGlobalSection
EndGlobal EndGlobal

2
samples/SampleApp/Startup.cs
View File

@ -9,7 +9,7 @@ namespace SampleApp
{ {
public class Startup public class Startup
{ {
public void Configure(IBuilder app) public void Configure(IApplicationBuilder app)
{ {
app.UseWebSockets(); app.UseWebSockets();

13
src/Microsoft.AspNet.Server.Kestrel/project.json
View File

@ -1,20 +1,11 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"dependencies": { "dependencies": {
"Microsoft.Framework.Runtime.Interfaces": "1.0.0-*" "Microsoft.Framework.Runtime.Interfaces": { "version": "1.0.0-*","type": "build" }
}, },
"frameworks": { "frameworks": {
"aspnet50": { "aspnet50": { },
"compilationOptions": {
"define": [ "TRACE", "NET45" ],
"allowUnsafe": true
}
},
"aspnetcore50": { "aspnetcore50": {
"compilationOptions": {
"define": [ "TRACE", "K10" ],
"allowUnsafe": true
},
"dependencies": { "dependencies": {
"System.Threading.ThreadPool": "4.0.10.0", "System.Threading.ThreadPool": "4.0.10.0",
"System.Diagnostics.Debug": "4.0.10.0", "System.Diagnostics.Debug": "4.0.10.0",

5
test/Microsoft.AspNet.Server.KestrelTests/project.json
View File

@ -5,11 +5,8 @@
"Microsoft.AspNet.Server.Kestrel": "1.0.0-*" "Microsoft.AspNet.Server.Kestrel": "1.0.0-*"
}, },
"frameworks": { "frameworks": {
"aspnet50": { "aspnet50": { },
"compilationOptions": { "define": [ "TRACE" ] }
},
"aspnetcore50": { "aspnetcore50": {
"compilationOptions": { "define": [ "TRACE" ] },
"dependencies": { "dependencies": {
"System.Net.Sockets": "4.0.0.0", "System.Net.Sockets": "4.0.0.0",
"System.Runtime.Handles": "4.0.0.0", "System.Runtime.Handles": "4.0.0.0",