Skip to content

Commit

Permalink
Switch to .net 9.0 release and solve most warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
Vincent Wilms committed Nov 14, 2024
1 parent 4a8478b commit 8688f86
Show file tree
Hide file tree
Showing 18 changed files with 68 additions and 76 deletions.
11 changes: 4 additions & 7 deletions src/Nexus.UI/Components/AttachmentView.razor
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@
</MudTooltip>

<UIDialog
@bind-IsVisible="_isAttachmentDialogOpen"
Title="Attachments"
@bind-Visible="_isAttachmentDialogOpen"
MaxWidth="MaxWidth.ExtraSmall">
<TitleContent>
<MudText Typo="Typo.h6">
Expand Down Expand Up @@ -73,16 +72,14 @@
T="IReadOnlyList<IBrowserFile>"
FilesChanged="UploadAttachmentsAsync"
MaximumFileCount="100">
<ButtonTemplate>
<ActivatorContent>
<MudButton
HtmlTag="label"
Variant="Variant.Outlined"
Color="Color.Primary"
StartIcon="@Icons.Material.Filled.Upload"
for="@context">
StartIcon="@Icons.Material.Filled.Upload">
Upload
</MudButton>
</ButtonTemplate>
</ActivatorContent>
</MudFileUpload>
}
</DialogActions>
Expand Down
2 changes: 1 addition & 1 deletion src/Nexus.UI/Components/CatalogAboutView.razor
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<MudIconButton OnClick="OpenCatalogAboutModal" Icon="@Icons.Material.Outlined.Info" />
</MudTooltip>

<UIDialog @bind-IsVisible="_isCatalogAboutDialogOpen" MaxWidth="MaxWidth.ExtraSmall">
<UIDialog @bind-Visible="_isCatalogAboutDialogOpen" MaxWidth="MaxWidth.ExtraSmall">

<TitleContent>
<MudText Typo="Typo.h6">
Expand Down
2 changes: 1 addition & 1 deletion src/Nexus.UI/Components/ErrorsView.razor
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
}

<UIDialog
@bind-IsVisible="_isErrorDialogOpen"
@bind-Visible="_isErrorDialogOpen"
MaxWidth="MaxWidth.ExtraSmall">
<TitleContent>
<MudText Typo="Typo.h6">
Expand Down
2 changes: 1 addition & 1 deletion src/Nexus.UI/Components/JobView.razor
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
Color="Color.Error" />

<UIDialog
@bind-IsVisible="_isErrorMessageDialogOpen"
@bind-Visible="_isErrorMessageDialogOpen"
MaxWidth="MaxWidth.ExtraSmall">
<TitleContent>
<MudText Typo="Typo.h6">
Expand Down
2 changes: 1 addition & 1 deletion src/Nexus.UI/Components/Leftbar_Settings.razor
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
@bind-Value="SamplePeriod"
Label="Period"
CoerceValue="true"
SearchFunc="_ => Task.FromResult(_values.AsEnumerable())"
SearchFunc="(_, _) => Task.FromResult(_values.AsEnumerable())"
Converter="PeriodHelper.CreateConverter(getCurrentValue: () => AppState.Settings.SamplePeriod)" />
</div>

Expand Down
2 changes: 1 addition & 1 deletion src/Nexus.UI/Components/LicenseView.razor
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</MudTooltip>

<UIDialog
@bind-IsVisible="_isLicenseDialogOpen"
@bind-Visible="_isLicenseDialogOpen"
MaxWidth="MaxWidth.ExtraSmall">
<TitleContent>
<MudText Typo="Typo.h6">
Expand Down
2 changes: 1 addition & 1 deletion src/Nexus.UI/Components/PropertiesView.razor
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
@inject IJSInProcessRuntime JSRuntime

<UIDialog
@bind-IsVisible="BoundValue"
@bind-Visible="BoundValue"
MaxWidth="MaxWidth.Small">
<TitleContent>
<MudText Typo="Typo.h6">
Expand Down
3 changes: 1 addition & 2 deletions src/Nexus.UI/Components/ResourceView.razor
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@
</UIContextMenu>

