From 929b6bb2c0b482aeff9f2e3fa7f4242f50a5a87d Mon Sep 17 00:00:00 2001 From: Rob King Date: Fri, 4 Dec 2015 10:38:01 +0000 Subject: [PATCH] Moved Autofac to NuGet. Version change: None --- src/Orchard.Core.Tests/Orchard.Core.Tests.csproj | 6 +++--- src/Orchard.Core.Tests/packages.config | 1 + src/Orchard.Specs/Orchard.Specs.csproj | 6 +++--- src/Orchard.Specs/packages.config | 1 + .../Orchard.Tests.Modules.csproj | 6 +++--- src/Orchard.Tests.Modules/packages.config | 1 + src/Orchard.Tests/Orchard.Framework.Tests.csproj | 12 ++++++------ src/Orchard.Tests/packages.config | 2 ++ src/Orchard.Web.Tests/Orchard.Web.Tests.csproj | 13 +++++++------ src/Orchard.Web.Tests/packages.config | 2 ++ .../Orchard.ImportExport.csproj | 8 +++++--- .../Modules/Orchard.ImportExport/packages.config | 4 ++++ .../Modules/Orchard.Modules/Orchard.Modules.csproj | 9 ++++++--- .../Modules/Orchard.Modules/packages.config | 4 ++++ .../Orchard.MultiTenancy.csproj | 8 ++++++-- .../Modules/Orchard.MultiTenancy/packages.config | 4 ++++ .../Orchard.OutputCache/Orchard.OutputCache.csproj | 9 ++++++--- .../Modules/Orchard.OutputCache/packages.config | 4 ++++ .../Tests/Orchard.Projections.Tests.csproj | 5 +++-- .../Orchard.Projections/Tests/packages.config | 1 + .../Modules/Orchard.Recipes/Orchard.Recipes.csproj | 8 ++++++-- .../Modules/Orchard.Recipes/packages.config | 4 ++++ .../Modules/Orchard.Setup/Orchard.Setup.csproj | 9 ++++++--- .../Modules/Orchard.Setup/packages.config | 4 ++++ .../Orchard.TaskLease/Orchard.TaskLease.csproj | 9 ++++++--- .../Modules/Orchard.TaskLease/packages.config | 4 ++++ .../Tests/Orchard.Tokens.Tests.csproj | 6 +++--- .../Modules/Orchard.Tokens/Tests/packages.config | 1 + src/Orchard.Web/Orchard.Web.csproj | 10 +++++----- src/Orchard.Web/packages.config | 4 ++++ src/Orchard/Orchard.Framework.csproj | 11 +++++------ src/Orchard/packages.config | 5 +++++ 32 files changed, 125 insertions(+), 56 deletions(-) create mode 100644 src/Orchard.Web/Modules/Orchard.ImportExport/packages.config create mode 100644 src/Orchard.Web/Modules/Orchard.Modules/packages.config create mode 100644 src/Orchard.Web/Modules/Orchard.MultiTenancy/packages.config create mode 100644 src/Orchard.Web/Modules/Orchard.OutputCache/packages.config create mode 100644 src/Orchard.Web/Modules/Orchard.Recipes/packages.config create mode 100644 src/Orchard.Web/Modules/Orchard.Setup/packages.config create mode 100644 src/Orchard.Web/Modules/Orchard.TaskLease/packages.config create mode 100644 src/Orchard.Web/packages.config create mode 100644 src/Orchard/packages.config diff --git a/src/Orchard.Core.Tests/Orchard.Core.Tests.csproj b/src/Orchard.Core.Tests/Orchard.Core.Tests.csproj index ce428c7a2..3c056c2e4 100644 --- a/src/Orchard.Core.Tests/Orchard.Core.Tests.csproj +++ b/src/Orchard.Core.Tests/Orchard.Core.Tests.csproj @@ -57,9 +57,9 @@ false - - False - ..\..\lib\autofac\Autofac.dll + + ..\packages\Autofac.3.5.2\lib\net40\Autofac.dll + True False diff --git a/src/Orchard.Core.Tests/packages.config b/src/Orchard.Core.Tests/packages.config index 4c04439e8..54cc54da8 100644 --- a/src/Orchard.Core.Tests/packages.config +++ b/src/Orchard.Core.Tests/packages.config @@ -1,4 +1,5 @@  + \ No newline at end of file diff --git a/src/Orchard.Specs/Orchard.Specs.csproj b/src/Orchard.Specs/Orchard.Specs.csproj index f44bab1fe..65fc3402f 100644 --- a/src/Orchard.Specs/Orchard.Specs.csproj +++ b/src/Orchard.Specs/Orchard.Specs.csproj @@ -57,9 +57,9 @@ false - - False - ..\..\lib\autofac\Autofac.dll + + ..\packages\Autofac.3.5.2\lib\net40\Autofac.dll + True False diff --git a/src/Orchard.Specs/packages.config b/src/Orchard.Specs/packages.config index 4c04439e8..54cc54da8 100644 --- a/src/Orchard.Specs/packages.config +++ b/src/Orchard.Specs/packages.config @@ -1,4 +1,5 @@  + \ No newline at end of file diff --git a/src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj b/src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj index ca0481023..0526c68ef 100644 --- a/src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj +++ b/src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj @@ -57,9 +57,9 @@ false - - False - ..\..\lib\autofac\Autofac.dll + + ..\packages\Autofac.3.5.2\lib\net40\Autofac.dll + True False diff --git a/src/Orchard.Tests.Modules/packages.config b/src/Orchard.Tests.Modules/packages.config index 4c04439e8..54cc54da8 100644 --- a/src/Orchard.Tests.Modules/packages.config +++ b/src/Orchard.Tests.Modules/packages.config @@ -1,4 +1,5 @@  + \ 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 8500308d5..d17342829 100644 --- a/src/Orchard.Tests/Orchard.Framework.Tests.csproj +++ b/src/Orchard.Tests/Orchard.Framework.Tests.csproj @@ -57,13 +57,13 @@ false - - False - ..\..\lib\autofac\Autofac.dll + + ..\packages\Autofac.3.5.2\lib\net40\Autofac.dll + True - - False - ..\..\lib\autofac\Autofac.Integration.Web.dll + + ..\packages\Autofac.Web.3.2.0\lib\net40\Autofac.Integration.Web.dll + True False diff --git a/src/Orchard.Tests/packages.config b/src/Orchard.Tests/packages.config index 4c04439e8..1ce9c1c12 100644 --- a/src/Orchard.Tests/packages.config +++ b/src/Orchard.Tests/packages.config @@ -1,4 +1,6 @@  + + \ No newline at end of file diff --git a/src/Orchard.Web.Tests/Orchard.Web.Tests.csproj b/src/Orchard.Web.Tests/Orchard.Web.Tests.csproj index 7a17b4aa9..3367683bd 100644 --- a/src/Orchard.Web.Tests/Orchard.Web.Tests.csproj +++ b/src/Orchard.Web.Tests/Orchard.Web.Tests.csproj @@ -56,13 +56,14 @@ false - - False - ..\..\lib\autofac\Autofac.dll + + ..\packages\Autofac.3.5.2\lib\net40\Autofac.dll + True + + + ..\packages\Autofac.Web.3.2.0\lib\net40\Autofac.Integration.Web.dll + True - - False - ..\..\lib\autofac\Autofac.Integration.Web.dll ..\packages\NUnit.2.5.10.11092\lib\nunit.framework.dll diff --git a/src/Orchard.Web.Tests/packages.config b/src/Orchard.Web.Tests/packages.config index 4c04439e8..1ce9c1c12 100644 --- a/src/Orchard.Web.Tests/packages.config +++ b/src/Orchard.Web.Tests/packages.config @@ -1,4 +1,6 @@  + + \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.ImportExport/Orchard.ImportExport.csproj b/src/Orchard.Web/Modules/Orchard.ImportExport/Orchard.ImportExport.csproj index df4c6767f..bd0f118d2 100644 --- a/src/Orchard.Web/Modules/Orchard.ImportExport/Orchard.ImportExport.csproj +++ b/src/Orchard.Web/Modules/Orchard.ImportExport/Orchard.ImportExport.csproj @@ -49,8 +49,8 @@ - False - ..\..\..\..\lib\autofac\Autofac.dll + ..\..\..\packages\Autofac.3.5.2\lib\net40\Autofac.dll + True @@ -158,7 +158,9 @@ - + + + diff --git a/src/Orchard.Web/Modules/Orchard.ImportExport/packages.config b/src/Orchard.Web/Modules/Orchard.ImportExport/packages.config new file mode 100644 index 000000000..1ce1a9759 --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.ImportExport/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Orchard.Modules.csproj b/src/Orchard.Web/Modules/Orchard.Modules/Orchard.Modules.csproj index 01e033910..856ee8516 100644 --- a/src/Orchard.Web/Modules/Orchard.Modules/Orchard.Modules.csproj +++ b/src/Orchard.Web/Modules/Orchard.Modules/Orchard.Modules.csproj @@ -49,9 +49,9 @@ false - - False - ..\..\..\..\lib\autofac\Autofac.dll + + ..\..\..\packages\Autofac.3.5.2\lib\net40\Autofac.dll + True @@ -166,6 +166,9 @@ + + + 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) diff --git a/src/Orchard.Web/Modules/Orchard.Modules/packages.config b/src/Orchard.Web/Modules/Orchard.Modules/packages.config new file mode 100644 index 000000000..1ce1a9759 --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.Modules/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Orchard.MultiTenancy.csproj b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Orchard.MultiTenancy.csproj index 3fc0ac7b3..879c887eb 100644 --- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Orchard.MultiTenancy.csproj +++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Orchard.MultiTenancy.csproj @@ -49,8 +49,9 @@ false - - ..\..\..\..\lib\autofac\Autofac.dll + + ..\..\..\packages\Autofac.3.5.2\lib\net40\Autofac.dll + True ..\..\..\..\lib\nhibernate\NHibernate.dll @@ -135,6 +136,9 @@ + + + 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/packages.config b/src/Orchard.Web/Modules/Orchard.MultiTenancy/packages.config new file mode 100644 index 000000000..1ce1a9759 --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.OutputCache/Orchard.OutputCache.csproj b/src/Orchard.Web/Modules/Orchard.OutputCache/Orchard.OutputCache.csproj index dfc148b68..72f84ea6d 100644 --- a/src/Orchard.Web/Modules/Orchard.OutputCache/Orchard.OutputCache.csproj +++ b/src/Orchard.Web/Modules/Orchard.OutputCache/Orchard.OutputCache.csproj @@ -49,9 +49,9 @@ false - - False - ..\..\..\..\lib\autofac\Autofac.dll + + ..\..\..\packages\Autofac.3.5.2\lib\net40\Autofac.dll + True @@ -133,6 +133,9 @@ + + + 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) diff --git a/src/Orchard.Web/Modules/Orchard.OutputCache/packages.config b/src/Orchard.Web/Modules/Orchard.OutputCache/packages.config new file mode 100644 index 000000000..1ce1a9759 --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.OutputCache/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Projections/Tests/Orchard.Projections.Tests.csproj b/src/Orchard.Web/Modules/Orchard.Projections/Tests/Orchard.Projections.Tests.csproj index 1adf3a1c3..f9eec03bc 100644 --- a/src/Orchard.Web/Modules/Orchard.Projections/Tests/Orchard.Projections.Tests.csproj +++ b/src/Orchard.Web/Modules/Orchard.Projections/Tests/Orchard.Projections.Tests.csproj @@ -35,8 +35,9 @@ false - - ..\..\..\..\..\lib\autofac\Autofac.dll + + ..\..\..\..\packages\Autofac.3.5.2\lib\net40\Autofac.dll + True False diff --git a/src/Orchard.Web/Modules/Orchard.Projections/Tests/packages.config b/src/Orchard.Web/Modules/Orchard.Projections/Tests/packages.config index 4c04439e8..54cc54da8 100644 --- a/src/Orchard.Web/Modules/Orchard.Projections/Tests/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Projections/Tests/packages.config @@ -1,4 +1,5 @@  + \ 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 f45f6bd67..ceb68f1e4 100644 --- a/src/Orchard.Web/Modules/Orchard.Recipes/Orchard.Recipes.csproj +++ b/src/Orchard.Web/Modules/Orchard.Recipes/Orchard.Recipes.csproj @@ -48,8 +48,9 @@ false - - ..\..\..\..\lib\autofac\Autofac.dll + + ..\..\..\packages\Autofac.3.5.2\lib\net40\Autofac.dll + True ..\..\..\..\lib\log4net\log4net.dll @@ -150,6 +151,9 @@ + + + 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) diff --git a/src/Orchard.Web/Modules/Orchard.Recipes/packages.config b/src/Orchard.Web/Modules/Orchard.Recipes/packages.config new file mode 100644 index 000000000..1ce1a9759 --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.Recipes/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Orchard.Setup.csproj b/src/Orchard.Web/Modules/Orchard.Setup/Orchard.Setup.csproj index 8f1f75660..4bd4d867c 100644 --- a/src/Orchard.Web/Modules/Orchard.Setup/Orchard.Setup.csproj +++ b/src/Orchard.Web/Modules/Orchard.Setup/Orchard.Setup.csproj @@ -49,9 +49,9 @@ false - - False - ..\..\..\..\lib\autofac\Autofac.dll + + ..\..\..\packages\Autofac.3.5.2\lib\net40\Autofac.dll + True @@ -137,6 +137,9 @@ + + + 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) diff --git a/src/Orchard.Web/Modules/Orchard.Setup/packages.config b/src/Orchard.Web/Modules/Orchard.Setup/packages.config new file mode 100644 index 000000000..1ce1a9759 --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.Setup/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.TaskLease/Orchard.TaskLease.csproj b/src/Orchard.Web/Modules/Orchard.TaskLease/Orchard.TaskLease.csproj index 954b16270..e205eb83b 100644 --- a/src/Orchard.Web/Modules/Orchard.TaskLease/Orchard.TaskLease.csproj +++ b/src/Orchard.Web/Modules/Orchard.TaskLease/Orchard.TaskLease.csproj @@ -49,8 +49,9 @@ false - - ..\..\..\..\lib\autofac\Autofac.dll + + ..\..\..\packages\Autofac.3.5.2\lib\net40\Autofac.dll + True @@ -87,7 +88,9 @@ - + + + {2D1D92BB-4555-4CBE-8D0E-63563D6CE4C6} diff --git a/src/Orchard.Web/Modules/Orchard.TaskLease/packages.config b/src/Orchard.Web/Modules/Orchard.TaskLease/packages.config new file mode 100644 index 000000000..1ce1a9759 --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.TaskLease/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Tokens/Tests/Orchard.Tokens.Tests.csproj b/src/Orchard.Web/Modules/Orchard.Tokens/Tests/Orchard.Tokens.Tests.csproj index ad0d3140f..78f2a5298 100644 --- a/src/Orchard.Web/Modules/Orchard.Tokens/Tests/Orchard.Tokens.Tests.csproj +++ b/src/Orchard.Web/Modules/Orchard.Tokens/Tests/Orchard.Tokens.Tests.csproj @@ -35,9 +35,9 @@ false - - False - ..\..\..\..\..\lib\autofac\Autofac.dll + + ..\..\..\..\packages\Autofac.3.5.2\lib\net40\Autofac.dll + True ..\..\..\..\packages\NUnit.2.5.10.11092\lib\nunit.framework.dll diff --git a/src/Orchard.Web/Modules/Orchard.Tokens/Tests/packages.config b/src/Orchard.Web/Modules/Orchard.Tokens/Tests/packages.config index 4c04439e8..54cc54da8 100644 --- a/src/Orchard.Web/Modules/Orchard.Tokens/Tests/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Tokens/Tests/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 be718bb33..bf530f748 100644 --- a/src/Orchard.Web/Orchard.Web.csproj +++ b/src/Orchard.Web/Orchard.Web.csproj @@ -48,9 +48,8 @@ false - - False - ..\..\lib\autofac\Autofac.dll + + ..\packages\Autofac.3.5.2\lib\net40\Autofac.dll True @@ -172,6 +171,7 @@ + Web.config @@ -287,5 +287,5 @@ --> - - + + \ No newline at end of file diff --git a/src/Orchard.Web/packages.config b/src/Orchard.Web/packages.config new file mode 100644 index 000000000..1ce1a9759 --- /dev/null +++ b/src/Orchard.Web/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/src/Orchard/Orchard.Framework.csproj b/src/Orchard/Orchard.Framework.csproj index 93d44dbdb..449b64d22 100644 --- a/src/Orchard/Orchard.Framework.csproj +++ b/src/Orchard/Orchard.Framework.csproj @@ -59,14 +59,12 @@ 0436 - - False - ..\..\lib\autofac\Autofac.dll + + ..\packages\Autofac.3.5.2\lib\net40\Autofac.dll True - - False - ..\..\lib\autofac\Autofac.Configuration.dll + + ..\packages\Autofac.Configuration.3.3.0\lib\net40\Autofac.Configuration.dll True @@ -1037,6 +1035,7 @@ + diff --git a/src/Orchard/packages.config b/src/Orchard/packages.config new file mode 100644 index 000000000..645966231 --- /dev/null +++ b/src/Orchard/packages.config @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file