resolved merge conflict (#7819)

microsoft · Jul 24, 2018 · eb5df15 · eb5df15
1 parent 813e762
commit eb5df15
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/Tasks/AzureRmWebAppDeploymentV4/deploymentProvider/WindowsWebAppWebDeployProvider.ts b/Tasks/AzureRmWebAppDeploymentV4/deploymentProvider/WindowsWebAppWebDeployProvider.ts
@@ -4,6 +4,7 @@ import { FileTransformsUtility } from '../operations/FileTransformsUtility';
 import { DeployWar } from '../operations/WarDeploymentUtilities';
 import * as Constant from '../operations/Constants';
 import { WebDeployUtility } from '../operations/WebDeployUtility';
+import { Package } from 'webdeployment-common/packageUtility';
 
 var deployUtility = require('webdeployment-common/utility.js');
 
@@ -20,6 +21,7 @@ export class WindowsWebAppWebDeployProvider extends AzureRmWebAppDeploymentProvi
         }
 
         webPackage = await FileTransformsUtility.applyTransformations(webPackage, this.taskParams);
+        this.taskParams.Package = new Package(webPackage);
 
         if(deployUtility.canUseWebDeploy(this.taskParams.UseWebDeploy)) {
             tl.debug("Performing the deployment of webapp.");

diff --git a/Tasks/AzureRmWebAppDeploymentV4/task.json b/Tasks/AzureRmWebAppDeploymentV4/task.json
@@ -18,7 +18,7 @@
     "version": {
         "Major": 4,
         "Minor": 2,
-        "Patch": 5
+        "Patch": 6
     },
     "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/AzureRmWebAppDeploymentV4/task.loc.json b/Tasks/AzureRmWebAppDeploymentV4/task.loc.json
@@ -18,7 +18,7 @@
   "version": {
     "Major": 4,
     "Minor": 2,
-    "Patch": 5
+    "Patch": 6
   },
   "releaseNotes": "ms-resource:loc.releaseNotes",
   "minimumAgentVersion": "2.104.1",