Skip to content

Commit a63cd20

Browse files
scott-xuscott-xu
committed
3.3.0
1 parent 990defd commit a63cd20

File tree

55 files changed

+817
-179
lines changed

Some content is hidden

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

55 files changed

+817
-179
lines changed

‎CHANGELOG.md‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,21 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
55
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
66

7+
## [3.3.0] - 2017-10-23
8+
9+
### Added
10+
- Support .NET Standard 2.0
11+
- Marked CLS Compliant
12+
13+
### Changed
14+
- Spelling: renamed "NonePublic" to "NonPublic"
15+
16+
### Fixed
17+
- `GetNameWithoutGenericPart` Throws `SubString` exception [#26](https://github.com/ninject/Ninject.Extensions.Conventions/issues/26)
18+
19+
### Removed
20+
- .NET 3.5, .NET 4.0 and Silverlight
21+
722
## [3.3.0-beta1]
823

924
### Added

‎src/Ninject.Extensions.Conventions/BindingBuilder/AssemblyFinder.cs‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,23 @@
11
// -------------------------------------------------------------------------------------------------
22
// <copyright file="AssemblyFinder.cs" company="Ninject Project Contributors">
3-
// Copyright (c) 2009-2017 Ninject Project Contributors
4-
// Licensed under the Apache License, Version 2.0.
3+
// Copyright (c) 2009-2017 Ninject Project Contributors. All rights reserved.
4+
//
5+
// Dual-licensed under the Apache License, Version 2.0, and the Microsoft Public License (Ms-PL).
6+
// You may not use this file except in compliance with one of the Licenses.
7+
// You may obtain a copy of the License at
8+
//
9+
// http://www.apache.org/licenses/LICENSE-2.0
10+
// or
11+
// http://www.microsoft.com/opensource/licenses.mspx
12+
//
13+
// Unless required by applicable law or agreed to in writing, software
14+
// distributed under the License is distributed on an "AS IS" BASIS,
15+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
// See the License for the specific language governing permissions and
17+
// limitations under the License.
518
// </copyright>
619
// -------------------------------------------------------------------------------------------------
720

8-
#if !NO_ASSEMBLY_SCANNING
921
namespace Ninject.Extensions.Conventions.BindingBuilder
1022
{
1123
using System;
@@ -107,5 +119,4 @@ private static string GetBaseDirectory()
107119
return string.IsNullOrEmpty(searchPath) ? baseDirectory : Path.Combine(baseDirectory, searchPath);
108120
}
109121
}
110-
}
111-
#endif
122+
}

‎src/Ninject.Extensions.Conventions/BindingBuilder/BindingGeneratorFactory.cs‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,20 @@
11
// -------------------------------------------------------------------------------------------------
22
// <copyright file="BindingGeneratorFactory.cs" company="Ninject Project Contributors">
3-
// Copyright (c) 2009-2017 Ninject Project Contributors
4-
// Licensed under the Apache License, Version 2.0.
3+
// Copyright (c) 2009-2017 Ninject Project Contributors. All rights reserved.
4+
//
5+
// Dual-licensed under the Apache License, Version 2.0, and the Microsoft Public License (Ms-PL).
6+
// You may not use this file except in compliance with one of the Licenses.
7+
// You may obtain a copy of the License at
8+
//
9+
// http://www.apache.org/licenses/LICENSE-2.0
10+
// or
11+
// http://www.microsoft.com/opensource/licenses.mspx
12+
//
13+
// Unless required by applicable law or agreed to in writing, software
14+
// distributed under the License is distributed on an "AS IS" BASIS,
15+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
// See the License for the specific language governing permissions and
17+
// limitations under the License.
518
// </copyright>
619
// -------------------------------------------------------------------------------------------------
720

@@ -14,9 +27,7 @@ namespace Ninject.Extensions.Conventions.BindingBuilder
1427
using Ninject.Components;
1528
using Ninject.Extensions.Conventions.BindingGenerators;
1629
using Ninject.Extensions.Conventions.Syntax;
17-
#if !SILVERLIGHT_20 && !WINDOWS_PHONE && !NETCF_35
1830
using Ninject.Extensions.Factory;
19-
#endif
2031

