Skip to content

Commit 79fb3b3

Browse files
osoykanosoykan
authored
Merge pull request #4 from osoykan/dev
dev to master
2 parents 2cf16c9 + 721eea0 commit 79fb3b3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+14394
-353
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
### Assembly and type scanner for .NET
44

5-
[![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)
5+
[![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)
66

77
### Examples
88

‎appveyor.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,15 @@ environment:
1111
nuget_user: [email protected]
1212
nuget_password:
1313
secure: w73Xs1Is7iK/DtAOf0XTHg==
14+
COVERALLS_REPO_TOKEN:
15+
secure: dVMQAKOiU3HuWBAVVTrML0OS5fiGriqI9
1416
before_build:
1517
- cmd: dotnet.exe restore
1618
test:
1719
assemblies: test\FluentAssemblyScanner.Tests\bin\Debug\net461\win7-x64\FluentAssemblyScanner.Tests.dll
20+
after_test:
21+
- 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
22+
- tools\coverage\coveralls.net\csmacnz.Coveralls.exe --opencover -i xunit_opencovertests.xml --repoToken %COVERALLS_REPO_TOKEN% --commitBranch %APPVEYOR_REPO_BRANCH%
1823
nuget:
1924
disable_publish_on_pr: true
2025
account_feed: true

‎nuget.config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
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>

‎src/FluentAssemblyScanner/AppDomainExtensions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
namespace FluentAssemblyScanner
66
{
7-
public static class AppDomainExtensions
7+
internal static class AppDomainExtensions
88
{
99
[NotNull]
1010
public static string GetActualDomainPath([NotNull] this AppDomain @this)

‎src/FluentAssemblyScanner/JetbrainsAnnotations.cs‎

Lines changed: 543 additions & 299 deletions
Large diffs are not rendered by default.

‎src/FluentAssemblyScanner/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System.Reflection;
2+
using System.Runtime.CompilerServices;
23
using System.Runtime.InteropServices;
34

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

2122
[assembly: Guid("0f21fef4-cffc-47f9-add5-d9bea0ec3cbb")]
23+
[assembly:InternalsVisibleTo("FluentAssemblyScanner.Tests")]

‎src/FluentAssemblyScanner/project.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version" : "1.0.6-*",
2+
"version" : "1.0.7-*",
33

44
"dependencies" : {},
55
"frameworks" : {

‎test/FluentAssemblyScanner.Tests/ExcludeAssemblyContaining_Tests.cs‎

Lines changed: 36 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,13 @@ public void AllTypes_should_return_count_greater_than_zero()
1717
//-----------------------------------------------------------------------------------------------------------
1818
// Arrange
1919
//-----------------------------------------------------------------------------------------------------------
20-
var assemblyFilter = new AssemblyFilter(string.Empty);
20+
21+
// None.
2122

2223
//-----------------------------------------------------------------------------------------------------------
2324
// Act
2425
//-----------------------------------------------------------------------------------------------------------
25-
FromAssemblyDefiner instance = AssemblyScanner.FromAssemblyInDirectory(assemblyFilter);
26+
FromAssemblyDefiner instance = AssemblyScanner.FromAssemblyInThisApplicationDirectory();
2627

2728
//-----------------------------------------------------------------------------------------------------------
2829
// Assert
@@ -40,12 +41,13 @@ public void should_work_as_expected()
4041
//-----------------------------------------------------------------------------------------------------------
4142
// Arrange
4243
//-----------------------------------------------------------------------------------------------------------
43-
var assemblyFilter = new AssemblyFilter(string.Empty);
44+
45+
// None.
4446

4547
//-----------------------------------------------------------------------------------------------------------
4648
// Act
4749
//-----------------------------------------------------------------------------------------------------------
48-
FromAssemblyDefiner instance = AssemblyScanner.FromAssemblyInDirectory(assemblyFilter);
50+
FromAssemblyDefiner instance = AssemblyScanner.FromAssemblyInThisApplicationDirectory();
4951

5052
//-----------------------------------------------------------------------------------------------------------
5153
// Assert
@@ -62,12 +64,13 @@ public void should_work_on_not_wanted_assemblies()
6264
//-----------------------------------------------------------------------------------------------------------
6365
// Arrange
6466
//-----------------------------------------------------------------------------------------------------------
65-
var assemblyFilter = new AssemblyFilter(string.Empty);
67+
68+
// None.
6669

6770
//-----------------------------------------------------------------------------------------------------------
6871
// Act
6972
//-----------------------------------------------------------------------------------------------------------
70-
FromAssemblyDefiner instance = AssemblyScanner.FromAssemblyInDirectory(assemblyFilter);
73+
FromAssemblyDefiner instance = AssemblyScanner.FromAssemblyInThisApplicationDirectory();
7174

7275
//-----------------------------------------------------------------------------------------------------------
7376
// Assert
@@ -84,12 +87,13 @@ public void should_not_contains_private_classes_when_nonpublictypes_is_not_inclu
8487
//-----------------------------------------------------------------------------------------------------------
8588
// Arrange
8689
//-----------------------------------------------------------------------------------------------------------
87-
var assemblyFilter = new AssemblyFilter(string.Empty);
90+
91+
// None.
8892

8993
//-----------------------------------------------------------------------------------------------------------
9094
// Act
9195
//-----------------------------------------------------------------------------------------------------------
92-
FromAssemblyDefiner instance = AssemblyScanner.FromAssemblyInDirectory(assemblyFilter);
96+
FromAssemblyDefiner instance = AssemblyScanner.FromAssemblyInThisApplicationDirectory();
9397

9498
//-----------------------------------------------------------------------------------------------------------
9599
// Assert
@@ -105,12 +109,13 @@ public void should_contains_private_classes_when_nonpublictypes_included()
105109
//-----------------------------------------------------------------------------------------------------------
106110
// Arrange
107111
//-----------------------------------------------------------------------------------------------------------
108-
var assemblyFilter = new AssemblyFilter(string.Empty);
112+
113+
// None.
109114

110115
//-----------------------------------------------------------------------------------------------------------
111116
// Act
112117
//-----------------------------------------------------------------------------------------------------------
113-
FromAssemblyDefiner instance = AssemblyScanner.FromAssemblyInDirectory(assemblyFilter);
118+
FromAssemblyDefiner instance = AssemblyScanner.FromAssemblyInThisApplicationDirectory();
114119

115120
//-----------------------------------------------------------------------------------------------------------
116121
// Assert
@@ -127,12 +132,13 @@ public void should_not_find_any_type_from_excluded_assembly()
127132
//-----------------------------------------------------------------------------------------------------------
128133
// Arrange
129134
//-----------------------------------------------------------------------------------------------------------
130-
var assemblyFilter = new AssemblyFilter(string.Empty);
135+
136+
// None.
131137

132138
//-----------------------------------------------------------------------------------------------------------
133139
// Act
134140
//-----------------------------------------------------------------------------------------------------------
135-
FromAssemblyDefiner instance = AssemblyScanner.FromAssemblyInDirectory(assemblyFilter);
141+
FromAssemblyDefiner instance = AssemblyScanner.FromAssemblyInThisApplicationDirectory();
136142

137143
//-----------------------------------------------------------------------------------------------------------
138144
// Assert
@@ -150,12 +156,13 @@ public void should_not_find_any_type_from_excluded_assembly_with_full_named()
150156
//-----------------------------------------------------------------------------------------------------------
151157
// Arrange
152158
//-----------------------------------------------------------------------------------------------------------
153-
var assemblyFilter = new AssemblyFilter(string.Empty);
159+
160+
// None.
154161

155162
//-----------------------------------------------------------------------------------------------------------
156163
// Act
157164
//-----------------------------------------------------------------------------------------------------------
158-
FromAssemblyDefiner instance = AssemblyScanner.FromAssemblyInDirectory(assemblyFilter);
165+
FromAssemblyDefiner instance = AssemblyScanner.FromAssemblyInThisApplicationDirectory();
159166

160167
//-----------------------------------------------------------------------------------------------------------
161168
// Assert
@@ -173,12 +180,13 @@ public void should_not_find_any_type_from_excluded_assembly_with_name_starts_wit
173180
//-----------------------------------------------------------------------------------------------------------
174181
// Arrange
175182
//-----------------------------------------------------------------------------------------------------------
176-
var assemblyFilter = new AssemblyFilter(string.Empty);
183+
184+
// None.
177185

178186
//-----------------------------------------------------------------------------------------------------------
179187
// Act
180188
//-----------------------------------------------------------------------------------------------------------
181-
FromAssemblyDefiner instance = AssemblyScanner.FromAssemblyInDirectory(assemblyFilter);
189+
FromAssemblyDefiner instance = AssemblyScanner.FromAssemblyInThisApplicationDirectory();
182190

183191
//-----------------------------------------------------------------------------------------------------------
184192
// Assert
@@ -196,12 +204,13 @@ public void should_not_find_any_type_from_excluded_assembly_with_name_ends_with(
196204
//-----------------------------------------------------------------------------------------------------------
197205
// Arrange
198206
//-----------------------------------------------------------------------------------------------------------
199-
var assemblyFilter = new AssemblyFilter(string.Empty);
207+
208+
// None.
200209

201210
//-----------------------------------------------------------------------------------------------------------
202211
// Act
203212
//-----------------------------------------------------------------------------------------------------------
204-
FromAssemblyDefiner instance = AssemblyScanner.FromAssemblyInDirectory(assemblyFilter);
213+
FromAssemblyDefiner instance = AssemblyScanner.FromAssemblyInThisApplicationDirectory();
205214

206215
//-----------------------------------------------------------------------------------------------------------
207216
// Assert
@@ -219,12 +228,13 @@ public void should_not_find_any_type_from_excluded_assembly_with_name()
219228
//-----------------------------------------------------------------------------------------------------------
220229
// Arrange
221230
//-----------------------------------------------------------------------------------------------------------
222-
var assemblyFilter = new AssemblyFilter(string.Empty);
231+
232+
// None.
223233

224234
//-----------------------------------------------------------------------------------------------------------
225235
// Act
226236
//-----------------------------------------------------------------------------------------------------------
227-
FromAssemblyDefiner instance = AssemblyScanner.FromAssemblyInDirectory(assemblyFilter);
237+
FromAssemblyDefiner instance = AssemblyScanner.FromAssemblyInThisApplicationDirectory();
228238

229239
//-----------------------------------------------------------------------------------------------------------
230240
// Assert
@@ -242,12 +252,13 @@ public void should_not_find_any_type_from_excluded_assembly_with_name_contains()
242252
//-----------------------------------------------------------------------------------------------------------
243253
// Arrange
244254
//-----------------------------------------------------------------------------------------------------------
245-
var assemblyFilter = new AssemblyFilter(string.Empty);
255+
256+
// None.
246257

247258
//-----------------------------------------------------------------------------------------------------------
248259
// Act
249260
//-----------------------------------------------------------------------------------------------------------
250-
FromAssemblyDefiner instance = AssemblyScanner.FromAssemblyInDirectory(assemblyFilter);
261+
FromAssemblyDefiner instance = AssemblyScanner.FromAssemblyInThisApplicationDirectory();
251262

252263
//-----------------------------------------------------------------------------------------------------------
253264
// Assert
@@ -265,12 +276,13 @@ public void should_not_find_any_type_from_excluded_assembly_should_work_on_ignor
265276
//-----------------------------------------------------------------------------------------------------------
266277
// Arrange
267278
//-----------------------------------------------------------------------------------------------------------
268-
var assemblyFilter = new AssemblyFilter(string.Empty);
279+
280+
// None.
269281

270282
//-----------------------------------------------------------------------------------------------------------
271283
// Act
272284
//-----------------------------------------------------------------------------------------------------------
273-
FromAssemblyDefiner instance = AssemblyScanner.FromAssemblyInDirectory(assemblyFilter);
285+
FromAssemblyDefiner instance = AssemblyScanner.FromAssemblyInThisApplicationDirectory();
274286

275287
//-----------------------------------------------------------------------------------------------------------
276288
// Assert

‎test/FluentAssemblyScanner.Tests/FilterDefiner_Tests.cs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ public void when_use_with_filter_with_methodHasAttribute_should_work()
1717
//-----------------------------------------------------------------------------------------------------------
1818
// Arrange
1919
//-----------------------------------------------------------------------------------------------------------
20-
var assemblyFilter = new AssemblyFilter(string.Empty);
20+
// None.
2121

2222
//-----------------------------------------------------------------------------------------------------------
2323
// Act
2424
//-----------------------------------------------------------------------------------------------------------
25-
FromAssemblyDefiner instance = AssemblyScanner.FromAssemblyInDirectory(assemblyFilter);
25+
FromAssemblyDefiner instance = AssemblyScanner.FromAssemblyInThisApplicationDirectory();
2626

2727
//-----------------------------------------------------------------------------------------------------------
2828
// Assert
@@ -42,12 +42,12 @@ public void when_use_with_filter_with_method_name_contains()
4242
//-----------------------------------------------------------------------------------------------------------
4343
// Arrange
4444
//-----------------------------------------------------------------------------------------------------------
45-
var assemblyFilter = new AssemblyFilter(string.Empty);
45+
// None.
4646

4747
//-----------------------------------------------------------------------------------------------------------
4848
// Act
4949
//-----------------------------------------------------------------------------------------------------------
50-
FromAssemblyDefiner instance = AssemblyScanner.FromAssemblyInDirectory(assemblyFilter);
50+
FromAssemblyDefiner instance = AssemblyScanner.FromAssemblyInThisApplicationDirectory();
5151

5252
//-----------------------------------------------------------------------------------------------------------
5353
// Assert
@@ -67,12 +67,12 @@ public void when_use_with_filter_with_non_abstract_classes_should_not_return_any
6767
//-----------------------------------------------------------------------------------------------------------
6868
// Arrange
6969
//-----------------------------------------------------------------------------------------------------------
70-
var assemblyFilter = new AssemblyFilter(string.Empty);
70+
// None.
7171

7272
//-----------------------------------------------------------------------------------------------------------
7373
// Act
7474
//-----------------------------------------------------------------------------------------------------------
75-
FromAssemblyDefiner instance = AssemblyScanner.FromAssemblyInDirectory(assemblyFilter);
75+
FromAssemblyDefiner instance = AssemblyScanner.FromAssemblyInThisApplicationDirectory();
7676

7777
//-----------------------------------------------------------------------------------------------------------
7878
// Assert
@@ -118,12 +118,12 @@ public void when_use_with_filter_with_non_static_classes_should_not_return_any_s
118118
//-----------------------------------------------------------------------------------------------------------
119119
// Arrange
120120
//-----------------------------------------------------------------------------------------------------------
121-
var assemblyFilter = new AssemblyFilter(string.Empty);
121+
// None.
122122

123123
//-----------------------------------------------------------------------------------------------------------
124124
// Act
125125
//-----------------------------------------------------------------------------------------------------------
126-
FromAssemblyDefiner instance = AssemblyScanner.FromAssemblyInDirectory(assemblyFilter);
126+
FromAssemblyDefiner instance = AssemblyScanner.FromAssemblyInThisApplicationDirectory();
127127

128128
//-----------------------------------------------------------------------------------------------------------
129129
// Assert

0 commit comments

Comments
 (0)