Skip to content

Commit 7e40e2f

Browse files
committed
fix merge
1 parent 65a5660 commit 7e40e2f

6 files changed

Lines changed: 7 additions & 209 deletions

File tree

src/ModVerify/Reporting/Baseline/Json/JsonVerificationBaseline.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ public JsonVerificationBaseline(VerificationBaseline baseline)
3333
[JsonConstructor]
3434
private JsonVerificationBaseline(
3535
JsonVerificationTarget target,
36-
Version version,
37-
VerificationSeverity minimumSeverity,
36+
Version version,
37+
VerificationSeverity minimumSeverity,
3838
IEnumerable<JsonVerificationError> errors)
3939
{
4040
Target = target;

src/ModVerify/Reporting/BaselineVerificationTarget.cs

Lines changed: 0 additions & 23 deletions
This file was deleted.

src/ModVerify/Reporting/InvalidBaselineException.cs

Lines changed: 0 additions & 14 deletions
This file was deleted.

src/ModVerify/Reporting/Json/JsonBaselineParser.cs

Lines changed: 0 additions & 36 deletions
This file was deleted.

src/ModVerify/Reporting/Json/JsonBaselineSchema.cs

Lines changed: 0 additions & 129 deletions
This file was deleted.

src/ModVerify/Reporting/Json/JsonVerificationTarget.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ namespace AET.ModVerify.Reporting.Json;
66

77
internal class JsonVerificationTarget
88
{
9-
[JsonPropertyName("name")]
9+
[JsonPropertyName("name")]
1010
public string Name { get; }
1111

1212
[JsonPropertyName("engine")]
@@ -18,17 +18,17 @@ internal class JsonVerificationTarget
1818

1919
[JsonPropertyName("version")]
2020
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
21-
public string? Version{ get; }
21+
public string? Version { get; }
2222

2323
[JsonPropertyName("location")]
2424
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
2525
public JsonGameLocation? Location { get; }
2626

2727
[JsonConstructor]
2828
private JsonVerificationTarget(
29-
string name,
30-
string? version,
31-
JsonGameLocation? location,
29+
string name,
30+
string? version,
31+
JsonGameLocation? location,
3232
GameEngineType engine,
3333
bool isGame)
3434
{

0 commit comments

Comments
 (0)