Skip to content

Commit 136b192

Browse files
normjnormj
authored
[LambdaTestTool] Add support for .NET 10 and removed support for .NET 6 (#2266)
1 parent e83c55a commit 136b192

31 files changed

+240
-135
lines changed

‎.autover/autover.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,9 @@
127127
"Name": "Amazon.Lambda.TestTool.BlazorTester",
128128
"Paths": [
129129
"Tools/LambdaTestTool/src/Amazon.Lambda.TestTool.BlazorTester/Amazon.Lambda.TestTool.BlazorTester.csproj",
130-
"Tools/LambdaTestTool/src/Amazon.Lambda.TestTool.BlazorTester/Amazon.Lambda.TestTool.BlazorTester60-pack.csproj",
131130
"Tools/LambdaTestTool/src/Amazon.Lambda.TestTool.BlazorTester/Amazon.Lambda.TestTool.BlazorTester80-pack.csproj",
132-
"Tools/LambdaTestTool/src/Amazon.Lambda.TestTool.BlazorTester/Amazon.Lambda.TestTool.BlazorTester90-pack.csproj"
131+
"Tools/LambdaTestTool/src/Amazon.Lambda.TestTool.BlazorTester/Amazon.Lambda.TestTool.BlazorTester90-pack.csproj",
132+
"Tools/LambdaTestTool/src/Amazon.Lambda.TestTool.BlazorTester/Amazon.Lambda.TestTool.BlazorTester10_0-pack.csproj"
133133
]
134134
},
135135
{

‎.autover/changes/30911c67-b2cc-4223-9477-ac0bab2fba8a.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"Projects": [
3+
{
4+
"Name": "Amazon.Lambda.TestTool.BlazorTester",
5+
"Type": "Minor",
6+
"ChangelogMessages": [
7+
"Add support for .NET 10",
8+
"Removed support for .NET 6"
9+
]
10+
}
11+
]
12+
}

‎Tools/LambdaTestTool/src/Amazon.Lambda.TestTool.BlazorTester/Amazon.Lambda.TestTool.BlazorTester.csproj‎

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk.Web">
1+
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<Import Project="..\..\..\..\buildtools\common.props" />
44

@@ -12,22 +12,11 @@
1212
<PackageTags>AWS;Amazon;Lambda</PackageTags>
1313
<NoWarn>1701;1702;1591;1587;3021;NU5100;CS1591</NoWarn>
1414
<GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
15-
<TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
15+
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
1616
</PropertyGroup>
17-
18-
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
19-
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="6.0.35" />
20-
</ItemGroup>
21-
22-
<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
23-
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.10" />
24-
</ItemGroup>
25-
26-
<ItemGroup Condition=" '$(TargetFramework)' == 'net9.0' ">
27-
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="9.0.0-rc.2.24474.3" />
28-
</ItemGroup>
17+
2918

30-
<ItemGroup>
19+
<ItemGroup>
3120
<PackageReference Include="Blazored.Modal" Version="3.1.2" />
3221
<ProjectReference Include="..\Amazon.Lambda.TestTool\Amazon.Lambda.TestTool.csproj" />
3322
</ItemGroup>
@@ -36,4 +25,8 @@
3625
<EmbeddedResource Include="wwwroot\**" />
3726
</ItemGroup>
3827

28+
<ItemGroup>
29+
<Folder Include="Shared\" />
30+
</ItemGroup>
31+
3932
</Project>

Tools/LambdaTestTool/src/Amazon.Lambda.TestTool.BlazorTester/Amazon.Lambda.TestTool.BlazorTester60-pack.csproj renamed to Tools/LambdaTestTool/src/Amazon.Lambda.TestTool.BlazorTester/Amazon.Lambda.TestTool.BlazorTester10_0-pack.csproj

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,23 @@
44

