7 files changed, 52 insertions, 9 deletions
diff --git a/templates/CMakeLists.txt.template b/templates/CMakeLists.txt.template
index 06adb33739..435217bacd 100644
--- a/templates/CMakeLists.txt.template
+++ b/templates/CMakeLists.txt.template
@@ -35,7 +35,7 @@
 
   def get_deps(target_dict):
     deps = []
-    if target_dict.get('baselib', False):
+    if target_dict.get('baselib', False) or target_dict['name'] == 'address_sorting':
       deps.append("${_gRPC_BASELIB_LIBRARIES}")
     if target_dict.get('build', None) in ['protoc']:
       deps.append("${_gRPC_PROTOBUF_PROTOC_LIBRARIES}")
diff --git a/templates/gRPC-Core.podspec.template b/templates/gRPC-Core.podspec.template
index af97d81834..a767a612a6 100644
--- a/templates/gRPC-Core.podspec.template
+++ b/templates/gRPC-Core.podspec.template
@@ -68,6 +68,14 @@
     excl = grpc_private_files(libs)
     return [file for file in out if not file in excl]
 
+  def cfstream_private_headers(libs):
+    out = grpc_lib_files(libs, ("grpc_cfstream",), ("own_headers",))
+    return out
+
+  def cfstream_private_files(libs):
+    out = grpc_lib_files(libs, ("grpc_cfstream",), ("own_src", "own_headers"))
+    return out
+
   def ruby_multiline_list(files, indent):
     return (',\n' + indent*' ').join('\'%s\'' % f for f in files)
   %>
@@ -175,6 +183,16 @@
       ss.private_header_files = ${ruby_multiline_list(grpc_private_headers(libs), 30)}
     end
 
+    s.subspec 'CFStream-Implementation' do |ss|
+      ss.header_mappings_dir = '.'
+      ss.dependency "#{s.name}/Implementation", version
+      ss.pod_target_xcconfig = {
+        'GCC_PREPROCESSOR_DEFINITIONS' => 'GRPC_CFSTREAM=1'
+      }
+      ss.source_files = ${ruby_multiline_list(cfstream_private_files(filegroups), 22)}
+      ss.private_header_files = ${ruby_multiline_list(cfstream_private_headers(filegroups), 30)}
+    end
+
     s.subspec 'Cronet-Interface' do |ss|
       ss.header_mappings_dir = 'include/grpc'
       ss.source_files = ${ruby_multiline_list(grpc_cronet_public_headers(libs), 22)}
diff --git a/templates/gRPC-ProtoRPC.podspec.template b/templates/gRPC-ProtoRPC.podspec.template
index d2dcc429ef..96966784f1 100644
--- a/templates/gRPC-ProtoRPC.podspec.template
+++ b/templates/gRPC-ProtoRPC.podspec.template
@@ -43,12 +43,25 @@
     s.header_dir = name
 
     src_dir = 'src/objective-c/ProtoRPC'
-    s.source_files = "#{src_dir}/*.{h,m}"
-    s.header_mappings_dir = "#{src_dir}"
 
