Skip to content

Commit 8f10ad0

Browse files
authored
Enable gRPC tests on MacOS 12 (#53186)
1 parent ca0db47 commit 8f10ad0

File tree

6 files changed

+3
-36
lines changed

6 files changed

+3
-36
lines changed

eng/targets/Helix.Common.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<HelixAvailableTargetQueue Include="$(HelixQueueArmDebian12)" Platform="Linux" />
5050

5151
<!-- Mac -->
52-
<HelixAvailableTargetQueue Include="OSX.1100.Amd64.Open" Platform="OSX" />
52+
<HelixAvailableTargetQueue Include="OSX.1200.Amd64.Open" Platform="OSX" />
5353

5454
<!-- Windows -->
5555
<HelixAvailableTargetQueue Include="Windows.Amd64.Server2022.Open" Platform="Windows" />

src/Grpc/Interop/Directory.Build.props

Lines changed: 0 additions & 9 deletions
This file was deleted.

src/Grpc/JsonTranscoding/perf/Directory.Build.props

Lines changed: 0 additions & 9 deletions
This file was deleted.

src/Grpc/JsonTranscoding/perf/Microsoft.AspNetCore.Grpc.Microbenchmarks/Microsoft.AspNetCore.Grpc.Microbenchmarks.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
77
<TieredCompilation>false</TieredCompilation>
88
<DefineConstants>$(DefineConstants);IS_BENCHMARKS</DefineConstants>
9-
<!-- TODO: Remove when Grpc.Tools on MacOS 11 is fixed. See https://github.com/grpc/grpc/issues/32558 -->
10-
<SkipMicrobenchmarksValidation>true</SkipMicrobenchmarksValidation>
119
</PropertyGroup>
1210

1311
<ItemGroup>

src/Grpc/JsonTranscoding/test/Directory.Build.props

Lines changed: 0 additions & 9 deletions
This file was deleted.

src/ProjectTemplates/test/Templates.Tests/GrpcTemplateTest.cs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,14 @@ public ITestOutputHelper Output
3434
}
3535
}
3636

37-
// TODO (https://github.com/dotnet/aspnetcore/issues/47336): Don't skip on macos 11
3837
[ConditionalFact]
39-
[SkipOnHelix("Not supported queues", Queues = "OSX.1100.Amd64.Open;windows.11.arm64.open;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)]
38+
[SkipOnHelix("Not supported queues", Queues = "windows.11.arm64.open;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)]
4039
[SkipOnAlpine("https://github.com/grpc/grpc/issues/18338")] // protoc doesn't support Alpine. Note that the issue was closed with a workaround which isn't applied to our OS image.
4140
public async Task GrpcTemplate()
4241
{
4342
await GrpcTemplateCore();
4443
}
4544

46-
// TODO (https://github.com/dotnet/aspnetcore/issues/47336): Don't skip on macos 11
4745
[ConditionalFact]
4846
[SkipOnHelix("Not supported queues", Queues = HelixConstants.NativeAotNotSupportedHelixQueues)]
4947
[SkipOnAlpine("https://github.com/grpc/grpc/issues/18338")] // protoc doesn't support Alpine. Note that the issue was closed with a workaround which isn't applied to our OS image.
@@ -52,16 +50,14 @@ public async Task GrpcTemplateNativeAot()
5250
await GrpcTemplateCore(args: new[] { ArgConstants.PublishNativeAot });
5351
}
5452

55-
// TODO (https://github.com/dotnet/aspnetcore/issues/47336): Don't skip on macos 11
5653
[ConditionalFact]
57-
[SkipOnHelix("Not supported queues", Queues = "OSX.1100.Amd64.Open;windows.11.arm64.open;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)]
54+
[SkipOnHelix("Not supported queues", Queues = "windows.11.arm64.open;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)]
5855
[SkipOnAlpine("https://github.com/grpc/grpc/issues/18338")] // protoc doesn't support Alpine. Note that the issue was closed with a workaround which isn't applied to our OS image.
5956
public async Task GrpcTemplateProgramMain()
6057
{
6158
await GrpcTemplateCore(args: new[] { ArgConstants.UseProgramMain });
6259
}
6360

64-
// TODO (https://github.com/dotnet/aspnetcore/issues/47336): Don't skip on macos 11
6561
[ConditionalFact]
6662
[SkipOnHelix("Not supported queues", Queues = HelixConstants.NativeAotNotSupportedHelixQueues)]
6763
[SkipOnAlpine("https://github.com/grpc/grpc/issues/18338")] // protoc doesn't support Alpine. Note that the issue was closed with a workaround which isn't applied to our OS image.

0 commit comments

Comments
 (0)