diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 0d62f54..89e6114 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,6 +1,6 @@ # Find the Dockerfile for mcr.microsoft.com/azure-functions/dotnet:3.0-dotnet3-core-tools at this URL # https://github.com/Azure/azure-functions-docker/blob/main/host/3.0/buster/amd64/dotnet/dotnet-core-tools.Dockerfile -FROM mcr.microsoft.com/azure-functions/dotnet:3.0-dotnet3-core-tools +FROM mcr.microsoft.com/azure-functions/dotnet:4-dotnet6-core-tools # Uncomment following lines If you want to enable Development Container Script # For more details https://github.com/microsoft/vscode-dev-containers/tree/main/script-library diff --git a/.gitignore b/.gitignore index 0683a89..02b7d96 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,7 @@ # Azurite files __azurite_*.json +__blobstorage__ # User-specific files (MonoDevelop/Xamarin Studio) *.userprefs diff --git a/.vscode/settings.json b/.vscode/settings.json index eb91ab2..cf8e0c8 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,8 +1,8 @@ { "azureFunctions.projectSubpath": "api/TwoWeeksReady", - "azureFunctions.deploySubpath": "api/TwoWeeksReady/bin/Release/netcoreapp3.1/publish", + "azureFunctions.deploySubpath": "api/TwoWeeksReady/bin/Release/net6.0/publish", "azureFunctions.projectLanguage": "C#", - "azureFunctions.projectRuntime": "~3", + "azureFunctions.projectRuntime": "~4", "debug.internalConsoleOptions": "neverOpen", "azureFunctions.preDeployTask": "publish (functions)" } \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 7b83460..fbefe0e 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -98,7 +98,7 @@ "type": "func", "dependsOn": "API (Build)", "options": { - "cwd": "${workspaceFolder}/api/TwoWeeksReady/bin/Debug/netcoreapp3.1", + "cwd": "${workspaceFolder}/api/TwoWeeksReady/bin/Debug/net6.0", "languageWorkers__node__arguments": "--inspect=5858" }, "command": "host start", diff --git a/tools/CosmosEmulator/CosmosEmulator.csproj b/tools/CosmosEmulator/CosmosEmulator.csproj index eeae762..da3707d 100644 --- a/tools/CosmosEmulator/CosmosEmulator.csproj +++ b/tools/CosmosEmulator/CosmosEmulator.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp3.1 + net6.0 diff --git a/tools/samples/local.settings.sample.json b/tools/samples/local.settings.sample.json index 322b1e8..56d290e 100644 --- a/tools/samples/local.settings.sample.json +++ b/tools/samples/local.settings.sample.json @@ -1,15 +1,16 @@ { - "IsEncrypted": false, - "Values": { - "FUNCTIONS_WORKER_RUNTIME": "dotnet", - "OidcApiAuthSettings:Audience": "https://2wrdev.azurewebsites.net", - "OidcApiAuthSettings:IssuerUrl": "https://login.2wr.org/" - }, - "ConnectionStrings": { - "CosmosDBConnection": "AccountEndpoint=https://localhost:8081/;AccountKey=YOURLOCALACCOUNTKEY", - "StorageConnection": "UseDevelopmentStorage=true" - }, - "Host":{ - "CORS": "*" - } + "IsEncrypted": false, + "Values": { + "AzureWebJobsStorage": "UseDevelopmentStorage=true", + "FUNCTIONS_WORKER_RUNTIME": "dotnet", + "OidcApiAuthSettings:Audience": "https://2wrdev.azurewebsites.net", + "OidcApiAuthSettings:IssuerUrl": "https://login.2wr.org/" + }, + "ConnectionStrings": { + "CosmosDBConnection": "AccountEndpoint=https://localhost:8081/;AccountKey=C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw==", + "StorageConnection": "UseDevelopmentStorage=true" + }, + "Host":{ + "CORS": "*" + } } \ No newline at end of file