Skip to content

Commit

Permalink
3.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
scott-xu committed Oct 22, 2017
1 parent 990defd commit a63cd20
Show file tree
Hide file tree
Showing 55 changed files with 817 additions and 179 deletions.
15 changes: 15 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,21 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [3.3.0] - 2017-10-23

### Added
- Support .NET Standard 2.0
- Marked CLS Compliant

### Changed
- Spelling: renamed "NonePublic" to "NonPublic"

### Fixed
- `GetNameWithoutGenericPart` Throws `SubString` exception [#26](https://github.com/ninject/Ninject.Extensions.Conventions/issues/26)

### Removed
- .NET 3.5, .NET 4.0 and Silverlight

## [3.3.0-beta1]

### Added
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,23 @@
// -------------------------------------------------------------------------------------------------
// <copyright file="AssemblyFinder.cs" company="Ninject Project Contributors">
// Copyright (c) 2009-2017 Ninject Project Contributors
// Licensed under the Apache License, Version 2.0.
// Copyright (c) 2009-2017 Ninject Project Contributors. All rights reserved.
//
// Dual-licensed under the Apache License, Version 2.0, and the Microsoft Public License (Ms-PL).
// You may not use this file except in compliance with one of the Licenses.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
// or
// http://www.microsoft.com/opensource/licenses.mspx
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
// </copyright>
// -------------------------------------------------------------------------------------------------

#if !NO_ASSEMBLY_SCANNING
namespace Ninject.Extensions.Conventions.BindingBuilder
{
using System;
Expand Down Expand Up @@ -107,5 +119,4 @@ private static string GetBaseDirectory()
return string.IsNullOrEmpty(searchPath) ? baseDirectory : Path.Combine(baseDirectory, searchPath);
}
}
}
#endif
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,20 @@
// -------------------------------------------------------------------------------------------------
// <copyright file="BindingGeneratorFactory.cs" company="Ninject Project Contributors">
// Copyright (c) 2009-2017 Ninject Project Contributors
// Licensed under the Apache License, Version 2.0.
// Copyright (c) 2009-2017 Ninject Project Contributors. All rights reserved.
//
// Dual-licensed under the Apache License, Version 2.0, and the Microsoft Public License (Ms-PL).
// You may not use this file except in compliance with one of the Licenses.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
// or
// http://www.microsoft.com/opensource/licenses.mspx
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
// </copyright>
// -------------------------------------------------------------------------------------------------

Expand All @@ -14,9 +27,7 @@ namespace Ninject.Extensions.Conventions.BindingBuilder
using Ninject.Components;
using Ninject.Extensions.Conventions.BindingGenerators;
using Ninject.Extensions.Conventions.Syntax;
#if !SILVERLIGHT_20 && !WINDOWS_PHONE && !NETCF_35
using Ninject.Extensions.Factory;
#endif

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

