Skip to content

Commit

Permalink
Migrate to net9.0
Browse files Browse the repository at this point in the history
  • Loading branch information
ImoutoChan committed Nov 23, 2024
1 parent 0f832cf commit 9c2fadf
Show file tree
Hide file tree
Showing 67 changed files with 137 additions and 109 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Unreleased

### This version update requires for you to run ./install-dependencies.ps1 again

### Infrastructure
* Migrate to .NET 9
* Update all dependencies

# 4.26.1

### Infrastructure
Expand Down
91 changes: 49 additions & 42 deletions Source/Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -1,87 +1,94 @@
<Project>

<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<CentralPackageTransitivePinningEnabled>false</CentralPackageTransitivePinningEnabled>
</PropertyGroup>

<ItemGroup>
<PackageVersion Include="AspNetCoreInjection.TypedFactories" Version="1.2.0"/>
<PackageVersion Include="AutoMapper" Version="13.0.1"/>
<PackageVersion Include="CommunityToolkit.Mvvm" Version="8.3.2"/>
<PackageVersion Include="coverlet.collector" Version="6.0.2"/>
<PackageVersion Include="FluentAssertions" Version="6.12.1"/>
<PackageVersion Include="GihanSoft.String.NaturalComparer" Version="3.3.0"/>
<PackageVersion Include="FluentAssertions" Version="6.12.2"/>
<PackageVersion Include="GihanSoft.String.NaturalComparer" Version="3.5.0"/>
<PackageVersion Include="Humanizer.Core" Version="2.14.1"/>
<PackageVersion Include="IgnoresAccessChecksToGenerator" Version="0.7.0"/>
<PackageVersion Include="Imouto.BooruParser" Version="3.4.1"/>
<PackageVersion Include="ImoutoRebirth.ApngWpfPlayer" Version="1.4.2"/>
<PackageVersion Include="JetBrains.DotMemoryUnit" Version="3.2.20220510"/>
<PackageVersion Include="Mackiovello.Maybe" Version="1.0.0"/>
<PackageVersion Include="MahApps.Metro" Version="2.4.10"/>
<PackageVersion Include="MahApps.Metro.IconPacks" Version="5.0.1"/>
<PackageVersion Include="MassTransit.SqlTransport.PostgreSQL" Version="8.3.0"/>
<PackageVersion Include="MahApps.Metro.IconPacks" Version="5.1.0"/>
<PackageVersion Include="MassTransit.SqlTransport.PostgreSQL" Version="8.3.2"/>
<PackageVersion Include="MediatR" Version="12.4.1"/>
<PackageVersion Include="Microsoft-WindowsAPICodePack-Core" Version="1.1.5"/>
<PackageVersion Include="Microsoft-WindowsAPICodePack-Shell" Version="1.1.5"/>
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.10"/>
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0"/>
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="8.0.10"/>
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.10"/>
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.10"/>
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.10"/>
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1"/>
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2"/>
<PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0"/>
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1"/>
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1"/>
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2"/>
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.1"/>
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1"/>
<PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="8.0.1"/>
<PackageVersion Include="Microsoft.Extensions.Http" Version="8.0.1"/>
<PackageVersion Include="Microsoft.Extensions.Http.Polly" Version="8.0.10"/>
<PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.1"/>
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2"/>
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="8.0.1"/>
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0"/>
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1"/>
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.0"/>
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0"/>
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="9.0.0"/>
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageVersion>
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.0"/>
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageVersion>
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="9.0.0"/>
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.0"/>
<PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.0"/>
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0"/>
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0"/>
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0"/>
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.0"/>
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0"/>
<PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="9.0.0"/>
<PackageVersion Include="Microsoft.Extensions.Http" Version="9.0.0"/>
<PackageVersion Include="Microsoft.Extensions.Http.Polly" Version="9.0.0"/>
<PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.0"/>
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0"/>
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="9.0.0"/>
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.0"/>
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0"/>
<PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.135"/>
<PackageVersion Include="Moq" Version="4.20.72"/>
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3"/>
<PackageVersion Include="NinjaNye.SearchExtensions" Version="4.0.1"/>
<PackageVersion Include="NodaTime" Version="3.2.0"/>
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.10"/>
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL.NodaTime" Version="8.0.10"/>
<PackageVersion Include="Npgsql.OpenTelemetry" Version="8.0.5"/>
<PackageVersion Include="OpenTelemetry" Version="1.9.0"/>
<PackageVersion Include="OpenTelemetry.Api" Version="1.9.0"/>
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.9.0"/>
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.9.0"/>
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.1"/>
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL.NodaTime" Version="9.0.1"/>
<PackageVersion Include="Npgsql.OpenTelemetry" Version="9.0.1"/>
<PackageVersion Include="OpenTelemetry" Version="1.10.0"/>
<PackageVersion Include="OpenTelemetry.Api" Version="1.10.0"/>
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.10.0"/>
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.10.0"/>
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.9.0"/>
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.9.0"/>
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.9.0"/>
<PackageVersion Include="Quartz" Version="3.13.0"/>
<PackageVersion Include="Serilog" Version="4.0.2"/>
<PackageVersion Include="Quartz" Version="3.13.1"/>
<PackageVersion Include="ResQueue.MassTransit" Version="1.0.8"/>
<PackageVersion Include="Serilog" Version="4.1.0"/>
<PackageVersion Include="Serilog.Enrichers.Thread" Version="4.0.0"/>
<PackageVersion Include="Serilog.Exceptions" Version="8.4.0"/>
<PackageVersion Include="Serilog.Extensions.Logging" Version="8.0.0"/>
<PackageVersion Include="Serilog.Settings.Configuration" Version="8.0.4"/>
<PackageVersion Include="Serilog.Sinks.Console" Version="6.0.0"/>
<PackageVersion Include="Serilog.Sinks.File" Version="6.0.0"/>
<PackageVersion Include="Serilog.Sinks.OpenSearch" Version="1.2.0"/>
<PackageVersion Include="SixLabors.ImageSharp" Version="3.1.5"/>
<PackageVersion Include="Swashbuckle.AspNetCore" Version="6.9.0"/>
<PackageVersion Include="System.Drawing.Common" Version="8.0.10"/>
<PackageVersion Include="SixLabors.ImageSharp" Version="3.1.6"/>
<PackageVersion Include="Swashbuckle.AspNetCore" Version="7.0.0"/>
<PackageVersion Include="System.Drawing.Common" Version="9.0.0"/>
<PackageVersion Include="System.Linq.Async" Version="6.0.1"/>
<PackageVersion Include="System.Reactive.Async" Version="6.0.0-alpha.18"/>
<PackageVersion Include="System.ServiceProcess.ServiceController" Version="8.0.1"/>
<PackageVersion Include="System.ServiceProcess.ServiceController" Version="9.0.0"/>
<PackageVersion Include="VideoLAN.LibVLC.Windows" Version="3.0.21"/>
<PackageVersion Include="Vlc.DotNet.Wpf" Version="3.1.0"/>
<PackageVersion Include="WpfAnimatedGif" Version="2.0.2"/>
<PackageVersion Include="XAMLTools.MSBuild" Version="1.0.0-alpha0143"/>
<PackageVersion Include="xunit" Version="2.9.2"/>
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2"/>
<PackageVersion Include="System.Private.Uri" Version="4.3.2"/>
<PackageVersion Include="System.Net.Http" Version="4.3.4"/>
<PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1"/>
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion Source/Imouto.Viewer/ImoutoViewer/ImoutoViewer.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net8.0-windows</TargetFramework>
<TargetFramework>net9.0-windows</TargetFramework>
<TieredCompilation>true</TieredCompilation>
<UseWPF>true</UseWPF>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<Nullable>enable</Nullable>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<ImplicitUsings>true</ImplicitUsings>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
<SelfContained>false</SelfContained>

