diff options
| author |  Jan Tattermusch <jtattermusch@google.com> | 2016-09-08 16:21:16 +0200 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@google.com> | 2016-09-08 16:21:39 +0200 |
| commit | 1f7ce19d63410a453d276ea4c2b829c4e9e4968b (patch) | |
| tree | b236b6dd840b16be639eee88af9f67f7e3865d5e | |
| parent | 08ac1d4b5a93c9ff14ee37de6c35b6b729ccffec (diff) | |
update path to C# test build by dotnet cli
| -rw-r--r-- | tools/run_tests/build_csharp_coreclr.bat | 2 | ||||
| -rwxr-xr-x | tools/run_tests/run_tests.py | 12 |
2 files changed, 4 insertions, 10 deletions
diff --git a/tools/run_tests/build_csharp_coreclr.bat b/tools/run_tests/build_csharp_coreclr.bat index cead6d0e02..b6e3ccbd2b 100644 --- a/tools/run_tests/build_csharp_coreclr.bat +++ b/tools/run_tests/build_csharp_coreclr.bat @@ -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 diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index 146018ba3a..c579f14f91 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -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': |