#if !SILVERLIGHT_20 && !WINDOWS_PHONE && !NETCF_35
/// <summary>
/// Creates a new FactoryBindingGenerator instance.
/// </summary>
Expand All @@ -145,7 +155,6 @@ public IBindingGenerator FactoryBindingGenerator(Func<IInstanceProvider> instanc
{
return new FactoryBindingGenerator(instanceProvider);
}
#endif

/// <summary>
/// Creates the multi binding creator.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,20 @@
// -------------------------------------------------------------------------------------------------
// <copyright file="ConventionBindingBuilder.cs" company="Ninject Project Contributors">
// Copyright (c) 2009-2017 Ninject Project Contributors
// Licensed under the Apache License, Version 2.0.
// Copyright (c) 2009-2017 Ninject Project Contributors. All rights reserved.
//
// Dual-licensed under the Apache License, Version 2.0, and the Microsoft Public License (Ms-PL).
// You may not use this file except in compliance with one of the Licenses.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
// or
// http://www.microsoft.com/opensource/licenses.mspx
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
// </copyright>
// -------------------------------------------------------------------------------------------------

Expand All @@ -11,6 +24,7 @@ namespace Ninject.Extensions.Conventions.BindingBuilder
using System.Collections.Generic;
using System.Linq;
using System.Reflection;

using Ninject.Extensions.Conventions.BindingGenerators;
using Ninject.Extensions.Conventions.Syntax;
using Ninject.Syntax;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,20 @@
// -------------------------------------------------------------------------------------------------
// <copyright file="ConventionSyntax.Bind.cs" company="Ninject Project Contributors">
// Copyright (c) 2009-2017 Ninject Project Contributors
// Licensed under the Apache License, Version 2.0.
// Copyright (c) 2009-2017 Ninject Project Contributors. All rights reserved.
//
// Dual-licensed under the Apache License, Version 2.0, and the Microsoft Public License (Ms-PL).
// You may not use this file except in compliance with one of the Licenses.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
// or
// http://www.microsoft.com/opensource/licenses.mspx
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
// </copyright>
// -------------------------------------------------------------------------------------------------

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

using Ninject.Extensions.Conventions.BindingGenerators;
using Ninject.Extensions.Conventions.Syntax;
#if !SILVERLIGHT_20 && !WINDOWS_PHONE && !NETCF_35
using Ninject.Extensions.Factory;
#endif

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

#if !SILVERLIGHT_20 && !WINDOWS_PHONE && !NETCF_35
/// <summary>
/// Binds interfaces to factory implementations using the factory extension.
/// </summary>
Expand All @@ -159,6 +169,5 @@ public IConfigureSyntax BindToFactory(Func<IInstanceProvider> instanceProvider)
{
return this.BindWith(this.bindingGeneratorFactory.FactoryBindingGenerator(instanceProvider));
}
#endif
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,20 @@
// -------------------------------------------------------------------------------------------------
// <copyright file="ConventionSyntax.Configure.cs" company="Ninject Project Contributors">
// Copyright (c) 2009-2017 Ninject Project Contributors
// Licensed under the Apache License, Version 2.0.
// Copyright (c) 2009-2017 Ninject Project Contributors. All rights reserved.
//
// Dual-licensed under the Apache License, Version 2.0, and the Microsoft Public License (Ms-PL).
// You may not use this file except in compliance with one of the Licenses.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
// or
// http://www.microsoft.com/opensource/licenses.mspx
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
// </copyright>
// -------------------------------------------------------------------------------------------------

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,20 @@
// -------------------------------------------------------------------------------------------------
// <copyright file="ConventionSyntax.Filter.cs" company="Ninject Project Contributors">
// Copyright (c) 2009-2017 Ninject Project Contributors
// Licensed under the Apache License, Version 2.0.
// Copyright (c) 2009-2017 Ninject Project Contributors. All rights reserved.
//
// Dual-licensed under the Apache License, Version 2.0, and the Microsoft Public License (Ms-PL).
// You may not use this file except in compliance with one of the Licenses.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
// or
// http://www.microsoft.com/opensource/licenses.mspx
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
// </copyright>
// -------------------------------------------------------------------------------------------------

Expand All @@ -10,6 +23,7 @@ namespace Ninject.Extensions.Conventions.BindingBuilder
using System;
using System.Collections.Generic;
using System.Linq;

using Ninject.Extensions.Conventions.Syntax;

/// <summary>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,20 @@
// -------------------------------------------------------------------------------------------------
// <copyright file="ConventionSyntax.From.cs" company="Ninject Project Contributors">
// Copyright (c) 2009-2017 Ninject Project Contributors
// Licensed under the Apache License, Version 2.0.
// Copyright (c) 2009-2017 Ninject Project Contributors. All rights reserved.
//
// Dual-licensed under the Apache License, Version 2.0, and the Microsoft Public License (Ms-PL).
// You may not use this file except in compliance with one of the Licenses.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
// or
// http://www.microsoft.com/opensource/licenses.mspx
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
// </copyright>
// -------------------------------------------------------------------------------------------------

Expand All @@ -11,6 +24,7 @@ namespace Ninject.Extensions.Conventions.BindingBuilder
using System.Collections.Generic;
using System.Linq;
using System.Reflection;

using Ninject.Extensions.Conventions.Syntax;

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

#if !NO_ASSEMBLY_SCANNING
/// <summary>
/// Scans the specified assemblies.
/// </summary>
Expand Down Expand Up @@ -161,6 +174,5 @@ public IIncludingNonPublicTypesSelectSyntax FromAssembliesMatching(IEnumerable<s
{
return this.From(this.assemblyFinder.FindAssembliesMatching(patterns), filter);
}
#endif
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,20 @@
// -------------------------------------------------------------------------------------------------
// <copyright file="ConventionSyntax.IncludeExclude.cs" company="Ninject Project Contributors">
// Copyright (c) 2009-2017 Ninject Project Contributors
// Licensed under the Apache License, Version 2.0.
// Copyright (c) 2009-2017 Ninject Project Contributors. All rights reserved.
//
// Dual-licensed under the Apache License, Version 2.0, and the Microsoft Public License (Ms-PL).
// You may not use this file except in compliance with one of the Licenses.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
// or
// http://www.microsoft.com/opensource/licenses.mspx
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
// </copyright>
// -------------------------------------------------------------------------------------------------

Expand All @@ -10,6 +23,7 @@ namespace Ninject.Extensions.Conventions.BindingBuilder
using System;
using System.Collections.Generic;
using System.Linq;

using Ninject.Extensions.Conventions.Syntax;

/// <summary>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,27 @@
// -------------------------------------------------------------------------------------------------
// <copyright file="ConventionSyntax.Select.cs" company="Ninject Project Contributors">
// Copyright (c) 2009-2017 Ninject Project Contributors
// Licensed under the Apache License, Version 2.0.
// Copyright (c) 2009-2017 Ninject Project Contributors. All rights reserved.
//
// Dual-licensed under the Apache License, Version 2.0, and the Microsoft Public License (Ms-PL).
// You may not use this file except in compliance with one of the Licenses.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
// or
// http://www.microsoft.com/opensource/licenses.mspx
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
// </copyright>
// -------------------------------------------------------------------------------------------------

namespace Ninject.Extensions.Conventions.BindingBuilder
{
using System;

using Ninject.Extensions.Conventions.Syntax;
using Ninject.Syntax;

Expand Down
Loading

0 comments on commit a63cd20

Please sign in to comment.