diff options
| author | Jose <jose@zeroc.com> | 2019-02-01 17:23:20 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2019-02-01 17:23:20 +0100 |
| commit | e0e65dbbce41a5ea7dc2e21da8c6dc94dce41073 (patch) | |
| tree | 90c71dc4512df38340f7eaa9a83865f5ef8dcf50 /scripts/Util.py | |
| parent | Minor fixes to the build and test system (diff) | |
| download | ice-e0e65dbbce41a5ea7dc2e21da8c6dc94dce41073.tar.bz2 ice-e0e65dbbce41a5ea7dc2e21da8c6dc94dce41073.tar.xz ice-e0e65dbbce41a5ea7dc2e21da8c6dc94dce41073.zip | |
Downgrade default .NET Core framework to 2.1v3.7.2
Diffstat (limited to 'scripts/Util.py')
| -rw-r--r-- | scripts/Util.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/Util.py b/scripts/Util.py index 083dad4d9b6..4e821a69bfb 100644 --- a/scripts/Util.py +++ b/scripts/Util.py @@ -248,9 +248,9 @@ class Platform(object): installDir = component.getInstallDir(mapping, current) if isinstance(mapping, CSharpMapping): if component.useBinDist(mapping, current): - return os.path.join(installDir, "tools", "netcoreapp2.2") + return os.path.join(installDir, "tools", "netcoreapp2.1") else: - return os.path.join(installDir, "bin", "netcoreapp2.2") + return os.path.join(installDir, "bin", "netcoreapp2.1") return os.path.join(installDir, "bin") def _getLibDir(self, component, process, mapping, current): @@ -3277,8 +3277,8 @@ class CSharpMapping(Mapping): if self.dotnetcore: self.libTargetFramework = "netstandard2.0" - self.binTargetFramework = "netcoreapp2.2" if self.framework == "" else self.framework - self.testTargetFramework = "netcoreapp2.2" if self.framework == "" else self.framework + self.binTargetFramework = "netcoreapp2.1" if self.framework == "" else self.framework + self.testTargetFramework = "netcoreapp2.1" 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 |