Skip to content

Update dependencies and refactor E2E test command registration #345

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dolunay wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Update dependencies and refactor E2E test command registration #345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6d51ea3
Update dependencies and refactor E2E test command registration
dolunay Dec 23, 2025
9820f54
Add Turkish language support and translations
dolunay Dec 23, 2025
2424bc9
Add localized "Cancel" button to all supported languages
dolunay Dec 23, 2025
a2aa7be
Localize Markdown editor toolbar button labels
dolunay Dec 23, 2025
178bcb7
Upgrade to .NET 10, update packages, and refactor forms
dolunay Dec 28, 2025
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
82 changes: 41 additions & 41 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,42 +1,42 @@
<Project>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="Aspire.Hosting.AppHost" Version="9.0.0" />
<PackageVersion Include="Aspire.Hosting.PostgreSQL" Version="9.0.0" />
<PackageVersion Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.0" />
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
<PackageVersion Include="markdig" Version="0.40.0" />
<PackageVersion Include="Microsoft.AspNetCore.Authorization" Version="9.0.1" />
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="9.0.1" />
<PackageVersion Include="Microsoft.AspNetCore.Components.Authorization" Version="9.0.1" />
<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.1" />
<PackageVersion Include="Microsoft.AspNetCore.Identity.UI" Version="9.0.1" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.1" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.1" />
<PackageVersion Include="Microsoft.Extensions.Identity.Stores" Version="9.0.1" />
<PackageVersion Include="Microsoft.Extensions.Localization" Version="9.0.1" />
<PackageVersion Include="Microsoft.AspNetCore.Components.QuickGrid" Version="9.0.1" />
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="9.0.1" />
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="9.0.1" />
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.1" />
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="9.1.0" />
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="9.0.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageVersion Include="Microsoft.Playwright.Xunit" Version="1.50.0-beta-2" />
<PackageVersion Include="Moq" Version="4.20.72" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.11.0" />
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.11.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.10.1" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.10.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.10.0" />
<PackageVersion Include="PSC.Blazor.Components.MarkdownEditor" Version="8.0.5" />
<PackageVersion Include="System.Text.Json" Version="9.0.1" />
<PackageVersion Include="xunit" Version="2.9.3" />
<PackageVersion Include="xunit.runner.visualstudio" Version="3.0.1" />
</ItemGroup>
<Project>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="Aspire.Hosting.AppHost" Version="13.1.0" />
<PackageVersion Include="Aspire.Hosting.PostgreSQL" Version="13.1.0" />
<PackageVersion Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" Version="13.1.0" />
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
<PackageVersion Include="markdig" Version="0.44.0" />
<PackageVersion Include="Microsoft.AspNetCore.Authorization" Version="10.0.1" />
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="10.0.1" />
<PackageVersion Include="Microsoft.AspNetCore.Components.Authorization" Version="10.0.1" />
<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.1" />
<PackageVersion Include="Microsoft.AspNetCore.Identity.UI" Version="10.0.1" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.1" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.1" />
<PackageVersion Include="Microsoft.Extensions.Identity.Stores" Version="10.0.1" />
<PackageVersion Include="Microsoft.Extensions.Localization" Version="10.0.1" />
<PackageVersion Include="Microsoft.AspNetCore.Components.QuickGrid" Version="10.0.1" />
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="10.0.1" />
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="10.0.1" />
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.1" />
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="10.1.0" />
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="10.1.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
<PackageVersion Include="Microsoft.Playwright.Xunit" Version="1.57.0" />
<PackageVersion Include="Moq" Version="4.20.72" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.14.0" />
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.14.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.14.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.14.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.14.0" />
<PackageVersion Include="PSC.Blazor.Components.MarkdownEditor" Version="8.0.8" />
<PackageVersion Include="System.Text.Json" Version="10.0.1" />
<PackageVersion Include="xunit" Version="2.9.3" />
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
</ItemGroup>
</Project>
20 changes: 20 additions & 0 deletions delete-bin-obj-folders.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
@ECHO off
cls

ECHO Deleting all BIN and OBJ folders...
ECHO.

