Bump all .NET Core 3.1 to .NET 6.0

aws-samples · Jul 7, 2023 · 0ed414d · 0ed414d
1 parent 226b625
commit 0ed414d
Show file tree

Hide file tree

Showing 21 changed files with 48 additions and 53 deletions.
diff --git a/...e-dotnet-cdk/src/ApigwHttpApiEventbridgeDotnetCdk/ApigwHttpApiEventbridgeDotnetCdk.csproj b/...e-dotnet-cdk/src/ApigwHttpApiEventbridgeDotnetCdk/ApigwHttpApiEventbridgeDotnetCdk.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <!-- Roll forward to future major versions of the netcoreapp as needed -->
     <RollForward>Major</RollForward>
   </PropertyGroup>

diff --git a/apigw-lambda-s3-cdk-dotnet/cdk/src/Cdk/Cdk.csproj b/apigw-lambda-s3-cdk-dotnet/cdk/src/Cdk/Cdk.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <!-- Roll forward to future major versions of the netcoreapp as needed -->
     <RollForward>Major</RollForward>
   </PropertyGroup>

diff --git a/apigw-sfn-cdk/cdk/src/Cdk/Cdk.csproj b/apigw-sfn-cdk/cdk/src/Cdk/Cdk.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <!-- Roll forward to future major versions of the netcoreapp as needed -->
     <RollForward>Major</RollForward>
   </PropertyGroup>

diff --git a/...ns-sqs-lambda-cdk-dotnet/src/ApigwSnsSqsLambdaCdkDotnet/ApigwSnsSqsLambdaCdkDotnet.csproj b/...ns-sqs-lambda-cdk-dotnet/src/ApigwSnsSqsLambdaCdkDotnet/ApigwSnsSqsLambdaCdkDotnet.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <!-- Roll forward to future major versions of the netcoreapp as needed -->
     <RollForward>Major</RollForward>
   </PropertyGroup>

