3.3.1

ninject · Oct 22, 2017 · 1817335 · 1817335
1 parent 04a26c2
commit 1817335
Show file tree

Hide file tree

Showing 85 changed files with 1,264 additions and 182 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,10 +4,11 @@ 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
 - Implemented an abstract `ErrorHandlingInterceptor`
+- Marked CLS Compliant
 
 ## [3.3.0] - 2017-09-26
 

diff --git a/src/Ninject.Extensions.Interception.DynamicProxy/DynamicProxyModule.cs b/src/Ninject.Extensions.Interception.DynamicProxy/DynamicProxyModule.cs
@@ -1,8 +1,21 @@
 // -------------------------------------------------------------------------------------------------
 // <copyright file="DynamicProxyModule.cs" company="Ninject Project Contributors">
-//   Copyright (c) 2007-2010, Enkari, Ltd.
-//   Copyright (c) 2010-2017, Ninject Project Contributors
+//   Copyright (c) 2007-2010 Enkari, Ltd. All rights reserved.
+//   Copyright (c) 2010-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>
 // -------------------------------------------------------------------------------------------------
 

diff --git a/src/Ninject.Extensions.Interception.DynamicProxy/DynamicProxyProxyFactory.cs b/src/Ninject.Extensions.Interception.DynamicProxy/DynamicProxyProxyFactory.cs
@@ -1,8 +1,21 @@
 // -------------------------------------------------------------------------------------------------
 // <copyright file="DynamicProxyProxyFactory.cs" company="Ninject Project Contributors">
-//   Copyright (c) 2007-2010, Enkari, Ltd.
-//   Copyright (c) 2010-2017, Ninject Project Contributors
+//   Copyright (c) 2007-2010 Enkari, Ltd. All rights reserved.
+//   Copyright (c) 2010-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>
 // -------------------------------------------------------------------------------------------------
 