<UIDialog
@bind-IsVisible="_isParametersDialogOpen"
@bind-Visible="_isParametersDialogOpen"
MaxWidth="MaxWidth.ExtraSmall">
<TitleContent>
<MudText Typo="Typo.h6">
Expand Down Expand Up @@ -180,7 +180,6 @@
<UIOption Key="@key" DefaultValue="defaultValue2" Store="_parametersArgumentMap">
<UISelect
T="string"
Color="Color.Secondary"
@bind-Value="@context.Value"
Label="@label2"
Items="@((argument.GetStringDictionary("items") ?? new Dictionary<string, string>()).Keys)"
Expand Down
2 changes: 1 addition & 1 deletion src/Nexus.UI/Components/Rightbar_Settings.razor
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
@bind-Value="AppState.Settings.FilePeriod"
Label="File Period"
CoerceValue="true"
SearchFunc="_ => Task.FromResult(_values.AsEnumerable())"
SearchFunc="(_, _) => Task.FromResult(_values.AsEnumerable())"
Converter="PeriodHelper.CreateConverter(getCurrentValue: () => AppState.Settings.FilePeriod)" /> />

@if (AppState.Settings.WriterDescriptions is not null)
Expand Down
2 changes: 1 addition & 1 deletion src/Nexus.UI/Components/UserSettingsView.razor
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</div>

<UIDialog
@bind-IsVisible="_showUserSettingsDialog"
@bind-Visible="_showUserSettingsDialog"
MaxWidth="MaxWidth.Medium">

