diff options
| author | Jose <jose@zeroc.com> | 2019-09-25 01:02:43 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2019-09-25 01:02:43 +0200 |
| commit | f7a9f03cd31fe70d4edf07a2c57b6e80ef9e3563 (patch) | |
| tree | 21be43d2f4a6296b844d77ce775742d2c57aa9ac | |
| parent | Fix Swift Xcode deployment target settings (diff) | |
| download | ice-f7a9f03cd31fe70d4edf07a2c57b6e80ef9e3563.tar.bz2 ice-f7a9f03cd31fe70d4edf07a2c57b6e80ef9e3563.tar.xz ice-f7a9f03cd31fe70d4edf07a2c57b6e80ef9e3563.zip | |
.NET Core 3.0 testing
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | scripts/Util.py | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index 07282ef77c1..c35ad5a8539 100644 --- a/.gitignore +++ b/.gitignore @@ -102,6 +102,7 @@ SliceCompile.command.*.log *.nupkg **/netstandard2.0/netstandard2.0/* +**/netstandard2.0/netcoreapp3.0/* AppPackages BundleArtifacts diff --git a/scripts/Util.py b/scripts/Util.py index c06cdffb105..f80ad988fe0 100644 --- a/scripts/Util.py +++ b/scripts/Util.py @@ -278,9 +278,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.1") + return os.path.join(installDir, "tools", mapping.getBinTargetFramework(current)) else: - return os.path.join(installDir, "bin", "netcoreapp2.1") + return os.path.join(installDir, "bin", mapping.getBinTargetFramework(current)) return os.path.join(installDir, "bin") def _getLibDir(self, component, process, mapping, current): |