dotnet8: bump setup-dotnet to v4, remove omnisharp platform, remove l…

…int, fix version typos
aws · Feb 8, 2024 · 1d96ed1 · 1d96ed1
1 parent 811a249
commit 1d96ed1
Show file tree

Hide file tree

Showing 15 changed files with 35 additions and 31 deletions.
diff --git a/.github/workflows/build_test_invoke.yml b/.github/workflows/build_test_invoke.yml
@@ -360,7 +360,7 @@ jobs:
         name: Checkout PR
       - uses: ./.github/actions/aws-sam-cli-develop
         name: Install develop version of AWS SAM CLI
-      - uses: actions/setup-dotnet@v3
+      - uses: actions/setup-dotnet@v4
         name: Setup dotnet ${{ matrix.version }}
         with:
           dotnet-version: ${{ matrix.version }}

diff --git a/dotnet6/web/README.md b/dotnet6/web/README.md
@@ -1,6 +1,6 @@
 # Cookiecutter SAM for dotNet based Lambda functions
 
-This is a [Cookiecutter](https://github.com/audreyr/cookiecutter) template to create a Serverless Hello World App based on Serverless Application Model (SAM) and dotnet 3.1.
+This is a [Cookiecutter](https://github.com/audreyr/cookiecutter) template to create a Serverless Hello World App based on Serverless Application Model (SAM) and dotnet.
 
 It is important to note that you should not try to `git clone` this project but use `cookiecutter` CLI instead as ``{{cookiecutter.project_name}}`` will be rendered based on your input and therefore all variables and files will be rendered properly.
 

diff --git a/dotnet8/cw-event/{{cookiecutter.project_name}}/omnisharp.json b/dotnet8/cw-event/{{cookiecutter.project_name}}/omnisharp.json
@@ -4,8 +4,5 @@
         "**/bin/**/*",
         "**/obj/**/*"
       ]
-    },
-    "msbuild": {
-        "Platform": "rhel.7.2-x64"
     }
 }
diff --git a/dotnet8/hello-img/{{cookiecutter.project_name}}/omnisharp.json b/dotnet8/hello-img/{{cookiecutter.project_name}}/omnisharp.json
@@ -4,8 +4,5 @@
         "**/bin/**/*",
         "**/obj/**/*"
       ]
-    },
-    "msbuild": {
-        "Platform": "rhel.7.2-x64"
     }
 }
diff --git a/dotnet8/hello-img/{{cookiecutter.project_name}}/src/HelloWorld/Dockerfile b/dotnet8/hello-img/{{cookiecutter.project_name}}/src/HelloWorld/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build-image
+FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build-image
 
 ARG FUNCTION_DIR="/build"
 ARG SAM_BUILD_MODE="run"

diff --git a/dotnet8/hello-pt/{{cookiecutter.project_name}}/omnisharp.json b/dotnet8/hello-pt/{{cookiecutter.project_name}}/omnisharp.json
@@ -4,8 +4,5 @@
         "**/bin/**/*",
         "**/obj/**/*"
       ]
-    },
-    "msbuild": {
-        "Platform": "rhel.7.2-x64"
     }
 }
diff --git a/dotnet8/hello/{{cookiecutter.project_name}}/omnisharp.json b/dotnet8/hello/{{cookiecutter.project_name}}/omnisharp.json
@@ -4,8 +4,5 @@
         "**/bin/**/*",
         "**/obj/**/*"
       ]
-    },
-    "msbuild": {
-        "Platform": "rhel.7.2-x64"
     }
 }
diff --git a/dotnet8/s3/{{cookiecutter.project_name}}/omnisharp.json b/dotnet8/s3/{{cookiecutter.project_name}}/omnisharp.json
@@ -4,8 +4,5 @@
         "**/bin/**/*",
         "**/obj/**/*"
       ]
-    },
-    "msbuild": {
-        "Platform": "rhel.7.2-x64"
     }
 }
diff --git a/dotnet8/scratch/{{cookiecutter.project_name}}/omnisharp.json b/dotnet8/scratch/{{cookiecutter.project_name}}/omnisharp.json
@@ -4,8 +4,5 @@
       "**/bin/**/*",
       "**/obj/**/*"
     ]
-  },
-  "msbuild": {
-      "Platform": "rhel.7.2-x64"
   }
 }
