Merge #1491 runtimes: dotnet 5.0

Author: justinmk3

.changes/next-release/Feature-2c4a26e6-46c9-4d6a-b94d-9b7b591d0fb7.json

@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "Support for SAM CLI 1.16: SAM create/run dotnet5.0"
+}

.changes/next-release/Feature-cbc68594-0491-470d-91b8-83ff87a3170c.json

@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "Improved validation when searching for SAM CLI #1465"
+}

src/lambda/models/samLambdaRuntime.ts

@@ -65,8 +65,7 @@ export const samLambdaCreatableRuntimes: ImmutableSet<Runtime> = isCloud9()
 const dotnet50 = 'dotnet5.0'
 export const samImageLambdaRuntimes = ImmutableSet<Runtime>([
     ...samLambdaCreatableRuntimes,
-    // TODO enable to allow dotnet 5 support
-    // dotnet50,
+    dotnet50,
     // SAM also supports ruby, go, java, but toolkit does not support
 ])
 

src/shared/sam/debugger/awsSamDebugConfigurationValidator.ts

@@ -5,7 +5,7 @@
 
 import * as vscode from 'vscode'
 import * as fs from 'fs'
-import { samZipLambdaRuntimes } from '../../../lambda/models/samLambdaRuntime'
+import { samImageLambdaRuntimes, samZipLambdaRuntimes } from '../../../lambda/models/samLambdaRuntime'
 import { CloudFormation } from '../../cloudformation/cloudformation'
 import { localize } from '../../utilities/vsCodeUtils'
 import {
@@ -171,13 +171,13 @@ export class DefaultAwsSamDebugConfigurationValidator implements AwsSamDebugConf
                 }
             }
             // can't infer the runtime for image-based lambdas
-            if (!config.lambda?.runtime || !samZipLambdaRuntimes.has(config.lambda.runtime)) {
+            if (!config.lambda?.runtime || !samImageLambdaRuntimes.has(config.lambda.runtime)) {
                 return {
                     isValid: false,
                     message: localize(
                         'AWS.sam.debugger.missingRuntimeForImage',
                         'Run configurations for Image-based Lambdas require a valid Lambda runtime value, expected one of [{0}]',
-                        Array.from(samZipLambdaRuntimes).join(', ')
+                        Array.from(samImageLambdaRuntimes).join(', ')
                     ),
                 }
             }