dont include x86 grpc_csharp_ext for linux and mac

src/csharp/Grpc.Core/Grpc.Core.csproj

@@ -39,18 +39,10 @@
       <PackagePath>runtimes/osx/native/libgrpc_csharp_ext.x64.dylib</PackagePath>
       <Pack>true</Pack>
     </Content>
-    <Content Include="..\nativelibs\csharp_ext_macos_x86\libgrpc_csharp_ext.dylib">
-      <PackagePath>runtimes/osx/native/libgrpc_csharp_ext.x86.dylib</PackagePath>
-      <Pack>true</Pack>
-    </Content>
     <Content Include="..\nativelibs\csharp_ext_linux_x64\libgrpc_csharp_ext.so">
       <PackagePath>runtimes/linux/native/libgrpc_csharp_ext.x64.so</PackagePath>
       <Pack>true</Pack>
     </Content>
-    <Content Include="..\nativelibs\csharp_ext_linux_x86\libgrpc_csharp_ext.so">
-      <PackagePath>runtimes/linux/native/libgrpc_csharp_ext.x86.so</PackagePath>
-      <Pack>true</Pack>
-    </Content>
     <Content Include="..\nativelibs\csharp_ext_windows_x64\grpc_csharp_ext.dll">
       <PackagePath>runtimes/win/native/grpc_csharp_ext.x64.dll</PackagePath>
       <Pack>true</Pack>

src/csharp/Grpc.Core/build/net45/Grpc.Core.targets

@@ -20,21 +20,11 @@
       <Link>grpc_csharp_ext.x64.dll</Link>
       <Visible>false</Visible>
     </Content>
-    <Content Include="$(MSBuildThisFileDirectory)..\..\runtimes\linux\native\libgrpc_csharp_ext.x86.so">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Link>libgrpc_csharp_ext.x86.so</Link>
-      <Visible>false</Visible>
-    </Content>
     <Content Include="$(MSBuildThisFileDirectory)..\..\runtimes\linux\native\libgrpc_csharp_ext.x64.so">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <Link>libgrpc_csharp_ext.x64.so</Link>
       <Visible>false</Visible>
     </Content>
-    <Content Include="$(MSBuildThisFileDirectory)..\..\runtimes\osx\native\libgrpc_csharp_ext.x86.dylib">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Link>libgrpc_csharp_ext.x86.dylib</Link>
-      <Visible>false</Visible>
-    </Content>
     <Content Include="$(MSBuildThisFileDirectory)..\..\runtimes\osx\native\libgrpc_csharp_ext.x64.dylib">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <Link>libgrpc_csharp_ext.x64.dylib</Link>

tools/run_tests/artifacts/artifact_targets.py

@@ -344,10 +344,17 @@ class ProtocArtifact:
 
 def targets():
     """Gets list of supported targets"""
-    return ([
+    return [
-        Cls(platform, arch) for Cls in (CSharpExtArtifact, ProtocArtifact)
+        ProtocArtifact('linux', 'x64'),
-        for platform in ('linux', 'macos', 'windows') for arch in ('x86', 'x64')
+        ProtocArtifact('linux', 'x86'),
-    ] + [
+        ProtocArtifact('macos', 'x64'),
+        ProtocArtifact('macos', 'x86'),
+        ProtocArtifact('windows', 'x64'),
+        ProtocArtifact('windows', 'x86'),
+        CSharpExtArtifact('linux', 'x64'),
+        CSharpExtArtifact('macos', 'x64'),
+        CSharpExtArtifact('windows', 'x64'),
+        CSharpExtArtifact('windows', 'x86'),
         CSharpExtArtifact('linux', 'android', arch_abi='arm64-v8a'),
         CSharpExtArtifact('linux', 'android', arch_abi='armeabi-v7a'),
         CSharpExtArtifact('linux', 'android', arch_abi='x86'),
@@ -405,4 +412,4 @@ def targets():
         RubyArtifact('linux', 'x64'),
         RubyArtifact('macos', 'x64'),
         PHPArtifact('linux', 'x64')
-    ])
+    ]

tools/run_tests/artifacts/distribtest_targets.py

@@ -328,14 +328,13 @@ def targets():
         CppDistribTest('windows', 'x86', testcase='cmake_as_externalproject'),
         # C#
         CSharpDistribTest('linux', 'x64', 'jessie'),
-        CSharpDistribTest('linux', 'x86', 'jessie'),
         CSharpDistribTest('linux', 'x64', 'stretch'),
         CSharpDistribTest('linux', 'x64', 'stretch', use_dotnet_cli=True),
         CSharpDistribTest('linux', 'x64', 'centos7'),
         CSharpDistribTest('linux', 'x64', 'ubuntu1604'),
         CSharpDistribTest('linux', 'x64', 'ubuntu1604', use_dotnet_cli=True),
         CSharpDistribTest('linux', 'x64', 'alpine', use_dotnet_cli=True),
-        CSharpDistribTest('macos', 'x86'),
+        CSharpDistribTest('macos', 'x64'),
         CSharpDistribTest('windows', 'x86'),
         CSharpDistribTest('windows', 'x64'),
         # Python