2132
/// <summary>
2233
/// Factory for binding generators.
@@ -135,7 +146,6 @@ public IBindingGenerator CreateSelectorBindingGenerator(ServiceSelector selector
135146
return new SelectorBindingGenerator(this.CreateSingleBindingCreator(), selector, this.bindableTypeSelector);
136147
}
137148

138-
#if !SILVERLIGHT_20 && !WINDOWS_PHONE && !NETCF_35
139149
/// <summary>
140150
/// Creates a new FactoryBindingGenerator instance.
141151
/// </summary>
@@ -145,7 +155,6 @@ public IBindingGenerator FactoryBindingGenerator(Func<IInstanceProvider> instanc
145155
{
146156
return new FactoryBindingGenerator(instanceProvider);
147157
}
148-
#endif
149158

150159
/// <summary>
151160
/// Creates the multi binding creator.

‎src/Ninject.Extensions.Conventions/BindingBuilder/ConventionBindingBuilder.cs‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,20 @@
11
// -------------------------------------------------------------------------------------------------
22
// <copyright file="ConventionBindingBuilder.cs" company="Ninject Project Contributors">
3-
// Copyright (c) 2009-2017 Ninject Project Contributors
4-
// Licensed under the Apache License, Version 2.0.
3+
// Copyright (c) 2009-2017 Ninject Project Contributors. All rights reserved.
4+
//
5+
// Dual-licensed under the Apache License, Version 2.0, and the Microsoft Public License (Ms-PL).
6+
// You may not use this file except in compliance with one of the Licenses.
7+
// You may obtain a copy of the License at
8+
//
9+
// http://www.apache.org/licenses/LICENSE-2.0
10+
// or
11+
// http://www.microsoft.com/opensource/licenses.mspx
12+
//
13+
// Unless required by applicable law or agreed to in writing, software
14+
// distributed under the License is distributed on an "AS IS" BASIS,
15+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
// See the License for the specific language governing permissions and
17+
// limitations under the License.
518
// </copyright>
619
// -------------------------------------------------------------------------------------------------
720

@@ -11,6 +24,7 @@ namespace Ninject.Extensions.Conventions.BindingBuilder
1124
using System.Collections.Generic;
1225
using System.Linq;
1326
using System.Reflection;
27+
1428
using Ninject.Extensions.Conventions.BindingGenerators;
1529
using Ninject.Extensions.Conventions.Syntax;
1630
using Ninject.Syntax;

‎src/Ninject.Extensions.Conventions/BindingBuilder/ConventionSyntax.Bind.cs‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,20 @@
11
// -------------------------------------------------------------------------------------------------
22
// <copyright file="ConventionSyntax.Bind.cs" company="Ninject Project Contributors">
3-
// Copyright (c) 2009-2017 Ninject Project Contributors
4-
// Licensed under the Apache License, Version 2.0.
3+
// Copyright (c) 2009-2017 Ninject Project Contributors. All rights reserved.
4+
//
5+
// Dual-licensed under the Apache License, Version 2.0, and the Microsoft Public License (Ms-PL).
6+
// You may not use this file except in compliance with one of the Licenses.
7+
// You may obtain a copy of the License at
8+
//
9+
// http://www.apache.org/licenses/LICENSE-2.0
10+
// or
11+
// http://www.microsoft.com/opensource/licenses.mspx
12+
//
13+
// Unless required by applicable law or agreed to in writing, software
14+
// distributed under the License is distributed on an "AS IS" BASIS,
15+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
// See the License for the specific language governing permissions and
17+
// limitations under the License.
518
// </copyright>
619
// -------------------------------------------------------------------------------------------------
720

@@ -12,9 +25,7 @@ namespace Ninject.Extensions.Conventions.BindingBuilder
1225

1326
using Ninject.Extensions.Conventions.BindingGenerators;
1427
using Ninject.Extensions.Conventions.Syntax;
15-
#if !SILVERLIGHT_20 && !WINDOWS_PHONE && !NETCF_35
1628
using Ninject.Extensions.Factory;
17-
#endif
1829

1930
/// <summary>
2031
/// The syntax to configure the conventions
@@ -140,7 +151,6 @@ public IConfigureSyntax BindUsingRegex(string pattern, RegexOptions options)
140151
return this.BindWith(this.bindingGeneratorFactory.CreateRegexBindingGenerator(pattern, options));
141152
}
142153

