Skip to content

Commit 8202ca2

Browse files
authored
Backport PR 16576 and 16666 into M208 (#16771)
* Backport PR 16576 into M208 (v2) * Backported changes from PR 16666 Co-authored-by: Ondrej Netocny <[email protected]>
1 parent cff11d6 commit 8202ca2

File tree

5 files changed

+34
-34
lines changed

5 files changed

+34
-34
lines changed

Tasks/AzureFunctionAppV1/Strings/resources.resjson/en-US/resources.resjson

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"loc.messages.Unabletoretrievewebappsettings": "Unable to retrieve App Service application settings. [Status Code: '%s', Error Message: '%s']",
4545
"loc.messages.Unabletoupdatewebappsettings": "Unable to update App service application settings. Status Code: '%s'",
4646
"loc.messages.CannotupdatedeploymentstatusuniquedeploymentIdCannotBeRetrieved": "Cannot update deployment status : Unique Deployment ID cannot be retrieved",
47-
"loc.messages.PackageDeploymentSuccess": "Successfully deployed web package to App Service.",
47+
"loc.messages.PackageDeploymentSuccess": "The web package has been deployed to App Service. Please note that the package mount or extraction errors will be logged in the deployment logs in the location above.",
4848
"loc.messages.PackageDeploymentFailed": "Failed to deploy web package to App Service.",
4949
"loc.messages.Runningcommand": "Running command: %s",
5050
"loc.messages.Deployingwebapplicationatvirtualpathandphysicalpath": "Deploying web package : %s at virtual path (physical path) : %s (%s)",

Tasks/AzureFunctionAppV1/deploymentProvider/BuiltInLinuxWebAppDeploymentProvider.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ var zipUtility = require('azure-pipelines-tasks-azurermdeploycommon-v3/webdeploy
99

1010
const linuxFunctionStorageSetting: string = '-WEBSITES_ENABLE_APP_SERVICE_STORAGE true';
1111
const linuxFunctionRuntimeSettingName: string = '-FUNCTIONS_WORKER_RUNTIME ';
12-
const premiumPlanRunsFromPackage: string = ' -WEBSITE_RUN_FROM_PACKAGE true';
12+
const premiumPlanRunsFromPackage: string = ' -WEBSITE_RUN_FROM_PACKAGE 1';
1313

1414
const linuxFunctionRuntimeSettingValue = new Map([
1515
[ 'DOCKER|microsoft/azure-functions-dotnet-core2.0:2.0', 'dotnet ' ],

Tasks/AzureFunctionAppV1/package-lock.json

Lines changed: 28 additions & 28 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Tasks/AzureFunctionAppV1/task.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"version": {
1919
"Major": 1,
2020
"Minor": 208,
21-
"Patch": 0
21+
"Patch": 1
2222
},
2323
"minimumAgentVersion": "2.104.1",
2424
"groups": [
@@ -250,7 +250,7 @@
250250
"Unabletoretrievewebappsettings": "Unable to retrieve App Service application settings. [Status Code: '%s', Error Message: '%s']",
251251
"Unabletoupdatewebappsettings": "Unable to update App service application settings. Status Code: '%s'",
252252
"CannotupdatedeploymentstatusuniquedeploymentIdCannotBeRetrieved": "Cannot update deployment status : Unique Deployment ID cannot be retrieved",
253-
"PackageDeploymentSuccess": "Successfully deployed web package to App Service.",
253+
"PackageDeploymentSuccess": "The web package has been deployed to App Service. Please note that the package mount or extraction errors will be logged in the deployment logs in the location above.",
254254
"PackageDeploymentFailed": "Failed to deploy web package to App Service.",
255255
"Runningcommand": "Running command: %s",
256256
"Deployingwebapplicationatvirtualpathandphysicalpath": "Deploying web package : %s at virtual path (physical path) : %s (%s)",

Tasks/AzureFunctionAppV1/task.loc.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"version": {
1919
"Major": 1,
2020
"Minor": 208,
21-
"Patch": 0
21+
"Patch": 1
2222
},
2323
"minimumAgentVersion": "2.104.1",
2424
"groups": [
@@ -393,4 +393,4 @@
393393
"SyncFunctionTriggersSuccess": "ms-resource:loc.messages.SyncFunctionTriggersSuccess",
394394
"UpdatedRunFromPackageSettings": "ms-resource:loc.messages.UpdatedRunFromPackageSettings"
395395
}
396-
}
396+
}

0 commit comments

Comments
 (0)