Release 8.1 (#131)

* bugfix: don't publish transaction if it wasn't committed to the database

* fix: allow assembly version to be ignored

* fix: pass options to tests

* chore: switch to vars for NUGET_SOURCE

Author: the-avid-engineer

.github/workflows/publish-beta.yml

@@ -46,7 +46,7 @@ jobs:
       - name: Pack Projects into Nuget Packages
         run: dotnet pack EntityDb.sln --no-restore -c Release /p:Version='${{ needs.milestone.outputs.version }}-beta.${{ github.event.number }}.${{ github.run_number }}.${{ github.run_attempt }}'
       - name: Publish to Beta
-        run: dotnet nuget push ./**/*.nupkg -s ${{ secrets.NUGET_SOURCE }} -k ${{ secrets.NUGET_API_KEY }}
+        run: dotnet nuget push ./**/*.nupkg -s ${{ vars.NUGET_SOURCE }} -k ${{ secrets.NUGET_API_KEY }}
       - name: Packages & Symbols Artifact
         uses: actions/[email protected]
         with:

.github/workflows/publish-stable.yml

@@ -54,7 +54,7 @@ jobs:
       - name: Pack Projects into Nuget Packages
         run: dotnet pack EntityDb.sln --no-restore -c Release /p:Version=${{ needs.tag.outputs.version }}
       - name: Publish to Stable
-        run: dotnet nuget push ./**/*.nupkg -s ${{ secrets.NUGET_SOURCE }} -k ${{ secrets.NUGET_API_KEY }}
+        run: dotnet nuget push ./**/*.nupkg -s ${{ vars.NUGET_SOURCE }} -k ${{ secrets.NUGET_API_KEY }}
       - name: Packages & Symbols Artifact
         uses: actions/[email protected]
         with:

src/EntityDb.Common/Entities/EntityRepository.cs

@@ -57,14 +57,14 @@ public async Task<TEntity> GetSnapshot(Pointer entityPointer, CancellationToken
 
     public async Task<bool> PutTransaction(ITransaction transaction, CancellationToken cancellationToken = default)
     {
-        try
-        {
-            return await TransactionRepository.PutTransaction(transaction, cancellationToken);
-        }
-        finally
+        var success = await TransactionRepository.PutTransaction(transaction, cancellationToken);
+
+        if (success)
         {
             Publish(transaction);
         }
+
+        return success;
     }
 
     public override async ValueTask DisposeAsync()

src/EntityDb.Common/TypeResolvers/DefaultPartialTypeResolver.cs

@@ -1,11 +1,29 @@
 using EntityDb.Common.Envelopes;
+using Microsoft.Extensions.Options;
 using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
 
 namespace EntityDb.Common.TypeResolvers;
 
 internal class DefaultPartialTypeResolver : IPartialTypeResolver
 {
+    private readonly IOptions<DefaultPartialTypeResolverOptions> _options;
+
+    public DefaultPartialTypeResolver(IOptions<DefaultPartialTypeResolverOptions> options)
+    {
+        _options = options;
+    }
+    
+    private Assembly AssemblyResolver(AssemblyName assemblyName)
+    {
+        if (_options.Value.IgnoreVersion)
+        {
+            assemblyName.Version = null;
+        }
+        
+        return Assembly.Load(assemblyName);
+    }
+    
     public bool TryResolveType(EnvelopeHeaders envelopeHeaders, [NotNullWhen(true)] out Type? resolvedType)
     {
         if (EnvelopeHelper.NotThisPlatform(envelopeHeaders) ||
@@ -19,7 +37,7 @@ public bool TryResolveType(EnvelopeHeaders envelopeHeaders, [NotNullWhen(true)]
         resolvedType = Type.GetType
         (
             Assembly.CreateQualifiedName(assemblyFullName, typeFullName),
-            Assembly.Load,
+            AssemblyResolver,
             (assembly, typeName, ignoreCase) => assembly!.GetType(typeName, true, ignoreCase),
             true,
             false

src/EntityDb.Common/TypeResolvers/DefaultPartialTypeResolverOptions.cs

@@ -0,0 +1,13 @@
+namespace EntityDb.Common.TypeResolvers;
+
+/// <summary>
+///     Options for the default partial type resolver
+/// </summary>
+public class DefaultPartialTypeResolverOptions
+{
+    /// <summary>
+    ///     If you version your assemblies, you may want to ignore the
+    ///     version of the assembly for type resolving purposes.
+    /// </summary>
+    public bool IgnoreVersion { get; set; }
+}

test/EntityDb.Common.Tests/TypeResolvers/DefaultTypeResolverTests.cs

@@ -1,5 +1,7 @@
 using EntityDb.Common.Envelopes;
 using EntityDb.Common.TypeResolvers;
+using Microsoft.Extensions.Options;
+using Moq;
 using Shouldly;
 using Xunit;
 
@@ -14,7 +16,13 @@ public void GivenEmptyHeaders_WhenLoadingType_ThenReturnNull()
 
         var headers = new EnvelopeHeaders(new Dictionary<string, string>());
 
-        var typeResolver = new DefaultPartialTypeResolver();
+        var optionsMock = new Mock<IOptions<DefaultPartialTypeResolverOptions>>();
+
+        optionsMock
+            .SetupGet(x => x.Value)
+            .Returns(new DefaultPartialTypeResolverOptions());
+
+        var typeResolver = new DefaultPartialTypeResolver(optionsMock.Object);
 
         // ACT
 
@@ -37,7 +45,13 @@ public void GivenFullNames_WhenLoadingType_ThenReturnType()
 
         var headers = EnvelopeHelper.GetEnvelopeHeaders(expectedType, true, false);
 
-        var typeResolver = new DefaultPartialTypeResolver();
+        var optionsMock = new Mock<IOptions<DefaultPartialTypeResolverOptions>>();
+
+        optionsMock
+            .SetupGet(x => x.Value)
+            .Returns(new DefaultPartialTypeResolverOptions());
+
+        var typeResolver = new DefaultPartialTypeResolver(optionsMock.Object);
 
         // ACT
 
@@ -56,7 +70,13 @@ public void GivenMemberInfoName_WhenLoadingType_ThenReturnNull()
 
         var headers = EnvelopeHelper.GetEnvelopeHeaders(typeof(object), false);
 
-        var typeResolver = new DefaultPartialTypeResolver();
+        var optionsMock = new Mock<IOptions<DefaultPartialTypeResolverOptions>>();
+
+        optionsMock
+            .SetupGet(x => x.Value)
+            .Returns(new DefaultPartialTypeResolverOptions());
+
+        var typeResolver = new DefaultPartialTypeResolver(optionsMock.Object);
 
         // ACT
 
@@ -73,7 +93,13 @@ public void GivenNoTypeInformation_WhenLoadingType_ThenReturnNull()
     {
         // ARRANGE
 
-        var typeResolver = new DefaultPartialTypeResolver();
+        var optionsMock = new Mock<IOptions<DefaultPartialTypeResolverOptions>>();
+
+        optionsMock
+            .SetupGet(x => x.Value)
+            .Returns(new DefaultPartialTypeResolverOptions());
+
+        var typeResolver = new DefaultPartialTypeResolver(optionsMock.Object);
 
         var envelopeHeaders = new EnvelopeHeaders(new Dictionary<string, string>
         {
@@ -95,7 +121,13 @@ public void GivenGarbageTypeInformation_WhenLoadingType_ThenThrow()
     {
         // ARRANGE
 
-        var typeResolver = new DefaultPartialTypeResolver();
+        var optionsMock = new Mock<IOptions<DefaultPartialTypeResolverOptions>>();
+
+        optionsMock
+            .SetupGet(x => x.Value)
+            .Returns(new DefaultPartialTypeResolverOptions());
+
+        var typeResolver = new DefaultPartialTypeResolver(optionsMock.Object);
 
         var envelopeHeaders = new EnvelopeHeaders(new Dictionary<string, string>
         {