@@ -12,6 +25,7 @@ namespace Ninject.Extensions.Interception.ProxyFactory
 {
     using System;
     using System.Linq;
+
     using Castle.DynamicProxy;
     using Castle.DynamicProxy.Serialization;
     using Ninject.Activation;

diff --git a/src/Ninject.Extensions.Interception.DynamicProxy/DynamicProxyWrapper.cs b/src/Ninject.Extensions.Interception.DynamicProxy/DynamicProxyWrapper.cs
@@ -1,8 +1,21 @@
 // -------------------------------------------------------------------------------------------------
 // <copyright file="DynamicProxyWrapper.cs" company="Ninject Project Contributors">
-//   Copyright (c) 2007-2010, Enkari, Ltd.
-//   Copyright (c) 2010-2017, Ninject Project Contributors
+//   Copyright (c) 2007-2010 Enkari, Ltd. All rights reserved.
+//   Copyright (c) 2010-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>
 // -------------------------------------------------------------------------------------------------
 

diff --git a/....Extensions.Interception.DynamicProxy/Ninject.Extensions.Interception.DynamicProxy.csproj b/....Extensions.Interception.DynamicProxy/Ninject.Extensions.Interception.DynamicProxy.csproj
@@ -3,11 +3,11 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
     <Version>0.0.0</Version>
-    <Authors>Ninject Contributors</Authors>
+    <Authors>Ninject Project Contributors</Authors>
     <Company>Ninject Project Contributors</Company>
     <Product>Interception extension for Ninject with Castle Dynamic Proxy 2</Product>
     <Description>Adds support for interception to Ninject using Castle Dynamic Proxy 2</Description>
-    <Copyright>2007-2010, Enkari, Ltd. 2010-2017, Ninject Contributors.</Copyright>
+    <Copyright>2007-2010 Enkari, Ltd. 2010-2017 Ninject Project Contributors.</Copyright>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyOriginatorKeyFile>..\Ninject.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
@@ -36,17 +36,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Castle.Core" Version="4.1.1" />
+    <PackageReference Include="Castle.Core" Version="4.2.0" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.0-beta004">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\Ninject.Extensions.Interception\Ninject.Extensions.Interception.csproj" />
   </ItemGroup>

diff --git a/src/Ninject.Extensions.Interception.DynamicProxy/ObjectMethodsInvocation.cs b/src/Ninject.Extensions.Interception.DynamicProxy/ObjectMethodsInvocation.cs
@@ -1,8 +1,21 @@
 // -------------------------------------------------------------------------------------------------
 // <copyright file="ObjectMethodsInvocation.cs" company="Ninject Project Contributors">
-//   Copyright (c) 2007-2010, Enkari, Ltd.
-//   Copyright (c) 2010-2017, Ninject Project Contributors
+//   Copyright (c) 2007-2010 Enkari, Ltd. All rights reserved.
+//   Copyright (c) 2010-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>
 // -------------------------------------------------------------------------------------------------
 

diff --git a/src/Ninject.Extensions.Interception.DynamicProxy/Properties/AssemblyInfo.cs b/src/Ninject.Extensions.Interception.DynamicProxy/Properties/AssemblyInfo.cs
@@ -0,0 +1,24 @@
+// -------------------------------------------------------------------------------------------------
+// <copyright file="AssemblyInfo.cs" company="Ninject Project Contributors">
+//   Copyright (c) 2007-2010 Enkari, Ltd. All rights reserved.
+//   Copyright (c) 2010-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>
+// -------------------------------------------------------------------------------------------------
+
+using System;
+
+[assembly: CLSCompliant(true)]
diff --git a/src/Ninject.Extensions.Interception.DynamicProxy/ProxyBase.cs b/src/Ninject.Extensions.Interception.DynamicProxy/ProxyBase.cs
@@ -1,8 +1,21 @@
 // -------------------------------------------------------------------------------------------------
 // <copyright file="ProxyBase.cs" company="Ninject Project Contributors">
-//   Copyright (c) 2007-2010, Enkari, Ltd.
-//   Copyright (c) 2010-2017, Ninject Project Contributors
+//   Copyright (c) 2007-2010 Enkari, Ltd. All rights reserved.
+//   Copyright (c) 2010-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>
 // -------------------------------------------------------------------------------------------------
 

diff --git a/src/Ninject.Extensions.Interception.LinFu/LinFuModule.cs b/src/Ninject.Extensions.Interception.LinFu/LinFuModule.cs
@@ -1,8 +1,21 @@
 // -------------------------------------------------------------------------------------------------
 // <copyright file="LinFuModule.cs" company="Ninject Project Contributors">
-//   Copyright (c) 2007-2010, Enkari, Ltd.
-//   Copyright (c) 2010-2017, Ninject Project Contributors
+//   Copyright (c) 2007-2010 Enkari, Ltd. All rights reserved.
+//   Copyright (c) 2010-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>
 // -------------------------------------------------------------------------------------------------
 
@@ -11,6 +24,7 @@
 namespace Ninject.Extensions.Interception
 {
     using System;
+
     using Ninject.Extensions.Interception.ProxyFactory;
 
     /// <summary>

diff --git a/src/Ninject.Extensions.Interception.LinFu/LinFuProxyFactory.cs b/src/Ninject.Extensions.Interception.LinFu/LinFuProxyFactory.cs
@@ -1,8 +1,21 @@
 // -------------------------------------------------------------------------------------------------
 // <copyright file="LinFuProxyFactory.cs" company="Ninject Project Contributors">
-//   Copyright (c) 2007-2010, Enkari, Ltd.
-//   Copyright (c) 2010-2017, Ninject Project Contributors
+//   Copyright (c) 2007-2010 Enkari, Ltd. All rights reserved.
+//   Copyright (c) 2010-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>
 // -------------------------------------------------------------------------------------------------
 
@@ -13,6 +26,7 @@ namespace Ninject.Extensions.Interception.ProxyFactory
     using System;
     using System.Linq;
     using System.Reflection;
+
     using LinFu.DynamicProxy;
     using Ninject.Activation;
     using Ninject.Extensions.Interception.Parameters;

diff --git a/src/Ninject.Extensions.Interception.LinFu/LinFuWrapper.cs b/src/Ninject.Extensions.Interception.LinFu/LinFuWrapper.cs
@@ -1,8 +1,21 @@
 // -------------------------------------------------------------------------------------------------
 // <copyright file="LinFuWrapper.cs" company="Ninject Project Contributors">
-//   Copyright (c) 2007-2010, Enkari, Ltd.
-//   Copyright (c) 2010-2017, Ninject Project Contributors
+//   Copyright (c) 2007-2010 Enkari, Ltd. All rights reserved.
+//   Copyright (c) 2010-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>
 // -------------------------------------------------------------------------------------------------
 

diff --git a/src/Ninject.Extensions.Interception.LinFu/Ninject.Extensions.Interception.LinFu.csproj b/src/Ninject.Extensions.Interception.LinFu/Ninject.Extensions.Interception.LinFu.csproj
@@ -3,18 +3,18 @@
   <PropertyGroup>
     <TargetFrameworks>net45</TargetFrameworks>
     <Version>0.0.0</Version>
-    <Authors>Ninject Contributors</Authors>
+    <Authors>Ninject Project Contributors</Authors>
     <Company>Ninject Project Contributors</Company>
     <Product>Interception extension for Ninject with LinFu</Product>
     <Description>Adds support for interception to Ninject using LinFu</Description>
-    <Copyright>2007-2010, Enkari, Ltd. 2010-2017, Ninject Contributors.</Copyright>
+    <Copyright>2007-2010, Enkari, Ltd. 2010-2017, Ninject Project Contributors.</Copyright>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyOriginatorKeyFile>..\Ninject.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
     <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
     <PackageId>Ninject.Extensions.Interception.Linfu</PackageId>
     <PackageVersion>0.0.0</PackageVersion>
-    <PackageTags>Ninject;ioc;di;interception;aop;dynamicproxy;</PackageTags>
+    <PackageTags>Ninject;ioc;di;interception;aop;LinFu;</PackageTags>
     <PackageProjectUrl>http://www.ninject.org/</PackageProjectUrl>
     <PackageReleaseNotes>https://github.com/ninject/Ninject.Extensions.Interception/blob/master/CHANGELOG.md</PackageReleaseNotes>
     <PackageIconUrl>https://github.com/ninject/ninject/raw/master/logos/Ninject-Logo32.png</PackageIconUrl>
@@ -42,11 +42,6 @@
     </PackageReference>
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\Ninject.Extensions.Interception\Ninject.Extensions.Interception.csproj" />
   </ItemGroup>

diff --git a/src/Ninject.Extensions.Interception.LinFu/Properties/AssemblyInfo.cs b/src/Ninject.Extensions.Interception.LinFu/Properties/AssemblyInfo.cs
@@ -0,0 +1,24 @@
+// -------------------------------------------------------------------------------------------------
+// <copyright file="AssemblyInfo.cs" company="Ninject Project Contributors">
+//   Copyright (c) 2007-2010 Enkari, Ltd. All rights reserved.
+//   Copyright (c) 2010-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>
+// -------------------------------------------------------------------------------------------------
+
+using System;
+
+[assembly: CLSCompliant(true)]
diff --git a/src/Ninject.Extensions.Interception.Test/Ninject.Extensions.Interception.Tests.csproj b/src/Ninject.Extensions.Interception.Test/Ninject.Extensions.Interception.Tests.csproj
@@ -8,15 +8,13 @@
   <ItemGroup>
     <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>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
-    <Reference Include="System" />
     <Reference Include="System.ServiceModel" />
-    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Ninject.Extensions.Interception/ActionInterceptor.cs b/src/Ninject.Extensions.Interception/ActionInterceptor.cs
@@ -1,8 +1,21 @@
 // -------------------------------------------------------------------------------------------------
 // <copyright file="ActionInterceptor.cs" company="Ninject Project Contributors">
-//   Copyright (c) 2007-2010, Enkari, Ltd.
-//   Copyright (c) 2010-2017, Ninject Project Contributors
+//   Copyright (c) 2007-2010 Enkari, Ltd. All rights reserved.
+//   Copyright (c) 2010-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>
 // -------------------------------------------------------------------------------------------------