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
2 changes: 1 addition & 1 deletion Core/Bones.Api.Client/Bones.Api.Client.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Http" Version="10.0.3" />
<PackageReference Include="Microsoft.Extensions.Http" Version="10.0.5" />
<PackageReference Include="ReQuesty.Runtime" Version="0.0.7" />
</ItemGroup>

Expand Down
10 changes: 5 additions & 5 deletions Core/Bones.Database/Bones.Database.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.3">
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.5">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.3" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.3" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.3">
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.5">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.0" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.1" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Core/Bones.Logic/Bones.Logic.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="10.0.3" />
<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="10.0.5" />
</ItemGroup>
</Project>
14 changes: 7 additions & 7 deletions Core/Bones.Shared.Backend/Bones.Shared.Backend.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,22 @@
<ItemGroup>
<!-- Aspire -->
<FrameworkReference Include="Microsoft.AspNetCore.App" />
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="10.3.0" />
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="10.3.0" />
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="10.4.0" />
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="10.4.0" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.0" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.15.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.15.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.15.1" />
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.15.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.15.0" />

<!-- Everything else -->
<PackageReference Include="Autofac" Version="9.0.0" />
<PackageReference Include="Autofac" Version="9.1.0" />
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="10.0.0" />
<PackageReference Include="FluentValidation" Version="12.1.1" />
<PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="12.1.1" />
<PackageReference Include="Questy" Version="0.0.7" />
<PackageReference Include="Questy.Autofac" Version="0.0.6" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.3" />
<PackageReference Include="Questy" Version="0.0.8" />
<PackageReference Include="Questy.Autofac" Version="0.0.7" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.5" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Core/Bones.Shared/Bones.Shared.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<ItemGroup>
<PackageReference Include="DnsClient" Version="1.8.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.3" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.5" />
<PackageReference Include="Serilog" Version="4.3.1" />
<PackageReference Include="Serilog.Extensions.Hosting" Version="10.0.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="6.1.1" />
Expand Down
12 changes: 6 additions & 6 deletions Frontend/Bones.WebUI/Bones.WebUI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
</PropertyGroup>

<ItemGroup Condition="$(Configuration) == 'Debug'">
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.3" PrivateAssets="all" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.5" PrivateAssets="all" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.3" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="10.0.3" />
<PackageReference Include="MudBlazor" Version="9.0.0" />
<PackageReference Include="CodeBeam.MudBlazor.Extensions" Version="9.0.1" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.5" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="10.0.5" />
<PackageReference Include="MudBlazor" Version="9.2.0" />
<PackageReference Include="CodeBeam.MudBlazor.Extensions" Version="9.0.3" />
</ItemGroup>

<ItemGroup>
Expand All @@ -28,7 +28,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Sdk.WebAssembly.Pack" Version="10.0.3" />
<PackageReference Include="Microsoft.NET.Sdk.WebAssembly.Pack" Version="10.0.5" />
<Content Remove="wwwroot/appsettings.Development.json" Condition="$(Configuration) == 'Release'" />
</ItemGroup>

Expand Down
16 changes: 8 additions & 8 deletions Frontend/Bones.WebUI/Pages/Project/ItemLayoutPage.razor
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<RowTemplate>
<MudTd DataLabel="Controls">
<div style="display: flex;">
<MudIconButton Size="Size.Small" Icon="@Icons.Material.Filled.Add" aria-label="add" OnClick="@(() => AddField(context.FieldVersionId))" />
<MudIconButton Size="Size.Small" Icon="@Icons.Material.Filled.Add" aria-label="add" OnClick="@(async () => await AddFieldAsync(context.FieldVersionId))" />
</div>
</MudTd>
<MudTd DataLabel="Field Name">@context.Name</MudTd>
Expand All @@ -60,9 +60,9 @@
<RowTemplate>
<MudTd DataLabel="Controls">
<div style="display: flex;">
<MudIconButton Size="Size.Small" Icon="@Icons.Material.Filled.ArrowUpward" Color="Color.Primary" aria-label="move up" OnClick="@(() => MoveFieldUp(context.Value.FieldVersionId))" />
<MudIconButton Size="Size.Small" Icon="@Icons.Material.Filled.ArrowDownward" Color="Color.Primary" aria-label="move down" OnClick="@(() => MoveFieldDown(context.Value.FieldVersionId))" />
<MudIconButton Size="Size.Small" Icon="@Icons.Material.Filled.Delete" aria-label="remove" OnClick="@(() => RemoveField(context.Value.FieldVersionId))" />
<MudIconButton Size="Size.Small" Icon="@Icons.Material.Filled.ArrowUpward" Color="Color.Primary" aria-label="move up" OnClick="@(async () => await MoveFieldUpAsync(context.Value.FieldVersionId))" />
<MudIconButton Size="Size.Small" Icon="@Icons.Material.Filled.ArrowDownward" Color="Color.Primary" aria-label="move down" OnClick="@(async () => await MoveFieldDownAsync(context.Value.FieldVersionId))" />
<MudIconButton Size="Size.Small" Icon="@Icons.Material.Filled.Delete" aria-label="remove" OnClick="@(async () => await RemoveFieldAsync(context.Value.FieldVersionId))" />
</div>
</MudTd>
<MudTd DataLabel="Field Name">@context.Value.Name</MudTd>
Expand Down Expand Up @@ -93,7 +93,7 @@
<MudSelectItem Value="Bones.Api.Client.AutoGen.Models.SelectionType.Multiple">Multiple</MudSelectItem>
</MudSelect>

