From db3144286d73e5e6cc489aea391b756fd7011b74 Mon Sep 17 00:00:00 2001 From: Phil Asmar Date: Thu, 1 May 2025 20:06:57 -0400 Subject: [PATCH] feat: upgrade deploy tool to net8.0 --- site/content/contributing.md | 2 +- site/content/docs/commands/deploy.md | 2 +- site/content/docs/deployment-projects/recipe-file.md | 8 ++++---- site/content/docs/getting-started/run-tool.md | 2 +- site/content/troubleshooting-guide/index.md | 2 +- site/content/tutorials/custom-project.md | 2 +- src/AWS.Deploy.CLI/AWS.Deploy.CLI.csproj | 2 +- .../ServerMode/AwsCredentialsAuthenticationHandler.cs | 3 +-- src/AWS.Deploy.Common/AWS.Deploy.Common.csproj | 2 +- .../AWS.Deploy.Orchestration.csproj | 4 ++-- .../AWS.Deploy.Recipes.CDK.Common.csproj | 2 +- src/AWS.Deploy.Recipes/AWS.Deploy.Recipes.csproj | 2 +- .../AspNetAppAppRunner/AspNetAppAppRunner.csproj | 2 +- .../AspNetAppEcsFargate/AspNetAppEcsFargate.csproj | 2 +- .../AspNetAppElasticBeanstalkLinux.csproj | 2 +- .../AspNetAppElasticBeanstalkWindows.csproj | 2 +- .../CdkTemplates/BlazorWasm/BlazorWasm.csproj | 2 +- .../CdkTemplates/BlazorWasm/Generated/Recipe.cs | 2 +- .../ConsoleAppECSFargateScheduleTask.csproj | 2 +- .../ConsoleAppEcsFargateService.csproj | 2 +- .../AWS.Deploy.ServerMode.ClientGenerator.csproj | 2 +- .../AWS.Deploy.CLI.Common.UnitTests.csproj | 2 +- .../AWS.Deploy.CLI.IntegrationTests.csproj | 2 +- .../AWS.Deploy.CLI.UnitTests.csproj | 8 ++++---- .../AWS.Deploy.DockerImageUploader.csproj | 2 +- .../AWS.Deploy.Orchestration.UnitTests.csproj | 2 +- .../AWS.Deploy.ServerMode.Client.UnitTests.csproj | 4 ++-- 27 files changed, 35 insertions(+), 36 deletions(-) diff --git a/site/content/contributing.md b/site/content/contributing.md index b93e1f9d0..1b27e9e41 100644 --- a/site/content/contributing.md +++ b/site/content/contributing.md @@ -176,7 +176,7 @@ To support IDEs using the AWS .NET Deploy tool the CLI can be launched in server ```json { "DeployServer":{ - "AlternateCliPath":"C:\\code\\aws-dotnet-deploy\\src\\AWS.Deploy.CLI\\bin\\Release\\net6.0\\AWS.Deploy.CLI.exe", + "AlternateCliPath":"C:\\code\\aws-dotnet-deploy\\src\\AWS.Deploy.CLI\\bin\\Release\\net8.0\\AWS.Deploy.CLI.exe", "PortRange":{ "Start":10000, "End":10100 diff --git a/site/content/docs/commands/deploy.md b/site/content/docs/commands/deploy.md index a8642d7f3..4c99189fb 100644 --- a/site/content/docs/commands/deploy.md +++ b/site/content/docs/commands/deploy.md @@ -19,7 +19,7 @@ Inspects the project and recommends AWS compute that is most suited to the type Deploying HelloWorld ``` -dotnet new web -n HelloWorld -f net6.0 +dotnet new web -n HelloWorld -f net8.0 cd HelloWorld dotnet aws deploy ``` diff --git a/site/content/docs/deployment-projects/recipe-file.md b/site/content/docs/deployment-projects/recipe-file.md index 66d1c7c27..4421003d8 100644 --- a/site/content/docs/deployment-projects/recipe-file.md +++ b/site/content/docs/deployment-projects/recipe-file.md @@ -60,8 +60,8 @@ The deploy tool supports a collection of tests that can be run against the .NET "Condition": { "PropertyName": "TargetFramework", "AllowedValues": [ - "netcoreapp3.1", - "net6.0" + "net8.0", + "net9.0" ] } } @@ -103,8 +103,8 @@ Here is an example of a rule that checks if the project is a web project and tar "Condition": { "PropertyName": "TargetFramework", "AllowedValues": [ - "netcoreapp3.1", - "net6.0" + "net8.0", + "net9.0" ] } } diff --git a/site/content/docs/getting-started/run-tool.md b/site/content/docs/getting-started/run-tool.md index bef6e0056..bb8574f04 100644 --- a/site/content/docs/getting-started/run-tool.md +++ b/site/content/docs/getting-started/run-tool.md @@ -12,7 +12,7 @@ dotnet-aws ... #### Step 1: Create the ASP.NET Web application ``` -dotnet new web -n HelloWorld -f net6.0 +dotnet new web -n HelloWorld -f net8.0 ``` #### Step 2: cd to the project folder diff --git a/site/content/troubleshooting-guide/index.md b/site/content/troubleshooting-guide/index.md index 1aa4534ac..a29784054 100644 --- a/site/content/troubleshooting-guide/index.md +++ b/site/content/troubleshooting-guide/index.md @@ -30,7 +30,7 @@ For example: ```xml - net6.0 + net8.0 $(TargetFrameworkVersion) diff --git a/site/content/tutorials/custom-project.md b/site/content/tutorials/custom-project.md index 6a99341e3..229419750 100644 --- a/site/content/tutorials/custom-project.md +++ b/site/content/tutorials/custom-project.md @@ -20,7 +20,7 @@ Tasks we will accomplish: In your command prompt, run the following command to create your app: ``` -dotnet new webapp -o Acme.WebApp -f net6.0 +dotnet new webapp -o Acme.WebApp -f net8.0 ``` ### Step 2: Generate a deployment project diff --git a/src/AWS.Deploy.CLI/AWS.Deploy.CLI.csproj b/src/AWS.Deploy.CLI/AWS.Deploy.CLI.csproj index 1c47f6e3b..f72b4f42f 100644 --- a/src/AWS.Deploy.CLI/AWS.Deploy.CLI.csproj +++ b/src/AWS.Deploy.CLI/AWS.Deploy.CLI.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 dotnet-aws true true diff --git a/src/AWS.Deploy.CLI/ServerMode/AwsCredentialsAuthenticationHandler.cs b/src/AWS.Deploy.CLI/ServerMode/AwsCredentialsAuthenticationHandler.cs index 0d3545b16..befab210e 100644 --- a/src/AWS.Deploy.CLI/ServerMode/AwsCredentialsAuthenticationHandler.cs +++ b/src/AWS.Deploy.CLI/ServerMode/AwsCredentialsAuthenticationHandler.cs @@ -62,9 +62,8 @@ public AwsCredentialsAuthenticationHandler( IOptionsMonitor options, ILoggerFactory logger, UrlEncoder encoder, - ISystemClock clock, IEncryptionProvider encryptionProvider) - : base(options, logger, encoder, clock) + : base(options, logger, encoder) { _encryptionProvider = encryptionProvider; } diff --git a/src/AWS.Deploy.Common/AWS.Deploy.Common.csproj b/src/AWS.Deploy.Common/AWS.Deploy.Common.csproj index a414d1e1a..aea6efad9 100644 --- a/src/AWS.Deploy.Common/AWS.Deploy.Common.csproj +++ b/src/AWS.Deploy.Common/AWS.Deploy.Common.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 Latest AWS.Deploy.Common AWS.Deploy.Common diff --git a/src/AWS.Deploy.Orchestration/AWS.Deploy.Orchestration.csproj b/src/AWS.Deploy.Orchestration/AWS.Deploy.Orchestration.csproj index 2740b75b2..dbbde0884 100644 --- a/src/AWS.Deploy.Orchestration/AWS.Deploy.Orchestration.csproj +++ b/src/AWS.Deploy.Orchestration/AWS.Deploy.Orchestration.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 Latest AWS.Deploy.Orchestration AWS.Deploy.Orchestration @@ -37,7 +37,7 @@ - + diff --git a/src/AWS.Deploy.Recipes.CDK.Common/AWS.Deploy.Recipes.CDK.Common.csproj b/src/AWS.Deploy.Recipes.CDK.Common/AWS.Deploy.Recipes.CDK.Common.csproj index 40fb2ad99..502187978 100644 --- a/src/AWS.Deploy.Recipes.CDK.Common/AWS.Deploy.Recipes.CDK.Common.csproj +++ b/src/AWS.Deploy.Recipes.CDK.Common/AWS.Deploy.Recipes.CDK.Common.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 AWS .NET deployment tool CDK Utilities Utility code used in CDK recipes used by the AWS .NET deployment tool. This package is not intended for direct usage. AWS.Deploy.Recipes.CDK.Common diff --git a/src/AWS.Deploy.Recipes/AWS.Deploy.Recipes.csproj b/src/AWS.Deploy.Recipes/AWS.Deploy.Recipes.csproj index a3ef76e6a..cfb3d8e6d 100644 --- a/src/AWS.Deploy.Recipes/AWS.Deploy.Recipes.csproj +++ b/src/AWS.Deploy.Recipes/AWS.Deploy.Recipes.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 AWS.Deploy.Recipes AWS.Deploy.Recipes diff --git a/src/AWS.Deploy.Recipes/CdkTemplates/AspNetAppAppRunner/AspNetAppAppRunner.csproj b/src/AWS.Deploy.Recipes/CdkTemplates/AspNetAppAppRunner/AspNetAppAppRunner.csproj index d1bfb2f08..3e833a80b 100644 --- a/src/AWS.Deploy.Recipes/CdkTemplates/AspNetAppAppRunner/AspNetAppAppRunner.csproj +++ b/src/AWS.Deploy.Recipes/CdkTemplates/AspNetAppAppRunner/AspNetAppAppRunner.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 Major enable DeploymentProject diff --git a/src/AWS.Deploy.Recipes/CdkTemplates/AspNetAppEcsFargate/AspNetAppEcsFargate.csproj b/src/AWS.Deploy.Recipes/CdkTemplates/AspNetAppEcsFargate/AspNetAppEcsFargate.csproj index ee7ecfd2b..6f9f5bb01 100644 --- a/src/AWS.Deploy.Recipes/CdkTemplates/AspNetAppEcsFargate/AspNetAppEcsFargate.csproj +++ b/src/AWS.Deploy.Recipes/CdkTemplates/AspNetAppEcsFargate/AspNetAppEcsFargate.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 Major enable DeploymentProject diff --git a/src/AWS.Deploy.Recipes/CdkTemplates/AspNetAppElasticBeanstalkLinux/AspNetAppElasticBeanstalkLinux.csproj b/src/AWS.Deploy.Recipes/CdkTemplates/AspNetAppElasticBeanstalkLinux/AspNetAppElasticBeanstalkLinux.csproj index 7e8312aaf..c4cb0b7eb 100644 --- a/src/AWS.Deploy.Recipes/CdkTemplates/AspNetAppElasticBeanstalkLinux/AspNetAppElasticBeanstalkLinux.csproj +++ b/src/AWS.Deploy.Recipes/CdkTemplates/AspNetAppElasticBeanstalkLinux/AspNetAppElasticBeanstalkLinux.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 Major enable DeploymentProject diff --git a/src/AWS.Deploy.Recipes/CdkTemplates/AspNetAppElasticBeanstalkWindows/AspNetAppElasticBeanstalkWindows.csproj b/src/AWS.Deploy.Recipes/CdkTemplates/AspNetAppElasticBeanstalkWindows/AspNetAppElasticBeanstalkWindows.csproj index 7e8312aaf..c4cb0b7eb 100644 --- a/src/AWS.Deploy.Recipes/CdkTemplates/AspNetAppElasticBeanstalkWindows/AspNetAppElasticBeanstalkWindows.csproj +++ b/src/AWS.Deploy.Recipes/CdkTemplates/AspNetAppElasticBeanstalkWindows/AspNetAppElasticBeanstalkWindows.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 Major enable DeploymentProject diff --git a/src/AWS.Deploy.Recipes/CdkTemplates/BlazorWasm/BlazorWasm.csproj b/src/AWS.Deploy.Recipes/CdkTemplates/BlazorWasm/BlazorWasm.csproj index d1bfb2f08..3e833a80b 100644 --- a/src/AWS.Deploy.Recipes/CdkTemplates/BlazorWasm/BlazorWasm.csproj +++ b/src/AWS.Deploy.Recipes/CdkTemplates/BlazorWasm/BlazorWasm.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 Major enable DeploymentProject diff --git a/src/AWS.Deploy.Recipes/CdkTemplates/BlazorWasm/Generated/Recipe.cs b/src/AWS.Deploy.Recipes/CdkTemplates/BlazorWasm/Generated/Recipe.cs index 8b5718aab..d07b7c7e1 100644 --- a/src/AWS.Deploy.Recipes/CdkTemplates/BlazorWasm/Generated/Recipe.cs +++ b/src/AWS.Deploy.Recipes/CdkTemplates/BlazorWasm/Generated/Recipe.cs @@ -76,7 +76,7 @@ private void ConfigureCloudFrontDistribution(Configuration settings) { DefaultBehavior = new BehaviorOptions { - Origin = new S3Origin(ContentS3Bucket, new S3OriginProps()) + Origin = S3BucketOrigin.WithOriginAccessControl(ContentS3Bucket) }, DefaultRootObject = settings.IndexDocument, EnableIpv6 = settings.EnableIpv6, diff --git a/src/AWS.Deploy.Recipes/CdkTemplates/ConsoleAppECSFargateScheduleTask/ConsoleAppECSFargateScheduleTask.csproj b/src/AWS.Deploy.Recipes/CdkTemplates/ConsoleAppECSFargateScheduleTask/ConsoleAppECSFargateScheduleTask.csproj index d1bfb2f08..3e833a80b 100644 --- a/src/AWS.Deploy.Recipes/CdkTemplates/ConsoleAppECSFargateScheduleTask/ConsoleAppECSFargateScheduleTask.csproj +++ b/src/AWS.Deploy.Recipes/CdkTemplates/ConsoleAppECSFargateScheduleTask/ConsoleAppECSFargateScheduleTask.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 Major enable DeploymentProject diff --git a/src/AWS.Deploy.Recipes/CdkTemplates/ConsoleAppECSFargateService/ConsoleAppEcsFargateService.csproj b/src/AWS.Deploy.Recipes/CdkTemplates/ConsoleAppECSFargateService/ConsoleAppEcsFargateService.csproj index d1bfb2f08..3e833a80b 100644 --- a/src/AWS.Deploy.Recipes/CdkTemplates/ConsoleAppECSFargateService/ConsoleAppEcsFargateService.csproj +++ b/src/AWS.Deploy.Recipes/CdkTemplates/ConsoleAppECSFargateService/ConsoleAppEcsFargateService.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 Major enable DeploymentProject diff --git a/src/AWS.Deploy.ServerMode.ClientGenerator/AWS.Deploy.ServerMode.ClientGenerator.csproj b/src/AWS.Deploy.ServerMode.ClientGenerator/AWS.Deploy.ServerMode.ClientGenerator.csproj index 3f1bf7a1a..af8016a2c 100644 --- a/src/AWS.Deploy.ServerMode.ClientGenerator/AWS.Deploy.ServerMode.ClientGenerator.csproj +++ b/src/AWS.Deploy.ServerMode.ClientGenerator/AWS.Deploy.ServerMode.ClientGenerator.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 Major diff --git a/test/AWS.Deploy.CLI.Common.UnitTests/AWS.Deploy.CLI.Common.UnitTests.csproj b/test/AWS.Deploy.CLI.Common.UnitTests/AWS.Deploy.CLI.Common.UnitTests.csproj index 7b4bdfcfb..21e0db458 100644 --- a/test/AWS.Deploy.CLI.Common.UnitTests/AWS.Deploy.CLI.Common.UnitTests.csproj +++ b/test/AWS.Deploy.CLI.Common.UnitTests/AWS.Deploy.CLI.Common.UnitTests.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 false Latest diff --git a/test/AWS.Deploy.CLI.IntegrationTests/AWS.Deploy.CLI.IntegrationTests.csproj b/test/AWS.Deploy.CLI.IntegrationTests/AWS.Deploy.CLI.IntegrationTests.csproj index 6ed3aa149..7247d252f 100644 --- a/test/AWS.Deploy.CLI.IntegrationTests/AWS.Deploy.CLI.IntegrationTests.csproj +++ b/test/AWS.Deploy.CLI.IntegrationTests/AWS.Deploy.CLI.IntegrationTests.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 false diff --git a/test/AWS.Deploy.CLI.UnitTests/AWS.Deploy.CLI.UnitTests.csproj b/test/AWS.Deploy.CLI.UnitTests/AWS.Deploy.CLI.UnitTests.csproj index 894582a0c..0a8c4a550 100644 --- a/test/AWS.Deploy.CLI.UnitTests/AWS.Deploy.CLI.UnitTests.csproj +++ b/test/AWS.Deploy.CLI.UnitTests/AWS.Deploy.CLI.UnitTests.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 false AWS.Deploy.CLI.UnitTests AWS.Deploy.CLI.UnitTests @@ -16,7 +16,7 @@ Always - + @@ -34,7 +34,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + @@ -43,5 +43,5 @@ - + diff --git a/test/AWS.Deploy.DockerImageUploader/AWS.Deploy.DockerImageUploader.csproj b/test/AWS.Deploy.DockerImageUploader/AWS.Deploy.DockerImageUploader.csproj index 91eb733db..35afce164 100644 --- a/test/AWS.Deploy.DockerImageUploader/AWS.Deploy.DockerImageUploader.csproj +++ b/test/AWS.Deploy.DockerImageUploader/AWS.Deploy.DockerImageUploader.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 enable diff --git a/test/AWS.Deploy.Orchestration.UnitTests/AWS.Deploy.Orchestration.UnitTests.csproj b/test/AWS.Deploy.Orchestration.UnitTests/AWS.Deploy.Orchestration.UnitTests.csproj index ed639b1f4..7a1da2dd3 100644 --- a/test/AWS.Deploy.Orchestration.UnitTests/AWS.Deploy.Orchestration.UnitTests.csproj +++ b/test/AWS.Deploy.Orchestration.UnitTests/AWS.Deploy.Orchestration.UnitTests.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 false Latest diff --git a/test/AWS.Deploy.ServerMode.Client.UnitTests/AWS.Deploy.ServerMode.Client.UnitTests.csproj b/test/AWS.Deploy.ServerMode.Client.UnitTests/AWS.Deploy.ServerMode.Client.UnitTests.csproj index d0a9aa7c2..1a68d3710 100644 --- a/test/AWS.Deploy.ServerMode.Client.UnitTests/AWS.Deploy.ServerMode.Client.UnitTests.csproj +++ b/test/AWS.Deploy.ServerMode.Client.UnitTests/AWS.Deploy.ServerMode.Client.UnitTests.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 false @@ -17,7 +17,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive