Handled PR comments

ShilpiRachna1 · ShilpiRachna1 · commit 16e010732b49 · 2025-01-09T16:33:47.000+05:30
diff --git a/Tasks/AzureRmWebAppDeploymentV5/deploymentProvider/BuiltInLinuxWebAppDeploymentProvider.ts b/Tasks/AzureRmWebAppDeploymentV5/deploymentProvider/BuiltInLinuxWebAppDeploymentProvider.ts
@@ -65,25 +65,12 @@ export class BuiltInLinuxWebAppDeploymentProvider extends AzureRmWebAppDeploymen
                 let tempPackagePath = deployUtility.generateTemporaryFolderOrZipPath(tl.getVariable('AGENT.TEMPDIRECTORY'), false);
                 let archivedWebPackage = await zipUtility.archiveFolder(this.taskParams.Package.getPath(), "", tempPackagePath);
                 tl.debug("Compressed folder into zip " +  archivedWebPackage);
-                if (zipDeploy) {
-                    this.zipDeploymentID = await this.kuduServiceUtility.deployUsingZipDeploy(archivedWebPackage, this.taskParams.TakeAppOfflineFlag, 
-                        { slotName: this.appService.getSlot() }, true);
-                }
-                else {
-                    this.zipDeploymentID = await this.kuduServiceUtility.deployUsingOneDeploy(archivedWebPackage, isClean, this.taskParams.TakeAppOfflineFlag, 
-                        { slotName: this.appService.getSlot() }, 'Zip', true);
-                }
+                await this.InvokeDeploymentMethod(zipDeploy, archivedWebPackage, 'Zip', isClean);
                     
             break;
+
             case PackageType.zip:
-                if (zipDeploy) {
-                    this.zipDeploymentID = await this.kuduServiceUtility.deployUsingZipDeploy(this.taskParams.Package.getPath(), this.taskParams.TakeAppOfflineFlag, 
-                        { slotName: this.appService.getSlot() }, true);
-                }
-                else {
-                    this.zipDeploymentID = await this.kuduServiceUtility.deployUsingOneDeploy(this.taskParams.Package.getPath(), isClean, this.taskParams.TakeAppOfflineFlag, 
-                        { slotName: this.appService.getSlot() }, 'Zip', true);
-                }
+                await this.InvokeDeploymentMethod(zipDeploy, this.taskParams.Package.getPath(), 'Zip', isClean);
                 
             break;
 
@@ -93,14 +80,7 @@ export class BuiltInLinuxWebAppDeploymentProvider extends AzureRmWebAppDeploymen
                 var output = await webCommonUtility.archiveFolderForDeployment(false, folderPath);
                 var webPackage = output.webDeployPkg;
                 tl.debug("Initiated deployment via kudu service for webapp jar package : "+ webPackage);
-                if (zipDeploy) {
-                    this.zipDeploymentID = await this.kuduServiceUtility.deployUsingZipDeploy(webPackage, this.taskParams.TakeAppOfflineFlag, 
-                        { slotName: this.appService.getSlot() }, true);
-                }
-                else {
-                    this.zipDeploymentID = await this.kuduServiceUtility.deployUsingOneDeploy(webPackage, isClean, this.taskParams.TakeAppOfflineFlag,
-                        { slotName: this.appService.getSlot() }, 'Jar', true);
-                }
+                await this.InvokeDeploymentMethod(zipDeploy, webPackage, 'Jar', isClean);
                
             break;
 
@@ -129,4 +109,15 @@ export class BuiltInLinuxWebAppDeploymentProvider extends AzureRmWebAppDeploymen
             }
         }
     }
+
+    private async InvokeDeploymentMethod(zipDeploy: boolean, packagePath: string, packageType: string, isClean: boolean){
+        if (zipDeploy) {
+            this.zipDeploymentID = await this.kuduServiceUtility.deployUsingZipDeploy(packagePath, this.taskParams.TakeAppOfflineFlag, 
+                { slotName: this.appService.getSlot() }, true);
+        }
+        else {
+            this.zipDeploymentID = await this.kuduServiceUtility.deployUsingOneDeploy(packagePath, isClean, this.taskParams.TakeAppOfflineFlag, 
+                { slotName: this.appService.getSlot() }, packageType, true);
+        }
+    }
 }