FOR /d /r . %%d in (bin,obj) DO (
IF EXIST "%%d" (
ECHO %%d | FIND /I "\node_modules\" > Nul && (
ECHO.Skipping: %%d
) || (
ECHO.Deleting: %%d
rd /s/q "%%d"
)
)
)

ECHO.
ECHO.BIN and OBJ folders have been successfully deleted. Press any key to exit.
pause > nul
7 changes: 5 additions & 2 deletions e2e/SharpSite.E2E/SharpSite.E2E.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFrameworks>net10.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="coverlet.collector" />
<PackageReference Include="coverlet.collector">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="Microsoft.Playwright.Xunit" />
<PackageReference Include="xunit" />
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "9.0.100",
"version": "10.0.101",
"allowPrerelease": true,
"rollForward": "minor"
}
Expand Down
2 changes: 1 addition & 1 deletion nuget.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
<packageSources>
<!--To inherit the global NuGet package sources remove the <clear/> line below -->
<clear />
<add key="nuget" value="https://api.nuget.org/v3/index.json" />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
</packageSources>
</configuration>
2 changes: 1 addition & 1 deletion plugins/Sample.FirstThemePlugin/Sample.FirstThemePlugin.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFrameworks>net10.0</TargetFrameworks>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion .../SharpSite.Plugins.FileStorage.FileSystem/SharpSite.Plugins.FileStorage.FileSystem.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFrameworks>net10.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/SharpSite.Abstractions.Base/SharpSite.Abstractions.Base.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFrameworks>net10.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<OutputPath>bin\Debug\</OutputPath>
Expand Down
2 changes: 1 addition & 1 deletion src/SharpSite.Abstractions.FileStorage/SharpSite.Abstractions.FileStorage.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFrameworks>net10.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/SharpSite.Abstractions.Theme/SharpSite.Abstractions.Theme.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFrameworks>net10.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/SharpSite.Abstractions/SharpSite.Abstractions.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFrameworks>net10.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<OutputPath>bin\Debug\</OutputPath>
Expand Down
46 changes: 28 additions & 18 deletions src/SharpSite.AppHost/RunE2ETestsCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,25 @@ public static class RunE2ETestsCommand

