3.3.0

CHANGELOG.md

@@ -4,7 +4,7 @@ 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.0] - 2017-10-23
 
 ### Added
  - Support .NET Standard 2.0

src/Ninject.Extensions.NamedScope/DisposeNotifyingObject.cs

@@ -1,8 +1,21 @@
 // -------------------------------------------------------------------------------------------------
 // <copyright file="DisposeNotifyingObject.cs" company="Ninject Project Contributors">
-//   Copyright (c) 2010 bbv Software Services AG
-//   Copyright (c) 2011-2017 Ninject Project Contributors
-//   Licensed under the Apache License, Version 2.0.
+//   Copyright (c) 2010 bbv Software Services AG. 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>
 // -------------------------------------------------------------------------------------------------
 

src/Ninject.Extensions.NamedScope/ExceptionFormatter.cs

@@ -1,8 +1,21 @@
 // -------------------------------------------------------------------------------------------------
 // <copyright file="ExceptionFormatter.cs" company="Ninject Project Contributors">
-//   Copyright (c) 2010 bbv Software Services AG
-//   Copyright (c) 2011-2017 Ninject Project Contributors
-//   Licensed under the Apache License, Version 2.0.
+//   Copyright (c) 2010 bbv Software Services AG. 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>
 // -------------------------------------------------------------------------------------------------
 

src/Ninject.Extensions.NamedScope/NamedScope.cs

@@ -1,8 +1,21 @@
 // -------------------------------------------------------------------------------------------------
 // <copyright file="NamedScope.cs" company="Ninject Project Contributors">
-//   Copyright (c) 2010 bbv Software Services AG
-//   Copyright (c) 2011-2017 Ninject Project Contributors
-//   Licensed under the Apache License, Version 2.0.
+//   Copyright (c) 2010 bbv Software Services AG. 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>
 // -------------------------------------------------------------------------------------------------
 

src/Ninject.Extensions.NamedScope/NamedScopeActivationStrategy.cs

@@ -1,16 +1,30 @@
 // -------------------------------------------------------------------------------------------------
 // <copyright file="NamedScopeActivationStrategy.cs" company="Ninject Project Contributors">
