fix(tests): outdated netwonsoft dep (#2728)

Problem:
newtonsoft dependency in the SAM examples has a reported vulnerability
which is detected by automation.

Solution:
- Update the examples to the "dotnet6" template from `sam init`.
- Update tests for the new templates.

Author: justinmk3

src/test/shared/codelens/sampleDotNetSamProgram.ts

@@ -6,38 +6,37 @@
 import * as vscode from 'vscode'
 
 /**
- * This file emits the Program.cs file contents from the stock SAM CLI app for dotnet, as well as
- * the corresponding DocumentSymbols generated by VS Code.
+ * @deprecated These are not easy to update if the related document changes...
  */
 
 export function getDocumentSymbols(): vscode.DocumentSymbol[] {
     const namespaceSymbol: vscode.DocumentSymbol = new vscode.DocumentSymbol(
         'HelloWorld',
         '',
         vscode.SymbolKind.Namespace,
-        new vscode.Range(14, 0, 51, 1),
-        new vscode.Range(14, 10, 14, 20)
+        new vscode.Range(12, 0, 48, 1),
+        new vscode.Range(12, 10, 12, 20)
     )
     const classSymbol: vscode.DocumentSymbol = new vscode.DocumentSymbol(
         'HelloWorld.Function',
         '',
         vscode.SymbolKind.Class,
-        new vscode.Range(17, 4, 50, 5),
-        new vscode.Range(17, 17, 17, 25)
+        new vscode.Range(15, 4, 47, 5),
+        new vscode.Range(15, 17, 15, 25)
     )
     const privateMethodSymbol: vscode.DocumentSymbol = new vscode.DocumentSymbol(
         'GetCallingIP()',
         '',
         vscode.SymbolKind.Method,
-        new vscode.Range(22, 8, 31, 9),
-        new vscode.Range(22, 42, 22, 54)
+        new vscode.Range(20, 8, 28, 9),
+        new vscode.Range(20, 42, 20, 54)
     )
     const publicMethodSymbol: vscode.DocumentSymbol = new vscode.DocumentSymbol(
         'FunctionHandler(APIGatewayProxyRequest apigProxyEvent, ILambdaContext context)',
         '',
         vscode.SymbolKind.Method,
-        new vscode.Range(33, 8, 49, 9),
-        new vscode.Range(33, 39, 33, 54)
+        new vscode.Range(30, 8, 46, 9),
+        new vscode.Range(30, 51, 30, 66)
     )
 
     namespaceSymbol.children.push(classSymbol)
@@ -47,20 +46,21 @@ export function getDocumentSymbols(): vscode.DocumentSymbol[] {
     return [namespaceSymbol]
 }
 
+/**
+ * @deprecated
+ */
 export function getFunctionText(): string {
-    return String.raw`using System;
+    return String.raw`
 using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using System.Net.Http;
-using System.Net.Http.Headers;
-using Newtonsoft.Json;
+using System.Text.Json;
+using System.Threading.Tasks;
 
-using Amazon.Lambda.Core;
 using Amazon.Lambda.APIGatewayEvents;
+using Amazon.Lambda.Core;
 
 // Assembly attribute to enable the Lambda function's JSON input to be converted into a .NET class.
-[assembly: LambdaSerializer(typeof(Amazon.Lambda.Serialization.Json.JsonSerializer))]
+[assembly: LambdaSerializer(typeof(Amazon.Lambda.Serialization.SystemTextJson.DefaultLambdaJsonSerializer))]
 
 namespace HelloWorld
 {
@@ -75,25 +75,24 @@ namespace HelloWorld
             client.DefaultRequestHeaders.Accept.Clear();
             client.DefaultRequestHeaders.Add("User-Agent", "AWS Lambda .Net Client");
 
-            var stringTask = client.GetStringAsync("http://checkip.amazonaws.com/").ConfigureAwait(continueOnCapturedContext:false);
+            var msg = await client.GetStringAsync("http://checkip.amazonaws.com/").ConfigureAwait(continueOnCapturedContext:false);
 
-            var msg = await stringTask;
             return msg.Replace("\n","");
         }
 
-        public APIGatewayProxyResponse FunctionHandler(APIGatewayProxyRequest apigProxyEvent, ILambdaContext context)
+        public async Task<APIGatewayProxyResponse> FunctionHandler(APIGatewayProxyRequest apigProxyEvent, ILambdaContext context)
         {
 
-            string location = GetCallingIP().Result;
-            Dictionary<string, string> body = new Dictionary<string, string>
+            var location = await GetCallingIP();
+            var body = new Dictionary<string, string>
             {
                 { "message", "hello world" },
-                { "location", location },
+                { "location", location }
             };
 
             return new APIGatewayProxyResponse
             {
-                Body = JsonConvert.SerializeObject(body),
+                Body = JsonSerializer.Serialize(body),
                 StatusCode = 200,
                 Headers = new Dictionary<string, string> { { "Content-Type", "application/json" } }
             };

src/test/shared/debug/launchConfiguration.test.ts

@@ -102,7 +102,7 @@ describe('LaunchConfiguration', function () {
     const templateUriPython37 = vscode.Uri.file(
         path.join(workspace.uri.fsPath, 'python3.7-plain-sam-app/template.yaml')
     )
-    const templateUriCsharp = vscode.Uri.file(path.join(workspace.uri.fsPath, 'csharp2.1-plain-sam-app/template.yaml'))
+    const templateUriCsharp = vscode.Uri.file(path.join(workspace.uri.fsPath, 'csharp6-zip/template.yaml'))
 
     beforeEach(async function () {
         await globals.templateRegistry.addWatchPattern(TEMPLATE_FILE_GLOB_PATTERN)

src/test/shared/sam/debugger/samDebugConfigProvider.test.ts

@@ -310,7 +310,7 @@ describe('SamDebugConfigurationProvider', async function () {
             const config = await getConfig(
                 debugConfigProvider,
                 globals.templateRegistry,
-                'testFixtures/workspaceFolder/csharp2.1-plain-sam-app/'
+                'testFixtures/workspaceFolder/csharp6-zip/'
             )
 
             // No workspace folder:
@@ -1586,7 +1586,7 @@ describe('SamDebugConfigurationProvider', async function () {
 
         it('target=code: dotnet/csharp', async function () {
             const appDir = pathutil.normalize(
-                path.join(testutil.getProjectDir(), 'testFixtures/workspaceFolder/csharp2.1-plain-sam-app/')
+                path.join(testutil.getProjectDir(), 'testFixtures/workspaceFolder/csharp6-zip/')
             )
             const folder = testutil.getWorkspaceFolder(appDir)
             const input = {
@@ -1599,7 +1599,7 @@ describe('SamDebugConfigurationProvider', async function () {
                     projectRoot: 'src/HelloWorld',
                 },
                 lambda: {
-                    runtime: 'dotnetcore3.1',
+                    runtime: 'dotnet6',
                 },
             }
             const actual = (await debugConfigProvider.makeConfig(folder, input))! as SamLaunchRequestArgs
@@ -1608,7 +1608,7 @@ describe('SamDebugConfigurationProvider', async function () {
             const expected: SamLaunchRequestArgs = {
                 awsCredentials: fakeCredentials,
                 request: 'attach', // Input "direct-invoke", output "attach".
-                runtime: 'dotnetcore3.1', // lambdaModel.dotNetRuntimes[0],
+                runtime: 'dotnet6', // lambdaModel.dotNetRuntimes[0],
                 runtimeFamily: lambdaModel.RuntimeFamily.DotNetCore,
                 useIkpdb: false,
                 type: AWS_SAM_DEBUG_TYPE,
@@ -1675,7 +1675,7 @@ describe('SamDebugConfigurationProvider', async function () {
       Handler: HelloWorld::HelloWorld.Function::FunctionHandler
       CodeUri: >-
         ${input.invokeTarget.projectRoot}
-      Runtime: dotnetcore3.1
+      Runtime: dotnet6
 `
             )
 
@@ -1741,7 +1741,7 @@ describe('SamDebugConfigurationProvider', async function () {
 
         it('target=template: dotnet/csharp', async function () {
             const appDir = pathutil.normalize(
-                path.join(testutil.getProjectDir(), 'testFixtures/workspaceFolder/csharp2.1-plain-sam-app')
+                path.join(testutil.getProjectDir(), 'testFixtures/workspaceFolder/csharp6-zip')
             )
             const folder = testutil.getWorkspaceFolder(appDir)
             const input = {
@@ -1774,7 +1774,7 @@ describe('SamDebugConfigurationProvider', async function () {
             const expected: SamLaunchRequestArgs = {
                 awsCredentials: fakeCredentials,
                 request: 'attach', // Input "direct-invoke", output "attach".
-                runtime: 'dotnetcore3.1', // lambdaModel.dotNetRuntimes[0],
+                runtime: 'dotnet6', // lambdaModel.dotNetRuntimes[0],
                 runtimeFamily: lambdaModel.RuntimeFamily.DotNetCore,
                 useIkpdb: false,
                 type: AWS_SAM_DEBUG_TYPE,
@@ -1796,7 +1796,7 @@ describe('SamDebugConfigurationProvider', async function () {
                     ...input.lambda,
                 },
                 name: input.name,
-                architecture: undefined,
+                architecture: 'x86_64',
                 templatePath: pathutil.normalize(path.join(path.dirname(templatePath.fsPath), 'template.yaml')),
 
                 //
@@ -1893,7 +1893,7 @@ describe('SamDebugConfigurationProvider', async function () {
 
         it('target=template: Image dotnet/csharp', async function () {
             const appDir = pathutil.normalize(
-                path.join(testutil.getProjectDir(), 'testFixtures/workspaceFolder/csharp2.1-image-sam-app')
+                path.join(testutil.getProjectDir(), 'testFixtures/workspaceFolder/csharp6-image')
             )
             const folder = testutil.getWorkspaceFolder(appDir)
             const input = {
@@ -1906,7 +1906,7 @@ describe('SamDebugConfigurationProvider', async function () {
                     logicalId: 'HelloWorldFunction',
                 },
                 lambda: {
-                    runtime: 'dotnetcore3.1',
+                    runtime: 'dotnet6',
                     environmentVariables: {
                         'test-envvar-1': 'test value 1',
                     },
@@ -1927,7 +1927,7 @@ describe('SamDebugConfigurationProvider', async function () {
             const expected: SamLaunchRequestArgs = {
                 awsCredentials: fakeCredentials,
                 request: 'attach', // Input "direct-invoke", output "attach".
-                runtime: 'dotnetcore3.1', // lambdaModel.dotNetRuntimes[0],
+                runtime: 'dotnet6', // lambdaModel.dotNetRuntimes[0],
                 runtimeFamily: lambdaModel.RuntimeFamily.DotNetCore,
                 useIkpdb: false,
                 type: AWS_SAM_DEBUG_TYPE,

src/testFixtures/workspaceFolder/.vscode/launch.json

@@ -95,7 +95,7 @@
             "request": "direct-invoke",
             "invokeTarget": {
                 "target": "api",
-                "templatePath": "csharp2.1-plain-sam-app/template.yaml",
+                "templatePath": "csharp6-zip/template.yaml",
                 "logicalId": "HelloWorldFunction"
             },
             "api": {