<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<Nullable>enable</Nullable>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<ImplicitUsings>true</ImplicitUsings>
Expand All @@ -18,6 +18,7 @@
<PackageReference Include="Microsoft.Extensions.Configuration.Json" />
<PackageReference Include="Microsoft.Extensions.Hosting" />
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" />
<PackageReference Include="System.Private.Uri" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<Nullable>enable</Nullable>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<ImplicitUsings>true</ImplicitUsings>
Expand All @@ -16,6 +16,8 @@
<PackageReference Include="Microsoft.Extensions.Http.Polly" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" />
<PackageReference Include="Newtonsoft.Json" />
<PackageReference Include="System.Net.Http" />
<PackageReference Include="System.Text.RegularExpressions" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<Nullable>enable</Nullable>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<ImplicitUsings>true</ImplicitUsings>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<Nullable>enable</Nullable>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<ImplicitUsings>true</ImplicitUsings>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<Nullable>enable</Nullable>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<ImplicitUsings>true</ImplicitUsings>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<Nullable>enable</Nullable>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<ImplicitUsings>enable</ImplicitUsings>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<Nullable>enable</Nullable>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<ImplicitUsings>true</ImplicitUsings>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<Nullable>enable</Nullable>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<ImplicitUsings>true</ImplicitUsings>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<Nullable>enable</Nullable>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<ImplicitUsings>true</ImplicitUsings>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<Nullable>enable</Nullable>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<ImplicitUsings>true</ImplicitUsings>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<Nullable>enable</Nullable>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<ImplicitUsings>true</ImplicitUsings>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<Nullable>enable</Nullable>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<ImplicitUsings>enable</ImplicitUsings>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<Nullable>enable</Nullable>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<ImplicitUsings>true</ImplicitUsings>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<Nullable>enable</Nullable>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<ImplicitUsings>true</ImplicitUsings>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ public static IServiceCollection AddSqlMassTransit(
bool shouldAutoConfigureEndpoints = true,
params Assembly[] addConsumersFromAssemblies)
{

var configurator = new MassTransitConfigurator();
configure?.Invoke(configurator);

Expand Down Expand Up @@ -68,7 +69,7 @@ public static IServiceCollection AddSqlMassTransit(
cfg.ConfigureEndpoints(context);
});
});

return services;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ public UpgradablePostgresDatabaseMigrator(
_logger = logger;
}

public Task CreateSchemaIfNotExist(SqlTransportOptions options, CancellationToken cancellationToken)
=> _defaultMigrator.CreateSchemaIfNotExist(options, cancellationToken);

public async Task CreateInfrastructure(SqlTransportOptions options, CancellationToken ct)
{
try
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<Nullable>enable</Nullable>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<ImplicitUsings>true</ImplicitUsings>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<Nullable>enable</Nullable>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<ImplicitUsings>true</ImplicitUsings>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<Nullable>enable</Nullable>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<ImplicitUsings>true</ImplicitUsings>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0-windows</TargetFramework>
<TargetFramework>net9.0-windows</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0;netstandard2.0</TargetFrameworks>
<TargetFrameworks>net9.0;netstandard2.0</TargetFrameworks>
<Nullable>enable</Nullable>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<ImplicitUsings>true</ImplicitUsings>
Expand All @@ -20,4 +20,4 @@
<None Include="$(OutputPath)\$(AssemblyName).dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
</ItemGroup>

</Project>
</Project>
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<Nullable>enable</Nullable>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<ImplicitUsings>true</ImplicitUsings>
Expand Down
Loading

0 comments on commit 9c2fadf

Please sign in to comment.