From 1e51acc389e5efd3e994f53e47afbc99625342dc Mon Sep 17 00:00:00 2001 From: James Newton-King Date: Wed, 21 Dec 2022 13:48:04 +0800 Subject: [PATCH 1/2] Fix gRPC template tests --- src/ProjectTemplates/test/Templates.Tests/GrpcTemplateTest.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ProjectTemplates/test/Templates.Tests/GrpcTemplateTest.cs b/src/ProjectTemplates/test/Templates.Tests/GrpcTemplateTest.cs index 72b80940aa58..7fda00930fec 100644 --- a/src/ProjectTemplates/test/Templates.Tests/GrpcTemplateTest.cs +++ b/src/ProjectTemplates/test/Templates.Tests/GrpcTemplateTest.cs @@ -35,7 +35,7 @@ public ITestOutputHelper Output } [ConditionalTheory] - [SkipOnHelix("Not supported queues", Queues = "All.OSX;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)] + [SkipOnHelix("Not supported queues", Queues = "All.OSX;windows.11.arm64.open;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)] [SkipOnAlpine("https://github.com/grpc/grpc/issues/18338")] [InlineData(true)] [InlineData(false)] From 8a80a1bc2c3c22d7eb800ac4b55a0d38540faee1 Mon Sep 17 00:00:00 2001 From: James Newton-King Date: Fri, 23 Dec 2022 09:35:01 +0800 Subject: [PATCH 2/2] Update --- .../test/Templates.Tests/GrpcTemplateTest.cs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/ProjectTemplates/test/Templates.Tests/GrpcTemplateTest.cs b/src/ProjectTemplates/test/Templates.Tests/GrpcTemplateTest.cs index 7fda00930fec..c5dcb416ed03 100644 --- a/src/ProjectTemplates/test/Templates.Tests/GrpcTemplateTest.cs +++ b/src/ProjectTemplates/test/Templates.Tests/GrpcTemplateTest.cs @@ -35,7 +35,7 @@ public ITestOutputHelper Output } [ConditionalTheory] - [SkipOnHelix("Not supported queues", Queues = "All.OSX;windows.11.arm64.open;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)] + [SkipOnHelix("Not supported queues", Queues = "windows.11.arm64.open;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)] [SkipOnAlpine("https://github.com/grpc/grpc/issues/18338")] [InlineData(true)] [InlineData(false)] @@ -54,11 +54,9 @@ public async Task GrpcTemplate(bool useProgramMain) await project.RunDotNetBuildAsync(); - var isOsx = RuntimeInformation.IsOSPlatform(OSPlatform.OSX); var isWindowsOld = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) && Environment.OSVersion.Version < new Version(6, 2); - var unsupported = isOsx || isWindowsOld; - using (var serverProcess = project.StartBuiltProjectAsync(hasListeningUri: !unsupported, logger: Logger)) + using (var serverProcess = project.StartBuiltProjectAsync(hasListeningUri: !isWindowsOld, logger: Logger)) { // These templates are HTTPS + HTTP/2 only which is not supported on some platforms. if (isWindowsOld) @@ -76,7 +74,7 @@ public async Task GrpcTemplate(bool useProgramMain) } } - using (var aspNetProcess = project.StartPublishedProjectAsync(hasListeningUri: !unsupported)) + using (var aspNetProcess = project.StartPublishedProjectAsync(hasListeningUri: !isWindowsOld)) { // These templates are HTTPS + HTTP/2 only which is not supported on some platforms. if (isWindowsOld)