Ensure OmniSharp binaries are executable on Unix

package.json

@@ -74,6 +74,9 @@
       "installPath": ".omnisharp-coreclr",
       "runtimeIds": [
         "win7-x86"
+      ],
+      "binaries": [
+        "./.omnisharp-coreclr/OmniSharp"
       ]
     },
     {
@@ -82,6 +85,9 @@
       "installPath": ".omnisharp-coreclr",
       "runtimeIds": [
         "win7-x64"
+      ],
+      "binaries": [
+        "./.omnisharp-coreclr/OmniSharp"
       ]
     },
     {
@@ -90,6 +96,9 @@
       "installPath": ".omnisharp-coreclr",
       "runtimeIds": [
         "osx.10.11-x64"
+      ],
+      "binaries": [
+        "./.omnisharp-coreclr/OmniSharp"
       ]
     },
     {
@@ -98,6 +107,9 @@
       "installPath": ".omnisharp-coreclr",
       "runtimeIds": [
         "centos.7-x64"
+      ],
+      "binaries": [
+        "./.omnisharp-coreclr/OmniSharp"
       ]
     },
     {
@@ -106,6 +118,9 @@
       "installPath": ".omnisharp-coreclr",
       "runtimeIds": [
         "debian.8-x64"
+      ],
+      "binaries": [
+        "./.omnisharp-coreclr/OmniSharp"
       ]
     },
     {
@@ -114,6 +129,9 @@
       "installPath": ".omnisharp-coreclr",
       "runtimeIds": [
         "fedora.23-x64"
+      ],
+      "binaries": [
+        "./.omnisharp-coreclr/OmniSharp"
       ]
     },
     {
@@ -122,6 +140,9 @@
       "installPath": ".omnisharp-coreclr",
       "runtimeIds": [
         "opensuse.13.2-x64"
+      ],
+      "binaries": [
+        "./.omnisharp-coreclr/OmniSharp"
       ]
     },
     {
@@ -130,6 +151,9 @@
       "installPath": ".omnisharp-coreclr",
       "runtimeIds": [
         "rhel.7-x64"
+      ],
+      "binaries": [
+        "./.omnisharp-coreclr/OmniSharp"
       ]
     },
     {
@@ -138,6 +162,9 @@
       "installPath": ".omnisharp-coreclr",
       "runtimeIds": [
         "ubuntu.14.04-x64"
+      ],
+      "binaries": [
+        "./.omnisharp-coreclr/OmniSharp"
       ]
     },
     {
@@ -146,6 +173,9 @@
       "installPath": ".omnisharp-coreclr",
       "runtimeIds": [
         "ubuntu.16.04-x64"
+      ],
+      "binaries": [
+        "./.omnisharp-coreclr/OmniSharp"
       ]
     },
     {

src/main.ts

@@ -88,10 +88,6 @@ function installRuntimeDependencies(extension: vscode.Extension<any>): Promise<v
             installationStage = 'installPackages';
             return packageManager.InstallPackages(logger, status);
         })
-        .then(() => {
-            installationStage = 'makeBinariesExecutable';
-            return allowExecution(path.resolve(util.getBinPath(), 'run'), platformInfo, logger);
-        })
         .then(() => {
             installationStage = 'touchLockFile';
             return util.touchLockFile();

src/omnisharp/launcher.ts

@@ -180,10 +180,16 @@ function getLaunchPath(platformInfo: PlatformInformation, kind: LaunchTargetKind
             return path.join(util.getExtensionPath(), '.omnisharp-desktop', 'OmniSharp.exe');
         }
 
-        return path.join(util.getExtensionPath(), '.omnisharp-mono', "OmniSharp.exe");
+        return path.join(util.getExtensionPath(), '.omnisharp-mono', 'OmniSharp.exe');
     }
 
-    return path.join(util.getExtensionPath(), '.omnisharp-coreclr', "OmniSharp.exe");
+    let basePath = path.join(util.getExtensionPath(), '.omnisharp-coreclr');
+    if (platformInfo.operatingSystem === OperatingSystem.Windows) {
+        return path.join(basePath, 'OmniSharp.exe');
+    }
+    else {
+        return path.join(basePath, 'OmniSharp');
+    }
 }
 
 function launchWindows(launchPath: string, cwd: string, args: string[]): LaunchResult {