diff --git a/Tasks/AzureRmWebAppDeploymentV5/task.json b/Tasks/AzureRmWebAppDeploymentV5/task.json
@@ -687,6 +687,7 @@
     "JarPathNotPresent": "Java jar path is not present",
     "FailedToUpdateApplicationInsightsResource": "Failed to update Application Insights '%s' Resource. Error: %s",
     "RunFromZipPreventsFileInUseError": "Move from Web Deploy to RunFrom Package, which helps in avoiding FILE_IN_USE error. Note that Run From Package does not support msBuild package type. Please change your package format to use this deployment method.",
-    "MSDeployNotSupportTokenAuth": "App Service is configured to not use basic authentication. This requires Web Deploy msdeploy.exe version 7.1.7225 or higher. You need a version of Visual Studio that includes an updated version of msdeploy.exe. For more information, visit https://aka.ms/azdo-webapp-msdeploy ."
+    "MSDeployNotSupportTokenAuth": "App Service is configured to not use basic authentication. This requires Web Deploy msdeploy.exe version 7.1.7225 or higher. You need a version of Visual Studio that includes an updated version of msdeploy.exe. For more information, visit https://aka.ms/azdo-webapp-msdeploy .",
+    "RunFromPackageAppsetting": "NOTE: Run From Package makes wwwroot read-only, so you will receive an error when writing files to this directory."
   }
 }
diff --git a/Tasks/AzureRmWebAppDeploymentV5/task.loc.json b/Tasks/AzureRmWebAppDeploymentV5/task.loc.json
@@ -687,6 +687,7 @@
     "JarPathNotPresent": "ms-resource:loc.messages.JarPathNotPresent",
     "FailedToUpdateApplicationInsightsResource": "ms-resource:loc.messages.FailedToUpdateApplicationInsightsResource",
     "RunFromZipPreventsFileInUseError": "ms-resource:loc.messages.RunFromZipPreventsFileInUseError",
-    "MSDeployNotSupportTokenAuth": "ms-resource:loc.messages.MSDeployNotSupportTokenAuth"
+    "MSDeployNotSupportTokenAuth": "ms-resource:loc.messages.MSDeployNotSupportTokenAuth",
+    "RunFromPackageAppsetting": "ms-resource:loc.messages.RunFromPackageAppsetting"
   }
 }
diff --git a/_generated/AzureRmWebAppDeploymentV5/Strings/resources.resjson/en-US/resources.resjson b/_generated/AzureRmWebAppDeploymentV5/Strings/resources.resjson/en-US/resources.resjson
@@ -233,5 +233,6 @@
   "loc.messages.JarPathNotPresent": "Java jar path is not present",
   "loc.messages.FailedToUpdateApplicationInsightsResource": "Failed to update Application Insights '%s' Resource. Error: %s",
   "loc.messages.RunFromZipPreventsFileInUseError": "Move from Web Deploy to RunFrom Package, which helps in avoiding FILE_IN_USE error. Note that Run From Package does not support msBuild package type. Please change your package format to use this deployment method.",
-  "loc.messages.MSDeployNotSupportTokenAuth": "App Service is configured to not use basic authentication. This requires Web Deploy msdeploy.exe version 7.1.7225 or higher. You need a version of Visual Studio that includes an updated version of msdeploy.exe. For more information, visit https://aka.ms/azdo-webapp-msdeploy ."
+  "loc.messages.MSDeployNotSupportTokenAuth": "App Service is configured to not use basic authentication. This requires Web Deploy msdeploy.exe version 7.1.7225 or higher. You need a version of Visual Studio that includes an updated version of msdeploy.exe. For more information, visit https://aka.ms/azdo-webapp-msdeploy .",
+  "loc.messages.RunFromPackageAppsetting": "NOTE: Run From Package makes wwwroot read-only, so you will receive an error when writing files to this directory."
 }
diff --git a/_generated/AzureRmWebAppDeploymentV5/deploymentProvider/BuiltInLinuxWebAppDeploymentProvider.ts b/_generated/AzureRmWebAppDeploymentV5/deploymentProvider/BuiltInLinuxWebAppDeploymentProvider.ts
@@ -65,25 +65,12 @@ export class BuiltInLinuxWebAppDeploymentProvider extends AzureRmWebAppDeploymen
                 let tempPackagePath = deployUtility.generateTemporaryFolderOrZipPath(tl.getVariable('AGENT.TEMPDIRECTORY'), false);
                 let archivedWebPackage = await zipUtility.archiveFolder(this.taskParams.Package.getPath(), "", tempPackagePath);
                 tl.debug("Compressed folder into zip " +  archivedWebPackage);
