Skip to content

Commit c901371

Browse files
authored
Remove support for dotnetcore 3.1 Lambda Runtime (#3576)
* Remove support for dotnetcore 3.1 Lambda Runtime * Removed dotnetcore3.1 inn localLambdaRunConfigTest file * changed minSamversion number * Changed Test file * Changed to dotnet6 instead of dotnet5
1 parent 7270386 commit c901371

File tree

26 files changed

+23
-181
lines changed

26 files changed

+23
-181
lines changed
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"type" : "removal",
3+
"description" : "Dropped support for dotnetcore 3.1 Lambda Runtime"
4+
}

core/src/software/aws/toolkits/core/lambda/LambdaRuntime.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ enum class LambdaRuntime(
2828
PYTHON3_7(Runtime.PYTHON3_7),
2929
PYTHON3_8(Runtime.PYTHON3_8, architectures = ARM_COMPATIBLE),
3030
PYTHON3_9(Runtime.PYTHON3_9, minSamDebugging = "1.28.0", minSamInit = "1.28.0", architectures = ARM_COMPATIBLE),
31-
DOTNETCORE3_1(Runtime.DOTNETCORE3_1),
3231
DOTNET5_0(null, minSamInit = "1.16.0", runtimeOverride = "dotnet5.0"),
3332
DOTNET6_0(Runtime.DOTNET6, minSamDebugging = "1.40.1", minSamInit = "1.40.1", architectures = ARM_COMPATIBLE);
3433

jetbrains-rider/it/software/aws/toolkits/jetbrains/services/lambda/dotnet/DotnetLocalLambdaRunConfigurationIntegrationTest.kt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,6 @@ import software.aws.toolkits.jetbrains.utils.jsonToMap
2424
import software.aws.toolkits.jetbrains.utils.setSamExecutableFromEnvironment
2525
import java.nio.file.Files
2626

27-
class Dotnet31LocalLambdaRunConfigurationIntegrationTest : DotnetLocalLambdaRunConfigurationIntegrationTestBase("EchoLambda3X", LambdaRuntime.DOTNETCORE3_1)
28-
29-
class Dotnet31LocalLambdaImageRunConfigurationIntegrationTest :
30-
DotnetLocalLambdaImageRunConfigurationIntegrationTestBase("ImageLambda3X", LambdaRuntime.DOTNETCORE3_1)
31-
3227
class Dotnet50LocalLambdaImageRunConfigurationIntegrationTest :
3328
DotnetLocalLambdaImageRunConfigurationIntegrationTestBase("ImageLambda5X", LambdaRuntime.DOTNET5_0)
3429

jetbrains-rider/resources/META-INF/ext-rider.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
<handlerResolver id="DOTNET" implementationClass="software.aws.toolkits.jetbrains.services.lambda.dotnet.DotNetLambdaHandlerResolver"/>
3030
<handlerCompletion id="DOTNET" implementationClass="software.aws.toolkits.jetbrains.services.lambda.completion.DotNetHandlerCompletion"/>
3131
<sam.runtimeDebugSupport id="DOTNET" implementationClass="software.aws.toolkits.jetbrains.services.lambda.dotnet.DotNetRuntimeDebugSupport"/>
32-
<sam.imageDebuggerSupport implementation="software.aws.toolkits.jetbrains.services.lambda.dotnet.Dotnet31ImageDebug"/>
3332
<sam.imageDebuggerSupport implementation="software.aws.toolkits.jetbrains.services.lambda.dotnet.Dotnet50ImageDebug"/>
3433
<sam.imageDebuggerSupport implementation="software.aws.toolkits.jetbrains.services.lambda.dotnet.Dotnet60ImageDebug"/>
3534
<sam.projectWizard id="DOTNET" implementationClass="software.aws.toolkits.jetbrains.services.lambda.dotnet.DotNetSamProjectWizard"/>

jetbrains-rider/src/software/aws/toolkits/jetbrains/services/lambda/dotnet/DotNetRuntimeGroup.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ class DotNetRuntimeGroup : SdkBasedRuntimeGroup() {
2121
VbLanguage.id
2222
)
2323
override val supportedRuntimes = listOf(
24-
LambdaRuntime.DOTNETCORE3_1,
2524
LambdaRuntime.DOTNET5_0,
2625
LambdaRuntime.DOTNET6_0
2726
)

jetbrains-rider/src/software/aws/toolkits/jetbrains/services/lambda/dotnet/DotNetSamProjectTemplate.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ class DotNetSamProjectTemplate : SamAppTemplateBased() {
1616

1717
override fun description(): String = message("sam.init.template.hello_world.description")
1818

19-
override fun supportedZipRuntimes(): Set<LambdaRuntime> = setOf(LambdaRuntime.DOTNETCORE3_1, LambdaRuntime.DOTNET6_0)
20-
override fun supportedImageRuntimes(): Set<LambdaRuntime> = setOf(LambdaRuntime.DOTNETCORE3_1, LambdaRuntime.DOTNET5_0, LambdaRuntime.DOTNET6_0)
19+
override fun supportedZipRuntimes(): Set<LambdaRuntime> = setOf(LambdaRuntime.DOTNET6_0)
20+
override fun supportedImageRuntimes(): Set<LambdaRuntime> = setOf(LambdaRuntime.DOTNET5_0, LambdaRuntime.DOTNET6_0)
2121
}

jetbrains-rider/src/software/aws/toolkits/jetbrains/services/lambda/dotnet/DotnetDebugSupport.kt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,6 @@ abstract class DotnetImageDebugSupport : ImageDebugSupport {
6868
): XDebugProcessStarter = DotnetDebugUtils.createDebugProcess(environment, debugHost, debugPorts, context)
6969
}
7070

71-
class Dotnet31ImageDebug : DotnetImageDebugSupport() {
72-
override val id: String = LambdaRuntime.DOTNETCORE3_1.toString()
73-
override fun displayName() = LambdaRuntime.DOTNETCORE3_1.toString().capitalize()
74-
}
75-
7671
class Dotnet50ImageDebug : DotnetImageDebugSupport() {
7772
override val id: String = LambdaRuntime.DOTNET5_0.toString()
7873
override fun displayName() = LambdaRuntime.DOTNET5_0.toString().capitalize()

jetbrains-rider/src/software/aws/toolkits/jetbrains/utils/DotNetRuntimeUtils.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ object DotNetRuntimeUtils {
1212

1313
private val logger = getLogger<DotNetRuntimeUtils>()
1414

15-
private val defaultDotNetCoreRuntime = LambdaRuntime.DOTNETCORE3_1
15+
private val defaultDotNetCoreRuntime = LambdaRuntime.DOTNET6_0
1616

1717
/**
1818
* Get information about current .NET runtime

jetbrains-rider/testData/solutions/EchoLambda3X/EchoLambda.sln

Lines changed: 0 additions & 10 deletions
This file was deleted.

jetbrains-rider/testData/solutions/EchoLambda3X/expected.gold

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)