Skip to content

Commit 29a3331

Browse files
Revert xunit version. We knew this already!
1 parent e9afa98 commit 29a3331

File tree

2 files changed

+20
-12
lines changed

2 files changed

+20
-12
lines changed

tests/Directory.Build.targets

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,14 @@
2222
<PackageReference Update="BenchmarkDotNet" Version="0.12.1" />
2323
<PackageReference Update="Microsoft.Azure.KeyVault.Core" Version="3.0.4" />
2424
<PackageReference Update="Microsoft.Azure.Storage.Blob" Version="11.1.2" />
25+
26+
<!--
27+
Don't update these. We're getting AmbiguousMatchException for
28+
CommandParser tests.
29+
-->
30+
<!--See https://github.com/xunit/xunit/issues/1771-->
31+
<PackageReference Update="xunit" Version="2.3.1" />
32+
<PackageReference Update="xunit.runner.visualstudio" Version="2.3.1" />
2533
</ItemGroup>
2634

2735
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">

tests/ImageSharp.Web.Tests/Commands/CommandParserTests.cs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public class CommandParserTests
2222
private static readonly string PiStringDk = Pi.ToString(Dk);
2323
private static readonly double RoundedPi = Math.Round(Pi, MidpointRounding.AwayFromZero);
2424

25-
public static TheoryData<object, string, CultureInfo> IntegralValuesInv
25+
public static TheoryData<object, string, CultureInfo> IntegralValuesInv { get; }
2626
= new TheoryData<object, string, CultureInfo>
2727
{
2828
{ (sbyte)1, "1", Inv },
@@ -38,7 +38,7 @@ public static TheoryData<object, string, CultureInfo> IntegralValuesInv
3838
{ 1M, "1", Inv },
3939
};
4040

41-
public static TheoryData<object, string, CultureInfo> IntegralValuesDk
41+
public static TheoryData<object, string, CultureInfo> IntegralValuesDk { get; }
4242
= new TheoryData<object, string, CultureInfo>
4343
{
4444
{ (sbyte)1, "1", Dk },
@@ -54,7 +54,7 @@ public static TheoryData<object, string, CultureInfo> IntegralValuesDk
5454
{ 1M, "1", Dk },
5555
};
5656

57-
public static TheoryData<object, string, CultureInfo> RealValuesInv
57+
public static TheoryData<object, string, CultureInfo> RealValuesInv { get; }
5858
= new TheoryData<object, string, CultureInfo>
5959
{
6060
{ (sbyte)RoundedPi, PiStringInv, Inv },
@@ -70,7 +70,7 @@ public static TheoryData<object, string, CultureInfo> RealValuesInv
7070
{ (decimal)Pi, PiStringInv, Inv },
7171
};
7272

73-
public static TheoryData<object, string, CultureInfo> RealValuesDanish
73+
public static TheoryData<object, string, CultureInfo> RealValuesDanish { get; }
7474
= new TheoryData<object, string, CultureInfo>
7575
{
7676
{ (sbyte)RoundedPi, PiStringDk, Dk },
@@ -86,44 +86,44 @@ public static TheoryData<object, string, CultureInfo> RealValuesDanish
8686
{ (decimal)Pi, PiStringDk, Dk },
8787
};
8888

89-
public static TheoryData<ResizeMode, string, CultureInfo> EnumValues
89+
public static TheoryData<ResizeMode, string, CultureInfo> EnumValues { get; }
9090
= new TheoryData<ResizeMode, string, CultureInfo>
9191
{
9292
{ ResizeMode.Max, "max", Inv },
9393
{ ResizeMode.Crop, "this is not, an enum value", Inv }, // Unknown returns default
9494
};
9595

96-
public static TheoryData<int[], string, CultureInfo> IntegralArrays
96+
public static TheoryData<int[], string, CultureInfo> IntegralArrays { get; }
9797
= new TheoryData<int[], string, CultureInfo>
9898
{
9999
{ new[] { 1, 2, 3, 4 }, ToNumericList(Inv, 1, 2, 3, 4), Inv },
100100
};
101101

102-
public static TheoryData<float[], string, CultureInfo> RealArraysInv
102+
public static TheoryData<float[], string, CultureInfo> RealArraysInv { get; }
103103
= new TheoryData<float[], string, CultureInfo>
104104
{
105105
{ new[] { 1.667F, 2.667F, 3.667F, 4.667F }, ToNumericList(Inv, 1.667F, 2.667F, 3.667F, 4.667F), Inv },
106106
};
107107

108-
public static TheoryData<float[], string, CultureInfo> RealArraysDk
108+
public static TheoryData<float[], string, CultureInfo> RealArraysDk { get; }
109109
= new TheoryData<float[], string, CultureInfo>
110110
{
111111
{ new[] { 1.667F, 2.667F, 3.667F, 4.667F }, ToNumericList(Dk, 1.667F, 2.667F, 3.667F, 4.667F), Dk },
112112
};
113113

114-
public static TheoryData<object, string, CultureInfo> IntegralLists
114+
public static TheoryData<object, string, CultureInfo> IntegralLists { get; }
115115
= new TheoryData<object, string, CultureInfo>
116116
{
117117
{ new List<int> { 1, 2, 3, 4 }, ToNumericList(Inv, 1, 2, 3, 4), Inv },
118118
};
119119

120-
public static TheoryData<List<float>, string, CultureInfo> RealLists
120+
public static TheoryData<List<float>, string, CultureInfo> RealLists { get; }
121121
= new TheoryData<List<float>, string, CultureInfo>
122122
{
123123
{ new List<float> { 1.667F, 2.667F, 3.667F, 4.667F }, "1.667,2.667,3.667,4.667", Inv },
124124
};
125125

126-
public static TheoryData<Color, string, CultureInfo> ColorValuesInv
126+
public static TheoryData<Color, string, CultureInfo> ColorValuesInv { get; }
127127
= new TheoryData<Color, string, CultureInfo>
128128
{
129129
{ default, string.Empty, Inv },
@@ -135,7 +135,7 @@ public static TheoryData<Color, string, CultureInfo> ColorValuesInv
135135
{ Color.YellowGreen, "9ACD32FF", Inv },
136136
};
137137

138-
public static TheoryData<Color, string, CultureInfo> ColorValuesDk
138+
public static TheoryData<Color, string, CultureInfo> ColorValuesDk { get; }
139139
= new TheoryData<Color, string, CultureInfo>
140140
{
141141
{ default, string.Empty, Dk },

0 commit comments

Comments
 (0)