Skip to content

Commit 78880d6

Browse files
SimonCroppSimonCropp
committed
cleanup
1 parent b8a959a commit 78880d6

File tree

139 files changed

+732
-690
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

139 files changed

+732
-690
lines changed

‎src/ApplyScrubbersTests/ApplyScrubbersTests.csproj

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
<TargetFramework>net6</TargetFramework>
55
</PropertyGroup>
66
<ItemGroup>
7-
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
8-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
9-
<PackageReference Include="Xunit" Version="2.4.1" />
10-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
11-
<PackageReference Include="ProjectDefaults" Version="1.0.71" PrivateAssets="all" />
12-
<ProjectReference Include="..\Verify.Xunit\Verify.Xunit.csproj" />
13-
<ProjectReference Include="..\Verify\Verify.csproj" />
7+
<PackageReference Include="Microsoft.CSharp" Version="4.7.0"/>
8+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0"/>
9+
<PackageReference Include="Xunit" Version="2.4.1"/>
10+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3"/>
11+
<PackageReference Include="ProjectDefaults" Version="1.0.71" PrivateAssets="all"/>
12+
<ProjectReference Include="..\Verify.Xunit\Verify.Xunit.csproj"/>
13+
<ProjectReference Include="..\Verify\Verify.csproj"/>
1414
</ItemGroup>
15-
<Import Project="$(ProjectDir)..\Verify\buildTransitive\Verify.props" />
16-
<Import Project="$(ProjectDir)..\Verify\buildTransitive\Verify.targets" />
17-
<Import Project="$(ProjectDir)..\Verify.Xunit\buildTransitive\Verify.Xunit.props" />
15+
<Import Project="$(ProjectDir)..\Verify\buildTransitive\Verify.props"/>
16+
<Import Project="$(ProjectDir)..\Verify\buildTransitive\Verify.targets"/>
17+
<Import Project="$(ProjectDir)..\Verify.Xunit\buildTransitive\Verify.Xunit.props"/>
1818
</Project>

‎src/DeterministicTests/DeterministicTests.csproj

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,21 @@
77
<DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
88
</PropertyGroup>
99
<ItemGroup>
10-
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
11-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
12-
<PackageReference Include="Xunit" Version="2.4.1" />
13-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
14-
<PackageReference Include="ProjectDefaults" Version="1.0.71" PrivateAssets="all" />
15-
<ProjectReference Include="..\Verify.Xunit\Verify.Xunit.csproj" />
16-
<ProjectReference Include="..\Verify\Verify.csproj" />
10+
<PackageReference Include="Microsoft.CSharp" Version="4.7.0"/>
11+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0"/>
12+
<PackageReference Include="Xunit" Version="2.4.1"/>
13+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3"/>
14+
<PackageReference Include="ProjectDefaults" Version="1.0.71" PrivateAssets="all"/>
15+
<ProjectReference Include="..\Verify.Xunit\Verify.Xunit.csproj"/>
16+
<ProjectReference Include="..\Verify\Verify.csproj"/>
1717
</ItemGroup>
18-
<Import Project="$(ProjectDir)..\Verify\buildTransitive\Verify.props" />
19-
<Import Project="$(ProjectDir)..\Verify\buildTransitive\Verify.targets" />
20-
<Import Project="$(ProjectDir)..\Verify.Xunit\buildTransitive\Verify.Xunit.props" />
18+
<Import Project="$(ProjectDir)..\Verify\buildTransitive\Verify.props"/>
19+
<Import Project="$(ProjectDir)..\Verify\buildTransitive\Verify.targets"/>
20+
<Import Project="$(ProjectDir)..\Verify.Xunit\buildTransitive\Verify.Xunit.props"/>
2121
<!--Work around: https://github.com/dotnet/sdk/issues/21006-->
2222
<Target Name="DisableAnalyzers" BeforeTargets="CoreCompile">
2323
<ItemGroup>
24-
<Analyzer Remove="@(Analyzer)" />
24+
<Analyzer Remove="@(Analyzer)"/>
2525
</ItemGroup>
2626
</Target>
2727
</Project>

‎src/DeterministicTests/Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
77
</PropertyGroup>
88
<ItemGroup>
9-
<SourceRoot Include = " $(MSBuildThisFileDirectory)/ " />
9+
<SourceRoot Include=" $(MSBuildThisFileDirectory)/ "/>
1010
</ItemGroup>
1111
</Project>

‎src/Directory.Build.props

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
</PropertyGroup>
1515

