diff --git a/test/FunctionalTests/Linker/LinkerTests.cs b/test/FunctionalTests/Linker/LinkerTests.cs index bcc5218e3..9eee6c6ce 100644 --- a/test/FunctionalTests/Linker/LinkerTests.cs +++ b/test/FunctionalTests/Linker/LinkerTests.cs @@ -56,10 +56,10 @@ public async Task RunWebsiteAndCallWithClient_Success() try { - await PublishApp(projectDirectory + @"\..\..\testassets\LinkerTestsWebsite\LinkerTestsWebsite.csproj", linkerTestsWebsitePath) - .TimeoutAfter(Timeout); - await PublishApp(projectDirectory + @"\..\..\testassets\LinkerTestsClient\LinkerTestsClient.csproj", linkerTestsClientPath) - .TimeoutAfter(Timeout); + var publishWebsiteTask = PublishAppAsync(projectDirectory + @"\..\..\testassets\LinkerTestsWebsite\LinkerTestsWebsite.csproj", linkerTestsWebsitePath); + var publishClientTask = PublishAppAsync(projectDirectory + @"\..\..\testassets\LinkerTestsClient\LinkerTestsClient.csproj", linkerTestsClientPath); + + await Task.WhenAll(publishWebsiteTask, publishClientTask).TimeoutAfter(Timeout); websiteProcess.Start(Path.Combine(linkerTestsWebsitePath, "LinkerTestsWebsite.dll")); await websiteProcess.WaitForReadyAsync().TimeoutAfter(Timeout); @@ -92,7 +92,7 @@ private void EnsureDeleted(string path) } } - private static async Task PublishApp(string path, string outputPath) + private static async Task PublishAppAsync(string path, string outputPath) { var resolvedPath = Path.GetFullPath(path); Console.WriteLine($"Publishing {resolvedPath}"); diff --git a/testassets/Greeter/Greeter.sln b/testassets/Greeter/Greeter.sln deleted file mode 100644 index c76dca87d..000000000 --- a/testassets/Greeter/Greeter.sln +++ /dev/null @@ -1,67 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29230.61 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Server", "Server\Server.csproj", "{534AC5F8-2DF2-40BD-87A5-B3D8310118C4}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Client", "Client\Client.csproj", "{48A1D3BC-A14B-436A-8822-6DE2BEF8B747}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Grpc.Net.Common", "..\..\src\Grpc.Net.Common\Grpc.Net.Common.csproj", "{7BAC4C72-8BE1-4642-9E16-E37D23B9F386}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Grpc.AspNetCore", "..\..\src\Grpc.AspNetCore\Grpc.AspNetCore.csproj", "{F1713F9E-6A06-4ADC-99C7-88A8F9C80351}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Grpc.Net.ClientFactory", "..\..\src\Grpc.Net.ClientFactory\Grpc.Net.ClientFactory.csproj", "{4BDD8F78-41C4-4023-9680-2A368DBA9691}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Grpc.Net.Client", "..\..\src\Grpc.Net.Client\Grpc.Net.Client.csproj", "{55CB8BDE-D0BB-455E-8A2C-7659CFBDC2D3}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Grpc.AspNetCore.Server.ClientFactory", "..\..\src\Grpc.AspNetCore.Server.ClientFactory\Grpc.AspNetCore.Server.ClientFactory.csproj", "{DF94E310-94BA-4C92-BD08-A2DA5E6D32A2}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Grpc.AspNetCore.Server", "..\..\src\Grpc.AspNetCore.Server\Grpc.AspNetCore.Server.csproj", "{98BE0416-3B7D-4F88-A5B6-0F7349843215}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {534AC5F8-2DF2-40BD-87A5-B3D8310118C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {534AC5F8-2DF2-40BD-87A5-B3D8310118C4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {534AC5F8-2DF2-40BD-87A5-B3D8310118C4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {534AC5F8-2DF2-40BD-87A5-B3D8310118C4}.Release|Any CPU.Build.0 = Release|Any CPU - {48A1D3BC-A14B-436A-8822-6DE2BEF8B747}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {48A1D3BC-A14B-436A-8822-6DE2BEF8B747}.Debug|Any CPU.Build.0 = Debug|Any CPU - {48A1D3BC-A14B-436A-8822-6DE2BEF8B747}.Release|Any CPU.ActiveCfg = Release|Any CPU - {48A1D3BC-A14B-436A-8822-6DE2BEF8B747}.Release|Any CPU.Build.0 = Release|Any CPU - {7BAC4C72-8BE1-4642-9E16-E37D23B9F386}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7BAC4C72-8BE1-4642-9E16-E37D23B9F386}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7BAC4C72-8BE1-4642-9E16-E37D23B9F386}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7BAC4C72-8BE1-4642-9E16-E37D23B9F386}.Release|Any CPU.Build.0 = Release|Any CPU - {F1713F9E-6A06-4ADC-99C7-88A8F9C80351}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F1713F9E-6A06-4ADC-99C7-88A8F9C80351}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F1713F9E-6A06-4ADC-99C7-88A8F9C80351}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F1713F9E-6A06-4ADC-99C7-88A8F9C80351}.Release|Any CPU.Build.0 = Release|Any CPU - {4BDD8F78-41C4-4023-9680-2A368DBA9691}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4BDD8F78-41C4-4023-9680-2A368DBA9691}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4BDD8F78-41C4-4023-9680-2A368DBA9691}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4BDD8F78-41C4-4023-9680-2A368DBA9691}.Release|Any CPU.Build.0 = Release|Any CPU - {55CB8BDE-D0BB-455E-8A2C-7659CFBDC2D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {55CB8BDE-D0BB-455E-8A2C-7659CFBDC2D3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {55CB8BDE-D0BB-455E-8A2C-7659CFBDC2D3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {55CB8BDE-D0BB-455E-8A2C-7659CFBDC2D3}.Release|Any CPU.Build.0 = Release|Any CPU - {DF94E310-94BA-4C92-BD08-A2DA5E6D32A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DF94E310-94BA-4C92-BD08-A2DA5E6D32A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DF94E310-94BA-4C92-BD08-A2DA5E6D32A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DF94E310-94BA-4C92-BD08-A2DA5E6D32A2}.Release|Any CPU.Build.0 = Release|Any CPU - {98BE0416-3B7D-4F88-A5B6-0F7349843215}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {98BE0416-3B7D-4F88-A5B6-0F7349843215}.Debug|Any CPU.Build.0 = Debug|Any CPU - {98BE0416-3B7D-4F88-A5B6-0F7349843215}.Release|Any CPU.ActiveCfg = Release|Any CPU - {98BE0416-3B7D-4F88-A5B6-0F7349843215}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {D22B3129-3BFB-41FA-9FCE-E45EBEF8C2DD} - EndGlobalSection -EndGlobal diff --git a/testassets/Greeter/Proto/greet.proto b/testassets/Greeter/Proto/greet.proto deleted file mode 100644 index 26d0c794d..000000000 --- a/testassets/Greeter/Proto/greet.proto +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright 2019 The gRPC Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -syntax = "proto3"; - -package greet; - -// The greeting service definition. -service Greeter { - // Sends a greeting - rpc SayHello (HelloRequest) returns (HelloReply); -} - -// The request message containing the user's name. -message HelloRequest { - string name = 1; -} - -// The response message containing the greetings -message HelloReply { - string message = 1; -}