Skip to content

Ensuring GAC dlls are loaded. Fix for #922 #923

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

Merged
adamralph merged 3 commits into from
Feb 7, 2015
Merged

Ensuring GAC dlls are loaded. Fix for #922 #923

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
b22e96d
Ensuring GAC dlls are loaded. Fix for #922
glennblock Feb 7, 2015
d18f516
Renaming test
glennblock Feb 7, 2015
b725cd6
Fixing to check for .exe not *.exe
glennblock Feb 7, 2015
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
8 changes: 8 additions & 0 deletions src/ScriptCs.Core/AssemblyUtility.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,18 @@

namespace ScriptCs
{
using System.IO;

public class AssemblyUtility : IAssemblyUtility
{
public bool IsManagedAssembly(string path)
{
if (!Path.IsPathRooted(path) && !(path.EndsWith(".dll", StringComparison.InvariantCultureIgnoreCase) ||
path.EndsWith(".exe", StringComparison.InvariantCultureIgnoreCase)))
{
return true;
}

try
{
AssemblyName.GetAssemblyName(path);
Expand Down
33 changes: 33 additions & 0 deletions test/ScriptCs.Core.Tests/AssemblyUtilityTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace ScriptCs.Tests
{
using System.IO;
using Contracts;
using Xunit;
using Should;

public class AssemblyUtilityTests
{
public class TheIsManagedAssemblyMethod
{
private readonly IAssemblyUtility _assemblyUtility = new AssemblyUtility();

[Fact]
public void ShouldReturnTrueWhenThePathIsNotRootedAndDoesNotHaveADllOrExeExtension()
{
_assemblyUtility.IsManagedAssembly("System.Data").ShouldBeTrue();
}

[Fact]
public void ShouldReturnTrueWhenThePathPointsToAManagedAssembly()
{
_assemblyUtility.IsManagedAssembly(typeof(String).Assembly.Location).ShouldBeTrue();
}
}
}
}
1 change: 1 addition & 0 deletions test/ScriptCs.Core.Tests/ScriptCs.Core.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
</Compile>
<Compile Include="AppDomainAssemblyResolverTests.cs" />
<Compile Include="AssemblyResolverTests.cs" />
<Compile Include="AssemblyUtilityTests.cs" />
<Compile Include="DirectiveLineProcessorTests.cs" />
<Compile Include="FileSystemMigratorTests.cs" />
<Compile Include="PackageReferenceTests.cs" />
Expand Down