Skip to content

Commit

Permalink
update packages
Browse files Browse the repository at this point in the history
  • Loading branch information
pwelter34 committed Apr 26, 2024
1 parent 1037334 commit fe6f2a7
Show file tree
Hide file tree
Showing 8 changed files with 23 additions and 30 deletions.
2 changes: 1 addition & 1 deletion src/FluentCommand.Csv/FluentCommand.Csv.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="CsvHelper" Version="31.0.3" />
<PackageReference Include="CsvHelper" Version="32.0.0" />
<PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.0" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
</PackageReference>
<PackageReference Include="FluentAssertions" Version="6.12.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="Verify.Xunit" Version="23.7.2" />
<PackageReference Include="xunit" Version="2.7.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
<PackageReference Include="Verify.Xunit" Version="24.1.0" />
<PackageReference Include="xunit" Version="2.7.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.8">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
12 changes: 4 additions & 8 deletions test/FluentCommand.PostgreSQL.Tests/DatabaseFixture.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

namespace FluentCommand.PostgreSQL.Tests;

public class DatabaseFixture : TestHostFixture, IAsyncLifetime
public class DatabaseFixture : TestApplicationFixture, IAsyncLifetime
{
private readonly PostgreSqlContainer _postgreSqlContainer = new PostgreSqlBuilder()
.WithDatabase("TrackerDocker")
Expand All @@ -30,15 +30,11 @@ public async Task DisposeAsync()
await _postgreSqlContainer.DisposeAsync();
}


protected override void ConfigureLogging(HostBuilderContext context, ILoggingBuilder builder)
protected override void ConfigureApplication(HostApplicationBuilder builder)
{
base.ConfigureLogging(context, builder);
builder.SetMinimumLevel(LogLevel.Debug);
}
base.ConfigureApplication(builder);

protected override void ConfigureServices(HostBuilderContext context, IServiceCollection services)
{
var services = builder.Services;
var trackerConnection = _postgreSqlContainer.GetConnectionString();

services.AddHostedService<DatabaseInitializer>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="Testcontainers.Postgresql" Version="3.8.0" />
<PackageReference Include="XUnit.Hosting" Version="1.5.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.8">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="xunit" Version="2.7.0" />
<PackageReference Include="xunit" Version="2.7.1" />
<PackageReference Include="FluentAssertions" Version="6.12.0" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@
<PackageReference Include="Microsoft.Data.Sqlite" Version="8.0.4" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="XUnit.Hosting" Version="1.5.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.8">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="xunit" Version="2.7.0" />
<PackageReference Include="xunit" Version="2.7.1" />
<PackageReference Include="FluentAssertions" Version="6.12.0" />
</ItemGroup>

Expand Down
13 changes: 5 additions & 8 deletions test/FluentCommand.SqlServer.Tests/DatabaseFixture.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
using Microsoft.Data.SqlClient;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;

using Testcontainers.Azurite;
using Testcontainers.MsSql;
Expand All @@ -19,7 +18,7 @@

namespace FluentCommand.SqlServer.Tests;

public class DatabaseFixture : TestHostFixture, IAsyncLifetime
public class DatabaseFixture : TestApplicationFixture, IAsyncLifetime
{
private readonly MsSqlContainer _msSqlContainer = new MsSqlBuilder()
.WithImage("mcr.microsoft.com/mssql/server:2022-latest")
Expand All @@ -46,14 +45,12 @@ public async Task DisposeAsync()
await _azuriteContainer.DisposeAsync();
}

protected override void ConfigureLogging(HostBuilderContext context, ILoggingBuilder builder)
protected override void ConfigureApplication(HostApplicationBuilder builder)
{
base.ConfigureLogging(context, builder);
builder.SetMinimumLevel(LogLevel.Debug);
}
base.ConfigureApplication(builder);

var services = builder.Services;

protected override void ConfigureServices(HostBuilderContext context, IServiceCollection services)
{
// change database from container default
var connectionBuilder = new SqlConnectionStringBuilder(_msSqlContainer.GetConnectionString())
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="CsvHelper" Version="31.0.3" />
<PackageReference Include="CsvHelper" Version="32.0.0" />
<PackageReference Include="dbup-sqlserver" Version="5.0.40" />
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.0" />
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="8.0.4" />
Expand All @@ -40,11 +40,11 @@
<PackageReference Include="Testcontainers.MsSql" Version="3.8.0" />
<PackageReference Include="Testcontainers.Redis" Version="3.8.0" />
<PackageReference Include="XUnit.Hosting" Version="1.5.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.8">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="xunit" Version="2.7.0" />
<PackageReference Include="xunit" Version="2.7.1" />
<PackageReference Include="FluentAssertions" Version="6.12.0" />
</ItemGroup>

Expand Down
6 changes: 3 additions & 3 deletions test/FluentCommand.Tests/FluentCommand.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="Verify.Xunit" Version="23.7.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
<PackageReference Include="Verify.Xunit" Version="24.1.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.8">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="xunit" Version="2.7.0" />
<PackageReference Include="xunit" Version="2.7.1" />
<PackageReference Include="FluentAssertions" Version="6.12.0" />
</ItemGroup>

Expand Down

0 comments on commit fe6f2a7

Please sign in to comment.