Merge pull request #5054 from Particular/hotfix-6.4.2

Installing .NET Framework 4.7.1 can cause an endpoint to fail to start
Particular · Oct 26, 2017 · da682c0 · da682c0
2 parents e350a5a + 2d8a4cf
commit da682c0
Show file tree

Hide file tree

Showing 15 changed files with 44 additions and 12 deletions.
diff --git a/src/NServiceBus.Core.Tests/API/APIApprovals.cs b/src/NServiceBus.Core.Tests/API/APIApprovals.cs
@@ -3,7 +3,6 @@
     using System;
     using System.Linq;
     using System.Runtime.CompilerServices;
-    using ApprovalTests;
     using NUnit.Framework;
     using PublicApiGenerator;
 
@@ -15,7 +14,7 @@ public class APIApprovals
         public void ApproveNServiceBus()
         {
             var publicApi = Filter(ApiGenerator.GeneratePublicApi(typeof(Endpoint).Assembly));
-            Approvals.Verify(publicApi);
+            TestApprover.Verify(publicApi);
         }
 
         string Filter(string text)

diff --git a/...Approvals.ApproveNServiceBus.approved.txt → ...Approvals.ApproveNServiceBus.approved.txt b/...Approvals.ApproveNServiceBus.approved.txt → ...Approvals.ApproveNServiceBus.approved.txt
diff --git a/...Tests.Can_round_trip_headers.approved.txt → ...Tests.Can_round_trip_headers.approved.txt b/...Tests.Can_round_trip_headers.approved.txt → ...Tests.Can_round_trip_headers.approved.txt
diff --git a/...uldCreateCachedExecutionPlan.approved.txt → ...uldCreateCachedExecutionPlan.approved.txt b/...uldCreateCachedExecutionPlan.approved.txt → ...uldCreateCachedExecutionPlan.approved.txt
diff --git a/...eTests.ShouldExecutePipeline.approved.txt → ...eTests.ShouldExecutePipeline.approved.txt b/...eTests.ShouldExecutePipeline.approved.txt → ...eTests.ShouldExecutePipeline.approved.txt
diff --git a/...eTests.ShouldNotCacheContext.approved.txt → ...eTests.ShouldNotCacheContext.approved.txt b/...eTests.ShouldNotCacheContext.approved.txt → ...eTests.ShouldNotCacheContext.approved.txt
diff --git a/...chDontFollowStructGuidelines.approved.txt → ...chDontFollowStructGuidelines.approved.txt b/...chDontFollowStructGuidelines.approved.txt → ...chDontFollowStructGuidelines.approved.txt
diff --git a/...ated_properties.Should_throw.approved.txt → ...ated_properties.Should_throw.approved.txt b/...ated_properties.Should_throw.approved.txt → ...ated_properties.Should_throw.approved.txt
diff --git a/src/NServiceBus.Core.Tests/NServiceBus.Core.Tests.csproj b/src/NServiceBus.Core.Tests/NServiceBus.Core.Tests.csproj
@@ -186,6 +186,7 @@
     <Compile Include="Routing\Routers\UnicastSendRouterTests.cs" />
     <Compile Include="Routing\Routers\UnicastSendRouteOptionsTests.cs" />
     <Compile Include="Routing\TypeRouteSourceTests.cs" />
+    <Compile Include="TestApprover.cs" />
     <Compile Include="Transports\Learning\HeaderSerializerTests.cs" />
     <Compile Include="Transports\Learning\AsyncFileTests.cs" />
     <Compile Include="Transports\Learning\LearningTransportDispatcherTests.cs" />

diff --git a/src/NServiceBus.Core.Tests/Pipeline/PipelineTests.cs b/src/NServiceBus.Core.Tests/Pipeline/PipelineTests.cs
@@ -8,7 +8,6 @@
     using System.Linq.Expressions;
     using System.Text;
     using System.Threading.Tasks;
-    using ApprovalTests;
     using Extensibility;
     using NServiceBus.Pipeline;
     using NUnit.Framework;
@@ -39,7 +38,7 @@ public async Task ShouldExecutePipeline()
 
             await pipeline.Invoke(context);
 
-            Approvals.Verify(stringWriter.ToString());
+            TestApprover.Verify(stringWriter.ToString());
         }
 
         [Test]
@@ -73,7 +72,7 @@ public async Task ShouldNotCacheContext()
 
             await pipeline.Invoke(context);
 
-            Approvals.Verify(stringWriter.ToString());
+            TestApprover.Verify(stringWriter.ToString());
         }
 
         [Test]
@@ -94,7 +93,7 @@ public void ShouldCreateCachedExecutionPlan()
             var expressions = new List<Expression>();
             behaviors.CreatePipelineExecutionExpression(expressions);
 
-            Approvals.Verify(expressions.PrettyPrint());
+            TestApprover.Verify(expressions.PrettyPrint());
         }
 
         [Test]

diff --git a/src/NServiceBus.Core.Tests/Sagas/When_saga_has_multiple_correlated_properties.cs b/src/NServiceBus.Core.Tests/Sagas/When_saga_has_multiple_correlated_properties.cs
@@ -3,7 +3,6 @@ namespace NServiceBus.Core.Tests.Sagas.TypeBasedSagas
     using System;
     using System.Collections.Generic;
     using System.Threading.Tasks;
-    using ApprovalTests;
     using NServiceBus.Sagas;
     using NUnit.Framework;
 
@@ -14,7 +13,7 @@ public class When_saga_has_multiple_correlated_properties
         public void Should_throw()
         {
             var exception = Assert.Throws<Exception>(() => SagaMetadata.Create(typeof(SagaWithMultipleCorrelatedProperties), new List<Type>(), new Conventions()));
-            Approvals.Verify(exception.Message);
+            TestApprover.Verify(exception.Message);
         }
 
         class SagaWithMultipleCorrelatedProperties : Saga<SagaWithMultipleCorrelatedProperties.MyEntity>,

diff --git a/src/NServiceBus.Core.Tests/StructConventionsTests.cs b/src/NServiceBus.Core.Tests/StructConventionsTests.cs
@@ -6,7 +6,6 @@ namespace NServiceBus.Core.Tests
     using System.Reflection;
     using System.Runtime.InteropServices;
     using System.Text;
-    using ApprovalTests;
     using NUnit.Framework;
 
     [TestFixture]
@@ -47,7 +46,7 @@ public void ApproveStructsWhichDontFollowStructGuidelines()
                 approvalBuilder.AppendLine();
             }
 
-            Approvals.Verify(approvalBuilder.ToString());
+            TestApprover.Verify(approvalBuilder.ToString());
         }
 
         static void InspectWhetherStructViolatesMutabilityRules(Type type, List<string> violatedRules)

diff --git a/src/NServiceBus.Core.Tests/TestApprover.cs b/src/NServiceBus.Core.Tests/TestApprover.cs
@@ -0,0 +1,31 @@
+namespace NServiceBus.Core.Tests
+{
+    using System.IO;
+    using ApprovalTests;
+    using ApprovalTests.Namers;
+
+    static class TestApprover
+    {
+        public static void Verify(string text)
+        {
+            var writer = new ApprovalTextWriter(text);
+            var namer = new ApprovalNamer();
+            Approvals.Verify(writer, namer, Approvals.GetReporter());
+        }
+
+        class ApprovalNamer : UnitTestFrameworkNamer
+        {
+            public ApprovalNamer()
+            {
+                var assemblyPath = GetType().Assembly.Location;
+                var assemblyDir = Path.GetDirectoryName(assemblyPath);
+
+                sourcePath = Path.Combine(assemblyDir, "..", "..", "ApprovalFiles");
+            }
+
+            public override string SourcePath => sourcePath;
+
+            readonly string sourcePath;
+        }
+    }
+}
diff --git a/src/NServiceBus.Core.Tests/Transports/Learning/HeaderSerializerTests.cs b/src/NServiceBus.Core.Tests/Transports/Learning/HeaderSerializerTests.cs
@@ -1,7 +1,6 @@
 namespace NServiceBus.Core.Tests.Transports.Learning
 {
     using System.Collections.Generic;
-    using ApprovalTests;
     using NUnit.Framework;
 
     public class HeaderSerializerTests
@@ -22,7 +21,7 @@ public void Can_round_trip_headers()
             };
             var serialized = HeaderSerializer.Serialize(input);
 
-            Approvals.Verify(serialized);
+            TestApprover.Verify(serialized);
             var deserialize = HeaderSerializer.Deserialize(serialized);
             CollectionAssert.AreEquivalent(input, deserialize);
         }

diff --git a/src/NServiceBus.Core/Hosting/Helpers/AssemblyScanner.cs b/src/NServiceBus.Core/Hosting/Helpers/AssemblyScanner.cs
@@ -255,6 +255,11 @@ internal static bool IsRuntimeAssembly(AssemblyName assemblyName)
                 return true;
             }
 
+            if (lowerInvariant == "cc7b13ffcd2ddd51")
+            {
+                return true;
+            }
+
             return false;
         }