55
<PropertyGroup>
66
<OutputType>Exe</OutputType>
7-
<Description>A tool to help debug and test your .NET 6.0 AWS Lambda functions locally.</Description>
7+
<Description>A tool to help debug and test your .NET 10.0 AWS Lambda functions locally.</Description>
88
<Version>0.16.3</Version>
99
<Product>AWS .NET Lambda Test Tool</Product>
1010
<Copyright>Apache 2</Copyright>
1111
<PackageTags>AWS;Amazon;Lambda</PackageTags>
12-
<TargetFramework>net6.0</TargetFramework>
13-
<ToolCommandName>dotnet-lambda-test-tool-6.0</ToolCommandName>
12+
<TargetFramework>net10.0</TargetFramework>
13+
<ToolCommandName>dotnet-lambda-test-tool-10.0</ToolCommandName>
1414
<IsPackable>true</IsPackable>
1515
<PackAsTool>true</PackAsTool>
16-
<PackageId>Amazon.Lambda.TestTool-6.0</PackageId>
16+
<PackageId>Amazon.Lambda.TestTool-10.0</PackageId>
1717
<AssemblyName>Amazon.Lambda.TestTool.BlazorTester</AssemblyName>
1818
<RootNamespace>Amazon.Lambda.TestTool.BlazorTester</RootNamespace>
1919
<GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
20-
<StaticWebAssetsEnabled>false</StaticWebAssetsEnabled>
2120
</PropertyGroup>
2221

2322
<ItemGroup>
2423
<PackageReference Include="Blazored.Modal" Version="3.1.2" />
25-
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="6.0.35" />
2624
<ProjectReference Include="..\Amazon.Lambda.TestTool\Amazon.Lambda.TestTool.csproj" />
2725
</ItemGroup>
2826

‎Tools/LambdaTestTool/src/Amazon.Lambda.TestTool.BlazorTester/Amazon.Lambda.TestTool.BlazorTester80-pack.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222

2323
<ItemGroup>
2424
<PackageReference Include="Blazored.Modal" Version="3.1.2" />
25-
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.10" />
2625
<ProjectReference Include="..\Amazon.Lambda.TestTool\Amazon.Lambda.TestTool.csproj" />
2726
</ItemGroup>
2827

‎Tools/LambdaTestTool/src/Amazon.Lambda.TestTool.BlazorTester/Amazon.Lambda.TestTool.BlazorTester90-pack.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222

2323
<ItemGroup>
2424
<PackageReference Include="Blazored.Modal" Version="3.1.2" />
25-
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="9.0.0-rc.2.24474.3" />
2625
<ProjectReference Include="..\Amazon.Lambda.TestTool\Amazon.Lambda.TestTool.csproj" />
2726
</ItemGroup>
2827

‎Tools/LambdaTestTool/src/Amazon.Lambda.TestTool.BlazorTester/App.razor‎

Lines changed: 48 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,48 @@
1-
2-
<Router AppAssembly="@typeof(Program).Assembly">
3-
<Found Context="routeData">
4-
<RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
5-
</Found>
6-
<NotFound>
7-
<LayoutView Layout="@typeof(MainLayout)">
8-
<p>Sorry, there's nothing at this address.</p>
9-
</LayoutView>
10-
</NotFound>
11-
</Router>
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
4+
<head>
5+
<meta charset="utf-8" />
6+
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
7+
<base href="/" />
8+
<link rel="stylesheet" href="css/bootstrap/bootstrap.min.css" />
9+
<link rel="stylesheet" href="css/site.css" />
10+
<link rel="stylesheet" href="css/font-awesome.min.css" />
11+
<link rel="stylesheet" href="css/blazored-modal.css" />
12+
<link rel="icon" type="image/png" href="favicon.ico" />
13+
<HeadOutlet />
14+
</head>
15+
16+
<body>
17+
<div id="components-reconnect-modal" class="my-reconnect-modal components-reconnect-hide">
18+
<div class="show failed refused">
19+
<div class="center-text">
20+
<p>
21+
@Constants.PRODUCT_NAME has paused. This can happen for the following reasons.
22+
<ul>
23+
<li>The attached debugger is currently on a breakpoint. The test tool will resume when execution has continued in the debugger.</li>
24+
<li>The debugger or test tool process has stopped. If so, this window can be closed.</li>
25+
</ul>
26+
</p>
27+
</div>
28+
</div>
29+
</div>
30+
31+
<app>
32+
<Routes @rendermode="Microsoft.AspNetCore.Components.Web.RenderMode.InteractiveServer" />
33+
</app>
34+
<div id="blazor-error-ui">
35+
<environment include="Staging,Production">
36+
An error has occurred. This application may no longer respond until reloaded.
37+
</environment>
38+
<environment include="Development">
39+
An unhandled exception has occurred. See browser dev tools for details.
40+
</environment>
41+
<a href="" class="reload">Reload</a>
42+
<a class="dismiss">🗙</a>
43+
</div>
44+
45+
<script src="_framework/blazor.web.js"></script>
46+
</body>
47+
48+
</html>

