Skip to content

Commit

Permalink
Merge pull request #4 from osoykan/dev
Browse files Browse the repository at this point in the history 
dev to master
  • Loading branch information
@osoykan
osoykan authored Feb 13, 2017
2 parents 2cf16c9 + 721eea0 commit 79fb3b3
Show file tree
Hide file tree
Showing 50 changed files with 14,394 additions and 353 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

### Assembly and type scanner for .NET

[![Build status](https://ci.appveyor.com/api/projects/status/4ap8tbdpfivfeysc?svg=true)](https://ci.appveyor.com/project/osoykan/fluentassemblyscanner) [![NuGet version](https://badge.fury.io/nu/fluentassemblyscanner.svg)](https://badge.fury.io/nu/fluentassemblyscanner)
[![Build status](https://ci.appveyor.com/api/projects/status/4ap8tbdpfivfeysc?svg=true)](https://ci.appveyor.com/project/osoykan/fluentassemblyscanner) [![NuGet version](https://badge.fury.io/nu/fluentassemblyscanner.svg)](https://badge.fury.io/nu/fluentassemblyscanner) [![Coverage Status](https://coveralls.io/repos/github/osoykan/FluentAssemblyScanner/badge.svg?branch=dev)](https://coveralls.io/github/osoykan/FluentAssemblyScanner?branch=dev)

### Examples

Expand Down
5 changes: 5 additions & 0 deletions appveyor.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,15 @@ environment:
nuget_user: [email protected]
nuget_password:
secure: w73Xs1Is7iK/DtAOf0XTHg==
COVERALLS_REPO_TOKEN:
secure: dVMQAKOiU3HuWBAVVTrML0OS5fiGriqI9
before_build:
- cmd: dotnet.exe restore
test:
assemblies: test\FluentAssemblyScanner.Tests\bin\Debug\net461\win7-x64\FluentAssemblyScanner.Tests.dll
after_test:
- tools\coverage\opencover\OpenCover.Console.exe -register:user -target:"tools\xunitrunner\xunit.console.x86.exe" -targetdir:"test\FluentAssemblyScanner.Tests\bin\Debug\net461\win7-x64" -targetargs:"FluentAssemblyScanner.Tests.dll" -filter:"+[FluentAssemblyScanner*]* -[FluentAssemblyScanner.T*]*" -excludebyattribute:*.ExcludeFromCodeCoverage* -output:xunit_opencovertests.xml -coverbytest:*.Tests.dll
- tools\coverage\coveralls.net\csmacnz.Coveralls.exe --opencover -i xunit_opencovertests.xml --repoToken %COVERALLS_REPO_TOKEN% --commitBranch %APPVEYOR_REPO_BRANCH%
nuget:
disable_publish_on_pr: true
account_feed: true
Expand Down
1 change: 1 addition & 0 deletions nuget.config
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<?xml version="1.0" encoding="utf-8"?> <configuration> <packageSources> <!--To inherit the global NuGet package sources remove the <clear/> line below --> <clear /> <add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" /> <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" /> </packageSources> </configuration>
2 changes: 1 addition & 1 deletion src/FluentAssemblyScanner/AppDomainExtensions.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace FluentAssemblyScanner
{
public static class AppDomainExtensions
internal static class AppDomainExtensions
{
[NotNull]
public static string GetActualDomainPath([NotNull] this AppDomain @this)
Expand Down
842 changes: 543 additions & 299 deletions src/FluentAssemblyScanner/JetbrainsAnnotations.cs
View file

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions src/FluentAssemblyScanner/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;

// General Information about an assembly is controlled through the following
Expand All @@ -19,3 +20,4 @@
// The following GUID is for the ID of the typelib if this project is exposed to COM

[assembly: Guid("0f21fef4-cffc-47f9-add5-d9bea0ec3cbb")]
[assembly:InternalsVisibleTo("FluentAssemblyScanner.Tests")]
2 changes: 1 addition & 1 deletion src/FluentAssemblyScanner/project.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version" : "1.0.6-*",
"version" : "1.0.7-*",

"dependencies" : {},
"frameworks" : {
Expand Down
60 changes: 36 additions & 24 deletions test/FluentAssemblyScanner.Tests/ExcludeAssemblyContaining_Tests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,13 @@ public void AllTypes_should_return_count_greater_than_zero()
//-----------------------------------------------------------------------------------------------------------
// Arrange
//-----------------------------------------------------------------------------------------------------------
var assemblyFilter = new AssemblyFilter(string.Empty);

// None.

//-----------------------------------------------------------------------------------------------------------
// Act
//-----------------------------------------------------------------------------------------------------------
FromAssemblyDefiner instance = AssemblyScanner.FromAssemblyInDirectory(assemblyFilter);
FromAssemblyDefiner instance = AssemblyScanner.FromAssemblyInThisApplicationDirectory();

//-----------------------------------------------------------------------------------------------------------
// Assert
Expand All @@ -40,12 +41,13 @@ public void should_work_as_expected()
//-----------------------------------------------------------------------------------------------------------
// Arrange
//-----------------------------------------------------------------------------------------------------------
var assemblyFilter = new AssemblyFilter(string.Empty);

// None.

//-----------------------------------------------------------------------------------------------------------
// Act
//-----------------------------------------------------------------------------------------------------------
FromAssemblyDefiner instance = AssemblyScanner.FromAssemblyInDirectory(assemblyFilter);
FromAssemblyDefiner instance = AssemblyScanner.FromAssemblyInThisApplicationDirectory();

//-----------------------------------------------------------------------------------------------------------
// Assert
Expand All @@ -62,12 +64,13 @@ public void should_work_on_not_wanted_assemblies()
//-----------------------------------------------------------------------------------------------------------
// Arrange
//-----------------------------------------------------------------------------------------------------------
var assemblyFilter = new AssemblyFilter(string.Empty);

// None.

//-----------------------------------------------------------------------------------------------------------
// Act
//-----------------------------------------------------------------------------------------------------------
FromAssemblyDefiner instance = AssemblyScanner.FromAssemblyInDirectory(assemblyFilter);
FromAssemblyDefiner instance = AssemblyScanner.FromAssemblyInThisApplicationDirectory();

//-----------------------------------------------------------------------------------------------------------
// Assert
Expand All @@ -84,12 +87,13 @@ public void should_not_contains_private_classes_when_nonpublictypes_is_not_inclu
//-----------------------------------------------------------------------------------------------------------
// Arrange
//-----------------------------------------------------------------------------------------------------------
var assemblyFilter = new AssemblyFilter(string.Empty);

// None.

//-----------------------------------------------------------------------------------------------------------
// Act
//-----------------------------------------------------------------------------------------------------------
FromAssemblyDefiner instance = AssemblyScanner.FromAssemblyInDirectory(assemblyFilter);
FromAssemblyDefiner instance = AssemblyScanner.FromAssemblyInThisApplicationDirectory();

//-----------------------------------------------------------------------------------------------------------
// Assert
Expand All @@ -105,12 +109,13 @@ public void should_contains_private_classes_when_nonpublictypes_included()
//-----------------------------------------------------------------------------------------------------------
// Arrange
//-----------------------------------------------------------------------------------------------------------
var assemblyFilter = new AssemblyFilter(string.Empty);

// None.

//-----------------------------------------------------------------------------------------------------------
// Act
//-----------------------------------------------------------------------------------------------------------
FromAssemblyDefiner instance = AssemblyScanner.FromAssemblyInDirectory(assemblyFilter);
FromAssemblyDefiner instance = AssemblyScanner.FromAssemblyInThisApplicationDirectory();

//-----------------------------------------------------------------------------------------------------------
// Assert
Expand All @@ -127,12 +132,13 @@ public void should_not_find_any_type_from_excluded_assembly()
//-----------------------------------------------------------------------------------------------------------
// Arrange
//-----------------------------------------------------------------------------------------------------------
var assemblyFilter = new AssemblyFilter(string.Empty);

// None.

//-----------------------------------------------------------------------------------------------------------
// Act
//-----------------------------------------------------------------------------------------------------------
FromAssemblyDefiner instance = AssemblyScanner.FromAssemblyInDirectory(assemblyFilter);
FromAssemblyDefiner instance = AssemblyScanner.FromAssemblyInThisApplicationDirectory();

//-----------------------------------------------------------------------------------------------------------
// Assert
Expand All @@ -150,12 +156,13 @@ public void should_not_find_any_type_from_excluded_assembly_with_full_named()
//-----------------------------------------------------------------------------------------------------------
// Arrange
//-----------------------------------------------------------------------------------------------------------
var assemblyFilter = new AssemblyFilter(string.Empty);

// None.

//-----------------------------------------------------------------------------------------------------------
// Act
//-----------------------------------------------------------------------------------------------------------
FromAssemblyDefiner instance = AssemblyScanner.FromAssemblyInDirectory(assemblyFilter);
FromAssemblyDefiner instance = AssemblyScanner.FromAssemblyInThisApplicationDirectory();

//-----------------------------------------------------------------------------------------------------------
// Assert
Expand All @@ -173,12 +180,13 @@ public void should_not_find_any_type_from_excluded_assembly_with_name_starts_wit
//-----------------------------------------------------------------------------------------------------------
// Arrange
//-----------------------------------------------------------------------------------------------------------
var assemblyFilter = new AssemblyFilter(string.Empty);

// None.

//-----------------------------------------------------------------------------------------------------------
// Act
//-----------------------------------------------------------------------------------------------------------
FromAssemblyDefiner instance = AssemblyScanner.FromAssemblyInDirectory(assemblyFilter);
FromAssemblyDefiner instance = AssemblyScanner.FromAssemblyInThisApplicationDirectory();

//-----------------------------------------------------------------------------------------------------------
// Assert
Expand All @@ -196,12 +204,13 @@ public void should_not_find_any_type_from_excluded_assembly_with_name_ends_with(
//-----------------------------------------------------------------------------------------------------------
// Arrange
//-----------------------------------------------------------------------------------------------------------
var assemblyFilter = new AssemblyFilter(string.Empty);

// None.

//-----------------------------------------------------------------------------------------------------------
// Act
//-----------------------------------------------------------------------------------------------------------
FromAssemblyDefiner instance = AssemblyScanner.FromAssemblyInDirectory(assemblyFilter);
FromAssemblyDefiner instance = AssemblyScanner.FromAssemblyInThisApplicationDirectory();

//-----------------------------------------------------------------------------------------------------------
// Assert
Expand All @@ -219,12 +228,13 @@ public void should_not_find_any_type_from_excluded_assembly_with_name()
//-----------------------------------------------------------------------------------------------------------
// Arrange
//-----------------------------------------------------------------------------------------------------------
var assemblyFilter = new AssemblyFilter(string.Empty);

// None.

//-----------------------------------------------------------------------------------------------------------
// Act
//-----------------------------------------------------------------------------------------------------------
FromAssemblyDefiner instance = AssemblyScanner.FromAssemblyInDirectory(assemblyFilter);
FromAssemblyDefiner instance = AssemblyScanner.FromAssemblyInThisApplicationDirectory();

//-----------------------------------------------------------------------------------------------------------
// Assert
Expand All @@ -242,12 +252,13 @@ public void should_not_find_any_type_from_excluded_assembly_with_name_contains()
//-----------------------------------------------------------------------------------------------------------
// Arrange
//-----------------------------------------------------------------------------------------------------------
var assemblyFilter = new AssemblyFilter(string.Empty);

// None.

//-----------------------------------------------------------------------------------------------------------
// Act
//-----------------------------------------------------------------------------------------------------------
FromAssemblyDefiner instance = AssemblyScanner.FromAssemblyInDirectory(assemblyFilter);
FromAssemblyDefiner instance = AssemblyScanner.FromAssemblyInThisApplicationDirectory();

//-----------------------------------------------------------------------------------------------------------
// Assert
Expand All @@ -265,12 +276,13 @@ public void should_not_find_any_type_from_excluded_assembly_should_work_on_ignor
//-----------------------------------------------------------------------------------------------------------
// Arrange
//-----------------------------------------------------------------------------------------------------------
var assemblyFilter = new AssemblyFilter(string.Empty);

// None.

//-----------------------------------------------------------------------------------------------------------
// Act
//-----------------------------------------------------------------------------------------------------------
FromAssemblyDefiner instance = AssemblyScanner.FromAssemblyInDirectory(assemblyFilter);
FromAssemblyDefiner instance = AssemblyScanner.FromAssemblyInThisApplicationDirectory();

//-----------------------------------------------------------------------------------------------------------
// Assert
Expand Down
16 changes: 8 additions & 8 deletions test/FluentAssemblyScanner.Tests/FilterDefiner_Tests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ public void when_use_with_filter_with_methodHasAttribute_should_work()
//-----------------------------------------------------------------------------------------------------------
// Arrange
//-----------------------------------------------------------------------------------------------------------
var assemblyFilter = new AssemblyFilter(string.Empty);
// None.

//-----------------------------------------------------------------------------------------------------------
// Act
//-----------------------------------------------------------------------------------------------------------
FromAssemblyDefiner instance = AssemblyScanner.FromAssemblyInDirectory(assemblyFilter);
FromAssemblyDefiner instance = AssemblyScanner.FromAssemblyInThisApplicationDirectory();

//-----------------------------------------------------------------------------------------------------------
// Assert
Expand All @@ -42,12 +42,12 @@ public void when_use_with_filter_with_method_name_contains()
//-----------------------------------------------------------------------------------------------------------
// Arrange
//-----------------------------------------------------------------------------------------------------------
var assemblyFilter = new AssemblyFilter(string.Empty);
// None.

//-----------------------------------------------------------------------------------------------------------
// Act
//-----------------------------------------------------------------------------------------------------------
FromAssemblyDefiner instance = AssemblyScanner.FromAssemblyInDirectory(assemblyFilter);
FromAssemblyDefiner instance = AssemblyScanner.FromAssemblyInThisApplicationDirectory();

//-----------------------------------------------------------------------------------------------------------
// Assert
Expand All @@ -67,12 +67,12 @@ public void when_use_with_filter_with_non_abstract_classes_should_not_return_any
//-----------------------------------------------------------------------------------------------------------
// Arrange
//-----------------------------------------------------------------------------------------------------------
var assemblyFilter = new AssemblyFilter(string.Empty);
// None.

//-----------------------------------------------------------------------------------------------------------
// Act
//-----------------------------------------------------------------------------------------------------------
FromAssemblyDefiner instance = AssemblyScanner.FromAssemblyInDirectory(assemblyFilter);
FromAssemblyDefiner instance = AssemblyScanner.FromAssemblyInThisApplicationDirectory();

//-----------------------------------------------------------------------------------------------------------
// Assert
Expand Down Expand Up @@ -118,12 +118,12 @@ public void when_use_with_filter_with_non_static_classes_should_not_return_any_s
//-----------------------------------------------------------------------------------------------------------
// Arrange
//-----------------------------------------------------------------------------------------------------------
var assemblyFilter = new AssemblyFilter(string.Empty);
// None.

//-----------------------------------------------------------------------------------------------------------
// Act
//-----------------------------------------------------------------------------------------------------------
FromAssemblyDefiner instance = AssemblyScanner.FromAssemblyInDirectory(assemblyFilter);
FromAssemblyDefiner instance = AssemblyScanner.FromAssemblyInThisApplicationDirectory();

//-----------------------------------------------------------------------------------------------------------
// Assert
Expand Down
Loading

0 comments on commit 79fb3b3

Please sign in to comment.