From b6373c2525e43ca448e33c4de48872e554a43d40 Mon Sep 17 00:00:00 2001 From: Zev Spitz Date: Mon, 17 Jan 2022 03:13:27 +0200 Subject: [PATCH 01/29] Rename AceyDucey; fix folder structure --- 00_Utilities/DotnetUtils/DotnetUtils/Program.cs | 1 - 01_Acey_Ducey/vbnet/{AceyDucy.sln => AceyDucey.sln} | 10 +++++----- .../{AceyDucy/AceyDucy.vbproj => AceyDucey.vbproj} | 3 ++- 01_Acey_Ducey/vbnet/{AceyDucy => }/Program.vb | 0 4 files changed, 7 insertions(+), 7 deletions(-) rename 01_Acey_Ducey/vbnet/{AceyDucy.sln => AceyDucey.sln} (64%) rename 01_Acey_Ducey/vbnet/{AceyDucy/AceyDucy.vbproj => AceyDucey.vbproj} (66%) rename 01_Acey_Ducey/vbnet/{AceyDucy => }/Program.vb (100%) diff --git a/00_Utilities/DotnetUtils/DotnetUtils/Program.cs b/00_Utilities/DotnetUtils/DotnetUtils/Program.cs index ab59bd9e..7f350f55 100644 --- a/00_Utilities/DotnetUtils/DotnetUtils/Program.cs +++ b/00_Utilities/DotnetUtils/DotnetUtils/Program.cs @@ -221,7 +221,6 @@ void checkProjects() { } } -// TODO make this run on a single project void printProjectWarnings(PortInfo info) { foreach (var proj in info.Projs) { var warnings = new List(); diff --git a/01_Acey_Ducey/vbnet/AceyDucy.sln b/01_Acey_Ducey/vbnet/AceyDucey.sln similarity index 64% rename from 01_Acey_Ducey/vbnet/AceyDucy.sln rename to 01_Acey_Ducey/vbnet/AceyDucey.sln index 881d7c9c..1c5cafb6 100644 --- a/01_Acey_Ducey/vbnet/AceyDucy.sln +++ b/01_Acey_Ducey/vbnet/AceyDucey.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.0.31903.59 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "AceyDucy", "AceyDucy\AceyDucy.vbproj", "{37496710-B458-4502-ADCB-4C57203866F9}" +Project("{778DAE3C-4631-46EA-AA77-85C1314464D9}") = "AceyDucey", "AceyDucey.vbproj", "{54C05475-238D-4A82-A67B-B6C1BF2CA337}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -11,10 +11,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {37496710-B458-4502-ADCB-4C57203866F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {37496710-B458-4502-ADCB-4C57203866F9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {37496710-B458-4502-ADCB-4C57203866F9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {37496710-B458-4502-ADCB-4C57203866F9}.Release|Any CPU.Build.0 = Release|Any CPU + {54C05475-238D-4A82-A67B-B6C1BF2CA337}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {54C05475-238D-4A82-A67B-B6C1BF2CA337}.Debug|Any CPU.Build.0 = Debug|Any CPU + {54C05475-238D-4A82-A67B-B6C1BF2CA337}.Release|Any CPU.ActiveCfg = Release|Any CPU + {54C05475-238D-4A82-A67B-B6C1BF2CA337}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/01_Acey_Ducey/vbnet/AceyDucy/AceyDucy.vbproj b/01_Acey_Ducey/vbnet/AceyDucey.vbproj similarity index 66% rename from 01_Acey_Ducey/vbnet/AceyDucy/AceyDucy.vbproj rename to 01_Acey_Ducey/vbnet/AceyDucey.vbproj index 98a07001..88e8cd5e 100644 --- a/01_Acey_Ducey/vbnet/AceyDucy/AceyDucy.vbproj +++ b/01_Acey_Ducey/vbnet/AceyDucey.vbproj @@ -2,8 +2,9 @@ Exe - AceyDucy + AceyDucey net6.0 + 16.9 diff --git a/01_Acey_Ducey/vbnet/AceyDucy/Program.vb b/01_Acey_Ducey/vbnet/Program.vb similarity index 100% rename from 01_Acey_Ducey/vbnet/AceyDucy/Program.vb rename to 01_Acey_Ducey/vbnet/Program.vb From 6172d6f6485c252153f2d4e61ed478dba38ae7eb Mon Sep 17 00:00:00 2001 From: Zev Spitz Date: Mon, 17 Jan 2022 08:16:42 +0200 Subject: [PATCH 02/29] Simplify Chemist (C#) folder structure --- 24_Chemist/csharp/{Chemist/Chemist => }/Chemist.csproj | 0 24_Chemist/csharp/{Chemist => }/Chemist.sln | 10 +++++----- 24_Chemist/csharp/{Chemist/Chemist => }/Program.cs | 0 3 files changed, 5 insertions(+), 5 deletions(-) rename 24_Chemist/csharp/{Chemist/Chemist => }/Chemist.csproj (100%) rename 24_Chemist/csharp/{Chemist => }/Chemist.sln (64%) rename 24_Chemist/csharp/{Chemist/Chemist => }/Program.cs (100%) diff --git a/24_Chemist/csharp/Chemist/Chemist/Chemist.csproj b/24_Chemist/csharp/Chemist.csproj similarity index 100% rename from 24_Chemist/csharp/Chemist/Chemist/Chemist.csproj rename to 24_Chemist/csharp/Chemist.csproj diff --git a/24_Chemist/csharp/Chemist/Chemist.sln b/24_Chemist/csharp/Chemist.sln similarity index 64% rename from 24_Chemist/csharp/Chemist/Chemist.sln rename to 24_Chemist/csharp/Chemist.sln index 6dc7bfa2..bac78435 100644 --- a/24_Chemist/csharp/Chemist/Chemist.sln +++ b/24_Chemist/csharp/Chemist.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.31005.135 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Chemist", "Chemist\Chemist.csproj", "{8CC70F80-F2D6-47B6-8976-079352AC6C85}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Chemist", "Chemist.csproj", "{C16545E8-E078-4C69-B7CA-9D821C944252}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -11,10 +11,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {8CC70F80-F2D6-47B6-8976-079352AC6C85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8CC70F80-F2D6-47B6-8976-079352AC6C85}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8CC70F80-F2D6-47B6-8976-079352AC6C85}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8CC70F80-F2D6-47B6-8976-079352AC6C85}.Release|Any CPU.Build.0 = Release|Any CPU + {C16545E8-E078-4C69-B7CA-9D821C944252}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C16545E8-E078-4C69-B7CA-9D821C944252}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C16545E8-E078-4C69-B7CA-9D821C944252}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C16545E8-E078-4C69-B7CA-9D821C944252}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/24_Chemist/csharp/Chemist/Chemist/Program.cs b/24_Chemist/csharp/Program.cs similarity index 100% rename from 24_Chemist/csharp/Chemist/Chemist/Program.cs rename to 24_Chemist/csharp/Program.cs From d4fac2463e8a43a6af30016ba3ae177831328e20 Mon Sep 17 00:00:00 2001 From: Zev Spitz Date: Mon, 17 Jan 2022 08:19:24 +0200 Subject: [PATCH 03/29] Simplify CivilWar (C#) folder structure --- 27_Civil_War/csharp/{CivilWar/CivilWar => }/Army.cs | 0 27_Civil_War/csharp/{CivilWar/CivilWar => }/Battle.cs | 0 .../csharp/{CivilWar/CivilWar => }/CivilWar.csproj | 0 27_Civil_War/csharp/{CivilWar => }/CivilWar.sln | 10 +++++----- .../csharp/{CivilWar/CivilWar => }/ConsoleUtils.cs | 0 .../csharp/{CivilWar/CivilWar => }/GameOptions.cs | 0 27_Civil_War/csharp/{CivilWar/CivilWar => }/Program.cs | 0 7 files changed, 5 insertions(+), 5 deletions(-) rename 27_Civil_War/csharp/{CivilWar/CivilWar => }/Army.cs (100%) rename 27_Civil_War/csharp/{CivilWar/CivilWar => }/Battle.cs (100%) rename 27_Civil_War/csharp/{CivilWar/CivilWar => }/CivilWar.csproj (100%) rename 27_Civil_War/csharp/{CivilWar => }/CivilWar.sln (64%) rename 27_Civil_War/csharp/{CivilWar/CivilWar => }/ConsoleUtils.cs (100%) rename 27_Civil_War/csharp/{CivilWar/CivilWar => }/GameOptions.cs (100%) rename 27_Civil_War/csharp/{CivilWar/CivilWar => }/Program.cs (100%) diff --git a/27_Civil_War/csharp/CivilWar/CivilWar/Army.cs b/27_Civil_War/csharp/Army.cs similarity index 100% rename from 27_Civil_War/csharp/CivilWar/CivilWar/Army.cs rename to 27_Civil_War/csharp/Army.cs diff --git a/27_Civil_War/csharp/CivilWar/CivilWar/Battle.cs b/27_Civil_War/csharp/Battle.cs similarity index 100% rename from 27_Civil_War/csharp/CivilWar/CivilWar/Battle.cs rename to 27_Civil_War/csharp/Battle.cs diff --git a/27_Civil_War/csharp/CivilWar/CivilWar/CivilWar.csproj b/27_Civil_War/csharp/CivilWar.csproj similarity index 100% rename from 27_Civil_War/csharp/CivilWar/CivilWar/CivilWar.csproj rename to 27_Civil_War/csharp/CivilWar.csproj diff --git a/27_Civil_War/csharp/CivilWar/CivilWar.sln b/27_Civil_War/csharp/CivilWar.sln similarity index 64% rename from 27_Civil_War/csharp/CivilWar/CivilWar.sln rename to 27_Civil_War/csharp/CivilWar.sln index 17da385e..d013f7ed 100644 --- a/27_Civil_War/csharp/CivilWar/CivilWar.sln +++ b/27_Civil_War/csharp/CivilWar.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.31005.135 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CivilWar", "CivilWar\CivilWar.csproj", "{09C22BBE-8480-4B8C-9A07-E2DAA24B692B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CivilWar", "CivilWar.csproj", "{4EE5EFE7-2D60-464A-9F8D-4BBD2A14AAC7}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -11,10 +11,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {09C22BBE-8480-4B8C-9A07-E2DAA24B692B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {09C22BBE-8480-4B8C-9A07-E2DAA24B692B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {09C22BBE-8480-4B8C-9A07-E2DAA24B692B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {09C22BBE-8480-4B8C-9A07-E2DAA24B692B}.Release|Any CPU.Build.0 = Release|Any CPU + {4EE5EFE7-2D60-464A-9F8D-4BBD2A14AAC7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4EE5EFE7-2D60-464A-9F8D-4BBD2A14AAC7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4EE5EFE7-2D60-464A-9F8D-4BBD2A14AAC7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4EE5EFE7-2D60-464A-9F8D-4BBD2A14AAC7}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/27_Civil_War/csharp/CivilWar/CivilWar/ConsoleUtils.cs b/27_Civil_War/csharp/ConsoleUtils.cs similarity index 100% rename from 27_Civil_War/csharp/CivilWar/CivilWar/ConsoleUtils.cs rename to 27_Civil_War/csharp/ConsoleUtils.cs diff --git a/27_Civil_War/csharp/CivilWar/CivilWar/GameOptions.cs b/27_Civil_War/csharp/GameOptions.cs similarity index 100% rename from 27_Civil_War/csharp/CivilWar/CivilWar/GameOptions.cs rename to 27_Civil_War/csharp/GameOptions.cs diff --git a/27_Civil_War/csharp/CivilWar/CivilWar/Program.cs b/27_Civil_War/csharp/Program.cs similarity index 100% rename from 27_Civil_War/csharp/CivilWar/CivilWar/Program.cs rename to 27_Civil_War/csharp/Program.cs From 7e480f946194e0ee69cfbf9d63e07542b2dc7e0a Mon Sep 17 00:00:00 2001 From: Zev Spitz Date: Mon, 17 Jan 2022 08:24:39 +0200 Subject: [PATCH 04/29] Simplify Craps (C#) folder structure --- 29_Craps/csharp/{Craps => }/.gitignore | 0 29_Craps/csharp/{Craps => }/Craps.sln | 0 29_Craps/csharp/Craps/{Craps => }/Craps.csproj | 0 29_Craps/csharp/Craps/{Craps => }/CrapsGame.cs | 0 29_Craps/csharp/Craps/{Craps => }/Dice.cs | 0 29_Craps/csharp/Craps/{Craps => }/Program.cs | 0 29_Craps/csharp/Craps/{Craps => }/UserInterface.cs | 0 29_Craps/csharp/{Craps => }/CrapsTester/CrapsTester.csproj | 0 29_Craps/csharp/{Craps => }/CrapsTester/CrapsTests.cs | 0 9 files changed, 0 insertions(+), 0 deletions(-) rename 29_Craps/csharp/{Craps => }/.gitignore (100%) rename 29_Craps/csharp/{Craps => }/Craps.sln (100%) rename 29_Craps/csharp/Craps/{Craps => }/Craps.csproj (100%) rename 29_Craps/csharp/Craps/{Craps => }/CrapsGame.cs (100%) rename 29_Craps/csharp/Craps/{Craps => }/Dice.cs (100%) rename 29_Craps/csharp/Craps/{Craps => }/Program.cs (100%) rename 29_Craps/csharp/Craps/{Craps => }/UserInterface.cs (100%) rename 29_Craps/csharp/{Craps => }/CrapsTester/CrapsTester.csproj (100%) rename 29_Craps/csharp/{Craps => }/CrapsTester/CrapsTests.cs (100%) diff --git a/29_Craps/csharp/Craps/.gitignore b/29_Craps/csharp/.gitignore similarity index 100% rename from 29_Craps/csharp/Craps/.gitignore rename to 29_Craps/csharp/.gitignore diff --git a/29_Craps/csharp/Craps/Craps.sln b/29_Craps/csharp/Craps.sln similarity index 100% rename from 29_Craps/csharp/Craps/Craps.sln rename to 29_Craps/csharp/Craps.sln diff --git a/29_Craps/csharp/Craps/Craps/Craps.csproj b/29_Craps/csharp/Craps/Craps.csproj similarity index 100% rename from 29_Craps/csharp/Craps/Craps/Craps.csproj rename to 29_Craps/csharp/Craps/Craps.csproj diff --git a/29_Craps/csharp/Craps/Craps/CrapsGame.cs b/29_Craps/csharp/Craps/CrapsGame.cs similarity index 100% rename from 29_Craps/csharp/Craps/Craps/CrapsGame.cs rename to 29_Craps/csharp/Craps/CrapsGame.cs diff --git a/29_Craps/csharp/Craps/Craps/Dice.cs b/29_Craps/csharp/Craps/Dice.cs similarity index 100% rename from 29_Craps/csharp/Craps/Craps/Dice.cs rename to 29_Craps/csharp/Craps/Dice.cs diff --git a/29_Craps/csharp/Craps/Craps/Program.cs b/29_Craps/csharp/Craps/Program.cs similarity index 100% rename from 29_Craps/csharp/Craps/Craps/Program.cs rename to 29_Craps/csharp/Craps/Program.cs diff --git a/29_Craps/csharp/Craps/Craps/UserInterface.cs b/29_Craps/csharp/Craps/UserInterface.cs similarity index 100% rename from 29_Craps/csharp/Craps/Craps/UserInterface.cs rename to 29_Craps/csharp/Craps/UserInterface.cs diff --git a/29_Craps/csharp/Craps/CrapsTester/CrapsTester.csproj b/29_Craps/csharp/CrapsTester/CrapsTester.csproj similarity index 100% rename from 29_Craps/csharp/Craps/CrapsTester/CrapsTester.csproj rename to 29_Craps/csharp/CrapsTester/CrapsTester.csproj diff --git a/29_Craps/csharp/Craps/CrapsTester/CrapsTests.cs b/29_Craps/csharp/CrapsTester/CrapsTests.cs similarity index 100% rename from 29_Craps/csharp/Craps/CrapsTester/CrapsTests.cs rename to 29_Craps/csharp/CrapsTester/CrapsTests.cs From 516c8dbc34347c88580ab3a34f8178a7d3ebf036 Mon Sep 17 00:00:00 2001 From: Zev Spitz Date: Mon, 17 Jan 2022 08:28:25 +0200 Subject: [PATCH 05/29] Simplify Hangman folder structure --- 44_Hangman/csharp/{Hangman => }/Graphic.cs | 0 44_Hangman/csharp/{Hangman => }/Hangman.csproj | 0 44_Hangman/csharp/{Hangman => }/Hangman.sln | 0 44_Hangman/csharp/{Hangman => }/Program.cs | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename 44_Hangman/csharp/{Hangman => }/Graphic.cs (100%) rename 44_Hangman/csharp/{Hangman => }/Hangman.csproj (100%) rename 44_Hangman/csharp/{Hangman => }/Hangman.sln (100%) rename 44_Hangman/csharp/{Hangman => }/Program.cs (100%) diff --git a/44_Hangman/csharp/Hangman/Graphic.cs b/44_Hangman/csharp/Graphic.cs similarity index 100% rename from 44_Hangman/csharp/Hangman/Graphic.cs rename to 44_Hangman/csharp/Graphic.cs diff --git a/44_Hangman/csharp/Hangman/Hangman.csproj b/44_Hangman/csharp/Hangman.csproj similarity index 100% rename from 44_Hangman/csharp/Hangman/Hangman.csproj rename to 44_Hangman/csharp/Hangman.csproj diff --git a/44_Hangman/csharp/Hangman/Hangman.sln b/44_Hangman/csharp/Hangman.sln similarity index 100% rename from 44_Hangman/csharp/Hangman/Hangman.sln rename to 44_Hangman/csharp/Hangman.sln diff --git a/44_Hangman/csharp/Hangman/Program.cs b/44_Hangman/csharp/Program.cs similarity index 100% rename from 44_Hangman/csharp/Hangman/Program.cs rename to 44_Hangman/csharp/Program.cs From 83c053fbd1024bfc0488da13471acf0c89d13d5a Mon Sep 17 00:00:00 2001 From: Zev Spitz Date: Mon, 17 Jan 2022 08:31:36 +0200 Subject: [PATCH 06/29] Simplify Pizza (C#) folder structure --- 69_Pizza/csharp/{Pizza => }/CustomerMap.cs | 0 69_Pizza/csharp/{Pizza => }/Pizza.csproj | 0 69_Pizza/csharp/{Pizza => }/Pizza.sln | 0 69_Pizza/csharp/{Pizza => }/PizzaGame.cs | 0 69_Pizza/csharp/{Pizza => }/Program.cs | 0 69_Pizza/csharp/{Pizza => }/StringBuilderExtensions.cs | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename 69_Pizza/csharp/{Pizza => }/CustomerMap.cs (100%) rename 69_Pizza/csharp/{Pizza => }/Pizza.csproj (100%) rename 69_Pizza/csharp/{Pizza => }/Pizza.sln (100%) rename 69_Pizza/csharp/{Pizza => }/PizzaGame.cs (100%) rename 69_Pizza/csharp/{Pizza => }/Program.cs (100%) rename 69_Pizza/csharp/{Pizza => }/StringBuilderExtensions.cs (100%) diff --git a/69_Pizza/csharp/Pizza/CustomerMap.cs b/69_Pizza/csharp/CustomerMap.cs similarity index 100% rename from 69_Pizza/csharp/Pizza/CustomerMap.cs rename to 69_Pizza/csharp/CustomerMap.cs diff --git a/69_Pizza/csharp/Pizza/Pizza.csproj b/69_Pizza/csharp/Pizza.csproj similarity index 100% rename from 69_Pizza/csharp/Pizza/Pizza.csproj rename to 69_Pizza/csharp/Pizza.csproj diff --git a/69_Pizza/csharp/Pizza/Pizza.sln b/69_Pizza/csharp/Pizza.sln similarity index 100% rename from 69_Pizza/csharp/Pizza/Pizza.sln rename to 69_Pizza/csharp/Pizza.sln diff --git a/69_Pizza/csharp/Pizza/PizzaGame.cs b/69_Pizza/csharp/PizzaGame.cs similarity index 100% rename from 69_Pizza/csharp/Pizza/PizzaGame.cs rename to 69_Pizza/csharp/PizzaGame.cs diff --git a/69_Pizza/csharp/Pizza/Program.cs b/69_Pizza/csharp/Program.cs similarity index 100% rename from 69_Pizza/csharp/Pizza/Program.cs rename to 69_Pizza/csharp/Program.cs diff --git a/69_Pizza/csharp/Pizza/StringBuilderExtensions.cs b/69_Pizza/csharp/StringBuilderExtensions.cs similarity index 100% rename from 69_Pizza/csharp/Pizza/StringBuilderExtensions.cs rename to 69_Pizza/csharp/StringBuilderExtensions.cs From 2028e9576456e4e6ae8bfb13b6be4a8ae1bc83f2 Mon Sep 17 00:00:00 2001 From: Zev Spitz Date: Mon, 17 Jan 2022 08:34:09 +0200 Subject: [PATCH 07/29] Simplify Reverse (C#) folder structure --- .../Reverse.Tests/Generators/PositiveIntegerGenerator.cs | 0 .../csharp/{Reverse => }/Reverse.Tests/Reverse.Tests.csproj | 0 73_Reverse/csharp/{Reverse => }/Reverse.Tests/ReverserTests.cs | 0 73_Reverse/csharp/{Reverse => }/Reverse.Tests/TestReverser.cs | 0 73_Reverse/csharp/{Reverse => }/Reverse.sln | 0 73_Reverse/csharp/Reverse/{Reverse => }/Program.cs | 0 73_Reverse/csharp/Reverse/{Reverse => }/Reverse.csproj | 0 73_Reverse/csharp/Reverse/{Reverse => }/Reverser.cs | 0 8 files changed, 0 insertions(+), 0 deletions(-) rename 73_Reverse/csharp/{Reverse => }/Reverse.Tests/Generators/PositiveIntegerGenerator.cs (100%) rename 73_Reverse/csharp/{Reverse => }/Reverse.Tests/Reverse.Tests.csproj (100%) rename 73_Reverse/csharp/{Reverse => }/Reverse.Tests/ReverserTests.cs (100%) rename 73_Reverse/csharp/{Reverse => }/Reverse.Tests/TestReverser.cs (100%) rename 73_Reverse/csharp/{Reverse => }/Reverse.sln (100%) rename 73_Reverse/csharp/Reverse/{Reverse => }/Program.cs (100%) rename 73_Reverse/csharp/Reverse/{Reverse => }/Reverse.csproj (100%) rename 73_Reverse/csharp/Reverse/{Reverse => }/Reverser.cs (100%) diff --git a/73_Reverse/csharp/Reverse/Reverse.Tests/Generators/PositiveIntegerGenerator.cs b/73_Reverse/csharp/Reverse.Tests/Generators/PositiveIntegerGenerator.cs similarity index 100% rename from 73_Reverse/csharp/Reverse/Reverse.Tests/Generators/PositiveIntegerGenerator.cs rename to 73_Reverse/csharp/Reverse.Tests/Generators/PositiveIntegerGenerator.cs diff --git a/73_Reverse/csharp/Reverse/Reverse.Tests/Reverse.Tests.csproj b/73_Reverse/csharp/Reverse.Tests/Reverse.Tests.csproj similarity index 100% rename from 73_Reverse/csharp/Reverse/Reverse.Tests/Reverse.Tests.csproj rename to 73_Reverse/csharp/Reverse.Tests/Reverse.Tests.csproj diff --git a/73_Reverse/csharp/Reverse/Reverse.Tests/ReverserTests.cs b/73_Reverse/csharp/Reverse.Tests/ReverserTests.cs similarity index 100% rename from 73_Reverse/csharp/Reverse/Reverse.Tests/ReverserTests.cs rename to 73_Reverse/csharp/Reverse.Tests/ReverserTests.cs diff --git a/73_Reverse/csharp/Reverse/Reverse.Tests/TestReverser.cs b/73_Reverse/csharp/Reverse.Tests/TestReverser.cs similarity index 100% rename from 73_Reverse/csharp/Reverse/Reverse.Tests/TestReverser.cs rename to 73_Reverse/csharp/Reverse.Tests/TestReverser.cs diff --git a/73_Reverse/csharp/Reverse/Reverse.sln b/73_Reverse/csharp/Reverse.sln similarity index 100% rename from 73_Reverse/csharp/Reverse/Reverse.sln rename to 73_Reverse/csharp/Reverse.sln diff --git a/73_Reverse/csharp/Reverse/Reverse/Program.cs b/73_Reverse/csharp/Reverse/Program.cs similarity index 100% rename from 73_Reverse/csharp/Reverse/Reverse/Program.cs rename to 73_Reverse/csharp/Reverse/Program.cs diff --git a/73_Reverse/csharp/Reverse/Reverse/Reverse.csproj b/73_Reverse/csharp/Reverse/Reverse.csproj similarity index 100% rename from 73_Reverse/csharp/Reverse/Reverse/Reverse.csproj rename to 73_Reverse/csharp/Reverse/Reverse.csproj diff --git a/73_Reverse/csharp/Reverse/Reverse/Reverser.cs b/73_Reverse/csharp/Reverse/Reverser.cs similarity index 100% rename from 73_Reverse/csharp/Reverse/Reverse/Reverser.cs rename to 73_Reverse/csharp/Reverse/Reverser.cs From d901e48f248e01882f53c1bb97ef50f25aec9864 Mon Sep 17 00:00:00 2001 From: Zev Spitz Date: Mon, 17 Jan 2022 08:35:11 +0200 Subject: [PATCH 08/29] Simplify RussianRoulette (C#) folder structure --- 76_Russian_Roulette/csharp/{RussianRoulette => }/Program.cs | 0 .../csharp/{RussianRoulette => }/RussianRoulette.csproj | 0 .../csharp/{RussianRoulette => }/RussianRoulette.sln | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename 76_Russian_Roulette/csharp/{RussianRoulette => }/Program.cs (100%) rename 76_Russian_Roulette/csharp/{RussianRoulette => }/RussianRoulette.csproj (100%) rename 76_Russian_Roulette/csharp/{RussianRoulette => }/RussianRoulette.sln (100%) diff --git a/76_Russian_Roulette/csharp/RussianRoulette/Program.cs b/76_Russian_Roulette/csharp/Program.cs similarity index 100% rename from 76_Russian_Roulette/csharp/RussianRoulette/Program.cs rename to 76_Russian_Roulette/csharp/Program.cs diff --git a/76_Russian_Roulette/csharp/RussianRoulette/RussianRoulette.csproj b/76_Russian_Roulette/csharp/RussianRoulette.csproj similarity index 100% rename from 76_Russian_Roulette/csharp/RussianRoulette/RussianRoulette.csproj rename to 76_Russian_Roulette/csharp/RussianRoulette.csproj diff --git a/76_Russian_Roulette/csharp/RussianRoulette/RussianRoulette.sln b/76_Russian_Roulette/csharp/RussianRoulette.sln similarity index 100% rename from 76_Russian_Roulette/csharp/RussianRoulette/RussianRoulette.sln rename to 76_Russian_Roulette/csharp/RussianRoulette.sln From 79c04373f4d94939757ec2a98be3f1f84fa0b32c Mon Sep 17 00:00:00 2001 From: Zev Spitz Date: Mon, 17 Jan 2022 08:37:17 +0200 Subject: [PATCH 09/29] Simplfy SineWave (C#) folder structure --- 78_Sine_Wave/csharp/{SineWave/SineWave => }/Program.cs | 0 .../csharp/{SineWave/SineWave => }/SineWave.csproj | 0 78_Sine_Wave/csharp/{SineWave => }/SineWave.sln | 10 +++++----- 3 files changed, 5 insertions(+), 5 deletions(-) rename 78_Sine_Wave/csharp/{SineWave/SineWave => }/Program.cs (100%) rename 78_Sine_Wave/csharp/{SineWave/SineWave => }/SineWave.csproj (100%) rename 78_Sine_Wave/csharp/{SineWave => }/SineWave.sln (64%) diff --git a/78_Sine_Wave/csharp/SineWave/SineWave/Program.cs b/78_Sine_Wave/csharp/Program.cs similarity index 100% rename from 78_Sine_Wave/csharp/SineWave/SineWave/Program.cs rename to 78_Sine_Wave/csharp/Program.cs diff --git a/78_Sine_Wave/csharp/SineWave/SineWave/SineWave.csproj b/78_Sine_Wave/csharp/SineWave.csproj similarity index 100% rename from 78_Sine_Wave/csharp/SineWave/SineWave/SineWave.csproj rename to 78_Sine_Wave/csharp/SineWave.csproj diff --git a/78_Sine_Wave/csharp/SineWave/SineWave.sln b/78_Sine_Wave/csharp/SineWave.sln similarity index 64% rename from 78_Sine_Wave/csharp/SineWave/SineWave.sln rename to 78_Sine_Wave/csharp/SineWave.sln index f32a06cd..adcc993f 100644 --- a/78_Sine_Wave/csharp/SineWave/SineWave.sln +++ b/78_Sine_Wave/csharp/SineWave.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.31005.135 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SineWave", "SineWave\SineWave.csproj", "{B316DD7F-5755-4216-AFDC-D83720F8ACA2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SineWave", "SineWave.csproj", "{730FA2CC-5AA5-4BE2-8DF9-8E55FDC8FB30}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -11,10 +11,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B316DD7F-5755-4216-AFDC-D83720F8ACA2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B316DD7F-5755-4216-AFDC-D83720F8ACA2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B316DD7F-5755-4216-AFDC-D83720F8ACA2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B316DD7F-5755-4216-AFDC-D83720F8ACA2}.Release|Any CPU.Build.0 = Release|Any CPU + {730FA2CC-5AA5-4BE2-8DF9-8E55FDC8FB30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {730FA2CC-5AA5-4BE2-8DF9-8E55FDC8FB30}.Debug|Any CPU.Build.0 = Debug|Any CPU + {730FA2CC-5AA5-4BE2-8DF9-8E55FDC8FB30}.Release|Any CPU.ActiveCfg = Release|Any CPU + {730FA2CC-5AA5-4BE2-8DF9-8E55FDC8FB30}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From 9deb45db960f002aa6021bd6d19dc97b69bbc40f Mon Sep 17 00:00:00 2001 From: Zev Spitz Date: Mon, 17 Jan 2022 08:44:09 +0200 Subject: [PATCH 10/29] Simplify Train (C#) folder structure --- 91_Train/csharp/{Train => }/Train.sln | 12 ++++++------ 91_Train/csharp/Train/{Train => }/TrainGame.cs | 0 91_Train/csharp/Train/{Train => }/TrainGame.csproj | 0 .../TrainTests/{TrainTests => }/TrainGameTests.cs | 0 .../TrainTests/{TrainTests => }/TrainTests.csproj | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) rename 91_Train/csharp/{Train => }/Train.sln (70%) rename 91_Train/csharp/Train/{Train => }/TrainGame.cs (100%) rename 91_Train/csharp/Train/{Train => }/TrainGame.csproj (100%) rename 91_Train/csharp/TrainTests/{TrainTests => }/TrainGameTests.cs (100%) rename 91_Train/csharp/TrainTests/{TrainTests => }/TrainTests.csproj (92%) diff --git a/91_Train/csharp/Train/Train.sln b/91_Train/csharp/Train.sln similarity index 70% rename from 91_Train/csharp/Train/Train.sln rename to 91_Train/csharp/Train.sln index 7735a737..29c49c59 100644 --- a/91_Train/csharp/Train/Train.sln +++ b/91_Train/csharp/Train.sln @@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.31129.286 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TrainGame", "Train\TrainGame.csproj", "{42617537-4E7C-4082-A17B-7F18DFA04C35}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TrainGame", "Train\TrainGame.csproj", "{42617537-4E7C-4082-A17B-7F18DFA04C35}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TrainTests", "..\TrainTests\TrainTests\TrainTests.csproj", "{7C740A47-99C6-44E1-BDEE-140086BCFE8B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TrainTests", "TrainTests\TrainTests.csproj", "{B967AA46-78F2-44F8-A30D-85D35F625991}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -17,10 +17,10 @@ Global {42617537-4E7C-4082-A17B-7F18DFA04C35}.Debug|Any CPU.Build.0 = Debug|Any CPU {42617537-4E7C-4082-A17B-7F18DFA04C35}.Release|Any CPU.ActiveCfg = Release|Any CPU {42617537-4E7C-4082-A17B-7F18DFA04C35}.Release|Any CPU.Build.0 = Release|Any CPU - {7C740A47-99C6-44E1-BDEE-140086BCFE8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7C740A47-99C6-44E1-BDEE-140086BCFE8B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7C740A47-99C6-44E1-BDEE-140086BCFE8B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7C740A47-99C6-44E1-BDEE-140086BCFE8B}.Release|Any CPU.Build.0 = Release|Any CPU + {B967AA46-78F2-44F8-A30D-85D35F625991}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B967AA46-78F2-44F8-A30D-85D35F625991}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B967AA46-78F2-44F8-A30D-85D35F625991}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B967AA46-78F2-44F8-A30D-85D35F625991}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/91_Train/csharp/Train/Train/TrainGame.cs b/91_Train/csharp/Train/TrainGame.cs similarity index 100% rename from 91_Train/csharp/Train/Train/TrainGame.cs rename to 91_Train/csharp/Train/TrainGame.cs diff --git a/91_Train/csharp/Train/Train/TrainGame.csproj b/91_Train/csharp/Train/TrainGame.csproj similarity index 100% rename from 91_Train/csharp/Train/Train/TrainGame.csproj rename to 91_Train/csharp/Train/TrainGame.csproj diff --git a/91_Train/csharp/TrainTests/TrainTests/TrainGameTests.cs b/91_Train/csharp/TrainTests/TrainGameTests.cs similarity index 100% rename from 91_Train/csharp/TrainTests/TrainTests/TrainGameTests.cs rename to 91_Train/csharp/TrainTests/TrainGameTests.cs diff --git a/91_Train/csharp/TrainTests/TrainTests/TrainTests.csproj b/91_Train/csharp/TrainTests/TrainTests.csproj similarity index 92% rename from 91_Train/csharp/TrainTests/TrainTests/TrainTests.csproj rename to 91_Train/csharp/TrainTests/TrainTests.csproj index a8de6dde..fb6ab9fb 100644 --- a/91_Train/csharp/TrainTests/TrainTests/TrainTests.csproj +++ b/91_Train/csharp/TrainTests/TrainTests.csproj @@ -20,7 +20,7 @@ - + From 59c8666c7a1fb11569249ffde6bbb6302b5ece47 Mon Sep 17 00:00:00 2001 From: Zev Spitz Date: Mon, 17 Jan 2022 08:48:34 +0200 Subject: [PATCH 11/29] Simplify War (C#) folder structure --- 94_War/csharp/{War => }/War.sln | 0 94_War/csharp/War/{War => }/Cards.cs | 0 94_War/csharp/War/{War => }/Program.cs | 0 94_War/csharp/War/{War => }/UserInterface.cs | 0 94_War/csharp/War/{War => }/War.csproj | 0 94_War/csharp/{War => }/WarTester/Tests.cs | 0 94_War/csharp/{War => }/WarTester/WarTester.csproj | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename 94_War/csharp/{War => }/War.sln (100%) rename 94_War/csharp/War/{War => }/Cards.cs (100%) rename 94_War/csharp/War/{War => }/Program.cs (100%) rename 94_War/csharp/War/{War => }/UserInterface.cs (100%) rename 94_War/csharp/War/{War => }/War.csproj (100%) rename 94_War/csharp/{War => }/WarTester/Tests.cs (100%) rename 94_War/csharp/{War => }/WarTester/WarTester.csproj (100%) diff --git a/94_War/csharp/War/War.sln b/94_War/csharp/War.sln similarity index 100% rename from 94_War/csharp/War/War.sln rename to 94_War/csharp/War.sln diff --git a/94_War/csharp/War/War/Cards.cs b/94_War/csharp/War/Cards.cs similarity index 100% rename from 94_War/csharp/War/War/Cards.cs rename to 94_War/csharp/War/Cards.cs diff --git a/94_War/csharp/War/War/Program.cs b/94_War/csharp/War/Program.cs similarity index 100% rename from 94_War/csharp/War/War/Program.cs rename to 94_War/csharp/War/Program.cs diff --git a/94_War/csharp/War/War/UserInterface.cs b/94_War/csharp/War/UserInterface.cs similarity index 100% rename from 94_War/csharp/War/War/UserInterface.cs rename to 94_War/csharp/War/UserInterface.cs diff --git a/94_War/csharp/War/War/War.csproj b/94_War/csharp/War/War.csproj similarity index 100% rename from 94_War/csharp/War/War/War.csproj rename to 94_War/csharp/War/War.csproj diff --git a/94_War/csharp/War/WarTester/Tests.cs b/94_War/csharp/WarTester/Tests.cs similarity index 100% rename from 94_War/csharp/War/WarTester/Tests.cs rename to 94_War/csharp/WarTester/Tests.cs diff --git a/94_War/csharp/War/WarTester/WarTester.csproj b/94_War/csharp/WarTester/WarTester.csproj similarity index 100% rename from 94_War/csharp/War/WarTester/WarTester.csproj rename to 94_War/csharp/WarTester/WarTester.csproj From ae9a0b1c5ef6c5a5e0a3104aa8899e6c2a3dab4e Mon Sep 17 00:00:00 2001 From: Zev Spitz Date: Mon, 17 Jan 2022 08:59:24 +0200 Subject: [PATCH 12/29] Fix capitalization mismatch --- 00_Utilities/DotnetUtils/DotnetUtils/Program.cs | 2 +- 06_Banner/csharp/banner.sln | 10 +++++----- 06_Banner/vbnet/banner.sln | 10 +++++----- 08_Batnum/vbnet/batnum.sln | 6 +++--- 96_Word/csharp/word.sln | 6 +++--- 96_Word/vbnet/word.sln | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/00_Utilities/DotnetUtils/DotnetUtils/Program.cs b/00_Utilities/DotnetUtils/DotnetUtils/Program.cs index 7f350f55..550250b1 100644 --- a/00_Utilities/DotnetUtils/DotnetUtils/Program.cs +++ b/00_Utilities/DotnetUtils/DotnetUtils/Program.cs @@ -101,7 +101,7 @@ void unexpectedSlnName() { if (!item.Slns.Any()) { continue; } var expectedSlnName = $"{item.GameName}.sln"; - if (item.Slns.Contains(Combine(item.LangPath, expectedSlnName))) { continue; } + if (item.Slns.Contains(Combine(item.LangPath, expectedSlnName), StringComparer.InvariantCultureIgnoreCase)) { continue; } counter += 1; WriteLine(item.LangPath); diff --git a/06_Banner/csharp/banner.sln b/06_Banner/csharp/banner.sln index 34f63984..9beeb9b3 100644 --- a/06_Banner/csharp/banner.sln +++ b/06_Banner/csharp/banner.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.31321.278 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "banner", "banner.csproj", "{9E24FA30-F2AC-4BF3-ADFB-92D3F796561C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Banner", "Banner.csproj", "{7E8612AB-AFFD-4F72-855F-8172786F28FD}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -11,10 +11,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {9E24FA30-F2AC-4BF3-ADFB-92D3F796561C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9E24FA30-F2AC-4BF3-ADFB-92D3F796561C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9E24FA30-F2AC-4BF3-ADFB-92D3F796561C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9E24FA30-F2AC-4BF3-ADFB-92D3F796561C}.Release|Any CPU.Build.0 = Release|Any CPU + {7E8612AB-AFFD-4F72-855F-8172786F28FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7E8612AB-AFFD-4F72-855F-8172786F28FD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7E8612AB-AFFD-4F72-855F-8172786F28FD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7E8612AB-AFFD-4F72-855F-8172786F28FD}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/06_Banner/vbnet/banner.sln b/06_Banner/vbnet/banner.sln index 5fdc8737..8a782a2f 100644 --- a/06_Banner/vbnet/banner.sln +++ b/06_Banner/vbnet/banner.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.31321.278 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "banner", "banner.vbproj", "{1738D297-A04C-4E6E-8219-D9E72982C39D}" +Project("{778DAE3C-4631-46EA-AA77-85C1314464D9}") = "Banner", "Banner.vbproj", "{091ABE13-3E70-4848-B836-592F725915A3}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -11,10 +11,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {1738D297-A04C-4E6E-8219-D9E72982C39D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1738D297-A04C-4E6E-8219-D9E72982C39D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1738D297-A04C-4E6E-8219-D9E72982C39D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1738D297-A04C-4E6E-8219-D9E72982C39D}.Release|Any CPU.Build.0 = Release|Any CPU + {091ABE13-3E70-4848-B836-592F725915A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {091ABE13-3E70-4848-B836-592F725915A3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {091ABE13-3E70-4848-B836-592F725915A3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {091ABE13-3E70-4848-B836-592F725915A3}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/08_Batnum/vbnet/batnum.sln b/08_Batnum/vbnet/batnum.sln index b3f63f59..ca05e41b 100644 --- a/08_Batnum/vbnet/batnum.sln +++ b/08_Batnum/vbnet/batnum.sln @@ -1,9 +1,9 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.31321.278 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32014.148 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "batnum", "batnum.vbproj", "{D577E429-F84D-4E84-86E7-E6526CFD5FD9}" +Project("{778DAE3C-4631-46EA-AA77-85C1314464D9}") = "Batnum", "Batnum.vbproj", "{D577E429-F84D-4E84-86E7-E6526CFD5FD9}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/96_Word/csharp/word.sln b/96_Word/csharp/word.sln index 59bdec97..77360e81 100644 --- a/96_Word/csharp/word.sln +++ b/96_Word/csharp/word.sln @@ -1,9 +1,9 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.31321.278 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32014.148 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "word", "word.csproj", "{E2CF183B-EBC3-497C-8D34-32EBEE4E2B73}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Word", "Word.csproj", "{E2CF183B-EBC3-497C-8D34-32EBEE4E2B73}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/96_Word/vbnet/word.sln b/96_Word/vbnet/word.sln index 16584104..73674ee4 100644 --- a/96_Word/vbnet/word.sln +++ b/96_Word/vbnet/word.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.31321.278 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "word", "word.vbproj", "{F0D2422C-983F-4DF3-9D17-D2480839DF07}" +Project("{778DAE3C-4631-46EA-AA77-85C1314464D9}") = "Word", "Word.vbproj", "{F0D2422C-983F-4DF3-9D17-D2480839DF07}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution From 827f2b0cb3cf75a26bbb76f49af1c491e7b670d9 Mon Sep 17 00:00:00 2001 From: Zev Spitz Date: Mon, 17 Jan 2022 09:07:59 +0200 Subject: [PATCH 13/29] Simplify Bullfight (C#) folder structure --- 17_Bullfight/csharp/{src => }/Action.cs | 0 17_Bullfight/csharp/{src => }/ActionResult.cs | 0 17_Bullfight/csharp/{src => }/BullFight.cs | 0 17_Bullfight/csharp/{Game.csproj => Bullfight.csproj} | 0 17_Bullfight/csharp/Bullfight.sln | 10 +++++----- 17_Bullfight/csharp/{src => }/Controller.cs | 0 17_Bullfight/csharp/{src => }/Events/BullCharging.cs | 0 17_Bullfight/csharp/{src => }/Events/Event.cs | 0 17_Bullfight/csharp/{src => }/Events/MatchCompleted.cs | 0 17_Bullfight/csharp/{src => }/Events/MatchStarted.cs | 0 17_Bullfight/csharp/{src => }/Events/PlayerGored.cs | 0 17_Bullfight/csharp/{src => }/Events/PlayerSurvived.cs | 0 17_Bullfight/csharp/{src => }/Mediator.cs | 0 17_Bullfight/csharp/{src => }/Program.cs | 0 17_Bullfight/csharp/{src => }/Quality.cs | 0 17_Bullfight/csharp/{src => }/Reward.cs | 0 17_Bullfight/csharp/{src => }/RiskLevel.cs | 0 17_Bullfight/csharp/{src => }/View.cs | 0 18 files changed, 5 insertions(+), 5 deletions(-) rename 17_Bullfight/csharp/{src => }/Action.cs (100%) rename 17_Bullfight/csharp/{src => }/ActionResult.cs (100%) rename 17_Bullfight/csharp/{src => }/BullFight.cs (100%) rename 17_Bullfight/csharp/{Game.csproj => Bullfight.csproj} (100%) rename 17_Bullfight/csharp/{src => }/Controller.cs (100%) rename 17_Bullfight/csharp/{src => }/Events/BullCharging.cs (100%) rename 17_Bullfight/csharp/{src => }/Events/Event.cs (100%) rename 17_Bullfight/csharp/{src => }/Events/MatchCompleted.cs (100%) rename 17_Bullfight/csharp/{src => }/Events/MatchStarted.cs (100%) rename 17_Bullfight/csharp/{src => }/Events/PlayerGored.cs (100%) rename 17_Bullfight/csharp/{src => }/Events/PlayerSurvived.cs (100%) rename 17_Bullfight/csharp/{src => }/Mediator.cs (100%) rename 17_Bullfight/csharp/{src => }/Program.cs (100%) rename 17_Bullfight/csharp/{src => }/Quality.cs (100%) rename 17_Bullfight/csharp/{src => }/Reward.cs (100%) rename 17_Bullfight/csharp/{src => }/RiskLevel.cs (100%) rename 17_Bullfight/csharp/{src => }/View.cs (100%) diff --git a/17_Bullfight/csharp/src/Action.cs b/17_Bullfight/csharp/Action.cs similarity index 100% rename from 17_Bullfight/csharp/src/Action.cs rename to 17_Bullfight/csharp/Action.cs diff --git a/17_Bullfight/csharp/src/ActionResult.cs b/17_Bullfight/csharp/ActionResult.cs similarity index 100% rename from 17_Bullfight/csharp/src/ActionResult.cs rename to 17_Bullfight/csharp/ActionResult.cs diff --git a/17_Bullfight/csharp/src/BullFight.cs b/17_Bullfight/csharp/BullFight.cs similarity index 100% rename from 17_Bullfight/csharp/src/BullFight.cs rename to 17_Bullfight/csharp/BullFight.cs diff --git a/17_Bullfight/csharp/Game.csproj b/17_Bullfight/csharp/Bullfight.csproj similarity index 100% rename from 17_Bullfight/csharp/Game.csproj rename to 17_Bullfight/csharp/Bullfight.csproj diff --git a/17_Bullfight/csharp/Bullfight.sln b/17_Bullfight/csharp/Bullfight.sln index 29f5276f..8c819db1 100644 --- a/17_Bullfight/csharp/Bullfight.sln +++ b/17_Bullfight/csharp/Bullfight.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.31321.278 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Game", "Game.csproj", "{8F7C450E-5F3A-45BA-9DB9-329744214931}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bullfight", "Bullfight.csproj", "{502A672C-F7D7-4A85-973A-B5EA8761008A}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -11,10 +11,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {8F7C450E-5F3A-45BA-9DB9-329744214931}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8F7C450E-5F3A-45BA-9DB9-329744214931}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8F7C450E-5F3A-45BA-9DB9-329744214931}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8F7C450E-5F3A-45BA-9DB9-329744214931}.Release|Any CPU.Build.0 = Release|Any CPU + {502A672C-F7D7-4A85-973A-B5EA8761008A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {502A672C-F7D7-4A85-973A-B5EA8761008A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {502A672C-F7D7-4A85-973A-B5EA8761008A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {502A672C-F7D7-4A85-973A-B5EA8761008A}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/17_Bullfight/csharp/src/Controller.cs b/17_Bullfight/csharp/Controller.cs similarity index 100% rename from 17_Bullfight/csharp/src/Controller.cs rename to 17_Bullfight/csharp/Controller.cs diff --git a/17_Bullfight/csharp/src/Events/BullCharging.cs b/17_Bullfight/csharp/Events/BullCharging.cs similarity index 100% rename from 17_Bullfight/csharp/src/Events/BullCharging.cs rename to 17_Bullfight/csharp/Events/BullCharging.cs diff --git a/17_Bullfight/csharp/src/Events/Event.cs b/17_Bullfight/csharp/Events/Event.cs similarity index 100% rename from 17_Bullfight/csharp/src/Events/Event.cs rename to 17_Bullfight/csharp/Events/Event.cs diff --git a/17_Bullfight/csharp/src/Events/MatchCompleted.cs b/17_Bullfight/csharp/Events/MatchCompleted.cs similarity index 100% rename from 17_Bullfight/csharp/src/Events/MatchCompleted.cs rename to 17_Bullfight/csharp/Events/MatchCompleted.cs diff --git a/17_Bullfight/csharp/src/Events/MatchStarted.cs b/17_Bullfight/csharp/Events/MatchStarted.cs similarity index 100% rename from 17_Bullfight/csharp/src/Events/MatchStarted.cs rename to 17_Bullfight/csharp/Events/MatchStarted.cs diff --git a/17_Bullfight/csharp/src/Events/PlayerGored.cs b/17_Bullfight/csharp/Events/PlayerGored.cs similarity index 100% rename from 17_Bullfight/csharp/src/Events/PlayerGored.cs rename to 17_Bullfight/csharp/Events/PlayerGored.cs diff --git a/17_Bullfight/csharp/src/Events/PlayerSurvived.cs b/17_Bullfight/csharp/Events/PlayerSurvived.cs similarity index 100% rename from 17_Bullfight/csharp/src/Events/PlayerSurvived.cs rename to 17_Bullfight/csharp/Events/PlayerSurvived.cs diff --git a/17_Bullfight/csharp/src/Mediator.cs b/17_Bullfight/csharp/Mediator.cs similarity index 100% rename from 17_Bullfight/csharp/src/Mediator.cs rename to 17_Bullfight/csharp/Mediator.cs diff --git a/17_Bullfight/csharp/src/Program.cs b/17_Bullfight/csharp/Program.cs similarity index 100% rename from 17_Bullfight/csharp/src/Program.cs rename to 17_Bullfight/csharp/Program.cs diff --git a/17_Bullfight/csharp/src/Quality.cs b/17_Bullfight/csharp/Quality.cs similarity index 100% rename from 17_Bullfight/csharp/src/Quality.cs rename to 17_Bullfight/csharp/Quality.cs diff --git a/17_Bullfight/csharp/src/Reward.cs b/17_Bullfight/csharp/Reward.cs similarity index 100% rename from 17_Bullfight/csharp/src/Reward.cs rename to 17_Bullfight/csharp/Reward.cs diff --git a/17_Bullfight/csharp/src/RiskLevel.cs b/17_Bullfight/csharp/RiskLevel.cs similarity index 100% rename from 17_Bullfight/csharp/src/RiskLevel.cs rename to 17_Bullfight/csharp/RiskLevel.cs diff --git a/17_Bullfight/csharp/src/View.cs b/17_Bullfight/csharp/View.cs similarity index 100% rename from 17_Bullfight/csharp/src/View.cs rename to 17_Bullfight/csharp/View.cs From 66d4c9b8af3b3bd34dc1f70bb137dba5971b5c63 Mon Sep 17 00:00:00 2001 From: Zev Spitz Date: Mon, 17 Jan 2022 09:12:50 +0200 Subject: [PATCH 14/29] Simplify Combat (C#) folder structure --- 28_Combat/csharp/{src => }/ArmedForces.cs | 0 28_Combat/csharp/{src => }/Ceasefire.cs | 0 28_Combat/csharp/{Game.csproj => Combat.csproj} | 0 28_Combat/csharp/Combat.sln | 10 +++++----- 28_Combat/csharp/{src => }/Controller.cs | 0 28_Combat/csharp/{src => }/FinalCampaign.cs | 0 28_Combat/csharp/{src => }/InitialCampaign.cs | 0 28_Combat/csharp/{src => }/MilitaryBranch.cs | 0 28_Combat/csharp/{src => }/Program.cs | 0 28_Combat/csharp/{src => }/View.cs | 0 28_Combat/csharp/{src => }/WarResult.cs | 0 28_Combat/csharp/{src => }/WarState.cs | 0 12 files changed, 5 insertions(+), 5 deletions(-) rename 28_Combat/csharp/{src => }/ArmedForces.cs (100%) rename 28_Combat/csharp/{src => }/Ceasefire.cs (100%) rename 28_Combat/csharp/{Game.csproj => Combat.csproj} (100%) rename 28_Combat/csharp/{src => }/Controller.cs (100%) rename 28_Combat/csharp/{src => }/FinalCampaign.cs (100%) rename 28_Combat/csharp/{src => }/InitialCampaign.cs (100%) rename 28_Combat/csharp/{src => }/MilitaryBranch.cs (100%) rename 28_Combat/csharp/{src => }/Program.cs (100%) rename 28_Combat/csharp/{src => }/View.cs (100%) rename 28_Combat/csharp/{src => }/WarResult.cs (100%) rename 28_Combat/csharp/{src => }/WarState.cs (100%) diff --git a/28_Combat/csharp/src/ArmedForces.cs b/28_Combat/csharp/ArmedForces.cs similarity index 100% rename from 28_Combat/csharp/src/ArmedForces.cs rename to 28_Combat/csharp/ArmedForces.cs diff --git a/28_Combat/csharp/src/Ceasefire.cs b/28_Combat/csharp/Ceasefire.cs similarity index 100% rename from 28_Combat/csharp/src/Ceasefire.cs rename to 28_Combat/csharp/Ceasefire.cs diff --git a/28_Combat/csharp/Game.csproj b/28_Combat/csharp/Combat.csproj similarity index 100% rename from 28_Combat/csharp/Game.csproj rename to 28_Combat/csharp/Combat.csproj diff --git a/28_Combat/csharp/Combat.sln b/28_Combat/csharp/Combat.sln index 522b680e..99233316 100644 --- a/28_Combat/csharp/Combat.sln +++ b/28_Combat/csharp/Combat.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.31321.278 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Game", "Game.csproj", "{054A1718-1B7D-4954-81A7-EEA390713439}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Combat", "Combat.csproj", "{F7CEEC00-CF2C-436C-883B-55A20C21AB93}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -11,10 +11,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {054A1718-1B7D-4954-81A7-EEA390713439}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {054A1718-1B7D-4954-81A7-EEA390713439}.Debug|Any CPU.Build.0 = Debug|Any CPU - {054A1718-1B7D-4954-81A7-EEA390713439}.Release|Any CPU.ActiveCfg = Release|Any CPU - {054A1718-1B7D-4954-81A7-EEA390713439}.Release|Any CPU.Build.0 = Release|Any CPU + {F7CEEC00-CF2C-436C-883B-55A20C21AB93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F7CEEC00-CF2C-436C-883B-55A20C21AB93}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F7CEEC00-CF2C-436C-883B-55A20C21AB93}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F7CEEC00-CF2C-436C-883B-55A20C21AB93}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/28_Combat/csharp/src/Controller.cs b/28_Combat/csharp/Controller.cs similarity index 100% rename from 28_Combat/csharp/src/Controller.cs rename to 28_Combat/csharp/Controller.cs diff --git a/28_Combat/csharp/src/FinalCampaign.cs b/28_Combat/csharp/FinalCampaign.cs similarity index 100% rename from 28_Combat/csharp/src/FinalCampaign.cs rename to 28_Combat/csharp/FinalCampaign.cs diff --git a/28_Combat/csharp/src/InitialCampaign.cs b/28_Combat/csharp/InitialCampaign.cs similarity index 100% rename from 28_Combat/csharp/src/InitialCampaign.cs rename to 28_Combat/csharp/InitialCampaign.cs diff --git a/28_Combat/csharp/src/MilitaryBranch.cs b/28_Combat/csharp/MilitaryBranch.cs similarity index 100% rename from 28_Combat/csharp/src/MilitaryBranch.cs rename to 28_Combat/csharp/MilitaryBranch.cs diff --git a/28_Combat/csharp/src/Program.cs b/28_Combat/csharp/Program.cs similarity index 100% rename from 28_Combat/csharp/src/Program.cs rename to 28_Combat/csharp/Program.cs diff --git a/28_Combat/csharp/src/View.cs b/28_Combat/csharp/View.cs similarity index 100% rename from 28_Combat/csharp/src/View.cs rename to 28_Combat/csharp/View.cs diff --git a/28_Combat/csharp/src/WarResult.cs b/28_Combat/csharp/WarResult.cs similarity index 100% rename from 28_Combat/csharp/src/WarResult.cs rename to 28_Combat/csharp/WarResult.cs diff --git a/28_Combat/csharp/src/WarState.cs b/28_Combat/csharp/WarState.cs similarity index 100% rename from 28_Combat/csharp/src/WarState.cs rename to 28_Combat/csharp/WarState.cs From cea4a9cdd09ad04275ede4d3f3664349ed82fbeb Mon Sep 17 00:00:00 2001 From: Zev Spitz Date: Mon, 17 Jan 2022 09:15:40 +0200 Subject: [PATCH 15/29] Simplify DepthCharge (C#) folder structure --- 31_Depth_Charge/csharp/{src => }/Controller.cs | 0 .../csharp/{Game.csproj => DepthCharge.csproj} | 0 31_Depth_Charge/csharp/DepthCharge.sln | 10 +++++----- 31_Depth_Charge/csharp/{src => }/Program.cs | 0 31_Depth_Charge/csharp/{src => }/View.cs | 0 5 files changed, 5 insertions(+), 5 deletions(-) rename 31_Depth_Charge/csharp/{src => }/Controller.cs (100%) rename 31_Depth_Charge/csharp/{Game.csproj => DepthCharge.csproj} (100%) rename 31_Depth_Charge/csharp/{src => }/Program.cs (100%) rename 31_Depth_Charge/csharp/{src => }/View.cs (100%) diff --git a/31_Depth_Charge/csharp/src/Controller.cs b/31_Depth_Charge/csharp/Controller.cs similarity index 100% rename from 31_Depth_Charge/csharp/src/Controller.cs rename to 31_Depth_Charge/csharp/Controller.cs diff --git a/31_Depth_Charge/csharp/Game.csproj b/31_Depth_Charge/csharp/DepthCharge.csproj similarity index 100% rename from 31_Depth_Charge/csharp/Game.csproj rename to 31_Depth_Charge/csharp/DepthCharge.csproj diff --git a/31_Depth_Charge/csharp/DepthCharge.sln b/31_Depth_Charge/csharp/DepthCharge.sln index 8d56c717..2f11d18c 100644 --- a/31_Depth_Charge/csharp/DepthCharge.sln +++ b/31_Depth_Charge/csharp/DepthCharge.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.31129.286 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Game", "Game.csproj", "{CBC9D8D9-9EDE-4D34-A20E-C90D929ABF8F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DepthCharge", "DepthCharge.csproj", "{15CF71F3-72F3-4C81-B54F-139F2A1E3920}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -11,10 +11,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {CBC9D8D9-9EDE-4D34-A20E-C90D929ABF8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CBC9D8D9-9EDE-4D34-A20E-C90D929ABF8F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CBC9D8D9-9EDE-4D34-A20E-C90D929ABF8F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CBC9D8D9-9EDE-4D34-A20E-C90D929ABF8F}.Release|Any CPU.Build.0 = Release|Any CPU + {15CF71F3-72F3-4C81-B54F-139F2A1E3920}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {15CF71F3-72F3-4C81-B54F-139F2A1E3920}.Debug|Any CPU.Build.0 = Debug|Any CPU + {15CF71F3-72F3-4C81-B54F-139F2A1E3920}.Release|Any CPU.ActiveCfg = Release|Any CPU + {15CF71F3-72F3-4C81-B54F-139F2A1E3920}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/31_Depth_Charge/csharp/src/Program.cs b/31_Depth_Charge/csharp/Program.cs similarity index 100% rename from 31_Depth_Charge/csharp/src/Program.cs rename to 31_Depth_Charge/csharp/Program.cs diff --git a/31_Depth_Charge/csharp/src/View.cs b/31_Depth_Charge/csharp/View.cs similarity index 100% rename from 31_Depth_Charge/csharp/src/View.cs rename to 31_Depth_Charge/csharp/View.cs From 56679d99d6fd6a24ab2154afe5bbb7a773935137 Mon Sep 17 00:00:00 2001 From: Zev Spitz Date: Mon, 17 Jan 2022 09:21:33 +0200 Subject: [PATCH 16/29] Simplify Hammurabi (C#) folder structure --- 43_Hammurabi/csharp/{src => }/ActionResult.cs | 0 43_Hammurabi/csharp/{src => }/Controller.cs | 0 43_Hammurabi/csharp/{src => }/GameResult.cs | 0 43_Hammurabi/csharp/{src => }/GameState.cs | 0 43_Hammurabi/csharp/{src => }/GreatOffence.cs | 0 .../csharp/{Game.csproj => Hammurabi.csproj} | 0 43_Hammurabi/csharp/Hammurabi.sln | 14 +++++++------- 43_Hammurabi/csharp/{src => }/PerformanceRating.cs | 0 43_Hammurabi/csharp/{src => }/Program.cs | 0 43_Hammurabi/csharp/{src => }/Rules.cs | 0 43_Hammurabi/csharp/{src => }/View.cs | 0 11 files changed, 7 insertions(+), 7 deletions(-) rename 43_Hammurabi/csharp/{src => }/ActionResult.cs (100%) rename 43_Hammurabi/csharp/{src => }/Controller.cs (100%) rename 43_Hammurabi/csharp/{src => }/GameResult.cs (100%) rename 43_Hammurabi/csharp/{src => }/GameState.cs (100%) rename 43_Hammurabi/csharp/{src => }/GreatOffence.cs (100%) rename 43_Hammurabi/csharp/{Game.csproj => Hammurabi.csproj} (100%) rename 43_Hammurabi/csharp/{src => }/PerformanceRating.cs (100%) rename 43_Hammurabi/csharp/{src => }/Program.cs (100%) rename 43_Hammurabi/csharp/{src => }/Rules.cs (100%) rename 43_Hammurabi/csharp/{src => }/View.cs (100%) diff --git a/43_Hammurabi/csharp/src/ActionResult.cs b/43_Hammurabi/csharp/ActionResult.cs similarity index 100% rename from 43_Hammurabi/csharp/src/ActionResult.cs rename to 43_Hammurabi/csharp/ActionResult.cs diff --git a/43_Hammurabi/csharp/src/Controller.cs b/43_Hammurabi/csharp/Controller.cs similarity index 100% rename from 43_Hammurabi/csharp/src/Controller.cs rename to 43_Hammurabi/csharp/Controller.cs diff --git a/43_Hammurabi/csharp/src/GameResult.cs b/43_Hammurabi/csharp/GameResult.cs similarity index 100% rename from 43_Hammurabi/csharp/src/GameResult.cs rename to 43_Hammurabi/csharp/GameResult.cs diff --git a/43_Hammurabi/csharp/src/GameState.cs b/43_Hammurabi/csharp/GameState.cs similarity index 100% rename from 43_Hammurabi/csharp/src/GameState.cs rename to 43_Hammurabi/csharp/GameState.cs diff --git a/43_Hammurabi/csharp/src/GreatOffence.cs b/43_Hammurabi/csharp/GreatOffence.cs similarity index 100% rename from 43_Hammurabi/csharp/src/GreatOffence.cs rename to 43_Hammurabi/csharp/GreatOffence.cs diff --git a/43_Hammurabi/csharp/Game.csproj b/43_Hammurabi/csharp/Hammurabi.csproj similarity index 100% rename from 43_Hammurabi/csharp/Game.csproj rename to 43_Hammurabi/csharp/Hammurabi.csproj diff --git a/43_Hammurabi/csharp/Hammurabi.sln b/43_Hammurabi/csharp/Hammurabi.sln index feeae212..7475f8fd 100644 --- a/43_Hammurabi/csharp/Hammurabi.sln +++ b/43_Hammurabi/csharp/Hammurabi.sln @@ -1,9 +1,9 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.31129.286 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32014.148 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Game", "Game.csproj", "{20599300-7C6E-48A2-AB24-EC7CCF224A5C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hammurabi", "Hammurabi.csproj", "{2C4407AF-5ED6-4C9F-833E-35461DF7DBBB}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -11,10 +11,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {20599300-7C6E-48A2-AB24-EC7CCF224A5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {20599300-7C6E-48A2-AB24-EC7CCF224A5C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {20599300-7C6E-48A2-AB24-EC7CCF224A5C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {20599300-7C6E-48A2-AB24-EC7CCF224A5C}.Release|Any CPU.Build.0 = Release|Any CPU + {2C4407AF-5ED6-4C9F-833E-35461DF7DBBB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2C4407AF-5ED6-4C9F-833E-35461DF7DBBB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2C4407AF-5ED6-4C9F-833E-35461DF7DBBB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2C4407AF-5ED6-4C9F-833E-35461DF7DBBB}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/43_Hammurabi/csharp/src/PerformanceRating.cs b/43_Hammurabi/csharp/PerformanceRating.cs similarity index 100% rename from 43_Hammurabi/csharp/src/PerformanceRating.cs rename to 43_Hammurabi/csharp/PerformanceRating.cs diff --git a/43_Hammurabi/csharp/src/Program.cs b/43_Hammurabi/csharp/Program.cs similarity index 100% rename from 43_Hammurabi/csharp/src/Program.cs rename to 43_Hammurabi/csharp/Program.cs diff --git a/43_Hammurabi/csharp/src/Rules.cs b/43_Hammurabi/csharp/Rules.cs similarity index 100% rename from 43_Hammurabi/csharp/src/Rules.cs rename to 43_Hammurabi/csharp/Rules.cs diff --git a/43_Hammurabi/csharp/src/View.cs b/43_Hammurabi/csharp/View.cs similarity index 100% rename from 43_Hammurabi/csharp/src/View.cs rename to 43_Hammurabi/csharp/View.cs From 35bfd114e06c0c5385fc6d4991f435c9d6cf7139 Mon Sep 17 00:00:00 2001 From: Zev Spitz Date: Mon, 17 Jan 2022 10:48:54 +0200 Subject: [PATCH 17/29] Simplify Hexapawn (C#) folder structure --- 46_Hexapawn/csharp/{Hexapawn => }/Board.cs | 0 46_Hexapawn/csharp/{Hexapawn => }/Cell.cs | 0 46_Hexapawn/csharp/{Hexapawn => }/Computer.cs | 0 46_Hexapawn/csharp/{Hexapawn => }/Game.cs | 0 .../csharp/{Hexapawn => }/GameSeries.cs | 0 .../csharp/{Hexapawn => }/Hexapawn.csproj | 0 46_Hexapawn/csharp/Hexapawn.sln | 31 +++++++------------ 46_Hexapawn/csharp/{Hexapawn => }/Human.cs | 0 46_Hexapawn/csharp/{Hexapawn => }/IPlayer.cs | 0 46_Hexapawn/csharp/{Hexapawn => }/Input.cs | 0 46_Hexapawn/csharp/{Hexapawn => }/Move.cs | 0 46_Hexapawn/csharp/{Hexapawn => }/Pawn.cs | 0 46_Hexapawn/csharp/{Hexapawn => }/Program.cs | 0 13 files changed, 11 insertions(+), 20 deletions(-) rename 46_Hexapawn/csharp/{Hexapawn => }/Board.cs (100%) rename 46_Hexapawn/csharp/{Hexapawn => }/Cell.cs (100%) rename 46_Hexapawn/csharp/{Hexapawn => }/Computer.cs (100%) rename 46_Hexapawn/csharp/{Hexapawn => }/Game.cs (100%) rename 46_Hexapawn/csharp/{Hexapawn => }/GameSeries.cs (100%) rename 46_Hexapawn/csharp/{Hexapawn => }/Hexapawn.csproj (100%) rename 46_Hexapawn/csharp/{Hexapawn => }/Human.cs (100%) rename 46_Hexapawn/csharp/{Hexapawn => }/IPlayer.cs (100%) rename 46_Hexapawn/csharp/{Hexapawn => }/Input.cs (100%) rename 46_Hexapawn/csharp/{Hexapawn => }/Move.cs (100%) rename 46_Hexapawn/csharp/{Hexapawn => }/Pawn.cs (100%) rename 46_Hexapawn/csharp/{Hexapawn => }/Program.cs (100%) diff --git a/46_Hexapawn/csharp/Hexapawn/Board.cs b/46_Hexapawn/csharp/Board.cs similarity index 100% rename from 46_Hexapawn/csharp/Hexapawn/Board.cs rename to 46_Hexapawn/csharp/Board.cs diff --git a/46_Hexapawn/csharp/Hexapawn/Cell.cs b/46_Hexapawn/csharp/Cell.cs similarity index 100% rename from 46_Hexapawn/csharp/Hexapawn/Cell.cs rename to 46_Hexapawn/csharp/Cell.cs diff --git a/46_Hexapawn/csharp/Hexapawn/Computer.cs b/46_Hexapawn/csharp/Computer.cs similarity index 100% rename from 46_Hexapawn/csharp/Hexapawn/Computer.cs rename to 46_Hexapawn/csharp/Computer.cs diff --git a/46_Hexapawn/csharp/Hexapawn/Game.cs b/46_Hexapawn/csharp/Game.cs similarity index 100% rename from 46_Hexapawn/csharp/Hexapawn/Game.cs rename to 46_Hexapawn/csharp/Game.cs diff --git a/46_Hexapawn/csharp/Hexapawn/GameSeries.cs b/46_Hexapawn/csharp/GameSeries.cs similarity index 100% rename from 46_Hexapawn/csharp/Hexapawn/GameSeries.cs rename to 46_Hexapawn/csharp/GameSeries.cs diff --git a/46_Hexapawn/csharp/Hexapawn/Hexapawn.csproj b/46_Hexapawn/csharp/Hexapawn.csproj similarity index 100% rename from 46_Hexapawn/csharp/Hexapawn/Hexapawn.csproj rename to 46_Hexapawn/csharp/Hexapawn.csproj diff --git a/46_Hexapawn/csharp/Hexapawn.sln b/46_Hexapawn/csharp/Hexapawn.sln index 6cfc8a8f..06e7b32f 100644 --- a/46_Hexapawn/csharp/Hexapawn.sln +++ b/46_Hexapawn/csharp/Hexapawn.sln @@ -1,34 +1,25 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26124.0 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32014.148 MinimumVisualStudioVersion = 15.0.26124.0 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hexapawn", "Hexapawn\Hexapawn.csproj", "{679D95BE-6E0C-4D8C-A2D4-0957576B63F3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hexapawn", "Hexapawn.csproj", "{785DA416-2609-4DB1-9F18-63CF6AC9927E}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU - Release|x64 = Release|x64 - Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {785DA416-2609-4DB1-9F18-63CF6AC9927E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {785DA416-2609-4DB1-9F18-63CF6AC9927E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {785DA416-2609-4DB1-9F18-63CF6AC9927E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {785DA416-2609-4DB1-9F18-63CF6AC9927E}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {679D95BE-6E0C-4D8C-A2D4-0957576B63F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {679D95BE-6E0C-4D8C-A2D4-0957576B63F3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {679D95BE-6E0C-4D8C-A2D4-0957576B63F3}.Debug|x64.ActiveCfg = Debug|Any CPU - {679D95BE-6E0C-4D8C-A2D4-0957576B63F3}.Debug|x64.Build.0 = Debug|Any CPU - {679D95BE-6E0C-4D8C-A2D4-0957576B63F3}.Debug|x86.ActiveCfg = Debug|Any CPU - {679D95BE-6E0C-4D8C-A2D4-0957576B63F3}.Debug|x86.Build.0 = Debug|Any CPU - {679D95BE-6E0C-4D8C-A2D4-0957576B63F3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {679D95BE-6E0C-4D8C-A2D4-0957576B63F3}.Release|Any CPU.Build.0 = Release|Any CPU - {679D95BE-6E0C-4D8C-A2D4-0957576B63F3}.Release|x64.ActiveCfg = Release|Any CPU - {679D95BE-6E0C-4D8C-A2D4-0957576B63F3}.Release|x64.Build.0 = Release|Any CPU - {679D95BE-6E0C-4D8C-A2D4-0957576B63F3}.Release|x86.ActiveCfg = Release|Any CPU - {679D95BE-6E0C-4D8C-A2D4-0957576B63F3}.Release|x86.Build.0 = Release|Any CPU + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {D662AD9F-88B1-4AC9-83AD-DBFC08F384A8} EndGlobalSection EndGlobal diff --git a/46_Hexapawn/csharp/Hexapawn/Human.cs b/46_Hexapawn/csharp/Human.cs similarity index 100% rename from 46_Hexapawn/csharp/Hexapawn/Human.cs rename to 46_Hexapawn/csharp/Human.cs diff --git a/46_Hexapawn/csharp/Hexapawn/IPlayer.cs b/46_Hexapawn/csharp/IPlayer.cs similarity index 100% rename from 46_Hexapawn/csharp/Hexapawn/IPlayer.cs rename to 46_Hexapawn/csharp/IPlayer.cs diff --git a/46_Hexapawn/csharp/Hexapawn/Input.cs b/46_Hexapawn/csharp/Input.cs similarity index 100% rename from 46_Hexapawn/csharp/Hexapawn/Input.cs rename to 46_Hexapawn/csharp/Input.cs diff --git a/46_Hexapawn/csharp/Hexapawn/Move.cs b/46_Hexapawn/csharp/Move.cs similarity index 100% rename from 46_Hexapawn/csharp/Hexapawn/Move.cs rename to 46_Hexapawn/csharp/Move.cs diff --git a/46_Hexapawn/csharp/Hexapawn/Pawn.cs b/46_Hexapawn/csharp/Pawn.cs similarity index 100% rename from 46_Hexapawn/csharp/Hexapawn/Pawn.cs rename to 46_Hexapawn/csharp/Pawn.cs diff --git a/46_Hexapawn/csharp/Hexapawn/Program.cs b/46_Hexapawn/csharp/Program.cs similarity index 100% rename from 46_Hexapawn/csharp/Hexapawn/Program.cs rename to 46_Hexapawn/csharp/Program.cs From 3eed84264f18700c34c982494fc72102cdb017d8 Mon Sep 17 00:00:00 2001 From: Zev Spitz Date: Mon, 17 Jan 2022 11:09:11 +0200 Subject: [PATCH 18/29] Simplify Hurkle (C#) folder structure --- .../{src/hurkle => }/CardinalDirection.cs | 0 .../{src/hurkle => }/ConsoleHurkleView.cs | 0 .../{src/hurkle => }/FailedGuessViewModel.cs | 0 .../csharp/{src/hurkle => }/GamePoint.cs | 0 .../csharp/{src/hurkle => }/GuessViewModel.cs | 0 .../hurkle/hurkle.csproj => Hurkle.csproj} | 16 +-- 51_Hurkle/csharp/Hurkle.sln | 20 ++- .../csharp/{src/hurkle => }/HurkleGame.cs | 0 .../csharp/{src/hurkle => }/IHurkleView.cs | 0 .../csharp/{src/hurkle => }/LossViewModel.cs | 0 51_Hurkle/csharp/{src/hurkle => }/Program.cs | 128 +++++++++--------- .../{src/hurkle => }/VictoryViewModel.cs | 0 12 files changed, 81 insertions(+), 83 deletions(-) rename 51_Hurkle/csharp/{src/hurkle => }/CardinalDirection.cs (100%) rename 51_Hurkle/csharp/{src/hurkle => }/ConsoleHurkleView.cs (100%) rename 51_Hurkle/csharp/{src/hurkle => }/FailedGuessViewModel.cs (100%) rename 51_Hurkle/csharp/{src/hurkle => }/GamePoint.cs (100%) rename 51_Hurkle/csharp/{src/hurkle => }/GuessViewModel.cs (100%) rename 51_Hurkle/csharp/{src/hurkle/hurkle.csproj => Hurkle.csproj} (95%) rename 51_Hurkle/csharp/{src/hurkle => }/HurkleGame.cs (100%) rename 51_Hurkle/csharp/{src/hurkle => }/IHurkleView.cs (100%) rename 51_Hurkle/csharp/{src/hurkle => }/LossViewModel.cs (100%) rename 51_Hurkle/csharp/{src/hurkle => }/Program.cs (97%) rename 51_Hurkle/csharp/{src/hurkle => }/VictoryViewModel.cs (100%) diff --git a/51_Hurkle/csharp/src/hurkle/CardinalDirection.cs b/51_Hurkle/csharp/CardinalDirection.cs similarity index 100% rename from 51_Hurkle/csharp/src/hurkle/CardinalDirection.cs rename to 51_Hurkle/csharp/CardinalDirection.cs diff --git a/51_Hurkle/csharp/src/hurkle/ConsoleHurkleView.cs b/51_Hurkle/csharp/ConsoleHurkleView.cs similarity index 100% rename from 51_Hurkle/csharp/src/hurkle/ConsoleHurkleView.cs rename to 51_Hurkle/csharp/ConsoleHurkleView.cs diff --git a/51_Hurkle/csharp/src/hurkle/FailedGuessViewModel.cs b/51_Hurkle/csharp/FailedGuessViewModel.cs similarity index 100% rename from 51_Hurkle/csharp/src/hurkle/FailedGuessViewModel.cs rename to 51_Hurkle/csharp/FailedGuessViewModel.cs diff --git a/51_Hurkle/csharp/src/hurkle/GamePoint.cs b/51_Hurkle/csharp/GamePoint.cs similarity index 100% rename from 51_Hurkle/csharp/src/hurkle/GamePoint.cs rename to 51_Hurkle/csharp/GamePoint.cs diff --git a/51_Hurkle/csharp/src/hurkle/GuessViewModel.cs b/51_Hurkle/csharp/GuessViewModel.cs similarity index 100% rename from 51_Hurkle/csharp/src/hurkle/GuessViewModel.cs rename to 51_Hurkle/csharp/GuessViewModel.cs diff --git a/51_Hurkle/csharp/src/hurkle/hurkle.csproj b/51_Hurkle/csharp/Hurkle.csproj similarity index 95% rename from 51_Hurkle/csharp/src/hurkle/hurkle.csproj rename to 51_Hurkle/csharp/Hurkle.csproj index 1d2d39a9..20827042 100644 --- a/51_Hurkle/csharp/src/hurkle/hurkle.csproj +++ b/51_Hurkle/csharp/Hurkle.csproj @@ -1,8 +1,8 @@ - - - - Exe - net5.0 - - - + + + + Exe + net5.0 + + + diff --git a/51_Hurkle/csharp/Hurkle.sln b/51_Hurkle/csharp/Hurkle.sln index e1792677..d1a6fb25 100644 --- a/51_Hurkle/csharp/Hurkle.sln +++ b/51_Hurkle/csharp/Hurkle.sln @@ -3,25 +3,23 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.30114.105 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{EBE7BC2B-8F2E-41D5-AF36-7AAC7CE0E1BF}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "hurkle", "src\hurkle\hurkle.csproj", "{47578EC1-A012-4BF7-8709-64F675E72DB0}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hurkle", "Hurkle.csproj", "{BE321D5B-93BD-4F91-A875-564DC9D4094F}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {BE321D5B-93BD-4F91-A875-564DC9D4094F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BE321D5B-93BD-4F91-A875-564DC9D4094F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BE321D5B-93BD-4F91-A875-564DC9D4094F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BE321D5B-93BD-4F91-A875-564DC9D4094F}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {47578EC1-A012-4BF7-8709-64F675E72DB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {47578EC1-A012-4BF7-8709-64F675E72DB0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {47578EC1-A012-4BF7-8709-64F675E72DB0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {47578EC1-A012-4BF7-8709-64F675E72DB0}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {47578EC1-A012-4BF7-8709-64F675E72DB0} = {EBE7BC2B-8F2E-41D5-AF36-7AAC7CE0E1BF} + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {42DC6AE5-5127-4B1B-BD5E-F3B1CCDC3822} EndGlobalSection EndGlobal diff --git a/51_Hurkle/csharp/src/hurkle/HurkleGame.cs b/51_Hurkle/csharp/HurkleGame.cs similarity index 100% rename from 51_Hurkle/csharp/src/hurkle/HurkleGame.cs rename to 51_Hurkle/csharp/HurkleGame.cs diff --git a/51_Hurkle/csharp/src/hurkle/IHurkleView.cs b/51_Hurkle/csharp/IHurkleView.cs similarity index 100% rename from 51_Hurkle/csharp/src/hurkle/IHurkleView.cs rename to 51_Hurkle/csharp/IHurkleView.cs diff --git a/51_Hurkle/csharp/src/hurkle/LossViewModel.cs b/51_Hurkle/csharp/LossViewModel.cs similarity index 100% rename from 51_Hurkle/csharp/src/hurkle/LossViewModel.cs rename to 51_Hurkle/csharp/LossViewModel.cs diff --git a/51_Hurkle/csharp/src/hurkle/Program.cs b/51_Hurkle/csharp/Program.cs similarity index 97% rename from 51_Hurkle/csharp/src/hurkle/Program.cs rename to 51_Hurkle/csharp/Program.cs index 148308d1..e5c3f6af 100644 --- a/51_Hurkle/csharp/src/hurkle/Program.cs +++ b/51_Hurkle/csharp/Program.cs @@ -1,64 +1,64 @@ -using System; - -namespace hurkle -{ - class Program - { - static void Main(string[] args) - { - /* - Original source transscription - 10 PRINT TAB(33);"HURKLE" - 20 PRINT TAB(15);"CREATIVE COMPUTING NORRISTOWN, NEW JERSEY" - 30 PRINT;PRINT;PRINT - */ - Console.WriteLine(new string(' ', 33) + @"HURKLE"); - Console.WriteLine(new string(' ', 15) + @"CREATIVE COMPUTING NORRISTOWN, NEW JERSEY"); - /* - 110 N=5 - 120 G=10 - */ - var N=5; - var G=10; - /* - 210 PRINT - 220 PRINT "A HURKLE IS HIDING ON A";G;"BY";G;"GRID. HOMEBASE" - 230 PRINT "ON THE GRID IS POINT 0,0 AND ANY GRIDPOINT IS A" - 240 PRINT "PAIR OF WHOLE NUMBERS SEPERATED BY A COMMA. TRY TO" - 250 PRINT "GUESS THE HURKLE'S GRIDPOINT. YOU GET";N;"TRIES." - 260 PRINT "AFTER EACH TRY, I WILL TELL YOU THE APPROXIMATE" - 270 PRINT "DIRECTION TO GO TO LOOK FOR THE HURKLE." - 280 PRINT - */ - // Using string formatting via the '$' string - Console.WriteLine(); - Console.WriteLine($"A HURKLE IS HIDING ON A {G} BY {G} GRID. HOMEBASE"); - Console.WriteLine(@"ON THE GRID IS POINT 0,0 AND ANY GRIDPOINT IS A"); - Console.WriteLine(@"PAIR OF WHOLE NUMBERS SEPERATED BY A COMMA. TRY TO"); - Console.WriteLine($"GUESS THE HURKLE'S GRIDPOINT. YOU GET {N} TRIES."); - Console.WriteLine(@"AFTER EACH TRY, I WILL TELL YOU THE APPROXIMATE"); - Console.WriteLine(@"DIRECTION TO GO TO LOOK FOR THE HURKLE."); - Console.WriteLine(); - - var view = new ConsoleHurkleView(); - var hurkle = new HurkleGame(N,G, view); - while(true) - { - hurkle.PlayGame(); - - Console.WriteLine("PLAY AGAIN? (Y)ES/(N)O"); - var playAgainResponse = Console.ReadLine(); - if(playAgainResponse.Trim().StartsWith("y", StringComparison.InvariantCultureIgnoreCase)) - { - Console.WriteLine(); - Console.WriteLine("LET'S PLAY AGAIN. HURKLE IS HIDING"); - Console.WriteLine(); - }else{ - Console.WriteLine("THANKS FOR PLAYING!"); - break; - } - - } - } - } -} +using System; + +namespace hurkle +{ + class Program + { + static void Main(string[] args) + { + /* + Original source transscription + 10 PRINT TAB(33);"HURKLE" + 20 PRINT TAB(15);"CREATIVE COMPUTING NORRISTOWN, NEW JERSEY" + 30 PRINT;PRINT;PRINT + */ + Console.WriteLine(new string(' ', 33) + @"HURKLE"); + Console.WriteLine(new string(' ', 15) + @"CREATIVE COMPUTING NORRISTOWN, NEW JERSEY"); + /* + 110 N=5 + 120 G=10 + */ + var N=5; + var G=10; + /* + 210 PRINT + 220 PRINT "A HURKLE IS HIDING ON A";G;"BY";G;"GRID. HOMEBASE" + 230 PRINT "ON THE GRID IS POINT 0,0 AND ANY GRIDPOINT IS A" + 240 PRINT "PAIR OF WHOLE NUMBERS SEPERATED BY A COMMA. TRY TO" + 250 PRINT "GUESS THE HURKLE'S GRIDPOINT. YOU GET";N;"TRIES." + 260 PRINT "AFTER EACH TRY, I WILL TELL YOU THE APPROXIMATE" + 270 PRINT "DIRECTION TO GO TO LOOK FOR THE HURKLE." + 280 PRINT + */ + // Using string formatting via the '$' string + Console.WriteLine(); + Console.WriteLine($"A HURKLE IS HIDING ON A {G} BY {G} GRID. HOMEBASE"); + Console.WriteLine(@"ON THE GRID IS POINT 0,0 AND ANY GRIDPOINT IS A"); + Console.WriteLine(@"PAIR OF WHOLE NUMBERS SEPERATED BY A COMMA. TRY TO"); + Console.WriteLine($"GUESS THE HURKLE'S GRIDPOINT. YOU GET {N} TRIES."); + Console.WriteLine(@"AFTER EACH TRY, I WILL TELL YOU THE APPROXIMATE"); + Console.WriteLine(@"DIRECTION TO GO TO LOOK FOR THE HURKLE."); + Console.WriteLine(); + + var view = new ConsoleHurkleView(); + var hurkle = new HurkleGame(N,G, view); + while(true) + { + hurkle.PlayGame(); + + Console.WriteLine("PLAY AGAIN? (Y)ES/(N)O"); + var playAgainResponse = Console.ReadLine(); + if(playAgainResponse.Trim().StartsWith("y", StringComparison.InvariantCultureIgnoreCase)) + { + Console.WriteLine(); + Console.WriteLine("LET'S PLAY AGAIN. HURKLE IS HIDING"); + Console.WriteLine(); + }else{ + Console.WriteLine("THANKS FOR PLAYING!"); + break; + } + + } + } + } +} diff --git a/51_Hurkle/csharp/src/hurkle/VictoryViewModel.cs b/51_Hurkle/csharp/VictoryViewModel.cs similarity index 100% rename from 51_Hurkle/csharp/src/hurkle/VictoryViewModel.cs rename to 51_Hurkle/csharp/VictoryViewModel.cs From df8269fd0c8a4235e9fbd474d7102cdc5eff0050 Mon Sep 17 00:00:00 2001 From: Zev Spitz Date: Mon, 17 Jan 2022 11:12:56 +0200 Subject: [PATCH 19/29] Simplify Love (C#) folder structure --- 58_Love/csharp/{Love => }/Input.cs | 0 58_Love/csharp/{Love => }/Love.csproj | 0 58_Love/csharp/Love.sln | 31 +++++++------------ 58_Love/csharp/{Love => }/LovePattern.cs | 0 58_Love/csharp/{Love => }/Program.cs | 0 58_Love/csharp/{Love => }/SourceCharacters.cs | 0 58_Love/csharp/{Love => }/Strings/Intro.txt | 0 7 files changed, 11 insertions(+), 20 deletions(-) rename 58_Love/csharp/{Love => }/Input.cs (100%) rename 58_Love/csharp/{Love => }/Love.csproj (100%) rename 58_Love/csharp/{Love => }/LovePattern.cs (100%) rename 58_Love/csharp/{Love => }/Program.cs (100%) rename 58_Love/csharp/{Love => }/SourceCharacters.cs (100%) rename 58_Love/csharp/{Love => }/Strings/Intro.txt (100%) diff --git a/58_Love/csharp/Love/Input.cs b/58_Love/csharp/Input.cs similarity index 100% rename from 58_Love/csharp/Love/Input.cs rename to 58_Love/csharp/Input.cs diff --git a/58_Love/csharp/Love/Love.csproj b/58_Love/csharp/Love.csproj similarity index 100% rename from 58_Love/csharp/Love/Love.csproj rename to 58_Love/csharp/Love.csproj diff --git a/58_Love/csharp/Love.sln b/58_Love/csharp/Love.sln index a89fd1d8..813af0f2 100644 --- a/58_Love/csharp/Love.sln +++ b/58_Love/csharp/Love.sln @@ -1,34 +1,25 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26124.0 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32014.148 MinimumVisualStudioVersion = 15.0.26124.0 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Love", "Love\Love.csproj", "{FC74E025-A50D-4E19-9337-87F2E4A9F83E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Love", "Love.csproj", "{1C02A3CA-615B-42CF-B696-4514770CA67F}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU - Release|x64 = Release|x64 - Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {1C02A3CA-615B-42CF-B696-4514770CA67F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1C02A3CA-615B-42CF-B696-4514770CA67F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1C02A3CA-615B-42CF-B696-4514770CA67F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1C02A3CA-615B-42CF-B696-4514770CA67F}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {FC74E025-A50D-4E19-9337-87F2E4A9F83E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FC74E025-A50D-4E19-9337-87F2E4A9F83E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FC74E025-A50D-4E19-9337-87F2E4A9F83E}.Debug|x64.ActiveCfg = Debug|Any CPU - {FC74E025-A50D-4E19-9337-87F2E4A9F83E}.Debug|x64.Build.0 = Debug|Any CPU - {FC74E025-A50D-4E19-9337-87F2E4A9F83E}.Debug|x86.ActiveCfg = Debug|Any CPU - {FC74E025-A50D-4E19-9337-87F2E4A9F83E}.Debug|x86.Build.0 = Debug|Any CPU - {FC74E025-A50D-4E19-9337-87F2E4A9F83E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FC74E025-A50D-4E19-9337-87F2E4A9F83E}.Release|Any CPU.Build.0 = Release|Any CPU - {FC74E025-A50D-4E19-9337-87F2E4A9F83E}.Release|x64.ActiveCfg = Release|Any CPU - {FC74E025-A50D-4E19-9337-87F2E4A9F83E}.Release|x64.Build.0 = Release|Any CPU - {FC74E025-A50D-4E19-9337-87F2E4A9F83E}.Release|x86.ActiveCfg = Release|Any CPU - {FC74E025-A50D-4E19-9337-87F2E4A9F83E}.Release|x86.Build.0 = Release|Any CPU + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {F9C55508-108B-4EA1-ADD7-4BA8EC915E68} EndGlobalSection EndGlobal diff --git a/58_Love/csharp/Love/LovePattern.cs b/58_Love/csharp/LovePattern.cs similarity index 100% rename from 58_Love/csharp/Love/LovePattern.cs rename to 58_Love/csharp/LovePattern.cs diff --git a/58_Love/csharp/Love/Program.cs b/58_Love/csharp/Program.cs similarity index 100% rename from 58_Love/csharp/Love/Program.cs rename to 58_Love/csharp/Program.cs diff --git a/58_Love/csharp/Love/SourceCharacters.cs b/58_Love/csharp/SourceCharacters.cs similarity index 100% rename from 58_Love/csharp/Love/SourceCharacters.cs rename to 58_Love/csharp/SourceCharacters.cs diff --git a/58_Love/csharp/Love/Strings/Intro.txt b/58_Love/csharp/Strings/Intro.txt similarity index 100% rename from 58_Love/csharp/Love/Strings/Intro.txt rename to 58_Love/csharp/Strings/Intro.txt From ca9fafc7585fd5d2ad6b0a201cabc3f3756c582b Mon Sep 17 00:00:00 2001 From: Zev Spitz Date: Mon, 17 Jan 2022 11:48:01 +0200 Subject: [PATCH 20/29] Simplify Mastermind (C#) folder structure --- 60_Mastermind/csharp/{Game/src => }/Code.cs | 0 60_Mastermind/csharp/{Game/src => }/CodeFactory.cs | 0 60_Mastermind/csharp/{Game/src => }/ColorInfo.cs | 0 60_Mastermind/csharp/{Game/src => }/Colors.cs | 0 60_Mastermind/csharp/{Game/src => }/Command.cs | 0 60_Mastermind/csharp/{Game/src => }/Controller.cs | 0 .../csharp/{Game/src => }/EnumerableExtensions.cs | 0 .../csharp/{Game/Game.csproj => Mastermind.csproj} | 0 60_Mastermind/csharp/Mastermind.sln | 14 +++++++------- 60_Mastermind/csharp/{Game/src => }/Program.cs | 0 60_Mastermind/csharp/{Game/src => }/TurnResult.cs | 0 60_Mastermind/csharp/{Game/src => }/View.cs | 0 12 files changed, 7 insertions(+), 7 deletions(-) rename 60_Mastermind/csharp/{Game/src => }/Code.cs (100%) rename 60_Mastermind/csharp/{Game/src => }/CodeFactory.cs (100%) rename 60_Mastermind/csharp/{Game/src => }/ColorInfo.cs (100%) rename 60_Mastermind/csharp/{Game/src => }/Colors.cs (100%) rename 60_Mastermind/csharp/{Game/src => }/Command.cs (100%) rename 60_Mastermind/csharp/{Game/src => }/Controller.cs (100%) rename 60_Mastermind/csharp/{Game/src => }/EnumerableExtensions.cs (100%) rename 60_Mastermind/csharp/{Game/Game.csproj => Mastermind.csproj} (100%) rename 60_Mastermind/csharp/{Game/src => }/Program.cs (100%) rename 60_Mastermind/csharp/{Game/src => }/TurnResult.cs (100%) rename 60_Mastermind/csharp/{Game/src => }/View.cs (100%) diff --git a/60_Mastermind/csharp/Game/src/Code.cs b/60_Mastermind/csharp/Code.cs similarity index 100% rename from 60_Mastermind/csharp/Game/src/Code.cs rename to 60_Mastermind/csharp/Code.cs diff --git a/60_Mastermind/csharp/Game/src/CodeFactory.cs b/60_Mastermind/csharp/CodeFactory.cs similarity index 100% rename from 60_Mastermind/csharp/Game/src/CodeFactory.cs rename to 60_Mastermind/csharp/CodeFactory.cs diff --git a/60_Mastermind/csharp/Game/src/ColorInfo.cs b/60_Mastermind/csharp/ColorInfo.cs similarity index 100% rename from 60_Mastermind/csharp/Game/src/ColorInfo.cs rename to 60_Mastermind/csharp/ColorInfo.cs diff --git a/60_Mastermind/csharp/Game/src/Colors.cs b/60_Mastermind/csharp/Colors.cs similarity index 100% rename from 60_Mastermind/csharp/Game/src/Colors.cs rename to 60_Mastermind/csharp/Colors.cs diff --git a/60_Mastermind/csharp/Game/src/Command.cs b/60_Mastermind/csharp/Command.cs similarity index 100% rename from 60_Mastermind/csharp/Game/src/Command.cs rename to 60_Mastermind/csharp/Command.cs diff --git a/60_Mastermind/csharp/Game/src/Controller.cs b/60_Mastermind/csharp/Controller.cs similarity index 100% rename from 60_Mastermind/csharp/Game/src/Controller.cs rename to 60_Mastermind/csharp/Controller.cs diff --git a/60_Mastermind/csharp/Game/src/EnumerableExtensions.cs b/60_Mastermind/csharp/EnumerableExtensions.cs similarity index 100% rename from 60_Mastermind/csharp/Game/src/EnumerableExtensions.cs rename to 60_Mastermind/csharp/EnumerableExtensions.cs diff --git a/60_Mastermind/csharp/Game/Game.csproj b/60_Mastermind/csharp/Mastermind.csproj similarity index 100% rename from 60_Mastermind/csharp/Game/Game.csproj rename to 60_Mastermind/csharp/Mastermind.csproj diff --git a/60_Mastermind/csharp/Mastermind.sln b/60_Mastermind/csharp/Mastermind.sln index c3827fb7..0da53b6d 100644 --- a/60_Mastermind/csharp/Mastermind.sln +++ b/60_Mastermind/csharp/Mastermind.sln @@ -1,9 +1,9 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.31321.278 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32014.148 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Game", "Game\Game.csproj", "{E8D63140-971D-4FBF-8138-964E54CCB7DD}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mastermind", "Mastermind.csproj", "{AEC839CD-C6D3-4476-AA85-79B160AF78BE}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -11,10 +11,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {E8D63140-971D-4FBF-8138-964E54CCB7DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E8D63140-971D-4FBF-8138-964E54CCB7DD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E8D63140-971D-4FBF-8138-964E54CCB7DD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E8D63140-971D-4FBF-8138-964E54CCB7DD}.Release|Any CPU.Build.0 = Release|Any CPU + {AEC839CD-C6D3-4476-AA85-79B160AF78BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AEC839CD-C6D3-4476-AA85-79B160AF78BE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AEC839CD-C6D3-4476-AA85-79B160AF78BE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AEC839CD-C6D3-4476-AA85-79B160AF78BE}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/60_Mastermind/csharp/Game/src/Program.cs b/60_Mastermind/csharp/Program.cs similarity index 100% rename from 60_Mastermind/csharp/Game/src/Program.cs rename to 60_Mastermind/csharp/Program.cs diff --git a/60_Mastermind/csharp/Game/src/TurnResult.cs b/60_Mastermind/csharp/TurnResult.cs similarity index 100% rename from 60_Mastermind/csharp/Game/src/TurnResult.cs rename to 60_Mastermind/csharp/TurnResult.cs diff --git a/60_Mastermind/csharp/Game/src/View.cs b/60_Mastermind/csharp/View.cs similarity index 100% rename from 60_Mastermind/csharp/Game/src/View.cs rename to 60_Mastermind/csharp/View.cs From b83307572254c5c4f3a55bf0631d51897e8463df Mon Sep 17 00:00:00 2001 From: Zev Spitz Date: Mon, 17 Jan 2022 11:50:17 +0200 Subject: [PATCH 21/29] Simplify Mugwump (C#) folder structure --- 62_Mugwump/csharp/{Mugwump => }/Game.cs | 0 62_Mugwump/csharp/{Mugwump => }/Grid.cs | 0 62_Mugwump/csharp/{Mugwump => }/Input.cs | 0 62_Mugwump/csharp/{Mugwump => }/Mugwump.cs | 0 .../csharp/{Mugwump => }/Mugwump.csproj | 0 62_Mugwump/csharp/Mugwump.sln | 31 +++++++------------ 62_Mugwump/csharp/{Mugwump => }/Offset.cs | 0 62_Mugwump/csharp/{Mugwump => }/Position.cs | 0 62_Mugwump/csharp/{Mugwump => }/Program.cs | 0 .../csharp/{Mugwump => }/Strings/Intro.txt | 0 10 files changed, 11 insertions(+), 20 deletions(-) rename 62_Mugwump/csharp/{Mugwump => }/Game.cs (100%) rename 62_Mugwump/csharp/{Mugwump => }/Grid.cs (100%) rename 62_Mugwump/csharp/{Mugwump => }/Input.cs (100%) rename 62_Mugwump/csharp/{Mugwump => }/Mugwump.cs (100%) rename 62_Mugwump/csharp/{Mugwump => }/Mugwump.csproj (100%) rename 62_Mugwump/csharp/{Mugwump => }/Offset.cs (100%) rename 62_Mugwump/csharp/{Mugwump => }/Position.cs (100%) rename 62_Mugwump/csharp/{Mugwump => }/Program.cs (100%) rename 62_Mugwump/csharp/{Mugwump => }/Strings/Intro.txt (100%) diff --git a/62_Mugwump/csharp/Mugwump/Game.cs b/62_Mugwump/csharp/Game.cs similarity index 100% rename from 62_Mugwump/csharp/Mugwump/Game.cs rename to 62_Mugwump/csharp/Game.cs diff --git a/62_Mugwump/csharp/Mugwump/Grid.cs b/62_Mugwump/csharp/Grid.cs similarity index 100% rename from 62_Mugwump/csharp/Mugwump/Grid.cs rename to 62_Mugwump/csharp/Grid.cs diff --git a/62_Mugwump/csharp/Mugwump/Input.cs b/62_Mugwump/csharp/Input.cs similarity index 100% rename from 62_Mugwump/csharp/Mugwump/Input.cs rename to 62_Mugwump/csharp/Input.cs diff --git a/62_Mugwump/csharp/Mugwump/Mugwump.cs b/62_Mugwump/csharp/Mugwump.cs similarity index 100% rename from 62_Mugwump/csharp/Mugwump/Mugwump.cs rename to 62_Mugwump/csharp/Mugwump.cs diff --git a/62_Mugwump/csharp/Mugwump/Mugwump.csproj b/62_Mugwump/csharp/Mugwump.csproj similarity index 100% rename from 62_Mugwump/csharp/Mugwump/Mugwump.csproj rename to 62_Mugwump/csharp/Mugwump.csproj diff --git a/62_Mugwump/csharp/Mugwump.sln b/62_Mugwump/csharp/Mugwump.sln index bc3cfbff..ab99858a 100644 --- a/62_Mugwump/csharp/Mugwump.sln +++ b/62_Mugwump/csharp/Mugwump.sln @@ -1,34 +1,25 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26124.0 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32014.148 MinimumVisualStudioVersion = 15.0.26124.0 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mugwump", "Mugwump\Mugwump.csproj", "{83F42802-4E7C-49B5-A022-DB9B6A65F2C6}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mugwump", "Mugwump.csproj", "{DB23BDB0-10A4-4771-B942-E646A1A5C416}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU - Release|x64 = Release|x64 - Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {DB23BDB0-10A4-4771-B942-E646A1A5C416}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DB23BDB0-10A4-4771-B942-E646A1A5C416}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DB23BDB0-10A4-4771-B942-E646A1A5C416}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DB23BDB0-10A4-4771-B942-E646A1A5C416}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {83F42802-4E7C-49B5-A022-DB9B6A65F2C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {83F42802-4E7C-49B5-A022-DB9B6A65F2C6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {83F42802-4E7C-49B5-A022-DB9B6A65F2C6}.Debug|x64.ActiveCfg = Debug|Any CPU - {83F42802-4E7C-49B5-A022-DB9B6A65F2C6}.Debug|x64.Build.0 = Debug|Any CPU - {83F42802-4E7C-49B5-A022-DB9B6A65F2C6}.Debug|x86.ActiveCfg = Debug|Any CPU - {83F42802-4E7C-49B5-A022-DB9B6A65F2C6}.Debug|x86.Build.0 = Debug|Any CPU - {83F42802-4E7C-49B5-A022-DB9B6A65F2C6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {83F42802-4E7C-49B5-A022-DB9B6A65F2C6}.Release|Any CPU.Build.0 = Release|Any CPU - {83F42802-4E7C-49B5-A022-DB9B6A65F2C6}.Release|x64.ActiveCfg = Release|Any CPU - {83F42802-4E7C-49B5-A022-DB9B6A65F2C6}.Release|x64.Build.0 = Release|Any CPU - {83F42802-4E7C-49B5-A022-DB9B6A65F2C6}.Release|x86.ActiveCfg = Release|Any CPU - {83F42802-4E7C-49B5-A022-DB9B6A65F2C6}.Release|x86.Build.0 = Release|Any CPU + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {1FE34948-9066-4F57-A4C1-423293A430C5} EndGlobalSection EndGlobal diff --git a/62_Mugwump/csharp/Mugwump/Offset.cs b/62_Mugwump/csharp/Offset.cs similarity index 100% rename from 62_Mugwump/csharp/Mugwump/Offset.cs rename to 62_Mugwump/csharp/Offset.cs diff --git a/62_Mugwump/csharp/Mugwump/Position.cs b/62_Mugwump/csharp/Position.cs similarity index 100% rename from 62_Mugwump/csharp/Mugwump/Position.cs rename to 62_Mugwump/csharp/Position.cs diff --git a/62_Mugwump/csharp/Mugwump/Program.cs b/62_Mugwump/csharp/Program.cs similarity index 100% rename from 62_Mugwump/csharp/Mugwump/Program.cs rename to 62_Mugwump/csharp/Program.cs diff --git a/62_Mugwump/csharp/Mugwump/Strings/Intro.txt b/62_Mugwump/csharp/Strings/Intro.txt similarity index 100% rename from 62_Mugwump/csharp/Mugwump/Strings/Intro.txt rename to 62_Mugwump/csharp/Strings/Intro.txt From 66393f12358c3f0a51acc05c3ee631132b6fc50a Mon Sep 17 00:00:00 2001 From: Zev Spitz Date: Mon, 17 Jan 2022 11:52:48 +0200 Subject: [PATCH 22/29] Simplify Stars (C#) folder structure --- 82_Stars/csharp/{Stars => }/Game.cs | 0 82_Stars/csharp/{Stars => }/Input.cs | 0 82_Stars/csharp/{Stars => }/Program.cs | 0 82_Stars/csharp/{Stars => }/Stars.csproj | 0 82_Stars/csharp/Stars.sln | 31 +++++++++--------------- 5 files changed, 11 insertions(+), 20 deletions(-) rename 82_Stars/csharp/{Stars => }/Game.cs (100%) rename 82_Stars/csharp/{Stars => }/Input.cs (100%) rename 82_Stars/csharp/{Stars => }/Program.cs (100%) rename 82_Stars/csharp/{Stars => }/Stars.csproj (100%) diff --git a/82_Stars/csharp/Stars/Game.cs b/82_Stars/csharp/Game.cs similarity index 100% rename from 82_Stars/csharp/Stars/Game.cs rename to 82_Stars/csharp/Game.cs diff --git a/82_Stars/csharp/Stars/Input.cs b/82_Stars/csharp/Input.cs similarity index 100% rename from 82_Stars/csharp/Stars/Input.cs rename to 82_Stars/csharp/Input.cs diff --git a/82_Stars/csharp/Stars/Program.cs b/82_Stars/csharp/Program.cs similarity index 100% rename from 82_Stars/csharp/Stars/Program.cs rename to 82_Stars/csharp/Program.cs diff --git a/82_Stars/csharp/Stars/Stars.csproj b/82_Stars/csharp/Stars.csproj similarity index 100% rename from 82_Stars/csharp/Stars/Stars.csproj rename to 82_Stars/csharp/Stars.csproj diff --git a/82_Stars/csharp/Stars.sln b/82_Stars/csharp/Stars.sln index 5f85e6b7..19c3a265 100644 --- a/82_Stars/csharp/Stars.sln +++ b/82_Stars/csharp/Stars.sln @@ -1,34 +1,25 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26124.0 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32014.148 MinimumVisualStudioVersion = 15.0.26124.0 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Stars", "Stars\Stars.csproj", "{5832C21C-4DE5-475E-893D-745DA15F1AAC}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stars", "Stars.csproj", "{F03C19DA-0F5D-45F4-B85E-E3ABCA197D4B}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU - Release|x64 = Release|x64 - Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {F03C19DA-0F5D-45F4-B85E-E3ABCA197D4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F03C19DA-0F5D-45F4-B85E-E3ABCA197D4B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F03C19DA-0F5D-45F4-B85E-E3ABCA197D4B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F03C19DA-0F5D-45F4-B85E-E3ABCA197D4B}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {5832C21C-4DE5-475E-893D-745DA15F1AAC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5832C21C-4DE5-475E-893D-745DA15F1AAC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5832C21C-4DE5-475E-893D-745DA15F1AAC}.Debug|x64.ActiveCfg = Debug|Any CPU - {5832C21C-4DE5-475E-893D-745DA15F1AAC}.Debug|x64.Build.0 = Debug|Any CPU - {5832C21C-4DE5-475E-893D-745DA15F1AAC}.Debug|x86.ActiveCfg = Debug|Any CPU - {5832C21C-4DE5-475E-893D-745DA15F1AAC}.Debug|x86.Build.0 = Debug|Any CPU - {5832C21C-4DE5-475E-893D-745DA15F1AAC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5832C21C-4DE5-475E-893D-745DA15F1AAC}.Release|Any CPU.Build.0 = Release|Any CPU - {5832C21C-4DE5-475E-893D-745DA15F1AAC}.Release|x64.ActiveCfg = Release|Any CPU - {5832C21C-4DE5-475E-893D-745DA15F1AAC}.Release|x64.Build.0 = Release|Any CPU - {5832C21C-4DE5-475E-893D-745DA15F1AAC}.Release|x86.ActiveCfg = Release|Any CPU - {5832C21C-4DE5-475E-893D-745DA15F1AAC}.Release|x86.Build.0 = Release|Any CPU + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {0752CA22-85F0-43AE-8B79-7A611531CAF7} EndGlobalSection EndGlobal From e69a3d4b3f14f4d731be997fdc51aa96d62e2378 Mon Sep 17 00:00:00 2001 From: Zev Spitz Date: Mon, 17 Jan 2022 11:56:20 +0200 Subject: [PATCH 23/29] Simplify StockMarket (C#) folder structure --- 83_Stock_Market/csharp/{src => }/Assets.cs | 0 83_Stock_Market/csharp/{src => }/Broker.cs | 0 83_Stock_Market/csharp/{src => }/Company.cs | 0 83_Stock_Market/csharp/{src => }/Controller.cs | 0 .../{src => }/Extensions/EnumerableExtensions.cs | 0 .../Extensions/ImmutableArrayExtensions.cs | 0 .../{src => }/Extensions/RandomExtensions.cs | 0 83_Stock_Market/csharp/{src => }/Program.cs | 0 83_Stock_Market/csharp/{src => }/StockMarket.cs | 0 .../csharp/{Game.csproj => StockMarket.csproj} | 0 83_Stock_Market/csharp/StockMarket.sln | 14 +++++++------- 83_Stock_Market/csharp/{src => }/TradingDay.cs | 0 .../csharp/{src => }/TransactionResult.cs | 0 83_Stock_Market/csharp/{src => }/View.cs | 0 14 files changed, 7 insertions(+), 7 deletions(-) rename 83_Stock_Market/csharp/{src => }/Assets.cs (100%) rename 83_Stock_Market/csharp/{src => }/Broker.cs (100%) rename 83_Stock_Market/csharp/{src => }/Company.cs (100%) rename 83_Stock_Market/csharp/{src => }/Controller.cs (100%) rename 83_Stock_Market/csharp/{src => }/Extensions/EnumerableExtensions.cs (100%) rename 83_Stock_Market/csharp/{src => }/Extensions/ImmutableArrayExtensions.cs (100%) rename 83_Stock_Market/csharp/{src => }/Extensions/RandomExtensions.cs (100%) rename 83_Stock_Market/csharp/{src => }/Program.cs (100%) rename 83_Stock_Market/csharp/{src => }/StockMarket.cs (100%) rename 83_Stock_Market/csharp/{Game.csproj => StockMarket.csproj} (100%) rename 83_Stock_Market/csharp/{src => }/TradingDay.cs (100%) rename 83_Stock_Market/csharp/{src => }/TransactionResult.cs (100%) rename 83_Stock_Market/csharp/{src => }/View.cs (100%) diff --git a/83_Stock_Market/csharp/src/Assets.cs b/83_Stock_Market/csharp/Assets.cs similarity index 100% rename from 83_Stock_Market/csharp/src/Assets.cs rename to 83_Stock_Market/csharp/Assets.cs diff --git a/83_Stock_Market/csharp/src/Broker.cs b/83_Stock_Market/csharp/Broker.cs similarity index 100% rename from 83_Stock_Market/csharp/src/Broker.cs rename to 83_Stock_Market/csharp/Broker.cs diff --git a/83_Stock_Market/csharp/src/Company.cs b/83_Stock_Market/csharp/Company.cs similarity index 100% rename from 83_Stock_Market/csharp/src/Company.cs rename to 83_Stock_Market/csharp/Company.cs diff --git a/83_Stock_Market/csharp/src/Controller.cs b/83_Stock_Market/csharp/Controller.cs similarity index 100% rename from 83_Stock_Market/csharp/src/Controller.cs rename to 83_Stock_Market/csharp/Controller.cs diff --git a/83_Stock_Market/csharp/src/Extensions/EnumerableExtensions.cs b/83_Stock_Market/csharp/Extensions/EnumerableExtensions.cs similarity index 100% rename from 83_Stock_Market/csharp/src/Extensions/EnumerableExtensions.cs rename to 83_Stock_Market/csharp/Extensions/EnumerableExtensions.cs diff --git a/83_Stock_Market/csharp/src/Extensions/ImmutableArrayExtensions.cs b/83_Stock_Market/csharp/Extensions/ImmutableArrayExtensions.cs similarity index 100% rename from 83_Stock_Market/csharp/src/Extensions/ImmutableArrayExtensions.cs rename to 83_Stock_Market/csharp/Extensions/ImmutableArrayExtensions.cs diff --git a/83_Stock_Market/csharp/src/Extensions/RandomExtensions.cs b/83_Stock_Market/csharp/Extensions/RandomExtensions.cs similarity index 100% rename from 83_Stock_Market/csharp/src/Extensions/RandomExtensions.cs rename to 83_Stock_Market/csharp/Extensions/RandomExtensions.cs diff --git a/83_Stock_Market/csharp/src/Program.cs b/83_Stock_Market/csharp/Program.cs similarity index 100% rename from 83_Stock_Market/csharp/src/Program.cs rename to 83_Stock_Market/csharp/Program.cs diff --git a/83_Stock_Market/csharp/src/StockMarket.cs b/83_Stock_Market/csharp/StockMarket.cs similarity index 100% rename from 83_Stock_Market/csharp/src/StockMarket.cs rename to 83_Stock_Market/csharp/StockMarket.cs diff --git a/83_Stock_Market/csharp/Game.csproj b/83_Stock_Market/csharp/StockMarket.csproj similarity index 100% rename from 83_Stock_Market/csharp/Game.csproj rename to 83_Stock_Market/csharp/StockMarket.csproj diff --git a/83_Stock_Market/csharp/StockMarket.sln b/83_Stock_Market/csharp/StockMarket.sln index 5bfb67aa..ab159a5b 100644 --- a/83_Stock_Market/csharp/StockMarket.sln +++ b/83_Stock_Market/csharp/StockMarket.sln @@ -1,9 +1,9 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.31321.278 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32014.148 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Game", "Game.csproj", "{BADD262D-D540-431F-8803-2A6F80C22033}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StockMarket", "StockMarket.csproj", "{B4C15C31-EB2D-4AAF-8380-5F2EBC0DD9D0}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -11,10 +11,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {BADD262D-D540-431F-8803-2A6F80C22033}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BADD262D-D540-431F-8803-2A6F80C22033}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BADD262D-D540-431F-8803-2A6F80C22033}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BADD262D-D540-431F-8803-2A6F80C22033}.Release|Any CPU.Build.0 = Release|Any CPU + {B4C15C31-EB2D-4AAF-8380-5F2EBC0DD9D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B4C15C31-EB2D-4AAF-8380-5F2EBC0DD9D0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B4C15C31-EB2D-4AAF-8380-5F2EBC0DD9D0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B4C15C31-EB2D-4AAF-8380-5F2EBC0DD9D0}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/83_Stock_Market/csharp/src/TradingDay.cs b/83_Stock_Market/csharp/TradingDay.cs similarity index 100% rename from 83_Stock_Market/csharp/src/TradingDay.cs rename to 83_Stock_Market/csharp/TradingDay.cs diff --git a/83_Stock_Market/csharp/src/TransactionResult.cs b/83_Stock_Market/csharp/TransactionResult.cs similarity index 100% rename from 83_Stock_Market/csharp/src/TransactionResult.cs rename to 83_Stock_Market/csharp/TransactionResult.cs diff --git a/83_Stock_Market/csharp/src/View.cs b/83_Stock_Market/csharp/View.cs similarity index 100% rename from 83_Stock_Market/csharp/src/View.cs rename to 83_Stock_Market/csharp/View.cs From eded164f64ac1409539b09d7a8386327a33e18b2 Mon Sep 17 00:00:00 2001 From: Zev Spitz Date: Mon, 17 Jan 2022 11:59:02 +0200 Subject: [PATCH 24/29] Simplify Target (C#) folder strucure --- 86_Target/csharp/{Target => }/Angle.cs | 0 86_Target/csharp/{Target => }/Explosion.cs | 0 86_Target/csharp/{Target => }/FiringRange.cs | 0 86_Target/csharp/{Target => }/Game.cs | 0 86_Target/csharp/{Target => }/Input.cs | 0 86_Target/csharp/{Target => }/Offset.cs | 0 86_Target/csharp/{Target => }/Point.cs | 0 86_Target/csharp/{Target => }/Program.cs | 0 .../csharp/{Target => }/RandomExtensions.cs | 0 .../Strings/TitleAndInstructions.txt | 0 86_Target/csharp/{Target => }/Target.csproj | 0 86_Target/csharp/Target.sln | 31 +++++++------------ 12 files changed, 11 insertions(+), 20 deletions(-) rename 86_Target/csharp/{Target => }/Angle.cs (100%) rename 86_Target/csharp/{Target => }/Explosion.cs (100%) rename 86_Target/csharp/{Target => }/FiringRange.cs (100%) rename 86_Target/csharp/{Target => }/Game.cs (100%) rename 86_Target/csharp/{Target => }/Input.cs (100%) rename 86_Target/csharp/{Target => }/Offset.cs (100%) rename 86_Target/csharp/{Target => }/Point.cs (100%) rename 86_Target/csharp/{Target => }/Program.cs (100%) rename 86_Target/csharp/{Target => }/RandomExtensions.cs (100%) rename 86_Target/csharp/{Target => }/Strings/TitleAndInstructions.txt (100%) rename 86_Target/csharp/{Target => }/Target.csproj (100%) diff --git a/86_Target/csharp/Target/Angle.cs b/86_Target/csharp/Angle.cs similarity index 100% rename from 86_Target/csharp/Target/Angle.cs rename to 86_Target/csharp/Angle.cs diff --git a/86_Target/csharp/Target/Explosion.cs b/86_Target/csharp/Explosion.cs similarity index 100% rename from 86_Target/csharp/Target/Explosion.cs rename to 86_Target/csharp/Explosion.cs diff --git a/86_Target/csharp/Target/FiringRange.cs b/86_Target/csharp/FiringRange.cs similarity index 100% rename from 86_Target/csharp/Target/FiringRange.cs rename to 86_Target/csharp/FiringRange.cs diff --git a/86_Target/csharp/Target/Game.cs b/86_Target/csharp/Game.cs similarity index 100% rename from 86_Target/csharp/Target/Game.cs rename to 86_Target/csharp/Game.cs diff --git a/86_Target/csharp/Target/Input.cs b/86_Target/csharp/Input.cs similarity index 100% rename from 86_Target/csharp/Target/Input.cs rename to 86_Target/csharp/Input.cs diff --git a/86_Target/csharp/Target/Offset.cs b/86_Target/csharp/Offset.cs similarity index 100% rename from 86_Target/csharp/Target/Offset.cs rename to 86_Target/csharp/Offset.cs diff --git a/86_Target/csharp/Target/Point.cs b/86_Target/csharp/Point.cs similarity index 100% rename from 86_Target/csharp/Target/Point.cs rename to 86_Target/csharp/Point.cs diff --git a/86_Target/csharp/Target/Program.cs b/86_Target/csharp/Program.cs similarity index 100% rename from 86_Target/csharp/Target/Program.cs rename to 86_Target/csharp/Program.cs diff --git a/86_Target/csharp/Target/RandomExtensions.cs b/86_Target/csharp/RandomExtensions.cs similarity index 100% rename from 86_Target/csharp/Target/RandomExtensions.cs rename to 86_Target/csharp/RandomExtensions.cs diff --git a/86_Target/csharp/Target/Strings/TitleAndInstructions.txt b/86_Target/csharp/Strings/TitleAndInstructions.txt similarity index 100% rename from 86_Target/csharp/Target/Strings/TitleAndInstructions.txt rename to 86_Target/csharp/Strings/TitleAndInstructions.txt diff --git a/86_Target/csharp/Target/Target.csproj b/86_Target/csharp/Target.csproj similarity index 100% rename from 86_Target/csharp/Target/Target.csproj rename to 86_Target/csharp/Target.csproj diff --git a/86_Target/csharp/Target.sln b/86_Target/csharp/Target.sln index 3e111702..9aa2c86d 100644 --- a/86_Target/csharp/Target.sln +++ b/86_Target/csharp/Target.sln @@ -1,34 +1,25 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26124.0 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32014.148 MinimumVisualStudioVersion = 15.0.26124.0 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Target", "Target\Target.csproj", "{8B0B5114-1D05-4F8D-B328-EA2FB89992E7}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Target", "Target.csproj", "{DF03CFDB-2857-4416-A07A-80D84874F46E}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU - Release|x64 = Release|x64 - Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {DF03CFDB-2857-4416-A07A-80D84874F46E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DF03CFDB-2857-4416-A07A-80D84874F46E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DF03CFDB-2857-4416-A07A-80D84874F46E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DF03CFDB-2857-4416-A07A-80D84874F46E}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {8B0B5114-1D05-4F8D-B328-EA2FB89992E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8B0B5114-1D05-4F8D-B328-EA2FB89992E7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8B0B5114-1D05-4F8D-B328-EA2FB89992E7}.Debug|x64.ActiveCfg = Debug|Any CPU - {8B0B5114-1D05-4F8D-B328-EA2FB89992E7}.Debug|x64.Build.0 = Debug|Any CPU - {8B0B5114-1D05-4F8D-B328-EA2FB89992E7}.Debug|x86.ActiveCfg = Debug|Any CPU - {8B0B5114-1D05-4F8D-B328-EA2FB89992E7}.Debug|x86.Build.0 = Debug|Any CPU - {8B0B5114-1D05-4F8D-B328-EA2FB89992E7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8B0B5114-1D05-4F8D-B328-EA2FB89992E7}.Release|Any CPU.Build.0 = Release|Any CPU - {8B0B5114-1D05-4F8D-B328-EA2FB89992E7}.Release|x64.ActiveCfg = Release|Any CPU - {8B0B5114-1D05-4F8D-B328-EA2FB89992E7}.Release|x64.Build.0 = Release|Any CPU - {8B0B5114-1D05-4F8D-B328-EA2FB89992E7}.Release|x86.ActiveCfg = Release|Any CPU - {8B0B5114-1D05-4F8D-B328-EA2FB89992E7}.Release|x86.Build.0 = Release|Any CPU + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {B49DF932-4DF9-44C3-B63F-FD9443B4DDD2} EndGlobalSection EndGlobal From eaed38c036e6794ad73e607a4cfeaee6def94718 Mon Sep 17 00:00:00 2001 From: Zev Spitz Date: Mon, 17 Jan 2022 15:11:35 +0200 Subject: [PATCH 25/29] Simplify 3-D Plot (C#) folder structure --- 87_3-D_Plot/csharp/{Plot => }/Function.cs | 0 87_3-D_Plot/csharp/{Plot => }/Plot.csproj | 0 87_3-D_Plot/csharp/Plot.sln | 31 ++++++++--------------- 87_3-D_Plot/csharp/{Plot => }/Program.cs | 0 4 files changed, 11 insertions(+), 20 deletions(-) rename 87_3-D_Plot/csharp/{Plot => }/Function.cs (100%) rename 87_3-D_Plot/csharp/{Plot => }/Plot.csproj (100%) rename 87_3-D_Plot/csharp/{Plot => }/Program.cs (100%) diff --git a/87_3-D_Plot/csharp/Plot/Function.cs b/87_3-D_Plot/csharp/Function.cs similarity index 100% rename from 87_3-D_Plot/csharp/Plot/Function.cs rename to 87_3-D_Plot/csharp/Function.cs diff --git a/87_3-D_Plot/csharp/Plot/Plot.csproj b/87_3-D_Plot/csharp/Plot.csproj similarity index 100% rename from 87_3-D_Plot/csharp/Plot/Plot.csproj rename to 87_3-D_Plot/csharp/Plot.csproj diff --git a/87_3-D_Plot/csharp/Plot.sln b/87_3-D_Plot/csharp/Plot.sln index 1402bc2a..b296ace9 100644 --- a/87_3-D_Plot/csharp/Plot.sln +++ b/87_3-D_Plot/csharp/Plot.sln @@ -1,34 +1,25 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26124.0 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32014.148 MinimumVisualStudioVersion = 15.0.26124.0 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plot", "Plot\Plot.csproj", "{8857AE83-F481-43B0-AA51-D78E1340BD93}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Plot", "Plot.csproj", "{8000A3CF-612D-4FB7-B53D-885BB6E5492B}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU - Release|x64 = Release|x64 - Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {8000A3CF-612D-4FB7-B53D-885BB6E5492B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8000A3CF-612D-4FB7-B53D-885BB6E5492B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8000A3CF-612D-4FB7-B53D-885BB6E5492B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8000A3CF-612D-4FB7-B53D-885BB6E5492B}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {8857AE83-F481-43B0-AA51-D78E1340BD93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8857AE83-F481-43B0-AA51-D78E1340BD93}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8857AE83-F481-43B0-AA51-D78E1340BD93}.Debug|x64.ActiveCfg = Debug|Any CPU - {8857AE83-F481-43B0-AA51-D78E1340BD93}.Debug|x64.Build.0 = Debug|Any CPU - {8857AE83-F481-43B0-AA51-D78E1340BD93}.Debug|x86.ActiveCfg = Debug|Any CPU - {8857AE83-F481-43B0-AA51-D78E1340BD93}.Debug|x86.Build.0 = Debug|Any CPU - {8857AE83-F481-43B0-AA51-D78E1340BD93}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8857AE83-F481-43B0-AA51-D78E1340BD93}.Release|Any CPU.Build.0 = Release|Any CPU - {8857AE83-F481-43B0-AA51-D78E1340BD93}.Release|x64.ActiveCfg = Release|Any CPU - {8857AE83-F481-43B0-AA51-D78E1340BD93}.Release|x64.Build.0 = Release|Any CPU - {8857AE83-F481-43B0-AA51-D78E1340BD93}.Release|x86.ActiveCfg = Release|Any CPU - {8857AE83-F481-43B0-AA51-D78E1340BD93}.Release|x86.Build.0 = Release|Any CPU + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {5DE8E572-67C9-4DE3-B851-447B78FE983A} EndGlobalSection EndGlobal diff --git a/87_3-D_Plot/csharp/Plot/Program.cs b/87_3-D_Plot/csharp/Program.cs similarity index 100% rename from 87_3-D_Plot/csharp/Plot/Program.cs rename to 87_3-D_Plot/csharp/Program.cs From d35fa5a54694ed79160d133f314d13e0cf2fade3 Mon Sep 17 00:00:00 2001 From: Zev Spitz Date: Mon, 17 Jan 2022 15:17:54 +0200 Subject: [PATCH 26/29] Simplify TicTacToe (C#) folder structure --- .../csharp/{tictactoe1 => }/Program.cs | 0 .../tictactoe1.csproj => TicTacToe.csproj} | 0 89_Tic-Tac-Toe/csharp/TicTacToe.sln | 19 +++++++++++-------- 3 files changed, 11 insertions(+), 8 deletions(-) rename 89_Tic-Tac-Toe/csharp/{tictactoe1 => }/Program.cs (100%) rename 89_Tic-Tac-Toe/csharp/{tictactoe1/tictactoe1.csproj => TicTacToe.csproj} (100%) diff --git a/89_Tic-Tac-Toe/csharp/tictactoe1/Program.cs b/89_Tic-Tac-Toe/csharp/Program.cs similarity index 100% rename from 89_Tic-Tac-Toe/csharp/tictactoe1/Program.cs rename to 89_Tic-Tac-Toe/csharp/Program.cs diff --git a/89_Tic-Tac-Toe/csharp/tictactoe1/tictactoe1.csproj b/89_Tic-Tac-Toe/csharp/TicTacToe.csproj similarity index 100% rename from 89_Tic-Tac-Toe/csharp/tictactoe1/tictactoe1.csproj rename to 89_Tic-Tac-Toe/csharp/TicTacToe.csproj diff --git a/89_Tic-Tac-Toe/csharp/TicTacToe.sln b/89_Tic-Tac-Toe/csharp/TicTacToe.sln index c26bd1b4..f334433a 100644 --- a/89_Tic-Tac-Toe/csharp/TicTacToe.sln +++ b/89_Tic-Tac-Toe/csharp/TicTacToe.sln @@ -1,22 +1,25 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.30114.105 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32014.148 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "tictactoe1", "tictactoe1\tictactoe1.csproj", "{FE9379CF-AF73-43DA-8FEC-2BCA7FA13A5E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TicTacToe", "TicTacToe.csproj", "{A318881A-DA1A-499C-8820-69A1BF02B824}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {A318881A-DA1A-499C-8820-69A1BF02B824}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A318881A-DA1A-499C-8820-69A1BF02B824}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A318881A-DA1A-499C-8820-69A1BF02B824}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A318881A-DA1A-499C-8820-69A1BF02B824}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {FE9379CF-AF73-43DA-8FEC-2BCA7FA13A5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FE9379CF-AF73-43DA-8FEC-2BCA7FA13A5E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FE9379CF-AF73-43DA-8FEC-2BCA7FA13A5E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FE9379CF-AF73-43DA-8FEC-2BCA7FA13A5E}.Release|Any CPU.Build.0 = Release|Any CPU + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {B5343227-EE3B-4829-AC09-DF6702D24501} EndGlobalSection EndGlobal From 3b896fc1447f640313fc50eaed91ce7d624a341f Mon Sep 17 00:00:00 2001 From: Zev Spitz Date: Mon, 17 Jan 2022 15:25:01 +0200 Subject: [PATCH 27/29] Simplify Tower (C#) folder structure --- 90_Tower/csharp/{Tower => }/Game.cs | 0 90_Tower/csharp/{Tower => }/Models/Needle.cs | 0 90_Tower/csharp/{Tower => }/Models/Towers.cs | 0 90_Tower/csharp/{Tower => }/Program.cs | 0 .../{Tower => }/Resources/Congratulations.txt | 0 .../{Tower => }/Resources/DiskCountPrompt.txt | 0 .../{Tower => }/Resources/DiskCountQuit.txt | 0 .../{Tower => }/Resources/DiskCountRetry.txt | 0 .../{Tower => }/Resources/DiskNotInPlay.txt | 0 .../{Tower => }/Resources/DiskPrompt.txt | 0 .../csharp/{Tower => }/Resources/DiskQuit.txt | 0 .../{Tower => }/Resources/DiskRetry.txt | 0 .../{Tower => }/Resources/DiskUnavailable.txt | 0 .../{Tower => }/Resources/IllegalMove.txt | 0 .../{Tower => }/Resources/Instructions.txt | 0 .../csharp/{Tower => }/Resources/Intro.txt | 0 .../{Tower => }/Resources/NeedlePrompt.txt | 0 .../{Tower => }/Resources/NeedleQuit.txt | 0 .../{Tower => }/Resources/NeedleRetry.txt | 0 .../{Tower => }/Resources/PlayAgainPrompt.txt | 0 .../csharp/{Tower => }/Resources/Strings.cs | 0 .../{Tower => }/Resources/TaskFinished.txt | 0 .../csharp/{Tower => }/Resources/Thanks.txt | 0 .../csharp/{Tower => }/Resources/Title.txt | 0 .../{Tower => }/Resources/TooManyMoves.txt | 0 .../{Tower => }/Resources/YesNoPrompt.txt | 0 90_Tower/csharp/{Tower => }/Tower.csproj | 0 90_Tower/csharp/Tower.sln | 31 +++++++------------ 90_Tower/csharp/{Tower => }/UI/Input.cs | 0 90_Tower/csharp/{Tower => }/UI/Prompt.cs | 0 .../csharp/{Tower => }/UI/TowerDisplay.cs | 0 31 files changed, 11 insertions(+), 20 deletions(-) rename 90_Tower/csharp/{Tower => }/Game.cs (100%) rename 90_Tower/csharp/{Tower => }/Models/Needle.cs (100%) rename 90_Tower/csharp/{Tower => }/Models/Towers.cs (100%) rename 90_Tower/csharp/{Tower => }/Program.cs (100%) rename 90_Tower/csharp/{Tower => }/Resources/Congratulations.txt (100%) rename 90_Tower/csharp/{Tower => }/Resources/DiskCountPrompt.txt (100%) rename 90_Tower/csharp/{Tower => }/Resources/DiskCountQuit.txt (100%) rename 90_Tower/csharp/{Tower => }/Resources/DiskCountRetry.txt (100%) rename 90_Tower/csharp/{Tower => }/Resources/DiskNotInPlay.txt (100%) rename 90_Tower/csharp/{Tower => }/Resources/DiskPrompt.txt (100%) rename 90_Tower/csharp/{Tower => }/Resources/DiskQuit.txt (100%) rename 90_Tower/csharp/{Tower => }/Resources/DiskRetry.txt (100%) rename 90_Tower/csharp/{Tower => }/Resources/DiskUnavailable.txt (100%) rename 90_Tower/csharp/{Tower => }/Resources/IllegalMove.txt (100%) rename 90_Tower/csharp/{Tower => }/Resources/Instructions.txt (100%) rename 90_Tower/csharp/{Tower => }/Resources/Intro.txt (100%) rename 90_Tower/csharp/{Tower => }/Resources/NeedlePrompt.txt (100%) rename 90_Tower/csharp/{Tower => }/Resources/NeedleQuit.txt (100%) rename 90_Tower/csharp/{Tower => }/Resources/NeedleRetry.txt (100%) rename 90_Tower/csharp/{Tower => }/Resources/PlayAgainPrompt.txt (100%) rename 90_Tower/csharp/{Tower => }/Resources/Strings.cs (100%) rename 90_Tower/csharp/{Tower => }/Resources/TaskFinished.txt (100%) rename 90_Tower/csharp/{Tower => }/Resources/Thanks.txt (100%) rename 90_Tower/csharp/{Tower => }/Resources/Title.txt (100%) rename 90_Tower/csharp/{Tower => }/Resources/TooManyMoves.txt (100%) rename 90_Tower/csharp/{Tower => }/Resources/YesNoPrompt.txt (100%) rename 90_Tower/csharp/{Tower => }/Tower.csproj (100%) rename 90_Tower/csharp/{Tower => }/UI/Input.cs (100%) rename 90_Tower/csharp/{Tower => }/UI/Prompt.cs (100%) rename 90_Tower/csharp/{Tower => }/UI/TowerDisplay.cs (100%) diff --git a/90_Tower/csharp/Tower/Game.cs b/90_Tower/csharp/Game.cs similarity index 100% rename from 90_Tower/csharp/Tower/Game.cs rename to 90_Tower/csharp/Game.cs diff --git a/90_Tower/csharp/Tower/Models/Needle.cs b/90_Tower/csharp/Models/Needle.cs similarity index 100% rename from 90_Tower/csharp/Tower/Models/Needle.cs rename to 90_Tower/csharp/Models/Needle.cs diff --git a/90_Tower/csharp/Tower/Models/Towers.cs b/90_Tower/csharp/Models/Towers.cs similarity index 100% rename from 90_Tower/csharp/Tower/Models/Towers.cs rename to 90_Tower/csharp/Models/Towers.cs diff --git a/90_Tower/csharp/Tower/Program.cs b/90_Tower/csharp/Program.cs similarity index 100% rename from 90_Tower/csharp/Tower/Program.cs rename to 90_Tower/csharp/Program.cs diff --git a/90_Tower/csharp/Tower/Resources/Congratulations.txt b/90_Tower/csharp/Resources/Congratulations.txt similarity index 100% rename from 90_Tower/csharp/Tower/Resources/Congratulations.txt rename to 90_Tower/csharp/Resources/Congratulations.txt diff --git a/90_Tower/csharp/Tower/Resources/DiskCountPrompt.txt b/90_Tower/csharp/Resources/DiskCountPrompt.txt similarity index 100% rename from 90_Tower/csharp/Tower/Resources/DiskCountPrompt.txt rename to 90_Tower/csharp/Resources/DiskCountPrompt.txt diff --git a/90_Tower/csharp/Tower/Resources/DiskCountQuit.txt b/90_Tower/csharp/Resources/DiskCountQuit.txt similarity index 100% rename from 90_Tower/csharp/Tower/Resources/DiskCountQuit.txt rename to 90_Tower/csharp/Resources/DiskCountQuit.txt diff --git a/90_Tower/csharp/Tower/Resources/DiskCountRetry.txt b/90_Tower/csharp/Resources/DiskCountRetry.txt similarity index 100% rename from 90_Tower/csharp/Tower/Resources/DiskCountRetry.txt rename to 90_Tower/csharp/Resources/DiskCountRetry.txt diff --git a/90_Tower/csharp/Tower/Resources/DiskNotInPlay.txt b/90_Tower/csharp/Resources/DiskNotInPlay.txt similarity index 100% rename from 90_Tower/csharp/Tower/Resources/DiskNotInPlay.txt rename to 90_Tower/csharp/Resources/DiskNotInPlay.txt diff --git a/90_Tower/csharp/Tower/Resources/DiskPrompt.txt b/90_Tower/csharp/Resources/DiskPrompt.txt similarity index 100% rename from 90_Tower/csharp/Tower/Resources/DiskPrompt.txt rename to 90_Tower/csharp/Resources/DiskPrompt.txt diff --git a/90_Tower/csharp/Tower/Resources/DiskQuit.txt b/90_Tower/csharp/Resources/DiskQuit.txt similarity index 100% rename from 90_Tower/csharp/Tower/Resources/DiskQuit.txt rename to 90_Tower/csharp/Resources/DiskQuit.txt diff --git a/90_Tower/csharp/Tower/Resources/DiskRetry.txt b/90_Tower/csharp/Resources/DiskRetry.txt similarity index 100% rename from 90_Tower/csharp/Tower/Resources/DiskRetry.txt rename to 90_Tower/csharp/Resources/DiskRetry.txt diff --git a/90_Tower/csharp/Tower/Resources/DiskUnavailable.txt b/90_Tower/csharp/Resources/DiskUnavailable.txt similarity index 100% rename from 90_Tower/csharp/Tower/Resources/DiskUnavailable.txt rename to 90_Tower/csharp/Resources/DiskUnavailable.txt diff --git a/90_Tower/csharp/Tower/Resources/IllegalMove.txt b/90_Tower/csharp/Resources/IllegalMove.txt similarity index 100% rename from 90_Tower/csharp/Tower/Resources/IllegalMove.txt rename to 90_Tower/csharp/Resources/IllegalMove.txt diff --git a/90_Tower/csharp/Tower/Resources/Instructions.txt b/90_Tower/csharp/Resources/Instructions.txt similarity index 100% rename from 90_Tower/csharp/Tower/Resources/Instructions.txt rename to 90_Tower/csharp/Resources/Instructions.txt diff --git a/90_Tower/csharp/Tower/Resources/Intro.txt b/90_Tower/csharp/Resources/Intro.txt similarity index 100% rename from 90_Tower/csharp/Tower/Resources/Intro.txt rename to 90_Tower/csharp/Resources/Intro.txt diff --git a/90_Tower/csharp/Tower/Resources/NeedlePrompt.txt b/90_Tower/csharp/Resources/NeedlePrompt.txt similarity index 100% rename from 90_Tower/csharp/Tower/Resources/NeedlePrompt.txt rename to 90_Tower/csharp/Resources/NeedlePrompt.txt diff --git a/90_Tower/csharp/Tower/Resources/NeedleQuit.txt b/90_Tower/csharp/Resources/NeedleQuit.txt similarity index 100% rename from 90_Tower/csharp/Tower/Resources/NeedleQuit.txt rename to 90_Tower/csharp/Resources/NeedleQuit.txt diff --git a/90_Tower/csharp/Tower/Resources/NeedleRetry.txt b/90_Tower/csharp/Resources/NeedleRetry.txt similarity index 100% rename from 90_Tower/csharp/Tower/Resources/NeedleRetry.txt rename to 90_Tower/csharp/Resources/NeedleRetry.txt diff --git a/90_Tower/csharp/Tower/Resources/PlayAgainPrompt.txt b/90_Tower/csharp/Resources/PlayAgainPrompt.txt similarity index 100% rename from 90_Tower/csharp/Tower/Resources/PlayAgainPrompt.txt rename to 90_Tower/csharp/Resources/PlayAgainPrompt.txt diff --git a/90_Tower/csharp/Tower/Resources/Strings.cs b/90_Tower/csharp/Resources/Strings.cs similarity index 100% rename from 90_Tower/csharp/Tower/Resources/Strings.cs rename to 90_Tower/csharp/Resources/Strings.cs diff --git a/90_Tower/csharp/Tower/Resources/TaskFinished.txt b/90_Tower/csharp/Resources/TaskFinished.txt similarity index 100% rename from 90_Tower/csharp/Tower/Resources/TaskFinished.txt rename to 90_Tower/csharp/Resources/TaskFinished.txt diff --git a/90_Tower/csharp/Tower/Resources/Thanks.txt b/90_Tower/csharp/Resources/Thanks.txt similarity index 100% rename from 90_Tower/csharp/Tower/Resources/Thanks.txt rename to 90_Tower/csharp/Resources/Thanks.txt diff --git a/90_Tower/csharp/Tower/Resources/Title.txt b/90_Tower/csharp/Resources/Title.txt similarity index 100% rename from 90_Tower/csharp/Tower/Resources/Title.txt rename to 90_Tower/csharp/Resources/Title.txt diff --git a/90_Tower/csharp/Tower/Resources/TooManyMoves.txt b/90_Tower/csharp/Resources/TooManyMoves.txt similarity index 100% rename from 90_Tower/csharp/Tower/Resources/TooManyMoves.txt rename to 90_Tower/csharp/Resources/TooManyMoves.txt diff --git a/90_Tower/csharp/Tower/Resources/YesNoPrompt.txt b/90_Tower/csharp/Resources/YesNoPrompt.txt similarity index 100% rename from 90_Tower/csharp/Tower/Resources/YesNoPrompt.txt rename to 90_Tower/csharp/Resources/YesNoPrompt.txt diff --git a/90_Tower/csharp/Tower/Tower.csproj b/90_Tower/csharp/Tower.csproj similarity index 100% rename from 90_Tower/csharp/Tower/Tower.csproj rename to 90_Tower/csharp/Tower.csproj diff --git a/90_Tower/csharp/Tower.sln b/90_Tower/csharp/Tower.sln index 2c6e524d..6f87b0b9 100644 --- a/90_Tower/csharp/Tower.sln +++ b/90_Tower/csharp/Tower.sln @@ -1,34 +1,25 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26124.0 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32014.148 MinimumVisualStudioVersion = 15.0.26124.0 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tower", "tower\Tower.csproj", "{2E14FCD5-A52C-4292-A7F4-0C7E5780C962}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tower", "Tower.csproj", "{EEED33AD-3DE2-49AA-8AF1-2174C510E128}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU - Release|x64 = Release|x64 - Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {EEED33AD-3DE2-49AA-8AF1-2174C510E128}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {EEED33AD-3DE2-49AA-8AF1-2174C510E128}.Debug|Any CPU.Build.0 = Debug|Any CPU + {EEED33AD-3DE2-49AA-8AF1-2174C510E128}.Release|Any CPU.ActiveCfg = Release|Any CPU + {EEED33AD-3DE2-49AA-8AF1-2174C510E128}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {2E14FCD5-A52C-4292-A7F4-0C7E5780C962}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2E14FCD5-A52C-4292-A7F4-0C7E5780C962}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2E14FCD5-A52C-4292-A7F4-0C7E5780C962}.Debug|x64.ActiveCfg = Debug|Any CPU - {2E14FCD5-A52C-4292-A7F4-0C7E5780C962}.Debug|x64.Build.0 = Debug|Any CPU - {2E14FCD5-A52C-4292-A7F4-0C7E5780C962}.Debug|x86.ActiveCfg = Debug|Any CPU - {2E14FCD5-A52C-4292-A7F4-0C7E5780C962}.Debug|x86.Build.0 = Debug|Any CPU - {2E14FCD5-A52C-4292-A7F4-0C7E5780C962}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2E14FCD5-A52C-4292-A7F4-0C7E5780C962}.Release|Any CPU.Build.0 = Release|Any CPU - {2E14FCD5-A52C-4292-A7F4-0C7E5780C962}.Release|x64.ActiveCfg = Release|Any CPU - {2E14FCD5-A52C-4292-A7F4-0C7E5780C962}.Release|x64.Build.0 = Release|Any CPU - {2E14FCD5-A52C-4292-A7F4-0C7E5780C962}.Release|x86.ActiveCfg = Release|Any CPU - {2E14FCD5-A52C-4292-A7F4-0C7E5780C962}.Release|x86.Build.0 = Release|Any CPU + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {BDCB8278-62ED-46E3-92C2-FF572E0E3ED3} EndGlobalSection EndGlobal diff --git a/90_Tower/csharp/Tower/UI/Input.cs b/90_Tower/csharp/UI/Input.cs similarity index 100% rename from 90_Tower/csharp/Tower/UI/Input.cs rename to 90_Tower/csharp/UI/Input.cs diff --git a/90_Tower/csharp/Tower/UI/Prompt.cs b/90_Tower/csharp/UI/Prompt.cs similarity index 100% rename from 90_Tower/csharp/Tower/UI/Prompt.cs rename to 90_Tower/csharp/UI/Prompt.cs diff --git a/90_Tower/csharp/Tower/UI/TowerDisplay.cs b/90_Tower/csharp/UI/TowerDisplay.cs similarity index 100% rename from 90_Tower/csharp/Tower/UI/TowerDisplay.cs rename to 90_Tower/csharp/UI/TowerDisplay.cs From 33f0a2b5aae2dd264ca859fb2ff27c6d36562349 Mon Sep 17 00:00:00 2001 From: Zev Spitz Date: Mon, 17 Jan 2022 15:29:38 +0200 Subject: [PATCH 28/29] Rename some projects to match game name --- .../DotnetUtils/DotnetUtils/PortInfo.cs | 2 +- .../csharp/{csharp.csproj => Awari.csproj} | 0 04_Awari/csharp/Awari.sln | 19 +++++++++++-------- .../{21_calendar.csproj => Calendar.csproj} | 0 .../csharp/{21_calendar.sln => Calendar.sln} | 10 +++++----- .../csharp/{csharp.csproj => Gunner.csproj} | 0 42_Gunner/csharp/Gunner.sln | 15 +++++++++------ 47_Hi-Lo/csharp/{hi-lo.csproj => HiLo.csproj} | 0 47_Hi-Lo/csharp/HiLo.sln | 15 +++++++++------ 47_Hi-Lo/csharp/{hi-lo.cs => Program.cs} | 0 .../vbnet/{ThreeDPlot.sln => Plot.sln} | 15 +++++++++------ .../vbnet/{ThreeDPlot.vbproj => Plot.vbproj} | 2 +- 12 files changed, 45 insertions(+), 33 deletions(-) rename 04_Awari/csharp/{csharp.csproj => Awari.csproj} (100%) rename 21_Calendar/csharp/{21_calendar.csproj => Calendar.csproj} (100%) rename 21_Calendar/csharp/{21_calendar.sln => Calendar.sln} (64%) rename 42_Gunner/csharp/{csharp.csproj => Gunner.csproj} (100%) rename 47_Hi-Lo/csharp/{hi-lo.csproj => HiLo.csproj} (100%) rename 47_Hi-Lo/csharp/{hi-lo.cs => Program.cs} (100%) rename 87_3-D_Plot/vbnet/{ThreeDPlot.sln => Plot.sln} (54%) rename 87_3-D_Plot/vbnet/{ThreeDPlot.vbproj => Plot.vbproj} (81%) diff --git a/00_Utilities/DotnetUtils/DotnetUtils/PortInfo.cs b/00_Utilities/DotnetUtils/DotnetUtils/PortInfo.cs index 1cb0ba03..535c0ca0 100644 --- a/00_Utilities/DotnetUtils/DotnetUtils/PortInfo.cs +++ b/00_Utilities/DotnetUtils/DotnetUtils/PortInfo.cs @@ -19,7 +19,7 @@ public record PortInfo( // .NET namespaces cannot have a digit as the first character // For games whose name starts with a digit, we map the name to a specific string private static readonly Dictionary specialGameNames = new() { - { "3-D_Plot", "ThreeDPlot" }, + { "3-D_Plot", "Plot" }, { "3-D_Tic-Tac-Toe", "ThreeDTicTacToe" }, { "23_Matches", "TwentyThreeMatches"} }; diff --git a/04_Awari/csharp/csharp.csproj b/04_Awari/csharp/Awari.csproj similarity index 100% rename from 04_Awari/csharp/csharp.csproj rename to 04_Awari/csharp/Awari.csproj diff --git a/04_Awari/csharp/Awari.sln b/04_Awari/csharp/Awari.sln index 816cfcc9..492aa580 100644 --- a/04_Awari/csharp/Awari.sln +++ b/04_Awari/csharp/Awari.sln @@ -1,22 +1,25 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.30114.105 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32014.148 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp", "csharp.csproj", "{4E2057CB-0BFE-41A4-910C-798DFABF7FE9}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Awari", "Awari.csproj", "{DD161F58-D90F-481A-8275-96E01D229A70}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {DD161F58-D90F-481A-8275-96E01D229A70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DD161F58-D90F-481A-8275-96E01D229A70}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DD161F58-D90F-481A-8275-96E01D229A70}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DD161F58-D90F-481A-8275-96E01D229A70}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {4E2057CB-0BFE-41A4-910C-798DFABF7FE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4E2057CB-0BFE-41A4-910C-798DFABF7FE9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4E2057CB-0BFE-41A4-910C-798DFABF7FE9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4E2057CB-0BFE-41A4-910C-798DFABF7FE9}.Release|Any CPU.Build.0 = Release|Any CPU + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {7F5C288A-A6C6-4AC0-96E3-6A3B482A0947} EndGlobalSection EndGlobal diff --git a/21_Calendar/csharp/21_calendar.csproj b/21_Calendar/csharp/Calendar.csproj similarity index 100% rename from 21_Calendar/csharp/21_calendar.csproj rename to 21_Calendar/csharp/Calendar.csproj diff --git a/21_Calendar/csharp/21_calendar.sln b/21_Calendar/csharp/Calendar.sln similarity index 64% rename from 21_Calendar/csharp/21_calendar.sln rename to 21_Calendar/csharp/Calendar.sln index d8330a26..8b2be04b 100644 --- a/21_Calendar/csharp/21_calendar.sln +++ b/21_Calendar/csharp/Calendar.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.31613.86 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "21_calendar", "21_calendar.csproj", "{99AB85E1-A42B-4FEF-8BA6-0ED877F05249}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Calendar", "Calendar.csproj", "{1EADFB6C-4496-42C2-A80F-84FEC3F061D1}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -11,10 +11,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {99AB85E1-A42B-4FEF-8BA6-0ED877F05249}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {99AB85E1-A42B-4FEF-8BA6-0ED877F05249}.Debug|Any CPU.Build.0 = Debug|Any CPU - {99AB85E1-A42B-4FEF-8BA6-0ED877F05249}.Release|Any CPU.ActiveCfg = Release|Any CPU - {99AB85E1-A42B-4FEF-8BA6-0ED877F05249}.Release|Any CPU.Build.0 = Release|Any CPU + {1EADFB6C-4496-42C2-A80F-84FEC3F061D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1EADFB6C-4496-42C2-A80F-84FEC3F061D1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1EADFB6C-4496-42C2-A80F-84FEC3F061D1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1EADFB6C-4496-42C2-A80F-84FEC3F061D1}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/42_Gunner/csharp/csharp.csproj b/42_Gunner/csharp/Gunner.csproj similarity index 100% rename from 42_Gunner/csharp/csharp.csproj rename to 42_Gunner/csharp/Gunner.csproj diff --git a/42_Gunner/csharp/Gunner.sln b/42_Gunner/csharp/Gunner.sln index bbc80af3..5fadb359 100644 --- a/42_Gunner/csharp/Gunner.sln +++ b/42_Gunner/csharp/Gunner.sln @@ -3,20 +3,23 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.30114.105 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csharp", "csharp.csproj", "{83323E98-D981-4AC2-A74B-36804C9C2497}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Gunner", "Gunner.csproj", "{0279F69D-A69A-49B6-867C-78AA4F4DB962}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {0279F69D-A69A-49B6-867C-78AA4F4DB962}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0279F69D-A69A-49B6-867C-78AA4F4DB962}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0279F69D-A69A-49B6-867C-78AA4F4DB962}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0279F69D-A69A-49B6-867C-78AA4F4DB962}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {83323E98-D981-4AC2-A74B-36804C9C2497}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {83323E98-D981-4AC2-A74B-36804C9C2497}.Debug|Any CPU.Build.0 = Debug|Any CPU - {83323E98-D981-4AC2-A74B-36804C9C2497}.Release|Any CPU.ActiveCfg = Release|Any CPU - {83323E98-D981-4AC2-A74B-36804C9C2497}.Release|Any CPU.Build.0 = Release|Any CPU + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {09C668DA-38D4-4EF4-9FCA-EB1FF9EF6067} EndGlobalSection EndGlobal diff --git a/47_Hi-Lo/csharp/hi-lo.csproj b/47_Hi-Lo/csharp/HiLo.csproj similarity index 100% rename from 47_Hi-Lo/csharp/hi-lo.csproj rename to 47_Hi-Lo/csharp/HiLo.csproj diff --git a/47_Hi-Lo/csharp/HiLo.sln b/47_Hi-Lo/csharp/HiLo.sln index b735d83d..225235b8 100644 --- a/47_Hi-Lo/csharp/HiLo.sln +++ b/47_Hi-Lo/csharp/HiLo.sln @@ -3,20 +3,23 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.30114.105 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "hi-lo", "hi-lo.csproj", "{59721819-A474-4348-8E3D-5F2FCA5D95FA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HiLo", "HiLo.csproj", "{C4D0FAB6-056D-4DD2-827D-3383BE0AA382}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {C4D0FAB6-056D-4DD2-827D-3383BE0AA382}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C4D0FAB6-056D-4DD2-827D-3383BE0AA382}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C4D0FAB6-056D-4DD2-827D-3383BE0AA382}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C4D0FAB6-056D-4DD2-827D-3383BE0AA382}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {59721819-A474-4348-8E3D-5F2FCA5D95FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {59721819-A474-4348-8E3D-5F2FCA5D95FA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {59721819-A474-4348-8E3D-5F2FCA5D95FA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {59721819-A474-4348-8E3D-5F2FCA5D95FA}.Release|Any CPU.Build.0 = Release|Any CPU + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {BF77DB59-426B-4A01-A8AC-09AAF42DA633} EndGlobalSection EndGlobal diff --git a/47_Hi-Lo/csharp/hi-lo.cs b/47_Hi-Lo/csharp/Program.cs similarity index 100% rename from 47_Hi-Lo/csharp/hi-lo.cs rename to 47_Hi-Lo/csharp/Program.cs diff --git a/87_3-D_Plot/vbnet/ThreeDPlot.sln b/87_3-D_Plot/vbnet/Plot.sln similarity index 54% rename from 87_3-D_Plot/vbnet/ThreeDPlot.sln rename to 87_3-D_Plot/vbnet/Plot.sln index b2ea1dbe..a0dcbfcb 100644 --- a/87_3-D_Plot/vbnet/ThreeDPlot.sln +++ b/87_3-D_Plot/vbnet/Plot.sln @@ -3,20 +3,23 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.30114.105 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ThreeDPlot", "ThreeDPlot.vbproj", "{FF54B85E-8AD1-4AD5-BB54-2E3DABAA0998}" +Project("{778DAE3C-4631-46EA-AA77-85C1314464D9}") = "Plot", "Plot.vbproj", "{534355CC-A2C1-4138-9EB5-09D658DD4504}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {534355CC-A2C1-4138-9EB5-09D658DD4504}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {534355CC-A2C1-4138-9EB5-09D658DD4504}.Debug|Any CPU.Build.0 = Debug|Any CPU + {534355CC-A2C1-4138-9EB5-09D658DD4504}.Release|Any CPU.ActiveCfg = Release|Any CPU + {534355CC-A2C1-4138-9EB5-09D658DD4504}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {FF54B85E-8AD1-4AD5-BB54-2E3DABAA0998}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FF54B85E-8AD1-4AD5-BB54-2E3DABAA0998}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FF54B85E-8AD1-4AD5-BB54-2E3DABAA0998}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FF54B85E-8AD1-4AD5-BB54-2E3DABAA0998}.Release|Any CPU.Build.0 = Release|Any CPU + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {CAD09CCC-4522-438E-A8C6-514A866D90DE} EndGlobalSection EndGlobal diff --git a/87_3-D_Plot/vbnet/ThreeDPlot.vbproj b/87_3-D_Plot/vbnet/Plot.vbproj similarity index 81% rename from 87_3-D_Plot/vbnet/ThreeDPlot.vbproj rename to 87_3-D_Plot/vbnet/Plot.vbproj index 903ea6aa..be687f57 100644 --- a/87_3-D_Plot/vbnet/ThreeDPlot.vbproj +++ b/87_3-D_Plot/vbnet/Plot.vbproj @@ -1,7 +1,7 @@ Exe - ThreeDPlot + Plot net6.0 16.9 From a0c2565adaa6dfc2d81de4771174f17edb4ce5f3 Mon Sep 17 00:00:00 2001 From: Claus Volko <49327712+adokhugi@users.noreply.github.com> Date: Mon, 17 Jan 2022 17:17:34 +0100 Subject: [PATCH 29/29] Kotlin implementation of the Acey Ducey game --- 01_Acey_Ducey/aceyducey.kt | 74 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 01_Acey_Ducey/aceyducey.kt diff --git a/01_Acey_Ducey/aceyducey.kt b/01_Acey_Ducey/aceyducey.kt new file mode 100644 index 00000000..ccc5eb0a --- /dev/null +++ b/01_Acey_Ducey/aceyducey.kt @@ -0,0 +1,74 @@ +import java.util.Random + +fun printCard(a: Int) { + if (a < 11) println(a) + if (a == 11) println("JACK") + if (a == 12) println("QUEEN") + if (a == 13) println("KING") + if (a == 14) println("ACE") +} + +fun main() { + println("ACEY DUCEY CARD GAME") + println("CREATIVE COMPUTING MORRISTOWN, NEW JERSEY") + println() + println() + println("ACEY-DUCEY IS PLAYED IN THE FOLLOWING MANNER ") + println("THE DEALER (COMPUTER) DEALS TWO CARDS FACE UP") + println("YOU HAVE AN OPTION TO BET OR NOT BET DEPENDING") + println("ON WHETHER OR NOT YOU FEEL THE CARD WILL HAVE") + println("A VALUE BETWEEN THE FIRST TWO.") + println("IF YOU DO NOT WANT TO BET, INPUT A 0") + var random = Random() + do { + var q = 100 + var a : Int + var b : Int + var m : Int + println("YOU NOW HAVE " + q + " DOLLARS.") + println() + do { + do { + do { + println("HERE ARE YOUR NEXT TWO CARDS: ") + do { + a = random.nextInt(12) + 2 + b = random.nextInt(12) + 2 + } while (a >= b); + printCard(a) + printCard(b) + println() + println() + print("WHAT IS YOUR BET") + m = readLine()!!.toInt() + if (m == 0) { + println("CHICKEN!!") + println() + } + } while (m == 0); + if (m > q) { + println("SORRY, MY FRIEND, BUT YOU BET TOO MUCH.") + println("YOU HAVE ONLY " + q + " DOLLARS TO BET.") + } + } while (m > q); + var c = random.nextInt(12) + 2 + printCard(c) + println() + if (c > a && c < b) { + println("YOU WIN!!!") + q += m + } + else { + println("SORRY, YOU LOSE") + if (m < q) q -= m + } + } while (m < q); + println() + println() + println("SORRY, FRIEND, BUT YOU BLEW YOUR WAD.") + println() + println() + println("TRY AGAIN (YES OR NO)") + } while (readLine() == "YES"); + println("O.K., HOPE YOU HAD FUN!") +}