143-
#if !SILVERLIGHT_20 && !WINDOWS_PHONE && !NETCF_35
144154
/// <summary>
145155
/// Binds interfaces to factory implementations using the factory extension.
146156
/// </summary>
@@ -159,6 +169,5 @@ public IConfigureSyntax BindToFactory(Func<IInstanceProvider> instanceProvider)
159169
{
160170
return this.BindWith(this.bindingGeneratorFactory.FactoryBindingGenerator(instanceProvider));
161171
}
162-
#endif
163172
}
164173
}

‎src/Ninject.Extensions.Conventions/BindingBuilder/ConventionSyntax.Configure.cs‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,20 @@
11
// -------------------------------------------------------------------------------------------------
22
// <copyright file="ConventionSyntax.Configure.cs" company="Ninject Project Contributors">
3-
// Copyright (c) 2009-2017 Ninject Project Contributors
4-
// Licensed under the Apache License, Version 2.0.
3+
// Copyright (c) 2009-2017 Ninject Project Contributors. All rights reserved.
4+
//
5+
// Dual-licensed under the Apache License, Version 2.0, and the Microsoft Public License (Ms-PL).
6+
// You may not use this file except in compliance with one of the Licenses.
7+
// You may obtain a copy of the License at
8+
//
9+
// http://www.apache.org/licenses/LICENSE-2.0
10+
// or
11+
// http://www.microsoft.com/opensource/licenses.mspx
12+
//
13+
// Unless required by applicable law or agreed to in writing, software
14+
// distributed under the License is distributed on an "AS IS" BASIS,
15+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
// See the License for the specific language governing permissions and
17+
// limitations under the License.
518
// </copyright>
619
// -------------------------------------------------------------------------------------------------
720

‎src/Ninject.Extensions.Conventions/BindingBuilder/ConventionSyntax.Filter.cs‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,20 @@
11
// -------------------------------------------------------------------------------------------------
22
// <copyright file="ConventionSyntax.Filter.cs" company="Ninject Project Contributors">
3-
// Copyright (c) 2009-2017 Ninject Project Contributors
4-
// Licensed under the Apache License, Version 2.0.
3+
// Copyright (c) 2009-2017 Ninject Project Contributors. All rights reserved.
4+
//
5+
// Dual-licensed under the Apache License, Version 2.0, and the Microsoft Public License (Ms-PL).
6+
// You may not use this file except in compliance with one of the Licenses.
7+
// You may obtain a copy of the License at
8+
//
9+
// http://www.apache.org/licenses/LICENSE-2.0
10+
// or
11+
// http://www.microsoft.com/opensource/licenses.mspx
12+
//
13+
// Unless required by applicable law or agreed to in writing, software
14+
// distributed under the License is distributed on an "AS IS" BASIS,
15+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
// See the License for the specific language governing permissions and
17+
// limitations under the License.
518
// </copyright>
619
// -------------------------------------------------------------------------------------------------
720

@@ -10,6 +23,7 @@ namespace Ninject.Extensions.Conventions.BindingBuilder
1023
using System;
1124
using System.Collections.Generic;
1225
using System.Linq;
26+
1327
using Ninject.Extensions.Conventions.Syntax;
1428

1529
/// <summary>

‎src/Ninject.Extensions.Conventions/BindingBuilder/ConventionSyntax.From.cs‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,20 @@
11
// -------------------------------------------------------------------------------------------------
22
// <copyright file="ConventionSyntax.From.cs" company="Ninject Project Contributors">
3-
// Copyright (c) 2009-2017 Ninject Project Contributors
4-
// Licensed under the Apache License, Version 2.0.
3+
// Copyright (c) 2009-2017 Ninject Project Contributors. All rights reserved.
4+
//
5+
// Dual-licensed under the Apache License, Version 2.0, and the Microsoft Public License (Ms-PL).
6+
// You may not use this file except in compliance with one of the Licenses.
7+
// You may obtain a copy of the License at
8+
//
9+
// http://www.apache.org/licenses/LICENSE-2.0
10+
// or
11+
// http://www.microsoft.com/opensource/licenses.mspx
12+
//
13+
// Unless required by applicable law or agreed to in writing, software
14+
// distributed under the License is distributed on an "AS IS" BASIS,
15+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
// See the License for the specific language governing permissions and
17+
// limitations under the License.
518
// </copyright>
619
// -------------------------------------------------------------------------------------------------
720

