Skip to content

Commit 08f026d

Browse files
scott-xuscott-xu
committed
3.3.1
1 parent 3b5f84d commit 08f026d

25 files changed

Lines changed: 313 additions & 55 deletions

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
.vs
2+
*.user
23
bin
34
obj
45
TestResults

‎CHANGELOG.md‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@ 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-
## [Unreleased]
7+
## [3.3.1] - 2017-10-22
8+
9+
### Added
10+
- CLS Compliant
811

912
### Fixed
1013
- Ninject.Extensions.Factory.FuncTests.LazyInjection fails at .NET Core 2.0 [#38](https://github.com/ninject/Ninject.Extensions.Factory/issues/38)

‎src/Ninject.Extensions.Factory.Test/Ninject.Extensions.Factory.Test.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Castle.Core" Version="4.1.1" />
9+
<PackageReference Include="Castle.Core" Version="4.2.0" />
1010
<PackageReference Include="FluentAssertions" Version="4.19.4" />
1111
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
12-
<PackageReference Include="Moq" Version="4.7.99" />
12+
<PackageReference Include="Moq" Version="4.7.137" />
1313
<PackageReference Include="xunit" Version="2.3.0" />
1414
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.0" />
1515
</ItemGroup>

‎src/Ninject.Extensions.Factory/BindToExtensions.cs‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,23 @@
11
// -------------------------------------------------------------------------------------------------
22
// <copyright file="BindToExtensions.cs" company="Ninject Project Contributors">
3-
// Copyright (c) 2009-2017 Ninject Project Contributors
3+
// Copyright (c) 2009-2017 Ninject Project Contributors. All rights reserved.
4+
//
45
// 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 !SILVERLIGHT_20 && !WINDOWS_PHONE && !NETCF_35
921
namespace Ninject.Extensions.Factory
1022
{
1123
using System;
@@ -174,5 +186,4 @@ private static IBindingWhenInNamedWithOrOnSyntax<TInterface> ToFactory<TInterfac
174186
return result;
175187
}
176188
}
177-
}
178-
#endif
189+
}

‎src/Ninject.Extensions.Factory/Factory/FactoryInterceptor.cs‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,23 @@
11
// -------------------------------------------------------------------------------------------------
22
// <copyright file="FactoryInterceptor.cs" company="Ninject Project Contributors">
3-
// Copyright (c) 2009-2017 Ninject Project Contributors
3+
// Copyright (c) 2009-2017 Ninject Project Contributors. All rights reserved.
4+
//
45
// 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 !SILVERLIGHT_20 && !WINDOWS_PHONE && !NETCF_35
921
namespace Ninject.Extensions.Factory
1022
{
1123
using Castle.DynamicProxy;
@@ -43,5 +55,4 @@ public void Intercept(IInvocation invocation)
4355
invocation.ReturnValue = this.instanceProvider.GetInstance(this, invocation.Method, invocation.Arguments);
4456
}
4557
}
46-
}
47-
#endif
58+
}

‎src/Ninject.Extensions.Factory/Factory/IFactoryProxy.cs‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,23 @@
11
// -------------------------------------------------------------------------------------------------
22
// <copyright file="IFactoryProxy.cs" company="Ninject Project Contributors">
3-
// Copyright (c) 2009-2017 Ninject Project Contributors
3+
// Copyright (c) 2009-2017 Ninject Project Contributors. All rights reserved.
4+
//
45
// 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 !SILVERLIGHT_20 && !WINDOWS_PHONE && !NETCF_35
921
namespace Ninject.Extensions.Factory
1022
{
1123
/// <summary>
@@ -14,5 +26,4 @@ namespace Ninject.Extensions.Factory
1426
public interface IFactoryProxy
1527
{
1628
}
17-
}
18-
#endif
29+
}

‎src/Ninject.Extensions.Factory/Factory/IInstanceProvider.cs‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,27 @@
11
// -------------------------------------------------------------------------------------------------
22
// <copyright file="IInstanceProvider.cs" company="Ninject Project Contributors">
3-
// Copyright (c) 2009-2017 Ninject Project Contributors
3+
// Copyright (c) 2009-2017 Ninject Project Contributors. All rights reserved.
4+
//
45
// 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.Factory
922
{
1023
using System.Reflection;
24+
1125
using Ninject.Extensions.Factory.Factory;
1226

1327
/// <summary>

‎src/Ninject.Extensions.Factory/Factory/IInstanceResolver.cs‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,20 @@
11
// -------------------------------------------------------------------------------------------------
22
// <copyright file="IInstanceResolver.cs" company="Ninject Project Contributors">
3-
// Copyright (c) 2009-2017 Ninject Project Contributors
3+
// Copyright (c) 2009-2017 Ninject Project Contributors. All rights reserved.
4+
//
45
// 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.Factory/Factory/InstanceResolver.cs‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,20 @@
11
// -------------------------------------------------------------------------------------------------
22
// <copyright file="InstanceResolver.cs" company="Ninject Project Contributors">
3-
// Copyright (c) 2009-2017 Ninject Project Contributors
3+
// Copyright (c) 2009-2017 Ninject Project Contributors. All rights reserved.
4+
//
45
// 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.Factory/Factory/ProxyTargetParameter.cs‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,23 @@
11
// -------------------------------------------------------------------------------------------------
22
// <copyright file="ProxyTargetParameter.cs" company="Ninject Project Contributors">
3-
// Copyright (c) 2009-2017 Ninject Project Contributors
3+
// Copyright (c) 2009-2017 Ninject Project Contributors. All rights reserved.
4+
//
45
// 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 !SILVERLIGHT_20 && !WINDOWS_PHONE && !NETCF_35
921
namespace Ninject.Extensions.Factory
1022
{
1123
using Ninject.Activation;
@@ -41,5 +53,4 @@ public bool AppliesToTarget(IContext context, ITarget target)
4153
return target.Type == typeof(object);
4254
}
4355
}
44-
}
45-
#endif
56+
}

0 commit comments

Comments
 (0)