Skip to content

Commit e1dafec

Browse files
committed
merge main
2 parents 0dd20d5 + ca942f2 commit e1dafec

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

package-lock.json

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

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1391,7 +1391,7 @@
13911391
"@azure/core-client": "^1.7.3",
13921392
"@azure/core-rest-pipeline": "^1.11.0",
13931393
"@azure/storage-blob": "^12.5.0",
1394-
"@microsoft/vscode-azext-azureappservice": "^3.5.3",
1394+
"@microsoft/vscode-azext-azureappservice": "^3.5.4",
13951395
"@microsoft/vscode-azext-azureappsettings": "^0.2.6",
13961396
"@microsoft/vscode-azext-azureutils": "^3.1.6",
13971397
"@microsoft/vscode-azext-utils": "^2.6.3",

src/commands/createFunctionApp/stacks/getStackPicks.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ export async function getEolWarningMessages(context: ISubscriptionActionContext,
306306
displayInfo = (await getEOLDate(context, {
307307
site: options.site,
308308
version: nonNullValue(version),
309-
runtime: nonNullValue(runtime),
309+
runtime: nonNullValue(runtime) === 'dotnet-isolated' ? 'dotnet' : nonNullValue(runtime),
310310
isFlex: true,
311311
location: options.site.location
312312
})

src/commands/deploy/deploy.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ async function deploy(actionContext: IActionContext, arg1: vscode.Uri | string |
175175
deploymentWarningMessages.length > 0) {
176176
// if there is a warning message, we want to show the deploy confirmation regardless of the setting
177177
const deployCommandId = 'azureFunctions.deploy';
178-
await showDeployConfirmation(context, node.site, deployCommandId, deploymentWarningMessages);
178+
await showDeployConfirmation(context, node.site, deployCommandId, deploymentWarningMessages, `https://aka.ms/FunctionsStackUpgrade`);
179179
}
180180

181181
await runPreDeployTask(context, context.effectiveDeployFsPath, siteConfig.scmType);

0 commit comments

Comments
 (0)