From 030c93be8efae5462ee3428a82ef1c1e2feb08b8 Mon Sep 17 00:00:00 2001 From: Renaud Paquay Date: Thu, 6 May 2010 10:28:29 -0700 Subject: [PATCH] Convert solution/projects to dev10 and target .net 40 --HG-- branch : net40 --- .hgignore | 1 + .../Orchard.Core.Tests.csproj | 40 ++- src/Orchard.Specs/Orchard.Specs.csproj | 40 ++- .../Orchard.Tests.Modules.csproj | 40 ++- .../Orchard.Framework.Tests.csproj | 40 ++- .../Orchard.Web.Tests.csproj | 40 ++- src/Orchard.Web/Core/Orchard.Core.csproj | 27 +- src/Orchard.Web/Core/Web.config | 171 ++++-------- .../Futures.Widgets/Futures.Widgets.csproj | 24 +- .../Modules/Futures.Widgets/Web.config | 171 ++++-------- .../Orchard.Blogs/Orchard.Blogs.csproj | 30 ++- .../Modules/Orchard.Blogs/Web.config | 171 ++++-------- .../Orchard.Comments/Orchard.Comments.csproj | 30 ++- .../Modules/Orchard.Comments/Web.config | 178 ++++--------- .../Orchard.DevTools/Orchard.DevTools.csproj | 30 ++- .../Modules/Orchard.DevTools/Web.config | 178 ++++--------- .../Orchard.Media/Orchard.Media.csproj | 30 ++- .../Modules/Orchard.Media/Web.config | 178 ++++--------- .../Orchard.Modules/Orchard.Modules.csproj | 30 ++- .../Modules/Orchard.Modules/Web.config | 164 +++--------- .../Orchard.MultiTenancy.csproj | 30 ++- .../Modules/Orchard.MultiTenancy/Web.config | 167 +++--------- .../Orchard.Pages/Orchard.Pages.csproj | 30 ++- .../Modules/Orchard.Pages/Web.config | 173 ++++--------- .../Orchard.Roles/Orchard.Roles.csproj | 30 ++- .../Modules/Orchard.Roles/Web.config | 171 ++++-------- .../Orchard.Sandbox/Orchard.Sandbox.csproj | 30 ++- .../Modules/Orchard.Sandbox/Web.config | 171 ++++-------- .../Orchard.Setup/Orchard.Setup.csproj | 30 ++- .../Modules/Orchard.Setup/Web.config | 171 ++++-------- .../Modules/Orchard.Tags/Orchard.Tags.csproj | 30 ++- .../Modules/Orchard.Tags/Web.config | 178 ++++--------- .../Orchard.Themes/Orchard.Themes.csproj | 30 ++- .../Modules/Orchard.Themes/Web.config | 164 +++--------- .../Orchard.Users/Orchard.Users.csproj | 30 ++- .../Modules/Orchard.Users/Web.config | 171 ++++-------- .../Modules/TinyMce/TinyMce.csproj | 30 ++- src/Orchard.Web/Modules/TinyMce/Web.config | 171 ++++-------- src/Orchard.Web/Orchard.Web.csproj | 30 ++- src/Orchard.Web/Web.config | 245 ++++++------------ src/Orchard.sln | 30 +-- src/Orchard/Orchard.Framework.csproj | 40 ++- .../MSBuild.Orchard.Tasks.Tests.csproj | 40 ++- .../MSBuild.Orchard.Tasks.csproj | 40 ++- src/Tools/Orchard/Orchard.csproj | 40 ++- 45 files changed, 1477 insertions(+), 2408 deletions(-) diff --git a/.hgignore b/.hgignore index 0e4e5c05c..d0f7a0069 100644 --- a/.hgignore +++ b/.hgignore @@ -13,3 +13,4 @@ glob:src/Orchard.Web/Modules/Orchard.Sandbox/Module.txt glob:src/Orchard.Web/Media/* glob:desktop.ini glob:src/Orchard.Azure.suo +glob:src/Orchard.5.0.ReSharper diff --git a/src/Orchard.Core.Tests/Orchard.Core.Tests.csproj b/src/Orchard.Core.Tests/Orchard.Core.Tests.csproj index 7eb333c40..dd8b3e05c 100644 --- a/src/Orchard.Core.Tests/Orchard.Core.Tests.csproj +++ b/src/Orchard.Core.Tests/Orchard.Core.Tests.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -12,6 +12,25 @@ Orchard.Core.Tests v3.5 512 + + + 3.5 + + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true true @@ -21,6 +40,7 @@ DEBUG;TRACE prompt 4 + AllRules.ruleset pdbonly @@ -29,6 +49,7 @@ TRACE prompt 4 + AllRules.ruleset @@ -101,6 +122,23 @@ Orchard.Framework + + + False + .NET Framework 3.5 SP1 Client Profile + false + + + False + .NET Framework 3.5 SP1 + true + + + False + Windows Installer 3.1 + true + + - - - - -
- -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Futures.Widgets/Futures.Widgets.csproj b/src/Orchard.Web/Modules/Futures.Widgets/Futures.Widgets.csproj index f8d211b90..b4442b16c 100644 --- a/src/Orchard.Web/Modules/Futures.Widgets/Futures.Widgets.csproj +++ b/src/Orchard.Web/Modules/Futures.Widgets/Futures.Widgets.csproj @@ -1,4 +1,5 @@ - + + Debug AnyCPU @@ -10,8 +11,13 @@ Properties Futures.Widgets Futures.Widgets - v3.5 + v4.0 false + + + 3.5 + + true @@ -21,6 +27,7 @@ DEBUG;TRACE prompt 4 + AllRules.ruleset pdbonly @@ -29,22 +36,25 @@ TRACE prompt 4 + AllRules.ruleset - - 3.5 - + + + + + False ..\..\..\..\lib\aspnetmvc\System.Web.Mvc.dll - + @@ -75,7 +85,7 @@ - + - - - - -
- -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj b/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj index b6bbd7bf5..ffe487a97 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj @@ -1,4 +1,5 @@ - + + Debug AnyCPU @@ -10,8 +11,13 @@ Properties Orchard.Blogs Orchard.Blogs - v3.5 + v4.0 false + + + 3.5 + + true @@ -21,6 +27,7 @@ DEBUG;TRACE prompt 4 + AllRules.ruleset pdbonly @@ -29,6 +36,7 @@ TRACE prompt 4 + AllRules.ruleset @@ -36,22 +44,17 @@ 3.5 - - 3.5 - - - 3.5 - + + + + + False ..\..\..\..\lib\aspnetmvc\System.Web.Mvc.dll - - 3.5 - - @@ -59,6 +62,7 @@ + @@ -179,7 +183,7 @@ - + - - - - -
- -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Orchard.Comments.csproj b/src/Orchard.Web/Modules/Orchard.Comments/Orchard.Comments.csproj index 065c4ae21..391eb11c5 100644 --- a/src/Orchard.Web/Modules/Orchard.Comments/Orchard.Comments.csproj +++ b/src/Orchard.Web/Modules/Orchard.Comments/Orchard.Comments.csproj @@ -1,4 +1,5 @@ - + + Debug AnyCPU @@ -10,8 +11,13 @@ Properties Orchard.Comments Orchard.Comments - v3.5 + v4.0 false + + + 3.5 + + true @@ -21,6 +27,7 @@ DEBUG;TRACE prompt 4 + AllRules.ruleset pdbonly @@ -29,6 +36,7 @@ TRACE prompt 4 + AllRules.ruleset @@ -40,22 +48,17 @@ 3.5 - - 3.5 - - - 3.5 - + + + + + False ..\..\..\..\lib\aspnetmvc\System.Web.Mvc.dll - - 3.5 - - @@ -63,6 +66,7 @@ + @@ -127,7 +131,7 @@ - + - - - - -
- -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/Orchard.DevTools.csproj b/src/Orchard.Web/Modules/Orchard.DevTools/Orchard.DevTools.csproj index 068425dae..b6061e236 100644 --- a/src/Orchard.Web/Modules/Orchard.DevTools/Orchard.DevTools.csproj +++ b/src/Orchard.Web/Modules/Orchard.DevTools/Orchard.DevTools.csproj @@ -1,4 +1,5 @@ - + + Debug AnyCPU @@ -10,8 +11,13 @@ Properties Orchard.DevTools Orchard.DevTools - v3.5 + v4.0 false + + + 3.5 + + true @@ -21,6 +27,7 @@ DEBUG;TRACE prompt 4 + AllRules.ruleset pdbonly @@ -29,6 +36,7 @@ TRACE prompt 4 + AllRules.ruleset @@ -40,22 +48,17 @@ 3.5 - - 3.5 - - - 3.5 - + + + + + False ..\..\..\..\lib\aspnetmvc\System.Web.Mvc.dll - - 3.5 - - @@ -63,6 +66,7 @@ + @@ -96,7 +100,7 @@ - + - - - - -
- -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Media/Orchard.Media.csproj b/src/Orchard.Web/Modules/Orchard.Media/Orchard.Media.csproj index 45ab37910..9c6082b22 100644 --- a/src/Orchard.Web/Modules/Orchard.Media/Orchard.Media.csproj +++ b/src/Orchard.Web/Modules/Orchard.Media/Orchard.Media.csproj @@ -1,4 +1,5 @@ - + + Debug AnyCPU @@ -10,8 +11,13 @@ Properties Orchard.Media Orchard.Media - v3.5 + v4.0 false + + + 3.5 + + true @@ -21,6 +27,7 @@ DEBUG;TRACE prompt 4 + AllRules.ruleset pdbonly @@ -29,6 +36,7 @@ TRACE prompt 4 + AllRules.ruleset @@ -40,22 +48,17 @@ 3.5 - - 3.5 - - - 3.5 - + + + + + False ..\..\..\..\lib\aspnetmvc\System.Web.Mvc.dll - - 3.5 - - @@ -63,6 +66,7 @@ + @@ -111,7 +115,7 @@ - + - - - - -
- -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ 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 15dc4894a..6f46fd3df 100644 --- a/src/Orchard.Web/Modules/Orchard.Modules/Orchard.Modules.csproj +++ b/src/Orchard.Web/Modules/Orchard.Modules/Orchard.Modules.csproj @@ -1,4 +1,5 @@ - + + Debug AnyCPU @@ -10,8 +11,13 @@ Properties Orchard.Modules Orchard.Modules - v3.5 + v4.0 false + + + 3.5 + + true @@ -21,6 +27,7 @@ DEBUG;TRACE prompt 4 + AllRules.ruleset pdbonly @@ -29,6 +36,7 @@ TRACE prompt 4 + AllRules.ruleset @@ -36,22 +44,17 @@ 3.5 - - 3.5 - - - 3.5 - + + + + + False ..\..\..\..\lib\aspnetmvc\System.Web.Mvc.dll - - 3.5 - - @@ -59,6 +62,7 @@ + @@ -95,7 +99,7 @@ - + - - - - -
- -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ 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 b94684a61..d5c698117 100644 --- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Orchard.MultiTenancy.csproj +++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Orchard.MultiTenancy.csproj @@ -1,4 +1,5 @@ - + + Debug AnyCPU @@ -10,8 +11,13 @@ Properties Orchard.MultiTenancy Orchard.MultiTenancy - v3.5 + v4.0 false + + + 3.5 + + true @@ -21,6 +27,7 @@ DEBUG;TRACE prompt 4 + AllRules.ruleset pdbonly @@ -29,6 +36,7 @@ TRACE prompt 4 + AllRules.ruleset @@ -36,21 +44,16 @@ 3.5 - - 3.5 - - - 3.5 - + + + + + False ..\..\..\..\lib\aspnetmvc\System.Web.Mvc.dll - - 3.5 - - @@ -58,6 +61,7 @@ + @@ -84,7 +88,7 @@ - + - - - - -
- -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Pages/Orchard.Pages.csproj b/src/Orchard.Web/Modules/Orchard.Pages/Orchard.Pages.csproj index ceb8dba5b..056bde59d 100644 --- a/src/Orchard.Web/Modules/Orchard.Pages/Orchard.Pages.csproj +++ b/src/Orchard.Web/Modules/Orchard.Pages/Orchard.Pages.csproj @@ -1,4 +1,5 @@ - + + Debug AnyCPU @@ -10,8 +11,13 @@ Properties Orchard.Pages Orchard.Pages - v3.5 + v4.0 false + + + 3.5 + + true @@ -21,6 +27,7 @@ DEBUG;TRACE prompt 4 + AllRules.ruleset pdbonly @@ -29,6 +36,7 @@ TRACE prompt 4 + AllRules.ruleset @@ -36,22 +44,17 @@ 3.5 - - 3.5 - - - 3.5 - + + + + + False ..\..\..\..\lib\aspnetmvc\System.Web.Mvc.dll - - 3.5 - - @@ -59,6 +62,7 @@ + False ..\..\..\..\lib\yaml\Yaml.dll @@ -141,7 +145,7 @@ - + - - - - -
- -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj b/src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj index 6a8458af7..71908c00b 100644 --- a/src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj +++ b/src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj @@ -1,4 +1,5 @@ - + + Debug AnyCPU @@ -10,8 +11,13 @@ Properties Orchard.Roles Orchard.Roles - v3.5 + v4.0 false + + + 3.5 + + true @@ -21,6 +27,7 @@ DEBUG;TRACE prompt 4 + AllRules.ruleset pdbonly @@ -29,6 +36,7 @@ TRACE prompt 4 + AllRules.ruleset @@ -36,22 +44,17 @@ 3.5 - - 3.5 - - - 3.5 - + + + + + False ..\..\..\..\lib\aspnetmvc\System.Web.Mvc.dll - - 3.5 - - @@ -59,6 +62,7 @@ + @@ -100,7 +104,7 @@ - + - - - - -
- -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Sandbox/Orchard.Sandbox.csproj b/src/Orchard.Web/Modules/Orchard.Sandbox/Orchard.Sandbox.csproj index a242235e5..ccde29bd6 100644 --- a/src/Orchard.Web/Modules/Orchard.Sandbox/Orchard.Sandbox.csproj +++ b/src/Orchard.Web/Modules/Orchard.Sandbox/Orchard.Sandbox.csproj @@ -1,4 +1,5 @@ - + + Debug AnyCPU @@ -10,8 +11,13 @@ Properties Orchard.Sandbox Orchard.Sandbox - v3.5 + v4.0 false + + + 3.5 + + true @@ -21,6 +27,7 @@ DEBUG;TRACE prompt 4 + AllRules.ruleset pdbonly @@ -29,6 +36,7 @@ TRACE prompt 4 + AllRules.ruleset @@ -36,22 +44,17 @@ 3.5 - - 3.5 - - - 3.5 - + + + + + False ..\..\..\..\lib\aspnetmvc\System.Web.Mvc.dll - - 3.5 - - @@ -59,6 +62,7 @@ + @@ -99,7 +103,7 @@ - + - - - - -
- -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ 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 075d62dd5..cb8375c1b 100644 --- a/src/Orchard.Web/Modules/Orchard.Setup/Orchard.Setup.csproj +++ b/src/Orchard.Web/Modules/Orchard.Setup/Orchard.Setup.csproj @@ -1,4 +1,5 @@ - + + Debug AnyCPU @@ -10,8 +11,13 @@ Properties Orchard.Setup Orchard.Setup - v3.5 + v4.0 false + + + 3.5 + + true @@ -21,6 +27,7 @@ DEBUG;TRACE prompt 4 + AllRules.ruleset pdbonly @@ -29,6 +36,7 @@ TRACE prompt 4 + AllRules.ruleset @@ -40,22 +48,17 @@ 3.5 - - 3.5 - - - 3.5 - + + + + + False ..\..\..\..\lib\aspnetmvc\System.Web.Mvc.dll - - 3.5 - - @@ -63,6 +66,7 @@ + @@ -101,7 +105,7 @@ - + - - - - -
- -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Orchard.Tags.csproj b/src/Orchard.Web/Modules/Orchard.Tags/Orchard.Tags.csproj index 872089915..2c93a394a 100644 --- a/src/Orchard.Web/Modules/Orchard.Tags/Orchard.Tags.csproj +++ b/src/Orchard.Web/Modules/Orchard.Tags/Orchard.Tags.csproj @@ -1,4 +1,5 @@ - + + Debug AnyCPU @@ -10,8 +11,13 @@ Properties Orchard.Tags Orchard.Tags - v3.5 + v4.0 false + + + 3.5 + + true @@ -21,6 +27,7 @@ DEBUG;TRACE prompt 4 + AllRules.ruleset pdbonly @@ -29,6 +36,7 @@ TRACE prompt 4 + AllRules.ruleset @@ -36,22 +44,17 @@ 3.5 - - 3.5 - - - 3.5 - + + + + + False ..\..\..\..\lib\aspnetmvc\System.Web.Mvc.dll - - 3.5 - - @@ -59,6 +62,7 @@ + @@ -103,7 +107,7 @@ - + - - - - -
- -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj b/src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj index bd99db3ec..174c4dc67 100644 --- a/src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj +++ b/src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj @@ -1,4 +1,5 @@ - + + Debug AnyCPU @@ -10,8 +11,13 @@ Properties Orchard.Themes Orchard.Themes - v3.5 + v4.0 false + + + 3.5 + + true @@ -21,6 +27,7 @@ DEBUG;TRACE prompt 4 + AllRules.ruleset pdbonly @@ -29,6 +36,7 @@ TRACE prompt 4 + AllRules.ruleset @@ -36,22 +44,17 @@ 3.5 - - 3.5 - - - 3.5 - + + + + + False ..\..\..\..\lib\aspnetmvc\System.Web.Mvc.dll - - 3.5 - - @@ -59,6 +62,7 @@ + @@ -116,7 +120,7 @@ - + - - - - -
- -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj b/src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj index 093f9c70b..747a36978 100644 --- a/src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj +++ b/src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj @@ -1,4 +1,5 @@ - + + Debug AnyCPU @@ -10,8 +11,13 @@ Properties Orchard.Users Orchard.Users - v3.5 + v4.0 false + + + 3.5 + + true @@ -21,6 +27,7 @@ DEBUG;TRACE prompt 4 + AllRules.ruleset pdbonly @@ -29,6 +36,7 @@ TRACE prompt 4 + AllRules.ruleset @@ -36,22 +44,17 @@ 3.5 - - 3.5 - - - 3.5 - + + + + + False ..\..\..\..\lib\aspnetmvc\System.Web.Mvc.dll - - 3.5 - - @@ -59,6 +62,7 @@ + @@ -100,7 +104,7 @@ - + - - - - -
- -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/TinyMce/TinyMce.csproj b/src/Orchard.Web/Modules/TinyMce/TinyMce.csproj index f2648d7c6..9f7e48552 100644 --- a/src/Orchard.Web/Modules/TinyMce/TinyMce.csproj +++ b/src/Orchard.Web/Modules/TinyMce/TinyMce.csproj @@ -1,4 +1,5 @@ - + + Debug AnyCPU @@ -10,8 +11,13 @@ Properties TinyMce TinyMce - v3.5 + v4.0 false + + + 3.5 + + true @@ -21,6 +27,7 @@ DEBUG;TRACE prompt 4 + AllRules.ruleset pdbonly @@ -29,6 +36,7 @@ TRACE prompt 4 + AllRules.ruleset @@ -36,27 +44,23 @@ 3.5 - - 3.5 - - - 3.5 - + + + + + False ..\..\..\..\lib\aspnetmvc\System.Web.Mvc.dll - - 3.5 - - + @@ -155,7 +159,7 @@ - + - - - - -
- -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Orchard.Web.csproj b/src/Orchard.Web/Orchard.Web.csproj index 5f74ca391..6e47c2ba3 100644 --- a/src/Orchard.Web/Orchard.Web.csproj +++ b/src/Orchard.Web/Orchard.Web.csproj @@ -1,4 +1,5 @@ - + + Debug AnyCPU @@ -10,8 +11,13 @@ Properties Orchard.Web Orchard.Web - v3.5 + v4.0 false + + + 3.5 + + true @@ -21,6 +27,7 @@ DEBUG;TRACE prompt 4 + AllRules.ruleset pdbonly @@ -29,6 +36,7 @@ TRACE prompt 4 + AllRules.ruleset @@ -52,28 +60,23 @@ 3.5 - - 3.5 - - - 3.5 - + False ..\..\lib\sqlite\System.Data.SQLite.DLL True + + + + False ..\..\lib\aspnetmvc\System.Web.Mvc.dll True - - 3.5 - - @@ -81,6 +84,7 @@ + @@ -363,7 +367,7 @@ - + - - - - -
- -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.sln b/src/Orchard.sln index 03401fe46..ea0128b58 100644 --- a/src/Orchard.sln +++ b/src/Orchard.sln @@ -1,6 +1,14 @@  -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Modules", "Modules", "{E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{74E681ED-FECC-4034-B9BD-01B0BB1BDECA}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{383DBA32-4A3E-48D1-AAC3-75377A694452}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Futures", "Futures", "{E75A4CE4-CAA6-41E4-B951-33ACC60DC77C}" +EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Web", "Orchard.Web\Orchard.Web.csproj", "{50B779EA-EC00-4699-84C0-03B395C365D2}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Framework", "Orchard\Orchard.Framework.csproj", "{2D1D92BB-4555-4CBE-8D0E-63563D6CE4C6}" @@ -9,8 +17,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Framework.Tests", " EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Web.Tests", "Orchard.Web.Tests\Orchard.Web.Tests.csproj", "{F112851D-B023-4746-B6B1-8D2E5AD8F7AA}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Modules", "Modules", "{E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TinyMce", "Orchard.Web\Modules\TinyMce\TinyMce.csproj", "{954CA994-D204-468B-9D69-51F6AD3E1C29}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Media", "Orchard.Web\Modules\Orchard.Media\Orchard.Media.csproj", "{D9A7B330-CD22-4DA1-A95A-8DE1982AD8EB}" @@ -25,8 +31,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Core", "Orchard.Web EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Core.Tests", "Orchard.Core.Tests\Orchard.Core.Tests.csproj", "{2FC1D9C8-446D-4414-B252-5E9FBE61EB63}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{74E681ED-FECC-4034-B9BD-01B0BB1BDECA}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Sandbox", "Orchard.Web\Modules\Orchard.Sandbox\Orchard.Sandbox.csproj", "{17C44253-65A2-4597-98C7-16EE576824B6}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Blogs", "Orchard.Web\Modules\Orchard.Blogs\Orchard.Blogs.csproj", "{63FBD4D9-E1DA-4A7B-AA6A-D6074FE50867}" @@ -41,14 +45,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Pages", "Orchard.We EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Setup", "Orchard.Web\Modules\Orchard.Setup\Orchard.Setup.csproj", "{8C7FCBC2-E6E1-405E-BFB5-D8D9E67A09C4}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{383DBA32-4A3E-48D1-AAC3-75377A694452}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MSBuild.Orchard.Tasks", "Tools\MSBuild.Orchard.Tasks\MSBuild.Orchard.Tasks.csproj", "{5E5E7A21-C7B2-44D8-8593-2F9541AE041D}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MSBuild.Orchard.Tasks.Tests", "Tools\MSBuild.Orchard.Tasks.Tests\MSBuild.Orchard.Tasks.Tests.csproj", "{4AB4B5B6-277E-4FF6-B69B-7AE9E16D2A56}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Futures", "Futures", "{E75A4CE4-CAA6-41E4-B951-33ACC60DC77C}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Futures.Widgets", "Orchard.Web\Modules\Futures.Widgets\Futures.Widgets.csproj", "{E65E5633-C0FF-453C-A906-481C14F969D6}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Specs", "Orchard.Specs\Orchard.Specs.csproj", "{7354DF37-934B-46CF-A13C-455D5F5F5413}" @@ -176,11 +176,6 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {F112851D-B023-4746-B6B1-8D2E5AD8F7AA} = {74E681ED-FECC-4034-B9BD-01B0BB1BDECA} - {6CB3EB30-F725-45C0-9742-42599BA8E8D2} = {74E681ED-FECC-4034-B9BD-01B0BB1BDECA} - {2FC1D9C8-446D-4414-B252-5E9FBE61EB63} = {74E681ED-FECC-4034-B9BD-01B0BB1BDECA} - {ABC826D4-2FA1-4F2F-87DE-E6095F653810} = {74E681ED-FECC-4034-B9BD-01B0BB1BDECA} - {7354DF37-934B-46CF-A13C-455D5F5F5413} = {74E681ED-FECC-4034-B9BD-01B0BB1BDECA} {954CA994-D204-468B-9D69-51F6AD3E1C29} = {E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5} {D9A7B330-CD22-4DA1-A95A-8DE1982AD8EB} = {E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5} {79AED36E-ABD0-4747-93D3-8722B042454B} = {E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5} @@ -195,6 +190,11 @@ Global {72457126-E118-4171-A08F-9A709EE4B7FC} = {E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5} {CDE24A24-01D3-403C-84B9-37722E18DFB7} = {E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5} {17F86780-9A1F-4AA1-86F1-875EEC2730C7} = {E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5} + {ABC826D4-2FA1-4F2F-87DE-E6095F653810} = {74E681ED-FECC-4034-B9BD-01B0BB1BDECA} + {F112851D-B023-4746-B6B1-8D2E5AD8F7AA} = {74E681ED-FECC-4034-B9BD-01B0BB1BDECA} + {6CB3EB30-F725-45C0-9742-42599BA8E8D2} = {74E681ED-FECC-4034-B9BD-01B0BB1BDECA} + {2FC1D9C8-446D-4414-B252-5E9FBE61EB63} = {74E681ED-FECC-4034-B9BD-01B0BB1BDECA} + {7354DF37-934B-46CF-A13C-455D5F5F5413} = {74E681ED-FECC-4034-B9BD-01B0BB1BDECA} {5E5E7A21-C7B2-44D8-8593-2F9541AE041D} = {383DBA32-4A3E-48D1-AAC3-75377A694452} {4AB4B5B6-277E-4FF6-B69B-7AE9E16D2A56} = {383DBA32-4A3E-48D1-AAC3-75377A694452} {33B1BC8D-E292-4972-A363-22056B207156} = {383DBA32-4A3E-48D1-AAC3-75377A694452} diff --git a/src/Orchard/Orchard.Framework.csproj b/src/Orchard/Orchard.Framework.csproj index 9beecc61b..ce9644cb0 100644 --- a/src/Orchard/Orchard.Framework.csproj +++ b/src/Orchard/Orchard.Framework.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -12,6 +12,25 @@ Orchard.Framework v3.5 512 + + + 3.5 + + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true true @@ -21,6 +40,7 @@ DEBUG;TRACE prompt 4 + AllRules.ruleset pdbonly @@ -29,6 +49,7 @@ TRACE prompt 4 + AllRules.ruleset @@ -425,6 +446,23 @@ + + + False + .NET Framework 3.5 SP1 Client Profile + false + + + False + .NET Framework 3.5 SP1 + true + + + False + Windows Installer 3.1 + true + +