From e9ffbf59e516b567a426408dc390aa5d6472e332 Mon Sep 17 00:00:00 2001 From: Tatsuro Shibamura Date: Wed, 10 Jul 2024 12:58:40 +0900 Subject: [PATCH] Upgrade to .NET 8 In-Proc (#460) --- .github/workflows/build.yml | 2 +- .github/workflows/publish.yml | 2 +- AppService.Acmebot/AppService.Acmebot.csproj | 8 +++--- azuredeploy.bicep | 14 +++++++---- azuredeploy.json | 26 +++++++++++--------- 5 files changed, 30 insertions(+), 22 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 110393b..f9ce0d3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,7 +8,7 @@ on: env: DOTNET_VERSION: 6.0.x - BICEP_VERSION: 0.25.53 + BICEP_VERSION: 0.28.1 jobs: build: diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index e5ad398..0fd0861 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -6,7 +6,7 @@ on: env: DOTNET_VERSION: 6.0.x - BICEP_VERSION: 0.25.53 + BICEP_VERSION: 0.28.1 jobs: publish: diff --git a/AppService.Acmebot/AppService.Acmebot.csproj b/AppService.Acmebot/AppService.Acmebot.csproj index 9096754..9544968 100644 --- a/AppService.Acmebot/AppService.Acmebot.csproj +++ b/AppService.Acmebot/AppService.Acmebot.csproj @@ -4,14 +4,14 @@ v4 - + - - + + - + diff --git a/azuredeploy.bicep b/azuredeploy.bicep index 50d5e5a..da1def5 100644 --- a/azuredeploy.bicep +++ b/azuredeploy.bicep @@ -28,7 +28,7 @@ var appInsightsEndpoints = { AzureUSGovernment: 'applicationinsights.us' } -resource storageAccount 'Microsoft.Storage/storageAccounts@2022-09-01' = { +resource storageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = { name: storageAccountName location: location kind: 'Storage' @@ -42,7 +42,7 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2022-09-01' = { } } -resource appServicePlan 'Microsoft.Web/serverfarms@2022-03-01' = { +resource appServicePlan 'Microsoft.Web/serverfarms@2023-12-01' = { name: appServicePlanName location: location sku: { @@ -52,7 +52,7 @@ resource appServicePlan 'Microsoft.Web/serverfarms@2022-03-01' = { properties: {} } -resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { +resource workspace 'Microsoft.OperationalInsights/workspaces@2023-09-01' = { name: workspaceName location: location properties: { @@ -76,7 +76,7 @@ resource appInsights 'Microsoft.Insights/components@2020-02-02' = { } } -resource functionApp 'Microsoft.Web/sites@2022-03-01' = { +resource functionApp 'Microsoft.Web/sites@2023-12-01' = { name: functionAppName location: location kind: 'functionapp' @@ -113,6 +113,10 @@ resource functionApp 'Microsoft.Web/sites@2022-03-01' = { name: 'FUNCTIONS_EXTENSION_VERSION' value: '~4' } + { + name: 'FUNCTIONS_INPROC_NET8_ENABLED' + value: '1' + } { name: 'FUNCTIONS_WORKER_RUNTIME' value: 'dotnet' @@ -134,7 +138,7 @@ resource functionApp 'Microsoft.Web/sites@2022-03-01' = { value: environment().name } ] - netFrameworkVersion: 'v6.0' + netFrameworkVersion: 'v8.0' ftpsState: 'Disabled' minTlsVersion: '1.2' scmMinTlsVersion: '1.2' diff --git a/azuredeploy.json b/azuredeploy.json index a6fefe1..96a09ea 100644 --- a/azuredeploy.json +++ b/azuredeploy.json @@ -4,8 +4,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.25.53.49325", - "templateHash": "11728208178327999889" + "version": "0.28.1.47646", + "templateHash": "14382008126277796973" } }, "parameters": { @@ -58,7 +58,7 @@ "resources": [ { "type": "Microsoft.Storage/storageAccounts", - "apiVersion": "2022-09-01", + "apiVersion": "2023-05-01", "name": "[variables('storageAccountName')]", "location": "[parameters('location')]", "kind": "Storage", @@ -73,7 +73,7 @@ }, { "type": "Microsoft.Web/serverfarms", - "apiVersion": "2022-03-01", + "apiVersion": "2023-12-01", "name": "[variables('appServicePlanName')]", "location": "[parameters('location')]", "sku": { @@ -84,7 +84,7 @@ }, { "type": "Microsoft.OperationalInsights/workspaces", - "apiVersion": "2022-10-01", + "apiVersion": "2023-09-01", "name": "[variables('workspaceName')]", "location": "[parameters('location')]", "properties": { @@ -113,7 +113,7 @@ }, { "type": "Microsoft.Web/sites", - "apiVersion": "2022-03-01", + "apiVersion": "2023-12-01", "name": "[variables('functionAppName')]", "location": "[parameters('location')]", "kind": "functionapp", @@ -132,11 +132,11 @@ }, { "name": "AzureWebJobsStorage", - "value": "[format('DefaultEndpointsProtocol=https;AccountName={0};AccountKey={1};EndpointSuffix={2}', variables('storageAccountName'), listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('storageAccountName')), '2022-09-01').keys[0].value, environment().suffixes.storage)]" + "value": "[format('DefaultEndpointsProtocol=https;AccountName={0};AccountKey={1};EndpointSuffix={2}', variables('storageAccountName'), listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('storageAccountName')), '2023-05-01').keys[0].value, environment().suffixes.storage)]" }, { "name": "WEBSITE_CONTENTAZUREFILECONNECTIONSTRING", - "value": "[format('DefaultEndpointsProtocol=https;AccountName={0};AccountKey={1};EndpointSuffix={2}', variables('storageAccountName'), listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('storageAccountName')), '2022-09-01').keys[0].value, environment().suffixes.storage)]" + "value": "[format('DefaultEndpointsProtocol=https;AccountName={0};AccountKey={1};EndpointSuffix={2}', variables('storageAccountName'), listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('storageAccountName')), '2023-05-01').keys[0].value, environment().suffixes.storage)]" }, { "name": "WEBSITE_CONTENTSHARE", @@ -150,6 +150,10 @@ "name": "FUNCTIONS_EXTENSION_VERSION", "value": "~4" }, + { + "name": "FUNCTIONS_INPROC_NET8_ENABLED", + "value": "1" + }, { "name": "FUNCTIONS_WORKER_RUNTIME", "value": "dotnet" @@ -171,7 +175,7 @@ "value": "[environment().name]" } ], - "netFrameworkVersion": "v6.0", + "netFrameworkVersion": "v8.0", "ftpsState": "Disabled", "minTlsVersion": "1.2", "scmMinTlsVersion": "1.2" @@ -191,11 +195,11 @@ }, "principalId": { "type": "string", - "value": "[reference(resourceId('Microsoft.Web/sites', variables('functionAppName')), '2022-03-01', 'full').identity.principalId]" + "value": "[reference(resourceId('Microsoft.Web/sites', variables('functionAppName')), '2023-12-01', 'full').identity.principalId]" }, "tenantId": { "type": "string", - "value": "[reference(resourceId('Microsoft.Web/sites', variables('functionAppName')), '2022-03-01', 'full').identity.tenantId]" + "value": "[reference(resourceId('Microsoft.Web/sites', variables('functionAppName')), '2023-12-01', 'full').identity.tenantId]" } } } \ No newline at end of file