diff --git a/dotnet8/sqs/{{cookiecutter.project_name}}/omnisharp.json b/dotnet8/sqs/{{cookiecutter.project_name}}/omnisharp.json
@@ -4,8 +4,5 @@
         "**/bin/**/*",
         "**/obj/**/*"
       ]
-    },
-    "msbuild": {
-        "Platform": "rhel.7.2-x64"
     }
 }
diff --git a/dotnet8/step-func/{{cookiecutter.project_name}}/omnisharp.json b/dotnet8/step-func/{{cookiecutter.project_name}}/omnisharp.json
@@ -4,8 +4,5 @@
         "**/bin/**/*",
         "**/obj/**/*"
       ]
-    },
-    "msbuild": {
-        "Platform": "rhel.7.2-x64"
     }
 }
diff --git a/dotnet8/web/README.md b/dotnet8/web/README.md
@@ -1,6 +1,6 @@
 # Cookiecutter SAM for dotNet based Lambda functions
 
-This is a [Cookiecutter](https://github.com/audreyr/cookiecutter) template to create a Serverless Hello World App based on Serverless Application Model (SAM) and dotnet 3.1.
+This is a [Cookiecutter](https://github.com/audreyr/cookiecutter) template to create a Serverless Hello World App based on Serverless Application Model (SAM) and dotnet.
 
 It is important to note that you should not try to `git clone` this project but use `cookiecutter` CLI instead as ``{{cookiecutter.project_name}}`` will be rendered based on your input and therefore all variables and files will be rendered properly.
 

diff --git a/dotnet8/web/{{cookiecutter.project_name}}/omnisharp.json b/dotnet8/web/{{cookiecutter.project_name}}/omnisharp.json
@@ -4,8 +4,5 @@
         "**/bin/**/*",
         "**/obj/**/*"
       ]
-    },
-    "msbuild": {
-        "Platform": "rhel.7.2-x64"
     }
 }
diff --git a/tests/integration/build_invoke/dotnet/test_build_invoke_dotnet8.py b/tests/integration/build_invoke/dotnet/test_build_invoke_dotnet8.py
@@ -14,58 +14,71 @@
 class BuildInvoke_dotnet8_cookiecutter_aws_sam_hello_dotnet(BuildInvokeBase.DotNetCoreExtraRerunBuildInvokeBase):
     use_container = False
     directory = "dotnet8/hello"
+    should_test_lint = False
 
+class BuildInvoke_dotnet8_cookiecutter_aws_sam_hello_native_aot_dotnet(BuildInvokeBase.DotNetCoreExtraRerunBuildInvokeBase):
+    use_container = False
+    directory = "dotnet8/hello-native-aot"
+    should_test_lint = False
 
 class BuildInvoke_dotnet8_cookiecutter_aws_sam_hello_dotnet_pt(BuildInvokeBase.DotNetCoreExtraRerunBuildInvokeBase):
     use_container = False
     directory = "dotnet8/hello-pt"
+    should_test_lint = False
 
 
 class BuildInvoke_dotnet8_cookiecutter_aws_sam_quick_start_s3_dotnet(
     BuildInvokeBase.DotNetCoreExtraRerunBuildInvokeBase
 ):
     use_container = False
     directory = "dotnet8/s3"
+    should_test_lint = False
 
 
 class BuildInvoke_dotnet8_cookiecutter_aws_sam_quick_start_sns_dotnet(
     BuildInvokeBase.DotNetCoreExtraRerunBuildInvokeBase
 ):
     use_container = False
     directory = "dotnet8/sns"
+    should_test_lint = False
 
 
 class BuildInvoke_dotnet8_cookiecutter_aws_sam_quick_start_sqs_dotnet(
     BuildInvokeBase.DotNetCoreExtraRerunBuildInvokeBase
 ):
     use_container = False
     directory = "dotnet8/sqs"
+    should_test_lint = False
 
 
 class BuildInvoke_dotnet8_cookiecutter_aws_sam_hello_step_functions_sample_app(
     BuildInvokeBase.DotNetCoreExtraRerunBuildInvokeBase
 ):
     use_container = False
     directory = "dotnet8/step-func"
+    should_test_lint = False
 
 
 class BuildInvoke_dotnet8_cookiecutter_aws_sam_quick_start_cloudwatch_events_dotnet(
     BuildInvokeBase.DotNetCoreExtraRerunBuildInvokeBase
 ):
     use_container = False
     directory = "dotnet8/cw-event"