-    s.dependency 'gRPC', version
-    s.dependency 'gRPC-RxLibrary', version
-    s.dependency 'Protobuf', '~> 3.0'
+    s.default_subspec = 'Main'
+
+    s.subspec 'Main' do |ss|
+      ss.header_mappings_dir = "#{src_dir}"
+      ss.dependency 'gRPC', version
+      ss.dependency 'gRPC-RxLibrary', version
+      ss.dependency 'Protobuf', '~> 3.0'
+
+      ss.source_files = "#{src_dir}/*.{h,m}"
+    end
+    s.subspec 'CFStream' do |ss|
+      ss.dependency 'gRPC/CFStream', version
+      ss.dependency "#{s.name}/Main", version
+      ss.pod_target_xcconfig = {
+        'GCC_PREPROCESSOR_DEFINITIONS' => 'GRPC_CFSTREAM=1'
+      }
+    end
+
     s.pod_target_xcconfig = {
       # This is needed by all pods that depend on Protobuf:
       'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS=1',
diff --git a/templates/gRPC.podspec.template b/templates/gRPC.podspec.template
index 6616e74bd7..a3190c2d8e 100644
--- a/templates/gRPC.podspec.template
+++ b/templates/gRPC.podspec.template
@@ -65,6 +65,16 @@
       ss.dependency 'gRPC-Core', version
     end
 
+    # This subspec is mutually exclusive with the `Main` subspec
+    s.subspec 'CFStream' do |ss|
+      ss.dependency 'gRPC-Core/CFStream-Implementation', version
+      ss.dependency "#{s.name}/Main", version
+
+      ss.pod_target_xcconfig = {
+        'GCC_PREPROCESSOR_DEFINITIONS' => 'GRPC_CFSTREAM=1'
+      }
+    end
+
     s.subspec 'GID' do |ss|
       ss.ios.deployment_target = '7.0'
 
diff --git a/templates/src/csharp/build_packages_dotnetcli.bat.template b/templates/src/csharp/build_packages_dotnetcli.bat.template
index 1bf78c4d23..45010fec74 100755
--- a/templates/src/csharp/build_packages_dotnetcli.bat.template
+++ b/templates/src/csharp/build_packages_dotnetcli.bat.template
@@ -49,6 +49,7 @@
   %%DOTNET% pack --configuration Release Grpc.Reflection --output ..\..\..\artifacts || goto :error
   
   %%NUGET% pack Grpc.nuspec -Version %VERSION% -OutputDirectory ..\..\artifacts || goto :error
+  %%NUGET% pack Grpc.Core.NativeDebug.nuspec -Version %VERSION% -OutputDirectory ..\..\artifacts
   %%NUGET% pack Grpc.Tools.nuspec -Version %VERSION% -OutputDirectory ..\..\artifacts
   
   @rem copy resulting nuget packages to artifacts directory
diff --git a/templates/src/csharp/build_packages_dotnetcli.sh.template b/templates/src/csharp/build_packages_dotnetcli.sh.template
index ddfea74744..1172582ebd 100755
--- a/templates/src/csharp/build_packages_dotnetcli.sh.template
+++ b/templates/src/csharp/build_packages_dotnetcli.sh.template
@@ -48,6 +48,7 @@
   dotnet pack --configuration Release Grpc.Reflection --output ../../../artifacts
   
   nuget pack Grpc.nuspec -Version "${settings.csharp_version}" -OutputDirectory ../../artifacts
+  nuget pack Grpc.Core.NativeDebug.nuspec -Version "${settings.csharp_version}" -OutputDirectory ../../artifacts
   nuget pack Grpc.Tools.nuspec -Version "${settings.csharp_version}" -OutputDirectory ../../artifacts
   
   (cd ../../artifacts && zip csharp_nugets_dotnetcli.zip *.nupkg)
diff --git a/templates/test/cpp/naming/resolver_component_tests_defs.include b/templates/test/cpp/naming/resolver_component_tests_defs.include
index bc981dc83e..c3c3b68672 100644
--- a/templates/test/cpp/naming/resolver_component_tests_defs.include
+++ b/templates/test/cpp/naming/resolver_component_tests_defs.include
@@ -58,7 +58,7 @@ def wait_until_dns_server_is_up(args,
     test_runner_log('Health check: attempt to connect to DNS server over TCP.')
     tcp_connect_subprocess = subprocess.Popen([
         args.tcp_connect_bin_path,
-        '--server_host', '127.0.0.1',
+        '--server_host', '::1',
         '--server_port', str(args.dns_server_port),
         '--timeout', str(1)])
     tcp_connect_subprocess.communicate()
@@ -68,7 +68,7 @@ def wait_until_dns_server_is_up(args,
       dns_resolver_subprocess = subprocess.Popen([
           args.dns_resolver_bin_path,
           '--qname', 'health-check-local-dns-server-is-alive.resolver-tests.grpctestingexp',
-          '--server_host', '127.0.0.1',
+          '--server_host', '::1',
           '--server_port', str(args.dns_server_port)],
           stdout=subprocess.PIPE)
       dns_resolver_stdout, _ = dns_resolver_subprocess.communicate()
@@ -125,7 +125,7 @@ current_test_subprocess = subprocess.Popen([\
 
 \
   % endfor
-  '--local_dns_server_address', '127.0.0.1:%d' % args.dns_server_port])\
+  '--local_dns_server_address', '[::1]:%d' % args.dns_server_port])\
 
 current_test_subprocess.communicate()\