Skip to content

Commit 92fa3f8

Browse files
Bump xunit: 2.5.0->2.6.2
And fix xUnit1012
1 parent 2e62b9b commit 92fa3f8

File tree

13 files changed

+18
-18
lines changed

13 files changed

+18
-18
lines changed

tests/BenchmarkDotNet.IntegrationTests.ManualRunning.MultipleFrameworks/BenchmarkDotNet.IntegrationTests.ManualRunning.MultipleFrameworks.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
<ItemGroup>
4848
<!-- Microsoft.NET.Test.Sdk breaks netcoreapp2.0 -->
4949
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.3" Condition=" '$(TargetFramework)' != 'netcoreapp2.0' " />
50-
<PackageReference Include="xunit" Version="2.5.0" />
50+
<PackageReference Include="xunit" Version="2.6.2" />
5151
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
5252
<PrivateAssets>all</PrivateAssets>
5353
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

tests/BenchmarkDotNet.IntegrationTests.ManualRunning/BenchmarkDotNet.IntegrationTests.ManualRunning.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
</ItemGroup>
3131
<ItemGroup>
3232
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
33-
<PackageReference Include="xunit" Version="2.5.0" />
33+
<PackageReference Include="xunit" Version="2.6.2" />
3434
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
3535
<PrivateAssets>all</PrivateAssets>
3636
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

tests/BenchmarkDotNet.IntegrationTests/BenchmarkDotNet.IntegrationTests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<ItemGroup>
3434
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
3535
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
36-
<PackageReference Include="xunit" Version="2.5.0" />
36+
<PackageReference Include="xunit" Version="2.6.2" />
3737
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
3838
<PrivateAssets>all</PrivateAssets>
3939
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

tests/BenchmarkDotNet.IntegrationTests/JitRuntimeValidationTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public JitRuntimeValidationTest(ITestOutputHelper output) : base(output) { }
2525
[InlineData(Jit.LegacyJit, Platform.X64, null)]
2626
[InlineData(Jit.RyuJit, Platform.X86, RyuJitNotAvailable)]
2727
[InlineData(Jit.RyuJit, Platform.X64, null)]
28-
public void CheckClrOnWindows(Jit jit, Platform platform, string errorMessage)
28+
public void CheckClrOnWindows(Jit jit, Platform platform, string? errorMessage)
2929
{
3030
Verify(ClrRuntime.Net462, jit, platform, errorMessage);
3131
}
@@ -54,7 +54,7 @@ public void CheckCore(Jit jit, Platform platform, string errorMessage)
5454
Verify(CoreRuntime.Core80, jit, platform, errorMessage);
5555
}
5656

