Small refactoring #44

.editorconfig

@@ -140,8 +140,8 @@ csharp_style_pattern_local_over_anonymous_function = true:suggestion
 csharp_style_prefer_index_operator = true:suggestion
 csharp_style_prefer_range_operator = true:suggestion
 csharp_style_throw_expression = true:suggestion
-csharp_style_unused_value_assignment_preference = discard_variable:suggestion
-csharp_style_unused_value_expression_statement_preference = discard_variable:suggestion
+csharp_style_unused_value_assignment_preference = discard_variable:none
+csharp_style_unused_value_expression_statement_preference = discard_variable:none
 
 # 'using' directive preferences
 csharp_using_directive_placement = outside_namespace:suggestion

OperationResults.sln

@@ -9,6 +9,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
 		src\Directory.Build.props = src\Directory.Build.props
+		README.md = README.md
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{40EA0531-BCD9-4D33-9114-D1BB9EA7DDBA}"

samples/OperationResults.Sample.BusinessLayer/Services/PeopleService.cs

@@ -48,15 +48,16 @@ public async Task<Result<Person>> GetAsync(Guid id)
     public async Task<Result<PersonWithImage>> GetWithImageAsync(Guid id)
     {
         var personResult = await GetAsync(id);
+
         if (!personResult) // A shortcut to !personResult.Success
         {
-            // The person operation failed
             return Result.Fail(personResult.FailureReason);
         }
 
         var person = personResult.Content!;
+
         var imageResult = await imageService.GetImageAsync();
-        if (imageResult.TryGet(out var imageFileContent) && imageFileContent is not null)
+        if (imageResult.TryGetContent(out var imageFileContent) && imageFileContent is not null)
         {
             // The image operation succeeded, return person with image
             var personWithImage = new PersonWithImage

samples/OperationResults.Sample.Shared/Models/PersonWithImage.cs

@@ -3,5 +3,6 @@ namespace OperationResults.Sample.Shared.Models;
 public class PersonWithImage
 {
     public Person Person { get; set; }
+
     public byte[] Image { get; set; }
 }

src/OperationResults.AspNetCore.Http/OperationResults.AspNetCore.Http.csproj

@@ -33,6 +33,5 @@
             <Pack>True</Pack>
             <PackagePath></PackagePath>
         </None>
-        <None Include="..\..\README.md" Pack="true" PackagePath="\" />
     </ItemGroup>
 </Project>

src/OperationResults.AspNetCore/OperationResults.AspNetCore.csproj

@@ -33,6 +33,5 @@
             <Pack>True</Pack>
             <PackagePath></PackagePath>
         </None>
-        <None Include="..\..\README.md" Pack="true" PackagePath="\" />
     </ItemGroup>
 </Project>

src/OperationResults/IGenericResult{OfT}.cs

@@ -1,8 +1,10 @@
+using System.Diagnostics.CodeAnalysis;
+
 namespace OperationResults;
 
 public interface IGenericResult<T> : IGenericResult
 {
     public T? Content { get; }
 
-    public bool TryGet(out T? value);
+    public bool TryGetContent([NotNullWhen(returnValue: true)] T? content);
 }

src/OperationResults/OperationResults.csproj

@@ -26,7 +26,6 @@
             <Pack>True</Pack>
             <PackagePath></PackagePath>
         </None>
-        <None Include="..\..\README.md" Pack="true" PackagePath="\" />
     </ItemGroup>
 
 </Project>

src/OperationResults/Result{OfT}.cs

@@ -1,3 +1,5 @@
+using System.Diagnostics.CodeAnalysis;
+
 namespace OperationResults;
 
 public class Result<T> : IGenericResult<T>
@@ -29,9 +31,9 @@ internal Result(bool success = true, T? content = default, int failureReason = F
         ValidationErrors = validationErrors;
     }
 
-    public bool TryGet(out T? value)
+    public bool TryGetContent([NotNullWhen(returnValue: true)] T? content)
     {
-        value = Content;
+        content = Content;
         return Success;
     }