Fixed the install directory for the windows hosted machine (#7082)

* Fixed the install directory for the windows hosted machine * Fix for Unit Test
microsoft · Apr 26, 2018 · f06e9da · f06e9da
1 parent f6e7870
commit f06e9da
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/Tasks/UseRubyVersion/Tests/L0.ts b/Tasks/UseRubyVersion/Tests/L0.ts
@@ -158,6 +158,6 @@ describe('UseRubyVersion L0 Suite', function () {
         };
 
         await uut.useRubyVersion(parameters, uut.Platform.Windows);
-        assert.strictEqual(`${toolPath};`, mockPath);
+        assert.strictEqual(`${path.join(toolPath, 'bin')};`, mockPath);
     });
 });
diff --git a/Tasks/UseRubyVersion/task.json b/Tasks/UseRubyVersion/task.json
@@ -13,7 +13,7 @@
     "version": {
         "Major": 0,
         "Minor": 134,
-        "Patch": 0
+        "Patch": 1
     },
     "preview": true,
     "demands": [],

diff --git a/Tasks/UseRubyVersion/task.loc.json b/Tasks/UseRubyVersion/task.loc.json
@@ -13,7 +13,7 @@
   "version": {
     "Major": 0,
     "Minor": 134,
-    "Patch": 0
+    "Patch": 1
   },
   "preview": true,
   "demands": [],

diff --git a/Tasks/UseRubyVersion/userubyversion.ts b/Tasks/UseRubyVersion/userubyversion.ts
@@ -39,10 +39,8 @@ export async function useRubyVersion(parameters: TaskParameters, platform: Platf
         ].join(os.EOL));
     }
 
-    let toolPath: string = installDir;
+    const toolPath: string = path.join(installDir, 'bin');
     if (platform !== Platform.Windows) {
-        toolPath = path.join(installDir, 'bin');
-
         // replace the default
         const dest: string = '/usr/bin/ruby';
         if (fs.existsSync(dest)) {