Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions src/ProjectTemplates/test/Templates.Tests/GrpcTemplateTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public ITestOutputHelper Output
}

[ConditionalTheory]
[SkipOnHelix("Not supported queues", Queues = "All.OSX;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)]
[SkipOnHelix("Not supported queues", Queues = "windows.11.arm64.open;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we add this value to HelixConstants?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably. But first, I'd like to ensure this change fixes the problem. The problem is that the Helix queue only runs on full CI (i.e. not PR CI). Need to merge to check.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are ways to run it without merging PRs, oh well

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok!

#45885 😄

[SkipOnAlpine("https://github.com/grpc/grpc/issues/18338")]
[InlineData(true)]
[InlineData(false)]
Expand All @@ -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)
Expand All @@ -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)
Expand Down