Merge pull request #48 from marcominerva/develop

Add missing nullability annotation
marcominerva · Feb 20, 2024 · 2a8e2f0 · 2a8e2f0
2 parents 15590cd + 7e23560
commit 2a8e2f0
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 8 deletions.
diff --git a/samples/Controllers/OperationResults.Sample/OperationResults.Sample.csproj b/samples/Controllers/OperationResults.Sample/OperationResults.Sample.csproj
@@ -6,9 +6,9 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.0" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.2" />
         <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
-        <PackageReference Include="TinyHelpers.AspNetCore" Version="3.0.2" />
+        <PackageReference Include="TinyHelpers.AspNetCore" Version="3.0.6" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/samples/MinimalApis/OperationResults.Sample/OperationResults.Sample.csproj b/samples/MinimalApis/OperationResults.Sample/OperationResults.Sample.csproj
@@ -6,8 +6,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.0" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.0" />
+        <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.2" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.2" />
         <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
     </ItemGroup>
 

diff --git a/samples/OperationResults.Sample.BusinessLayer/Services/PeopleService.cs b/samples/OperationResults.Sample.BusinessLayer/Services/PeopleService.cs
@@ -57,7 +57,7 @@ public async Task<Result<PersonWithImage>> GetWithImageAsync(Guid id)
         var person = personResult.Content!;
 
         var imageResult = await imageService.GetImageAsync();
-        if (imageResult.TryGetContent(out var imageFileContent) && imageFileContent is not null)
+        if (imageResult.TryGetContent(out var imageFileContent))
         {
             // The image operation succeeded, return person with image
             var personWithImage = new PersonWithImage

diff --git a/...es/OperationResults.Sample.DataAccessLayer/OperationResults.Sample.DataAccessLayer.csproj b/...es/OperationResults.Sample.DataAccessLayer/OperationResults.Sample.DataAccessLayer.csproj
@@ -6,6 +6,6 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.2" />
     </ItemGroup>
 </Project>
diff --git a/src/OperationResults.AspNetCore.Http/OperationResults.AspNetCore.Http.csproj b/src/OperationResults.AspNetCore.Http/OperationResults.AspNetCore.Http.csproj
@@ -25,13 +25,15 @@
     </ItemGroup>
 
     <ItemGroup>        
-        <PackageReference Include="OperationResultTools" Version="1.0.15" />
+        <PackageReference Include="OperationResultTools" Version="1.0.21" />
     </ItemGroup>
 
     <ItemGroup>
         <None Include="..\..\Toolbox.png">
             <Pack>True</Pack>
             <PackagePath></PackagePath>
         </None>
+        <None Include="..\..\README.md" Pack="true" PackagePath="\" />
     </ItemGroup>
+
 </Project>
diff --git a/src/OperationResults.AspNetCore/OperationResults.AspNetCore.csproj b/src/OperationResults.AspNetCore/OperationResults.AspNetCore.csproj
@@ -25,13 +25,15 @@
     </ItemGroup>
 
     <ItemGroup>        
-        <PackageReference Include="OperationResultTools" Version="1.0.15" />
+        <PackageReference Include="OperationResultTools" Version="1.0.21" />
     </ItemGroup>
 
     <ItemGroup>
         <None Include="..\..\Toolbox.png">
             <Pack>True</Pack>
             <PackagePath></PackagePath>
         </None>
+        <None Include="..\..\README.md" Pack="true" PackagePath="\" />
     </ItemGroup>
+
 </Project>
diff --git a/src/OperationResults/Result{OfT}.cs b/src/OperationResults/Result{OfT}.cs
@@ -4,6 +4,7 @@ namespace OperationResults;
 
 public class Result<T> : IGenericResult<T>
 {
+    [MemberNotNullWhen(true, nameof(Content))]
     public bool Success { get; }
 
     public T? Content { get; }