From 96a7f9c117e21e5fffcea47df4da09a5fd201727 Mon Sep 17 00:00:00 2001 From: Scott Xu Date: Mon, 23 Oct 2017 22:45:32 +0800 Subject: [PATCH] 3.3.0 --- CHANGELOG.md | 2 +- .../Filter/FilterContextParameter.cs | 19 ++++- src/Ninject.Web.Mvc/Filter/INinjectFilter.cs | 19 ++++- src/Ninject.Web.Mvc/Filter/NinjectFilter.cs | 19 ++++- .../NinjectFilterAttributeFilterProvider.cs | 19 ++++- .../Filter/NinjectFilterProvider.cs | 19 ++++- .../AttributeValueSelector.cs | 19 ++++- .../BindingRootExtensions.cs | 19 ++++- .../FilterFilterBindingBuilder.cs | 19 ++++- .../IConstructorArgumentSyntaxExtensions.cs | 19 ++++- .../IFilterBindingInNamedWithOrOnSyntax.cs | 19 ++++- .../IFilterBindingInSyntax.cs | 19 ++++- .../IFilterBindingNamedSyntax.cs | 19 ++++- .../IFilterBindingNamedWithOrOnSyntax.cs | 19 ++++- .../IFilterBindingOnSyntax.cs | 19 ++++- ...IFilterBindingWhenInNamedWithOrOnSyntax.cs | 19 ++++- .../IFilterBindingWhenSyntax.cs | 19 ++++- .../IFilterBindingWithOrOnSyntax.cs | 19 ++++- .../IFilterBindingWithSyntax.cs | 19 ++++- src/Ninject.Web.Mvc/MvcModule.cs | 19 ++++- src/Ninject.Web.Mvc/Ninject.Web.Mvc.csproj | 6 +- .../NinjectDependencyResolver.cs | 19 ++++- .../NinjectMvcHttpApplicationPlugin.cs | 19 ++++- .../Properties/AssemblyInfo.cs | 24 ++++++ ...ctDataAnnotationsModelValidatorProvider.cs | 19 ++++- src/Ninject.Web.Mvc/stylecop.json | 2 +- .../SampleApplication.csproj | 8 +- src/SampleApplication/Web.config | 80 +++++++++---------- src/SampleApplication/packages.config | 6 +- 29 files changed, 427 insertions(+), 119 deletions(-) create mode 100644 src/Ninject.Web.Mvc/Properties/AssemblyInfo.cs diff --git a/CHANGELOG.md b/CHANGELOG.md index 0280b3d..1519a31 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] - 2017-10-19 +## [3.3.0] - 2017-10-23 ### Removed - Dropped support for ASP.NET MVC 1,2,3,4. \ No newline at end of file diff --git a/src/Ninject.Web.Mvc/Filter/FilterContextParameter.cs b/src/Ninject.Web.Mvc/Filter/FilterContextParameter.cs index b919908..482dbf0 100644 --- a/src/Ninject.Web.Mvc/Filter/FilterContextParameter.cs +++ b/src/Ninject.Web.Mvc/Filter/FilterContextParameter.cs @@ -1,8 +1,21 @@ // ------------------------------------------------------------------------------------------------- // -// Copyright (c) 2010 bbv Software Services AG. -// Copyright (c) 2010-2017 Ninject Contributors. -// Licensed under the Apache License, Version 2.0, and the Microsoft Public License (Ms-PL). +// 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.Web.Mvc/Filter/INinjectFilter.cs b/src/Ninject.Web.Mvc/Filter/INinjectFilter.cs index f5af426..5ba2304 100644 --- a/src/Ninject.Web.Mvc/Filter/INinjectFilter.cs +++ b/src/Ninject.Web.Mvc/Filter/INinjectFilter.cs @@ -1,8 +1,21 @@ // ------------------------------------------------------------------------------------------------- // -// Copyright (c) 2010 bbv Software Services AG. -// Copyright (c) 2010-2017 Ninject Contributors. -// Licensed under the Apache License, Version 2.0, and the Microsoft Public License (Ms-PL). +// 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.Web.Mvc/Filter/NinjectFilter.cs b/src/Ninject.Web.Mvc/Filter/NinjectFilter.cs index 236b5eb..6aaf82a 100644 --- a/src/Ninject.Web.Mvc/Filter/NinjectFilter.cs +++ b/src/Ninject.Web.Mvc/Filter/NinjectFilter.cs @@ -1,8 +1,21 @@ // ------------------------------------------------------------------------------------------------- // -// Copyright (c) 2010 bbv Software Services AG. -// Copyright (c) 2010-2017 Ninject Contributors. -// Licensed under the Apache License, Version 2.0, and the Microsoft Public License (Ms-PL). +// 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.Web.Mvc/Filter/NinjectFilterAttributeFilterProvider.cs b/src/Ninject.Web.Mvc/Filter/NinjectFilterAttributeFilterProvider.cs index f5c1b4d..2470ce9 100644 --- a/src/Ninject.Web.Mvc/Filter/NinjectFilterAttributeFilterProvider.cs +++ b/src/Ninject.Web.Mvc/Filter/NinjectFilterAttributeFilterProvider.cs @@ -1,8 +1,21 @@ // ------------------------------------------------------------------------------------------------- // -// Copyright (c) 2010 bbv Software Services AG. -// Copyright (c) 2010-2017 Ninject Contributors. -// Licensed under the Apache License, Version 2.0, and the Microsoft Public License (Ms-PL). +// 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.Web.Mvc/Filter/NinjectFilterProvider.cs b/src/Ninject.Web.Mvc/Filter/NinjectFilterProvider.cs index 70203fb..2caee20 100644 --- a/src/Ninject.Web.Mvc/Filter/NinjectFilterProvider.cs +++ b/src/Ninject.Web.Mvc/Filter/NinjectFilterProvider.cs @@ -1,8 +1,21 @@ // ------------------------------------------------------------------------------------------------- // -// Copyright (c) 2010 bbv Software Services AG. -// Copyright (c) 2010-2017 Ninject Contributors. -// Licensed under the Apache License, Version 2.0, and the Microsoft Public License (Ms-PL). +// 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.Web.Mvc/FilterBindingSyntax/AttributeValueSelector.cs b/src/Ninject.Web.Mvc/FilterBindingSyntax/AttributeValueSelector.cs index faa45ac..ecbbc38 100644 --- a/src/Ninject.Web.Mvc/FilterBindingSyntax/AttributeValueSelector.cs +++ b/src/Ninject.Web.Mvc/FilterBindingSyntax/AttributeValueSelector.cs @@ -1,8 +1,21 @@ // ------------------------------------------------------------------------------------------------- // -// Copyright (c) 2010 bbv Software Services AG. -// Copyright (c) 2010-2017 Ninject Contributors. -// Licensed under the Apache License, Version 2.0, and the Microsoft Public License (Ms-PL). +// 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.Web.Mvc/FilterBindingSyntax/BindingRootExtensions.cs b/src/Ninject.Web.Mvc/FilterBindingSyntax/BindingRootExtensions.cs index e5b270f..666a880 100644 --- a/src/Ninject.Web.Mvc/FilterBindingSyntax/BindingRootExtensions.cs +++ b/src/Ninject.Web.Mvc/FilterBindingSyntax/BindingRootExtensions.cs @@ -1,8 +1,21 @@ // ------------------------------------------------------------------------------------------------- // -// Copyright (c) 2010 bbv Software Services AG. -// Copyright (c) 2010-2017 Ninject Contributors. -// Licensed under the Apache License, Version 2.0, and the Microsoft Public License (Ms-PL). +// 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.Web.Mvc/FilterBindingSyntax/FilterFilterBindingBuilder.cs b/src/Ninject.Web.Mvc/FilterBindingSyntax/FilterFilterBindingBuilder.cs index cc984d9..c838cb0 100644 --- a/src/Ninject.Web.Mvc/FilterBindingSyntax/FilterFilterBindingBuilder.cs +++ b/src/Ninject.Web.Mvc/FilterBindingSyntax/FilterFilterBindingBuilder.cs @@ -1,8 +1,21 @@ // ------------------------------------------------------------------------------------------------- // -// Copyright (c) 2010 bbv Software Services AG. -// Copyright (c) 2010-2017 Ninject Contributors. -// Licensed under the Apache License, Version 2.0, and the Microsoft Public License (Ms-PL). +// 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.Web.Mvc/FilterBindingSyntax/IConstructorArgumentSyntaxExtensions.cs b/src/Ninject.Web.Mvc/FilterBindingSyntax/IConstructorArgumentSyntaxExtensions.cs index 8a7875d..abad8ab 100644 --- a/src/Ninject.Web.Mvc/FilterBindingSyntax/IConstructorArgumentSyntaxExtensions.cs +++ b/src/Ninject.Web.Mvc/FilterBindingSyntax/IConstructorArgumentSyntaxExtensions.cs @@ -1,8 +1,21 @@ // ------------------------------------------------------------------------------------------------- // -// Copyright (c) 2010 bbv Software Services AG. -// Copyright (c) 2010-2017 Ninject Contributors. -// Licensed under the Apache License, Version 2.0, and the Microsoft Public License (Ms-PL). +// 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.Web.Mvc/FilterBindingSyntax/IFilterBindingInNamedWithOrOnSyntax.cs b/src/Ninject.Web.Mvc/FilterBindingSyntax/IFilterBindingInNamedWithOrOnSyntax.cs index 7965ed9..d852365 100644 --- a/src/Ninject.Web.Mvc/FilterBindingSyntax/IFilterBindingInNamedWithOrOnSyntax.cs +++ b/src/Ninject.Web.Mvc/FilterBindingSyntax/IFilterBindingInNamedWithOrOnSyntax.cs @@ -1,8 +1,21 @@ // ------------------------------------------------------------------------------------------------- // -// Copyright (c) 2010 bbv Software Services AG. -// Copyright (c) 2010-2017 Ninject Contributors. -// Licensed under the Apache License, Version 2.0, and the Microsoft Public License (Ms-PL). +// 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.Web.Mvc/FilterBindingSyntax/IFilterBindingInSyntax.cs b/src/Ninject.Web.Mvc/FilterBindingSyntax/IFilterBindingInSyntax.cs index 9ca5e03..d708e28 100644 --- a/src/Ninject.Web.Mvc/FilterBindingSyntax/IFilterBindingInSyntax.cs +++ b/src/Ninject.Web.Mvc/FilterBindingSyntax/IFilterBindingInSyntax.cs @@ -1,8 +1,21 @@ // ------------------------------------------------------------------------------------------------- // -// Copyright (c) 2010 bbv Software Services AG. -// Copyright (c) 2010-2017 Ninject Contributors. -// Licensed under the Apache License, Version 2.0, and the Microsoft Public License (Ms-PL). +// 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.Web.Mvc/FilterBindingSyntax/IFilterBindingNamedSyntax.cs b/src/Ninject.Web.Mvc/FilterBindingSyntax/IFilterBindingNamedSyntax.cs index 193d428..5317290 100644 --- a/src/Ninject.Web.Mvc/FilterBindingSyntax/IFilterBindingNamedSyntax.cs +++ b/src/Ninject.Web.Mvc/FilterBindingSyntax/IFilterBindingNamedSyntax.cs @@ -1,8 +1,21 @@ // ------------------------------------------------------------------------------------------------- // -// Copyright (c) 2010 bbv Software Services AG. -// Copyright (c) 2010-2017 Ninject Contributors. -// Licensed under the Apache License, Version 2.0, and the Microsoft Public License (Ms-PL). +// 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.Web.Mvc/FilterBindingSyntax/IFilterBindingNamedWithOrOnSyntax.cs b/src/Ninject.Web.Mvc/FilterBindingSyntax/IFilterBindingNamedWithOrOnSyntax.cs index 2ee5c2d..a633edb 100644 --- a/src/Ninject.Web.Mvc/FilterBindingSyntax/IFilterBindingNamedWithOrOnSyntax.cs +++ b/src/Ninject.Web.Mvc/FilterBindingSyntax/IFilterBindingNamedWithOrOnSyntax.cs @@ -1,8 +1,21 @@ // ------------------------------------------------------------------------------------------------- // -// Copyright (c) 2010 bbv Software Services AG. -// Copyright (c) 2010-2017 Ninject Contributors. -// Licensed under the Apache License, Version 2.0, and the Microsoft Public License (Ms-PL). +// 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.Web.Mvc/FilterBindingSyntax/IFilterBindingOnSyntax.cs b/src/Ninject.Web.Mvc/FilterBindingSyntax/IFilterBindingOnSyntax.cs index fb48490..3a97c74 100644 --- a/src/Ninject.Web.Mvc/FilterBindingSyntax/IFilterBindingOnSyntax.cs +++ b/src/Ninject.Web.Mvc/FilterBindingSyntax/IFilterBindingOnSyntax.cs @@ -1,8 +1,21 @@ // ------------------------------------------------------------------------------------------------- // -// Copyright (c) 2010 bbv Software Services AG. -// Copyright (c) 2010-2017 Ninject Contributors. -// Licensed under the Apache License, Version 2.0, and the Microsoft Public License (Ms-PL). +// 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.Web.Mvc/FilterBindingSyntax/IFilterBindingWhenInNamedWithOrOnSyntax.cs b/src/Ninject.Web.Mvc/FilterBindingSyntax/IFilterBindingWhenInNamedWithOrOnSyntax.cs index b8fb4f4..4987cb3 100644 --- a/src/Ninject.Web.Mvc/FilterBindingSyntax/IFilterBindingWhenInNamedWithOrOnSyntax.cs +++ b/src/Ninject.Web.Mvc/FilterBindingSyntax/IFilterBindingWhenInNamedWithOrOnSyntax.cs @@ -1,8 +1,21 @@ // ------------------------------------------------------------------------------------------------- // -// Copyright (c) 2010 bbv Software Services AG. -// Copyright (c) 2010-2017 Ninject Contributors. -// Licensed under the Apache License, Version 2.0, and the Microsoft Public License (Ms-PL). +// 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.Web.Mvc/FilterBindingSyntax/IFilterBindingWhenSyntax.cs b/src/Ninject.Web.Mvc/FilterBindingSyntax/IFilterBindingWhenSyntax.cs index 0b27ed5..5295449 100644 --- a/src/Ninject.Web.Mvc/FilterBindingSyntax/IFilterBindingWhenSyntax.cs +++ b/src/Ninject.Web.Mvc/FilterBindingSyntax/IFilterBindingWhenSyntax.cs @@ -1,8 +1,21 @@ // ------------------------------------------------------------------------------------------------- // -// Copyright (c) 2010 bbv Software Services AG. -// Copyright (c) 2010-2017 Ninject Contributors. -// Licensed under the Apache License, Version 2.0, and the Microsoft Public License (Ms-PL). +// 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.Web.Mvc/FilterBindingSyntax/IFilterBindingWithOrOnSyntax.cs b/src/Ninject.Web.Mvc/FilterBindingSyntax/IFilterBindingWithOrOnSyntax.cs index 490d55e..1255150 100644 --- a/src/Ninject.Web.Mvc/FilterBindingSyntax/IFilterBindingWithOrOnSyntax.cs +++ b/src/Ninject.Web.Mvc/FilterBindingSyntax/IFilterBindingWithOrOnSyntax.cs @@ -1,8 +1,21 @@ // ------------------------------------------------------------------------------------------------- // -// Copyright (c) 2010 bbv Software Services AG. -// Copyright (c) 2010-2017 Ninject Contributors. -// Licensed under the Apache License, Version 2.0, and the Microsoft Public License (Ms-PL). +// 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.Web.Mvc/FilterBindingSyntax/IFilterBindingWithSyntax.cs b/src/Ninject.Web.Mvc/FilterBindingSyntax/IFilterBindingWithSyntax.cs index e6a97c4..375b223 100644 --- a/src/Ninject.Web.Mvc/FilterBindingSyntax/IFilterBindingWithSyntax.cs +++ b/src/Ninject.Web.Mvc/FilterBindingSyntax/IFilterBindingWithSyntax.cs @@ -1,8 +1,21 @@ // ------------------------------------------------------------------------------------------------- // -// Copyright (c) 2010 bbv Software Services AG. -// Copyright (c) 2010-2017 Ninject Contributors. -// Licensed under the Apache License, Version 2.0, and the Microsoft Public License (Ms-PL). +// 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.Web.Mvc/MvcModule.cs b/src/Ninject.Web.Mvc/MvcModule.cs index 07fb523..2689a61 100644 --- a/src/Ninject.Web.Mvc/MvcModule.cs +++ b/src/Ninject.Web.Mvc/MvcModule.cs @@ -1,8 +1,21 @@ // ------------------------------------------------------------------------------------------------- // -// Copyright (c) 2010 bbv Software Services AG. -// Copyright (c) 2010-2017 Ninject Contributors. -// Licensed under the Apache License, Version 2.0, and the Microsoft Public License (Ms-PL). +// 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.Web.Mvc/Ninject.Web.Mvc.csproj b/src/Ninject.Web.Mvc/Ninject.Web.Mvc.csproj index 1e03281..fa1f549 100644 --- a/src/Ninject.Web.Mvc/Ninject.Web.Mvc.csproj +++ b/src/Ninject.Web.Mvc/Ninject.Web.Mvc.csproj @@ -3,11 +3,11 @@ net45 0.0.0 - Remo Gloor, Ian Davis, Ninject Contributors + Ninject Project Contributors Ninject Project Contributors Ninject ASP.NET MVC Integration Extension for Ninject providing integration with ASP.NET MVC5 - 2010 bbv Software Services AG. 2010-2017 Ninject Contributors. + 2010 bbv Software Services AG. 2010-2017 Ninject Project Contributors. true ..\Ninject.snk true @@ -38,7 +38,7 @@ - + All diff --git a/src/Ninject.Web.Mvc/NinjectDependencyResolver.cs b/src/Ninject.Web.Mvc/NinjectDependencyResolver.cs index d1e096d..f7ca8d1 100644 --- a/src/Ninject.Web.Mvc/NinjectDependencyResolver.cs +++ b/src/Ninject.Web.Mvc/NinjectDependencyResolver.cs @@ -1,8 +1,21 @@ // ------------------------------------------------------------------------------------------------- // -// Copyright (c) 2010 bbv Software Services AG. -// Copyright (c) 2010-2017 Ninject Contributors. -// Licensed under the Apache License, Version 2.0, and the Microsoft Public License (Ms-PL). +// 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.Web.Mvc/NinjectMvcHttpApplicationPlugin.cs b/src/Ninject.Web.Mvc/NinjectMvcHttpApplicationPlugin.cs index f03f618..caec0fb 100644 --- a/src/Ninject.Web.Mvc/NinjectMvcHttpApplicationPlugin.cs +++ b/src/Ninject.Web.Mvc/NinjectMvcHttpApplicationPlugin.cs @@ -1,8 +1,21 @@ // ------------------------------------------------------------------------------------------------- // -// Copyright (c) 2010 bbv Software Services AG. -// Copyright (c) 2010-2017 Ninject Contributors. -// Licensed under the Apache License, Version 2.0, and the Microsoft Public License (Ms-PL). +// 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.Web.Mvc/Properties/AssemblyInfo.cs b/src/Ninject.Web.Mvc/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..a73dac7 --- /dev/null +++ b/src/Ninject.Web.Mvc/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.Web.Mvc/Validation/NinjectDataAnnotationsModelValidatorProvider.cs b/src/Ninject.Web.Mvc/Validation/NinjectDataAnnotationsModelValidatorProvider.cs index c23930a..7833a88 100644 --- a/src/Ninject.Web.Mvc/Validation/NinjectDataAnnotationsModelValidatorProvider.cs +++ b/src/Ninject.Web.Mvc/Validation/NinjectDataAnnotationsModelValidatorProvider.cs @@ -1,8 +1,21 @@ // ------------------------------------------------------------------------------------------------- // -// Copyright (c) 2010 bbv Software Services AG. -// Copyright (c) 2010-2017 Ninject Contributors. -// Licensed under the Apache License, Version 2.0, and the Microsoft Public License (Ms-PL). +// 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.Web.Mvc/stylecop.json b/src/Ninject.Web.Mvc/stylecop.json index 0046c2d..c4fa91c 100644 --- a/src/Ninject.Web.Mvc/stylecop.json +++ b/src/Ninject.Web.Mvc/stylecop.json @@ -3,7 +3,7 @@ "settings": { "documentationRules": { "companyName": "Ninject Project Contributors", - "copyrightText": " Copyright (c) 2010 bbv Software Services AG.\r\n Copyright (c) 2010-2017 Ninject Contributors.\r\n Licensed under the Apache License, Version 2.0, and the Microsoft Public License (Ms-PL).", + "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": { diff --git a/src/SampleApplication/SampleApplication.csproj b/src/SampleApplication/SampleApplication.csproj index d8ada22..cc56d24 100644 --- a/src/SampleApplication/SampleApplication.csproj +++ b/src/SampleApplication/SampleApplication.csproj @@ -51,14 +51,14 @@ ..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - ..\..\packages\Ninject.3.3.2-rc1\lib\net45\Ninject.dll + + ..\..\packages\Ninject.3.3.3\lib\net45\Ninject.dll - ..\..\packages\Ninject.Web.Common.3.3.0-beta1\lib\net45\Ninject.Web.Common.dll + ..\..\packages\Ninject.Web.Common.3.3.0\lib\net45\Ninject.Web.Common.dll - ..\..\packages\Ninject.Web.Common.WebHost.3.3.0-beta1\lib\net45\Ninject.Web.Common.WebHost.dll + ..\..\packages\Ninject.Web.Common.WebHost.3.3.0\lib\net45\Ninject.Web.Common.WebHost.dll diff --git a/src/SampleApplication/Web.config b/src/SampleApplication/Web.config index c3f38ff..6b22a05 100644 --- a/src/SampleApplication/Web.config +++ b/src/SampleApplication/Web.config @@ -1,21 +1,17 @@ - + - - + + - - - + + + - + - - + + - - + + - - - + + + - - - - - - + + + + + + - - + + - + - - + + - - + + - - + + + + + + diff --git a/src/SampleApplication/packages.config b/src/SampleApplication/packages.config index 5957b98..f26dd47 100644 --- a/src/SampleApplication/packages.config +++ b/src/SampleApplication/packages.config @@ -5,7 +5,7 @@ - - - + + + \ No newline at end of file