diff --git a/src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj b/src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj index 82f1283f5..89c1ab081 100644 --- a/src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj +++ b/src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj @@ -79,21 +79,30 @@ ..\..\lib\dotnetzip\Ionic.Zip.dll - - False - ..\..\lib\dlr\IronRuby.dll + + ..\packages\IronRuby.1.1.3\lib\IronRuby.dll + True - - ..\..\lib\dlr\IronRuby.Libraries.dll + + ..\packages\IronRuby.1.1.3\lib\IronRuby.Libraries.dll + True + + + ..\packages\IronRuby.1.1.3\lib\IronRuby.Libraries.Yaml.dll + True - - False - ..\..\lib\dlr\Microsoft.Dynamic.dll + + ..\packages\IronRuby.1.1.3\lib\Microsoft.Dynamic.dll + True - - False - ..\..\lib\dlr\Microsoft.Scripting.dll + + ..\packages\IronRuby.1.1.3\lib\Microsoft.Scripting.dll + True + + + ..\packages\IronRuby.1.1.3\lib\Microsoft.Scripting.Metadata.dll + True False diff --git a/src/Orchard.Tests.Modules/packages.config b/src/Orchard.Tests.Modules/packages.config index 6b0442ac0..6b0549992 100644 --- a/src/Orchard.Tests.Modules/packages.config +++ b/src/Orchard.Tests.Modules/packages.config @@ -2,5 +2,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 09c702402..34e8b2e09 100644 --- a/src/Orchard.Tests/Orchard.Framework.Tests.csproj +++ b/src/Orchard.Tests/Orchard.Framework.Tests.csproj @@ -77,24 +77,34 @@ False ..\..\lib\nhibernate\Iesi.Collections.dll - - False - ..\..\lib\dlr\IronRuby.dll + + ..\packages\IronRuby.1.1.3\lib\IronRuby.dll + True - - ..\..\lib\dlr\IronRuby.Libraries.dll + + ..\packages\IronRuby.1.1.3\lib\IronRuby.Libraries.dll + True + + + ..\packages\IronRuby.1.1.3\lib\IronRuby.Libraries.Yaml.dll + True False ..\..\lib\log4net\log4net.dll - - False - ..\..\lib\dlr\Microsoft.Dynamic.dll + + ..\packages\IronRuby.1.1.3\lib\Microsoft.Dynamic.dll + True - - ..\..\lib\dlr\Microsoft.Scripting.dll + + ..\packages\IronRuby.1.1.3\lib\Microsoft.Scripting.dll + True + + + ..\packages\IronRuby.1.1.3\lib\Microsoft.Scripting.Metadata.dll + True False diff --git a/src/Orchard.Tests/packages.config b/src/Orchard.Tests/packages.config index b45428194..790982802 100644 --- a/src/Orchard.Tests/packages.config +++ b/src/Orchard.Tests/packages.config @@ -3,5 +3,6 @@ + \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Scripting.Dlr/Orchard.Scripting.Dlr.csproj b/src/Orchard.Web/Modules/Orchard.Scripting.Dlr/Orchard.Scripting.Dlr.csproj index 63242c26d..ee7fb8769 100644 --- a/src/Orchard.Web/Modules/Orchard.Scripting.Dlr/Orchard.Scripting.Dlr.csproj +++ b/src/Orchard.Web/Modules/Orchard.Scripting.Dlr/Orchard.Scripting.Dlr.csproj @@ -48,25 +48,29 @@ false - - False - ..\..\..\..\lib\dlr\IronRuby.dll + + ..\..\..\packages\IronRuby.1.1.3\lib\IronRuby.dll True - - False - ..\..\..\..\lib\dlr\IronRuby.Libraries.dll + + ..\..\..\packages\IronRuby.1.1.3\lib\IronRuby.Libraries.dll + True + + + ..\..\..\packages\IronRuby.1.1.3\lib\IronRuby.Libraries.Yaml.dll True - - False - ..\..\..\..\lib\dlr\Microsoft.Dynamic.dll + + ..\..\..\packages\IronRuby.1.1.3\lib\Microsoft.Dynamic.dll True - - False - ..\..\..\..\lib\dlr\Microsoft.Scripting.dll + + ..\..\..\packages\IronRuby.1.1.3\lib\Microsoft.Scripting.dll + True + + + ..\..\..\packages\IronRuby.1.1.3\lib\Microsoft.Scripting.Metadata.dll True @@ -106,6 +110,9 @@ + + + 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) diff --git a/src/Orchard.Web/Modules/Orchard.Scripting.Dlr/packages.config b/src/Orchard.Web/Modules/Orchard.Scripting.Dlr/packages.config new file mode 100644 index 000000000..b5a48f4e1 --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.Scripting.Dlr/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file