Use x86 protoc binaries on arm64 Windows (#32017)

grpc · May 18, 2023 · 6d53449 · 6d53449
1 parent a7607cc
commit 6d53449
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/src/csharp/Grpc.Tools.Tests/ProtoToolsPlatformTaskTest.cs b/src/csharp/Grpc.Tools.Tests/ProtoToolsPlatformTaskTest.cs
@@ -79,6 +79,11 @@ public void CpuIsArm64()
                 {
                     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
                 {
                     Assert.AreEqual("arm64", _task.Cpu);

diff --git a/src/csharp/Grpc.Tools/ProtoToolsPlatform.cs b/src/csharp/Grpc.Tools/ProtoToolsPlatform.cs
@@ -65,6 +65,11 @@ public override bool Execute()
             {
                 Cpu = "x64";
             }
+            // Use x86 on Windows arm64 until a native protoc is shipped
+            else if (Os == "windows" && Cpu == "arm64")
+            {
+                Cpu = "x86";
+            }
 
             return true;
         }