further fix for dispose issues

.github/workflows/createrelease.yml

@@ -23,7 +23,7 @@ jobs:
       run: dotnet restore TransactionProcessor.sln --source ${{ secrets.PUBLICFEEDURL }} --source ${{ secrets.PRIVATEFEED_URL }}
 
     - name: Build Code
-      run: dotnet build TransactionProcessor.sln --configuration Release            
+      run: dotnet build TransactionProcessor.sln --configuration Release --no-restore
 
     - name: Publish Images to Docker Hub - Pre Release
       if: ${{ github.event.release.prerelease == true }} 
@@ -41,11 +41,12 @@ jobs:
 
     - name: Publish API
       if: ${{ github.event.release.prerelease == false }}
-      run: dotnet publish "TransactionProcessor\TransactionProcessor.csproj" --configuration Release --output publishOutput -r win-x64 --self-contained
-              -p:Version=${{ steps.get_version.outputs.VERSION }}
-              -p:AssemblyVersion=${{ steps.get_version.outputs.VERSION }}
-              -p:FileVersion=${{ steps.get_version.outputs.VERSION }}
-              -p:InformationalVersion=${{ steps.get_version.outputs.VERSION }}
+      run: |
+        dotnet publish "TransactionProcessor/TransactionProcessor.csproj" --configuration Release --output publishOutput -r win-x64 --self-contained --no-build --no-restore \
+          -p:Version=${{ steps.get_version.outputs.VERSION }} \
+          -p:AssemblyVersion=${{ steps.get_version.outputs.VERSION }} \
+          -p:FileVersion=${{ steps.get_version.outputs.VERSION }} \
+          -p:InformationalVersion=${{ steps.get_version.outputs.VERSION }}
 
     - name: Build Release Package
       run: |

TransactionProcessor.Tests/RepositoryTests/TransactionProcessorReadModelRepositoryTests.cs

@@ -0,0 +1,84 @@
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Data.Sqlite;
+using Moq;
+using Shared.EntityFramework;
+using Shouldly;
+using System;
+using System.Data.Common;
+using System.Threading;
+using System.Threading.Tasks;
+using TransactionProcessor.Database.Contexts;
+using TransactionProcessor.Database.Entities;
+using TransactionProcessor.Repository;
+using Xunit;
+
+namespace TransactionProcessor.Tests.RepositoryTests
+{
+    public class TransactionProcessorReadModelRepositoryTests
+    {
+        private static (EstateManagementContext Context, DbConnection Connection) CreateContext()
+        {
+            SqliteConnection connection = new SqliteConnection("DataSource=:memory:");
+            connection.Open();
+
+            DbContextOptionsBuilder<EstateManagementContext> builder = new DbContextOptionsBuilder<EstateManagementContext>()
+                .UseSqlite(connection);
+
+            EstateManagementContext context = new EstateManagementContext(builder.Options);
+            context.Database.EnsureCreated();
+
+            return (context, connection);
+        }
+
+        [Fact]
+        public async Task GetEstate_DisposesResolvedScope_WhenReadCompletes()
+        {
+            Guid estateId = Guid.NewGuid();
+            (EstateManagementContext context, DbConnection connection) = CreateContext();
+
+            await using (context)
+            await using (connection)
+            {
+                await context.Estates.AddAsync(new Estate
+                {
+                    EstateId = estateId,
+                    CreatedDateTime = DateTime.UtcNow,
+                    Name = "Test estate",
+                    Reference = "EST-001"
+                }, CancellationToken.None);
+                await context.SaveChangesAsync(CancellationToken.None);
+
+                TrackingDisposable trackingDisposable = new TrackingDisposable();
+                ServiceProvider serviceProvider = new ServiceCollection()
+                    .AddScoped(_ => trackingDisposable)
+                    .AddTransient(_ => context)
+                    .BuildServiceProvider();
+
+                IServiceScope scope = serviceProvider.CreateScope();
+                _ = scope.ServiceProvider.GetRequiredService<TrackingDisposable>();
+
+                Mock<IDbContextResolver<EstateManagementContext>> resolver = new();
+                resolver.Setup(r => r.Resolve(It.IsAny<String>(), It.IsAny<String>()))
+                        .Returns(new ResolvedDbContext<EstateManagementContext>(scope));
+
+                TransactionProcessorReadModelRepository repository = new TransactionProcessorReadModelRepository(resolver.Object);
+
+                var result = await repository.GetEstate(estateId, CancellationToken.None);
+
+                result.IsSuccess.ShouldBeTrue();
+                trackingDisposable.Disposed.ShouldBeTrue();
+            }
+        }
+
+        private sealed class TrackingDisposable : IDisposable
+        {
+            public Boolean Disposed { get; private set; }
+
+            public void Dispose()
+            {
+                this.Disposed = true;
+            }
+        }
+    }
+}

