Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .autover/autover.json
Original file line number Diff line number Diff line change
Expand Up @@ -127,9 +127,9 @@
"Name": "Amazon.Lambda.TestTool.BlazorTester",
"Paths": [
"Tools/LambdaTestTool/src/Amazon.Lambda.TestTool.BlazorTester/Amazon.Lambda.TestTool.BlazorTester.csproj",
"Tools/LambdaTestTool/src/Amazon.Lambda.TestTool.BlazorTester/Amazon.Lambda.TestTool.BlazorTester60-pack.csproj",
"Tools/LambdaTestTool/src/Amazon.Lambda.TestTool.BlazorTester/Amazon.Lambda.TestTool.BlazorTester80-pack.csproj",
"Tools/LambdaTestTool/src/Amazon.Lambda.TestTool.BlazorTester/Amazon.Lambda.TestTool.BlazorTester90-pack.csproj"
"Tools/LambdaTestTool/src/Amazon.Lambda.TestTool.BlazorTester/Amazon.Lambda.TestTool.BlazorTester90-pack.csproj",
"Tools/LambdaTestTool/src/Amazon.Lambda.TestTool.BlazorTester/Amazon.Lambda.TestTool.BlazorTester10_0-pack.csproj"
]
},
{
Expand Down
12 changes: 12 additions & 0 deletions .autover/changes/30911c67-b2cc-4223-9477-ac0bab2fba8a.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"Projects": [
{
"Name": "Amazon.Lambda.TestTool.BlazorTester",
"Type": "Minor",
"ChangelogMessages": [
"Add support for .NET 10",
"Removed support for .NET 6"
]
}
]
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<Project Sdk="Microsoft.NET.Sdk.Web">

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

Expand All @@ -12,22 +12,11 @@
<PackageTags>AWS;Amazon;Lambda</PackageTags>
<NoWarn>1701;1702;1591;1587;3021;NU5100;CS1591</NoWarn>
<GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
<TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
</PropertyGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="6.0.35" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.10" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net9.0' ">
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="9.0.0-rc.2.24474.3" />
</ItemGroup>


<ItemGroup>
<ItemGroup>
<PackageReference Include="Blazored.Modal" Version="3.1.2" />
<ProjectReference Include="..\Amazon.Lambda.TestTool\Amazon.Lambda.TestTool.csproj" />
</ItemGroup>
Expand All @@ -36,4 +25,8 @@
<EmbeddedResource Include="wwwroot\**" />
</ItemGroup>

<ItemGroup>
<Folder Include="Shared\" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,23 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<Description>A tool to help debug and test your .NET 6.0 AWS Lambda functions locally.</Description>
<Description>A tool to help debug and test your .NET 10.0 AWS Lambda functions locally.</Description>
<Version>0.16.3</Version>
<Product>AWS .NET Lambda Test Tool</Product>
<Copyright>Apache 2</Copyright>
<PackageTags>AWS;Amazon;Lambda</PackageTags>
<TargetFramework>net6.0</TargetFramework>
<ToolCommandName>dotnet-lambda-test-tool-6.0</ToolCommandName>
<TargetFramework>net10.0</TargetFramework>
<ToolCommandName>dotnet-lambda-test-tool-10.0</ToolCommandName>
<IsPackable>true</IsPackable>
<PackAsTool>true</PackAsTool>
<PackageId>Amazon.Lambda.TestTool-6.0</PackageId>
<PackageId>Amazon.Lambda.TestTool-10.0</PackageId>
<AssemblyName>Amazon.Lambda.TestTool.BlazorTester</AssemblyName>
<RootNamespace>Amazon.Lambda.TestTool.BlazorTester</RootNamespace>
<GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
<StaticWebAssetsEnabled>false</StaticWebAssetsEnabled>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Blazored.Modal" Version="3.1.2" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="6.0.35" />
<ProjectReference Include="..\Amazon.Lambda.TestTool\Amazon.Lambda.TestTool.csproj" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@

<ItemGroup>
<PackageReference Include="Blazored.Modal" Version="3.1.2" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.10" />
<ProjectReference Include="..\Amazon.Lambda.TestTool\Amazon.Lambda.TestTool.csproj" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@

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

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,48 @@

<Router AppAssembly="@typeof(Program).Assembly">
<Found Context="routeData">
<RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
</Found>
<NotFound>
<LayoutView Layout="@typeof(MainLayout)">
<p>Sorry, there's nothing at this address.</p>
</LayoutView>
</NotFound>
</Router>
<!DOCTYPE html>
<html lang="en">

<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<base href="/" />
<link rel="stylesheet" href="css/bootstrap/bootstrap.min.css" />
<link rel="stylesheet" href="css/site.css" />
<link rel="stylesheet" href="css/font-awesome.min.css" />
<link rel="stylesheet" href="css/blazored-modal.css" />
<link rel="icon" type="image/png" href="favicon.ico" />
<HeadOutlet />
</head>

<body>
<div id="components-reconnect-modal" class="my-reconnect-modal components-reconnect-hide">
<div class="show failed refused">
<div class="center-text">
<p>
@Constants.PRODUCT_NAME has paused. This can happen for the following reasons.
<ul>
<li>The attached debugger is currently on a breakpoint. The test tool will resume when execution has continued in the debugger.</li>
<li>The debugger or test tool process has stopped. If so, this window can be closed.</li>
</ul>
</p>
</div>
</div>
</div>

<app>
<Routes @rendermode="Microsoft.AspNetCore.Components.Web.RenderMode.InteractiveServer" />
</app>
<div id="blazor-error-ui">
<environment include="Staging,Production">
An error has occurred. This application may no longer respond until reloaded.
</environment>
<environment include="Development">
An unhandled exception has occurred. See browser dev tools for details.
</environment>
<a href="" class="reload">Reload</a>
<a class="dismiss">🗙</a>
</div>

<script src="_framework/blazor.web.js"></script>
</body>

</html>
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@

<Router AppAssembly="@typeof(Program).Assembly">
<Found Context="routeData">
<RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
</Found>
<NotFound>
<LayoutView Layout="@typeof(MainLayout)">
<p>Sorry, there's nothing at this address.</p>
</LayoutView>
</NotFound>
</Router>
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ public class Constants
public const int DEFAULT_PORT = 5050;
public const string DEFAULT_HOST = "localhost";

#if NET6_0
public const string PRODUCT_NAME = "AWS .NET 6.0 Mock Lambda Test Tool";
#elif NET8_0
#if NET8_0
public const string PRODUCT_NAME = "AWS .NET 8.0 Mock Lambda Test Tool";
#elif NET9_0
public const string PRODUCT_NAME = "AWS .NET 9.0 Mock Lambda Test Tool";
#elif NET10_0
public const string PRODUCT_NAME = "AWS .NET 10.0 Mock Lambda Test Tool";
#else
Update for new target framework!!!
#endif
Expand All @@ -26,6 +26,6 @@ public class Constants
public const string LINK_GITHUB_TEST_TOOL_INSTALL_AND_RUN = "https://github.com/aws/aws-lambda-dotnet/tree/master/Tools/LambdaTestTool#installing-and-running";
public const string LINK_DLQ_DEVELOEPR_GUIDE = "https://docs.aws.amazon.com/lambda/latest/dg/dlq.html";
public const string LINK_MSDN_ASSEMBLY_LOAD_CONTEXT = "https://docs.microsoft.com/en-us/dotnet/api/system.runtime.loader.assemblyloadcontext";
public const string LINK_VS_TOOLKIT_MARKETPLACE = "https://marketplace.visualstudio.com/items?itemName=AmazonWebServices.AWSToolkitforVisualStudio2017";
public const string LINK_VS_TOOLKIT_MARKETPLACE = "https://marketplace.visualstudio.com/items?itemName=AmazonWebServices.AWSToolkitforVisualStudio2022";
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

namespace Amazon.Lambda.TestTool.BlazorTester.Controllers
{
#if NET6_0_OR_GREATER
public class RuntimeApiController : ControllerBase
{
private const string HEADER_BREAK = "-----------------------------------";
Expand Down Expand Up @@ -101,5 +100,4 @@ internal class StatusResponse
[System.Text.Json.Serialization.JsonPropertyName("status")]
public string Status { get; set; }
}
#endif
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@page "/"
@page "/"
@namespace Amazon.Lambda.TestTool.BlazorTester.Pages
@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
@{
Expand Down Expand Up @@ -34,7 +34,7 @@
</div>

<app>
<component type="typeof(App)" render-mode="ServerPrerendered" />
<component type="typeof(AppLegacy)" render-mode="ServerPrerendered" />
</app>

<div id="blazor-error-ui">
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<Router AppAssembly="typeof(Program).Assembly">
<Found Context="routeData">
<RouteView RouteData="routeData" DefaultLayout="typeof(Shared.MainLayout)" />
<FocusOnNavigate RouteData="routeData" Selector="h1" />
</Found>
</Router>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@inherits LayoutComponentBase
@inherits LayoutComponentBase

<div class="sidebar">
<NavMenu />
Expand All @@ -9,10 +9,13 @@
@Body
<hr />
<footer>
<p>@Constants.PRODUCT_NAME (@Utils.DetermineToolVersion()) is an open source project. For issues or feedback visit the <a href="@Constants.LINK_GITHUB_TEST_TOOL">AWS Lambda for .NET Core GitHub repository.</a></p>
<p>
Check out the <a href="https://github.com/aws/integrations-on-dotnet-aspire-for-aws/tree/main/src/Aspire.Hosting.AWS#integrating-aws-lambda-local-development" target="_blank" rel="noopener noreferrer">Aspire + Lambda Test Tool</a> integration for a more full
featured Lambda emulation including API Gateway emulation. @Constants.PRODUCT_NAME (@Utils.DetermineToolVersion()) is an open source project. For issues or feedback visit the <a href="@Constants.LINK_GITHUB_TEST_TOOL">AWS Lambda for .NET Core GitHub repository</a>
</p>
</footer>
</div>

</div>

<BlazoredModal />
<BlazoredModal />
Loading
Loading