Skip to content

Commit 0733bcb

Browse files
niemyjskiniemyjski
committed
Upgraded to xunit v3
1 parent 85ecb9b commit 0733bcb

24 files changed

+245
-257
lines changed

‎samples/Foundatio.SampleApp/Server/Foundatio.SampleApp.Server.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Foundatio.Extensions.Hosting" Version="12.0.0" />
10+
<PackageReference Include="Foundatio.Extensions.Hosting" Version="12.0.1-preview.0.39" />
1111
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.19" />
1212
</ItemGroup>
1313

‎src/Foundatio.Repositories/Foundatio.Repositories.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<ItemGroup>
3-
<PackageReference Include="Foundatio" Version="12.0.0" Condition="'$(ReferenceFoundatioSource)' == '' OR '$(ReferenceFoundatioSource)' == 'false'" />
3+
<PackageReference Include="Foundatio" Version="12.0.1-preview.0.39" Condition="'$(ReferenceFoundatioSource)' == '' OR '$(ReferenceFoundatioSource)' == 'false'" />
44
<ProjectReference Include="$(FoundatioProjectsDir)Foundatio\src\Foundatio\Foundatio.csproj" Condition="'$(ReferenceFoundatioSource)' == 'true'" />
55

6-
<PackageReference Include="Foundatio.JsonNet" Version="12.0.0" Condition="'$(ReferenceFoundatioSource)' == '' OR '$(ReferenceFoundatioSource)' == 'false'" />
6+
<PackageReference Include="Foundatio.JsonNet" Version="12.0.1-preview.0.39" Condition="'$(ReferenceFoundatioSource)' == '' OR '$(ReferenceFoundatioSource)' == 'false'" />
77
<ProjectReference Include="$(FoundatioProjectsDir)Foundatio\src\Foundatio.JsonNet\Foundatio.JsonNet.csproj" Condition="'$(ReferenceFoundatioSource)' == 'true'" />
88
</ItemGroup>
99
</Project>

‎tests/Directory.Build.props‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
<Import Project="..\build\common.props" />
33
<PropertyGroup>
44
<TargetFrameworks>net8.0</TargetFrameworks>
5+
<OutputType>Exe</OutputType>
56
<IsPackable>False</IsPackable>
67
<NoWarn>$(NoWarn);CS1591;NU1701</NoWarn>
78
</PropertyGroup>
89
<ItemGroup>
9-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
10-
<PackageReference Include="xunit" Version="2.9.3" />
10+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
11+
<PackageReference Include="xunit.v3.mtp-off" Version="3.2.1" />
1112
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5" />
13+
<PackageReference Include="GitHubActionsTestLogger" Version="3.0.1" PrivateAssets="All" />
1214

13-
<PackageReference Include="GitHubActionsTestLogger" Version="3.0.1" PrivateAssets="All" />
14-
15-
<PackageReference Include="Foundatio.TestHarness" Version="12.0.0" Condition="'$(ReferenceFoundatioSource)' == '' OR '$(ReferenceFoundatioSource)' == 'false'" />
15+
<PackageReference Include="Foundatio.TestHarness" Version="12.0.1-preview.0.39" Condition="'$(ReferenceFoundatioSource)' == '' OR '$(ReferenceFoundatioSource)' == 'false'" />
1616
<ProjectReference Include="..\..\..\Foundatio\src\Foundatio.TestHarness\Foundatio.TestHarness.csproj" Condition="'$(ReferenceFoundatioSource)' == 'true'" />
1717
</ItemGroup>
1818
</Project>

‎tests/Foundatio.Repositories.Elasticsearch.Tests/AggregationQueryTests.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System;
1+
using System;
22
using System.Collections.Generic;
33
using System.IO;
44
using System.Linq;
@@ -11,7 +11,6 @@
1111
using Nest;
1212
using Newtonsoft.Json;
1313
using Xunit;
14-
using Xunit.Abstractions;
1514

