diff options
| author | Jose <jose@zeroc.com> | 2019-09-27 15:13:53 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2019-09-27 15:13:53 +0200 |
| commit | 76881c182d1f51ff67a0d141c73884a5f677183e (patch) | |
| tree | ab8389ccff8c3e00a0302e41b1131532e199f995 /scripts/Util.py | |
| parent | Set default configuration for Windows builds to Release (diff) | |
| download | ice-76881c182d1f51ff67a0d141c73884a5f677183e.tar.bz2 ice-76881c182d1f51ff67a0d141c73884a5f677183e.tar.xz ice-76881c182d1f51ff67a0d141c73884a5f677183e.zip | |
Fix for running tests with default .NET Core framework
Diffstat (limited to 'scripts/Util.py')
| -rw-r--r-- | scripts/Util.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/scripts/Util.py b/scripts/Util.py index 3f400541ee0..862860e2e50 100644 --- a/scripts/Util.py +++ b/scripts/Util.py @@ -216,7 +216,7 @@ class Platform(object): version = run("dotnet --version").split(".") self.nugetPackageCache = re.search("info : global-packages: (.*)", run("dotnet nuget locals --list global-packages")).groups(1)[0] - self.defaultNetCoreFramework = "netcoreapp{}".format("3.0" if version[0] >= 3 else "2.1") + self.defaultNetCoreFramework = "netcoreapp{}".format("3.0" if int(version[0]) >= 3 else "2.1") except: self.nugetPackageCache = None @@ -3479,8 +3479,9 @@ class CSharpMapping(Mapping): else: path = os.path.join(current.testcase.getPath(current), current.getBuildDir(exe)) - useDotnetExe = current.config.dotnetcore and (current.config.framework in ["netcoreapp2.1", "netcoreapp2.2"] or - process.isFromBinDir()) + useDotnetExe = (current.config.dotnetcore and + (current.config.testTargetFramework in ["netcoreapp2.1", "netcoreapp2.2"] or + process.isFromBinDir())) command = "" if useDotnetExe: command += "dotnet " |