Merge master changes

microsoft · Sep 17, 2019 · b79c17e · b79c17e
2 parents c36228a + 3ec956d
commit b79c17e
Show file tree

Hide file tree

Showing 92 changed files with 3,545 additions and 1,362 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -263,6 +263,8 @@ Tasks/NuGetPublisherV0/*    @zjrunner
 
 Tasks/NuGetToolInstallerV0/*    @zjrunner
 
+Tasks/OpenPolicyAgentInstallerV0/*    @Anumita
+
 Tasks/PackerBuildV0/*   @bishal-pdmsft
 
 Tasks/PackerBuildV1/*   @bishal-pdmsft

diff --git a/Tasks/AzureAppServiceManageV0/package-lock.json b/Tasks/AzureAppServiceManageV0/package-lock.json
diff --git a/Tasks/AzureAppServiceManageV0/task.json b/Tasks/AzureAppServiceManageV0/task.json
@@ -19,7 +19,7 @@
     "version": {
         "Major": 0,
         "Minor": 2,
-        "Patch": 59
+        "Patch": 60
     },
     "minimumAgentVersion": "1.102.0",
     "instanceNameFormat": "$(Action): $(WebAppName)",

diff --git a/Tasks/AzureAppServiceManageV0/task.loc.json b/Tasks/AzureAppServiceManageV0/task.loc.json
@@ -19,7 +19,7 @@
   "version": {
     "Major": 0,
     "Minor": 2,
-    "Patch": 59
+    "Patch": 60
   },
   "minimumAgentVersion": "1.102.0",
   "instanceNameFormat": "ms-resource:loc.instanceNameFormat",
@@ -85,7 +85,7 @@
       "label": "ms-resource:loc.input.label.SpecifySlot",
       "defaultValue": "false",
       "required": false,
-      "visibleRule": "Action != Swap Slots && Action != Delete Slot && Action != Start Swap With Preview && Action != Complete Swap"
+      "visibleRule": "Action != Swap Slots && Action != Delete Slot && Action != Start Swap With Preview && Action != Complete Swap && Action != Cancel Swap"
     },
     {
       "name": "ResourceGroupName",