diff options
| author | Jose <jose@zeroc.com> | 2017-07-18 08:13:08 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2017-07-18 08:13:08 +0200 |
| commit | a893d11cdef19587c58bdf40fbd1a892c2013b8a (patch) | |
| tree | f1a2c842a631ab766fb24fa4cc924f9256a28e6a | |
| parent | build system fixes for java/android (diff) | |
| download | ice-a893d11cdef19587c58bdf40fbd1a892c2013b8a.tar.bz2 ice-a893d11cdef19587c58bdf40fbd1a892c2013b8a.tar.xz ice-a893d11cdef19587c58bdf40fbd1a892c2013b8a.zip | |
ICE-8338 - Running uwp tests with NuGets requires non-uwp NuGets
| -rw-r--r-- | scripts/Util.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/Util.py b/scripts/Util.py index e2137a8116b..63ccea3645a 100644 --- a/scripts/Util.py +++ b/scripts/Util.py @@ -303,7 +303,9 @@ class Windows(Platform): buildConfig = current.driver.configs[mapping].buildConfig config = "Debug" if buildConfig.find("Debug") >= 0 else "Release" - if current.driver.useIceBinDist(mapping): + if current.config.uwp: + return "" + elif current.driver.useIceBinDist(mapping): version = self.getNugetPackageVersion() packageSuffix = self.getPlatformToolset() if isinstance(mapping, CppMapping) else "net" package = os.path.join(mapping.path, "msbuild", "packages", "{0}".format( @@ -349,7 +351,6 @@ class Windows(Platform): return "PATH" def getIceInstallDir(self, mapping, current): - platform = current.config.buildPlatform config = "Debug" if current.config.buildConfig.find("Debug") >= 0 else "Release" version = self.getNugetPackageVersion() |