diff options
| author | Jose <jose@zeroc.com> | 2019-09-26 17:27:59 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2019-09-26 17:27:59 +0200 |
| commit | 6602c001317a2dff9be9c523b308ce42b4cbc696 (patch) | |
| tree | 06f47d7f89546c941c1a102cb054437792bf1560 /scripts/Util.py | |
| parent | MSBuildToolsVersion instead of VisualStudioVersion (diff) | |
| download | ice-6602c001317a2dff9be9c523b308ce42b4cbc696.tar.bz2 ice-6602c001317a2dff9be9c523b308ce42b4cbc696.tar.xz ice-6602c001317a2dff9be9c523b308ce42b4cbc696.zip | |
Dynamically set the default .NET Core framework for testing
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 f097febc45b..389d00316d6 100644 --- a/scripts/Util.py +++ b/scripts/Util.py @@ -213,9 +213,10 @@ class Platform(object): def __init__(self): try: - run("dotnet --version") + 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(version[0], version[1]) except: self.nugetPackageCache = None @@ -3362,8 +3363,8 @@ class CSharpMapping(Mapping): if self.dotnetcore: self.libTargetFramework = "netstandard2.0" - self.binTargetFramework = "netcoreapp3.0" if self.framework == "" else self.framework - self.testTargetFramework = "netcoreapp3.0" if self.framework == "" else self.framework + self.binTargetFramework = platform.defaultNetCoreFramework if self.framework == "" else self.framework + self.testTargetFramework = platform.defaultNetCoreFramework if self.framework == "" else self.framework else: self.libTargetFramework = "net45" if self.framework == "" else "netstandard2.0" self.binTargetFramework = "net45" if self.framework == "" else self.framework |