@@ -11,6 +24,7 @@ namespace Ninject.Extensions.Conventions.BindingBuilder
1124
using System.Collections.Generic;
1225
using System.Linq;
1326
using System.Reflection;
27+
1428
using Ninject.Extensions.Conventions.Syntax;
1529

1630
/// <summary>
@@ -78,7 +92,6 @@ public IIncludingNonPublicTypesSelectSyntax FromAssemblyContaining(IEnumerable<T
7892
return this.From(types.Select(t => t.Assembly).Distinct());
7993
}
8094

81-
#if !NO_ASSEMBLY_SCANNING
8295
/// <summary>
8396
/// Scans the specified assemblies.
8497
/// </summary>
@@ -161,6 +174,5 @@ public IIncludingNonPublicTypesSelectSyntax FromAssembliesMatching(IEnumerable<s
161174
{
162175
return this.From(this.assemblyFinder.FindAssembliesMatching(patterns), filter);
163176
}
164-
#endif
165177
}
166178
}

‎src/Ninject.Extensions.Conventions/BindingBuilder/ConventionSyntax.IncludeExclude.cs‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,20 @@
11
// -------------------------------------------------------------------------------------------------
22
// <copyright file="ConventionSyntax.IncludeExclude.cs" company="Ninject Project Contributors">
3-
// Copyright (c) 2009-2017 Ninject Project Contributors
4-
// Licensed under the Apache License, Version 2.0.
3+
// Copyright (c) 2009-2017 Ninject Project Contributors. All rights reserved.
4+
//
5+
// Dual-licensed under the Apache License, Version 2.0, and the Microsoft Public License (Ms-PL).
6+
// You may not use this file except in compliance with one of the Licenses.
7+
// You may obtain a copy of the License at
8+
//
9+
// http://www.apache.org/licenses/LICENSE-2.0
10+
// or
11+
// http://www.microsoft.com/opensource/licenses.mspx
12+
//
13+
// Unless required by applicable law or agreed to in writing, software
14+
// distributed under the License is distributed on an "AS IS" BASIS,
15+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
// See the License for the specific language governing permissions and
17+
// limitations under the License.
518
// </copyright>
619
// -------------------------------------------------------------------------------------------------
720

@@ -10,6 +23,7 @@ namespace Ninject.Extensions.Conventions.BindingBuilder
1023
using System;
1124
using System.Collections.Generic;
1225
using System.Linq;
26+
1327
using Ninject.Extensions.Conventions.Syntax;
1428

1529
/// <summary>

‎src/Ninject.Extensions.Conventions/BindingBuilder/ConventionSyntax.Select.cs‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,27 @@
11
// -------------------------------------------------------------------------------------------------
22
// <copyright file="ConventionSyntax.Select.cs" company="Ninject Project Contributors">
3-
// Copyright (c) 2009-2017 Ninject Project Contributors
4-
// Licensed under the Apache License, Version 2.0.
3+
// Copyright (c) 2009-2017 Ninject Project Contributors. All rights reserved.
4+
//
5+
// Dual-licensed under the Apache License, Version 2.0, and the Microsoft Public License (Ms-PL).
6+
// You may not use this file except in compliance with one of the Licenses.
7+
// You may obtain a copy of the License at
8+
//
9+
// http://www.apache.org/licenses/LICENSE-2.0
10+
// or
11+
// http://www.microsoft.com/opensource/licenses.mspx
12+
//
13+
// Unless required by applicable law or agreed to in writing, software
14+
// distributed under the License is distributed on an "AS IS" BASIS,
15+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
// See the License for the specific language governing permissions and
17+
// limitations under the License.
518
// </copyright>
619
// -------------------------------------------------------------------------------------------------
720

821
namespace Ninject.Extensions.Conventions.BindingBuilder
922
{
1023
using System;
24+
1125
using Ninject.Extensions.Conventions.Syntax;
1226
using Ninject.Syntax;
1327

0 commit comments

Comments
 (0)