diff --git a/README.md b/README.md index c812d07..812690b 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ description: "This architecture walks you through the process involved in develo [![Node.js CI](https://github.com/Azure-Samples/Serverless-microservices-reference-architecture/actions/workflows/nodejs.yml/badge.svg)](https://github.com/Azure-Samples/Serverless-microservices-reference-architecture/actions/workflows/nodejs.yml) [![spa build](https://github.com/Azure-Samples/Serverless-microservices-reference-architecture/actions/workflows/spa.yml/badge.svg)](https://github.com/Azure-Samples/Serverless-microservices-reference-architecture/actions/workflows/spa.yml) -> This sample has been upgraded to Azure Functions v3. An upgrade to Azure Functions v4 is in progress. See [PR #43](https://github.com/Azure-Samples/Serverless-microservices-reference-architecture/pull/43) for details. +> This sample is being upgraded to Azure Functions v4 / dotnet 6. See [PR #43](https://github.com/Azure-Samples/Serverless-microservices-reference-architecture/pull/43) for details. ## The reference architecture diff --git a/dotnet/ServerlessMicroservices.FunctionApp.Drivers/ServerlessMicroservices.FunctionApp.Drivers.csproj b/dotnet/ServerlessMicroservices.FunctionApp.Drivers/ServerlessMicroservices.FunctionApp.Drivers.csproj index 30aa239..e73d606 100644 --- a/dotnet/ServerlessMicroservices.FunctionApp.Drivers/ServerlessMicroservices.FunctionApp.Drivers.csproj +++ b/dotnet/ServerlessMicroservices.FunctionApp.Drivers/ServerlessMicroservices.FunctionApp.Drivers.csproj @@ -1,12 +1,13 @@ - netcoreapp3.1 - v3 + net6.0 + v4 + <_FunctionsSkipCleanOutput>true - + diff --git a/dotnet/ServerlessMicroservices.FunctionApp.Orchestrators/ServerlessMicroservices.FunctionApp.Orchestrators.csproj b/dotnet/ServerlessMicroservices.FunctionApp.Orchestrators/ServerlessMicroservices.FunctionApp.Orchestrators.csproj index 7dccd57..65c3e60 100644 --- a/dotnet/ServerlessMicroservices.FunctionApp.Orchestrators/ServerlessMicroservices.FunctionApp.Orchestrators.csproj +++ b/dotnet/ServerlessMicroservices.FunctionApp.Orchestrators/ServerlessMicroservices.FunctionApp.Orchestrators.csproj @@ -1,12 +1,13 @@  - netcoreapp3.1 - v3 + net6.0 + v4 + <_FunctionsSkipCleanOutput>true - - - + + + diff --git a/dotnet/ServerlessMicroservices.FunctionApp.Passengers/ServerlessMicroservices.FunctionApp.Passengers.csproj b/dotnet/ServerlessMicroservices.FunctionApp.Passengers/ServerlessMicroservices.FunctionApp.Passengers.csproj index c1ffded..8ce7f49 100644 --- a/dotnet/ServerlessMicroservices.FunctionApp.Passengers/ServerlessMicroservices.FunctionApp.Passengers.csproj +++ b/dotnet/ServerlessMicroservices.FunctionApp.Passengers/ServerlessMicroservices.FunctionApp.Passengers.csproj @@ -1,11 +1,11 @@ - netcoreapp3.1 - v3 - <_FunctionsSkipCleanOutput>true + net6.0 + v4 + <_FunctionsSkipCleanOutput>true - + diff --git a/dotnet/ServerlessMicroservices.FunctionApp.Trips/ServerlessMicroservices.FunctionApp.Trips.csproj b/dotnet/ServerlessMicroservices.FunctionApp.Trips/ServerlessMicroservices.FunctionApp.Trips.csproj index 0fa7f0a..d63a4f5 100644 --- a/dotnet/ServerlessMicroservices.FunctionApp.Trips/ServerlessMicroservices.FunctionApp.Trips.csproj +++ b/dotnet/ServerlessMicroservices.FunctionApp.Trips/ServerlessMicroservices.FunctionApp.Trips.csproj @@ -1,13 +1,15 @@  - netcoreapp3.1 - v3 + net6.0 + v4 + <_FunctionsSkipCleanOutput>true - + - - + + + diff --git a/dotnet/ServerlessMicroservices.Models/ServerlessMicroservices.Models.csproj b/dotnet/ServerlessMicroservices.Models/ServerlessMicroservices.Models.csproj index 3271307..eae6d33 100644 --- a/dotnet/ServerlessMicroservices.Models/ServerlessMicroservices.Models.csproj +++ b/dotnet/ServerlessMicroservices.Models/ServerlessMicroservices.Models.csproj @@ -1,7 +1,7 @@ - netcoreapp3.1 + net6.0 diff --git a/dotnet/ServerlessMicroservices.Seeder/ServerlessMicroservices.Seeder.csproj b/dotnet/ServerlessMicroservices.Seeder/ServerlessMicroservices.Seeder.csproj index f278268..b1c2116 100644 --- a/dotnet/ServerlessMicroservices.Seeder/ServerlessMicroservices.Seeder.csproj +++ b/dotnet/ServerlessMicroservices.Seeder/ServerlessMicroservices.Seeder.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp3.1 + net6.0 diff --git a/dotnet/ServerlessMicroservices.Shared/ServerlessMicroservices.Shared.csproj b/dotnet/ServerlessMicroservices.Shared/ServerlessMicroservices.Shared.csproj index 424cdc2..5050d11 100644 --- a/dotnet/ServerlessMicroservices.Shared/ServerlessMicroservices.Shared.csproj +++ b/dotnet/ServerlessMicroservices.Shared/ServerlessMicroservices.Shared.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net6.0 diff --git a/scripts/run-local.ps1 b/scripts/run-local.ps1 index 5fea02c..e84cbbe 100644 --- a/scripts/run-local.ps1 +++ b/scripts/run-local.ps1 @@ -1,5 +1,5 @@ # NOTE: Install latest versions of Node and NPM: https://nodejs.org/en/download/ -# NOTE: Install latest version of func CLI: https://docs.microsoft.com/en-us/azure/azure-functions/functions-run-local +# NOTE: Function core tools v4 must be installed: https://docs.microsoft.com/en-us/azure/azure-functions/functions-run-local?tabs=v4%2Cwindows%2Ccsharp%2Cportal%2Cbash#install-the-azure-functions-core-tools # NOTE: Start Azure Storage Emulator https://docs.microsoft.com/en-us/azure/storage/common/storage-use-emulator $ErrorActionPreference = 'Stop' @@ -19,17 +19,20 @@ try { Write-Host 'Build and start Trip Archiver Nodejs Function...' Start-Process pwsh { -c cd ../nodejs/serverless-microservices-functionapp-triparchiver && npm install && npm run pack && func start --javascript -p 7075 --cors http://localhost:4280 } + Write-Host 'Build dotnet...' + dotnet build -c Debug + Write-Host 'Build and start Drivers Function...' - Start-Process pwsh { -c cd ServerlessMicroservices.FunctionApp.Drivers && func start --csharp -p 7071 --cors http://localhost:4280 } + Start-Process pwsh { -c cd ServerlessMicroservices.FunctionApp.Drivers/bin/Debug/net6.0 && func start --csharp -p 7071 --cors http://localhost:4280 --no-build } Write-Host 'Build and start Trips Function...' - Start-Process pwsh { -c cd ServerlessMicroservices.FunctionApp.Trips && func start --csharp -p 7072 --cors http://localhost:4280 } + Start-Process pwsh { -c cd ServerlessMicroservices.FunctionApp.Trips/bin/Debug/net6.0 && func start --csharp -p 7072 --cors http://localhost:4280 --no-build } Write-Host 'Build and start Passengers Function...' - Start-Process pwsh { -c cd ServerlessMicroservices.FunctionApp.Passengers && func start --csharp -p 7073 --cors http://localhost:4280 } + Start-Process pwsh { -c cd ServerlessMicroservices.FunctionApp.Passengers/bin/Debug/net6.0 && func start --csharp -p 7073 --cors http://localhost:4280 --no-build } Write-Host 'Build and start Orchestrators Function...' - Start-Process pwsh { -c cd ServerlessMicroservices.FunctionApp.Orchestrators && func start --csharp -p 7074 --cors http://localhost:4280 } + Start-Process pwsh { -c cd ServerlessMicroservices.FunctionApp.Orchestrators/bin/Debug/net6.0 && func start --csharp -p 7074 --cors http://localhost:4280 --no-build } Write-Host 'When all builds have finished, open browser at http://localhost:4280/'