1615
namespace Foundatio.Repositories.Elasticsearch.Tests;
1716

@@ -24,7 +23,7 @@ public AggregationQueryTests(ITestOutputHelper output) : base(output)
2423
_employeeRepository = new EmployeeRepository(_configuration);
2524
}
2625

27-
public override async Task InitializeAsync()
26+
public override async ValueTask InitializeAsync()
2827
{
2928
await base.InitializeAsync();
3029
await RemoveDataAsync();

‎tests/Foundatio.Repositories.Elasticsearch.Tests/CustomFieldTests.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
using Foundatio.Repositories.Exceptions;
99
using Microsoft.Extensions.Logging;
1010
using Xunit;
11-
using Xunit.Abstractions;
1211

1312
namespace Foundatio.Repositories.Elasticsearch.Tests;
1413

@@ -25,7 +24,7 @@ public CustomFieldTests(ITestOutputHelper output) : base(output)
2524
_repocache = _configuration.Cache as InMemoryCacheClient;
2625
}
2726

28-
public override async Task InitializeAsync()
27+
public override async ValueTask InitializeAsync()
2928
{
3029
await base.InitializeAsync();
3130
await RemoveDataAsync();

‎tests/Foundatio.Repositories.Elasticsearch.Tests/DailyRepositoryTests.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System;
1+
using System;
22
using System.Linq;
33
using System.Threading.Tasks;
44
using Foundatio.Repositories.Elasticsearch.Tests.Repositories;
@@ -7,7 +7,6 @@
77
using Foundatio.Utility;
88
using Microsoft.Extensions.Time.Testing;
99
using Xunit;
10-
using Xunit.Abstractions;
1110

1211
namespace Foundatio.Repositories.Elasticsearch.Tests;
1312

@@ -20,7 +19,7 @@ public DailyRepositoryTests(ITestOutputHelper output) : base(output)
2019
_fileAccessHistoryRepository = new FileAccessHistoryRepository(_configuration.DailyFileAccessHistory);
2120
}
2221

23-
public override async Task InitializeAsync()
22+
public override async ValueTask InitializeAsync()
2423
{
2524
await base.InitializeAsync();
2625
await RemoveDataAsync();

‎tests/Foundatio.Repositories.Elasticsearch.Tests/ElasticRepositoryTestBase.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System;
1+
using System;
22
using System.Diagnostics;
33
using System.Threading;
44
using System.Threading.Tasks;
@@ -12,7 +12,7 @@
1212
using Foundatio.Xunit;
1313
using Microsoft.Extensions.Logging;
1414
using Nest;
15-
using Xunit.Abstractions;
15+
using Xunit;
1616
using IAsyncLifetime = Xunit.IAsyncLifetime;
1717
using LogLevel = Microsoft.Extensions.Logging.LogLevel;
1818

@@ -38,7 +38,7 @@ public ElasticRepositoryTestBase(ITestOutputHelper output) : base(output)
3838
}
3939

4040
private static bool _elasticsearchReady;
41-
public virtual async Task InitializeAsync()
41+
public virtual async ValueTask InitializeAsync()
4242
{
4343
if (!_elasticsearchReady)
4444
await _client.WaitForReadyAsync(new CancellationTokenSource(TimeSpan.FromMinutes(1)).Token);
@@ -70,5 +70,5 @@ protected virtual async Task RemoveDataAsync(bool configureIndexes = true)
7070
Log.DefaultLogLevel = minimumLevel;
7171
}
7272

73-
public virtual Task DisposeAsync() => Task.CompletedTask;
73+
public virtual ValueTask DisposeAsync() => ValueTask.CompletedTask;
7474
}

‎tests/Foundatio.Repositories.Elasticsearch.Tests/FieldIncludeParserTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System;
1+
using System;
22
using Foundatio.Repositories.Elasticsearch.Utility;
33
using Xunit;
44

0 commit comments

Comments
 (0)