diff --git a/src/csharp/Grpc.Core/Grpc.Core.csproj b/src/csharp/Grpc.Core/Grpc.Core.csproj index 5b3da7c6c99..852b2121143 100644 --- a/src/csharp/Grpc.Core/Grpc.Core.csproj +++ b/src/csharp/Grpc.Core/Grpc.Core.csproj @@ -8,7 +8,7 @@ Grpc.Core Grpc.Core v4.5 - be3e9d03 + c0512805 bin\$(Configuration)\Grpc.Core.Xml @@ -19,6 +19,7 @@ DEBUG; prompt 4 + Debug pdbonly @@ -26,6 +27,7 @@ bin\Release prompt 4 + Release pdbonly @@ -36,6 +38,7 @@ 4 True C:\keys\Grpc.snk + Release @@ -133,7 +136,7 @@ ignored, which gives us the desired effect. --> - + PreserveNewest @@ -142,15 +145,6 @@ - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - + \ No newline at end of file diff --git a/src/csharp/Grpc.Core/packages.config b/src/csharp/Grpc.Core/packages.config index 89600744a76..86a48c512e6 100644 --- a/src/csharp/Grpc.Core/packages.config +++ b/src/csharp/Grpc.Core/packages.config @@ -1,6 +1,4 @@  - - \ No newline at end of file diff --git a/src/csharp/buildall.bat b/src/csharp/buildall.bat index d85896c255b..08d4bdb3355 100644 --- a/src/csharp/buildall.bat +++ b/src/csharp/buildall.bat @@ -9,7 +9,8 @@ cd /d %~dp0 @call "%VS120COMNTOOLS%\..\..\vc\vcvarsall.bat" x86 @rem Build the C# native extension -msbuild ..\..\vsprojects\grpc_csharp_ext.sln /p:PlatformToolset=v120 || goto :error +msbuild ..\..\vsprojects\grpc_csharp_ext.sln /p:Configuration=Debug /p:PlatformToolset=v120 || goto :error +msbuild ..\..\vsprojects\grpc_csharp_ext.sln /p:Configuration=Release /p:PlatformToolset=v120 || goto :error msbuild Grpc.sln /p:Configuration=Debug || goto :error msbuild Grpc.sln /p:Configuration=Release || goto :error diff --git a/vsprojects/nuget_package/buildall.bat b/vsprojects/nuget_package/buildall.bat index 65aac3aa685..e6cd0ac421d 100644 --- a/vsprojects/nuget_package/buildall.bat +++ b/vsprojects/nuget_package/buildall.bat @@ -1,10 +1,10 @@ @echo off -REM setlocal -REM call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64 -REM call :build x64 Release v140 || goto :eof -REM call :build x64 Debug v140 || goto :eof -REM endlocal +setlocal +call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64 +call :build x64 Release v140 || goto :eof +call :build x64 Debug v140 || goto :eof +endlocal setlocal call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86 @@ -12,11 +12,11 @@ call :build Win32 Release v140 || goto :eof call :build Win32 Debug v140 || goto :eof endlocal -REM setlocal -REM call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" amd64 -REM call :build x64 Release v120 || goto :eof -REM call :build x64 Debug v120 || goto :eof -REM endlocal +setlocal +call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" amd64 +call :build x64 Release v120 || goto :eof +call :build x64 Debug v120 || goto :eof +endlocal setlocal call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x86 @@ -24,34 +24,8 @@ call :build Win32 Release v120 || goto :eof call :build Win32 Debug v120 || goto :eof endlocal -REM setlocal -REM call "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\vcvarsall.bat" amd64 -REM call :build x64 Release v110 || goto :eof -REM call :build x64 Debug v110 || goto :eof -REM endlocal - -REM setlocal -REM call "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\vcvarsall.bat" x86 -REM call :build Win32 Release v110 || goto :eof -REM call :build Win32 Debug v110 || goto :eof -REM endlocal - -REM setlocal -REM call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" amd64 -REM call :build x64 Release v100 || goto :eof -REM call :build x64 Debug v100 || goto :eof -REM endlocal - -setlocal -call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" x86 -call :build Win32 Release v100 || goto :eof -call :build Win32 Debug v100 || goto :eof -endlocal - goto :eof :build msbuild /P:Platform=%1 /P:Configuration=%2 /P:PlatformToolset=%3 /P:OutDir=..\..\nuget_package\output\%3\%1\%2\ /P:IntDir=..\..\nuget_package\tmp\%3\%1\%2\ ..\grpc_csharp_ext.sln || goto :eof goto :eof - - diff --git a/vsprojects/nuget_package/grpc.native.csharp.nuspec b/vsprojects/nuget_package/grpc.native.csharp.nuspec index 0f65d1e1a1b..72b9a79d896 100644 --- a/vsprojects/nuget_package/grpc.native.csharp.nuspec +++ b/vsprojects/nuget_package/grpc.native.csharp.nuspec @@ -14,22 +14,19 @@ gRPC C# Native Extension Native library required by gRPC C# gRPC native - - - - - - - - + + + + +