Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

remove value tuple #4950

Merged
merged 3 commits into from
Sep 15, 2017
Merged

remove value tuple #4950

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
616ccdc
remove value tuple
SimonCropp Sep 13, 2017
51e0a41
typo
SimonCropp Sep 13, 2017
67ed800
fix build
SimonCropp Sep 14, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/NServiceBus.Core.Tests/AssemblyScanner/When_validating_assemblies.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.");
Expand All @@ -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.");
Expand All @@ -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.");
Expand Down
2 changes: 1 addition & 1 deletion src/NServiceBus.Core/Hosting/Helpers/AssemblyScanner.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
13 changes: 9 additions & 4 deletions src/NServiceBus.Core/Hosting/Helpers/AssemblyValidator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,28 @@

class AssemblyValidator
{
public (bool shouldLoad, string reason) ValidateAssemblyFile(string assemblyPath)
public void ValidateAssemblyFile(string assemblyPath, out bool shouldLoad, out string reason)
{
try
{
var token = AssemblyName.GetAssemblyName(assemblyPath).GetPublicKeyToken();

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)
Expand Down
4 changes: 0 additions & 4 deletions src/NServiceBus.Core/NServiceBus.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down