diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-07-31 07:44:49 -0700 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-07-31 07:44:49 -0700 |
| commit | c80670fbc426bf2a3808d7f16466841d046bfea2 (patch) | |
| tree | 6be5cecfb59cc89ea75d8266f4e7fb1ba3adf39c /src | |
| parent | 70e9b3d2a2940fc3db2124314938974c66ca14bc (diff) | |
| parent | 909917955c99f6b32f34b4966c252daca0fe7061 (diff) | |
Merge github.com:grpc/grpc into plucking-hell
Conflicts:
templates/vsprojects/grpc.sln.template
templates/vsprojects/grpc_csharp_ext/grpc_csharp_ext.vcxproj.template
templates/vsprojects/sln_defs.include
templates/vsprojects/vcxproj_defs.include
vsprojects/grpc.sln
vsprojects/grpc_csharp_ext/grpc_csharp_ext.vcxproj
Diffstat (limited to 'src')
| -rw-r--r-- | src/csharp/buildall.bat | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/csharp/buildall.bat b/src/csharp/buildall.bat index e73feb87b9..d85896c255 100644 --- a/src/csharp/buildall.bat +++ b/src/csharp/buildall.bat @@ -9,7 +9,7 @@ cd /d %~dp0 @call "%VS120COMNTOOLS%\..\..\vc\vcvarsall.bat" x86 @rem Build the C# native extension -msbuild ..\..\vsprojects\grpc.sln /t:grpc_csharp_ext /p:PlatformToolset=v120 || goto :error +msbuild ..\..\vsprojects\grpc_csharp_ext.sln /p:PlatformToolset=v120 || goto :error msbuild Grpc.sln /p:Configuration=Debug || goto :error msbuild Grpc.sln /p:Configuration=Release || goto :error |