Skip to content

Commit

Permalink
3.3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
scott-xu committed Oct 22, 2017
1 parent 3b5f84d commit 08f026d
Show file tree
Hide file tree
Showing 25 changed files with 313 additions and 55 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
.vs
*.user
bin
obj
TestResults
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@ 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).

## [Unreleased]
## [3.3.1] - 2017-10-22

### Added
- CLS Compliant

### Fixed
- Ninject.Extensions.Factory.FuncTests.LazyInjection fails at .NET Core 2.0 [#38](https://github.com/ninject/Ninject.Extensions.Factory/issues/38)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Castle.Core" Version="4.1.1" />
<PackageReference Include="Castle.Core" Version="4.2.0" />
<PackageReference Include="FluentAssertions" Version="4.19.4" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
<PackageReference Include="Moq" Version="4.7.99" />
<PackageReference Include="Moq" Version="4.7.137" />
<PackageReference Include="xunit" Version="2.3.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.0" />
</ItemGroup>
Expand Down
19 changes: 15 additions & 4 deletions src/Ninject.Extensions.Factory/BindToExtensions.cs
Original file line number Diff line number Diff line change
@@ -1,11 +1,23 @@
// -------------------------------------------------------------------------------------------------
// <copyright file="BindToExtensions.cs" company="Ninject Project Contributors">
// Copyright (c) 2009-2017 Ninject Project Contributors
// 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 !SILVERLIGHT_20 && !WINDOWS_PHONE && !NETCF_35
namespace Ninject.Extensions.Factory
{
using System;
Expand Down Expand Up @@ -174,5 +186,4 @@ private static IBindingWhenInNamedWithOrOnSyntax<TInterface> ToFactory<TInterfac
return result;
}
}
}
#endif
}
19 changes: 15 additions & 4 deletions src/Ninject.Extensions.Factory/Factory/FactoryInterceptor.cs
Original file line number Diff line number Diff line change
@@ -1,11 +1,23 @@
// -------------------------------------------------------------------------------------------------
// <copyright file="FactoryInterceptor.cs" company="Ninject Project Contributors">
// Copyright (c) 2009-2017 Ninject Project Contributors
// 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 !SILVERLIGHT_20 && !WINDOWS_PHONE && !NETCF_35
namespace Ninject.Extensions.Factory
{
using Castle.DynamicProxy;
Expand Down Expand Up @@ -43,5 +55,4 @@ public void Intercept(IInvocation invocation)
invocation.ReturnValue = this.instanceProvider.GetInstance(this, invocation.Method, invocation.Arguments);
}
}
}
#endif
}
19 changes: 15 additions & 4 deletions src/Ninject.Extensions.Factory/Factory/IFactoryProxy.cs
Original file line number Diff line number Diff line change
@@ -1,11 +1,23 @@
// -------------------------------------------------------------------------------------------------
// <copyright file="IFactoryProxy.cs" company="Ninject Project Contributors">
// Copyright (c) 2009-2017 Ninject Project Contributors
// 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 !SILVERLIGHT_20 && !WINDOWS_PHONE && !NETCF_35
namespace Ninject.Extensions.Factory
{
/// <summary>
Expand All @@ -14,5 +26,4 @@ namespace Ninject.Extensions.Factory
public interface IFactoryProxy
{
}
}
#endif
}
16 changes: 15 additions & 1 deletion src/Ninject.Extensions.Factory/Factory/IInstanceProvider.cs
Original file line number Diff line number Diff line change
@@ -1,13 +1,27 @@
// -------------------------------------------------------------------------------------------------
// <copyright file="IInstanceProvider.cs" company="Ninject Project Contributors">
// Copyright (c) 2009-2017 Ninject Project Contributors
// 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.Factory
{
using System.Reflection;

using Ninject.Extensions.Factory.Factory;

/// <summary>
Expand Down
15 changes: 14 additions & 1 deletion src/Ninject.Extensions.Factory/Factory/IInstanceResolver.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,20 @@
// -------------------------------------------------------------------------------------------------
// <copyright file="IInstanceResolver.cs" company="Ninject Project Contributors">
// Copyright (c) 2009-2017 Ninject Project Contributors
// 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
15 changes: 14 additions & 1 deletion src/Ninject.Extensions.Factory/Factory/InstanceResolver.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,20 @@
// -------------------------------------------------------------------------------------------------
// <copyright file="InstanceResolver.cs" company="Ninject Project Contributors">
// Copyright (c) 2009-2017 Ninject Project Contributors
// 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
19 changes: 15 additions & 4 deletions src/Ninject.Extensions.Factory/Factory/ProxyTargetParameter.cs
Original file line number Diff line number Diff line change
@@ -1,11 +1,23 @@
// -------------------------------------------------------------------------------------------------
// <copyright file="ProxyTargetParameter.cs" company="Ninject Project Contributors">
// Copyright (c) 2009-2017 Ninject Project Contributors
// 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 !SILVERLIGHT_20 && !WINDOWS_PHONE && !NETCF_35
namespace Ninject.Extensions.Factory
{
using Ninject.Activation;
Expand Down Expand Up @@ -41,5 +53,4 @@ public bool AppliesToTarget(IContext context, ITarget target)
return target.Type == typeof(object);
}
}
}
#endif
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,20 @@
// -------------------------------------------------------------------------------------------------
// <copyright file="StandardInstanceProvider.cs" company="Ninject Project Contributors">
// Copyright (c) 2009-2017 Ninject Project Contributors
// 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,12 +1,27 @@
// -------------------------------------------------------------------------------------------------
// <copyright file="TypeMatchingArgumentInheritanceInstanceProvider.cs" company="Ninject Project Contributors">
// Copyright (c) 2009-2017 Ninject Project Contributors
// 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.Factory
{
using System.Reflection;

using Ninject.Parameters;

/// <summary>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,20 @@
// -------------------------------------------------------------------------------------------------
// <copyright file="ArgumentPositionCalculator.cs" company="Ninject Project Contributors">
// Copyright (c) 2009-2017 Ninject Project Contributors
// 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
15 changes: 14 additions & 1 deletion src/Ninject.Extensions.Factory/Func/ConstructorInfoExtensions.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,20 @@
// -------------------------------------------------------------------------------------------------
// <copyright file="ConstructorInfoExtensions.cs" company="Ninject Project Contributors">
// Copyright (c) 2009-2017 Ninject Project Contributors
// 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
16 changes: 15 additions & 1 deletion src/Ninject.Extensions.Factory/Func/FuncConstructorArgument.cs
Original file line number Diff line number Diff line change
@@ -1,13 +1,27 @@
// -------------------------------------------------------------------------------------------------
// <copyright file="FuncConstructorArgument.cs" company="Ninject Project Contributors">
// Copyright (c) 2009-2017 Ninject Project Contributors
// 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.Factory
{
using System;

using Ninject.Activation;
using Ninject.Parameters;
using Ninject.Planning.Targets;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,20 @@
// -------------------------------------------------------------------------------------------------
// <copyright file="FuncConstructorArgumentFactory.cs" company="Ninject Project Contributors">
// Copyright (c) 2009-2017 Ninject Project Contributors
// 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
Loading

0 comments on commit 08f026d

Please sign in to comment.