Skip to content

Commit fd44bf2

Browse files
committed
Upgrade to xunit v3
1 parent 0c4f99c commit fd44bf2

File tree

4 files changed

+9
-11
lines changed

4 files changed

+9
-11
lines changed

src/Foundatio.AzureStorage/Foundatio.AzureStorage.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<PackageReference Include="Microsoft.Azure.Storage.Blob" Version="11.2.3" />
88
<PackageReference Include="Microsoft.Azure.Storage.Queue" Version="11.2.3" />
99

10-
<PackageReference Include="Foundatio" Version="12.0.0" Condition="'$(ReferenceFoundatioSource)' == '' OR '$(ReferenceFoundatioSource)' == 'false'" />
10+
<PackageReference Include="Foundatio" Version="12.0.1-preview.0.39" Condition="'$(ReferenceFoundatioSource)' == '' OR '$(ReferenceFoundatioSource)' == 'false'" />
1111
<ProjectReference Include="..\..\..\Foundatio\src\Foundatio\Foundatio.csproj" Condition="'$(ReferenceFoundatioSource)' == 'true'" />
1212
</ItemGroup>
1313
</Project>

tests/Directory.Build.props

Lines changed: 4 additions & 4 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" />
12-
1313
<PackageReference Include="GitHubActionsTestLogger" Version="3.0.1" PrivateAssets="All" />
1414

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.AzureStorage.Tests/Queues/AzureStorageQueueTests.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
using Microsoft.Azure.Storage.RetryPolicies;
77
using Microsoft.Extensions.Logging;
88
using Xunit;
9-
using Xunit.Abstractions;
109

1110
namespace Foundatio.Azure.Tests.Queue;
1211

tests/Foundatio.AzureStorage.Tests/Storage/AzureStorageTests.cs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
using Foundatio.Tests.Storage;
77
using Foundatio.Tests.Utility;
88
using Xunit;
9-
using Xunit.Abstractions;
109

1110
namespace Foundatio.Azure.Tests.Storage;
1211

@@ -153,14 +152,14 @@ public override Task CanSaveOverExistingStoredContent()
153152
public virtual async Task WillNotReturnDirectoryInGetPagedFileListAsync()
154153
{
155154
var storage = GetStorage();
156-
if (storage == null)
155+
if (storage is null)
157156
return;
158157

159158
await ResetAsync(storage);
160159

161160
using (storage)
162161
{
163-
var result = await storage.GetPagedFileListAsync();
162+
var result = await storage.GetPagedFileListAsync(cancellationToken: TestCancellationToken);
164163
Assert.False(result.HasMore);
165164
Assert.Empty(result.Files);
166165
Assert.False(await result.NextPageAsync());
@@ -171,9 +170,9 @@ public virtual async Task WillNotReturnDirectoryInGetPagedFileListAsync()
171170
Assert.NotNull(container);
172171

173172
var blockBlob = container.GetBlockBlobReference("EmptyFolder/");
174-
await blockBlob.UploadFromStreamAsync(new MemoryStream(), null, null, null);
173+
await blockBlob.UploadFromStreamAsync(new MemoryStream(), null, null, null, TestCancellationToken);
175174

176-
result = await storage.GetPagedFileListAsync();
175+
result = await storage.GetPagedFileListAsync(cancellationToken: TestCancellationToken);
177176
Assert.False(result.HasMore);
178177
Assert.Empty(result.Files);
179178
Assert.False(await result.NextPageAsync());

0 commit comments

Comments
 (0)