Skip to content
Snippets Groups Projects
Commit 78cb931a authored by Jan Tattermusch's avatar Jan Tattermusch
Browse files

address review comments

parent 3f5b8aad
No related branches found
No related tags found
No related merge requests found
...@@ -32,12 +32,10 @@ set -ex ...@@ -32,12 +32,10 @@ set -ex
cd $(dirname $0)/../../../src/csharp cd $(dirname $0)/../../../src/csharp
OVERRIDE_NATIVELIB_MAYBE=""
if [ "$CONFIG" == "gcov" ] if [ "$CONFIG" == "gcov" ]
then then
# overriding NativeDependenciesConfigurationUnix makes C# project pick up # overriding NativeDependenciesConfigurationUnix makes C# project pick up the gcov flavor of grpc_csharp_ext
# the gcov flavor of grpc_csharp_ext dotnet build --configuration $MSBUILD_CONFIG /p:NativeDependenciesConfigurationUnix=gcov Grpc.sln
OVERRIDE_NATIVELIB_MAYBE="/p:NativeDependenciesConfigurationUnix=$CONFIG" else
dotnet build --configuration $MSBUILD_CONFIG Grpc.sln
fi fi
dotnet build --configuration $MSBUILD_CONFIG $OVERRIDE_NATIVELIB_MAYBE Grpc.sln
...@@ -44,9 +44,8 @@ mkdir %ARCHITECTURE% ...@@ -44,9 +44,8 @@ mkdir %ARCHITECTURE%
cd %ARCHITECTURE% cd %ARCHITECTURE%
@rem TODO(jtattermusch): Stop hardcoding path to yasm once Jenkins workers can locate yasm correctly @rem TODO(jtattermusch): Stop hardcoding path to yasm once Jenkins workers can locate yasm correctly
cmake -G "Visual Studio 14 2015" -A %ARCHITECTURE% -DgRPC_BUILD_TESTS=OFF -DgRPC_MSVC_STATIC_RUNTIME=ON -DCMAKE_ASM_NASM_COMPILER="C:/Program Files (x86)/yasm/yasm.exe" ../../.. || goto :error cmake -G "Visual Studio 14 2015" -A %ARCHITECTURE% -DgRPC_BUILD_TESTS=OFF -DgRPC_MSVC_STATIC_RUNTIME=ON -DCMAKE_ASM_NASM_COMPILER="C:/Program Files (x86)/yasm/yasm.exe" ../../.. || goto :error
cd ..\..\..
cd src/csharp cd ..\..\..\src\csharp
dotnet restore Grpc.sln || goto :error dotnet restore Grpc.sln || goto :error
......
...@@ -763,7 +763,7 @@ class CSharpLanguage(object): ...@@ -763,7 +763,7 @@ class CSharpLanguage(object):
tests_by_assembly = json.load(f) tests_by_assembly = json.load(f)
msbuild_config = _MSBUILD_CONFIG[self.config.build_config] msbuild_config = _MSBUILD_CONFIG[self.config.build_config]
nunit_args = ['--labels=All','--noresult', '--workers=1'] nunit_args = ['--labels=All', '--noresult', '--workers=1']
assembly_subdir = 'bin/%s' % msbuild_config assembly_subdir = 'bin/%s' % msbuild_config
assembly_extension = '.exe' assembly_extension = '.exe'
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment