Merge pull request #508 from Particular/support-new-saga-mapping

HEskandari · web-flow · commit 80cf202e36df · 2020-08-25T15:31:52.000+10:00
Support new saga mapping api
diff --git a/src/AcceptanceTestHelper/AcceptanceTestHelper.csproj b/src/AcceptanceTestHelper/AcceptanceTestHelper.csproj
@@ -12,4 +12,8 @@
     <ProjectReference Include="..\TestHelper\TestHelper.csproj" />
   </ItemGroup>
 
-</Project>
+  <ItemGroup>
+    <PackageReference Include="NServiceBus" Version="[7.4.1,)" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/AcceptanceTestHelper/ConfigureHowToFindSagaWithMessage.cs b/src/AcceptanceTestHelper/ConfigureHowToFindSagaWithMessage.cs
@@ -3,7 +3,7 @@
 using System.Reflection;
 using NServiceBus;
 
-class ConfigureHowToFindSagaWithMessage : IConfigureHowToFindSagaWithMessage
+class ConfigureHowToFindSagaWithMessage : IConfigureHowToFindSagaWithMessage, IConfigureHowToFindSagaWithMessageHeaders
 {
     public void ConfigureMapping<TSagaEntity, TMessage>(Expression<Func<TSagaEntity, object>> sagaEntityProperty, Expression<Func<TMessage, object>> messageProperty)
         where TSagaEntity : IContainSagaData
@@ -15,6 +15,15 @@ public void ConfigureMapping<TSagaEntity, TMessage>(Expression<Func<TSagaEntity,
         CorrelationType = property.PropertyType;
     }
 
+    public void ConfigureMapping<TSagaEntity, TMessage>(Expression<Func<TSagaEntity, object>> sagaEntityProperty, string headerName) where TSagaEntity : IContainSagaData
+    {
+        var body = sagaEntityProperty.Body;
+        var member = GetMemberExpression(body);
+        var property = (PropertyInfo)member.Member;
+        CorrelationProperty = property.Name;
+        CorrelationType = property.PropertyType;
+    }
+
     MemberExpression GetMemberExpression(Expression body)
     {
         if (body is UnaryExpression unaryExpression)
diff --git a/src/AcceptanceTestHelper/EndpointConfigurationExtensions.cs b/src/AcceptanceTestHelper/EndpointConfigurationExtensions.cs
@@ -1,21 +1,24 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
 using NServiceBus;
 using NServiceBus.Configuration.AdvancedExtensibility;
 
 public static class EndpointConfigurationExtensions
 {
-    public static List<Type> ScannedTypes(this EndpointConfiguration configuration)
+    public static List<Type> UserProvidedTypes(this EndpointConfiguration configuration)
     {
-        var field = typeof(EndpointConfiguration)
-            .GetField("ScannedTypes", BindingFlags.Instance | BindingFlags.NonPublic);
-        if (field == null)
+        var scannerConfigurationTypeName = "NServiceBus.AssemblyScanningComponent+Configuration";
+        var userProvidedTypesPropertyName = "UserProvidedTypes";
+
+        var scannerConfiguration = configuration.GetSettings().Get(scannerConfigurationTypeName);
+
+        var property = scannerConfiguration.GetType().GetProperty(userProvidedTypesPropertyName);
+        if (property == null)
         {
-            throw new Exception("Could not extract field 'scannedTypes' from EndpointConfiguration.");
+            throw new Exception($"Could not extract field '{userProvidedTypesPropertyName}' from {scannerConfigurationTypeName}.");
         }
-        return (List<Type>)field.GetValue(configuration);
+        return (List<Type>)property.GetValue(scannerConfiguration);
     }
 
     public static bool IsSendOnly(this EndpointConfiguration configuration)
@@ -25,7 +28,7 @@ public static bool IsSendOnly(this EndpointConfiguration configuration)
 
     public static IEnumerable<Type> GetScannedSagaTypes(this EndpointConfiguration configuration)
     {
-        return configuration.ScannedTypes()
+        return configuration.UserProvidedTypes()
             .Where(type => !type.IsAbstract && typeof(Saga).IsAssignableFrom(type));
     }
 }
diff --git a/src/AcceptanceTestsShared/When_different_persistence_is_for_outbox.cs b/src/AcceptanceTestsShared/When_different_persistence_is_for_outbox.cs
@@ -21,7 +21,7 @@ await Scenario.Define<Context>()
                 .ConfigureAwait(false);
         });
 
-        StringAssert.StartsWith("Sagas and the Outbox need to use the same type of persistence.", ex.Message);
+        StringAssert.StartsWith("Sql Persistence must be enabled for either both Sagas and Outbox, or neither.", ex.Message);
     }
 
     public class Context : ScenarioContext
diff --git a/src/AcceptanceTestsShared/When_outbox_enabled_and_different_persistence_is_for_sagas.cs b/src/AcceptanceTestsShared/When_outbox_enabled_and_different_persistence_is_for_sagas.cs
@@ -21,7 +21,7 @@ await Scenario.Define<Context>()
                 .ConfigureAwait(false);
         });
 
-        StringAssert.StartsWith("Sagas and the Outbox need to use the same type of persistence.", ex.Message);
+        StringAssert.StartsWith("Sql Persistence must be enabled for either both Sagas and Outbox, or neither.", ex.Message);
     }
 
     public class Context : ScenarioContext
diff --git a/src/MsSqlMicrosoftDataClientAcceptanceTests/MsSqlMicrosoftDataClientAcceptanceTests.csproj b/src/MsSqlMicrosoftDataClientAcceptanceTests/MsSqlMicrosoftDataClientAcceptanceTests.csproj
@@ -13,8 +13,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
-    <PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="7.2.4" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.0" />
+    <PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="7.4.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
   </ItemGroup>
diff --git a/src/MsSqlMicrosoftDataClientSqlTransportAcceptanceTests/MsSqlMicrosoftDataClientSqlTransportAcceptanceTests.csproj b/src/MsSqlMicrosoftDataClientSqlTransportAcceptanceTests/MsSqlMicrosoftDataClientSqlTransportAcceptanceTests.csproj
@@ -12,9 +12,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
-    <PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="7.2.4" GeneratePathProperty="true" />
-    <PackageReference Include="NServiceBus.Transport.SqlServer" Version="6.0.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.0" />
+    <PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="7.4.1" GeneratePathProperty="true" />
+    <PackageReference Include="NServiceBus.Transport.SqlServer" Version="6.1.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
   </ItemGroup>
diff --git a/src/MsSqlSystemDataClientAcceptanceTests/MsSqlSystemDataClientAcceptanceTests.csproj b/src/MsSqlSystemDataClientAcceptanceTests/MsSqlSystemDataClientAcceptanceTests.csproj
@@ -13,8 +13,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
-    <PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="7.2.4" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.0" />
+    <PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="7.4.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
   </ItemGroup>
diff --git a/src/MsSqlSystemDataClientSqlTransportAcceptanceTests/MsSqlSystemDataClientSqlTransportAcceptanceTests.csproj b/src/MsSqlSystemDataClientSqlTransportAcceptanceTests/MsSqlSystemDataClientSqlTransportAcceptanceTests.csproj
@@ -12,8 +12,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
-    <PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="7.2.4" GeneratePathProperty="true" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.0" />
+    <PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="7.4.1" GeneratePathProperty="true" />
     <PackageReference Include="NServiceBus.SqlServer" Version="6.0.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