-//   Copyright (c) 2010 bbv Software Services AG
-//   Copyright (c) 2011-2017 Ninject Project Contributors
-//   Licensed under the Apache License, Version 2.0.
+//   Copyright (c) 2010 bbv Software Services AG. 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>
 // -------------------------------------------------------------------------------------------------
 
 namespace Ninject.Extensions.NamedScope
 {
     using System.Linq;
-    using Activation;
-    using Activation.Strategies;
+
+    using Ninject.Activation;
+    using Ninject.Activation.Strategies;
     using Ninject.Parameters;
 
     /// <summary>

src/Ninject.Extensions.NamedScope/NamedScopeExtensionMethods.cs

@@ -1,14 +1,28 @@
 // -------------------------------------------------------------------------------------------------
 // <copyright file="NamedScopeExtensionMethods.cs" company="Ninject Project Contributors">
-//   Copyright (c) 2010 bbv Software Services AG
-//   Copyright (c) 2011-2017 Ninject Project Contributors
-//   Licensed under the Apache License, Version 2.0.
+//   Copyright (c) 2010 bbv Software Services AG. 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>
 // -------------------------------------------------------------------------------------------------
 
 namespace Ninject.Extensions.NamedScope
 {
     using System.Linq;
+
     using Ninject.Activation;
     using Ninject.Syntax;
 

src/Ninject.Extensions.NamedScope/NamedScopeModule.cs

@@ -1,15 +1,28 @@
 // -------------------------------------------------------------------------------------------------
 // <copyright file="NamedScopeModule.cs" company="Ninject Project Contributors">
-//   Copyright (c) 2010 bbv Software Services AG
-//   Copyright (c) 2011-2017 Ninject Project Contributors
-//   Licensed under the Apache License, Version 2.0.
+//   Copyright (c) 2010 bbv Software Services AG. 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>
 // -------------------------------------------------------------------------------------------------
 
 namespace Ninject.Extensions.NamedScope
 {
-    using System;
     using System.Linq;
+
     using Ninject.Activation;
     using Ninject.Activation.Strategies;
     using Ninject.Modules;

src/Ninject.Extensions.NamedScope/NamedScopeParameter.cs

@@ -1,8 +1,21 @@
 // -------------------------------------------------------------------------------------------------
 // <copyright file="NamedScopeParameter.cs" company="Ninject Project Contributors">
-//   Copyright (c) 2010 bbv Software Services AG
-//   Copyright (c) 2011-2017 Ninject Project Contributors
-//   Licensed under the Apache License, Version 2.0.
+//   Copyright (c) 2010 bbv Software Services AG. 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>
 // -------------------------------------------------------------------------------------------------
 

src/Ninject.Extensions.NamedScope/NamedScopeReference.cs

@@ -1,14 +1,28 @@
 // -------------------------------------------------------------------------------------------------
 // <copyright file="NamedScopeReference.cs" company="Ninject Project Contributors">
-//   Copyright (c) 2010 bbv Software Services AG
-//   Copyright (c) 2011-2017 Ninject Project Contributors
-//   Licensed under the Apache License, Version 2.0.
+//   Copyright (c) 2010 bbv Software Services AG. 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>
 // -------------------------------------------------------------------------------------------------
 
 namespace Ninject.Extensions.NamedScope
 {
     using System;
+
     using Ninject.Infrastructure.Disposal;
 
     /// <summary>

src/Ninject.Extensions.NamedScope/NamedScopeReferenceScopeParameter.cs

@@ -1,14 +1,28 @@
 // -------------------------------------------------------------------------------------------------
 // <copyright file="NamedScopeReferenceScopeParameter.cs" company="Ninject Project Contributors">
-//   Copyright (c) 2010 bbv Software Services AG
-//   Copyright (c) 2011-2017 Ninject Project Contributors
-//   Licensed under the Apache License, Version 2.0.
+//   Copyright (c) 2010 bbv Software Services AG. 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>
 // -------------------------------------------------------------------------------------------------
 
 namespace Ninject.Extensions.NamedScope
 {
     using System;
+
     using Ninject.Parameters;
 
     /// <summary>

src/Ninject.Extensions.NamedScope/Ninject.Extensions.NamedScope.csproj

@@ -3,11 +3,11 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
     <Version>0.0.0</Version>
-    <Authors>Remo Gloor ([email protected]);Ninject Contributors</Authors>
+    <Authors>Ninject Project Contributors</Authors>
     <Company>Ninject Project Contributors</Company>
     <Product>Named scope extension for Ninject</Product>
     <Description>Extension for Ninject which allows bindings to define additional scope types.</Description>
-    <Copyright>2010 bbv Software Services AG;2011-2017 Ninject Project Contributors</Copyright>
+    <Copyright>2010 bbv Software Services AG. 2010-2017 Ninject Project Contributors.</Copyright>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyOriginatorKeyFile>..\Ninject.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
@@ -36,15 +36,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Ninject" Version="3.3.2-beta1" />
+    <PackageReference Include="Ninject" Version="3.3.3" />
     <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>
-
 </Project>

src/Ninject.Extensions.NamedScope/Properties/AssemblyInfo.cs

@@ -0,0 +1,24 @@
+// -------------------------------------------------------------------------------------------------
+// <copyright file="AssemblyInfo.cs" company="Ninject Project Contributors">
+//   Copyright (c) 2010 bbv Software Services AG. 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)]

src/Ninject.Extensions.NamedScope/ScopeDisposedException.cs

@@ -1,8 +1,21 @@
 // -------------------------------------------------------------------------------------------------
 // <copyright file="ScopeDisposedException.cs" company="Ninject Project Contributors">
-//   Copyright (c) 2010 bbv Software Services AG
-//   Copyright (c) 2011-2017 Ninject Project Contributors
-//   Licensed under the Apache License, Version 2.0.
+//   Copyright (c) 2010 bbv Software Services AG. 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>
 // -------------------------------------------------------------------------------------------------
 

src/Ninject.Extensions.NamedScope/UnknownScopeException.cs

@@ -1,8 +1,21 @@
 // -------------------------------------------------------------------------------------------------
 // <copyright file="UnknownScopeException.cs" company="Ninject Project Contributors">
-//   Copyright (c) 2010 bbv Software Services AG
-//   Copyright (c) 2011-2017 Ninject Project Contributors
-//   Licensed under the Apache License, Version 2.0.
+//   Copyright (c) 2010 bbv Software Services AG. 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>
 // -------------------------------------------------------------------------------------------------
 

src/stylecop.json

@@ -3,11 +3,14 @@
   "settings": {
     "documentationRules": {
       "companyName": "Ninject Project Contributors",
-      "copyrightText": "  Copyright (c) 2010 bbv Software Services AG\r\n  Copyright (c) 2011-2017 Ninject Project Contributors\r\n  Licensed under the Apache License, Version 2.0.",
+      "copyrightText": "  Copyright (c) 2010 bbv Software Services AG. All rights reserved.\r\n  Copyright (c) 2010-2017 Ninject Project Contributors. All rights reserved.\r\n\r\n  Dual-licensed under the Apache License, Version 2.0, and the Microsoft Public License (Ms-PL).\r\n  You may not use this file except in compliance with one of the Licenses.\r\n  You may obtain a copy of the License at\r\n\r\n      http://www.apache.org/licenses/LICENSE-2.0\r\n  or\r\n      http://www.microsoft.com/opensource/licenses.mspx\r\n\r\n  Unless required by applicable law or agreed to in writing, software\r\n  distributed under the License is distributed on an \"AS IS\" BASIS,\r\n  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r\n  See the License for the specific language governing permissions and\r\n  limitations under the License.",
       "headerDecoration": "-------------------------------------------------------------------------------------------------"
     },
     "layoutRules": {
       "newlineAtEndOfFile": "omit"
+    },
+    "orderingRules": {
+      "blankLinesBetweenUsingGroups": "require"
     }
   }
 }