From 5c5f401841953ea8e43d52fc334751a290cb5905 Mon Sep 17 00:00:00 2001 From: Cesar Blum Silveira Date: Fri, 20 Jan 2017 12:08:23 -0800 Subject: [PATCH] Move Microsoft.AspNetCore.Server.Kestrel.Performance back into test/ and add .notest file for it. --- KestrelHttpServer.sln | 30 +++++++++---------- .../.notest | 0 ...pNetCore.Server.Kestrel.Performance.csproj | 9 ++---- .../Program.cs | 0 .../Readme.md | 0 .../RequestParsing.cs | 0 .../Writing.cs | 0 .../columns/RpsColumn.cs | 0 .../configs/CoreConfig.cs | 0 .../runtimeconfig.template.json | 0 10 files changed, 16 insertions(+), 23 deletions(-) create mode 100644 test/Microsoft.AspNetCore.Server.Kestrel.Performance/.notest rename {benchmark => test}/Microsoft.AspNetCore.Server.Kestrel.Performance/Microsoft.AspNetCore.Server.Kestrel.Performance.csproj (71%) rename {benchmark => test}/Microsoft.AspNetCore.Server.Kestrel.Performance/Program.cs (100%) rename {benchmark => test}/Microsoft.AspNetCore.Server.Kestrel.Performance/Readme.md (100%) rename {benchmark => test}/Microsoft.AspNetCore.Server.Kestrel.Performance/RequestParsing.cs (100%) rename {benchmark => test}/Microsoft.AspNetCore.Server.Kestrel.Performance/Writing.cs (100%) rename {benchmark => test}/Microsoft.AspNetCore.Server.Kestrel.Performance/columns/RpsColumn.cs (100%) rename {benchmark => test}/Microsoft.AspNetCore.Server.Kestrel.Performance/configs/CoreConfig.cs (100%) rename {benchmark => test}/Microsoft.AspNetCore.Server.Kestrel.Performance/runtimeconfig.template.json (100%) diff --git a/KestrelHttpServer.sln b/KestrelHttpServer.sln index 11ae71eab..6eec9ede1 100644 --- a/KestrelHttpServer.sln +++ b/KestrelHttpServer.sln @@ -52,9 +52,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.FunctionalTests", "test\Microsoft.AspNetCore.Server.Kestrel.FunctionalTests\Microsoft.AspNetCore.Server.Kestrel.FunctionalTests.csproj", "{9559A5F1-080C-4909-B6CF-7E4B3DC55748}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "benchmark", "benchmark", "{332A75E4-7AF2-4B15-8F63-CF6266849A78}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Performance", "benchmark\Microsoft.AspNetCore.Server.Kestrel.Performance\Microsoft.AspNetCore.Server.Kestrel.Performance.csproj", "{2BE2A01A-8ABD-4E01-AC92-FB8EC4815DBA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Performance", "test\Microsoft.AspNetCore.Server.Kestrel.Performance\Microsoft.AspNetCore.Server.Kestrel.Performance.csproj", "{EBFE9719-A44B-4978-A71F-D5C254E7F35A}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -150,18 +148,18 @@ Global {9559A5F1-080C-4909-B6CF-7E4B3DC55748}.Release|x64.Build.0 = Release|x64 {9559A5F1-080C-4909-B6CF-7E4B3DC55748}.Release|x86.ActiveCfg = Release|x86 {9559A5F1-080C-4909-B6CF-7E4B3DC55748}.Release|x86.Build.0 = Release|x86 - {2BE2A01A-8ABD-4E01-AC92-FB8EC4815DBA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2BE2A01A-8ABD-4E01-AC92-FB8EC4815DBA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2BE2A01A-8ABD-4E01-AC92-FB8EC4815DBA}.Debug|x64.ActiveCfg = Debug|x64 - {2BE2A01A-8ABD-4E01-AC92-FB8EC4815DBA}.Debug|x64.Build.0 = Debug|x64 - {2BE2A01A-8ABD-4E01-AC92-FB8EC4815DBA}.Debug|x86.ActiveCfg = Debug|x86 - {2BE2A01A-8ABD-4E01-AC92-FB8EC4815DBA}.Debug|x86.Build.0 = Debug|x86 - {2BE2A01A-8ABD-4E01-AC92-FB8EC4815DBA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2BE2A01A-8ABD-4E01-AC92-FB8EC4815DBA}.Release|Any CPU.Build.0 = Release|Any CPU - {2BE2A01A-8ABD-4E01-AC92-FB8EC4815DBA}.Release|x64.ActiveCfg = Release|x64 - {2BE2A01A-8ABD-4E01-AC92-FB8EC4815DBA}.Release|x64.Build.0 = Release|x64 - {2BE2A01A-8ABD-4E01-AC92-FB8EC4815DBA}.Release|x86.ActiveCfg = Release|x86 - {2BE2A01A-8ABD-4E01-AC92-FB8EC4815DBA}.Release|x86.Build.0 = Release|x86 + {EBFE9719-A44B-4978-A71F-D5C254E7F35A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {EBFE9719-A44B-4978-A71F-D5C254E7F35A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {EBFE9719-A44B-4978-A71F-D5C254E7F35A}.Debug|x64.ActiveCfg = Debug|x64 + {EBFE9719-A44B-4978-A71F-D5C254E7F35A}.Debug|x64.Build.0 = Debug|x64 + {EBFE9719-A44B-4978-A71F-D5C254E7F35A}.Debug|x86.ActiveCfg = Debug|x86 + {EBFE9719-A44B-4978-A71F-D5C254E7F35A}.Debug|x86.Build.0 = Debug|x86 + {EBFE9719-A44B-4978-A71F-D5C254E7F35A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {EBFE9719-A44B-4978-A71F-D5C254E7F35A}.Release|Any CPU.Build.0 = Release|Any CPU + {EBFE9719-A44B-4978-A71F-D5C254E7F35A}.Release|x64.ActiveCfg = Release|x64 + {EBFE9719-A44B-4978-A71F-D5C254E7F35A}.Release|x64.Build.0 = Release|x64 + {EBFE9719-A44B-4978-A71F-D5C254E7F35A}.Release|x86.ActiveCfg = Release|x86 + {EBFE9719-A44B-4978-A71F-D5C254E7F35A}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -175,6 +173,6 @@ Global {BD2D4D29-1BD9-40D0-BB31-337D5416B63C} = {327F7880-D9AF-46BD-B45C-3B7E34A01DFD} {5F64B3C3-0C2E-431A-B820-A81BBFC863DA} = {2D5D5227-4DBD-499A-96B1-76A36B03B750} {9559A5F1-080C-4909-B6CF-7E4B3DC55748} = {D3273454-EA07-41D2-BF0B-FCC3675C2483} - {2BE2A01A-8ABD-4E01-AC92-FB8EC4815DBA} = {332A75E4-7AF2-4B15-8F63-CF6266849A78} + {EBFE9719-A44B-4978-A71F-D5C254E7F35A} = {D3273454-EA07-41D2-BF0B-FCC3675C2483} EndGlobalSection EndGlobal diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Performance/.notest b/test/Microsoft.AspNetCore.Server.Kestrel.Performance/.notest new file mode 100644 index 000000000..e69de29bb diff --git a/benchmark/Microsoft.AspNetCore.Server.Kestrel.Performance/Microsoft.AspNetCore.Server.Kestrel.Performance.csproj b/test/Microsoft.AspNetCore.Server.Kestrel.Performance/Microsoft.AspNetCore.Server.Kestrel.Performance.csproj similarity index 71% rename from benchmark/Microsoft.AspNetCore.Server.Kestrel.Performance/Microsoft.AspNetCore.Server.Kestrel.Performance.csproj rename to test/Microsoft.AspNetCore.Server.Kestrel.Performance/Microsoft.AspNetCore.Server.Kestrel.Performance.csproj index 87cb11038..ec62f4195 100644 --- a/benchmark/Microsoft.AspNetCore.Server.Kestrel.Performance/Microsoft.AspNetCore.Server.Kestrel.Performance.csproj +++ b/test/Microsoft.AspNetCore.Server.Kestrel.Performance/Microsoft.AspNetCore.Server.Kestrel.Performance.csproj @@ -1,11 +1,10 @@ + + netcoreapp1.1 Exe - ../../build/Key.snk - true - true @@ -26,8 +25,4 @@ - - - - diff --git a/benchmark/Microsoft.AspNetCore.Server.Kestrel.Performance/Program.cs b/test/Microsoft.AspNetCore.Server.Kestrel.Performance/Program.cs similarity index 100% rename from benchmark/Microsoft.AspNetCore.Server.Kestrel.Performance/Program.cs rename to test/Microsoft.AspNetCore.Server.Kestrel.Performance/Program.cs diff --git a/benchmark/Microsoft.AspNetCore.Server.Kestrel.Performance/Readme.md b/test/Microsoft.AspNetCore.Server.Kestrel.Performance/Readme.md similarity index 100% rename from benchmark/Microsoft.AspNetCore.Server.Kestrel.Performance/Readme.md rename to test/Microsoft.AspNetCore.Server.Kestrel.Performance/Readme.md diff --git a/benchmark/Microsoft.AspNetCore.Server.Kestrel.Performance/RequestParsing.cs b/test/Microsoft.AspNetCore.Server.Kestrel.Performance/RequestParsing.cs similarity index 100% rename from benchmark/Microsoft.AspNetCore.Server.Kestrel.Performance/RequestParsing.cs rename to test/Microsoft.AspNetCore.Server.Kestrel.Performance/RequestParsing.cs diff --git a/benchmark/Microsoft.AspNetCore.Server.Kestrel.Performance/Writing.cs b/test/Microsoft.AspNetCore.Server.Kestrel.Performance/Writing.cs similarity index 100% rename from benchmark/Microsoft.AspNetCore.Server.Kestrel.Performance/Writing.cs rename to test/Microsoft.AspNetCore.Server.Kestrel.Performance/Writing.cs diff --git a/benchmark/Microsoft.AspNetCore.Server.Kestrel.Performance/columns/RpsColumn.cs b/test/Microsoft.AspNetCore.Server.Kestrel.Performance/columns/RpsColumn.cs similarity index 100% rename from benchmark/Microsoft.AspNetCore.Server.Kestrel.Performance/columns/RpsColumn.cs rename to test/Microsoft.AspNetCore.Server.Kestrel.Performance/columns/RpsColumn.cs diff --git a/benchmark/Microsoft.AspNetCore.Server.Kestrel.Performance/configs/CoreConfig.cs b/test/Microsoft.AspNetCore.Server.Kestrel.Performance/configs/CoreConfig.cs similarity index 100% rename from benchmark/Microsoft.AspNetCore.Server.Kestrel.Performance/configs/CoreConfig.cs rename to test/Microsoft.AspNetCore.Server.Kestrel.Performance/configs/CoreConfig.cs diff --git a/benchmark/Microsoft.AspNetCore.Server.Kestrel.Performance/runtimeconfig.template.json b/test/Microsoft.AspNetCore.Server.Kestrel.Performance/runtimeconfig.template.json similarity index 100% rename from benchmark/Microsoft.AspNetCore.Server.Kestrel.Performance/runtimeconfig.template.json rename to test/Microsoft.AspNetCore.Server.Kestrel.Performance/runtimeconfig.template.json