Fixed Directory Structure (#4)

* fixed structure, naming and namespaces * fixed README example
skrasekmichael · Mar 16, 2024 · c31c94f · c31c94f
1 parent 7c9cb3c
commit c31c94f
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -51,7 +51,7 @@ public Result SetMemberRole(Guid initiatorId, Guid memberId, TeamRole newRole)
       return Errors.ForbiddenToUpdateTeamRoles;
 
    var member = GetTeamMember(memberId);
-   if (membe is null)
+   if (member is null)
       return Errors.MemberNotFound;
 
    if (member.Role.IsOwner())
@@ -74,4 +74,4 @@ public TeamMember? GetTeamMember(Guid memberId)
 
 *Note: using railway-oriented programming results in cleaner and shorter code, however, it also brings additional overhead and inability to return early from function, thus making it less performant.*
 
-*Learn more about [when to not use railway-oriented programming](https://fsharpforfunandprofit.com/posts/against-railway-oriented-programming/).*
+*Learn more about [when to not use railway-oriented programming](https://fsharpforfunandprofit.com/posts/against-railway-oriented-programming/).*
diff --git a/RailwayResult.FunctionExtensions/RailwayResult.FunctionExtensions.csproj b/RailwayResult.FunctionExtensions/RailwayResult.FunctionExtensions.csproj
diff --git a/RailwayResult.sln b/RailwayResult.sln
@@ -7,6 +7,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D27FC398-A54
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RailwayResult", "src\RailwayResult\RailwayResult.csproj", "{C290883E-72EC-433E-BB3F-83B58381F9FF}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RailwayResult.Errors", "src\RailwayResult.Errors\RailwayResult.Errors.csproj", "{0E724DCC-EFB9-4D31-B4A4-E15CDFBE92F9}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RailwayResult.FunctionalExtensions", "src\RailwayResult.FunctionalExtensions\RailwayResult.FunctionalExtensions.csproj", "{D13BAF96-7FA1-4FD7-A318-77AA18285D9A}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{9AF71DD6-A91C-429D-9E17-91DB64571176}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RailwayResult.Tests", "tests\RailwayResult.Tests\RailwayResult.Tests.csproj", "{BF48CBB9-7B8A-4376-9094-D71B093E0660}"
@@ -18,10 +22,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		Directory.Packages.props = Directory.Packages.props
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RailwayResult.Errors", "src\RailwayResult.Errors\RailwayResult.Errors.csproj", "{0E724DCC-EFB9-4D31-B4A4-E15CDFBE92F9}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RailwayResult.FunctionExtensions", "RailwayResult.FunctionExtensions\RailwayResult.FunctionExtensions.csproj", "{D13BAF96-7FA1-4FD7-A318-77AA18285D9A}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

diff --git a/...sult.FunctionExtensions/IRuleWithError.cs → ...lt.FunctionalExtensions/IRuleWithError.cs b/...sult.FunctionExtensions/IRuleWithError.cs → ...lt.FunctionalExtensions/IRuleWithError.cs
@@ -1,4 +1,4 @@
-namespace RailwayResult.FunctionExtensions;
+namespace RailwayResult.FunctionalExtensions;
 
 public interface IRuleWithError<T>
 {

diff --git a/src/RailwayResult.FunctionalExtensions/RailwayResult.FunctionalExtensions.csproj b/src/RailwayResult.FunctionalExtensions/RailwayResult.FunctionalExtensions.csproj
@@ -0,0 +1,8 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <ItemGroup>
+    <ProjectReference Include="..\RailwayResult.Errors\RailwayResult.Errors.csproj" />
+    <ProjectReference Include="..\RailwayResult\RailwayResult.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/...unctionExtensions/ResultExtensions.And.cs → ...ctionalExtensions/ResultExtensions.And.cs b/...unctionExtensions/ResultExtensions.And.cs → ...ctionalExtensions/ResultExtensions.And.cs
@@ -1,4 +1,4 @@
-namespace RailwayResult.FunctionExtensions;
+namespace RailwayResult.FunctionalExtensions;
 
 public static partial class ResultExtensions
 {

diff --git a/...tionExtensions/ResultExtensions.Ensure.cs → ...onalExtensions/ResultExtensions.Ensure.cs b/...tionExtensions/ResultExtensions.Ensure.cs → ...onalExtensions/ResultExtensions.Ensure.cs
@@ -1,4 +1,4 @@
-namespace RailwayResult.FunctionExtensions;
+namespace RailwayResult.FunctionalExtensions;
 
 public static partial class ResultExtensions
 {

diff --git a/...ensions/ResultExtensions.EnsureNotNull.cs → ...ensions/ResultExtensions.EnsureNotNull.cs b/...ensions/ResultExtensions.EnsureNotNull.cs → ...ensions/ResultExtensions.EnsureNotNull.cs
@@ -1,4 +1,4 @@
-namespace RailwayResult.FunctionExtensions;
+namespace RailwayResult.FunctionalExtensions;
 
 public static partial class ResultExtensions
 {

diff --git a/...unctionExtensions/ResultExtensions.Tap.cs → ...ctionalExtensions/ResultExtensions.Tap.cs b/...unctionExtensions/ResultExtensions.Tap.cs → ...ctionalExtensions/ResultExtensions.Tap.cs
@@ -1,4 +1,4 @@
-namespace RailwayResult.FunctionExtensions;
+namespace RailwayResult.FunctionalExtensions;
 
 public static partial class ResultExtensions
 {

diff --git a/...nctionExtensions/ResultExtensions.Then.cs → ...tionalExtensions/ResultExtensions.Then.cs b/...nctionExtensions/ResultExtensions.Then.cs → ...tionalExtensions/ResultExtensions.Then.cs
@@ -1,4 +1,4 @@
-namespace RailwayResult.FunctionExtensions;
+namespace RailwayResult.FunctionalExtensions;
 
 public static partial class ResultExtensions
 {

diff --git a/...lt.FunctionExtensions/ResultExtensions.cs → ....FunctionalExtensions/ResultExtensions.cs b/...lt.FunctionExtensions/ResultExtensions.cs → ....FunctionalExtensions/ResultExtensions.cs
@@ -1,4 +1,4 @@
-namespace RailwayResult.FunctionExtensions;
+namespace RailwayResult.FunctionalExtensions;
 
 public static partial class ResultExtensions
 {

diff --git a/...esult.FunctionExtensions/RuleWithError.cs → ...ult.FunctionalExtensions/RuleWithError.cs b/...esult.FunctionExtensions/RuleWithError.cs → ...ult.FunctionalExtensions/RuleWithError.cs
@@ -1,4 +1,4 @@
-namespace RailwayResult.FunctionExtensions;
+namespace RailwayResult.FunctionalExtensions;
 
 public delegate bool Rule<in T>(T value);