TransactionProcessor.Tests/TransactionProcessor.Tests.csproj

@@ -38,6 +38,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\TransactionProcessor.DomainEvents\TransactionProcessor.DomainEvents.csproj" />
+    <ProjectReference Include="..\TransactionProcessor.Repository\TransactionProcessor.Repository.csproj" />
     <ProjectReference Include="..\TransactionProcessor.Testing\TransactionProcessor.Testing.csproj" />
     <ProjectReference Include="..\TransactionProcessor\TransactionProcessor.csproj" />
   </ItemGroup>

TransactionProcessor/Dockerfile

@@ -3,9 +3,9 @@ WORKDIR /app
 
 FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build
 WORKDIR /src
-COPY ["TransactionProcessor/NuGet.Config", "."]
+COPY ["NuGet.Config", "."]
 COPY ["TransactionProcessor/TransactionProcessor.csproj", "TransactionProcessor/"]
-COPY ["TransactionProcessor/NuGet.Config", "TransactionProcessor/"]
+COPY ["NuGet.Config", "TransactionProcessor/"]
 COPY ["TransactionProcessor.DataTransferObjects/TransactionProcessor.DataTransferObjects.csproj", "TransactionProcessor.DataTransferObjects/"]
 COPY ["TransactionProcessor.BusinessLogic/TransactionProcessor.BusinessLogic.csproj", "TransactionProcessor.BusinessLogic/"]
 COPY ["TransactionProcessor.Models/TransactionProcessor.Models.csproj", "TransactionProcessor.Models/"]
@@ -27,4 +27,4 @@ RUN dotnet publish "TransactionProcessor.csproj" -c Release -o /app/publish
 FROM base AS final
 WORKDIR /app
 COPY --from=publish /app/publish .
-ENTRYPOINT ["dotnet", "TransactionProcessor.dll"]
+ENTRYPOINT ["dotnet", "TransactionProcessor.dll"]

TransactionProcessor/Dockerfilewindows

@@ -4,9 +4,9 @@ WORKDIR /app
 
 FROM mcr.microsoft.com/dotnet/sdk:10.0-windowsservercore-ltsc2022 AS build
 WORKDIR /src
-COPY ["TransactionProcessor/NuGet.Config", "."]
+COPY ["NuGet.Config", "."]
 COPY ["TransactionProcessor/TransactionProcessor.csproj", "TransactionProcessor/"]
-COPY ["TransactionProcessor/NuGet.Config", "TransactionProcessor/"]
+COPY ["NuGet.Config", "TransactionProcessor/"]
 COPY ["TransactionProcessor.DataTransferObjects/TransactionProcessor.DataTransferObjects.csproj", "TransactionProcessor.DataTransferObjects/"]
 COPY ["TransactionProcessor.BusinessLogic/TransactionProcessor.BusinessLogic.csproj", "TransactionProcessor.BusinessLogic/"]
 COPY ["TransactionProcessor.Models/TransactionProcessor.Models.csproj", "TransactionProcessor.Models/"]
@@ -27,4 +27,4 @@ RUN dotnet publish "TransactionProcessor.csproj" -c Release -o /app/publish
 FROM base AS final
 WORKDIR /app
 COPY --from=publish /app/publish .
-ENTRYPOINT ["dotnet", "TransactionProcessor.dll"]
+ENTRYPOINT ["dotnet", "TransactionProcessor.dll"]