Skip to content

Commit 1817335

Browse files
scott-xuscott-xu
committed
3.3.1
1 parent 04a26c2 commit 1817335

File tree

85 files changed

+1264
-182
lines changed

Some content is hidden

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

85 files changed

+1264
-182
lines changed

‎CHANGELOG.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@ 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
88

99
### Added
1010
- Implemented an abstract `ErrorHandlingInterceptor`
11+
- Marked CLS Compliant
1112

1213
## [3.3.0] - 2017-09-26
1314

‎src/Ninject.Extensions.Interception.DynamicProxy/DynamicProxyModule.cs‎

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

‎src/Ninject.Extensions.Interception.DynamicProxy/DynamicProxyProxyFactory.cs‎

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

@@ -12,6 +25,7 @@ namespace Ninject.Extensions.Interception.ProxyFactory
1225
{
1326
using System;
1427
using System.Linq;
28+
1529
using Castle.DynamicProxy;
1630
using Castle.DynamicProxy.Serialization;
1731
using Ninject.Activation;

‎src/Ninject.Extensions.Interception.DynamicProxy/DynamicProxyWrapper.cs‎

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

‎src/Ninject.Extensions.Interception.DynamicProxy/Ninject.Extensions.Interception.DynamicProxy.csproj‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
<PropertyGroup>
44
<TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
55
<Version>0.0.0</Version>
6-
<Authors>Ninject Contributors</Authors>
6+
<Authors>Ninject Project Contributors</Authors>
77
<Company>Ninject Project Contributors</Company>
88
<Product>Interception extension for Ninject with Castle Dynamic Proxy 2</Product>
99
<Description>Adds support for interception to Ninject using Castle Dynamic Proxy 2</Description>
10-
<Copyright>2007-2010, Enkari, Ltd. 2010-2017, Ninject Contributors.</Copyright>
10+
<Copyright>2007-2010 Enkari, Ltd. 2010-2017 Ninject Project Contributors.</Copyright>
1111
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1212
<AssemblyOriginatorKeyFile>..\Ninject.snk</AssemblyOriginatorKeyFile>
1313
<SignAssembly>true</SignAssembly>
@@ -36,17 +36,12 @@
3636
</ItemGroup>
3737

3838
<ItemGroup>
39-
<PackageReference Include="Castle.Core" Version="4.1.1" />
39+
<PackageReference Include="Castle.Core" Version="4.2.0" />
4040
<PackageReference Include="StyleCop.Analyzers" Version="1.1.0-beta004">
4141
<PrivateAssets>All</PrivateAssets>
4242
</PackageReference>
4343
</ItemGroup>
4444

45-
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
46-
<Reference Include="System" />
47-
<Reference Include="Microsoft.CSharp" />
48-
</ItemGroup>
49-
5045
<ItemGroup>
5146
<ProjectReference Include="..\Ninject.Extensions.Interception\Ninject.Extensions.Interception.csproj" />
5247
</ItemGroup>

‎src/Ninject.Extensions.Interception.DynamicProxy/ObjectMethodsInvocation.cs‎

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

‎src/Ninject.Extensions.Interception.DynamicProxy/Properties/AssemblyInfo.cs‎

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

‎src/Ninject.Extensions.Interception.DynamicProxy/ProxyBase.cs‎

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

‎src/Ninject.Extensions.Interception.LinFu/LinFuModule.cs‎

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

@@ -11,6 +24,7 @@
1124
namespace Ninject.Extensions.Interception
1225
{
1326
using System;
27+
1428
using Ninject.Extensions.Interception.ProxyFactory;
1529

1630
/// <summary>

‎src/Ninject.Extensions.Interception.LinFu/LinFuProxyFactory.cs‎

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

@@ -13,6 +26,7 @@ namespace Ninject.Extensions.Interception.ProxyFactory
1326
using System;
1427
using System.Linq;
1528
using System.Reflection;
29+
1630
using LinFu.DynamicProxy;
1731
using Ninject.Activation;
1832
using Ninject.Extensions.Interception.Parameters;

0 commit comments

Comments
 (0)