Merge remote-tracking branch 'origin/master'

# Conflicts: # src/FluentResults/FluentResults.csproj
altmann · Jun 28, 2024 · b3e1210 · b3e1210
2 parents 09aec15 + 695cf78
commit b3e1210
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,4 @@
-<img src="https://github.com/altmann/FluentResults/blob/master/resources/icons/FluentResults-Icon-64.png" alt="FluentResults"/>
-
+<img src="https://raw.githubusercontent.com/altmann/FluentResults/master/resources/icons/FluentResults-Icon-64.png" alt="FluentResults"/>
 # FluentResults
 
 [![Nuget downloads](https://img.shields.io/nuget/v/fluentresults.svg)](https://www.nuget.org/packages/FluentResults/)
@@ -186,7 +185,7 @@ bool IsDivisibleByTen(int i) => i % 10 == 0;
 
 ### Try
 
-In some scenarios you want to execute an action. If this action throws an exception then the exception should be catched and transformed to a result object. 
+In some scenarios you want to execute an action. If this action throws an exception then the exception should be caught and transformed to a result object. 
 
 ```csharp
 var result = Result.Try(() => DoSomethingCritical());

diff --git a/src/FluentResults.Extensions.FluentAssertions/Assertions/ReasonAssertions.cs b/src/FluentResults.Extensions.FluentAssertions/Assertions/ReasonAssertions.cs
@@ -22,7 +22,7 @@ public AndWhichConstraint<ReasonAssertions, IReason> HaveMetadata(string metadat
                    .ForCondition(metadata =>
                                  {
                                      metadata.TryGetValue(metadataKey, out var actualMetadataValue);
-                                     return actualMetadataValue == metadataValue;
+                                     return Equals(actualMetadataValue, metadataValue);
                                  })
                    .FailWith($"Reason should contain '{metadataKey}' with '{metadataValue}', but not contain it");
 

diff --git a/src/FluentResults/FluentResults.csproj b/src/FluentResults/FluentResults.csproj
@@ -15,7 +15,8 @@
     <PackageProjectUrl>https://github.com/altmann/FluentResults</PackageProjectUrl>
     <PackageIconUrl>https://raw.githubusercontent.com/altmann/FluentResults/master/resources/icons/FluentResults-Icon-128.png</PackageIconUrl>
     <PackageIcon>FluentResults-Icon-128.png</PackageIcon>
-
+    <PackageReadmeFile>README.md</PackageReadmeFile>
+
     <!--SourceLink-->
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
@@ -29,6 +30,10 @@
     <None Include="..\..\resources\icons\FluentResults-Icon-128.png" Pack="true" PackagePath="" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Include="..\..\README.md" Pack="true" PackagePath="" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.1.1" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />

diff --git a/src/FluentResults/Reasons/Error.cs b/src/FluentResults/Reasons/Error.cs
@@ -34,7 +34,7 @@ protected Error()
         /// <summary>
         /// Creates a new instance of <see cref="Error"/>
         /// </summary>
-        /// <param name="message">Discription of the error</param>
+        /// <param name="message">Description of the error</param>
         public Error(string message)
             : this()
         {
@@ -44,7 +44,7 @@ public Error(string message)
         /// <summary>
         /// Creates a new instance of <see cref="Error"/>
         /// </summary>
-        /// <param name="message">Discription of the error</param>
+        /// <param name="message">Description of the error</param>
         /// <param name="causedBy">The root cause of the <see cref="Error"/></param>
         public Error(string message, IError causedBy)
             : this(message)
@@ -169,4 +169,4 @@ public static string ReasonsToString(IReadOnlyCollection<IReason> errorReasons)
             return string.Join("; ", errorReasons);
         }
     }
-}
+}