msdeploy.exe.config file added to msdeploy package (#6811)

microsoft · Mar 28, 2018 · cda1de3 · cda1de3
1 parent 72f093a
commit cda1de3
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 16 deletions.
diff --git a/Tasks/AzureRmWebAppDeployment/make.json b/Tasks/AzureRmWebAppDeployment/make.json
@@ -15,11 +15,6 @@
     ],
     "externals": {
         "archivePackages": [
-            {
-                "archiveName": "MSDeploy.zip",
-                "url": "https://vstsagenttools.blob.core.windows.net/tools/MSDeploy/3.6/MSDeploy.zip",
-                "dest": "./"
-            },
             {
                 "archiveName": "ctt.zip",
                 "url": "https://vstsagenttools.blob.core.windows.net/tools/ctt/1.6/ctt.zip",

diff --git a/Tasks/AzureRmWebAppDeployment/task.json b/Tasks/AzureRmWebAppDeployment/task.json
@@ -17,7 +17,7 @@
     "version": {
         "Major": 4,
         "Minor": 0,
-        "Patch": 4
+        "Patch": 5
     },
     "releaseNotes": "What's new in version 4.* (preview)<br />Supports Kudu Zip Deploy<br />Supports App Service Environments<br />Improved UI for discovering different App service types supported by the task<br/>Click [here](https://aka.ms/azurermwebdeployreadme) for more Information.",
     "minimumAgentVersion": "2.104.1",

diff --git a/Tasks/AzureRmWebAppDeployment/task.loc.json b/Tasks/AzureRmWebAppDeployment/task.loc.json
@@ -17,7 +17,7 @@
   "version": {
     "Major": 4,
     "Minor": 0,
-    "Patch": 4
+    "Patch": 5
   },
   "releaseNotes": "ms-resource:loc.releaseNotes",
   "minimumAgentVersion": "2.104.1",

diff --git a/Tasks/Common/webdeployment-common/make.json b/Tasks/Common/webdeployment-common/make.json
@@ -4,5 +4,14 @@
             "source": "WebConfigTemplates",
             "options": "-R"
         }
-    ]
+    ],
+    "externals": {
+        "archivePackages": [
+            {
+                "archiveName": "MSDeploy.zip",
+                "url": "https://vstsagenttools.blob.core.windows.net/tools/MSDeploy/3.6/M133/MSDeploy.zip",
+                "dest": "./"
+            }
+        ]
+    }
 }
diff --git a/Tasks/Common/webdeployment-common/msdeployutility.ts b/Tasks/Common/webdeployment-common/msdeployutility.ts
@@ -120,7 +120,7 @@ export async function getMSDeployFullPath() {
     }
     catch(error) {
         tl.debug(error);
-        return path.join(__dirname, "..", "..", "MSDeploy3.6", "msdeploy.exe"); 
+        return path.join(__dirname, "MSDeploy3.6", "msdeploy.exe"); 
     }
 }
 

diff --git a/Tasks/IISWebAppDeploymentOnMachineGroup/make.json b/Tasks/IISWebAppDeploymentOnMachineGroup/make.json
@@ -9,11 +9,6 @@
     ],
     "externals": {
         "archivePackages": [
-            {
-                "archiveName": "MSDeploy.zip",
-                "url": "https://vstsagenttools.blob.core.windows.net/tools/MSDeploy/3.6/MSDeploy.zip",
-                "dest": "./"
-            },
             {
                 "archiveName": "ctt.zip",
                 "url": "https://vstsagenttools.blob.core.windows.net/tools/ctt/1.6/ctt.zip",

diff --git a/Tasks/IISWebAppDeploymentOnMachineGroup/task.json b/Tasks/IISWebAppDeploymentOnMachineGroup/task.json
@@ -15,7 +15,7 @@
     "version": {
         "Major": 0,
         "Minor": 0,
-        "Patch": 36
+        "Patch": 37
     },
     "demands": [],
     "minimumAgentVersion": "2.104.1",

diff --git a/Tasks/IISWebAppDeploymentOnMachineGroup/task.loc.json b/Tasks/IISWebAppDeploymentOnMachineGroup/task.loc.json
@@ -15,7 +15,7 @@
   "version": {
     "Major": 0,
     "Minor": 0,
-    "Patch": 36
+    "Patch": 37
   },
   "demands": [],
   "minimumAgentVersion": "2.104.1",