Skip to content

Commit

Permalink
Upgrade nugets (#32)
Browse files Browse the repository at this point in the history
* update npm packages
* upgrade nugets, fix warn analyzers
  • Loading branch information
stiankroknes committed Jul 14, 2023
1 parent 9119c9b commit 01d1562
Show file tree
Hide file tree
Showing 20 changed files with 399 additions and 381 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -354,3 +354,4 @@ MigrationBackup/

# Ionide (cross platform F# VS Code tools) working folder
.ionide/
/.DS_Store
1 change: 1 addition & 0 deletions VisNetwork.Blazor.sln
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "01_SolutionItems", "01_Solu
.editorconfig = .editorconfig
.gitignore = .gitignore
Directory.Build.props = Directory.Build.props
global.json = global.json
README.md = README.md
EndProjectSection
EndProject
Expand Down
6 changes: 6 additions & 0 deletions global.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"sdk": {
"version": "7.0.100",
"rollForward": "latestMajor"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.3" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.3" PrivateAssets="all" />
<PackageReference Include="System.Net.Http.Json" Version="7.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.9" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.9" PrivateAssets="all" />
<PackageReference Include="System.Net.Http.Json" Version="7.0.1" />
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions src/VisNetwork.Blazor/Models/Events.cs
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ public class ClickedItem
/// Since a double click is in fact 2 clicks, 2 click events are fired, followed by a double click event.
/// If you do not want to use the click events if a double click event is fired, just check the time between click events before processing them.
/// </summary>
[System.Diagnostics.CodeAnalysis.SuppressMessage("Minor Code Smell", "S2094:Classes should not be empty", Justification = "<Pending>")]
public class DoubleClickEvent : ClickEvent
{
}
Expand Down
4 changes: 2 additions & 2 deletions src/VisNetwork.Blazor/Models/Node.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public Node(string id, string label, int level, string shape, string? title = nu
}
public override bool Equals(object? obj) => obj is Node other && Equals(other);

public bool Equals(Node? other) => other is not null && other.Id == Id;
public bool Equals(Node? other) => other is not null && string.Equals(other.Id, Id, StringComparison.Ordinal);

public override int GetHashCode() => Id?.GetHashCode() ?? 0;
public override int GetHashCode() => Id?.GetHashCode(StringComparison.Ordinal) ?? 0;
}
699 changes: 354 additions & 345 deletions src/VisNetwork.Blazor/StaticAssets/package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/VisNetwork.Blazor/StaticAssets/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"typescript": "4.9.5",
"vis-data": "^7.1.4",
"vis-network": "^9.1.4",
"webpack": "5.75.0",
"webpack": "^5.83.1",
"webpack-cli": "5.0.1"
}
}
2 changes: 1 addition & 1 deletion src/VisNetwork.Blazor/VisNetwork.Blazor.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="SonarAnalyzer.CSharp" Version="8.53.0.62665">
<PackageReference Include="SonarAnalyzer.CSharp" Version="9.5.0.73987">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
2 changes: 1 addition & 1 deletion src/VisNetwork.Blazor/wwwroot/BlazorVisNetwork.js

Large diffs are not rendered by default.

6 changes: 2 additions & 4 deletions src/VisNetwork.Blazor/wwwroot/BlazorVisNetwork.js.LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,14 @@
* Copyright (c) hammerjs
* Licensed under the MIT license */

/*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */

/**
* vis-network
* https://visjs.github.io/vis-network/
*
* A dynamic, browser-based visualization library.
*
* @version 9.1.4
* @date 2023-02-24T18:18:24.755Z
* @version 9.1.6
* @date 2023-03-23T21:31:19.223Z
*
* @copyright (c) 2011-2017 Almende B.V, http://almende.com
* @copyright (c) 2017-2019 visjs contributors, https://github.com/visjs
Expand Down
12 changes: 6 additions & 6 deletions tests/VisNetwork.Blazor.Tests/VisNetwork.Blazor.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="bunit.web" Version="1.18.4" />
<PackageReference Include="FluentAssertions" Version="6.10.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<PackageReference Include="bunit.web" Version="1.21.9" />
<PackageReference Include="FluentAssertions" Version="6.11.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
<PackageReference Include="xunit" Version="2.5.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="3.2.0">
<PackageReference Include="coverlet.collector" Version="6.0.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
2 changes: 1 addition & 1 deletion tests/VisNetwork.Blazor.Tests/VisNetworkConfig.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public static void AddVisNetwork(TestServiceProvider services)
services.AddScoped<IJSModule, JSModule>();
}

internal class DummyVersionProvider : IVersionProvider
internal sealed class DummyVersionProvider : IVersionProvider
{
public string Version => string.Empty;
}
Expand Down
2 changes: 1 addition & 1 deletion tests/VisNetwork.Blazor.UITests/Pages/DotParsingPage.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

namespace VisNetwork.Blazor.UITests.Pages;

internal class DotParsingPage : BasePage
internal sealed class DotParsingPage : BasePage
{
private readonly IPage page;

Expand Down
2 changes: 1 addition & 1 deletion tests/VisNetwork.Blazor.UITests/Pages/IndexPage.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

namespace VisNetwork.Blazor.UITests.Pages;

internal class IndexPage : BasePage
internal sealed class IndexPage : BasePage
{
private readonly IPage page;
private readonly ILocator networkDiv;
Expand Down
2 changes: 1 addition & 1 deletion tests/VisNetwork.Blazor.UITests/Pages/InteractionPage.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

namespace VisNetwork.Blazor.UITests.Pages;

internal class InteractionPage : BasePage
internal sealed class InteractionPage : BasePage
{
private readonly LayoutPage layoutPage;

Expand Down
2 changes: 1 addition & 1 deletion tests/VisNetwork.Blazor.UITests/Pages/IssuePage.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

namespace VisNetwork.Blazor.UITests.Pages;

internal class IssuePage : BasePage
internal sealed class IssuePage : BasePage
{
private readonly IPage page;
private readonly ILocator networkDiv;
Expand Down
2 changes: 1 addition & 1 deletion tests/VisNetwork.Blazor.UITests/Pages/LayoutPage.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

namespace VisNetwork.Blazor.UITests.Pages;

internal class LayoutPage : BasePage
internal sealed class LayoutPage : BasePage
{
private readonly IPage page;
private readonly ILocator interactionMenuLink;
Expand Down
4 changes: 3 additions & 1 deletion tests/VisNetwork.Blazor.UITests/TestBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ public abstract class TestBase : IAsyncLifetime
public IBrowserContext Context { get; private set; } = null!;
public IPage Page { get; private set; } = null!;

private static readonly string[] args = new[] { "install" };

protected TestBase(BlazorWebAssemblyWebHostFixture fixture, ITestOutputHelper testOutputHelper)
{
Fixture = fixture;
Expand All @@ -45,7 +47,7 @@ protected TestBase(BlazorWebAssemblyWebHostFixture fixture, ITestOutputHelper te

private static bool InstallBrowsers()
{
var exitCode = Program.Main(new[] { "install" });
var exitCode = Program.Main(args);
if (exitCode != 0)
{
Environment.Exit(exitCode);
Expand Down
22 changes: 11 additions & 11 deletions tests/VisNetwork.Blazor.UITests/VisNetwork.Blazor.UITests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -39,21 +39,21 @@
</Target>-->

<ItemGroup>
<PackageReference Include="FluentAssertions" Version="6.10.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="7.0.3" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.3" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
<PackageReference Include="Microsoft.Playwright" Version="1.31.1" />
<PackageReference Include="Microsoft.Playwright.TestAdapter" Version="1.31.1" />
<PackageReference Include="Serilog" Version="2.12.0" />
<PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
<PackageReference Include="FluentAssertions" Version="6.11.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="7.0.9" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.9" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
<PackageReference Include="Microsoft.Playwright" Version="1.36.0" />
<PackageReference Include="Microsoft.Playwright.TestAdapter" Version="1.36.0" />
<PackageReference Include="Serilog" Version="3.0.1" />
<PackageReference Include="Serilog.Extensions.Logging" Version="7.0.0" />
<PackageReference Include="Serilog.Sinks.XUnit" Version="3.0.5" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<PackageReference Include="xunit" Version="2.5.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="3.2.0">
<PackageReference Include="coverlet.collector" Version="6.0.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down

0 comments on commit 01d1562

Please sign in to comment.