<MudIconButton Size="Size.Small" Icon="@Icons.Material.Filled.Add" aria-label="add" OnClick="@(() => AddAssignee())" />
<MudIconButton Size="Size.Small" Icon="@Icons.Material.Filled.Add" aria-label="add" OnClick="@(async () => await AddAssigneeAsync())" />

<MudTable Items="@ItemAssigneesList" Hover="true" Breakpoint="Breakpoint.Sm" Loading="@ItemAssigneesListLoading" LoadingProgressColor="Color.Info">
<HeaderContent>
Expand All @@ -106,9 +106,9 @@
<MudTd DataLabel="Controls">
<MudTd DataLabel="Controls">
<div style="display: flex;">
<MudIconButton Size="Size.Small" Icon="@Icons.Material.Filled.ArrowUpward" Color="Color.Primary" aria-label="move up" OnClick="@(() => MoveAssigneeUp(context.Name))" />
<MudIconButton Size="Size.Small" Icon="@Icons.Material.Filled.ArrowDownward" Color="Color.Primary" aria-label="move down" OnClick="@(() => MoveAssigneeDown(context.Name))" />
<MudIconButton Size="Size.Small" Icon="@Icons.Material.Filled.Delete" aria-label="remove" OnClick="@(() => RemoveAssignee(context.Name))" />
<MudIconButton Size="Size.Small" Icon="@Icons.Material.Filled.ArrowUpward" Color="Color.Primary" aria-label="move up" OnClick="@(async () => await MoveAssigneeUpAsync(context.Name))" />
<MudIconButton Size="Size.Small" Icon="@Icons.Material.Filled.ArrowDownward" Color="Color.Primary" aria-label="move down" OnClick="@(async () => await MoveAssigneeDownAsync(context.Name))" />
<MudIconButton Size="Size.Small" Icon="@Icons.Material.Filled.Delete" aria-label="remove" OnClick="@(async () => await RemoveAssigneeAsync(context.Name))" />
</div>
</MudTd>
</MudTd>
Expand Down
32 changes: 16 additions & 16 deletions Frontend/Bones.WebUI/Pages/Project/ItemLayoutPage.razor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ await apiClient.ItemLayout.Layouts.Create.PostAsync(new CreateItemLayoutRequest(
}
}

