Skip to content

Commit e47a6d8

Browse files
authored
Merge branch 'linkdotnet:master' into master
2 parents 29aa5df + e76a3f1 commit e47a6d8

File tree

9 files changed

+30
-33
lines changed

9 files changed

+30
-33
lines changed

.github/workflows/codeql.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ jobs:
2929
uses: actions/setup-dotnet@v4
3030
with:
3131
dotnet-version: |
32-
7.0.x
3332
8.0.x
3433
9.0.x
3534

.github/workflows/dotnet.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ jobs:
2525
uses: actions/setup-dotnet@v4
2626
with:
2727
dotnet-version: |
28-
7.0.x
2928
8.0.x
3029
9.0.x
3130
- name: Restore dependencies

Directory.Packages.props

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,44 +4,43 @@
44
</PropertyGroup>
55
<ItemGroup Label="Code Analyzers">
66
<PackageVersion Include="IDisposableAnalyzers" Version="4.0.8" />
7-
<GlobalPackageReference Include="SonarAnalyzer.CSharp" Version="10.10.0.116381" PrivateAssets="All" IncludeAssets="Runtime;Build;Native;contentFiles;Analyzers" />
7+
<GlobalPackageReference Include="SonarAnalyzer.CSharp" Version="10.13.0.120203" PrivateAssets="All" IncludeAssets="Runtime;Build;Native;contentFiles;Analyzers" />
88
</ItemGroup>
99
<ItemGroup Label="Infrastructure">
1010
<PackageVersion Include="Azure.Storage.Blobs" Version="12.24.1" />
11-
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="9.0.6" />
12-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.6" />
13-
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.6" />
14-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.6">
11+
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="9.0.7" />
12+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.7" />
13+
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.7" />
14+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.7">
1515
<PrivateAssets>all</PrivateAssets>
1616
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1717
</PackageVersion>
18-
<PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="9.0.6" />
18+
<PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="9.0.7" />
1919
<PackageVersion Include="MongoDB.Driver" Version="3.4.0" />
2020
<PackageVersion Include="Pomelo.EntityFrameworkCore.MySql" Version="9.0.0-preview.3.efcore.9.0.0" />
2121
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" />
22-
<PackageVersion Include="RavenDB.Client" Version="7.0.3" />
22+
<PackageVersion Include="RavenDB.Client" Version="7.1.0" />
2323
</ItemGroup>
2424
<ItemGroup Label="Web">
2525
<PackageVersion Include="AspNetCore.HealthChecks.UI.Client" Version="9.0.0" />
2626
<PackageVersion Include="Blazored.Toast" Version="4.2.1" />
27-
<PackageVersion Include="Blazorise.Bootstrap5" Version="1.7.7" />
28-
<PackageVersion Include="Blazorise.Markdown" Version="1.7.7" />
29-
<PackageVersion Include="Markdig" Version="0.41.2" />
30-
<PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="9.0.6" />
31-
<PackageVersion Include="Microsoft.Extensions.Options" Version="9.0.6" />
27+
<PackageVersion Include="Blazorise.Bootstrap5" Version="1.8.0" />
28+
<PackageVersion Include="Blazorise.Markdown" Version="1.8.0" />
29+
<PackageVersion Include="Markdig" Version="0.41.3" />
30+
<PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="9.0.7" />
31+
<PackageVersion Include="Microsoft.Extensions.Options" Version="9.0.7" />
3232
<PackageVersion Include="NCronJob" Version="4.5.4" />
3333
<PackageVersion Include="ReverseMarkdown" Version="4.7.0" />
34-
<PackageVersion Include="System.ServiceModel.Syndication" Version="9.0.6" />
34+
<PackageVersion Include="System.ServiceModel.Syndication" Version="9.0.7" />
3535
</ItemGroup>
3636
<ItemGroup Label="Tests">
37-
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.6" />
38-
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.6" />
39-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.0" />
37+
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.7" />
38+
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.7" />
39+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
4040
<PackageVersion Include="NSubstitute" Version="5.3.0" />
41-
<PackageVersion Include="RavenDB.TestDriver" Version="7.0.3" />
41+
<PackageVersion Include="RavenDB.TestDriver" Version="7.1.0" />
4242
<PackageVersion Include="Shouldly" Version="4.3.0" />
43-
<PackageVersion Include="bunit" Version="2.0.24-preview" />
44-
<PackageVersion Include="bunit.generators" Version="2.0.24-preview" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
43+
<PackageVersion Include="bunit" Version="2.0.41-preview" />
4544
<PackageVersion Include="coverlet.collector" Version="6.0.4">
4645
<PrivateAssets>all</PrivateAssets>
4746
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -50,11 +49,11 @@
5049
<PrivateAssets>all</PrivateAssets>
5150
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
5251
</PackageVersion>
53-
<PackageVersion Include="xunit.v3" Version="2.0.2" />
54-
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.0" />
52+
<PackageVersion Include="xunit.v3" Version="2.0.3" />
53+
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.1" />
5554
</ItemGroup>
5655
<ItemGroup Label="Tools">
5756
<PackageVersion Include="CommandLineParser" Version="2.9.1" />
58-
<PackageVersion Include="Microsoft.Playwright" Version="1.52.0" />
57+
<PackageVersion Include="Microsoft.Playwright" Version="1.53.0" />
5958
</ItemGroup>
6059
</Project>

