update path to C# test build by dotnet cli

pull/8039/head
Jan Tattermusch 9 years ago
parent 08ac1d4b5a
commit 1f7ce19d63
  1. 2
      tools/run_tests/build_csharp_coreclr.bat
  2. 12
      tools/run_tests/run_tests.py

@ -33,7 +33,7 @@ cd /d %~dp0\..\..\src\csharp
dotnet restore . || goto :error
dotnet build -f netstandard1.5 --configuration %MSBUILD_CONFIG% "**/project.json" || goto :error
dotnet build --configuration %MSBUILD_CONFIG% "**/project.json" || goto :error
endlocal

@ -654,15 +654,9 @@ class CSharpLanguage(object):
assembly_extension = '.exe'
if self.args.compiler == 'coreclr':
if self.platform == 'linux':
assembly_subdir += '/netstandard1.5/debian.8-x64'
assembly_extension = ''
elif self.platform == 'mac':
assembly_subdir += '/netstandard1.5/osx.10.11-x64'
assembly_extension = ''
else:
assembly_subdir += '/netstandard1.5/win7-x64'
runtime_cmd = []
assembly_subdir += '/netcoreapp1.0'
runtime_cmd = ['dotnet', 'exec']
assembly_extension = '.dll'
else:
nunit_args += ['--noresult', '--workers=1']
if self.platform == 'windows':

Loading…
Cancel
Save