diff --git a/src/Orchard.Specs/Orchard.Specs.csproj b/src/Orchard.Specs/Orchard.Specs.csproj index 3aafa4015..f7bd3da72 100644 --- a/src/Orchard.Specs/Orchard.Specs.csproj +++ b/src/Orchard.Specs/Orchard.Specs.csproj @@ -81,8 +81,9 @@ False ..\..\lib\nhibernate\Iesi.Collections.dll - - ..\..\lib\log4net\log4net.dll + + ..\packages\log4net.2.0.3\lib\net40-full\log4net.dll + True False diff --git a/src/Orchard.Specs/packages.config b/src/Orchard.Specs/packages.config index c37c4e01a..405c1fc94 100644 --- a/src/Orchard.Specs/packages.config +++ b/src/Orchard.Specs/packages.config @@ -3,5 +3,6 @@ + \ No newline at end of file diff --git a/src/Orchard.Tests/Orchard.Framework.Tests.csproj b/src/Orchard.Tests/Orchard.Framework.Tests.csproj index 34e8b2e09..6da44451d 100644 --- a/src/Orchard.Tests/Orchard.Framework.Tests.csproj +++ b/src/Orchard.Tests/Orchard.Framework.Tests.csproj @@ -89,9 +89,9 @@ ..\packages\IronRuby.1.1.3\lib\IronRuby.Libraries.Yaml.dll True - - False - ..\..\lib\log4net\log4net.dll + + ..\packages\log4net.2.0.3\lib\net40-full\log4net.dll + True diff --git a/src/Orchard.Tests/packages.config b/src/Orchard.Tests/packages.config index 790982802..36c23ce4d 100644 --- a/src/Orchard.Tests/packages.config +++ b/src/Orchard.Tests/packages.config @@ -4,5 +4,6 @@ + \ No newline at end of file diff --git a/src/Orchard.Web/Core/Web.config b/src/Orchard.Web/Core/Web.config index 9f3e353cc..5bfa41573 100644 --- a/src/Orchard.Web/Core/Web.config +++ b/src/Orchard.Web/Core/Web.config @@ -1,58 +1,74 @@ - - - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Azure/Orchard.Azure.csproj b/src/Orchard.Web/Modules/Orchard.Azure/Orchard.Azure.csproj index cac191eab..6c3eb0521 100644 --- a/src/Orchard.Web/Modules/Orchard.Azure/Orchard.Azure.csproj +++ b/src/Orchard.Web/Modules/Orchard.Azure/Orchard.Azure.csproj @@ -48,9 +48,9 @@ false - - False - ..\..\..\..\lib\log4net\log4net.dll + + ..\..\..\packages\log4net.2.0.3\lib\net40-full\log4net.dll + True False @@ -137,6 +137,9 @@ + + + 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) diff --git a/src/Orchard.Web/Modules/Orchard.Azure/packages.config b/src/Orchard.Web/Modules/Orchard.Azure/packages.config new file mode 100644 index 000000000..8ec03b3bc --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.Azure/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Recipes/Orchard.Recipes.csproj b/src/Orchard.Web/Modules/Orchard.Recipes/Orchard.Recipes.csproj index ceb68f1e4..e64eee60c 100644 --- a/src/Orchard.Web/Modules/Orchard.Recipes/Orchard.Recipes.csproj +++ b/src/Orchard.Web/Modules/Orchard.Recipes/Orchard.Recipes.csproj @@ -52,8 +52,9 @@ ..\..\..\packages\Autofac.3.5.2\lib\net40\Autofac.dll True - - ..\..\..\..\lib\log4net\log4net.dll + + ..\..\..\packages\log4net.2.0.3\lib\net40-full\log4net.dll + True diff --git a/src/Orchard.Web/Modules/Orchard.Recipes/packages.config b/src/Orchard.Web/Modules/Orchard.Recipes/packages.config index 1ce1a9759..d20fc0037 100644 --- a/src/Orchard.Web/Modules/Orchard.Recipes/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Recipes/packages.config @@ -1,4 +1,5 @@  + \ No newline at end of file diff --git a/src/Orchard.Web/Orchard.Web.csproj b/src/Orchard.Web/Orchard.Web.csproj index bf530f748..54846e3d4 100644 --- a/src/Orchard.Web/Orchard.Web.csproj +++ b/src/Orchard.Web/Orchard.Web.csproj @@ -52,6 +52,10 @@ ..\packages\Autofac.3.5.2\lib\net40\Autofac.dll True + + ..\packages\log4net.2.0.3\lib\net40-full\log4net.dll + True + ..\..\lib\owin\Microsoft.Owin.Host.SystemWeb.dll diff --git a/src/Orchard.Web/packages.config b/src/Orchard.Web/packages.config index 1ce1a9759..d20fc0037 100644 --- a/src/Orchard.Web/packages.config +++ b/src/Orchard.Web/packages.config @@ -1,4 +1,5 @@  + \ No newline at end of file diff --git a/src/Orchard/Orchard.Framework.csproj b/src/Orchard/Orchard.Framework.csproj index 27c6a40e0..6f605606a 100644 --- a/src/Orchard/Orchard.Framework.csproj +++ b/src/Orchard/Orchard.Framework.csproj @@ -79,8 +79,9 @@ False ..\..\lib\nhibernate\Iesi.Collections.dll - - ..\..\lib\log4net\log4net.dll + + ..\packages\log4net.2.0.3\lib\net40-full\log4net.dll + True diff --git a/src/Orchard/packages.config b/src/Orchard/packages.config index 96e297654..82a735183 100644 --- a/src/Orchard/packages.config +++ b/src/Orchard/packages.config @@ -3,4 +3,5 @@ + \ No newline at end of file