diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 5a09908..484e215 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -13,10 +13,10 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Setup .NET Core - uses: actions/setup-dotnet@v1 + - name: Setup .NET + uses: actions/setup-dotnet@v3 with: - dotnet-version: 3.1.101 + dotnet-version: 6.x - name: Install AWS Lambda Tool run: dotnet tool install -g Amazon.Lambda.Tools - name: Install dependencies diff --git a/aws-lambda-tools-defaults.json b/aws-lambda-tools-defaults.json index fb4895d..bde7fd8 100644 --- a/aws-lambda-tools-defaults.json +++ b/aws-lambda-tools-defaults.json @@ -1,7 +1,7 @@ { "region": "eu-west-1", "configuration": "Release", - "framework": "netcoreapp3.1", + "framework": "dotnet6", "stack-name": "gu-api-stack", "s3-bucket": "gu-api-deployments", "template": "template.yml" diff --git a/src/Gu.ApiGateway.CustomAuthorizer/Gu.ApiGateway.CustomAuthorizer.csproj b/src/Gu.ApiGateway.CustomAuthorizer/Gu.ApiGateway.CustomAuthorizer.csproj index b29cbc8..743bed5 100644 --- a/src/Gu.ApiGateway.CustomAuthorizer/Gu.ApiGateway.CustomAuthorizer.csproj +++ b/src/Gu.ApiGateway.CustomAuthorizer/Gu.ApiGateway.CustomAuthorizer.csproj @@ -1,14 +1,14 @@ - + - netcoreapp3.1 + net6.0 true Lambda - - - - - + + + + + \ No newline at end of file diff --git a/src/Gu.MailChimp.Api/Gu.MailChimp.Api.csproj b/src/Gu.MailChimp.Api/Gu.MailChimp.Api.csproj index 5d83aae..fe37341 100644 --- a/src/Gu.MailChimp.Api/Gu.MailChimp.Api.csproj +++ b/src/Gu.MailChimp.Api/Gu.MailChimp.Api.csproj @@ -1,19 +1,18 @@ - + - netcoreapp3.1 + net6.0 true Lambda - - - - - - - - - + + + + + + + + diff --git a/src/Gu.PaftaBulucu.Bot/Gu.PaftaBulucu.Bot.csproj b/src/Gu.PaftaBulucu.Bot/Gu.PaftaBulucu.Bot.csproj index bb6b532..26709ef 100644 --- a/src/Gu.PaftaBulucu.Bot/Gu.PaftaBulucu.Bot.csproj +++ b/src/Gu.PaftaBulucu.Bot/Gu.PaftaBulucu.Bot.csproj @@ -1,19 +1,18 @@ - + - netcoreapp3.1 + net6.0 true Lambda - - - - - - - - - + + + + + + + + diff --git a/src/Gu.PaftaBulucu.Business/Gu.PaftaBulucu.Business.csproj b/src/Gu.PaftaBulucu.Business/Gu.PaftaBulucu.Business.csproj index 8ec11b8..f116fde 100644 --- a/src/Gu.PaftaBulucu.Business/Gu.PaftaBulucu.Business.csproj +++ b/src/Gu.PaftaBulucu.Business/Gu.PaftaBulucu.Business.csproj @@ -1,11 +1,11 @@  - netcoreapp3.1 + net6.0 - + diff --git a/src/Gu.PaftaBulucu.Data/Gu.PaftaBulucu.Data.csproj b/src/Gu.PaftaBulucu.Data/Gu.PaftaBulucu.Data.csproj index 1f5f023..5e9152c 100644 --- a/src/Gu.PaftaBulucu.Data/Gu.PaftaBulucu.Data.csproj +++ b/src/Gu.PaftaBulucu.Data/Gu.PaftaBulucu.Data.csproj @@ -1,15 +1,15 @@  - netcoreapp2.1 + net6.0 - - - - - + + + + + diff --git a/src/Gu.PaftaBulucu.WebApi/Gu.PaftaBulucu.WebApi.csproj b/src/Gu.PaftaBulucu.WebApi/Gu.PaftaBulucu.WebApi.csproj index 1c04cb5..9cfd110 100644 --- a/src/Gu.PaftaBulucu.WebApi/Gu.PaftaBulucu.WebApi.csproj +++ b/src/Gu.PaftaBulucu.WebApi/Gu.PaftaBulucu.WebApi.csproj @@ -1,15 +1,15 @@  - netcoreapp3.1 + net6.0 true Lambda - - - + + + diff --git a/template.yml b/template.yml index 17547f3..3eebec3 100644 --- a/template.yml +++ b/template.yml @@ -40,7 +40,7 @@ Resources: FunctionName: GuAuth0CustomAuthorizer CodeUri: ./src/Gu.ApiGateway.CustomAuthorizer/ Handler: Gu.ApiGateway.CustomAuthorizer::Gu.ApiGateway.CustomAuthorizer.Function::FunctionHandlerAsync - Runtime: dotnetcore3.1 + Runtime: dotnet6 MemorySize: 256 Timeout: 30 Role: arn:aws:iam::065627307699:role/GuApiCustomAuthorizerLambdaFunctionRole @@ -55,7 +55,7 @@ Resources: Properties: FunctionName: PaftaBulucuBotFunction Handler: Gu.PaftaBulucu.Bot::Gu.PaftaBulucu.Bot.Function::FunctionHandlerAsync - Runtime: dotnetcore3.1 + Runtime: dotnet6 CodeUri: ./src/Gu.PaftaBulucu.Bot/ Description: Provide Telegram bot for sheet queries MemorySize: 256 @@ -80,7 +80,7 @@ Resources: Properties: FunctionName: GuMailChimpApiFunction Handler: Gu.MailChimp.Api::Gu.MailChimp.Api.Function::FunctionHandlerAsync - Runtime: dotnetcore3.1 + Runtime: dotnet6 CodeUri: ./src/Gu.MailChimp.Api/ Description: Provide API for MailChimp subscriptions MemorySize: 256 @@ -99,7 +99,7 @@ Resources: Properties: FunctionName: PaftaBulucuApiFunction Handler: Gu.PaftaBulucu.WebApi::Gu.PaftaBulucu.WebApi.LambdaEntryPoint::FunctionHandlerAsync - Runtime: dotnetcore3.1 + Runtime: dotnet6 CodeUri: ./src/Gu.PaftaBulucu.WebApi/ Description: Provide set of endpoints to find sheet name based on coordinates or get sheet's boundries based on sheet name. MemorySize: 256 diff --git a/test/Gu.PaftaBulucu.Business.Tests/Gu.PaftaBulucu.Business.Tests.csproj b/test/Gu.PaftaBulucu.Business.Tests/Gu.PaftaBulucu.Business.Tests.csproj index ef52583..6644ba2 100644 --- a/test/Gu.PaftaBulucu.Business.Tests/Gu.PaftaBulucu.Business.Tests.csproj +++ b/test/Gu.PaftaBulucu.Business.Tests/Gu.PaftaBulucu.Business.Tests.csproj @@ -1,16 +1,15 @@  - netcoreapp3.1 - + net6.0 false - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/Gu.PaftaBulucu.Data.Tests/Gu.PaftaBulucu.Data.Tests.csproj b/test/Gu.PaftaBulucu.Data.Tests/Gu.PaftaBulucu.Data.Tests.csproj index 024ac8d..6cb0924 100644 --- a/test/Gu.PaftaBulucu.Data.Tests/Gu.PaftaBulucu.Data.Tests.csproj +++ b/test/Gu.PaftaBulucu.Data.Tests/Gu.PaftaBulucu.Data.Tests.csproj @@ -1,16 +1,15 @@ - netcoreapp3.1 - + net6.0 false - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/Gu.PaftaBulucu.WebApi.Tests/Gu.PaftaBulucu.WebApi.Tests.csproj b/test/Gu.PaftaBulucu.WebApi.Tests/Gu.PaftaBulucu.WebApi.Tests.csproj index 76baf7c..1b475e7 100644 --- a/test/Gu.PaftaBulucu.WebApi.Tests/Gu.PaftaBulucu.WebApi.Tests.csproj +++ b/test/Gu.PaftaBulucu.WebApi.Tests/Gu.PaftaBulucu.WebApi.Tests.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net6.0 @@ -24,16 +24,16 @@ - - - + + + - - + + - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive