Merge pull request #5555 from Microsoft/users/kavipriya/rtw2018fix

kaadhina · web-flow · commit 28c052ad0048 · 2017-10-05T13:42:43.000+05:30
Users/kavipriya/rtw2018fix
diff --git a/Tasks/VsTest/helpers.ts b/Tasks/VsTest/helpers.ts
@@ -162,5 +162,11 @@ export class Helper {
 
         return argument;
     }
-
+	
+    public static setConsoleCodePage() {
+        tl.debug("Changing active code page to UTF-8");
+        const chcp = tl.tool(path.resolve(process.env.windir, "system32", "chcp.com"));
+        chcp.arg(["65001"]);
+        chcp.execSync({ silent: true } as tr.IExecSyncOptions);
+    }
 }
diff --git a/Tasks/VsTest/runvstest.ts b/Tasks/VsTest/runvstest.ts
@@ -14,6 +14,7 @@ ci.publishEvent(taskProps);
 try {
     tl.setResourcePath(path.join(__dirname, 'task.json'));
 
+    utils.Helper.setConsoleCodePage();
     const useDtaExecutionEngine = isDtaEngineRequired();
     if (useDtaExecutionEngine) {
         ci.publishEvent({ runmode: 'distributedtest', parallelism: tl.getVariable('System.ParallelExecutionType'),
diff --git a/Tasks/VsTest/task.json b/Tasks/VsTest/task.json
@@ -17,7 +17,7 @@
     "version": {
         "Major": 2,
         "Minor": 1,
-        "Patch": 8
+        "Patch": 9
     },
     "demands": [
         "vstest"
diff --git a/Tasks/VsTest/task.loc.json b/Tasks/VsTest/task.loc.json
@@ -17,7 +17,7 @@
   "version": {
     "Major": 2,
     "Minor": 1,
-    "Patch": 8
+    "Patch": 9
   },
   "demands": [
     "vstest"
diff --git a/Tests-Legacy/L0/VsTest/vs2015.json b/Tests-Legacy/L0/VsTest/vs2015.json
@@ -31,6 +31,9 @@
         "wmic datafile where name='\\\\vs\\\\IDE\\\\CommonExtensions\\\\Microsoft\\\\TestWindow\\\\vstest.console.exe' get Version /Value": {
 			"code": 0,
 			"stdout" : "version=14.0.0.0"
+        },
+        "C:\\WINDOWS\\system32\\chcp.com 65001": {
+            "code": 0
         }
     },
     "rmRF": {
diff --git a/Tests-Legacy/L0/VsTest/vs2017.json b/Tests-Legacy/L0/VsTest/vs2017.json
@@ -31,6 +31,9 @@
         "wmic datafile where name='\\\\vs2017\\\\installation\\\\folder\\\\Common7\\\\IDE\\\\CommonExtensions\\\\Microsoft\\\\TestWindow\\\\vstest.console.exe' get Version /Value": {
 			"code": 0,
 			"stdout" : "version=15.0.0.0"
+        },
+        "C:\\WINDOWS\\system32\\chcp.com 65001": {
+            "code": 0
         }
     },
     "rmRF": {
diff --git a/Tests-Legacy/L0/VsTest/vstestFails.json b/Tests-Legacy/L0/VsTest/vstestFails.json
@@ -26,6 +26,9 @@
         "wmic datafile where name='\\\\vs\\\\IDE\\\\CommonExtensions\\\\Microsoft\\\\TestWindow\\\\vstest.console.exe' get Version /Value": {
 			"code": 0,
 			"stdout" : "version=14.0.0.0"
+        },
+        "C:\\WINDOWS\\system32\\chcp.com 65001": {
+            "code": 0
         }
     },
     "rmRF": {
diff --git a/Tests-Legacy/L0/VsTest/vstestGood.json b/Tests-Legacy/L0/VsTest/vstestGood.json
@@ -109,6 +109,9 @@
         "wmic datafile where name='\\\\vs2017\\\\installation\\\\folder\\\\Common7\\\\IDE\\\\CommonExtensions\\\\Microsoft\\\\TestWindow\\\\vstest.console.exe' get Version /Value": {
 			"code": 0,
 			"stdout" : "version=15.0.0.0"
+        },
+        "C:\\WINDOWS\\system32\\chcp.com 65001": {
+            "code": 0
         }
     },
     
diff --git a/Tests-Legacy/L0/VsTest/vstestGoodRunInParallel.json b/Tests-Legacy/L0/VsTest/vstestGoodRunInParallel.json
@@ -39,6 +39,9 @@
         "wmic datafile where name='\\\\vs2017\\\\installation\\\\folder\\\\Common7\\\\IDE\\\\CommonExtensions\\\\Microsoft\\\\TestWindow\\\\vstest.console.exe' get Version /Value": {
             "code": 0,
             "stdout": "version=15.0.0.0"
+        },
+        "C:\\WINDOWS\\system32\\chcp.com 65001": {
+            "code": 0
         }
     },
     "rmRF": {
diff --git a/Tests-Legacy/L0/VsTest/vstestGoodSysDebugFalse.json b/Tests-Legacy/L0/VsTest/vstestGoodSysDebugFalse.json
@@ -38,6 +38,9 @@
         "wmic datafile where name='\\\\vs\\\\IDE\\\\CommonExtensions\\\\Microsoft\\\\TestWindow\\\\vstest.console.exe' get Version /Value": {
 			"code": 0,
 			"stdout" : "version=14.0.0.0"
+        },
+        "C:\\WINDOWS\\system32\\chcp.com 65001": {
+            "code": 0
         }
     },
     "rmRF": {
diff --git a/Tests-Legacy/L0/VsTest/vstestGoodWithTiaDisabled.json b/Tests-Legacy/L0/VsTest/vstestGoodWithTiaDisabled.json
@@ -29,6 +29,9 @@
         "wmic datafile where name='\\\\vs\\\\IDE\\\\CommonExtensions\\\\Microsoft\\\\TestWindow\\\\vstest.console.exe' get Version /Value": {
 			"code": 0,
 			"stdout" : "version=14.0.0.0"
+        },
+        "C:\\WINDOWS\\system32\\chcp.com 65001": {
+            "code": 0
         }
     },
     "rmRF": {
diff --git a/Tests-Legacy/L0/VsTest/vstestGoodWithTiaEnabled.json b/Tests-Legacy/L0/VsTest/vstestGoodWithTiaEnabled.json
@@ -13,6 +13,9 @@
         "\\vs\\IDE\\CommonExtensions\\Microsoft\\TestWindow\\vstest.console.exe path/to/file /logger:trx": {
             "code": 0,
             "stdout": "vstest"
+        },
+        "C:\\WINDOWS\\system32\\chcp.com 65001": {
+            "code": 0
         }
     },
     "rmRF": {
diff --git a/Tests-Legacy/L0/VsTest/vstestGoodwithNugetAdapter.json b/Tests-Legacy/L0/VsTest/vstestGoodwithNugetAdapter.json
@@ -90,6 +90,9 @@
         "wmic datafile where name='\\\\vs\\\\IDE\\\\CommonExtensions\\\\Microsoft\\\\TestWindow\\\\vstest.console.exe' get Version /Value": {
 			"code": 0,
 			"stdout" : "version=14.0.0.0"
+        },
+        "C:\\WINDOWS\\system32\\chcp.com 65001": {
+            "code": 0
         }
     },
     "rmRF": {
diff --git a/Tests-Legacy/L0/VsTest/vstestInvalidVstestPath.json b/Tests-Legacy/L0/VsTest/vstestInvalidVstestPath.json
@@ -5,5 +5,10 @@
     },
     "exist": {
         "C:/vstest.console.exe" : false
+    },
+    "exec": {
+        "C:\\WINDOWS\\system32\\chcp.com 65001": {
+            "code": 0
+        }
     }
 }
diff --git a/Tests-Legacy/L0/VsTest/vstestOtherConsoleOptions.json b/Tests-Legacy/L0/VsTest/vstestOtherConsoleOptions.json
@@ -34,6 +34,9 @@
         "wmic datafile where name='\\\\vs\\\\IDE\\\\CommonExtensions\\\\Microsoft\\\\TestWindow\\\\vstest.console.exe' get Version /Value": {
 			"code": 0,
 			"stdout" : "version=14.0.0.0"
+        },
+        "C:\\WINDOWS\\system32\\chcp.com 65001": {
+            "code": 0
         }
     },
     "rmRF": {
diff --git a/Tests-Legacy/L0/VsTest/vstestRM.json b/Tests-Legacy/L0/VsTest/vstestRM.json
@@ -25,6 +25,9 @@
         "wmic datafile where name='\\\\vs\\\\IDE\\\\CommonExtensions\\\\Microsoft\\\\TestWindow\\\\vstest.console.exe' get Version /Value": {
 			"code": 0,
 			"stdout" : "version=14.0.0.0"
+        },
+        "C:\\WINDOWS\\system32\\chcp.com 65001": {
+            "code": 0
         }
     },
     "rmRF": {
diff --git a/Tests-Legacy/L0/VsTest/vstestRunInParallel.json b/Tests-Legacy/L0/VsTest/vstestRunInParallel.json
@@ -24,6 +24,9 @@
         "[^~]*logger:trx$": {
             "code": 0,
             "stdout": "vstest"
+        },
+        "C:\\WINDOWS\\system32\\chcp.com 65001": {
+            "code": 0
         }
 	},
     "rmRF": {
diff --git a/Tests-Legacy/L0/VsTest/vstestSucceedsOnIgnoreFailure.json b/Tests-Legacy/L0/VsTest/vstestSucceedsOnIgnoreFailure.json
@@ -26,6 +26,9 @@
         "wmic datafile where name='\\\\vs\\\\IDE\\\\CommonExtensions\\\\Microsoft\\\\TestWindow\\\\vstest.console.exe' get Version /Value": {
 			"code": 0,
 			"stdout" : "version=14.0.0.0"
+        },
+        "C:\\WINDOWS\\system32\\chcp.com 65001": {
+            "code": 0
         }
     },
     "rmRF": {

Original file line number	Diff line number	Diff line change
`@@ -162,5 +162,11 @@ export class Helper {`
`162`	`162`
`163`	`163`	`return argument;`
`164`	`164`	`}`
`165`		`-`
	`165`	`+`
	`166`	`+ public static setConsoleCodePage() {`
	`167`	`+ tl.debug("Changing active code page to UTF-8");`
	`168`	`+ const chcp = tl.tool(path.resolve(process.env.windir, "system32", "chcp.com"));`
	`169`	`+ chcp.arg(["65001"]);`
	`170`	`+ chcp.execSync({ silent: true } as tr.IExecSyncOptions);`
	`171`	`+ }`
`166`	`172`	`}`
Original file line number	Diff line number	Diff line change
`@@ -109,6 +109,9 @@`
`109`	`109`	`"wmic datafile where name='\\\\vs2017\\\\installation\\\\folder\\\\Common7\\\\IDE\\\\CommonExtensions\\\\Microsoft\\\\TestWindow\\\\vstest.console.exe' get Version /Value": {`
`110`	`110`	`"code": 0,`
`111`	`111`	`"stdout" : "version=15.0.0.0"`
	`112`	`+ },`
	`113`	`+ "C:\\WINDOWS\\system32\\chcp.com 65001": {`
	`114`	`+ "code": 0`
`112`	`115`	`}`
`113`	`116`	`},`
`114`	`117`