summaryrefslogtreecommitdiff
path: root/scripts/Util.py
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/Util.py')
-rw-r--r--scripts/Util.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/scripts/Util.py b/scripts/Util.py
index d3103683b13..2e42bc4f03b 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 int(version[0]) >= 3 else "2.1")
+ self.defaultNetCoreFramework = "netcoreapp{}".format("3.1" if int(version[0]) >= 3 else "2.1")
except:
self.nugetPackageCache = None
@@ -3549,8 +3549,7 @@ class CSharpMapping(Mapping):
path = os.path.join(current.testcase.getPath(current), current.getBuildDir(exe))
useDotnetExe = (current.config.dotnetcore and
- (current.config.testTargetFramework in ["netcoreapp2.1", "netcoreapp2.2"] or
- process.isFromBinDir()))
+ (current.config.testTargetFramework in ["netcoreapp2.1"] or process.isFromBinDir() or isinstance(platform, Darwin)))
command = ""
if useDotnetExe:
command += "dotnet "