1616
<ItemGroup>
17-
<Using Include="System.Diagnostics.CodeAnalysis" />
18-
<Using Include="System.Text.RegularExpressions" />
19-
<Using Include="System.Globalization" />
20-
<Using Include="System.Linq.Expressions" />
21-
<Using Include="System.Collections.Specialized" />
17+
<Using Include="System.Diagnostics.CodeAnalysis"/>
18+
<Using Include="System.Text.RegularExpressions"/>
19+
<Using Include="System.Globalization"/>
20+
<Using Include="System.Linq.Expressions"/>
21+
<Using Include="System.Collections.Specialized"/>
2222
</ItemGroup>
2323
</Project>

‎src/DisableDirScrubbing/DisableDirScrubbing.csproj

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
<TargetFramework>net6</TargetFramework>
55
</PropertyGroup>
66
<ItemGroup>
7-
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
8-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
9-
<PackageReference Include="Xunit" Version="2.4.1" />
10-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
11-
<PackageReference Include="ProjectDefaults" Version="1.0.71" PrivateAssets="all" />
12-
<ProjectReference Include="..\Verify.Xunit\Verify.Xunit.csproj" />
13-
<ProjectReference Include="..\Verify\Verify.csproj" />
7+
<PackageReference Include="Microsoft.CSharp" Version="4.7.0"/>
8+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0"/>
9+
<PackageReference Include="Xunit" Version="2.4.1"/>
10+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3"/>
11+
<PackageReference Include="ProjectDefaults" Version="1.0.71" PrivateAssets="all"/>
12+
<ProjectReference Include="..\Verify.Xunit\Verify.Xunit.csproj"/>
13+
<ProjectReference Include="..\Verify\Verify.csproj"/>
1414
</ItemGroup>
15-
<Import Project="$(ProjectDir)..\Verify\buildTransitive\Verify.props" />
16-
<Import Project="$(ProjectDir)..\Verify\buildTransitive\Verify.targets" />
17-
<Import Project="$(ProjectDir)..\Verify.Xunit\buildTransitive\Verify.Xunit.props" />
15+
<Import Project="$(ProjectDir)..\Verify\buildTransitive\Verify.props"/>
16+
<Import Project="$(ProjectDir)..\Verify\buildTransitive\Verify.targets"/>
17+
<Import Project="$(ProjectDir)..\Verify.Xunit\buildTransitive\Verify.Xunit.props"/>
1818
</Project>

‎src/FSharpTests/FSharpTests.fsproj

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<PropertyGroup>
3-
<TargetFramework>net6</TargetFramework>
4-
<GenerateProgramFile>false</GenerateProgramFile>
5-
<LangVersion>preview</LangVersion>
6-
</PropertyGroup>
7-
<ItemGroup>
8-
<Compile Include="Tests.fs" />
9-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
10-
<PackageReference Include="xunit" Version="2.4.1" />
11-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
12-
<ProjectReference Include="..\Verify.Xunit\Verify.Xunit.csproj" />
13-
<ProjectReference Include="..\Verify\Verify.csproj" />
14-
<PackageReference Update="FSharp.Core" Version="6.0.3" />
15-
</ItemGroup>
16-
<Import Project="$(ProjectDir)..\Verify\buildTransitive\Verify.props" />
17-
<Import Project="$(ProjectDir)..\Verify\buildTransitive\Verify.targets" />
2+
<PropertyGroup>
3+
<TargetFramework>net6</TargetFramework>
4+
<GenerateProgramFile>false</GenerateProgramFile>
5+
<LangVersion>preview</LangVersion>
6+
</PropertyGroup>
7+
<ItemGroup>
8+
<Compile Include="Tests.fs"/>
9+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0"/>
10+
<PackageReference Include="xunit" Version="2.4.1"/>
11+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3"/>
12+
<ProjectReference Include="..\Verify.Xunit\Verify.Xunit.csproj"/>
13+
<ProjectReference Include="..\Verify\Verify.csproj"/>
14+
<PackageReference Update="FSharp.Core" Version="6.0.3"/>
15+
</ItemGroup>
16+
<Import Project="$(ProjectDir)..\Verify\buildTransitive\Verify.props"/>
17+
<Import Project="$(ProjectDir)..\Verify\buildTransitive\Verify.targets"/>
1818
</Project>

‎src/FSharpTests/Tests.fs

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,34 +7,30 @@ open VerifyXunit
77
open Newtonsoft.Json
88

99
// begin-snippet: NullValueHandling
10-
VerifierSettings.AddExtraSettings(fun settings ->
11-
settings.NullValueHandling <- NullValueHandling.Include)
10+
VerifierSettings.AddExtraSettings(fun settings -> settings.NullValueHandling <- NullValueHandling.Include)
1211
// end-snippet
1312

