Use x86 protoc binaries on arm64 Windows (#32017)

pull/30935/merge
tony 2 years ago committed by GitHub
parent 80e5f98139
commit aea02409bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 5
      src/csharp/Grpc.Tools.Tests/ProtoToolsPlatformTaskTest.cs
  2. 5
      src/csharp/Grpc.Tools/ProtoToolsPlatform.cs

@ -79,6 +79,11 @@ namespace Grpc.Tools.Tests
{ {
Assert.AreEqual("x64", _task.Cpu); Assert.AreEqual("x64", _task.Cpu);
} }
// On windows arm64, x86 is used until a native protoc is shipped
else if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
Assert.AreEqual("x86", _task.Cpu);
}
else else
{ {
Assert.AreEqual("arm64", _task.Cpu); Assert.AreEqual("arm64", _task.Cpu);

@ -65,6 +65,11 @@ namespace Grpc.Tools
{ {
Cpu = "x64"; Cpu = "x64";
} }
// Use x86 on Windows arm64 until a native protoc is shipped
else if (Os == "windows" && Cpu == "arm64")
{
Cpu = "x86";
}
return true; return true;
} }

Loading…
Cancel
Save