Merge pull request #2257 from DustinCampbell/fix-omnisharp-download

Set the correct installBinary to test for

Author: DustinCampbell

src/omnisharp/OmnisharpPackageCreator.ts

@@ -22,17 +22,11 @@ export function GetPackagesFromVersion(version: string, runTimeDependencies: Pac
 
 export function SetBinaryAndGetPackage(inputPackage: Package, serverUrl: string, version: string, installPath: string): Package {
     let installBinary: string;
-    if (inputPackage.platformId == "win-x86" || inputPackage.platformId == "win-x64") {
+    if (inputPackage.platformId === "win-x86" || inputPackage.platformId === "win-x64") {
         installBinary = "OmniSharp.exe";
     }
-    else if (inputPackage.platformId == "osx") {
-        installBinary = "mono.osx";
-    }
-    else if (inputPackage.platformId == "linux-x86") {
-        installBinary = "mono.linux-x86";
-    }
-    else if (inputPackage.platformId == "linux-x64") {
-        installBinary = "mono.linux-x86_64";
+    else {
+        installBinary = "run";
     }
 
     return GetPackage(inputPackage, serverUrl, version, installPath, installBinary);

test/featureTests/OmnisharpPackageCreator.test.ts

@@ -77,22 +77,22 @@ suite("GetOmnisharpPackage : Output package depends on the input package and oth
         resultPackage.installTestPath.should.equal("./experimentPath/1.2.3/OmniSharp.exe");
     });
 
-    test('Install test path is calculated using specified path, version and ends with mono.osx - OSX', () => {
+    test('Install test path is calculated using specified path, version and ends with run - OSX', () => {
         let testPackage = inputPackages.find(element => (element.platformId && element.platformId == "osx"));
         let resultPackage = SetBinaryAndGetPackage(testPackage, serverUrl, "1.2.3", "experimentPath");
-        resultPackage.installTestPath.should.equal("./experimentPath/1.2.3/mono.osx");
+        resultPackage.installTestPath.should.equal("./experimentPath/1.2.3/run");
     });
 
-    test('Install test path is calculated using specified path, version and ends with mono.linux-x86 - Linux(x86)', () => {
+    test('Install test path is calculated using specified path, version and ends with run - Linux(x86)', () => {
         let testPackage = inputPackages.find(element => (element.platformId && element.platformId == "linux-x86"));
         let resultPackage = SetBinaryAndGetPackage(testPackage, serverUrl, "1.2.3", "experimentPath");
-        resultPackage.installTestPath.should.equal("./experimentPath/1.2.3/mono.linux-x86");
+        resultPackage.installTestPath.should.equal("./experimentPath/1.2.3/run");
     });
 
-    test('Install test path is calculated using specified path, version and ends with mono.linux-x86_64 - Linux(x64)', () => {
+    test('Install test path is calculated using specified path, version and ends with run - Linux(x64)', () => {
         let testPackage = inputPackages.find(element => (element.platformId && element.platformId == "linux-x64"));
         let resultPackage = SetBinaryAndGetPackage(testPackage, serverUrl, "1.2.3", "experimentPath");
-        resultPackage.installTestPath.should.equal("./experimentPath/1.2.3/mono.linux-x86_64");
+        resultPackage.installTestPath.should.equal("./experimentPath/1.2.3/run");
     });
 });
 
@@ -155,7 +155,7 @@ suite('GetPackagesFromVersion : Gets the experimental omnisharp packages from a
         let outPackages = GetPackagesFromVersion("1.1.1", inputPackages, serverUrl, "experimentPath");
         outPackages.length.should.equal(2);
         outPackages[0].installTestPath.should.equal("./experimentPath/1.1.1/OmniSharp.exe");
-        outPackages[1].installTestPath.should.equal("./experimentPath/1.1.1/mono.osx");
+        outPackages[1].installTestPath.should.equal("./experimentPath/1.1.1/run");
     });
 
     test('Returns only omnisharp packages with experimentalIds', () => {