From e8543dadeef395c1752218a6c0dcd9405c58c23f Mon Sep 17 00:00:00 2001 From: Erik Schierboom Date: Tue, 31 Dec 2019 13:02:37 +0100 Subject: [PATCH 1/3] csharp: renamed floating-point-numbers to numbers-floating-point --- .../.docs/after.md | 0 .../.docs/cli.md | 0 .../.docs/hints.md | 0 .../.docs/instructions.md | 0 .../.docs/introduction.md | 0 .../Example.cs | 0 .../NumbersFloatingPoint.cs} | 0 .../NumbersFloatingPoint.csproj} | 0 .../NumbersFloatingPointTest.cs} | 0 languages/csharp/config.json | 26 +++++++------------ 10 files changed, 10 insertions(+), 16 deletions(-) rename languages/csharp/concept-exercises/{floating-point-numbers => numbers-floating-point}/.docs/after.md (100%) rename languages/csharp/concept-exercises/{floating-point-numbers => numbers-floating-point}/.docs/cli.md (100%) rename languages/csharp/concept-exercises/{floating-point-numbers => numbers-floating-point}/.docs/hints.md (100%) rename languages/csharp/concept-exercises/{floating-point-numbers => numbers-floating-point}/.docs/instructions.md (100%) rename languages/csharp/concept-exercises/{floating-point-numbers => numbers-floating-point}/.docs/introduction.md (100%) rename languages/csharp/concept-exercises/{floating-point-numbers => numbers-floating-point}/Example.cs (100%) rename languages/csharp/concept-exercises/{floating-point-numbers/FloatingPointNumbers.cs => numbers-floating-point/NumbersFloatingPoint.cs} (100%) rename languages/csharp/concept-exercises/{floating-point-numbers/FloatingPointNumbers.csproj => numbers-floating-point/NumbersFloatingPoint.csproj} (100%) rename languages/csharp/concept-exercises/{floating-point-numbers/FloatingPointNumbersTest.cs => numbers-floating-point/NumbersFloatingPointTest.cs} (100%) diff --git a/languages/csharp/concept-exercises/floating-point-numbers/.docs/after.md b/languages/csharp/concept-exercises/numbers-floating-point/.docs/after.md similarity index 100% rename from languages/csharp/concept-exercises/floating-point-numbers/.docs/after.md rename to languages/csharp/concept-exercises/numbers-floating-point/.docs/after.md diff --git a/languages/csharp/concept-exercises/floating-point-numbers/.docs/cli.md b/languages/csharp/concept-exercises/numbers-floating-point/.docs/cli.md similarity index 100% rename from languages/csharp/concept-exercises/floating-point-numbers/.docs/cli.md rename to languages/csharp/concept-exercises/numbers-floating-point/.docs/cli.md diff --git a/languages/csharp/concept-exercises/floating-point-numbers/.docs/hints.md b/languages/csharp/concept-exercises/numbers-floating-point/.docs/hints.md similarity index 100% rename from languages/csharp/concept-exercises/floating-point-numbers/.docs/hints.md rename to languages/csharp/concept-exercises/numbers-floating-point/.docs/hints.md diff --git a/languages/csharp/concept-exercises/floating-point-numbers/.docs/instructions.md b/languages/csharp/concept-exercises/numbers-floating-point/.docs/instructions.md similarity index 100% rename from languages/csharp/concept-exercises/floating-point-numbers/.docs/instructions.md rename to languages/csharp/concept-exercises/numbers-floating-point/.docs/instructions.md diff --git a/languages/csharp/concept-exercises/floating-point-numbers/.docs/introduction.md b/languages/csharp/concept-exercises/numbers-floating-point/.docs/introduction.md similarity index 100% rename from languages/csharp/concept-exercises/floating-point-numbers/.docs/introduction.md rename to languages/csharp/concept-exercises/numbers-floating-point/.docs/introduction.md diff --git a/languages/csharp/concept-exercises/floating-point-numbers/Example.cs b/languages/csharp/concept-exercises/numbers-floating-point/Example.cs similarity index 100% rename from languages/csharp/concept-exercises/floating-point-numbers/Example.cs rename to languages/csharp/concept-exercises/numbers-floating-point/Example.cs diff --git a/languages/csharp/concept-exercises/floating-point-numbers/FloatingPointNumbers.cs b/languages/csharp/concept-exercises/numbers-floating-point/NumbersFloatingPoint.cs similarity index 100% rename from languages/csharp/concept-exercises/floating-point-numbers/FloatingPointNumbers.cs rename to languages/csharp/concept-exercises/numbers-floating-point/NumbersFloatingPoint.cs diff --git a/languages/csharp/concept-exercises/floating-point-numbers/FloatingPointNumbers.csproj b/languages/csharp/concept-exercises/numbers-floating-point/NumbersFloatingPoint.csproj similarity index 100% rename from languages/csharp/concept-exercises/floating-point-numbers/FloatingPointNumbers.csproj rename to languages/csharp/concept-exercises/numbers-floating-point/NumbersFloatingPoint.csproj diff --git a/languages/csharp/concept-exercises/floating-point-numbers/FloatingPointNumbersTest.cs b/languages/csharp/concept-exercises/numbers-floating-point/NumbersFloatingPointTest.cs similarity index 100% rename from languages/csharp/concept-exercises/floating-point-numbers/FloatingPointNumbersTest.cs rename to languages/csharp/concept-exercises/numbers-floating-point/NumbersFloatingPointTest.cs diff --git a/languages/csharp/config.json b/languages/csharp/config.json index 299b20ca20..46ce02dedd 100644 --- a/languages/csharp/config.json +++ b/languages/csharp/config.json @@ -8,42 +8,36 @@ { "slug": "strings", "uuid": "eda235a5-37de-4fb6-a5c5-cf7aa2309987", - "concepts": ["basic-string-methods", "basic-string-formatting"], + "concepts": ["basic-strings"], "prerequisites": [] }, { - "slug": "floating-point-numbers", + "slug": "numbers-floating-point", "uuid": "4eb8d86f-7123-473e-9d96-7939e9652608", - "concepts": ["advanced-floating-point-numbers", "loops"], + "concepts": ["floating-point-numbers", "loops"], "prerequisites": [ - "basic-signed-integers", - "basic-floating-point-numbers", - "conditionals", - "type-conversion" + "basic-numbers", + "basic-type-conversion", + "conditionals" ] }, { "slug": "numbers", "uuid": "4eb8d86f-7123-473e-9d96-7939e9652608", - "concepts": [ - "basic-signed-integers", - "basic-floating-point-numbers", - "conditionals", - "type-conversion" - ], + "concepts": ["basic-numbers", "basic-type-conversion", "conditionals"], "prerequisites": [] }, { "slug": "enums", "uuid": "047b895b-7039-4af6-ad3a-17fd818d0b88", "concepts": ["basic-enums"], - "prerequisites": ["basic-string-methods", "basic-string-formatting"] + "prerequisites": ["basic-strings"] }, { "slug": "dates", "uuid": "7762d9ec-ca95-4e10-b93c-afd2521787a2", - "concepts": ["basic-dates", "basic-time", "advanced-string-formatting"], - "prerequisites": ["basic-signed-integers", "basic-string-formatting"] + "concepts": ["basic-dates", "basic-time", "string-formatting"], + "prerequisites": ["basic-numbers", "basic-strings"] }, { "slug": "bitwise-operations", From 538f8f4ed0b18c7720611574ab303f6826f9d4c7 Mon Sep 17 00:00:00 2001 From: Erik Schierboom Date: Tue, 31 Dec 2019 13:06:19 +0100 Subject: [PATCH 2/3] csharp: move example files to .meta directory --- .../bitwise-operations/{ => .meta}/Example.cs | 0 .../bitwise-operations/BitwiseOperations.csproj | 4 ---- .../csharp/concept-exercises/dates/{ => .meta}/Example.cs | 0 languages/csharp/concept-exercises/dates/Dates.csproj | 4 ---- .../csharp/concept-exercises/enums/{ => .meta}/Example.cs | 0 languages/csharp/concept-exercises/enums/Enums.csproj | 4 ---- .../numbers-floating-point/{ => .meta}/Example.cs | 0 .../numbers-floating-point/NumbersFloatingPoint.csproj | 4 ---- .../csharp/concept-exercises/numbers/{ => .meta}/Example.cs | 0 languages/csharp/concept-exercises/numbers/Numbers.cs | 2 +- languages/csharp/concept-exercises/numbers/Numbers.csproj | 4 ---- .../csharp/concept-exercises/strings/{ => .meta}/Example.cs | 0 languages/csharp/concept-exercises/strings/Strings.csproj | 4 ---- 13 files changed, 1 insertion(+), 25 deletions(-) rename languages/csharp/concept-exercises/bitwise-operations/{ => .meta}/Example.cs (100%) rename languages/csharp/concept-exercises/dates/{ => .meta}/Example.cs (100%) rename languages/csharp/concept-exercises/enums/{ => .meta}/Example.cs (100%) rename languages/csharp/concept-exercises/numbers-floating-point/{ => .meta}/Example.cs (100%) rename languages/csharp/concept-exercises/numbers/{ => .meta}/Example.cs (100%) rename languages/csharp/concept-exercises/strings/{ => .meta}/Example.cs (100%) diff --git a/languages/csharp/concept-exercises/bitwise-operations/Example.cs b/languages/csharp/concept-exercises/bitwise-operations/.meta/Example.cs similarity index 100% rename from languages/csharp/concept-exercises/bitwise-operations/Example.cs rename to languages/csharp/concept-exercises/bitwise-operations/.meta/Example.cs diff --git a/languages/csharp/concept-exercises/bitwise-operations/BitwiseOperations.csproj b/languages/csharp/concept-exercises/bitwise-operations/BitwiseOperations.csproj index 062ab2a974..e4ae56cdd6 100644 --- a/languages/csharp/concept-exercises/bitwise-operations/BitwiseOperations.csproj +++ b/languages/csharp/concept-exercises/bitwise-operations/BitwiseOperations.csproj @@ -4,10 +4,6 @@ netcoreapp3.0 - - - - diff --git a/languages/csharp/concept-exercises/dates/Example.cs b/languages/csharp/concept-exercises/dates/.meta/Example.cs similarity index 100% rename from languages/csharp/concept-exercises/dates/Example.cs rename to languages/csharp/concept-exercises/dates/.meta/Example.cs diff --git a/languages/csharp/concept-exercises/dates/Dates.csproj b/languages/csharp/concept-exercises/dates/Dates.csproj index 062ab2a974..e4ae56cdd6 100644 --- a/languages/csharp/concept-exercises/dates/Dates.csproj +++ b/languages/csharp/concept-exercises/dates/Dates.csproj @@ -4,10 +4,6 @@ netcoreapp3.0 - - - - diff --git a/languages/csharp/concept-exercises/enums/Example.cs b/languages/csharp/concept-exercises/enums/.meta/Example.cs similarity index 100% rename from languages/csharp/concept-exercises/enums/Example.cs rename to languages/csharp/concept-exercises/enums/.meta/Example.cs diff --git a/languages/csharp/concept-exercises/enums/Enums.csproj b/languages/csharp/concept-exercises/enums/Enums.csproj index 062ab2a974..e4ae56cdd6 100644 --- a/languages/csharp/concept-exercises/enums/Enums.csproj +++ b/languages/csharp/concept-exercises/enums/Enums.csproj @@ -4,10 +4,6 @@ netcoreapp3.0 - - - - diff --git a/languages/csharp/concept-exercises/numbers-floating-point/Example.cs b/languages/csharp/concept-exercises/numbers-floating-point/.meta/Example.cs similarity index 100% rename from languages/csharp/concept-exercises/numbers-floating-point/Example.cs rename to languages/csharp/concept-exercises/numbers-floating-point/.meta/Example.cs diff --git a/languages/csharp/concept-exercises/numbers-floating-point/NumbersFloatingPoint.csproj b/languages/csharp/concept-exercises/numbers-floating-point/NumbersFloatingPoint.csproj index 062ab2a974..e4ae56cdd6 100644 --- a/languages/csharp/concept-exercises/numbers-floating-point/NumbersFloatingPoint.csproj +++ b/languages/csharp/concept-exercises/numbers-floating-point/NumbersFloatingPoint.csproj @@ -4,10 +4,6 @@ netcoreapp3.0 - - - - diff --git a/languages/csharp/concept-exercises/numbers/Example.cs b/languages/csharp/concept-exercises/numbers/.meta/Example.cs similarity index 100% rename from languages/csharp/concept-exercises/numbers/Example.cs rename to languages/csharp/concept-exercises/numbers/.meta/Example.cs diff --git a/languages/csharp/concept-exercises/numbers/Numbers.cs b/languages/csharp/concept-exercises/numbers/Numbers.cs index 3b5606a461..6dfd0d588b 100644 --- a/languages/csharp/concept-exercises/numbers/Numbers.cs +++ b/languages/csharp/concept-exercises/numbers/Numbers.cs @@ -4,7 +4,7 @@ public static double ProductionRatePerHour(int speed) { // TODO: implement this method } - + public static int WorkingItemsPerMinute(int speed) { // TODO: implement this method diff --git a/languages/csharp/concept-exercises/numbers/Numbers.csproj b/languages/csharp/concept-exercises/numbers/Numbers.csproj index 062ab2a974..e4ae56cdd6 100644 --- a/languages/csharp/concept-exercises/numbers/Numbers.csproj +++ b/languages/csharp/concept-exercises/numbers/Numbers.csproj @@ -4,10 +4,6 @@ netcoreapp3.0 - - - - diff --git a/languages/csharp/concept-exercises/strings/Example.cs b/languages/csharp/concept-exercises/strings/.meta/Example.cs similarity index 100% rename from languages/csharp/concept-exercises/strings/Example.cs rename to languages/csharp/concept-exercises/strings/.meta/Example.cs diff --git a/languages/csharp/concept-exercises/strings/Strings.csproj b/languages/csharp/concept-exercises/strings/Strings.csproj index 062ab2a974..e4ae56cdd6 100644 --- a/languages/csharp/concept-exercises/strings/Strings.csproj +++ b/languages/csharp/concept-exercises/strings/Strings.csproj @@ -4,10 +4,6 @@ netcoreapp3.0 - - - - From 4c4a2d43a6fcf0ee04229039db805810a52c5fff Mon Sep 17 00:00:00 2001 From: Erik Schierboom Date: Tue, 31 Dec 2019 13:56:23 +0100 Subject: [PATCH 3/3] csharp: fix invalid links --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index b6eae60301..fb007005bd 100644 --- a/README.md +++ b/README.md @@ -47,13 +47,13 @@ An exercise has the following files. In the browser they will show at the releva This file provides an introduction to the concept. It should be explicit about what the exercise teaches and maybe provide a brief introduction to the concepts, but not give away so much that the user doesn't have to do any work to solve the exercise. -See the C# floating-point-numbers exercise's [introduction.md file](./languages/csharp/concept-exercises/floating-point-numbers/.docs/introduction.md) for an example. +See the C# floating-point-numbers exercise's [introduction.md file](./languages/csharp/concept-exercises/numbers-floating-point/.docs/introduction.md) for an example. #### `.docs/instructions.md` This file provides instructions for the exercise. It should explicitly explain what the user needs to do (define a function with the signature `X.y(...)` that takes an A and returns a Z), and provide at least one example usage of that function. If there are multiple tasks within the exercise, it should provide an example of each. -See the C# floating-point-numbers exercise's [instructions.md file](./languages/csharp/concept-exercises/floating-point-numbers/.docs/instructions.md) for an example. +See the C# floating-point-numbers exercise's [instructions.md file](./languages/csharp/concept-exercises/numbers-floating-point/.docs/instructions.md) for an example. #### `.docs/hints.md` @@ -61,13 +61,13 @@ If the user gets stuck, we will allow them to click a button requesting a hint, The file should contain both general and task-specific "hints". These hints should be enough to unblock almost any user. They might link to the docs of the functions that need to be used. -See the C# floating-point-numbers exercise's [hints.md file](./languages/csharp/concept-exercises/floating-point-numbers/.docs/hints.md) for an example. +See the C# floating-point-numbers exercise's [hints.md file](./languages/csharp/concept-exercises/numbers-floating-point/.docs/hints.md) for an example. #### `.docs/after.md` Once the user completes the exercise they will be shown this file, which gives them any bonus information or further reading about the concept taught. -See the C# floating-point-numbers exercise's [after.md file](./languages/csharp/concept-exercises/floating-point-numbers/.docs/after.md) for an example. +See the C# floating-point-numbers exercise's [after.md file](./languages/csharp/concept-exercises/numbers-floating-point/.docs/after.md) for an example. ## Repository structure