1413
// begin-snippet: FsTest
1514
[<Fact>]
1615
let MyTest () =
17-
async {
18-
do! Verifier.Verify(15)
19-
.ToTask() |> Async.AwaitTask
20-
}
16+
async { do! Verifier.Verify(15).ToTask() |> Async.AwaitTask }
2117
// end-snippet
2218

2319
// begin-snippet: FsTestTask
2420
[<Fact>]
25-
let MyTaskTest () =
26-
task {
27-
do! Verifier.Verify(15)
28-
}
21+
let MyTaskTest () = task { do! Verifier.Verify(15) }
2922
// end-snippet
3023

3124
// begin-snippet: WithSettings
3225
[<Fact>]
3326
let WithFluentSetting () =
34-
async {
35-
do! Verifier.Verify(15)
36-
.UseMethodName("customName")
37-
.ToTask() |> Async.AwaitTask
38-
}
27+
async {
28+
do!
29+
Verifier
30+
.Verify(15)
31+
.UseMethodName("customName")
32+
.ToTask()
33+
|> Async.AwaitTask
34+
}
3935
// end-snippet
40-
do ()
36+
do ()

‎src/FakeDiffTool/Program.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Thread.Sleep(5000);
1+
Thread.Sleep(5000);

‎src/OmitContentFromException/OmitContentFromException.csproj

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
<TargetFramework>net6</TargetFramework>
55
</PropertyGroup>
66
<ItemGroup>
7-
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
8-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
9-
<PackageReference Include="Xunit" Version="2.4.1" />
10-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
11-
<PackageReference Include="ProjectDefaults" Version="1.0.71" PrivateAssets="all" />
12-
<ProjectReference Include="..\Verify.Xunit\Verify.Xunit.csproj" />
13-
<ProjectReference Include="..\Verify\Verify.csproj" />
7+
<PackageReference Include="Microsoft.CSharp" Version="4.7.0"/>
8+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0"/>
9+
<PackageReference Include="Xunit" Version="2.4.1"/>
10+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3"/>
11+
<PackageReference Include="ProjectDefaults" Version="1.0.71" PrivateAssets="all"/>
12+
<ProjectReference Include="..\Verify.Xunit\Verify.Xunit.csproj"/>
13+
<ProjectReference Include="..\Verify\Verify.csproj"/>
1414
</ItemGroup>
15-
<Import Project="$(ProjectDir)..\Verify\buildTransitive\Verify.props" />
16-
<Import Project="$(ProjectDir)..\Verify\buildTransitive\Verify.targets" />
17-
<Import Project="$(ProjectDir)..\Verify.Xunit\buildTransitive\Verify.Xunit.props" />
15+
<Import Project="$(ProjectDir)..\Verify\buildTransitive\Verify.props"/>
16+
<Import Project="$(ProjectDir)..\Verify\buildTransitive\Verify.targets"/>
17+
<Import Project="$(ProjectDir)..\Verify.Xunit\buildTransitive\Verify.Xunit.props"/>
1818
</Project>

‎src/SortedPropertiesTests/SortedPropertiesTests.cs

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using Newtonsoft.Json;
22

33
#region SortProperties
4+
45
static class ModuleInitializer
56
{
67
[ModuleInitializer]
@@ -9,12 +10,14 @@ public static void Init()
910
VerifierSettings.SortPropertiesAlphabetically();
1011
}
1112
}
13+
1214
#endregion
1315

1416
[UsesVerify]
1517
public class SortedPropertiesTests
1618
{
1719
#region SortPropertiesUsage
20+
1821
[Fact]
1922
public Task Alphabetically()
2023
{
@@ -25,7 +28,7 @@ public Task Alphabetically()
2528
GivenNames = "John",
2629
FamilyName = "Smith",
2730
Spouse = "Jill",
28-
Children = new() { "Sam", "Mary" },
31+
Children = new() {"Sam", "Mary"},
2932
Address = new()
3033
{
3134
Street = "1 Puddle Lane",
@@ -35,6 +38,7 @@ public Task Alphabetically()
3538

3639
return Verify(person);
3740
}
41+
3842
#endregion
3943

4044
[Fact]
@@ -47,7 +51,7 @@ public Task DoesNotAffectTypeName()
4751
GivenNames = "John",
4852
FamilyName = "Smith",
4953
Spouse = "Jill",
50-
Children = new() { "Sam", "Mary" },
54+
Children = new() {"Sam", "Mary"},
5155
Address = new()
5256
{
5357
Street = "1 Puddle Lane",
@@ -57,7 +61,10 @@ public Task DoesNotAffectTypeName()
5761

5862
return Verify(person)
5963
.AddExtraSettings(
60-
_ => { _.TypeNameHandling = TypeNameHandling.All; });
64+
_ =>
65+
{
66+
_.TypeNameHandling = TypeNameHandling.All;
67+
});
6168
}
6269
}
6370

