Merge pull request #1 from Microsoft/master

Merging from Microsoft
microsoft · Nov 30, 2016 · 3ab08f3 · 3ab08f3
2 parents 1c716f3 + faf66f3
commit 3ab08f3
Show file tree

Hide file tree

Showing 304 changed files with 6,128 additions and 13,645 deletions.
diff --git a/Tasks/ANT/task.json b/Tasks/ANT/task.json
@@ -8,12 +8,16 @@
     "visibility": [
         "Build",
         "Release"
+    ],
+	"runsOn": [
+        "Agent",
+        "MachineGroup"
     ],
     "author": "Microsoft Corporation",
     "version": {
         "Major": 1,
         "Minor": 0,
-        "Patch": 58
+        "Patch": 59
     },
     "demands": [
         "ant"

diff --git a/Tasks/ANT/task.loc.json b/Tasks/ANT/task.loc.json
@@ -9,11 +9,15 @@
     "Build",
     "Release"
   ],
+  "runsOn": [
+    "Agent",
+    "MachineGroup"
+  ],
   "author": "Microsoft Corporation",
   "version": {
     "Major": 1,
     "Minor": 0,
-    "Patch": 58
+    "Patch": 59
   },
   "demands": [
     "ant"

diff --git a/Tasks/AndroidBuild/AndroidBuild.ps1 b/Tasks/AndroidBuild/AndroidBuild.ps1
diff --git a/Tasks/AndroidBuild/KillAndroidEmulator.ps1 b/Tasks/AndroidBuild/KillAndroidEmulator.ps1
diff --git a/Tasks/AndroidBuild/StartAndroidEmulator.ps1 b/Tasks/AndroidBuild/StartAndroidEmulator.ps1
diff --git a/Tasks/AndroidBuild/Strings/resources.resjson/de-de/resources.resjson b/Tasks/AndroidBuild/Strings/resources.resjson/de-de/resources.resjson