diff --git a/src/MySqlAcceptanceTests/ConfigureEndpointSqlPersistence.cs b/src/MySqlAcceptanceTests/ConfigureEndpointSqlPersistence.cs
@@ -14,7 +14,7 @@ public Task Configure(string endpointName, EndpointConfiguration configuration,
         {
             return Task.FromResult(0);
         }
-        var tablePrefix = TableNameCleaner.Clean(endpointName).Substring(0, Math.Min(endpointName.Length, 35));
+        var tablePrefix = TableNameCleaner.Clean(endpointName).Substring(0, Math.Min(endpointName.Length, 30));
         endpointHelper = new ConfigureEndpointHelper(configuration, tablePrefix, MySqlConnectionBuilder.Build, BuildSqlDialect.MySql);
         var persistence = configuration.UsePersistence<SqlPersistence>();
         persistence.ConnectionBuilder(MySqlConnectionBuilder.Build);
diff --git a/src/MySqlAcceptanceTests/MySqlAcceptanceTests.csproj b/src/MySqlAcceptanceTests/MySqlAcceptanceTests.csproj
@@ -12,8 +12,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
-    <PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="7.2.4" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.0" />
+    <PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="7.4.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
   </ItemGroup>
diff --git a/src/OracleAcceptanceTests/OracleAcceptanceTests.csproj b/src/OracleAcceptanceTests/OracleAcceptanceTests.csproj
@@ -12,8 +12,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
-    <PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="7.2.4" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.0" />
+    <PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="7.4.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
   </ItemGroup>
diff --git a/src/PostgreSqlAcceptanceTests/PostgreSqlAcceptanceTests.csproj b/src/PostgreSqlAcceptanceTests/PostgreSqlAcceptanceTests.csproj
@@ -12,8 +12,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
-    <PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="7.2.4" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.0" />
+    <PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="7.4.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
   </ItemGroup>
diff --git a/src/ScriptBuilder.Tests/ApprovalFiles/CoreSagaMetadataTests.TestHeaderMapping.approved.txt b/src/ScriptBuilder.Tests/ApprovalFiles/CoreSagaMetadataTests.TestHeaderMapping.approved.txt
@@ -0,0 +1,15 @@
+{
+  "HasUnmanagedCalls": false,
+  "HasUnexpectedCalls": false,
+  "HasBranchingLogic": false,
+  "SagaDefinition": {
+    "TableSuffix": "HeaderMappingSaga",
+    "CorrelationProperty": {
+      "Type": "String",
+      "Name": "SagaCorrelation"
+    },
+    "TransitionalCorrelationProperty": null,
+    "Name": "CoreSagaMetadataTests/HeaderMappingSaga"
+  },
+  "Exception": null
+}
diff --git a/src/ScriptBuilder.Tests/ApprovalFiles/CoreSagaMetadataTests.TestReverseHeaderMapping.approved.txt b/src/ScriptBuilder.Tests/ApprovalFiles/CoreSagaMetadataTests.TestReverseHeaderMapping.approved.txt
@@ -0,0 +1,15 @@
+{
+  "HasUnmanagedCalls": false,
+  "HasUnexpectedCalls": false,
+  "HasBranchingLogic": false,
+  "SagaDefinition": {
+    "TableSuffix": "ReverseHeaderMappingSaga",
+    "CorrelationProperty": {
+      "Type": "String",
+      "Name": "SagaCorrelation"
+    },
+    "TransitionalCorrelationProperty": null,
+    "Name": "CoreSagaMetadataTests/ReverseHeaderMappingSaga"
+  },
+  "Exception": null
+}
diff --git a/src/ScriptBuilder.Tests/ApprovalFiles/CoreSagaMetadataTests.TestReverseMapping.approved.txt b/src/ScriptBuilder.Tests/ApprovalFiles/CoreSagaMetadataTests.TestReverseMapping.approved.txt
@@ -0,0 +1,15 @@
+{
+  "HasUnmanagedCalls": false,
+  "HasUnexpectedCalls": false,
+  "HasBranchingLogic": false,
+  "SagaDefinition": {
+    "TableSuffix": "ReverseMappingSaga",
+    "CorrelationProperty": {
+      "Type": "String",
+      "Name": "SagaCorrelation"
+    },
+    "TransitionalCorrelationProperty": null,
+    "Name": "CoreSagaMetadataTests/ReverseMappingSaga"
+  },
+  "Exception": null
+}
diff --git a/src/ScriptBuilder.Tests/Saga/CoreSagaMetadata/CoreSagaMetadataTests.HeaderMappingSaga.cs b/src/ScriptBuilder.Tests/Saga/CoreSagaMetadata/CoreSagaMetadataTests.HeaderMappingSaga.cs
@@ -0,0 +1,46 @@
+﻿using NServiceBus;
+
+public partial class CoreSagaMetadataTests
+{
+    public class HeaderMappingSaga : Saga<HeaderMappingSaga.SagaData>
+    {
+        public class SagaData : ContainSagaData
+        {
+            public string SagaCorrelation { get; set; }
+        }
+
+        protected override void ConfigureHowToFindSaga(SagaPropertyMapper<SagaData> mapper)
+        {
+            mapper.ConfigureHeaderMapping<MessageA>("SomeHeaderName")
+                .ToSaga(saga => saga.SagaCorrelation);
+        }
+    }
+}
+
+/* IL:
+HeaderMappingSaga.ConfigureHowToFindSaga:
+IL_0000:  nop         
+IL_0001:  ldarg.1     
+IL_0002:  ldstr       "SomeHeaderName"
+IL_0007:  callvirt    NServiceBus.SagaPropertyMapper<UserQuery+HeaderMappingSaga+SagaData>.ConfigureHeaderMapping<MessageA>
+IL_000C:  ldtoken     UserQuery+HeaderMappingSaga.SagaData
+IL_0011:  call        System.Type.GetTypeFromHandle
+IL_0016:  ldstr       "saga"
+IL_001B:  call        System.Linq.Expressions.Expression.Parameter
+IL_0020:  stloc.0     
+IL_0021:  ldloc.0     
+IL_0022:  ldtoken     UserQuery+HeaderMappingSaga+SagaData.get_SagaCorrelation
+IL_0027:  call        System.Reflection.MethodBase.GetMethodFromHandle
+IL_002C:  castclass   System.Reflection.MethodInfo
+IL_0031:  call        System.Linq.Expressions.Expression.Property
+IL_0036:  ldc.i4.1    
+IL_0037:  newarr      System.Linq.Expressions.ParameterExpression
+IL_003C:  dup         
+IL_003D:  ldc.i4.0    
+IL_003E:  ldloc.0     
+IL_003F:  stelem.ref  
+IL_0040:  call        System.Linq.Expressions.Expression.Lambda<Func`2>
+IL_0045:  callvirt    NServiceBus.IToSagaExpression<UserQuery+HeaderMappingSaga+SagaData>.ToSaga
+IL_004A:  nop         
+IL_004B:  ret         
+*/
diff --git a/src/ScriptBuilder.Tests/Saga/CoreSagaMetadata/CoreSagaMetadataTests.ReverseHeaderMappingSaga.cs b/src/ScriptBuilder.Tests/Saga/CoreSagaMetadata/CoreSagaMetadataTests.ReverseHeaderMappingSaga.cs
@@ -0,0 +1,46 @@
+﻿using NServiceBus;
+
+public partial class CoreSagaMetadataTests
+{
+    public class ReverseHeaderMappingSaga : Saga<ReverseHeaderMappingSaga.SagaData>
+    {
+        public class SagaData : ContainSagaData
+        {
+            public string SagaCorrelation { get; set; }
+        }
+
+        protected override void ConfigureHowToFindSaga(SagaPropertyMapper<SagaData> mapper)
+        {
+            mapper.MapSaga(saga => saga.SagaCorrelation)
+                .ToMessageHeader<MessageA>("SomeHeaderName");
+        }
+    }
+}
+
+/* IL:
+ReverseHeaderMappingSaga.ConfigureHowToFindSaga:
+IL_0000:  nop         
+IL_0001:  ldarg.1     
+IL_0002:  ldtoken     UserQuery+ReverseHeaderMappingSaga.SagaData
+IL_0007:  call        System.Type.GetTypeFromHandle
+IL_000C:  ldstr       "saga"
+IL_0011:  call        System.Linq.Expressions.Expression.Parameter
+IL_0016:  stloc.0     
+IL_0017:  ldloc.0     
+IL_0018:  ldtoken     UserQuery+ReverseHeaderMappingSaga+SagaData.get_SagaCorrelation
+IL_001D:  call        System.Reflection.MethodBase.GetMethodFromHandle
+IL_0022:  castclass   System.Reflection.MethodInfo
+IL_0027:  call        System.Linq.Expressions.Expression.Property
+IL_002C:  ldc.i4.1    
+IL_002D:  newarr      System.Linq.Expressions.ParameterExpression
+IL_0032:  dup         
+IL_0033:  ldc.i4.0    
+IL_0034:  ldloc.0     
+IL_0035:  stelem.ref  
+IL_0036:  call        System.Linq.Expressions.Expression.Lambda<Func`2>
+IL_003B:  callvirt    NServiceBus.SagaPropertyMapper<UserQuery+ReverseHeaderMappingSaga+SagaData>.MapSaga
+IL_0040:  ldstr       "SomeHeaderName"
+IL_0045:  callvirt    NServiceBus.CorrelatedSagaPropertyMapper<UserQuery+ReverseHeaderMappingSaga+SagaData>.ToMessageHeader<MessageA>
+IL_004A:  pop         
+IL_004B:  ret         
+*/
diff --git a/src/ScriptBuilder.Tests/Saga/CoreSagaMetadata/CoreSagaMetadataTests.ReverseMappingSaga.cs b/src/ScriptBuilder.Tests/Saga/CoreSagaMetadata/CoreSagaMetadataTests.ReverseMappingSaga.cs
@@ -0,0 +1,61 @@
+﻿using NServiceBus;
+
+public partial class CoreSagaMetadataTests
+{
+    public class ReverseMappingSaga : Saga<ReverseMappingSaga.SagaData>
+    {
+        public class SagaData : ContainSagaData
+        {
+            public string SagaCorrelation { get; set; }
+        }
+
+        protected override void ConfigureHowToFindSaga(SagaPropertyMapper<SagaData> mapper)
+        {
+            mapper.MapSaga(saga => saga.SagaCorrelation)
+                .ToMessage<MessageA>(msg => msg.Correlation);
+        }
+    }
+}
+/* IL:
+ReverseMappingSaga.ConfigureHowToFindSaga:
+IL_0000:  nop         
+IL_0001:  ldarg.1     
+IL_0002:  ldtoken     UserQuery+ReverseMappingSaga.SagaData
+IL_0007:  call        System.Type.GetTypeFromHandle
+IL_000C:  ldstr       "saga"
+IL_0011:  call        System.Linq.Expressions.Expression.Parameter
+IL_0016:  stloc.0     
+IL_0017:  ldloc.0     
+IL_0018:  ldtoken     UserQuery+ReverseMappingSaga+SagaData.get_Correlation
+IL_001D:  call        System.Reflection.MethodBase.GetMethodFromHandle
+IL_0022:  castclass   System.Reflection.MethodInfo
+IL_0027:  call        System.Linq.Expressions.Expression.Property
+IL_002C:  ldc.i4.1    
+IL_002D:  newarr      System.Linq.Expressions.ParameterExpression
+IL_0032:  dup         
+IL_0033:  ldc.i4.0    
+IL_0034:  ldloc.0     
+IL_0035:  stelem.ref  
+IL_0036:  call        System.Linq.Expressions.Expression.Lambda<Func`2>
+IL_003B:  callvirt    NServiceBus.SagaPropertyMapper<UserQuery+ReverseMappingSaga+SagaData>.MapSaga
+IL_0040:  ldtoken     UserQuery.MessageA
+IL_0045:  call        System.Type.GetTypeFromHandle
+IL_004A:  ldstr       "msg"
+IL_004F:  call        System.Linq.Expressions.Expression.Parameter
+IL_0054:  stloc.0     
+IL_0055:  ldloc.0     
+IL_0056:  ldtoken     UserQuery+MessageA.get_Correlation
+IL_005B:  call        System.Reflection.MethodBase.GetMethodFromHandle
+IL_0060:  castclass   System.Reflection.MethodInfo
+IL_0065:  call        System.Linq.Expressions.Expression.Property
+IL_006A:  ldc.i4.1    
+IL_006B:  newarr      System.Linq.Expressions.ParameterExpression
+IL_0070:  dup         
+IL_0071:  ldc.i4.0    
+IL_0072:  ldloc.0     
+IL_0073:  stelem.ref  
+IL_0074:  call        System.Linq.Expressions.Expression.Lambda<Func`2>
+IL_0079:  callvirt    NServiceBus.CorrelatedSagaPropertyMapper<UserQuery+ReverseMappingSaga+SagaData>.ToMessage<MessageA>
+IL_007E:  pop         
+IL_007F:  ret         
+*/
diff --git a/src/ScriptBuilder.Tests/Saga/CoreSagaMetadata/CoreSagaMetadataTests.cs b/src/ScriptBuilder.Tests/Saga/CoreSagaMetadata/CoreSagaMetadataTests.cs
diff --git a/src/ScriptBuilder.Tests/ScriptBuilder.Tests.csproj b/src/ScriptBuilder.Tests/ScriptBuilder.Tests.csproj
diff --git a/src/ScriptBuilder/Saga/InstructionAnalyzer.cs b/src/ScriptBuilder/Saga/InstructionAnalyzer.cs
diff --git a/src/SqlPersistence/InstallerFeature.cs b/src/SqlPersistence/InstallerFeature.cs
diff --git a/src/SqlPersistence/Saga/Config/SagaSettings_SettingsForVersion.cs b/src/SqlPersistence/Saga/Config/SagaSettings_SettingsForVersion.cs
diff --git a/src/SqlPersistence/Subscription/SqlSubscriptionFeature.cs b/src/SqlPersistence/Subscription/SqlSubscriptionFeature.cs
diff --git a/src/VBTestCode/VBTestCode.vbproj b/src/VBTestCode/VBTestCode.vbproj

Original file line number	Diff line number	Diff line change
`@@ -1,21 +1,24 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using System.Linq;`
`4`		`-using System.Reflection;`
`5`	`4`	`using NServiceBus;`
`6`	`5`	`using NServiceBus.Configuration.AdvancedExtensibility;`
`7`	`6`
`8`	`7`	`public static class EndpointConfigurationExtensions`
`9`	`8`	`{`
`10`		`- public static List<Type> ScannedTypes(this EndpointConfiguration configuration)`
	`9`	`+ public static List<Type> UserProvidedTypes(this EndpointConfiguration configuration)`
`11`	`10`	`{`
`12`		`- var field = typeof(EndpointConfiguration)`
`13`		`- .GetField("ScannedTypes", BindingFlags.Instance \| BindingFlags.NonPublic);`
`14`		`- if (field == null)`
	`11`	`+ var scannerConfigurationTypeName = "NServiceBus.AssemblyScanningComponent+Configuration";`
	`12`	`+ var userProvidedTypesPropertyName = "UserProvidedTypes";`
	`13`	`+`
	`14`	`+ var scannerConfiguration = configuration.GetSettings().Get(scannerConfigurationTypeName);`
	`15`	`+`
	`16`	`+ var property = scannerConfiguration.GetType().GetProperty(userProvidedTypesPropertyName);`
	`17`	`+ if (property == null)`
`15`	`18`	`{`
`16`		`- throw new Exception("Could not extract field 'scannedTypes' from EndpointConfiguration.");`
	`19`	`+ throw new Exception($"Could not extract field '{userProvidedTypesPropertyName}' from {scannerConfigurationTypeName}.");`
`17`	`20`	`}`
`18`		`- return (List<Type>)field.GetValue(configuration);`
	`21`	`+ return (List<Type>)property.GetValue(scannerConfiguration);`
`19`	`22`	`}`
`20`	`23`
`21`	`24`	`public static bool IsSendOnly(this EndpointConfiguration configuration)`
`@@ -25,7 +28,7 @@ public static bool IsSendOnly(this EndpointConfiguration configuration)`
`25`	`28`
`26`	`29`	`public static IEnumerable<Type> GetScannedSagaTypes(this EndpointConfiguration configuration)`
`27`	`30`	`{`
`28`		`- return configuration.ScannedTypes()`
	`31`	`+ return configuration.UserProvidedTypes()`
`29`	`32`	`.Where(type => !type.IsAbstract && typeof(Saga).IsAssignableFrom(type));`
`30`	`33`	`}`
`31`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ await Scenario.Define<Context>()`
`21`	`21`	`.ConfigureAwait(false);`
`22`	`22`	`});`
`23`	`23`
`24`		`- StringAssert.StartsWith("Sagas and the Outbox need to use the same type of persistence.", ex.Message);`
	`24`	`+ StringAssert.StartsWith("Sql Persistence must be enabled for either both Sagas and Outbox, or neither.", ex.Message);`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`public class Context : ScenarioContext`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ public Task Configure(string endpointName, EndpointConfiguration configuration,`
`14`	`14`	`{`
`15`	`15`	`return Task.FromResult(0);`
`16`	`16`	`}`
`17`		`- var tablePrefix = TableNameCleaner.Clean(endpointName).Substring(0, Math.Min(endpointName.Length, 35));`
	`17`	`+ var tablePrefix = TableNameCleaner.Clean(endpointName).Substring(0, Math.Min(endpointName.Length, 30));`
`18`	`18`	`endpointHelper = new ConfigureEndpointHelper(configuration, tablePrefix, MySqlConnectionBuilder.Build, BuildSqlDialect.MySql);`
`19`	`19`	`var persistence = configuration.UsePersistence<SqlPersistence>();`
`20`	`20`	`persistence.ConnectionBuilder(MySqlConnectionBuilder.Build);`