+    should_test_lint = False
 
 
 class BuildInvoke_dotnet8_cookiecutter_aws_from_scratch_dotnet(BuildInvokeBase.DotNetCoreExtraRerunBuildInvokeBase):
     use_container = False
     directory = "dotnet8/scratch"
+    should_test_lint = False
 
 
 class BuildInvoke_dotnet8_cookiecutter_aws_sam_quick_start_web_dotnet(
     BuildInvokeBase.DotNetCoreExtraRerunBuildInvokeBase
 ):
     use_container = False
     directory = "dotnet8/web"
+    should_test_lint = False
 
 
 #
@@ -77,3 +90,4 @@ class BuildInvoke_image_dotnet8_cookiecutter_aws_sam_hello_dotnet_lambda_image(
     BuildInvokeBase.DotNetCoreExtraRerunBuildInvokeBase
 ):
     directory = "dotnet8/hello-img"
+    should_test_lint = False
diff --git a/tests/integration/unit_test/test_unit_test_dotnet8.py b/tests/integration/unit_test/test_unit_test_dotnet8.py
@@ -5,46 +5,63 @@
 class UnitTest_dotnet8_cookiecutter_aws_sam_hello_dotnet(UnitTestBase.DotNetCoreUnitTestBase):
     directory = "dotnet8/hello"
     code_directories = ["test/HelloWorld.Test"]
+    should_test_lint = False
+
+class UnitTest_dotnet8_cookiecutter_aws_sam_hello_native_aot_dotnet(UnitTestBase.DotNetCoreUnitTestBase):
+    directory = "dotnet8/hello-native-aot"
+    code_directories = ["test/HelloWorldAot.Test"]
+    should_test_lint = False
+
 
 class UnitTest_dotnet8_cookiecutter_aws_sam_hello_dotnet(UnitTestBase.DotNetCoreUnitTestBase):
     directory = "dotnet8/hello-img"
     code_directories = ["test/HelloWorld.Test"]
+    should_test_lint = False
+
 
 class UnitTest_dotnet8_cookiecutter_aws_sam_hello_dotnet_pt(UnitTestBase.DotNetCoreUnitTestBase):
     directory = "dotnet8/hello-pt"
     code_directories = ["test/HelloWorld.Test"]
+    should_test_lint = False
 
 
 class UnitTest_dotnet8_cookiecutter_aws_sam_hello_step_functions_sample_app(UnitTestBase.DotNetCoreUnitTestBase):
     directory = "dotnet8/step-func"
     code_directories = ["tests/StockBuyer.Test", "tests/StockChecker.Test", "tests/StockSeller.Test"]
+    should_test_lint = False
 
 
 class UnitTest_dotnet8_cookiecutter_aws_sam_quick_start_s3_dotnet(UnitTestBase.DotNetCoreUnitTestBase):
     directory = "dotnet8/s3"
     code_directories = ["test/S3EventSource.Tests"]
+    should_test_lint = False
 
 
 class UnitTest_dotnet8_cookiecutter_aws_sam_cloudwatch_events_dotnet(UnitTestBase.DotNetCoreUnitTestBase):
     directory = "dotnet8/cw-event"
     code_directories = ["test/CloudWatchEventSource.Tests"]
+    should_test_lint = False
 
 
 class UnitTest_dotnet8_cookiecutter_aws_sam_quickstart_sns_dotnet_sample_app(UnitTestBase.DotNetCoreUnitTestBase):
     directory = "dotnet8/sns"
     code_directories = ["test/SNSEventSource.Tests"]
+    should_test_lint = False
 
 
 class UnitTest_dotnet8_cookiecutter_aws_from_scratch_dotnet(UnitTestBase.DotNetCoreUnitTestBase):
     directory = "dotnet8/scratch"
     code_directories = ["test/ScratchLambda.Tests"]
+    should_test_lint = False
 
 
 class UnitTest_dotnet8_cookiecutter_aws_sam_quick_start_web_dotnet(UnitTestBase.DotNetCoreUnitTestBase):
     directory = "dotnet8/web"
     code_directories = ["tests/ServerlessAPI.Tests"]
+    should_test_lint = False
 
 
 class UnitTest_dotnet8_cookiecutter_aws_sam_quick_start_sqs(UnitTestBase.DotNetCoreUnitTestBase):
     directory = "dotnet8/sqs"
     code_directories = ["test/SQSEventSource.Tests"]
+    should_test_lint = False