-                if (zipDeploy) {
-                    this.zipDeploymentID = await this.kuduServiceUtility.deployUsingZipDeploy(archivedWebPackage, this.taskParams.TakeAppOfflineFlag, 
-                        { slotName: this.appService.getSlot() }, true);
-                }
-                else {
-                    this.zipDeploymentID = await this.kuduServiceUtility.deployUsingOneDeploy(archivedWebPackage, isClean, this.taskParams.TakeAppOfflineFlag, 
-                        { slotName: this.appService.getSlot() }, 'Zip', true);
-                }
+                await this.InvokeDeploymentMethod(zipDeploy, archivedWebPackage, 'Zip', isClean);
                     
             break;
+
             case PackageType.zip:
-                if (zipDeploy) {
-                    this.zipDeploymentID = await this.kuduServiceUtility.deployUsingZipDeploy(this.taskParams.Package.getPath(), this.taskParams.TakeAppOfflineFlag, 
-                        { slotName: this.appService.getSlot() }, true);
-                }
-                else {
-                    this.zipDeploymentID = await this.kuduServiceUtility.deployUsingOneDeploy(this.taskParams.Package.getPath(), isClean, this.taskParams.TakeAppOfflineFlag, 
-                        { slotName: this.appService.getSlot() }, 'Zip', true);
-                }
+                await this.InvokeDeploymentMethod(zipDeploy, this.taskParams.Package.getPath(), 'Zip', isClean);
                 
             break;
 
@@ -93,14 +80,7 @@ export class BuiltInLinuxWebAppDeploymentProvider extends AzureRmWebAppDeploymen
                 var output = await webCommonUtility.archiveFolderForDeployment(false, folderPath);
                 var webPackage = output.webDeployPkg;
                 tl.debug("Initiated deployment via kudu service for webapp jar package : "+ webPackage);
-                if (zipDeploy) {
-                    this.zipDeploymentID = await this.kuduServiceUtility.deployUsingZipDeploy(webPackage, this.taskParams.TakeAppOfflineFlag, 
-                        { slotName: this.appService.getSlot() }, true);
-                }
-                else {
-                    this.zipDeploymentID = await this.kuduServiceUtility.deployUsingOneDeploy(webPackage, isClean, this.taskParams.TakeAppOfflineFlag,
-                        { slotName: this.appService.getSlot() }, 'Jar', true);
-                }
+                await this.InvokeDeploymentMethod(zipDeploy, webPackage, 'Jar', isClean);
                
             break;
 
@@ -129,4 +109,15 @@ export class BuiltInLinuxWebAppDeploymentProvider extends AzureRmWebAppDeploymen
             }
         }
     }
+
+    private async InvokeDeploymentMethod(zipDeploy: boolean, packagePath: string, packageType: string, isClean: boolean){
+        if (zipDeploy) {
+            this.zipDeploymentID = await this.kuduServiceUtility.deployUsingZipDeploy(packagePath, this.taskParams.TakeAppOfflineFlag, 
+                { slotName: this.appService.getSlot() }, true);
+        }
+        else {
+            this.zipDeploymentID = await this.kuduServiceUtility.deployUsingOneDeploy(packagePath, isClean, this.taskParams.TakeAppOfflineFlag, 
+                { slotName: this.appService.getSlot() }, packageType, true);
+        }
+    }
 }
diff --git a/_generated/AzureRmWebAppDeploymentV5/task.json b/_generated/AzureRmWebAppDeploymentV5/task.json
@@ -687,7 +687,8 @@
     "JarPathNotPresent": "Java jar path is not present",
     "FailedToUpdateApplicationInsightsResource": "Failed to update Application Insights '%s' Resource. Error: %s",
     "RunFromZipPreventsFileInUseError": "Move from Web Deploy to RunFrom Package, which helps in avoiding FILE_IN_USE error. Note that Run From Package does not support msBuild package type. Please change your package format to use this deployment method.",