public static IResourceBuilder<ProjectResource> WithRunE2eTestsCommand(
this IResourceBuilder<ProjectResource> builder)
{
builder.WithCommand(
name: Name,
displayName: "Run end to end tests",
executeCommand: context => RunTests(),
updateState: OnUpdateResourceState,
iconName: "BookGlobe",
iconVariant: IconVariant.Filled);

{
//builder.WithCommand(
// name: Name,
// displayName: "Run end to end tests",
// executeCommand: context => RunTests(),
// updateState: OnUpdateResourceState,
// iconName: "BookGlobe",
// iconVariant: IconVariant.Filled);
CommandOptions? options = new()
{
UpdateState = OnUpdateResourceState,
IconName = "BookGlobe",
IconVariant = IconVariant.Filled
};
builder.WithCommand(
name: Name,
displayName: "Run end to end tests",
executeCommand: context => RunTests(),
options);
return builder;
}

Expand Down Expand Up @@ -56,15 +66,15 @@ private static async Task<ExecuteCommandResult> RunTests()
private static ResourceCommandState OnUpdateResourceState(
UpdateCommandStateContext context)
{
var logger = context.ServiceProvider.GetRequiredService<ILogger<Program>>();

//if (logger.IsEnabled(LogLevel.Information))
//{
// logger.LogInformation(
// "Updating resource state: {ResourceSnapshot}",
// context.ResourceSnapshot);
//}

var logger = context.ServiceProvider.GetRequiredService<ILogger<Program>>();
//if (logger.IsEnabled(LogLevel.Information))
//{
// logger.LogInformation(
// "Updating resource state: {ResourceSnapshot}",
// context.ResourceSnapshot);
//}
return context.ResourceSnapshot.HealthStatus is HealthStatus.Healthy
? ResourceCommandState.Enabled
: ResourceCommandState.Disabled;
Expand Down
6 changes: 3 additions & 3 deletions src/SharpSite.AppHost/SharpSite.AppHost.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<Sdk Name="Aspire.AppHost.Sdk" Version="9.0.0" />
<Sdk Name="Aspire.AppHost.Sdk" Version="13.1.0" />
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net9.0</TargetFramework>
<TargetFrameworks>net10.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsAspireHost>true</IsAspireHost>
Expand All @@ -18,7 +18,7 @@
<ItemGroup>
<PackageReference Include="Aspire.Hosting.AppHost" />
<PackageReference Include="Aspire.Hosting.PostgreSQL" />
<PackageReference Include="System.Text.Json" />
<!--<PackageReference Include="System.Text.Json" />-->
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions src/SharpSite.Data.Postgres.Migration/SharpSite.Data.Postgres.Migration.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk.Worker">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFrameworks>net10.0</TargetFrameworks>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<UserSecretsId>dotnet-SharpSite.Data.Postgres.Migration-289ae9dd-798a-46ac-a8f2-306177566084</UserSecretsId>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" />
<PackageReference Include="Microsoft.Extensions.Hosting" VersionOverride="9.0.0-rc.2.24473.5" />
<PackageReference Include="Microsoft.Extensions.Hosting" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" />
</ItemGroup>

Expand Down
12 changes: 6 additions & 6 deletions src/SharpSite.Data.Postgres/SharpSite.Data.Postgres.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net10.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\SharpSite.Abstractions\SharpSite.Abstractions.csproj" />
</ItemGroup>
Expand All @@ -8,10 +14,4 @@
<PackageReference Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" />
</ItemGroup>

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>

</Project>
2 changes: 1 addition & 1 deletion src/SharpSite.Plugins/SharpSite.Plugins.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFrameworks>net10.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
Expand Down
3 changes: 2 additions & 1 deletion src/SharpSite.Security.Postgres/Account/Pages/ExternalLogin.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
private HttpContext HttpContext { get; set; } = default!;

[SupplyParameterFromForm]
private InputModel Input { get; set; } = new();
private InputModel Input { get; set; } = default!;

[SupplyParameterFromQuery]
private string? RemoteError { get; set; }
Expand All @@ -69,6 +69,7 @@

protected override async Task OnInitializedAsync()
{
Input ??= new();
if (RemoteError is not null)
{
RedirectManager.RedirectToWithStatus("Account/Login", $"Error from external provider: {RemoteError}", HttpContext);
Expand Down
3 changes: 2 additions & 1 deletion src/SharpSite.Security.Postgres/Account/Pages/ForgotPassword.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,9 @@
</div>

@code {
protected override void OnInitialized() => Input ??= new();
[SupplyParameterFromForm]
private InputModel Input { get; set; } = new();
private InputModel Input { get; set; } = default!;

private async Task OnValidSubmitAsync()
{
Expand Down
3 changes: 2 additions & 1 deletion src/SharpSite.Security.Postgres/Account/Pages/Login.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
private HttpContext HttpContext { get; set; } = default!;

[SupplyParameterFromForm]
private InputModel Input { get; set; } = new();
private InputModel Input { get; set; } = default!;

[SupplyParameterFromQuery]
private string? ReturnUrl { get; set; }
Expand All @@ -82,6 +82,7 @@
// Clear the existing external cookie to ensure a clean login process
await HttpContext.SignOutAsync(IdentityConstants.ExternalScheme);
}
Input ??= new();
}

public async Task LoginUser()
Expand Down
3 changes: 2 additions & 1 deletion src/SharpSite.Security.Postgres/Account/Pages/LoginWith2fa.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
private PgSharpSiteUser user = default!;

[SupplyParameterFromForm]
private InputModel Input { get; set; } = new();
private InputModel Input { get; set; } = default!;

[SupplyParameterFromQuery]
private string? ReturnUrl { get; set; }
Expand All @@ -59,6 +59,7 @@

protected override async Task OnInitializedAsync()
{
Input ??= new();
// Ensure the user has gone through the username & password screen first
user = await SignInManager.GetTwoFactorAuthenticationUserAsync() ??
throw new InvalidOperationException("Unable to load two-factor authentication user.");
Expand Down
Loading