aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Stanley Cheung <stanley.cheung@gmail.com>2015-10-08 12:27:38 -0700
committerGravatar Stanley Cheung <stanley.cheung@gmail.com>2015-10-08 12:27:38 -0700
commitc96f27bc48b7c1bf2981b832653c4ece0a784c1f (patch)
treee4eea6821d42883e252695b9a576d5c9f1c2fe5f
parent0bb06f32fb88e5b54afe72a88ee300d3fd1bcefc (diff)
parenta6e68f163c938223754b0caba31c1bc63c53d9a4 (diff)
Merge pull request #3749 from jtattermusch/rename_csharp_ext_nuget
Rename grpc.native.csharp_ext nuget to grpc.native.csharp
-rw-r--r--src/csharp/Grpc.Core/Grpc.Core.nuspec2
-rw-r--r--src/csharp/build_packages.bat4
-rw-r--r--vsprojects/nuget_package/README.md2
-rw-r--r--vsprojects/nuget_package/grpc.native.csharp.nuspec (renamed from vsprojects/nuget_package/grpc.native.csharp_ext.nuspec)6
-rw-r--r--vsprojects/nuget_package/grpc.native.csharp.props (renamed from vsprojects/nuget_package/grpc.native.csharp_ext.props)0
-rw-r--r--vsprojects/nuget_package/grpc.native.csharp.targets (renamed from vsprojects/nuget_package/grpc.native.csharp_ext.targets)0
6 files changed, 7 insertions, 7 deletions
diff --git a/src/csharp/Grpc.Core/Grpc.Core.nuspec b/src/csharp/Grpc.Core/Grpc.Core.nuspec
index 06de55c8c3..67a04afc22 100644
--- a/src/csharp/Grpc.Core/Grpc.Core.nuspec
+++ b/src/csharp/Grpc.Core/Grpc.Core.nuspec
@@ -16,7 +16,7 @@
<tags>gRPC RPC Protocol HTTP/2</tags>
<dependencies>
<dependency id="Ix-Async" version="1.2.3" />
- <dependency id="grpc.native.csharp_ext" version="$GrpcNativeCsharpExtVersion$" />
+ <dependency id="grpc.native.csharp" version="$GrpcNativeCsharpVersion$" />
</dependencies>
</metadata>
<files>
diff --git a/src/csharp/build_packages.bat b/src/csharp/build_packages.bat
index a3505b1e01..b864a955a8 100644
--- a/src/csharp/build_packages.bat
+++ b/src/csharp/build_packages.bat
@@ -20,9 +20,9 @@ endlocal
@call ..\..\vsprojects\build_plugins.bat || goto :error
-%NUGET% pack ..\..\vsprojects\nuget_package\grpc.native.csharp_ext.nuspec -Version %CORE_VERSION% || goto :error
+%NUGET% pack ..\..\vsprojects\nuget_package\grpc.native.csharp.nuspec -Version %CORE_VERSION% || goto :error
%NUGET% pack Grpc.Auth\Grpc.Auth.nuspec -Symbols -Version %VERSION% || goto :error
-%NUGET% pack Grpc.Core\Grpc.Core.nuspec -Symbols -Version %VERSION% -Properties GrpcNativeCsharpExtVersion=%CORE_VERSION% || goto :error
+%NUGET% pack Grpc.Core\Grpc.Core.nuspec -Symbols -Version %VERSION% -Properties GrpcNativeCsharpVersion=%CORE_VERSION% || goto :error
%NUGET% pack Grpc.HealthCheck\Grpc.HealthCheck.nuspec -Symbols -Version %VERSION_WITH_BETA% -Properties ProtobufVersion=%PROTOBUF_VERSION% || goto :error
%NUGET% pack Grpc.Tools.nuspec -Version %VERSION% || goto :error
%NUGET% pack Grpc.nuspec -Version %VERSION% || goto :error
diff --git a/vsprojects/nuget_package/README.md b/vsprojects/nuget_package/README.md
index 00bb400d66..9fcbb5f85d 100644
--- a/vsprojects/nuget_package/README.md
+++ b/vsprojects/nuget_package/README.md
@@ -16,7 +16,7 @@ Build all flavors of gRPC C# extension and package them as a NuGet package.
```
buildall.bat
-nuget pack grpc.native.csharp_ext.nuspec
+nuget pack grpc.native.csharp.nuspec
```
When building the NuGet package, ignore the "Assembly outside lib folder" warnings (they DLLs are not assemblies, they are native libraries).
diff --git a/vsprojects/nuget_package/grpc.native.csharp_ext.nuspec b/vsprojects/nuget_package/grpc.native.csharp.nuspec
index 39791a5d8e..50b56e9e6e 100644
--- a/vsprojects/nuget_package/grpc.native.csharp_ext.nuspec
+++ b/vsprojects/nuget_package/grpc.native.csharp.nuspec
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<package>
<metadata>
- <id>grpc.native.csharp_ext</id>
+ <id>grpc.native.csharp</id>
<version>$version$</version>
<authors>Google Inc.</authors>
<owners>grpc-packages</owners>
@@ -20,8 +20,8 @@
</dependencies>
</metadata>
<files>
- <file src="grpc.native.csharp_ext.props" target="\build\portable-net45\grpc.native.csharp_ext.props" />
- <file src="grpc.native.csharp_ext.targets" target="\build\portable-net45\grpc.native.csharp_ext.targets" />
+ <file src="grpc.native.csharp.props" target="\build\portable-net45\grpc.native.csharp.props" />
+ <file src="grpc.native.csharp.targets" target="\build\portable-net45\grpc.native.csharp.targets" />
<file src="output\v100\Win32\Release\grpc_csharp_ext.dll" target="/build/native/bin/v100\Win32\Release\grpc_csharp_ext.dll" />
<file src="output\v120\Win32\Release\grpc_csharp_ext.dll" target="/build/native/bin/v120\Win32\Release\grpc_csharp_ext.dll" />
<file src="output\v100\Win32\Debug\grpc_csharp_ext.dll" target="/build/native/bin/v100\Win32\Debug\grpc_csharp_ext.dll" />
diff --git a/vsprojects/nuget_package/grpc.native.csharp_ext.props b/vsprojects/nuget_package/grpc.native.csharp.props
index 63d23be3da..63d23be3da 100644
--- a/vsprojects/nuget_package/grpc.native.csharp_ext.props
+++ b/vsprojects/nuget_package/grpc.native.csharp.props
diff --git a/vsprojects/nuget_package/grpc.native.csharp_ext.targets b/vsprojects/nuget_package/grpc.native.csharp.targets
index 1b69362d43..1b69362d43 100644
--- a/vsprojects/nuget_package/grpc.native.csharp_ext.targets
+++ b/vsprojects/nuget_package/grpc.native.csharp.targets