-    "MSDeployNotSupportTokenAuth": "App Service is configured to not use basic authentication. This requires Web Deploy msdeploy.exe version 7.1.7225 or higher. You need a version of Visual Studio that includes an updated version of msdeploy.exe. For more information, visit https://aka.ms/azdo-webapp-msdeploy ."
+    "MSDeployNotSupportTokenAuth": "App Service is configured to not use basic authentication. This requires Web Deploy msdeploy.exe version 7.1.7225 or higher. You need a version of Visual Studio that includes an updated version of msdeploy.exe. For more information, visit https://aka.ms/azdo-webapp-msdeploy .",
+    "RunFromPackageAppsetting": "NOTE: Run From Package makes wwwroot read-only, so you will receive an error when writing files to this directory."
   },
   "_buildConfigMapping": {
     "Default": "5.251.0",
diff --git a/_generated/AzureRmWebAppDeploymentV5/task.loc.json b/_generated/AzureRmWebAppDeploymentV5/task.loc.json
@@ -687,7 +687,8 @@
     "JarPathNotPresent": "ms-resource:loc.messages.JarPathNotPresent",
     "FailedToUpdateApplicationInsightsResource": "ms-resource:loc.messages.FailedToUpdateApplicationInsightsResource",
     "RunFromZipPreventsFileInUseError": "ms-resource:loc.messages.RunFromZipPreventsFileInUseError",
-    "MSDeployNotSupportTokenAuth": "ms-resource:loc.messages.MSDeployNotSupportTokenAuth"
+    "MSDeployNotSupportTokenAuth": "ms-resource:loc.messages.MSDeployNotSupportTokenAuth",
+    "RunFromPackageAppsetting": "ms-resource:loc.messages.RunFromPackageAppsetting"
   },
   "_buildConfigMapping": {
     "Default": "5.251.0",
diff --git a/_generated/AzureRmWebAppDeploymentV5_Node20/Strings/resources.resjson/en-US/resources.resjson b/_generated/AzureRmWebAppDeploymentV5_Node20/Strings/resources.resjson/en-US/resources.resjson
@@ -233,5 +233,6 @@
   "loc.messages.JarPathNotPresent": "Java jar path is not present",
   "loc.messages.FailedToUpdateApplicationInsightsResource": "Failed to update Application Insights '%s' Resource. Error: %s",
   "loc.messages.RunFromZipPreventsFileInUseError": "Move from Web Deploy to RunFrom Package, which helps in avoiding FILE_IN_USE error. Note that Run From Package does not support msBuild package type. Please change your package format to use this deployment method.",
-  "loc.messages.MSDeployNotSupportTokenAuth": "App Service is configured to not use basic authentication. This requires Web Deploy msdeploy.exe version 7.1.7225 or higher. You need a version of Visual Studio that includes an updated version of msdeploy.exe. For more information, visit https://aka.ms/azdo-webapp-msdeploy ."
+  "loc.messages.MSDeployNotSupportTokenAuth": "App Service is configured to not use basic authentication. This requires Web Deploy msdeploy.exe version 7.1.7225 or higher. You need a version of Visual Studio that includes an updated version of msdeploy.exe. For more information, visit https://aka.ms/azdo-webapp-msdeploy .",
+  "loc.messages.RunFromPackageAppsetting": "NOTE: Run From Package makes wwwroot read-only, so you will receive an error when writing files to this directory."
 }
diff --git a/_generated/AzureRmWebAppDeploymentV5_Node20/deploymentProvider/BuiltInLinuxWebAppDeploymentProvider.ts b/_generated/AzureRmWebAppDeploymentV5_Node20/deploymentProvider/BuiltInLinuxWebAppDeploymentProvider.ts
@@ -65,25 +65,12 @@ export class BuiltInLinuxWebAppDeploymentProvider extends AzureRmWebAppDeploymen
                 let tempPackagePath = deployUtility.generateTemporaryFolderOrZipPath(tl.getVariable('AGENT.TEMPDIRECTORY'), false);
                 let archivedWebPackage = await zipUtility.archiveFolder(this.taskParams.Package.getPath(), "", tempPackagePath);
                 tl.debug("Compressed folder into zip " +  archivedWebPackage);
