diff --git a/CHANGELOG.md b/CHANGELOG.md index 4f14c77..fce0bf3 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/src/Ninject.Extensions.NamedScope/DisposeNotifyingObject.cs b/src/Ninject.Extensions.NamedScope/DisposeNotifyingObject.cs index 3724f5f..929f812 100644 --- a/src/Ninject.Extensions.NamedScope/DisposeNotifyingObject.cs +++ b/src/Ninject.Extensions.NamedScope/DisposeNotifyingObject.cs @@ -1,8 +1,21 @@ // ------------------------------------------------------------------------------------------------- // -// 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. // // ------------------------------------------------------------------------------------------------- diff --git a/src/Ninject.Extensions.NamedScope/ExceptionFormatter.cs b/src/Ninject.Extensions.NamedScope/ExceptionFormatter.cs index b333a13..1924584 100644 --- a/src/Ninject.Extensions.NamedScope/ExceptionFormatter.cs +++ b/src/Ninject.Extensions.NamedScope/ExceptionFormatter.cs @@ -1,8 +1,21 @@ // ------------------------------------------------------------------------------------------------- // -// 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. // // ------------------------------------------------------------------------------------------------- diff --git a/src/Ninject.Extensions.NamedScope/NamedScope.cs b/src/Ninject.Extensions.NamedScope/NamedScope.cs index 65165fc..fd2080c 100644 --- a/src/Ninject.Extensions.NamedScope/NamedScope.cs +++ b/src/Ninject.Extensions.NamedScope/NamedScope.cs @@ -1,8 +1,21 @@ // ------------------------------------------------------------------------------------------------- // -// 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. // // ------------------------------------------------------------------------------------------------- diff --git a/src/Ninject.Extensions.NamedScope/NamedScopeActivationStrategy.cs b/src/Ninject.Extensions.NamedScope/NamedScopeActivationStrategy.cs index a420929..a3cfaa2 100644 --- a/src/Ninject.Extensions.NamedScope/NamedScopeActivationStrategy.cs +++ b/src/Ninject.Extensions.NamedScope/NamedScopeActivationStrategy.cs @@ -1,16 +1,30 @@ // ------------------------------------------------------------------------------------------------- // -// 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. // // ------------------------------------------------------------------------------------------------- namespace Ninject.Extensions.NamedScope { using System.Linq; - using Activation; - using Activation.Strategies; + + using Ninject.Activation; + using Ninject.Activation.Strategies; using Ninject.Parameters; /// diff --git a/src/Ninject.Extensions.NamedScope/NamedScopeExtensionMethods.cs b/src/Ninject.Extensions.NamedScope/NamedScopeExtensionMethods.cs index ff4125f..edd0249 100644 --- a/src/Ninject.Extensions.NamedScope/NamedScopeExtensionMethods.cs +++ b/src/Ninject.Extensions.NamedScope/NamedScopeExtensionMethods.cs @@ -1,14 +1,28 @@ // ------------------------------------------------------------------------------------------------- // -// 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. // // ------------------------------------------------------------------------------------------------- namespace Ninject.Extensions.NamedScope { using System.Linq; + using Ninject.Activation; using Ninject.Syntax; diff --git a/src/Ninject.Extensions.NamedScope/NamedScopeModule.cs b/src/Ninject.Extensions.NamedScope/NamedScopeModule.cs index 081fa2a..9f0dea2 100644 --- a/src/Ninject.Extensions.NamedScope/NamedScopeModule.cs +++ b/src/Ninject.Extensions.NamedScope/NamedScopeModule.cs @@ -1,15 +1,28 @@ // ------------------------------------------------------------------------------------------------- // -// 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. // // ------------------------------------------------------------------------------------------------- namespace Ninject.Extensions.NamedScope { - using System; using System.Linq; + using Ninject.Activation; using Ninject.Activation.Strategies; using Ninject.Modules; diff --git a/src/Ninject.Extensions.NamedScope/NamedScopeParameter.cs b/src/Ninject.Extensions.NamedScope/NamedScopeParameter.cs index 890588a..9b3ba56 100644 --- a/src/Ninject.Extensions.NamedScope/NamedScopeParameter.cs +++ b/src/Ninject.Extensions.NamedScope/NamedScopeParameter.cs @@ -1,8 +1,21 @@ // ------------------------------------------------------------------------------------------------- // -// 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. // // ------------------------------------------------------------------------------------------------- diff --git a/src/Ninject.Extensions.NamedScope/NamedScopeReference.cs b/src/Ninject.Extensions.NamedScope/NamedScopeReference.cs index e39e140..b80cc8e 100644 --- a/src/Ninject.Extensions.NamedScope/NamedScopeReference.cs +++ b/src/Ninject.Extensions.NamedScope/NamedScopeReference.cs @@ -1,14 +1,28 @@ // ------------------------------------------------------------------------------------------------- // -// 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. // // ------------------------------------------------------------------------------------------------- namespace Ninject.Extensions.NamedScope { using System; + using Ninject.Infrastructure.Disposal; /// diff --git a/src/Ninject.Extensions.NamedScope/NamedScopeReferenceScopeParameter.cs b/src/Ninject.Extensions.NamedScope/NamedScopeReferenceScopeParameter.cs index c5d47bc..897a0de 100644 --- a/src/Ninject.Extensions.NamedScope/NamedScopeReferenceScopeParameter.cs +++ b/src/Ninject.Extensions.NamedScope/NamedScopeReferenceScopeParameter.cs @@ -1,14 +1,28 @@ // ------------------------------------------------------------------------------------------------- // -// 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. // // ------------------------------------------------------------------------------------------------- namespace Ninject.Extensions.NamedScope { using System; + using Ninject.Parameters; /// diff --git a/src/Ninject.Extensions.NamedScope/Ninject.Extensions.NamedScope.csproj b/src/Ninject.Extensions.NamedScope/Ninject.Extensions.NamedScope.csproj index 12c5c29..0570f03 100644 --- a/src/Ninject.Extensions.NamedScope/Ninject.Extensions.NamedScope.csproj +++ b/src/Ninject.Extensions.NamedScope/Ninject.Extensions.NamedScope.csproj @@ -3,11 +3,11 @@ netstandard2.0;net45 0.0.0 - Remo Gloor (remo.gloor@gmail.com);Ninject Contributors + Ninject Project Contributors Ninject Project Contributors Named scope extension for Ninject Extension for Ninject which allows bindings to define additional scope types. - 2010 bbv Software Services AG;2011-2017 Ninject Project Contributors + 2010 bbv Software Services AG. 2010-2017 Ninject Project Contributors. true ..\Ninject.snk true @@ -36,15 +36,10 @@ - + All - - - - - \ No newline at end of file diff --git a/src/Ninject.Extensions.NamedScope/Properties/AssemblyInfo.cs b/src/Ninject.Extensions.NamedScope/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..a73dac7 --- /dev/null +++ b/src/Ninject.Extensions.NamedScope/Properties/AssemblyInfo.cs @@ -0,0 +1,24 @@ +// ------------------------------------------------------------------------------------------------- +// +// 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. +// +// ------------------------------------------------------------------------------------------------- + +using System; + +[assembly: CLSCompliant(true)] \ No newline at end of file diff --git a/src/Ninject.Extensions.NamedScope/ScopeDisposedException.cs b/src/Ninject.Extensions.NamedScope/ScopeDisposedException.cs index b8e05e4..6b1611d 100644 --- a/src/Ninject.Extensions.NamedScope/ScopeDisposedException.cs +++ b/src/Ninject.Extensions.NamedScope/ScopeDisposedException.cs @@ -1,8 +1,21 @@ // ------------------------------------------------------------------------------------------------- // -// 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. // // ------------------------------------------------------------------------------------------------- diff --git a/src/Ninject.Extensions.NamedScope/UnknownScopeException.cs b/src/Ninject.Extensions.NamedScope/UnknownScopeException.cs index 861258d..dbdb1d3 100644 --- a/src/Ninject.Extensions.NamedScope/UnknownScopeException.cs +++ b/src/Ninject.Extensions.NamedScope/UnknownScopeException.cs @@ -1,8 +1,21 @@ // ------------------------------------------------------------------------------------------------- // -// 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. // // ------------------------------------------------------------------------------------------------- diff --git a/src/stylecop.json b/src/stylecop.json index 409c462..c4fa91c 100644 --- a/src/stylecop.json +++ b/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" } } } \ No newline at end of file