From cd4d9f6f0dc526a4dc53d2149927a8440ec1637b Mon Sep 17 00:00:00 2001 From: Daniel Petrov Date: Mon, 5 Feb 2024 12:22:32 +0100 Subject: [PATCH 1/5] Update csharp core xunit project to the latest SDK and libs --- .../GildedRose/GildedRose.csproj | 2 +- .../GildedRoseTests/ApprovalTest.cs | 1 - .../GildedRoseTests/GildedRoseTests.csproj | 18 ++++++++++++------ 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/csharpcore-Verify.xunit/GildedRose/GildedRose.csproj b/csharpcore-Verify.xunit/GildedRose/GildedRose.csproj index 808ef6c9..e830fad1 100644 --- a/csharpcore-Verify.xunit/GildedRose/GildedRose.csproj +++ b/csharpcore-Verify.xunit/GildedRose/GildedRose.csproj @@ -2,7 +2,7 @@ Exe - net7.0 + net8.0 GildedRoseKata.Program diff --git a/csharpcore-Verify.xunit/GildedRoseTests/ApprovalTest.cs b/csharpcore-Verify.xunit/GildedRoseTests/ApprovalTest.cs index acfbf40c..ba8e701f 100644 --- a/csharpcore-Verify.xunit/GildedRoseTests/ApprovalTest.cs +++ b/csharpcore-Verify.xunit/GildedRoseTests/ApprovalTest.cs @@ -12,7 +12,6 @@ using Xunit; namespace GildedRoseTests { - [UsesVerify] public class ApprovalTest { [Fact] diff --git a/csharpcore-Verify.xunit/GildedRoseTests/GildedRoseTests.csproj b/csharpcore-Verify.xunit/GildedRoseTests/GildedRoseTests.csproj index d08b584b..931ecd95 100644 --- a/csharpcore-Verify.xunit/GildedRoseTests/GildedRoseTests.csproj +++ b/csharpcore-Verify.xunit/GildedRoseTests/GildedRoseTests.csproj @@ -1,15 +1,21 @@  - net7.0 + net8.0 false - - - - - + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + From 03a9d294d21dd4710e87e367029bea9183b0821f Mon Sep 17 00:00:00 2001 From: Daniel Petrov Date: Mon, 5 Feb 2024 12:37:27 +0100 Subject: [PATCH 2/5] Update csharp core nunit project to latest SDK and libs --- csharpcore/GildedRose/GildedRose.csproj | 2 +- csharpcore/GildedRoseTests/ApprovalTest.cs | 9 +++-- csharpcore/GildedRoseTests/GildedRoseTest.cs | 2 +- .../GildedRoseTests/GildedRoseTests.csproj | 35 ++++++++++--------- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/csharpcore/GildedRose/GildedRose.csproj b/csharpcore/GildedRose/GildedRose.csproj index 082dac9c..ae2821ed 100644 --- a/csharpcore/GildedRose/GildedRose.csproj +++ b/csharpcore/GildedRose/GildedRose.csproj @@ -1,7 +1,7 @@  - net7.0 + net8.0 diff --git a/csharpcore/GildedRoseTests/ApprovalTest.cs b/csharpcore/GildedRoseTests/ApprovalTest.cs index f8766d54..1e63c4d1 100644 --- a/csharpcore/GildedRoseTests/ApprovalTest.cs +++ b/csharpcore/GildedRoseTests/ApprovalTest.cs @@ -1,17 +1,16 @@ using System; using System.IO; using System.Text; -using ApprovalTests; -using ApprovalTests.Reporters; +using System.Threading.Tasks; using NUnit.Framework; +using VerifyNUnit; namespace GildedRoseTests; -[UseReporter(typeof(DiffReporter))] public class ApprovalTest { [Test] - public void ThirtyDays() + public Task ThirtyDays() { var fakeOutput = new StringBuilder(); Console.SetOut(new StringWriter(fakeOutput)); @@ -20,6 +19,6 @@ public class ApprovalTest TextTestFixture.Main(new string[] { "30" }); var output = fakeOutput.ToString(); - Approvals.Verify(output); + return Verifier.Verify(output); } } \ No newline at end of file diff --git a/csharpcore/GildedRoseTests/GildedRoseTest.cs b/csharpcore/GildedRoseTests/GildedRoseTest.cs index 3eb66aaa..d3f7e53d 100644 --- a/csharpcore/GildedRoseTests/GildedRoseTest.cs +++ b/csharpcore/GildedRoseTests/GildedRoseTest.cs @@ -12,6 +12,6 @@ public class GildedRoseTest var items = new List { new Item { Name = "foo", SellIn = 0, Quality = 0 } }; var app = new GildedRose(items); app.UpdateQuality(); - Assert.AreEqual("fixme", items[0].Name); + Assert.That(items[0].Name, Is.EqualTo("fixme")); } } \ No newline at end of file diff --git a/csharpcore/GildedRoseTests/GildedRoseTests.csproj b/csharpcore/GildedRoseTests/GildedRoseTests.csproj index 470e8179..8fb0e3cd 100644 --- a/csharpcore/GildedRoseTests/GildedRoseTests.csproj +++ b/csharpcore/GildedRoseTests/GildedRoseTests.csproj @@ -1,23 +1,24 @@  - - Exe - net7.0 - GildedRoseTests.TextTestFixture - + + Exe + net8.0 + GildedRoseTests.TextTestFixture + - - - - - runtime; build; native; contentfiles; analyzers; buildtransitive -all - - - + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + + - - - + + + \ No newline at end of file From 0e23a6f8ae8116c48f319740e5cfc920a373367a Mon Sep 17 00:00:00 2001 From: Daniel Petrov Date: Mon, 5 Feb 2024 12:52:23 +0100 Subject: [PATCH 3/5] Formatting --- .../GildedRoseTests/GildedRoseTests.csproj | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/csharpcore/GildedRoseTests/GildedRoseTests.csproj b/csharpcore/GildedRoseTests/GildedRoseTests.csproj index 8fb0e3cd..b0c6fcaf 100644 --- a/csharpcore/GildedRoseTests/GildedRoseTests.csproj +++ b/csharpcore/GildedRoseTests/GildedRoseTests.csproj @@ -1,24 +1,24 @@  - - Exe - net8.0 - GildedRoseTests.TextTestFixture - + + Exe + net8.0 + GildedRoseTests.TextTestFixture + - - - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - - + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + - - - + + + \ No newline at end of file From 0230368b96a1b7c482d094e145d07b32ad9a2cdb Mon Sep 17 00:00:00 2001 From: Daniel Petrov Date: Mon, 5 Feb 2024 12:55:05 +0100 Subject: [PATCH 4/5] Formatting --- csharpcore/GildedRoseTests/GildedRoseTests.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/csharpcore/GildedRoseTests/GildedRoseTests.csproj b/csharpcore/GildedRoseTests/GildedRoseTests.csproj index b0c6fcaf..738dadbb 100644 --- a/csharpcore/GildedRoseTests/GildedRoseTests.csproj +++ b/csharpcore/GildedRoseTests/GildedRoseTests.csproj @@ -11,8 +11,8 @@ - runtime; build; native; contentfiles; analyzers; buildtransitive - all + runtime; build; native; contentfiles; analyzers; buildtransitive + all From 4adba8f57f5bdb2a7adb7fe28e95c01f37206ed3 Mon Sep 17 00:00:00 2001 From: Daniel Petrov Date: Mon, 5 Feb 2024 12:57:07 +0100 Subject: [PATCH 5/5] Formatting --- .../GildedRoseTests/GildedRoseTests.csproj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/csharpcore-Verify.xunit/GildedRoseTests/GildedRoseTests.csproj b/csharpcore-Verify.xunit/GildedRoseTests/GildedRoseTests.csproj index 931ecd95..bed0eb47 100644 --- a/csharpcore-Verify.xunit/GildedRoseTests/GildedRoseTests.csproj +++ b/csharpcore-Verify.xunit/GildedRoseTests/GildedRoseTests.csproj @@ -9,12 +9,12 @@ - all - runtime; build; native; contentfiles; analyzers; buildtransitive + all + runtime; build; native; contentfiles; analyzers; buildtransitive - all - runtime; build; native; contentfiles; analyzers; buildtransitive + all + runtime; build; native; contentfiles; analyzers; buildtransitive