-                if (zipDeploy) {
-                    this.zipDeploymentID = await this.kuduServiceUtility.deployUsingZipDeploy(archivedWebPackage, this.taskParams.TakeAppOfflineFlag, 
-                        { slotName: this.appService.getSlot() }, true);
-                }
-                else {
-                    this.zipDeploymentID = await this.kuduServiceUtility.deployUsingOneDeploy(archivedWebPackage, isClean, this.taskParams.TakeAppOfflineFlag, 
-                        { slotName: this.appService.getSlot() }, 'Zip', true);
-                }
+                await this.InvokeDeploymentMethod(zipDeploy, archivedWebPackage, 'Zip', isClean);
                     
             break;
+
             case PackageType.zip:
-                if (zipDeploy) {
-                    this.zipDeploymentID = await this.kuduServiceUtility.deployUsingZipDeploy(this.taskParams.Package.getPath(), this.taskParams.TakeAppOfflineFlag, 
-                        { slotName: this.appService.getSlot() }, true);
-                }
-                else {
-                    this.zipDeploymentID = await this.kuduServiceUtility.deployUsingOneDeploy(this.taskParams.Package.getPath(), isClean, this.taskParams.TakeAppOfflineFlag, 
-                        { slotName: this.appService.getSlot() }, 'Zip', true);
-                }
+                await this.InvokeDeploymentMethod(zipDeploy, this.taskParams.Package.getPath(), 'Zip', isClean);
                 
             break;
 
@@ -93,14 +80,7 @@ export class BuiltInLinuxWebAppDeploymentProvider extends AzureRmWebAppDeploymen
                 var output = await webCommonUtility.archiveFolderForDeployment(false, folderPath);
                 var webPackage = output.webDeployPkg;
                 tl.debug("Initiated deployment via kudu service for webapp jar package : "+ webPackage);
-                if (zipDeploy) {
-                    this.zipDeploymentID = await this.kuduServiceUtility.deployUsingZipDeploy(webPackage, this.taskParams.TakeAppOfflineFlag, 
-                        { slotName: this.appService.getSlot() }, true);
-                }
-                else {
-                    this.zipDeploymentID = await this.kuduServiceUtility.deployUsingOneDeploy(webPackage, isClean, this.taskParams.TakeAppOfflineFlag,
-                        { slotName: this.appService.getSlot() }, 'Jar', true);
-                }
+                await this.InvokeDeploymentMethod(zipDeploy, webPackage, 'Jar', isClean);
                
             break;
 
@@ -129,4 +109,15 @@ export class BuiltInLinuxWebAppDeploymentProvider extends AzureRmWebAppDeploymen
             }
         }
     }
+
+    private async InvokeDeploymentMethod(zipDeploy: boolean, packagePath: string, packageType: string, isClean: boolean){
+        if (zipDeploy) {
+            this.zipDeploymentID = await this.kuduServiceUtility.deployUsingZipDeploy(packagePath, this.taskParams.TakeAppOfflineFlag, 
+                { slotName: this.appService.getSlot() }, true);
+        }
+        else {
+            this.zipDeploymentID = await this.kuduServiceUtility.deployUsingOneDeploy(packagePath, isClean, this.taskParams.TakeAppOfflineFlag, 
+                { slotName: this.appService.getSlot() }, packageType, true);
+        }
+    }
 }
diff --git a/_generated/AzureRmWebAppDeploymentV5_Node20/task.json b/_generated/AzureRmWebAppDeploymentV5_Node20/task.json
@@ -691,7 +691,8 @@
     "JarPathNotPresent": "Java jar path is not present",
     "FailedToUpdateApplicationInsightsResource": "Failed to update Application Insights '%s' Resource. Error: %s",
     "RunFromZipPreventsFileInUseError": "Move from Web Deploy to RunFrom Package, which helps in avoiding FILE_IN_USE error. Note that Run From Package does not support msBuild package type. Please change your package format to use this deployment method.",
