Revert "Moved UseDiffPackage checkbox to Upgrade section and enabled …

…it by default (#7345)" This reverts commit a1b9ff5.
microsoft · Jun 6, 2018 · e1b2939 · e1b2939
1 parent eff31b7
commit e1b2939
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 22 deletions.
diff --git a/Tasks/ServiceFabricDeploy/Create-DiffPackage.psm1 b/Tasks/ServiceFabricDeploy/Create-DiffPackage.psm1
@@ -1,4 +1,4 @@
-function New-DiffPackage
+function Create-DiffPackage
 {
     [CmdletBinding()]
     param(

diff --git a/Tasks/ServiceFabricDeploy/deploy.ps1 b/Tasks/ServiceFabricDeploy/deploy.ps1
@@ -113,7 +113,7 @@ try {
         if ($isPackageValid)
         {
             Import-Module "$PSScriptRoot\Create-DiffPackage.psm1"
-            $diffPackagePath = New-DiffPackage -ApplicationName $applicationName -ApplicationPackagePath $applicationPackagePath -ConnectedServiceEndpoint $connectedServiceEndpoint -ClusterConnectionParameters $clusterConnectionParameters
+            $diffPackagePath = Create-DiffPackage -ApplicationName $applicationName -ApplicationPackagePath $applicationPackagePath -ConnectedServiceEndpoint $connectedServiceEndpoint -ClusterConnectionParameters $clusterConnectionParameters
         }
         else
         {

diff --git a/Tasks/ServiceFabricDeploy/task.json b/Tasks/ServiceFabricDeploy/task.json
@@ -17,7 +17,7 @@
     "version": {
         "Major": 1,
         "Minor": 7,
-        "Patch": 11
+        "Patch": 10
     },
     "demands": [
         "Cmd"
@@ -91,6 +91,15 @@
             "groupname": "advanced",
             "helpMarkDown": "Indicates whether the application package should be compressed before copying to the image store. If enabled, this will override the value in the publish profile."
         },
+        {
+            "name": "useDiffPackage",
+            "type": "boolean",
+            "label": "Use Diff Package",
+            "defaultValue": "false",
+            "required": false,
+            "groupname": "advanced",
+            "helpMarkDown": "Upgrade by using a diff package that contains only the updated application files, the updated application manifest, and the service manifest files."
+        },
         {
             "name": "copyPackageTimeoutSec",
             "type": "string",
@@ -141,15 +150,6 @@
             "groupname": "advanced",
             "helpMarkDown": "Indicates whether the package should be validated or not before deployment."
         },
-        {
-            "name": "useDiffPackage",
-            "type": "boolean",
-            "label": "Use Diff Package",
-            "defaultValue": "false",
-            "required": false,
-            "groupname": "upgrade",
-            "helpMarkDown": "Upgrade by using a diff package that contains only the updated application files, the updated application manifest, and the service manifest files."
-        },
         {
             "name": "overridePublishProfileSettings",
             "type": "boolean",

diff --git a/Tasks/ServiceFabricDeploy/task.loc.json b/Tasks/ServiceFabricDeploy/task.loc.json
@@ -17,7 +17,7 @@
   "version": {
     "Major": 1,
     "Minor": 7,
-    "Patch": 11
+    "Patch": 10
   },
   "demands": [
     "Cmd"
@@ -91,6 +91,15 @@
       "groupname": "advanced",
       "helpMarkDown": "ms-resource:loc.input.help.compressPackage"
     },
+    {
+      "name": "useDiffPackage",
+      "type": "boolean",
+      "label": "ms-resource:loc.input.label.useDiffPackage",
+      "defaultValue": "false",
+      "required": false,
+      "groupname": "advanced",
+      "helpMarkDown": "ms-resource:loc.input.help.useDiffPackage"
+    },
     {
       "name": "copyPackageTimeoutSec",
       "type": "string",
@@ -141,15 +150,6 @@
       "groupname": "advanced",
       "helpMarkDown": "ms-resource:loc.input.help.skipPackageValidation"
     },
-    {
-      "name": "useDiffPackage",
-      "type": "boolean",
-      "label": "ms-resource:loc.input.label.useDiffPackage",
-      "defaultValue": "false",
-      "required": false,
-      "groupname": "upgrade",
-      "helpMarkDown": "ms-resource:loc.input.help.useDiffPackage"
-    },
     {
       "name": "overridePublishProfileSettings",
       "type": "boolean",