From 0e0c02550973cf200b84c70227d0e21e70b109dc Mon Sep 17 00:00:00 2001 From: Will Verland Date: Thu, 22 Jul 2021 08:37:04 +1200 Subject: [PATCH 1/4] Rename C# project to GuildedRose --- csharpcore/{ => GuildedRose}/ApprovalTest.cs | 2 +- csharpcore/{ => GuildedRose}/GildedRose.cs | 2 +- csharpcore/{ => GuildedRose}/GildedRoseTest.cs | 2 +- .../{csharpcore.csproj => GuildedRose/GuildedRose.csproj} | 2 +- csharpcore/{ => GuildedRose}/Item.cs | 2 +- csharpcore/{ => GuildedRose}/Program.cs | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) rename csharpcore/{ => GuildedRose}/ApprovalTest.cs (96%) rename csharpcore/{ => GuildedRose}/GildedRose.cs (99%) rename csharpcore/{ => GuildedRose}/GildedRoseTest.cs (94%) rename csharpcore/{csharpcore.csproj => GuildedRose/GuildedRose.csproj} (89%) rename csharpcore/{ => GuildedRose}/Item.cs (86%) rename csharpcore/{ => GuildedRose}/Program.cs (98%) diff --git a/csharpcore/ApprovalTest.cs b/csharpcore/GuildedRose/ApprovalTest.cs similarity index 96% rename from csharpcore/ApprovalTest.cs rename to csharpcore/GuildedRose/ApprovalTest.cs index 7b5d2db4..b9843b90 100644 --- a/csharpcore/ApprovalTest.cs +++ b/csharpcore/GuildedRose/ApprovalTest.cs @@ -5,7 +5,7 @@ using System.Text; using ApprovalTests; using ApprovalTests.Reporters; -namespace csharpcore +namespace GuildedRose { [UseReporter(typeof(DiffReporter))] public class ApprovalTest diff --git a/csharpcore/GildedRose.cs b/csharpcore/GuildedRose/GildedRose.cs similarity index 99% rename from csharpcore/GildedRose.cs rename to csharpcore/GuildedRose/GildedRose.cs index 0d019901..3b386391 100644 --- a/csharpcore/GildedRose.cs +++ b/csharpcore/GuildedRose/GildedRose.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace csharpcore +namespace GuildedRose { public class GildedRose { diff --git a/csharpcore/GildedRoseTest.cs b/csharpcore/GuildedRose/GildedRoseTest.cs similarity index 94% rename from csharpcore/GildedRoseTest.cs rename to csharpcore/GuildedRose/GildedRoseTest.cs index aa64b0b5..0d050891 100644 --- a/csharpcore/GildedRoseTest.cs +++ b/csharpcore/GuildedRose/GildedRoseTest.cs @@ -1,7 +1,7 @@ using Xunit; using System.Collections.Generic; -namespace csharpcore +namespace GuildedRose { public class GildedRoseTest { diff --git a/csharpcore/csharpcore.csproj b/csharpcore/GuildedRose/GuildedRose.csproj similarity index 89% rename from csharpcore/csharpcore.csproj rename to csharpcore/GuildedRose/GuildedRose.csproj index 3d6d5eea..d3c7a6e7 100644 --- a/csharpcore/csharpcore.csproj +++ b/csharpcore/GuildedRose/GuildedRose.csproj @@ -3,7 +3,7 @@ Exe netcoreapp3.1 - csharpcore.Program + GuildedRose.Program diff --git a/csharpcore/Item.cs b/csharpcore/GuildedRose/Item.cs similarity index 86% rename from csharpcore/Item.cs rename to csharpcore/GuildedRose/Item.cs index 7940eb84..ee0972f3 100644 --- a/csharpcore/Item.cs +++ b/csharpcore/GuildedRose/Item.cs @@ -1,4 +1,4 @@ -namespace csharpcore +namespace GuildedRose { public class Item { diff --git a/csharpcore/Program.cs b/csharpcore/GuildedRose/Program.cs similarity index 98% rename from csharpcore/Program.cs rename to csharpcore/GuildedRose/Program.cs index ebe4da4a..08cc3b79 100644 --- a/csharpcore/Program.cs +++ b/csharpcore/GuildedRose/Program.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace csharpcore +namespace GuildedRose { public class Program { From 3eec127eff5cfb2f4c1243b6abb2f64123f0591c Mon Sep 17 00:00:00 2001 From: Will Verland Date: Thu, 22 Jul 2021 08:37:20 +1200 Subject: [PATCH 2/4] Add Visual Studio solution --- csharpcore/GuildedRose.sln | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 csharpcore/GuildedRose.sln diff --git a/csharpcore/GuildedRose.sln b/csharpcore/GuildedRose.sln new file mode 100644 index 00000000..9941b0cf --- /dev/null +++ b/csharpcore/GuildedRose.sln @@ -0,0 +1,25 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.31424.327 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GuildedRose", "GuildedRose\GuildedRose.csproj", "{D781C52B-92C0-48BF-8414-177495DF4174}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {D781C52B-92C0-48BF-8414-177495DF4174}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D781C52B-92C0-48BF-8414-177495DF4174}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D781C52B-92C0-48BF-8414-177495DF4174}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D781C52B-92C0-48BF-8414-177495DF4174}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {02785EA4-86A5-4E57-9A9A-6998FAE1E617} + EndGlobalSection +EndGlobal From b556848479e6a6aea2b755f8f2e3075a597a410e Mon Sep 17 00:00:00 2001 From: Will Verland Date: Thu, 22 Jul 2021 08:46:15 +1200 Subject: [PATCH 3/4] Add separate project for tests --- csharpcore/GuildedRose.sln | 6 ++++ csharpcore/GuildedRose/GuildedRose.csproj | 6 ---- .../ApprovalTest.cs | 5 +-- .../GildedRoseTest.cs | 35 ++++++++++--------- .../GuildedRoseTests/GuildedRoseTests.csproj | 20 +++++++++++ 5 files changed, 47 insertions(+), 25 deletions(-) rename csharpcore/{GuildedRose => GuildedRoseTests}/ApprovalTest.cs (92%) rename csharpcore/{GuildedRose => GuildedRoseTests}/GildedRoseTest.cs (85%) create mode 100644 csharpcore/GuildedRoseTests/GuildedRoseTests.csproj diff --git a/csharpcore/GuildedRose.sln b/csharpcore/GuildedRose.sln index 9941b0cf..3468c12b 100644 --- a/csharpcore/GuildedRose.sln +++ b/csharpcore/GuildedRose.sln @@ -5,6 +5,8 @@ VisualStudioVersion = 16.0.31424.327 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GuildedRose", "GuildedRose\GuildedRose.csproj", "{D781C52B-92C0-48BF-8414-177495DF4174}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GuildedRoseTests", "GuildedRoseTests\GuildedRoseTests.csproj", "{CB6715CE-A283-4C70-9C1B-F58822077731}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -15,6 +17,10 @@ Global {D781C52B-92C0-48BF-8414-177495DF4174}.Debug|Any CPU.Build.0 = Debug|Any CPU {D781C52B-92C0-48BF-8414-177495DF4174}.Release|Any CPU.ActiveCfg = Release|Any CPU {D781C52B-92C0-48BF-8414-177495DF4174}.Release|Any CPU.Build.0 = Release|Any CPU + {CB6715CE-A283-4C70-9C1B-F58822077731}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CB6715CE-A283-4C70-9C1B-F58822077731}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CB6715CE-A283-4C70-9C1B-F58822077731}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CB6715CE-A283-4C70-9C1B-F58822077731}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/csharpcore/GuildedRose/GuildedRose.csproj b/csharpcore/GuildedRose/GuildedRose.csproj index d3c7a6e7..af859afe 100644 --- a/csharpcore/GuildedRose/GuildedRose.csproj +++ b/csharpcore/GuildedRose/GuildedRose.csproj @@ -6,10 +6,4 @@ GuildedRose.Program - - - - - - diff --git a/csharpcore/GuildedRose/ApprovalTest.cs b/csharpcore/GuildedRoseTests/ApprovalTest.cs similarity index 92% rename from csharpcore/GuildedRose/ApprovalTest.cs rename to csharpcore/GuildedRoseTests/ApprovalTest.cs index b9843b90..0ff3c994 100644 --- a/csharpcore/GuildedRose/ApprovalTest.cs +++ b/csharpcore/GuildedRoseTests/ApprovalTest.cs @@ -4,8 +4,9 @@ using System.IO; using System.Text; using ApprovalTests; using ApprovalTests.Reporters; - -namespace GuildedRose +using GuildedRose; + +namespace GuildedRoseTests { [UseReporter(typeof(DiffReporter))] public class ApprovalTest diff --git a/csharpcore/GuildedRose/GildedRoseTest.cs b/csharpcore/GuildedRoseTests/GildedRoseTest.cs similarity index 85% rename from csharpcore/GuildedRose/GildedRoseTest.cs rename to csharpcore/GuildedRoseTests/GildedRoseTest.cs index 0d050891..5134a2a5 100644 --- a/csharpcore/GuildedRose/GildedRoseTest.cs +++ b/csharpcore/GuildedRoseTests/GildedRoseTest.cs @@ -1,17 +1,18 @@ -using Xunit; -using System.Collections.Generic; - -namespace GuildedRose -{ - public class GildedRoseTest - { - [Fact] - public void foo() - { - IList Items = new List { new Item { Name = "foo", SellIn = 0, Quality = 0 } }; - GildedRose app = new GildedRose(Items); - app.UpdateQuality(); - Assert.Equal("fixme", Items[0].Name); - } - } -} \ No newline at end of file +using Xunit; +using System.Collections.Generic; +using GuildedRose; + +namespace GuildedRoseTests +{ + public class GildedRoseTest + { + [Fact] + public void foo() + { + IList Items = new List { new Item { Name = "foo", SellIn = 0, Quality = 0 } }; + GildedRose app = new GildedRose(Items); + app.UpdateQuality(); + Assert.Equal("fixme", Items[0].Name); + } + } +} diff --git a/csharpcore/GuildedRoseTests/GuildedRoseTests.csproj b/csharpcore/GuildedRoseTests/GuildedRoseTests.csproj new file mode 100644 index 00000000..02c2759e --- /dev/null +++ b/csharpcore/GuildedRoseTests/GuildedRoseTests.csproj @@ -0,0 +1,20 @@ + + + + netcoreapp3.1 + false + + + + + + + + + + + + + + + From 85a1611787403f900c85ec9115c22ffbc3e8d23c Mon Sep 17 00:00:00 2001 From: Will Verland Date: Fri, 23 Jul 2021 11:30:53 +1200 Subject: [PATCH 4/4] Fix misspelling of Guilded => Gilded for PR #252 --- csharpcore/{GuildedRose.sln => GildedRose.sln} | 4 ++-- csharpcore/{GuildedRose => GildedRose}/GildedRose.cs | 2 +- .../GuildedRose.csproj => GildedRose/GildedRose.csproj} | 2 +- csharpcore/{GuildedRose => GildedRose}/Item.cs | 2 +- csharpcore/{GuildedRose => GildedRose}/Program.cs | 2 +- .../{GuildedRoseTests => GildedRoseTests}/ApprovalTest.cs | 6 +++--- .../{GuildedRoseTests => GildedRoseTests}/GildedRoseTest.cs | 4 ++-- .../GildedRoseTests.csproj} | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) rename csharpcore/{GuildedRose.sln => GildedRose.sln} (79%) rename csharpcore/{GuildedRose => GildedRose}/GildedRose.cs (99%) rename csharpcore/{GuildedRose/GuildedRose.csproj => GildedRose/GildedRose.csproj} (74%) rename csharpcore/{GuildedRose => GildedRose}/Item.cs (85%) rename csharpcore/{GuildedRose => GildedRose}/Program.cs (98%) rename csharpcore/{GuildedRoseTests => GildedRoseTests}/ApprovalTest.cs (92%) rename csharpcore/{GuildedRoseTests => GildedRoseTests}/GildedRoseTest.cs (85%) rename csharpcore/{GuildedRoseTests/GuildedRoseTests.csproj => GildedRoseTests/GildedRoseTests.csproj} (86%) diff --git a/csharpcore/GuildedRose.sln b/csharpcore/GildedRose.sln similarity index 79% rename from csharpcore/GuildedRose.sln rename to csharpcore/GildedRose.sln index 3468c12b..a922b9a1 100644 --- a/csharpcore/GuildedRose.sln +++ b/csharpcore/GildedRose.sln @@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.31424.327 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GuildedRose", "GuildedRose\GuildedRose.csproj", "{D781C52B-92C0-48BF-8414-177495DF4174}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GildedRose", "GildedRose\GildedRose.csproj", "{D781C52B-92C0-48BF-8414-177495DF4174}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GuildedRoseTests", "GuildedRoseTests\GuildedRoseTests.csproj", "{CB6715CE-A283-4C70-9C1B-F58822077731}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GildedRoseTests", "GildedRoseTests\GildedRoseTests.csproj", "{CB6715CE-A283-4C70-9C1B-F58822077731}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/csharpcore/GuildedRose/GildedRose.cs b/csharpcore/GildedRose/GildedRose.cs similarity index 99% rename from csharpcore/GuildedRose/GildedRose.cs rename to csharpcore/GildedRose/GildedRose.cs index 3b386391..ed7dc428 100644 --- a/csharpcore/GuildedRose/GildedRose.cs +++ b/csharpcore/GildedRose/GildedRose.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace GuildedRose +namespace GildedRoseKata { public class GildedRose { diff --git a/csharpcore/GuildedRose/GuildedRose.csproj b/csharpcore/GildedRose/GildedRose.csproj similarity index 74% rename from csharpcore/GuildedRose/GuildedRose.csproj rename to csharpcore/GildedRose/GildedRose.csproj index af859afe..89266e99 100644 --- a/csharpcore/GuildedRose/GuildedRose.csproj +++ b/csharpcore/GildedRose/GildedRose.csproj @@ -3,7 +3,7 @@ Exe netcoreapp3.1 - GuildedRose.Program + GildedRoseKata.Program diff --git a/csharpcore/GuildedRose/Item.cs b/csharpcore/GildedRose/Item.cs similarity index 85% rename from csharpcore/GuildedRose/Item.cs rename to csharpcore/GildedRose/Item.cs index ee0972f3..3d87cab4 100644 --- a/csharpcore/GuildedRose/Item.cs +++ b/csharpcore/GildedRose/Item.cs @@ -1,4 +1,4 @@ -namespace GuildedRose +namespace GildedRoseKata { public class Item { diff --git a/csharpcore/GuildedRose/Program.cs b/csharpcore/GildedRose/Program.cs similarity index 98% rename from csharpcore/GuildedRose/Program.cs rename to csharpcore/GildedRose/Program.cs index 08cc3b79..1367fe73 100644 --- a/csharpcore/GuildedRose/Program.cs +++ b/csharpcore/GildedRose/Program.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace GuildedRose +namespace GildedRoseKata { public class Program { diff --git a/csharpcore/GuildedRoseTests/ApprovalTest.cs b/csharpcore/GildedRoseTests/ApprovalTest.cs similarity index 92% rename from csharpcore/GuildedRoseTests/ApprovalTest.cs rename to csharpcore/GildedRoseTests/ApprovalTest.cs index 0ff3c994..178e66a7 100644 --- a/csharpcore/GuildedRoseTests/ApprovalTest.cs +++ b/csharpcore/GildedRoseTests/ApprovalTest.cs @@ -4,9 +4,9 @@ using System.IO; using System.Text; using ApprovalTests; using ApprovalTests.Reporters; -using GuildedRose; - -namespace GuildedRoseTests +using GildedRoseKata; + +namespace GildedRoseTests { [UseReporter(typeof(DiffReporter))] public class ApprovalTest diff --git a/csharpcore/GuildedRoseTests/GildedRoseTest.cs b/csharpcore/GildedRoseTests/GildedRoseTest.cs similarity index 85% rename from csharpcore/GuildedRoseTests/GildedRoseTest.cs rename to csharpcore/GildedRoseTests/GildedRoseTest.cs index 5134a2a5..6e5d24b6 100644 --- a/csharpcore/GuildedRoseTests/GildedRoseTest.cs +++ b/csharpcore/GildedRoseTests/GildedRoseTest.cs @@ -1,8 +1,8 @@ using Xunit; using System.Collections.Generic; -using GuildedRose; +using GildedRoseKata; -namespace GuildedRoseTests +namespace GildedRoseTests { public class GildedRoseTest { diff --git a/csharpcore/GuildedRoseTests/GuildedRoseTests.csproj b/csharpcore/GildedRoseTests/GildedRoseTests.csproj similarity index 86% rename from csharpcore/GuildedRoseTests/GuildedRoseTests.csproj rename to csharpcore/GildedRoseTests/GildedRoseTests.csproj index 02c2759e..3991f8c9 100644 --- a/csharpcore/GuildedRoseTests/GuildedRoseTests.csproj +++ b/csharpcore/GildedRoseTests/GildedRoseTests.csproj @@ -14,7 +14,7 @@ - +