From 00fe48dc4550f67d7e17755005d72bba8e102fb6 Mon Sep 17 00:00:00 2001
From: Simon Cropp <simon.cropp@gmail.com>
Date: Fri, 15 Sep 2017 16:16:32 +1000
Subject: [PATCH] remove value tuple (#4950)

* remove value tuple

* typo

* fix build
---
 .../AssemblyScanner/When_validating_assemblies.cs   |  6 +++---
 .../Hosting/Helpers/AssemblyScanner.cs              |  2 +-
 .../Hosting/Helpers/AssemblyValidator.cs            | 13 +++++++++----
 src/NServiceBus.Core/NServiceBus.Core.csproj        |  4 ----
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/NServiceBus.Core.Tests/AssemblyScanner/When_validating_assemblies.cs b/src/NServiceBus.Core.Tests/AssemblyScanner/When_validating_assemblies.cs
index f51d3007cc..09eb7d03f0 100644
--- a/src/NServiceBus.Core.Tests/AssemblyScanner/When_validating_assemblies.cs
+++ b/src/NServiceBus.Core.Tests/AssemblyScanner/When_validating_assemblies.cs
@@ -15,7 +15,7 @@ public void Should_not_validate_system_assemblies()
 
             foreach (var assembly in systemAssemblies)
             {
-                var (shouldLoad, reason) = validator.ValidateAssemblyFile(assembly.Location);
+                validator.ValidateAssemblyFile(assembly.Location, out var shouldLoad, out var reason);
 
                 Assert.IsFalse(shouldLoad, $"Should not validate {assembly.FullName}");
                 Assert.That(reason == "File is a .NET runtime assembly.");
@@ -27,7 +27,7 @@ public void Should_validate_NServiceBus_Core_assembly()
         {
             var validator = new AssemblyValidator();
 
-            var (shouldLoad, reason) = validator.ValidateAssemblyFile(typeof(EndpointConfiguration).Assembly.Location);
+            validator.ValidateAssemblyFile(typeof(EndpointConfiguration).Assembly.Location, out var shouldLoad, out var reason);
 
             Assert.IsTrue(shouldLoad);
             Assert.That(reason == "File is a .NET assembly.");
@@ -38,7 +38,7 @@ public void Should_validate_non_system_assemblies()
         {
             var validator = new AssemblyValidator();
 
-            var (shouldLoad, reason) = validator.ValidateAssemblyFile(GetType().Assembly.Location);
+            validator.ValidateAssemblyFile(GetType().Assembly.Location, out var shouldLoad, out var reason);
 
             Assert.IsTrue(shouldLoad);
             Assert.That(reason == "File is a .NET assembly.");
diff --git a/src/NServiceBus.Core/Hosting/Helpers/AssemblyScanner.cs b/src/NServiceBus.Core/Hosting/Helpers/AssemblyScanner.cs
index 82a27a7989..806c00e1ca 100644
--- a/src/NServiceBus.Core/Hosting/Helpers/AssemblyScanner.cs
+++ b/src/NServiceBus.Core/Hosting/Helpers/AssemblyScanner.cs
@@ -140,7 +140,7 @@ bool TryLoadScannableAssembly(string assemblyPath, AssemblyScannerResults result
                 return false;
             }
 
-            var (shouldLoad, reason) = assemblyValidator.ValidateAssemblyFile(assemblyPath);
+            assemblyValidator.ValidateAssemblyFile(assemblyPath, out var shouldLoad, out var reason);
 
             if (!shouldLoad)
             {
diff --git a/src/NServiceBus.Core/Hosting/Helpers/AssemblyValidator.cs b/src/NServiceBus.Core/Hosting/Helpers/AssemblyValidator.cs
index 54a8df8c5b..9b326586eb 100644
--- a/src/NServiceBus.Core/Hosting/Helpers/AssemblyValidator.cs
+++ b/src/NServiceBus.Core/Hosting/Helpers/AssemblyValidator.cs
@@ -5,7 +5,7 @@
 
     class AssemblyValidator
     {
-        public (bool shouldLoad, string reason) ValidateAssemblyFile(string assemblyPath)
+        public void ValidateAssemblyFile(string assemblyPath, out bool shouldLoad, out string reason)
         {
             try
             {
@@ -13,15 +13,20 @@ class AssemblyValidator
 
                 if (IsRuntimeAssembly(token))
                 {
-                    return (false, "File is a .NET runtime assembly.");
+                    shouldLoad = false;
+                    reason = "File is a .NET runtime assembly.";
+                    return;
                 }
             }
             catch (BadImageFormatException)
             {
-                return (false, "File is not a .NET assembly.");
+                shouldLoad = false;
+                reason = "File is not a .NET assembly.";
+                return;
             }
 
-            return (true, "File is a .NET assembly.");
+            shouldLoad = true;
+            reason = "File is a .NET assembly.";
         }
 
         public static bool IsRuntimeAssembly(byte[] publicKeyToken)
diff --git a/src/NServiceBus.Core/NServiceBus.Core.csproj b/src/NServiceBus.Core/NServiceBus.Core.csproj
index c8bb479f12..31f3dea380 100644
--- a/src/NServiceBus.Core/NServiceBus.Core.csproj
+++ b/src/NServiceBus.Core/NServiceBus.Core.csproj
@@ -40,10 +40,6 @@
     <DotNetCliToolReference Include="dotnet-sourcelink-git" Version="2.1.2" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net452'">
-    <PackageReference Include="System.ValueTuple" Version="4.4.0" />
-  </ItemGroup>
-
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
     <PackageReference Include="System.Reflection.Emit" Version="4.3.0" />
     <PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.3.0" />