‎Tools/LambdaTestTool/src/Amazon.Lambda.TestTool.BlazorTester/AppLegacy.razor‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
2+
<Router AppAssembly="@typeof(Program).Assembly">
3+
<Found Context="routeData">
4+
<RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
5+
</Found>
6+
<NotFound>
7+
<LayoutView Layout="@typeof(MainLayout)">
8+
<p>Sorry, there's nothing at this address.</p>
9+
</LayoutView>
10+
</NotFound>
11+
</Router>

‎Tools/LambdaTestTool/src/Amazon.Lambda.TestTool.BlazorTester/Constants.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ public class Constants
55
public const int DEFAULT_PORT = 5050;
66
public const string DEFAULT_HOST = "localhost";
77

8-
#if NET6_0
9-
public const string PRODUCT_NAME = "AWS .NET 6.0 Mock Lambda Test Tool";
10-
#elif NET8_0
8+
#if NET8_0
119
public const string PRODUCT_NAME = "AWS .NET 8.0 Mock Lambda Test Tool";
1210
#elif NET9_0
1311
public const string PRODUCT_NAME = "AWS .NET 9.0 Mock Lambda Test Tool";
12+
#elif NET10_0
13+
public const string PRODUCT_NAME = "AWS .NET 10.0 Mock Lambda Test Tool";
1414
#else
1515
Update for new target framework!!!
1616
#endif
@@ -26,6 +26,6 @@ public class Constants
2626
public const string LINK_GITHUB_TEST_TOOL_INSTALL_AND_RUN = "https://github.com/aws/aws-lambda-dotnet/tree/master/Tools/LambdaTestTool#installing-and-running";
2727
public const string LINK_DLQ_DEVELOEPR_GUIDE = "https://docs.aws.amazon.com/lambda/latest/dg/dlq.html";
2828
public const string LINK_MSDN_ASSEMBLY_LOAD_CONTEXT = "https://docs.microsoft.com/en-us/dotnet/api/system.runtime.loader.assemblyloadcontext";
29-
public const string LINK_VS_TOOLKIT_MARKETPLACE = "https://marketplace.visualstudio.com/items?itemName=AmazonWebServices.AWSToolkitforVisualStudio2017";
29+
public const string LINK_VS_TOOLKIT_MARKETPLACE = "https://marketplace.visualstudio.com/items?itemName=AmazonWebServices.AWSToolkitforVisualStudio2022";
3030
}
3131
}

‎Tools/LambdaTestTool/src/Amazon.Lambda.TestTool.BlazorTester/Controllers/RuntimeApiController.cs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
namespace Amazon.Lambda.TestTool.BlazorTester.Controllers
99
{
10-
#if NET6_0_OR_GREATER
1110
public class RuntimeApiController : ControllerBase
1211
{
1312
private const string HEADER_BREAK = "-----------------------------------";
@@ -101,5 +100,4 @@ internal class StatusResponse
101100
[System.Text.Json.Serialization.JsonPropertyName("status")]
102101
public string Status { get; set; }
103102
}
104-
#endif
105-
}
103+
}

0 commit comments

Comments
 (0)