57-
private void Verify(Runtime runtime, Jit jit, Platform platform, string errorMessage)
57+
private void Verify(Runtime runtime, Jit jit, Platform platform, string? errorMessage)
5858
{
5959
var logger = new OutputLogger(Output);
6060
var config = ManualConfig.CreateEmpty()

tests/BenchmarkDotNet.Tests/BenchmarkDotNet.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<ItemGroup>
1818
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
1919
<PackageReference Include="Verify.Xunit" Version="20.3.2" />
20-
<PackageReference Include="xunit" Version="2.5.0" />
20+
<PackageReference Include="xunit" Version="2.6.2" />
2121
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
2222
<PrivateAssets>all</PrivateAssets>
2323
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

tests/BenchmarkDotNet.Tests/Environments/ProcessorBrandStringTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public void IntelCoreMicroarchitecture(string modelNumber, string microarchitect
6363
[Theory]
6464
[InlineData("", "Unknown processor")]
6565
[InlineData(null, "Unknown processor")]
66-
public void UnknownProcessorDoesNotThrow(string originalName, string prettifiedName)
66+
public void UnknownProcessorDoesNotThrow(string? originalName, string prettifiedName)
6767
{
6868
var cpuInfo = new CpuInfo(originalName, nominalFrequency: null);
6969

tests/BenchmarkDotNet.Tests/Exporters/XmlSerializerTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ public void CtorThrowsWhenParameterIsNull()
101101
[InlineData(null, typeof(ArgumentException))]
102102
[InlineData(" ", typeof(ArgumentException))]
103103
[InlineData("", typeof(ArgumentException))]
104-
public void WithRootNameThrowsGivenNameIsNullOrWhiteSpace(string name, Type exception)
104+
public void WithRootNameThrowsGivenNameIsNullOrWhiteSpace(string? name, Type exception)
105105
{
106106
Assert.Throws(exception, () => XmlSerializer.GetBuilder(typeof(MockSource))
107107
.WithRootName(name)
@@ -116,7 +116,7 @@ public void WithRootNameThrowsGivenNameIsNullOrWhiteSpace(string name, Type exce
116116
[InlineData(null, "MockItem", typeof(ArgumentException))]
117117
[InlineData(" ", "MockItem", typeof(ArgumentException))]
118118
[InlineData("", "MockItem", typeof(ArgumentException))]
119-
public void WithCollectionItemNameThrowsGivenInvalidArguments(string collectionName, string itemName, Type exception)
119+
public void WithCollectionItemNameThrowsGivenInvalidArguments(string? collectionName, string? itemName, Type exception)
120120
{
121121
Assert.Throws(exception, () => XmlSerializer.GetBuilder(typeof(MockSource))
122122
.WithCollectionItemName(collectionName, itemName)
@@ -127,7 +127,7 @@ public void WithCollectionItemNameThrowsGivenInvalidArguments(string collectionN
127127
[InlineData(null, typeof(ArgumentException))]
128128
[InlineData(" ", typeof(ArgumentException))]
129129
[InlineData("", typeof(ArgumentException))]
130-
public void WithExcludedPropertyThrowsGivenNameIsNullOrWhiteSpace(string name, Type exception)
130+
public void WithExcludedPropertyThrowsGivenNameIsNullOrWhiteSpace(string? name, Type exception)
131131
{
132132
Assert.Throws(exception, () => XmlSerializer.GetBuilder(typeof(MockSource))
133133
.WithExcludedProperty(name)

tests/BenchmarkDotNet.Tests/Portability/HyperVTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public void ContainsCorrectName()
2121
[InlineData("Dell", "ubuntu", false)]
2222
[InlineData("microsoft corporation", null, false)]
2323
[InlineData(null, "virtual machine", false)]
24-
public void DetectsVirtualMachine(string manufacturer, string model, bool expectedResult)
24+
public void DetectsVirtualMachine(string? manufacturer, string? model, bool expectedResult)
2525
{
2626
bool result = hypervisor.IsVirtualMachine(manufacturer, model);
2727
Assert.Equal(expectedResult, result);

tests/BenchmarkDotNet.Tests/Portability/VMWareTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public void ContainsCorrectName()
2020
[InlineData(null, "vmWare", true)]
2121
[InlineData("VMWare Inc", "redundant", false)]
2222
[InlineData("VMWare Inc", null, false)]
23-
public void DetectsVirtualMachine(string manufacturer, string model, bool expectedResult)
23+
public void DetectsVirtualMachine(string? manufacturer, string? model, bool expectedResult)
2424
{
2525
bool result = hypervisor.IsVirtualMachine(manufacturer, model);
2626
Assert.Equal(expectedResult, result);

tests/BenchmarkDotNet.Tests/Portability/VirtualBoxTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public void ContainsCorrectName()
1818
[InlineData("redundant", "VirtualBox", true)]
1919
[InlineData("redundant", "vmware", false)]
2020
[InlineData("redundant", null, false)]
21-
public void DetectsVirtualMachine(string manufacturer, string model, bool expectedResult)
21+
public void DetectsVirtualMachine(string manufacturer, string? model, bool expectedResult)
2222
{
2323
bool result = hypervisor.IsVirtualMachine(manufacturer, model);
2424
Assert.Equal(expectedResult, result);

0 commit comments

Comments
 (0)