<TitleContent>
Expand Down
10 changes: 5 additions & 5 deletions src/Nexus.UI/Nexus.UI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="9.0.0-preview.6.24328.4" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0-preview.6.24328.4" />
<PackageReference Include="MudBlazor" Version="6.16.0" />
<PackageReference Include="SkiaSharp" Version="2.88.7" />
<PackageReference Include="SkiaSharp.Views.Blazor" Version="2.88.7" />
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="9.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" />
<PackageReference Include="MudBlazor" Version="7.15.0" />
<PackageReference Include="SkiaSharp" Version="2.88.9" />
<PackageReference Include="SkiaSharp.Views.Blazor" Version="2.88.9" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Nexus.UI/Routes.razor
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
@code {
private MudTheme _theme = new MudTheme()
{
Palette = new PaletteLight()
PaletteLight = new PaletteLight()
{
Primary = "#0e7490", /* Tailwind cyan-700 */
Secondary = "#f97316", /* Tailwind orange-500 */
Expand Down
64 changes: 30 additions & 34 deletions src/Nexus/Nexus.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,61 +6,57 @@

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="2.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="9.0.0-preview.6.24328.4" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.0-preview.6.24328.4" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="9.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer" Version="5.1.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.0-preview.6.24327.4" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.0-preview.6.24327.4" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.0-preview.6.24327.4">
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="NSwag.AspNetCore" Version="14.0.8" />
<PackageReference Include="OpenIddict" Version="5.2.0" />
<PackageReference Include="OpenIddict.AspNetCore" Version="5.2.0" />
<PackageReference Include="OpenIddict.EntityFrameworkCore" Version="5.2.0" />
<PackageReference Include="Serilog.AspNetCore" Version="8.0.1" />
<PackageReference Include="Serilog.Enrichers.ClientInfo" Version="2.0.3" />
<PackageReference Include="NSwag.AspNetCore" Version="14.1.0" />
<PackageReference Include="OpenIddict" Version="5.8.0" />
<PackageReference Include="OpenIddict.AspNetCore" Version="5.8.0" />
<PackageReference Include="OpenIddict.EntityFrameworkCore" Version="5.8.0" />
<PackageReference Include="Serilog.AspNetCore" Version="8.0.3" />
<PackageReference Include="Serilog.Enrichers.ClientInfo" Version="2.1.2" />
<PackageReference Include="Serilog.Enrichers.CorrelationId" Version="3.0.1" />
<PackageReference Include="Serilog.Enrichers.Environment" Version="2.3.0" />
<PackageReference Include="Serilog.Expressions" Version="4.0.0" />
<PackageReference Include="Serilog.Enrichers.Environment" Version="3.0.1" />
<PackageReference Include="Serilog.Expressions" Version="5.0.0" />
<PackageReference Include="Serilog.Sinks.Grafana.Loki" Version="8.3.0" />
<PackageReference Include="Serilog.Sinks.Seq" Version="6.0.0" />
<PackageReference Include="Serilog.Sinks.Seq" Version="8.0.0" />
<PackageReference Include="SharpZipLib" Version="1.4.2" />
<PackageReference Include="StreamJsonRpc" Version="2.17.11" />

<!--
This direct dependency is only required because of the transitive dependency
System.Security.Cryptography.Xml (v4.5.0) which has a known moderate
severity vulnerability: https://github.com/advisories/GHSA-vh55-786g-wjwj
Package 'System.Text.Encodings.Web' 4.5.0 has a known critical severity
vulnerability, https://github.com/advisories/GHSA-ghhp-997w-qr28
dotnet dotnet nuget why src/Nexus/Nexus.csproj System.Security.Cryptography.Xml
dotnet nuget why src/Nexus/Nexus.csproj System.Text.Encodings.Web
TODO: Check if still required
-->
<PackageReference Include="System.Security.Cryptography.Xml" Version="8.0.1" />
<PackageReference Include="System.Text.Encodings.Web" Version="4.5.1" />

<!--
This direct dependency is only required because of the transitive dependency
System.Drawing.Common (v4.7.0) which has a known critical severity
vulnerability: https://github.com/advisories/GHSA-rxg9-xrhp-64gj
dotnet dotnet nuget why src/Nexus/Nexus.csproj System.Drawing.Common
<!--
Package 'System.Security.Cryptography.Xml' 4.5.0 has a known moderate severity
vulnerability, https://github.com/advisories/GHSA-vh55-786g-wjwj
dotnet nuget why src/Nexus/Nexus.csproj System.Security.Cryptography.Xml
TODO: Check if still required
-->
<PackageReference Include="System.Drawing.Common" Version="4.7.2" />
<PackageReference Include="System.Security.Cryptography.Xml" Version="4.7.1" />

<!--
This direct dependency is only required because of the transitive dependency
System.Formats.Asn1 (v8.0.0) which has a known high severity
vulnerability: https://github.com/advisories/GHSA-447r-wph3-92pm
dotnet dotnet nuget why src/Nexus/Nexus.csproj System.Formats.Asn1
<!--
Package 'System.Drawing.Common' 4.7.1 has a known critical severity vulnerability,
https://github.com/advisories/GHSA-rxg9-xrhp-64gj
dotnet nuget why src/Nexus/Nexus.csproj System.Drawing.Common
TODO: Check if still required
-->
<PackageReference Include="System.Formats.Asn1" Version="8.0.1" />
<PackageReference Include="System.Drawing.Common" Version="4.7.2" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="Moq" Version="4.20.70" />
<PackageReference Include="xunit" Version="2.7.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Include="Moq" Version="4.20.72" />
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
Expand Down
10 changes: 5 additions & 5 deletions tests/Nexus.Tests/Nexus.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="Moq" Version="4.20.70" />
<PackageReference Include="Serilog.AspNetCore" Version="8.0.1" />
<PackageReference Include="xunit" Version="2.7.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Include="Moq" Version="4.20.72" />
<PackageReference Include="Serilog.AspNetCore" Version="8.0.3" />
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
Expand Down
8 changes: 4 additions & 4 deletions tests/clients/dotnet-client-tests/dotnet-client-tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="Moq" Version="4.20.70" />
<PackageReference Include="xunit" Version="2.7.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Include="Moq" Version="4.20.72" />
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<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 @@ -5,11 +5,11 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0-preview.6.24327.7" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="Moq" Version="4.20.70" />
<PackageReference Include="xunit" Version="2.7.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Include="Moq" Version="4.20.72" />
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
Expand Down

0 comments on commit 8688f86

Please sign in to comment.