Skip to content

Commit 6ab15ea

Browse files
authored
Merge pull request #146 from cocobokostudios/ft/devcontainer-updates
Update DevContainer to .NET 6 and Functions 4, during a live hackathon
2 parents 1c53c15 + 35f163d commit 6ab15ea

File tree

6 files changed

+20
-18
lines changed

6 files changed

+20
-18
lines changed

.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Find the Dockerfile for mcr.microsoft.com/azure-functions/dotnet:3.0-dotnet3-core-tools at this URL
22
# https://github.com/Azure/azure-functions-docker/blob/main/host/3.0/buster/amd64/dotnet/dotnet-core-tools.Dockerfile
3-
FROM mcr.microsoft.com/azure-functions/dotnet:3.0-dotnet3-core-tools
3+
FROM mcr.microsoft.com/azure-functions/dotnet:4-dotnet6-core-tools
44

55
# Uncomment following lines If you want to enable Development Container Script
66
# For more details https://github.com/microsoft/vscode-dev-containers/tree/main/script-library

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
# Azurite files
1414
__azurite_*.json
15+
__blobstorage__
1516

1617
# User-specific files (MonoDevelop/Xamarin Studio)
1718
*.userprefs

.vscode/settings.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"azureFunctions.projectSubpath": "api/TwoWeeksReady",
3-
"azureFunctions.deploySubpath": "api/TwoWeeksReady/bin/Release/netcoreapp3.1/publish",
3+
"azureFunctions.deploySubpath": "api/TwoWeeksReady/bin/Release/net6.0/publish",
44
"azureFunctions.projectLanguage": "C#",
5-
"azureFunctions.projectRuntime": "~3",
5+
"azureFunctions.projectRuntime": "~4",
66
"debug.internalConsoleOptions": "neverOpen",
77
"azureFunctions.preDeployTask": "publish (functions)"
88
}

.vscode/tasks.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
"type": "func",
9999
"dependsOn": "API (Build)",
100100
"options": {
101-
"cwd": "${workspaceFolder}/api/TwoWeeksReady/bin/Debug/netcoreapp3.1",
101+
"cwd": "${workspaceFolder}/api/TwoWeeksReady/bin/Debug/net6.0",
102102
"languageWorkers__node__arguments": "--inspect=5858"
103103
},
104104
"command": "host start",

tools/CosmosEmulator/CosmosEmulator.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp3.1</TargetFramework>
5+
<TargetFramework>net6.0</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>
Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
{
2-
"IsEncrypted": false,
3-
"Values": {
4-
"FUNCTIONS_WORKER_RUNTIME": "dotnet",
5-
"OidcApiAuthSettings:Audience": "https://2wrdev.azurewebsites.net",
6-
"OidcApiAuthSettings:IssuerUrl": "https://login.2wr.org/"
7-
},
8-
"ConnectionStrings": {
9-
"CosmosDBConnection": "AccountEndpoint=https://localhost:8081/;AccountKey=YOURLOCALACCOUNTKEY",
10-
"StorageConnection": "UseDevelopmentStorage=true"
11-
},
12-
"Host":{
13-
"CORS": "*"
14-
}
2+
"IsEncrypted": false,
3+
"Values": {
4+
"AzureWebJobsStorage": "UseDevelopmentStorage=true",
5+
"FUNCTIONS_WORKER_RUNTIME": "dotnet",
6+
"OidcApiAuthSettings:Audience": "https://2wrdev.azurewebsites.net",
7+
"OidcApiAuthSettings:IssuerUrl": "https://login.2wr.org/"
8+
},
9+
"ConnectionStrings": {
10+
"CosmosDBConnection": "AccountEndpoint=https://localhost:8081/;AccountKey=C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw==",
11+
"StorageConnection": "UseDevelopmentStorage=true"
12+
},
13+
"Host":{
14+
"CORS": "*"
15+
}
1516
}

0 commit comments

Comments
 (0)