CSharp cleanup and fixes:

- Add EditorBrowsable(EditorBrowsableState.Never) to
  hidde internal public methods from Intellisense,
  see ICE-7448.
- Remove Base64 and replace it with .NET System.Convert
  see ICE-7477
- Remove SysLogger as that was only used by Mono
- Simplify ThreadPriority setting
- Remove using statements that are not required
- Normalize string, char, object spell, preferred over
  String, Char, Object
- Shorthen qualifier names avoiding redundant scopes.

1 files changed, 7 insertions, 4 deletions

diff --git a/scripts/Util.py b/scripts/Util.py
index 34c9a5e913c..f293f30506a 100644
--- a/scripts/Util.py
+++ b/scripts/Util.py
@@ -327,11 +327,14 @@ class Windows(Platform):
         cpp = isinstance(mapping, CppMapping)
         csharp = isinstance(mapping, CSharpMapping)
 
-        if iceHome and ((cpp and v140 and platform == "x64" and config == "Release") or (not csharp and not cpp)):
-            return iceHome
+        if current.driver.useIceBinDist(mapping):
+            if iceHome and ((cpp and v140 and platform == "x64" and config == "Release") or (not csharp and not cpp)):
+                return iceHome
+            else:
+                return os.path.join(toplevel, mapping.name, "msbuild", "packages",
+                                    "zeroc.ice.{0}.{1}".format(name, version))
         else:
-            return os.path.join(toplevel, mapping.name, "msbuild", "packages",
-                                "zeroc.ice.{0}.{1}".format(name, version))
+            return os.path.join(toplevel, mapping.name)
 
     def canRun(self, mapping, current):
         #