From 1fc282acb87874daf6996b6893c19c51d9285814 Mon Sep 17 00:00:00 2001 From: BrennanConroy Date: Thu, 12 Apr 2018 08:28:12 -0700 Subject: [PATCH] Move Benchmark Apps to new folder and use .All package when Benchmarks runs our scenarios (#1965) --- SignalR.sln | 24 ++++++++------- .../BenchmarkServer/BenchmarkServer.csproj | 29 +++++++++++++++++++ .../BenchmarkServer/Hubs/EchoHub.cs | 0 .../BenchmarkServer/Program.cs | 0 .../BenchmarkServer/README.md | 0 .../BenchmarkServer/Startup.cs | 0 .../BenchmarkServer/signalr.json | 2 +- .../Crankier/Agent.cs | 0 .../Crankier/AgentHeartbeatInformation.cs | 0 .../Crankier/AgentReceiver.cs | 0 .../Crankier/AgentSender.cs | 0 .../Crankier/AgentWorker.cs | 0 .../Crankier/Client.cs | 0 .../Crankier/Commands/AgentCommand.cs | 0 .../Crankier/Commands/CommandLineUtilities.cs | 0 .../Crankier/Commands/Defaults.cs | 0 .../Crankier/Commands/LocalCommand.cs | 0 .../Crankier/Commands/WorkerCommand.cs | 0 .../Crankier/ConnectionState.cs | 0 .../Crankier/Crankier.csproj | 0 .../Crankier/IAgent.cs | 0 .../Crankier/IRunner.cs | 0 .../Crankier/IWorker.cs | 0 .../Crankier/Message.cs | 0 .../Crankier/Program.cs | 0 .../Crankier/Runner.cs | 0 .../Crankier/StatusInformation.cs | 0 .../Crankier/Worker.cs | 0 .../Crankier/WorkerHeartbeatInformation.cs | 0 .../Crankier/WorkerReceiver.cs | 0 .../Crankier/WorkerSender.cs | 0 .../BenchmarkServer/BenchmarkServer.csproj | 20 ------------- build/dependencies.props | 2 ++ 33 files changed, 46 insertions(+), 31 deletions(-) create mode 100644 benchmarkapps/BenchmarkServer/BenchmarkServer.csproj rename {benchmarks => benchmarkapps}/BenchmarkServer/Hubs/EchoHub.cs (100%) rename {benchmarks => benchmarkapps}/BenchmarkServer/Program.cs (100%) rename {benchmarks => benchmarkapps}/BenchmarkServer/README.md (100%) rename {benchmarks => benchmarkapps}/BenchmarkServer/Startup.cs (100%) rename {benchmarks => benchmarkapps}/BenchmarkServer/signalr.json (86%) rename {benchmarks => benchmarkapps}/Crankier/Agent.cs (100%) rename {benchmarks => benchmarkapps}/Crankier/AgentHeartbeatInformation.cs (100%) rename {benchmarks => benchmarkapps}/Crankier/AgentReceiver.cs (100%) rename {benchmarks => benchmarkapps}/Crankier/AgentSender.cs (100%) rename {benchmarks => benchmarkapps}/Crankier/AgentWorker.cs (100%) rename {benchmarks => benchmarkapps}/Crankier/Client.cs (100%) rename {benchmarks => benchmarkapps}/Crankier/Commands/AgentCommand.cs (100%) rename {benchmarks => benchmarkapps}/Crankier/Commands/CommandLineUtilities.cs (100%) rename {benchmarks => benchmarkapps}/Crankier/Commands/Defaults.cs (100%) rename {benchmarks => benchmarkapps}/Crankier/Commands/LocalCommand.cs (100%) rename {benchmarks => benchmarkapps}/Crankier/Commands/WorkerCommand.cs (100%) rename {benchmarks => benchmarkapps}/Crankier/ConnectionState.cs (100%) rename {benchmarks => benchmarkapps}/Crankier/Crankier.csproj (100%) rename {benchmarks => benchmarkapps}/Crankier/IAgent.cs (100%) rename {benchmarks => benchmarkapps}/Crankier/IRunner.cs (100%) rename {benchmarks => benchmarkapps}/Crankier/IWorker.cs (100%) rename {benchmarks => benchmarkapps}/Crankier/Message.cs (100%) rename {benchmarks => benchmarkapps}/Crankier/Program.cs (100%) rename {benchmarks => benchmarkapps}/Crankier/Runner.cs (100%) rename {benchmarks => benchmarkapps}/Crankier/StatusInformation.cs (100%) rename {benchmarks => benchmarkapps}/Crankier/Worker.cs (100%) rename {benchmarks => benchmarkapps}/Crankier/WorkerHeartbeatInformation.cs (100%) rename {benchmarks => benchmarkapps}/Crankier/WorkerReceiver.cs (100%) rename {benchmarks => benchmarkapps}/Crankier/WorkerSender.cs (100%) delete mode 100644 benchmarks/BenchmarkServer/BenchmarkServer.csproj diff --git a/SignalR.sln b/SignalR.sln index 2b438e1acd..8f2b0c3052 100644 --- a/SignalR.sln +++ b/SignalR.sln @@ -1,4 +1,5 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 + +Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.27110.0 MinimumVisualStudioVersion = 15.0.26730.03 @@ -9,6 +10,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{DA69F624-539 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{83B2C3EB-A3D8-4E6F-9A3C-A380B005EF31}" ProjectSection(SolutionItems) = preProject + benchmarkapps\BenchmarkServer\BenchmarkServer.csproj = benchmarkapps\BenchmarkServer\BenchmarkServer.csproj build\dependencies.props = build\dependencies.props Directory.Build.props = Directory.Build.props Directory.Build.targets = Directory.Build.targets @@ -81,11 +83,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Signal EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FunctionalTests", "clients\ts\FunctionalTests\FunctionalTests.csproj", "{D0C7B22E-B0B6-4D62-BF7D-79EE4AAF1981}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BenchmarkServer", "benchmarks\BenchmarkServer\BenchmarkServer.csproj", "{B5286020-C218-443C-91A9-B65751FB9B29}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.SignalR.Protocols.Json", "src\Microsoft.AspNetCore.SignalR.Protocols.Json\Microsoft.AspNetCore.SignalR.Protocols.Json.csproj", "{896FA5EE-63A5-4EAC-9F09-346584BB4830}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.SignalR.Protocols.Json", "src\Microsoft.AspNetCore.SignalR.Protocols.Json\Microsoft.AspNetCore.SignalR.Protocols.Json.csproj", "{896FA5EE-63A5-4EAC-9F09-346584BB4830}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BenchmarkServer", "benchmarkapps\BenchmarkServer\BenchmarkServer.csproj", "{8C75AC94-C980-4FE1-9F79-6CED3C8665CE}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Crankier", "benchmarks\Crankier\Crankier.csproj", "{8D3E3E7D-452B-44F4-86CA-111003EA11ED}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Crankier", "benchmarkapps\Crankier\Crankier.csproj", "{8D3E3E7D-452B-44F4-86CA-111003EA11ED}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "benchmarkapps", "benchmarkapps", "{43F352F3-4E2B-4ED7-901B-36E6671251F5}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -197,14 +201,14 @@ Global {D0C7B22E-B0B6-4D62-BF7D-79EE4AAF1981}.Debug|Any CPU.Build.0 = Debug|Any CPU {D0C7B22E-B0B6-4D62-BF7D-79EE4AAF1981}.Release|Any CPU.ActiveCfg = Release|Any CPU {D0C7B22E-B0B6-4D62-BF7D-79EE4AAF1981}.Release|Any CPU.Build.0 = Release|Any CPU - {B5286020-C218-443C-91A9-B65751FB9B29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B5286020-C218-443C-91A9-B65751FB9B29}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B5286020-C218-443C-91A9-B65751FB9B29}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B5286020-C218-443C-91A9-B65751FB9B29}.Release|Any CPU.Build.0 = Release|Any CPU {896FA5EE-63A5-4EAC-9F09-346584BB4830}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {896FA5EE-63A5-4EAC-9F09-346584BB4830}.Debug|Any CPU.Build.0 = Debug|Any CPU {896FA5EE-63A5-4EAC-9F09-346584BB4830}.Release|Any CPU.ActiveCfg = Release|Any CPU {896FA5EE-63A5-4EAC-9F09-346584BB4830}.Release|Any CPU.Build.0 = Release|Any CPU + {8C75AC94-C980-4FE1-9F79-6CED3C8665CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8C75AC94-C980-4FE1-9F79-6CED3C8665CE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8C75AC94-C980-4FE1-9F79-6CED3C8665CE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8C75AC94-C980-4FE1-9F79-6CED3C8665CE}.Release|Any CPU.Build.0 = Release|Any CPU {8D3E3E7D-452B-44F4-86CA-111003EA11ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8D3E3E7D-452B-44F4-86CA-111003EA11ED}.Debug|Any CPU.Build.0 = Debug|Any CPU {8D3E3E7D-452B-44F4-86CA-111003EA11ED}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -240,9 +244,9 @@ Global {0A0A6135-EA24-4307-95C2-CE1B7E164A5E} = {6A35B453-52EC-48AF-89CA-D4A69800F131} {55DB4B6F-12E5-4A27-97F4-E97E135470FF} = {DA69F624-5398-4884-87E4-B816698CDE65} {D0C7B22E-B0B6-4D62-BF7D-79EE4AAF1981} = {3A76C5A2-79ED-49BC-8BDC-6A3A766FFA1B} - {B5286020-C218-443C-91A9-B65751FB9B29} = {8A4582C8-DC59-4B61-BCE7-119FBAA99EFB} {896FA5EE-63A5-4EAC-9F09-346584BB4830} = {DA69F624-5398-4884-87E4-B816698CDE65} - {8D3E3E7D-452B-44F4-86CA-111003EA11ED} = {8A4582C8-DC59-4B61-BCE7-119FBAA99EFB} + {8C75AC94-C980-4FE1-9F79-6CED3C8665CE} = {43F352F3-4E2B-4ED7-901B-36E6671251F5} + {8D3E3E7D-452B-44F4-86CA-111003EA11ED} = {43F352F3-4E2B-4ED7-901B-36E6671251F5} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {7945A4E4-ACDB-4F6E-95CA-6AC6E7C2CD59} diff --git a/benchmarkapps/BenchmarkServer/BenchmarkServer.csproj b/benchmarkapps/BenchmarkServer/BenchmarkServer.csproj new file mode 100644 index 0000000000..fc371cf6aa --- /dev/null +++ b/benchmarkapps/BenchmarkServer/BenchmarkServer.csproj @@ -0,0 +1,29 @@ + + + + netcoreapp2.1 + + $([System.String]::Copy($(MicrosoftAspNetCoreAllPackageVersion)).Replace('2.1', '1.0')) + + + + + + + + + + + + + + + + + + + + + + + diff --git a/benchmarks/BenchmarkServer/Hubs/EchoHub.cs b/benchmarkapps/BenchmarkServer/Hubs/EchoHub.cs similarity index 100% rename from benchmarks/BenchmarkServer/Hubs/EchoHub.cs rename to benchmarkapps/BenchmarkServer/Hubs/EchoHub.cs diff --git a/benchmarks/BenchmarkServer/Program.cs b/benchmarkapps/BenchmarkServer/Program.cs similarity index 100% rename from benchmarks/BenchmarkServer/Program.cs rename to benchmarkapps/BenchmarkServer/Program.cs diff --git a/benchmarks/BenchmarkServer/README.md b/benchmarkapps/BenchmarkServer/README.md similarity index 100% rename from benchmarks/BenchmarkServer/README.md rename to benchmarkapps/BenchmarkServer/README.md diff --git a/benchmarks/BenchmarkServer/Startup.cs b/benchmarkapps/BenchmarkServer/Startup.cs similarity index 100% rename from benchmarks/BenchmarkServer/Startup.cs rename to benchmarkapps/BenchmarkServer/Startup.cs diff --git a/benchmarks/BenchmarkServer/signalr.json b/benchmarkapps/BenchmarkServer/signalr.json similarity index 86% rename from benchmarks/BenchmarkServer/signalr.json rename to benchmarkapps/BenchmarkServer/signalr.json index 76286de061..0107023c85 100644 --- a/benchmarks/BenchmarkServer/signalr.json +++ b/benchmarkapps/BenchmarkServer/signalr.json @@ -4,7 +4,7 @@ "Source": { "Repository": "https://github.com/aspnet/SignalR.git", "BranchOrCommit": "dev", - "Project": "benchmarks/BenchmarkServer/BenchmarkServer.csproj" + "Project": "benchmarkapps/BenchmarkServer/BenchmarkServer.csproj" }, "Connections": 10, "Duration": 20, diff --git a/benchmarks/Crankier/Agent.cs b/benchmarkapps/Crankier/Agent.cs similarity index 100% rename from benchmarks/Crankier/Agent.cs rename to benchmarkapps/Crankier/Agent.cs diff --git a/benchmarks/Crankier/AgentHeartbeatInformation.cs b/benchmarkapps/Crankier/AgentHeartbeatInformation.cs similarity index 100% rename from benchmarks/Crankier/AgentHeartbeatInformation.cs rename to benchmarkapps/Crankier/AgentHeartbeatInformation.cs diff --git a/benchmarks/Crankier/AgentReceiver.cs b/benchmarkapps/Crankier/AgentReceiver.cs similarity index 100% rename from benchmarks/Crankier/AgentReceiver.cs rename to benchmarkapps/Crankier/AgentReceiver.cs diff --git a/benchmarks/Crankier/AgentSender.cs b/benchmarkapps/Crankier/AgentSender.cs similarity index 100% rename from benchmarks/Crankier/AgentSender.cs rename to benchmarkapps/Crankier/AgentSender.cs diff --git a/benchmarks/Crankier/AgentWorker.cs b/benchmarkapps/Crankier/AgentWorker.cs similarity index 100% rename from benchmarks/Crankier/AgentWorker.cs rename to benchmarkapps/Crankier/AgentWorker.cs diff --git a/benchmarks/Crankier/Client.cs b/benchmarkapps/Crankier/Client.cs similarity index 100% rename from benchmarks/Crankier/Client.cs rename to benchmarkapps/Crankier/Client.cs diff --git a/benchmarks/Crankier/Commands/AgentCommand.cs b/benchmarkapps/Crankier/Commands/AgentCommand.cs similarity index 100% rename from benchmarks/Crankier/Commands/AgentCommand.cs rename to benchmarkapps/Crankier/Commands/AgentCommand.cs diff --git a/benchmarks/Crankier/Commands/CommandLineUtilities.cs b/benchmarkapps/Crankier/Commands/CommandLineUtilities.cs similarity index 100% rename from benchmarks/Crankier/Commands/CommandLineUtilities.cs rename to benchmarkapps/Crankier/Commands/CommandLineUtilities.cs diff --git a/benchmarks/Crankier/Commands/Defaults.cs b/benchmarkapps/Crankier/Commands/Defaults.cs similarity index 100% rename from benchmarks/Crankier/Commands/Defaults.cs rename to benchmarkapps/Crankier/Commands/Defaults.cs diff --git a/benchmarks/Crankier/Commands/LocalCommand.cs b/benchmarkapps/Crankier/Commands/LocalCommand.cs similarity index 100% rename from benchmarks/Crankier/Commands/LocalCommand.cs rename to benchmarkapps/Crankier/Commands/LocalCommand.cs diff --git a/benchmarks/Crankier/Commands/WorkerCommand.cs b/benchmarkapps/Crankier/Commands/WorkerCommand.cs similarity index 100% rename from benchmarks/Crankier/Commands/WorkerCommand.cs rename to benchmarkapps/Crankier/Commands/WorkerCommand.cs diff --git a/benchmarks/Crankier/ConnectionState.cs b/benchmarkapps/Crankier/ConnectionState.cs similarity index 100% rename from benchmarks/Crankier/ConnectionState.cs rename to benchmarkapps/Crankier/ConnectionState.cs diff --git a/benchmarks/Crankier/Crankier.csproj b/benchmarkapps/Crankier/Crankier.csproj similarity index 100% rename from benchmarks/Crankier/Crankier.csproj rename to benchmarkapps/Crankier/Crankier.csproj diff --git a/benchmarks/Crankier/IAgent.cs b/benchmarkapps/Crankier/IAgent.cs similarity index 100% rename from benchmarks/Crankier/IAgent.cs rename to benchmarkapps/Crankier/IAgent.cs diff --git a/benchmarks/Crankier/IRunner.cs b/benchmarkapps/Crankier/IRunner.cs similarity index 100% rename from benchmarks/Crankier/IRunner.cs rename to benchmarkapps/Crankier/IRunner.cs diff --git a/benchmarks/Crankier/IWorker.cs b/benchmarkapps/Crankier/IWorker.cs similarity index 100% rename from benchmarks/Crankier/IWorker.cs rename to benchmarkapps/Crankier/IWorker.cs diff --git a/benchmarks/Crankier/Message.cs b/benchmarkapps/Crankier/Message.cs similarity index 100% rename from benchmarks/Crankier/Message.cs rename to benchmarkapps/Crankier/Message.cs diff --git a/benchmarks/Crankier/Program.cs b/benchmarkapps/Crankier/Program.cs similarity index 100% rename from benchmarks/Crankier/Program.cs rename to benchmarkapps/Crankier/Program.cs diff --git a/benchmarks/Crankier/Runner.cs b/benchmarkapps/Crankier/Runner.cs similarity index 100% rename from benchmarks/Crankier/Runner.cs rename to benchmarkapps/Crankier/Runner.cs diff --git a/benchmarks/Crankier/StatusInformation.cs b/benchmarkapps/Crankier/StatusInformation.cs similarity index 100% rename from benchmarks/Crankier/StatusInformation.cs rename to benchmarkapps/Crankier/StatusInformation.cs diff --git a/benchmarks/Crankier/Worker.cs b/benchmarkapps/Crankier/Worker.cs similarity index 100% rename from benchmarks/Crankier/Worker.cs rename to benchmarkapps/Crankier/Worker.cs diff --git a/benchmarks/Crankier/WorkerHeartbeatInformation.cs b/benchmarkapps/Crankier/WorkerHeartbeatInformation.cs similarity index 100% rename from benchmarks/Crankier/WorkerHeartbeatInformation.cs rename to benchmarkapps/Crankier/WorkerHeartbeatInformation.cs diff --git a/benchmarks/Crankier/WorkerReceiver.cs b/benchmarkapps/Crankier/WorkerReceiver.cs similarity index 100% rename from benchmarks/Crankier/WorkerReceiver.cs rename to benchmarkapps/Crankier/WorkerReceiver.cs diff --git a/benchmarks/Crankier/WorkerSender.cs b/benchmarkapps/Crankier/WorkerSender.cs similarity index 100% rename from benchmarks/Crankier/WorkerSender.cs rename to benchmarkapps/Crankier/WorkerSender.cs diff --git a/benchmarks/BenchmarkServer/BenchmarkServer.csproj b/benchmarks/BenchmarkServer/BenchmarkServer.csproj deleted file mode 100644 index 41b716153f..0000000000 --- a/benchmarks/BenchmarkServer/BenchmarkServer.csproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - netcoreapp2.1 - - - - - - - - - - - - - - - - diff --git a/build/dependencies.props b/build/dependencies.props index 80daeb9094..fd2d662693 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -6,6 +6,8 @@ 0.10.13 3.1.0 2.1.0-preview3-17002 + 2.1.0-preview3-32170 + 2.1.0-preview3-32170 2.1.0-preview3-32170 2.1.0-preview3-32170 2.1.0-preview3-32170