diff --git a/...s-sqs-lambda-cdk-dotnet/src/ApigwSnsSqsLambdaCdkDotnet/ApigwSnsSqsLambdaCdkDotnetStack.cs b/...s-sqs-lambda-cdk-dotnet/src/ApigwSnsSqsLambdaCdkDotnet/ApigwSnsSqsLambdaCdkDotnetStack.cs
@@ -30,9 +30,9 @@ internal ApigwSnsSqsLambdaCdkDotnetStack(Construct scope, string id, IStackProps
 
             var lambdaCarChangeQueueNonPremium = new Function(this, "nonPremiumWorkerHandler", new FunctionProps
             {
-                Runtime = Runtime.DOTNET_CORE_3_1,
+                Runtime = Runtime.DOTNET_6,
                 Handler = "ApiEventHandler::ApiEventHandler.Function::SQSHandler",
-                Code = Code.FromAsset("./src/lambdaHandler/ApiEventHandler/src/ApiEventHandler/bin/Debug/netcoreapp3.1"),
+                Code = Code.FromAsset("./src/lambdaHandler/ApiEventHandler/src/ApiEventHandler/bin/Debug/net6.0"),
 
             });
 
@@ -47,29 +47,27 @@ internal ApigwSnsSqsLambdaCdkDotnetStack(Construct scope, string id, IStackProps
 
             topicCarPriceChange.AddSubscription(new SqsSubscription(queueCarChangeQueuPremium));
 
-            IEnumerable<string?> commands = new[]
+            var buildOption = new BundlingOptions()
             {
-                "cd /asset-input",
-                "export DOTNET_CLI_HOME=\"/tmp/DOTNET_CLI_HOME\"",
-                "export PATH=\"$PATH:/tmp/DOTNET_CLI_HOME/.dotnet/tools\"",
-                "dotnet tool install -g Amazon.Lambda.Tools",
-                "dotnet lambda package -o output.zip",
-                "unzip -o -d /asset-output output.zip"
+                Image = Runtime.DOTNET_6.BundlingImage,
+                User = "root",
+                OutputType = BundlingOutput.ARCHIVED,
+                Command = new string[]{
+                    "/bin/sh",
+                    "-c",
+                    " dotnet tool install -g Amazon.Lambda.Tools"+
+                    " && dotnet build"+
+                    " && dotnet lambda package --output-package /asset-output/function.zip"
+                }
             };
+
             var lambdaCarChangeQueuePremium = new Function(this, "premiumWorkerHandler", new FunctionProps
             {
-                Runtime = Runtime.DOTNET_CORE_3_1,
+                Runtime = Runtime.DOTNET_6,
                 Handler = "Lambdas::Lambdas.Function::SQSHandler",
                 Code = Code.FromAsset("./src/lambdaHandler/ApiEventHandler/src/ApiEventHandler", new AssetOptions
                 {
-                    Bundling = new BundlingOptions
-                    {
-                        Image = Runtime.DOTNET_CORE_3_1.BundlingImage,
-                        Command = new[]
-                      {
-                          "bash", "-c", string.Join(" && ", commands)
-                      }
-                    }
+                    Bundling = buildOption
 
                 })
 

diff --git a/...a-cdk-dotnet/src/lambdaHandler/ApiEventHandler/src/ApiEventHandler/ApiEventHandler.csproj b/...a-cdk-dotnet/src/lambdaHandler/ApiEventHandler/src/ApiEventHandler/ApiEventHandler.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
     <AWSProjectType>Lambda</AWSProjectType>
     <!-- This property makes the build directory similar to a publish directory and helps the AWS .NET Lambda Mock Test Tool find project dependencies. -->

diff --git a/...tnet/src/lambdaHandler/ApiEventHandler/src/ApiEventHandler/aws-lambda-tools-defaults.json b/...tnet/src/lambdaHandler/ApiEventHandler/src/ApiEventHandler/aws-lambda-tools-defaults.json
@@ -8,7 +8,7 @@
   "profile": "",
   "region": "",
   "configuration": "Release",
-  "framework": "netcoreapp3.1",
+  "framework": "net6.0",
   "function-runtime": "dotnetcore3.1",
   "function-memory-size": 256,
   "function-timeout": 30,

diff --git a/...src/lambdaHandler/ApiEventHandler/test/ApiEventHandler.Tests/ApiEventHandler.Tests.csproj b/...src/lambdaHandler/ApiEventHandler/test/ApiEventHandler.Tests/ApiEventHandler.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Amazon.Lambda.Core" Version="2.1.0" />

diff --git a/cloudfront-cff-s3-staticsite-dotnet/src/Mdsite/Mdsite.csproj b/cloudfront-cff-s3-staticsite-dotnet/src/Mdsite/Mdsite.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <!-- Roll forward to future major versions of the netcoreapp as needed -->
     <RollForward>Major</RollForward>
   </PropertyGroup>

diff --git a/cloudfront-waf-s3-cdk/src/src.csproj b/cloudfront-waf-s3-cdk/src/src.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>

diff --git a/dynamodb-stream-lambda-cdk-dotnet/cdk/src/Cdk/Cdk.csproj b/dynamodb-stream-lambda-cdk-dotnet/cdk/src/Cdk/Cdk.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <!-- Roll forward to future major versions of the netcoreapp as needed -->
     <RollForward>Major</RollForward>
   </PropertyGroup>

diff --git a/...watch-dotnet-cdk/src/EventBridgeCloudWatchDotnetCdk/EventBridgeCloudWatchDotnetCdk.csproj b/...watch-dotnet-cdk/src/EventBridgeCloudWatchDotnetCdk/EventBridgeCloudWatchDotnetCdk.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <!-- Roll forward to future major versions of the netcoreapp as needed -->
     <RollForward>Major</RollForward>
   </PropertyGroup>

diff --git a/eventbridge-firehose-s3-cdk/src/src.csproj b/eventbridge-firehose-s3-cdk/src/src.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>

diff --git a/eventbridge-lambda-dotnet-cdk/src/ConsumerLambda/ConsumerLambda.csproj b/eventbridge-lambda-dotnet-cdk/src/ConsumerLambda/ConsumerLambda.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
     <AWSProjectType>Lambda</AWSProjectType>
     <!-- This property makes the build directory similar to a publish directory and helps the AWS .NET Lambda Mock Test Tool find project dependencies. -->

diff --git a/eventbridge-lambda-dotnet-cdk/src/ConsumerLambda/aws-lambda-tools-defaults.json b/eventbridge-lambda-dotnet-cdk/src/ConsumerLambda/aws-lambda-tools-defaults.json
@@ -8,7 +8,7 @@
   "profile": "",
   "region": "",
   "configuration": "Release",
-  "framework": "netcoreapp3.1",
+  "framework": "net6.0",
   "function-runtime": "dotnetcore3.1",
   "function-memory-size": 128,
   "function-timeout": 10,

diff --git a/...bridge-lambda-dotnet-cdk/src/EventBridgeLambdaDotnetCdk/EventBridgeLambdaDotnetCdk.csproj b/...bridge-lambda-dotnet-cdk/src/EventBridgeLambdaDotnetCdk/EventBridgeLambdaDotnetCdk.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <!-- Roll forward to future major versions of the netcoreapp as needed -->
     <RollForward>Major</RollForward>
   </PropertyGroup>

diff --git a/...ridge-lambda-dotnet-cdk/src/EventBridgeLambdaDotnetCdk/EventBridgeLambdaDotnetCdkStack.cs b/...ridge-lambda-dotnet-cdk/src/EventBridgeLambdaDotnetCdk/EventBridgeLambdaDotnetCdkStack.cs
@@ -33,32 +33,29 @@ internal EventBridgeLambdaDotnetCdkStack(Construct scope, string id, IStackProps
             });
 
             // Lambda Function Build Commands
-            var buildCommands = new[]
+            var buildOption = new BundlingOptions()
             {
-                "cd /asset-input",
-                "export DOTNET_CLI_HOME=\"/tmp/DOTNET_CLI_HOME\"",
-                "export PATH=\"$PATH:/tmp/DOTNET_CLI_HOME/.dotnet/tools\"",
-                "dotnet tool install -g Amazon.Lambda.Tools",
-                "dotnet lambda package -o output.zip",
-                "unzip -o -d /asset-output output.zip"
+                Image = Runtime.DOTNET_6.BundlingImage,
+                User = "root",
+                OutputType = BundlingOutput.ARCHIVED,
+                Command = new string[]{
+                    "/bin/sh",
+                    "-c",
+                    " dotnet tool install -g Amazon.Lambda.Tools"+
+                    " && dotnet build"+
+                    " && dotnet lambda package --output-package /asset-output/function.zip"
+                }
             };
 
             // Lambda Function
             var consumerLambdaHandler = new Function(this, "ConsumerLambda", new FunctionProps
             {
                 MemorySize = 128,
                 Timeout = Duration.Seconds(10),
-                Runtime = Runtime.DOTNET_CORE_3_1,
+                Runtime = Runtime.DOTNET_6,
                 Code = Code.FromAsset("src/ConsumerLambda", new AssetOptions
                 {
-                    Bundling = new BundlingOptions
-                    {
-                        Image  = Runtime.DOTNET_CORE_3_1.BundlingImage,
-                        Command = new []
-                        {
-                            "bash", "-c", string.Join(" && ", buildCommands)
-                        }
-                    }
+                    Bundling = buildOption
                 }),
                 Handler = "ConsumerLambda::ConsumerLambda.Function::FunctionHandler"
             });

diff --git a/eventbridge-sns-dotnet-cdk/src/EventBridgeSnsDotnetCdk/EventBridgeSnsDotnetCdk.csproj b/eventbridge-sns-dotnet-cdk/src/EventBridgeSnsDotnetCdk/EventBridgeSnsDotnetCdk.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <!-- Roll forward to future major versions of the netcoreapp as needed -->
     <RollForward>Major</RollForward>
     <RootNamespace>EventBridgeSNSDotnetCdk</RootNamespace>

diff --git a/eventbridge-sqs-dotnet-cdk/src/EventBridgeSqsDotnetCdk/EventBridgeSqsDotnetCdk.csproj b/eventbridge-sqs-dotnet-cdk/src/EventBridgeSqsDotnetCdk/EventBridgeSqsDotnetCdk.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <!-- Roll forward to future major versions of the netcoreapp as needed -->
     <RollForward>Major</RollForward>
     <RootNamespace>EventBridgeSqsDotnetCdk</RootNamespace>

diff --git a/lambda-vpc-endpoints-secrets-manager-cdk-dotnet/cdk/src/Cdk/Cdk.csproj b/lambda-vpc-endpoints-secrets-manager-cdk-dotnet/cdk/src/Cdk/Cdk.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <!-- Roll forward to future major versions of the netcoreapp as needed -->
     <RollForward>Major</RollForward>
   </PropertyGroup>

diff --git a/s3-sqs-dotnet-cdk/src/S3SqsDotnetCdk/S3SqsDotnetCdk.csproj b/s3-sqs-dotnet-cdk/src/S3SqsDotnetCdk/S3SqsDotnetCdk.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <!-- Roll forward to future major versions of the netcoreapp as needed -->
     <RollForward>Major</RollForward>
   </PropertyGroup>