private void AddField(Guid FieldVersionId)
private async Task AddFieldAsync(Guid FieldVersionId)
{
if (SelectedItemFields.Any(x => x.Value.FieldVersionId == FieldVersionId))
{
Expand All @@ -192,10 +192,10 @@ private void AddField(Guid FieldVersionId)
SelectedItemFields.Add(SelectedItemFields.Count, new(field.FieldVersionId, field.Name, field.IsRequired, field.Type!.Value));
SelectedItemFieldsCount = SelectedItemFields.Count;

Form.Validate();
await Form.ValidateAsync();
}

private void MoveFieldDown(Guid FieldVersionId)
private async Task MoveFieldDownAsync(Guid FieldVersionId)
{
if (!SelectedItemFields.Any(x => x.Value.FieldVersionId == FieldVersionId) || SelectedItemFields[(SelectedItemFields.Count - 1)].FieldVersionId == FieldVersionId)
{
Expand All @@ -209,10 +209,10 @@ private void MoveFieldDown(Guid FieldVersionId)
SelectedItemFields[fieldToMoveUp.Key] = fieldToMoveDown.Value;
SelectedItemFieldsCount = SelectedItemFields.Count;

Form.Validate();
await Form.ValidateAsync();
}

private void MoveFieldUp(Guid FieldVersionId)
private async Task MoveFieldUpAsync(Guid FieldVersionId)
{
if (!SelectedItemFields.Any(x => x.Value.FieldVersionId == FieldVersionId) || SelectedItemFields[0].FieldVersionId == FieldVersionId)
{
Expand All @@ -226,10 +226,10 @@ private void MoveFieldUp(Guid FieldVersionId)
SelectedItemFields[fieldToMoveDown.Key] = fieldToMoveUp.Value;
SelectedItemFieldsCount = SelectedItemFields.Count;

Form.Validate();
await Form.ValidateAsync();
}

private void RemoveField(Guid FieldVersionId)
private async Task RemoveFieldAsync(Guid FieldVersionId)
{
if (!SelectedItemFields.Any(x => x.Value.FieldVersionId == FieldVersionId))
{
Expand All @@ -252,10 +252,10 @@ private void RemoveField(Guid FieldVersionId)
SelectedItemFields.Remove(SelectedItemFields.Count - 1);
SelectedItemFieldsCount = SelectedItemFields.Count;

Form.Validate();
await Form.ValidateAsync();
}

private void AddAssignee()
private async Task AddAssigneeAsync()
{
if (NewAssigneeName.Trim().Length == 0 || ItemAssigneesList.Any(x => x.Name == NewAssigneeName.Trim()))
{
Expand All @@ -270,10 +270,10 @@ private void AddAssignee()
OrderNumber = ItemAssigneesList.Count
});

Form.Validate();
await Form.ValidateAsync();
}

private void MoveAssigneeDown(string assigneeName)
private async Task MoveAssigneeDownAsync(string assigneeName)
{
if (!ItemAssigneesList.Any(x => x.Name == assigneeName))
{
Expand All @@ -293,10 +293,10 @@ private void MoveAssigneeDown(string assigneeName)

ItemAssigneesList = [.. ItemAssigneesList.OrderBy(a => a.OrderNumber)];

Form.Validate();
await Form.ValidateAsync();
}

private void MoveAssigneeUp(string assigneeName)
private async Task MoveAssigneeUpAsync(string assigneeName)
{
if (!ItemAssigneesList.Any(x => x.Name == assigneeName))
{
Expand All @@ -316,10 +316,10 @@ private void MoveAssigneeUp(string assigneeName)

ItemAssigneesList = [.. ItemAssigneesList.OrderBy(a => a.OrderNumber)];

Form.Validate();
await Form.ValidateAsync();
}

private void RemoveAssignee(string assigneeName)
private async Task RemoveAssigneeAsync(string assigneeName)
{
if (!ItemAssigneesList.Any(x => x.Name == assigneeName))
{
Expand All @@ -335,7 +335,7 @@ private void RemoveAssignee(string assigneeName)
ItemAssigneesList[i].OrderNumber--;
}

Form.Validate();
await Form.ValidateAsync();
}

/// <summary>
Expand Down
6 changes: 3 additions & 3 deletions Services/Bones.Api/Bones.Api.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@

<ItemGroup>
<PackageReference Include="Serilog.AspNetCore" Version="10.0.0" />
<PackageReference Include="Swashbuckle.AspNetCore.ReDoc" Version="10.1.4" />
<PackageReference Include="Swashbuckle.AspNetCore.ReDoc" Version="10.1.5" />

<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.3" />
<PackageReference Include="Microsoft.Extensions.ApiDescription.Server" Version="10.0.3">
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.5" />
<PackageReference Include="Microsoft.Extensions.ApiDescription.Server" Version="10.0.5">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.3">
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.5">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.3" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.5" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL.Design" Version="1.1.0" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="8.0.0">
<PackageReference Include="coverlet.collector" Version="8.0.1">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
</Target>

<ItemGroup>
<PackageReference Include="Aspire.Hosting.Testing" Version="13.1.2" />
<PackageReference Include="Aspire.Hosting.Testing" Version="13.1.3" />
<PackageReference Include="Serilog" Version="4.3.1" />
<PackageReference Include="Serilog.Extensions.Hosting" Version="10.0.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="6.1.1" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="8.0.0">
<PackageReference Include="coverlet.collector" Version="8.0.1">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="8.0.0">
<PackageReference Include="coverlet.collector" Version="8.0.1">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="8.0.0">
<PackageReference Include="coverlet.collector" Version="8.0.1">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
Loading