diff options
| author | Jose <jose@zeroc.com> | 2019-01-08 14:08:12 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2019-01-08 14:15:31 +0100 |
| commit | 48272fd62e718faae3b5659970729ed62cca4286 (patch) | |
| tree | 1ad4f9af5ea2ce703ed4fe2f9f402b8cae92e6fc /scripts/Util.py | |
| parent | Fixed Xamarin UWP/Android controller identities to prevent failures when mult... (diff) | |
| download | ice-48272fd62e718faae3b5659970729ed62cca4286.tar.bz2 ice-48272fd62e718faae3b5659970729ed62cca4286.tar.xz ice-48272fd62e718faae3b5659970729ed62cca4286.zip | |
Upgrade .NET Core applications target framework to netcoreapp2.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 50d868ea7bb..0629141a9d3 100644 --- a/scripts/Util.py +++ b/scripts/Util.py @@ -247,9 +247,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.0") + return os.path.join(installDir, "tools", "netcoreapp2.2") else: - return os.path.join(installDir, "bin", "netcoreapp2.0") + return os.path.join(installDir, "bin", "netcoreapp2.2") return os.path.join(installDir, "bin") def _getLibDir(self, component, process, mapping, current): @@ -3269,8 +3269,8 @@ class CSharpMapping(Mapping): if self.dotnetcore: self.libTargetFramework = "netstandard2.0" - self.binTargetFramework = "netcoreapp2.0" if self.framework == "" else self.framework - self.testTargetFramework = "netcoreapp2.1" if self.framework == "" else self.framework + self.binTargetFramework = "netcoreapp2.2" if self.framework == "" else self.framework + self.testTargetFramework = "netcoreapp2.2" 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 |