Merge pull request #951 from aws/feature/net8-upgrade

Deploy Tool v2.0.0

Author: philasmar

.autover/changes/3a630e1b-18ac-44ce-93fd-5a5954fa645c.json

@@ -0,0 +1,11 @@
+{
+  "Projects": [
+    {
+      "Name": "AWS.Deploy.CLI",
+      "Type": "Patch",
+      "ChangelogMessages": [
+        "NodeJS has been removed from the generated Dockerfiles. If you have an application that requires NodeJS, you will need to add it to the generated Dockerfile and rerun the Deploy Tool."
+      ]
+    }
+  ]
+}

.autover/changes/c2231f60-987f-4787-9f86-b3cb068e2e95.json

@@ -0,0 +1,18 @@
+{
+  "Projects": [
+    {
+      "Name": "AWS.Deploy.CLI",
+      "Type": "Major",
+      "ChangelogMessages": [
+        "Upgrade the Deploy Tool from .NET 6 to .NET 8",
+        "Switch from System.CommandLine to Spectre.CLI for a better CLI experience",
+        "Update Amazon CDK library to 2.194.0 and CDK CLI to 2.1013.0",
+        "Update AWS .NET SDK to V4",
+        "Upgrade Microsoft Templating Engine from .NET 5 to .NET 8",
+        "Add support for deploying .NET 10 applications across different recipes",
+        "Add support for Podman in addition to the existing Docker support",
+        "Update the minimum NodeJS version from 14.x to 18.x"
+      ]
+    }
+  ]
+}

.github/workflows/DetectDocGeneratorChanges.yml

@@ -18,10 +18,10 @@ jobs:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2
       with:
         fetch-depth: '0'
-    - name: Setup .NET 8.0
+    - name: Setup .NET 10.0
       uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 #v4.3.1
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 10.0.x
     - name: Restore dependencies
       run: dotnet restore
     - name: Build

.github/workflows/DetectRestAPIClientChanges.yml

@@ -9,10 +9,10 @@ jobs:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2
       with:
         fetch-depth: '0'
-    - name: Setup .NET 8.0
+    - name: Setup .NET 10.0
       uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 #v4.3.1
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 10.0.x
     - name: Restore dependencies
       run: dotnet restore
     - name: Build

.github/workflows/UploadDockerImage.yml

@@ -27,12 +27,7 @@ jobs:
       with:
         fetch-depth: 0
 
-    - name: Setup .NET Core 6.0
-      uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 #v4.3.1
-      with:
-        dotnet-version: 6.0.x
-     
-    - name: Setup .NET 8.0
+    - name: Setup .NET 8
       uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 #v4.3.1
       with:
         dotnet-version: 8.0.x

.github/workflows/doc-builder.yml

@@ -26,11 +26,7 @@ jobs:
       - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 #v5.6.0
         with:
           python-version: 3.x
-      - name: Setup .NET Core 6.0
-        uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 #v4.3.1
-        with:
-          dotnet-version: 6.0.x
-      - name: Setup .NET 8.0
+      - name: Setup .NET 8
         uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 #v4.3.1
         with:
           dotnet-version: 8.0.x

AWS.Deploy.sln

@@ -71,6 +71,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebAppArmDeployment", "test
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleAppArmDeployment", "testapps\ConsoleAppArmDeployment\ConsoleAppArmDeployment.csproj", "{BA7E7790-8E60-4133-B3BC-BDD50B1D7A76}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApiNET10", "testapps\WebApiNET10\WebApiNET10.csproj", "{31EF03BB-F9D0-465D-9D33-96E212A86D91}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -185,6 +187,10 @@ Global
 		{BA7E7790-8E60-4133-B3BC-BDD50B1D7A76}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BA7E7790-8E60-4133-B3BC-BDD50B1D7A76}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BA7E7790-8E60-4133-B3BC-BDD50B1D7A76}.Release|Any CPU.Build.0 = Release|Any CPU