tests/Directory.Build.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
</ItemGroup>
1717

1818
<ItemGroup>
19-
<PackageReference Include="bunit.generators" />
2019
<PackageReference Include="bunit" />
2120
<PackageReference Include="Shouldly" />
2221
<PackageReference Include="NSubstitute" />

tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Admin/BlogPostEditor/CreateNewBlogPostPageTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public async Task ShouldSaveBlogPostOnSave()
4949
instantRegistry.Received(1).RunInstantJob<SimilarBlogPostJob>(Arg.Any<object>(), Arg.Any<CancellationToken>());
5050
}
5151

52-
private static void TriggerNewBlogPost(RenderedComponent<CreateNewBlogPost> cut)
52+
private static void TriggerNewBlogPost(IRenderedComponent<CreateNewBlogPost> cut)
5353
{
5454
cut.Find("#title").Input("My Title");
5555
cut.Find("#short").Input("My short Description");

tests/LinkDotNet.Blog.IntegrationTests/Web/Features/Admin/BlogPostEditor/UpdateBlogPostPageTests.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
using LinkDotNet.Blog.Web.Features.Admin.BlogPostEditor.Components;
1313
using LinkDotNet.Blog.Web.Features.Components;
1414
using LinkDotNet.Blog.Web.Features.Services;
15+
using Microsoft.AspNetCore.Components;
1516
using Microsoft.EntityFrameworkCore;
1617
using Microsoft.Extensions.DependencyInjection;
1718
using NCronJob;
@@ -68,7 +69,7 @@ public void ShouldThrowWhenNoIdProvided()
6869
act.ShouldThrow<ArgumentNullException>();
6970
}
7071

71-
private static void TriggerUpdate(RenderedFragment cut)
72+
private static void TriggerUpdate(IRenderedComponent<IComponent> cut)
7273
{
7374
cut.Find("#short").Input("My new Description");
7475

tests/LinkDotNet.Blog.IntegrationTests/Web/Shared/ProfileTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,10 +177,10 @@ private static void SetupGetAll(
177177
return (repoMock, calcMock);
178178
}
179179

180-
private RenderedComponent<Profile> RenderProfileWithEmptyInformation()
180+
private IRenderedComponent<Profile> RenderProfileWithEmptyInformation()
181181
=> Render<Profile>(p => p.Add(s => s.ProfileInformation, new ProfileInformationBuilder().Build()));
182182

183-
private RenderedComponent<Profile> RenderProfileInAdmin()
183+
private IRenderedComponent<Profile> RenderProfileInAdmin()
184184
=> Render<Profile>(p => p
185185
.Add(s => s.ProfileInformation, new ProfileInformationBuilder().Build())
186186
.Add(s => s.ShowAdminActions, true));

tests/LinkDotNet.Blog.TestUtilities/BunitExtensions.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ namespace LinkDotNet.Blog.TestUtilities;
55

66
public static class BunitExtensions
77
{
8-
public static RenderedComponent<TComponent> WaitForComponent<TComponent>(this RenderedFragment component)
8+
public static IRenderedComponent<TComponent> WaitForComponent<TComponent>(this IRenderedComponent<IComponent> component)
99
where TComponent : IComponent
1010
{
1111
component.WaitForState(component.HasComponent<TComponent>);
1212
return component.FindComponent<TComponent>();
1313
}
1414

15-
public static IReadOnlyList<RenderedComponent<TComponent>> WaitForComponents<TComponent>(this RenderedFragment component)
15+
public static IReadOnlyList<IRenderedComponent<TComponent>> WaitForComponents<TComponent>(this IRenderedComponent<IComponent> component)
1616
where TComponent : IComponent
1717
{
1818
component.WaitForState(component.HasComponent<TComponent>);

tests/LinkDotNet.Blog.UnitTests/Web/Features/Components/OgDataTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public void ShouldSetCanoncialLinkWithoutQueryParameter()
7070
}
7171

7272
private static void AssertMetaTagExistsWithValue(
73-
RenderedFragment cut,
73+
IRenderedComponent<IComponent> cut,
7474
string metaTag,
7575
string metaTagValue,
7676
string? ogPropertyName = null)
@@ -87,7 +87,7 @@ private static void AssertMetaTagExistsWithValue(
8787
}
8888

8989
private static bool GetMetaTagExists(
90-
RenderedFragment cut,
90+
IRenderedComponent<IComponent> cut,
9191
string metaTag)
9292
{
9393
var metaTags = cut.FindAll("meta");

0 commit comments

Comments
 (0)