diff options
| author | Jose <jose@zeroc.com> | 2020-12-10 16:01:36 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2020-12-10 16:01:36 +0100 |
| commit | 7646306cec492f4b261c301a332e77dbba6f898d (patch) | |
| tree | bba291adefbce28286830757ec42dec3bae088b4 | |
| parent | .NET test script fixes (diff) | |
| download | ice-7646306cec492f4b261c301a332e77dbba6f898d.tar.bz2 ice-7646306cec492f4b261c301a332e77dbba6f898d.tar.xz ice-7646306cec492f4b261c301a332e77dbba6f898d.zip | |
Additional fixes for .NET test scripts
| -rw-r--r-- | scripts/IceBoxUtil.py | 2 | ||||
| -rw-r--r-- | scripts/Util.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/IceBoxUtil.py b/scripts/IceBoxUtil.py index 083e5f25e42..de8961a7df9 100644 --- a/scripts/IceBoxUtil.py +++ b/scripts/IceBoxUtil.py @@ -30,7 +30,7 @@ class IceBox(ProcessFromBinDir, Server): for line in source.readlines(): if current.config.framework == "net5.0": target.write(line.replace("\\net45\\", "\\net5.0\\")) - else: + elif current.config.dotnetcore: target.write(line.replace("\\net45\\", "\\netstandard2.0\\{0}\\".format(libframework))) current.files.append(newConfigFile) diff --git a/scripts/Util.py b/scripts/Util.py index 0d867d88969..0d600562b35 100644 --- a/scripts/Util.py +++ b/scripts/Util.py @@ -519,7 +519,7 @@ class Windows(Platform): def getDotNetExe(self): try: - return run("where dotnet").strip() + return run("where dotnet").strip().splitlines()[0] except: return None |