‎src/SortedPropertiesTests/SortedPropertiesTests.csproj

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
<TargetFrameworks>net6</TargetFrameworks>
55
</PropertyGroup>
66
<ItemGroup>
7-
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
8-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
9-
<PackageReference Include="Xunit" Version="2.4.1" />
10-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
11-
<PackageReference Include="ProjectDefaults" Version="1.0.71" PrivateAssets="all" />
12-
<ProjectReference Include="..\Verify.Xunit\Verify.Xunit.csproj" />
13-
<ProjectReference Include="..\Verify\Verify.csproj" />
7+
<PackageReference Include="Microsoft.CSharp" Version="4.7.0"/>
8+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0"/>
9+
<PackageReference Include="Xunit" Version="2.4.1"/>
10+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3"/>
11+
<PackageReference Include="ProjectDefaults" Version="1.0.71" PrivateAssets="all"/>
12+
<ProjectReference Include="..\Verify.Xunit\Verify.Xunit.csproj"/>
13+
<ProjectReference Include="..\Verify\Verify.csproj"/>
1414
</ItemGroup>
15-
<Import Project="$(ProjectDir)..\Verify\buildTransitive\Verify.props" />
16-
<Import Project="$(ProjectDir)..\Verify\buildTransitive\Verify.targets" />
17-
<Import Project="$(ProjectDir)..\Verify.Xunit\buildTransitive\Verify.Xunit.props" />
15+
<Import Project="$(ProjectDir)..\Verify\buildTransitive\Verify.props"/>
16+
<Import Project="$(ProjectDir)..\Verify\buildTransitive\Verify.targets"/>
17+
<Import Project="$(ProjectDir)..\Verify.Xunit\buildTransitive\Verify.Xunit.props"/>
1818
</Project>

‎src/StrictJsonTests/StrictJsonTests.csproj

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
<TargetFrameworks>net6</TargetFrameworks>
55
</PropertyGroup>
66
<ItemGroup>
7-
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
8-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
9-
<PackageReference Include="Xunit" Version="2.4.1" />
10-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
11-
<PackageReference Include="ProjectDefaults" Version="1.0.71" PrivateAssets="all" />
12-
<ProjectReference Include="..\Verify.Xunit\Verify.Xunit.csproj" />
13-
<ProjectReference Include="..\Verify\Verify.csproj" />
7+
<PackageReference Include="Microsoft.CSharp" Version="4.7.0"/>
8+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0"/>
9+
<PackageReference Include="Xunit" Version="2.4.1"/>
10+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3"/>
11+
<PackageReference Include="ProjectDefaults" Version="1.0.71" PrivateAssets="all"/>
12+
<ProjectReference Include="..\Verify.Xunit\Verify.Xunit.csproj"/>
13+
<ProjectReference Include="..\Verify\Verify.csproj"/>
1414
</ItemGroup>
15-
<Import Project="$(ProjectDir)..\Verify\buildTransitive\Verify.props" />
16-
<Import Project="$(ProjectDir)..\Verify\buildTransitive\Verify.targets" />
17-
<Import Project="$(ProjectDir)..\Verify.Xunit\buildTransitive\Verify.Xunit.props" />
15+
<Import Project="$(ProjectDir)..\Verify\buildTransitive\Verify.props"/>
16+
<Import Project="$(ProjectDir)..\Verify\buildTransitive\Verify.targets"/>
17+
<Import Project="$(ProjectDir)..\Verify.Xunit\buildTransitive\Verify.Xunit.props"/>
1818
</Project>

‎src/TargetLibrary/ClassBeingTested.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#region ClassBeingTested
2+
23
public static class ClassBeingTested
34
{
45
public static Person FindPerson()
@@ -23,4 +24,5 @@ public static Person FindPerson()
2324
};
2425
}
2526
}
27+
2628
#endregion

‎src/TargetLibrary/ClassBeingTestedChanged.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
namespace Changed;
22

33
#region ClassBeingTestedChanged
4+
45
public static class ClassBeingTested
56
{
67
public static Person FindPerson()
@@ -27,4 +28,5 @@ public static Person FindPerson()
2728
};
2829
}
2930
}
31+
3032
#endregion

‎src/TargetLibrary/SampleModels.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// Non-nullable field is uninitialized.
2+
23
#pragma warning disable CS8618
34
public class Person
45
{
@@ -21,5 +22,6 @@ public class Address
2122

2223
public enum Title
2324
{
24-
Mr, Mrs
25+
Mr,
26+
Mrs
2527
}

0 commit comments

Comments
 (0)