+		{31EF03BB-F9D0-465D-9D33-96E212A86D91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{31EF03BB-F9D0-465D-9D33-96E212A86D91}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{31EF03BB-F9D0-465D-9D33-96E212A86D91}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{31EF03BB-F9D0-465D-9D33-96E212A86D91}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -218,6 +224,7 @@ Global
 		{49A1C020-F4C8-4B28-A6B2-6AD3C8452E69} = {BD466B5C-D8B0-4069-98A9-6DC8F01FA757}
 		{303A0323-3FEF-4640-80C2-E33A8BC0F1FC} = {C3A0C716-BDEA-4393-B223-AF8F8531522A}
 		{BA7E7790-8E60-4133-B3BC-BDD50B1D7A76} = {C3A0C716-BDEA-4393-B223-AF8F8531522A}
+		{31EF03BB-F9D0-465D-9D33-96E212A86D91} = {C3A0C716-BDEA-4393-B223-AF8F8531522A}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {5A4B2863-1763-4496-B122-651A38A4F5D7}

README.md

@@ -34,10 +34,10 @@ To take advantage of this library you’ll need:
   * The local credential profile can be configured by a variety of tools. For example, the credential profile can be configured with the [AWS Toolkit for Visual Studio](https://docs.aws.amazon.com/toolkit-for-visual-studio/latest/user-guide/credentials.html) or the [AWS CLI](https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-files.html), among others.
   * Note: You need to make sure to add the appropriate CloudFormation permissions to your credentials's profile / assumed role.
   * For SSO, please visit the [.NET SDK Reference Guide](https://docs.aws.amazon.com/sdkref/latest/guide/access-sso.html).
-* [.NET 6](https://dotnet.microsoft.com/download) or later
-* [Node.js 14](https://nodejs.org/en/download/) or later
+* [.NET 8](https://dotnet.microsoft.com/download) or later
+* [Node.js 18](https://nodejs.org/en/download/) or later
   * The [AWS Cloud Development Kit (CDK)](https://aws.amazon.com/cdk/) is used by this tool to create the AWS infrastructure to run applications. The CDK requires Node.js to function. This dependency is needed for deployments that are CDK based. If you will be using deployments that are not CDK based, you are not required to have this dependency.
-* (optional) [Docker](https://docs.docker.com/get-docker/)
+* (optional) [Docker](https://docs.docker.com/get-docker/) or [Podman](https://podman.io/docs/installation)
   * Used when deploying to a container based service like Amazon Elastic Container Service (Amazon ECS)
 * (optional) The zip cli tool
    *   Mac / Linux only. Used when creating zip packages for deployment bundles. The zip cli is used to maintain Linux file permissions.

THIRD_PARTY_LICENSES

@@ -21,7 +21,7 @@
 ** AWSSDK.ElasticLoadBalancingV2; version 3.7.302.33 -- https://www.nuget.org/packages/AWSSDK.ElasticLoadBalancingV2/
 ** AWSSDK.Core; version 3.7.303.20 -- https://www.nuget.org/packages/AWSSDK.Core
 ** AWSSDK.CloudWatchLogs; version 3.7.305.18 -- https://www.nuget.org/packages/AWSSDK.CloudWatchLogs
-** Amazon.CDK.Lib; version 2.171.1 -- https://www.nuget.org/packages/Amazon.CDK.Lib/
+** Amazon.CDK.Lib; version 2.194.0 -- https://www.nuget.org/packages/Amazon.CDK.Lib/
 
 Apache License
 Version 2.0, January 2004

buildtools/ci.buildspec.yml

@@ -5,6 +5,11 @@ phases:
     runtime-versions:
       nodejs: 22
       dotnet: 8.x
+    commands:
+      # Find and delete the global.json files that were added by CodeBuild. This causes issues when multiple SDKs are installed.
+      - find / -type f -name 'global.json' -delete
+      # The tests need .NET 6, 8 and 10. .NET6 is installed by default. .NET8 is added in the runtime-versions. .NET 10 is installed manually.
+      - curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin --channel 10.0
   pre_build:
     commands:
       - export DOTNET_CLI_TELEMETRY_OPTOUT=1