-    "MSDeployNotSupportTokenAuth": "App Service is configured to not use basic authentication. This requires Web Deploy msdeploy.exe version 7.1.7225 or higher. You need a version of Visual Studio that includes an updated version of msdeploy.exe. For more information, visit https://aka.ms/azdo-webapp-msdeploy ."
+    "MSDeployNotSupportTokenAuth": "App Service is configured to not use basic authentication. This requires Web Deploy msdeploy.exe version 7.1.7225 or higher. You need a version of Visual Studio that includes an updated version of msdeploy.exe. For more information, visit https://aka.ms/azdo-webapp-msdeploy .",
+    "RunFromPackageAppsetting": "NOTE: Run From Package makes wwwroot read-only, so you will receive an error when writing files to this directory."
   },
   "_buildConfigMapping": {
     "Default": "5.251.0",
diff --git a/_generated/AzureRmWebAppDeploymentV5_Node20/task.loc.json b/_generated/AzureRmWebAppDeploymentV5_Node20/task.loc.json
@@ -691,7 +691,8 @@
     "JarPathNotPresent": "ms-resource:loc.messages.JarPathNotPresent",
     "FailedToUpdateApplicationInsightsResource": "ms-resource:loc.messages.FailedToUpdateApplicationInsightsResource",
     "RunFromZipPreventsFileInUseError": "ms-resource:loc.messages.RunFromZipPreventsFileInUseError",
-    "MSDeployNotSupportTokenAuth": "ms-resource:loc.messages.MSDeployNotSupportTokenAuth"
+    "MSDeployNotSupportTokenAuth": "ms-resource:loc.messages.MSDeployNotSupportTokenAuth",
+    "RunFromPackageAppsetting": "ms-resource:loc.messages.RunFromPackageAppsetting"
   },
   "_buildConfigMapping": {
     "Default": "5.251.0",

Original file line number	Diff line number	Diff line change
`@@ -687,6 +687,7 @@`
`687`	`687`	`"JarPathNotPresent": "Java jar path is not present",`
`688`	`688`	`"FailedToUpdateApplicationInsightsResource": "Failed to update Application Insights '%s' Resource. Error: %s",`
`689`	`689`	`"RunFromZipPreventsFileInUseError": "Move from Web Deploy to RunFrom Package, which helps in avoiding FILE_IN_USE error. Note that Run From Package does not support msBuild package type. Please change your package format to use this deployment method.",`
`690`		`- "MSDeployNotSupportTokenAuth": "App Service is configured to not use basic authentication. This requires Web Deploy msdeploy.exe version 7.1.7225 or higher. You need a version of Visual Studio that includes an updated version of msdeploy.exe. For more information, visit https://aka.ms/azdo-webapp-msdeploy ."`
	`690`	`+ "MSDeployNotSupportTokenAuth": "App Service is configured to not use basic authentication. This requires Web Deploy msdeploy.exe version 7.1.7225 or higher. You need a version of Visual Studio that includes an updated version of msdeploy.exe. For more information, visit https://aka.ms/azdo-webapp-msdeploy .",`
	`691`	`+ "RunFromPackageAppsetting": "NOTE: Run From Package makes wwwroot read-only, so you will receive an error when writing files to this directory."`
`691`	`692`	`}`
`692`	`693`	`}`
Original file line number	Diff line number	Diff line change
`@@ -233,5 +233,6 @@`
`233`	`233`	`"loc.messages.JarPathNotPresent": "Java jar path is not present",`
`234`	`234`	`"loc.messages.FailedToUpdateApplicationInsightsResource": "Failed to update Application Insights '%s' Resource. Error: %s",`
`235`	`235`	`"loc.messages.RunFromZipPreventsFileInUseError": "Move from Web Deploy to RunFrom Package, which helps in avoiding FILE_IN_USE error. Note that Run From Package does not support msBuild package type. Please change your package format to use this deployment method.",`
`236`		`- "loc.messages.MSDeployNotSupportTokenAuth": "App Service is configured to not use basic authentication. This requires Web Deploy msdeploy.exe version 7.1.7225 or higher. You need a version of Visual Studio that includes an updated version of msdeploy.exe. For more information, visit https://aka.ms/azdo-webapp-msdeploy ."`
	`236`	`+ "loc.messages.MSDeployNotSupportTokenAuth": "App Service is configured to not use basic authentication. This requires Web Deploy msdeploy.exe version 7.1.7225 or higher. You need a version of Visual Studio that includes an updated version of msdeploy.exe. For more information, visit https://aka.ms/azdo-webapp-msdeploy .",`
	`237`	`+ "loc.messages.RunFromPackageAppsetting": "NOTE: Run From Package makes wwwroot read-only, so you will receive an error when writing files to this directory."`
`237`	`238`	`}`