From 9543e4ed7bf3169b32d46d0da40baac6df8d81ba Mon Sep 17 00:00:00 2001 From: Sebastien Ros Date: Wed, 10 Oct 2012 10:17:41 -0700 Subject: [PATCH 1/2] Optimizing ContentPartDriverCoordinator Prevents multiple evaluations off the same Linq expressions --HG-- branch : 1.x --- .../Drivers/Coordinators/ContentPartDriverCoordinator.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Orchard/ContentManagement/Drivers/Coordinators/ContentPartDriverCoordinator.cs b/src/Orchard/ContentManagement/Drivers/Coordinators/ContentPartDriverCoordinator.cs index 0091f346f..ca7f49657 100644 --- a/src/Orchard/ContentManagement/Drivers/Coordinators/ContentPartDriverCoordinator.cs +++ b/src/Orchard/ContentManagement/Drivers/Coordinators/ContentPartDriverCoordinator.cs @@ -26,7 +26,7 @@ namespace Orchard.ContentManagement.Drivers.Coordinators { if (contentTypeDefinition == null) return; - var partInfos = _drivers.SelectMany(cpp => cpp.GetPartInfo()); + var partInfos = _drivers.SelectMany(cpp => cpp.GetPartInfo()).ToList(); foreach (var typePartDefinition in contentTypeDefinition.Parts) { var partName = typePartDefinition.PartDefinition.Name; From 2fb0dc6fb340ea7d0321b86a0b78f1215dfde58c Mon Sep 17 00:00:00 2001 From: Sebastien Ros Date: Wed, 10 Oct 2012 11:56:52 -0700 Subject: [PATCH 2/2] Updated upgrade process for 1.6 --HG-- branch : 1.x rename : src/Orchard.Web/Modules/UpgradeTo15/AdminMenu.cs => src/Orchard.Web/Modules/UpgradeTo16/AdminMenu.cs rename : src/Orchard.Web/Modules/UpgradeTo15/Controllers/FieldController.cs => src/Orchard.Web/Modules/UpgradeTo16/Controllers/FieldController.cs rename : src/Orchard.Web/Modules/UpgradeTo15/Controllers/RouteController.cs => src/Orchard.Web/Modules/UpgradeTo16/Controllers/RouteController.cs rename : src/Orchard.Web/Modules/UpgradeTo15/Module.txt => src/Orchard.Web/Modules/UpgradeTo16/Module.txt rename : src/Orchard.Web/Modules/UpgradeTo15/Properties/AssemblyInfo.cs => src/Orchard.Web/Modules/UpgradeTo16/Properties/AssemblyInfo.cs rename : src/Orchard.Web/Modules/UpgradeTo15/Scripts/Web.config => src/Orchard.Web/Modules/UpgradeTo16/Scripts/Web.config rename : src/Orchard.Web/Modules/UpgradeTo15/Styles/Web.config => src/Orchard.Web/Modules/UpgradeTo16/Styles/Web.config rename : src/Orchard.Web/Modules/UpgradeTo15/ViewModels/MigrateViewModel.cs => src/Orchard.Web/Modules/UpgradeTo16/ViewModels/MigrateViewModel.cs rename : src/Orchard.Web/Modules/UpgradeTo15/Views/Field/Index.cshtml => src/Orchard.Web/Modules/UpgradeTo16/Views/Field/Index.cshtml rename : src/Orchard.Web/Modules/UpgradeTo15/Views/Route/Index.cshtml => src/Orchard.Web/Modules/UpgradeTo16/Views/Route/Index.cshtml rename : src/Orchard.Web/Modules/UpgradeTo15/Views/Web.config => src/Orchard.Web/Modules/UpgradeTo16/Views/Web.config rename : src/Orchard.Web/Modules/UpgradeTo15/Web.config => src/Orchard.Web/Modules/UpgradeTo16/Web.config --- src/Orchard.Web/Core/Navigation/Migrations.cs | 20 ---- .../Modules/UpgradeTo15/Module.txt | 11 --- .../{UpgradeTo15 => UpgradeTo16}/AdminMenu.cs | 9 +- .../Controllers/FieldController.cs | 4 +- .../UpgradeTo16/Controllers/MenuController.cs | 92 +++++++++++++++++++ .../Controllers/RouteController.cs | 6 +- .../Modules/UpgradeTo16/Module.txt | 11 +++ .../Properties/AssemblyInfo.cs | 2 +- .../Scripts/Web.config | 0 .../Styles/Web.config | 0 .../UpgradeTo16.csproj} | 12 ++- .../ViewModels/MigrateViewModel.cs | 2 +- .../Views/Field/Index.cshtml | 2 +- .../UpgradeTo16/Views/Menu/Index.cshtml | 14 +++ .../Views/Route/Index.cshtml | 2 +- .../Views/Web.config | 0 .../{UpgradeTo15 => UpgradeTo16}/Web.config | 0 src/Orchard.sln | 2 +- 18 files changed, 142 insertions(+), 47 deletions(-) delete mode 100644 src/Orchard.Web/Modules/UpgradeTo15/Module.txt rename src/Orchard.Web/Modules/{UpgradeTo15 => UpgradeTo16}/AdminMenu.cs (56%) rename src/Orchard.Web/Modules/{UpgradeTo15 => UpgradeTo16}/Controllers/FieldController.cs (96%) create mode 100644 src/Orchard.Web/Modules/UpgradeTo16/Controllers/MenuController.cs rename src/Orchard.Web/Modules/{UpgradeTo15 => UpgradeTo16}/Controllers/RouteController.cs (96%) create mode 100644 src/Orchard.Web/Modules/UpgradeTo16/Module.txt rename src/Orchard.Web/Modules/{UpgradeTo15 => UpgradeTo16}/Properties/AssemblyInfo.cs (94%) rename src/Orchard.Web/Modules/{UpgradeTo15 => UpgradeTo16}/Scripts/Web.config (100%) rename src/Orchard.Web/Modules/{UpgradeTo15 => UpgradeTo16}/Styles/Web.config (100%) rename src/Orchard.Web/Modules/{UpgradeTo15/UpgradeTo15.csproj => UpgradeTo16/UpgradeTo16.csproj} (91%) rename src/Orchard.Web/Modules/{UpgradeTo15 => UpgradeTo16}/ViewModels/MigrateViewModel.cs (85%) rename src/Orchard.Web/Modules/{UpgradeTo15 => UpgradeTo16}/Views/Field/Index.cshtml (94%) create mode 100644 src/Orchard.Web/Modules/UpgradeTo16/Views/Menu/Index.cshtml rename src/Orchard.Web/Modules/{UpgradeTo15 => UpgradeTo16}/Views/Route/Index.cshtml (94%) rename src/Orchard.Web/Modules/{UpgradeTo15 => UpgradeTo16}/Views/Web.config (100%) rename src/Orchard.Web/Modules/{UpgradeTo15 => UpgradeTo16}/Web.config (100%) diff --git a/src/Orchard.Web/Core/Navigation/Migrations.cs b/src/Orchard.Web/Core/Navigation/Migrations.cs index e574d92ad..e02620072 100644 --- a/src/Orchard.Web/Core/Navigation/Migrations.cs +++ b/src/Orchard.Web/Core/Navigation/Migrations.cs @@ -1,15 +1,9 @@ using Orchard.ContentManagement.MetaData; using Orchard.Core.Contents.Extensions; -using Orchard.Core.Navigation.Services; using Orchard.Data.Migration; namespace Orchard.Core.Navigation { public class Migrations : DataMigrationImpl { - private readonly IMenuService _menuService; - - public Migrations(IMenuService menuService ) { - _menuService = menuService; - } public int Create() { ContentDefinitionManager.AlterPartDefinition("MenuPart", builder => builder.Attachable()); @@ -181,20 +175,6 @@ namespace Orchard.Core.Navigation { .WithSetting("Stereotype", "MenuItem") ); - // create a Main Menu - var mainMenu = _menuService.Create("Main Menu"); - - // assign the Main Menu to all current menu items - foreach (var menuItem in _menuService.Get()) { - // if they don't have a position or a text, then they are not displayed - if(string.IsNullOrWhiteSpace(menuItem.MenuPosition) || string.IsNullOrEmpty(menuItem.MenuText)) { - continue; - } - menuItem.Menu = mainMenu.ContentItem; - } - - // at this point a widget should still be created to display the navigation - return 3; } } diff --git a/src/Orchard.Web/Modules/UpgradeTo15/Module.txt b/src/Orchard.Web/Modules/UpgradeTo15/Module.txt deleted file mode 100644 index 3dc6142ba..000000000 --- a/src/Orchard.Web/Modules/UpgradeTo15/Module.txt +++ /dev/null @@ -1,11 +0,0 @@ -Name: UpgradeTo15 -AntiForgery: enabled -Author: The Orchard Team -Website: http://orchardproject.net -Version: 1.5 -OrchardVersion: 1.5 -Description: Description for the module -Features: - UpgradeTo15: - Description: Description for feature UpgradeTo15. - Dependencies: Orchard.Autoroute, Title \ No newline at end of file diff --git a/src/Orchard.Web/Modules/UpgradeTo15/AdminMenu.cs b/src/Orchard.Web/Modules/UpgradeTo16/AdminMenu.cs similarity index 56% rename from src/Orchard.Web/Modules/UpgradeTo15/AdminMenu.cs rename to src/Orchard.Web/Modules/UpgradeTo16/AdminMenu.cs index 8133fe697..0f2c96685 100644 --- a/src/Orchard.Web/Modules/UpgradeTo15/AdminMenu.cs +++ b/src/Orchard.Web/Modules/UpgradeTo16/AdminMenu.cs @@ -2,7 +2,7 @@ using Orchard.Security; using Orchard.UI.Navigation; -namespace UpgradeTo15 { +namespace UpgradeTo16 { public class AdminMenu : INavigationProvider { public Localizer T { get; set; } @@ -12,9 +12,10 @@ namespace UpgradeTo15 { public void GetNavigation(NavigationBuilder builder) { builder - .Add(T("Migrate to 1.5"), "0", menu => menu.Action("Index", "Route", new { area = "UpgradeTo15" }) - .Add(T("Migrate Routes"), "0", item => item.Action("Index", "Route", new { area = "UpgradeTo15" }).LocalNav().Permission(StandardPermissions.SiteOwner)) - .Add(T("Migrate Fields"), "0", item => item.Action("Index", "Field", new { area = "UpgradeTo15" }).LocalNav().Permission(StandardPermissions.SiteOwner)) + .Add(T("Upgrade to 1.6"), "0", menu => menu.Action("Index", "Route", new { area = "UpgradeTo16" }) + .Add(T("Migrate Routes"), "0", item => item.Action("Index", "Route", new { area = "UpgradeTo16" }).LocalNav().Permission(StandardPermissions.SiteOwner)) + .Add(T("Migrate Fields"), "0", item => item.Action("Index", "Field", new { area = "UpgradeTo16" }).LocalNav().Permission(StandardPermissions.SiteOwner)) + .Add(T("Migrate Menu"), "0", item => item.Action("Index", "Menu", new { area = "UpgradeTo16" }).LocalNav().Permission(StandardPermissions.SiteOwner)) ); } } diff --git a/src/Orchard.Web/Modules/UpgradeTo15/Controllers/FieldController.cs b/src/Orchard.Web/Modules/UpgradeTo16/Controllers/FieldController.cs similarity index 96% rename from src/Orchard.Web/Modules/UpgradeTo15/Controllers/FieldController.cs rename to src/Orchard.Web/Modules/UpgradeTo16/Controllers/FieldController.cs index f79a650f2..227050478 100644 --- a/src/Orchard.Web/Modules/UpgradeTo15/Controllers/FieldController.cs +++ b/src/Orchard.Web/Modules/UpgradeTo16/Controllers/FieldController.cs @@ -9,9 +9,9 @@ using Orchard.Localization; using Orchard.Security; using Orchard.UI.Admin; using Orchard.UI.Notify; -using UpgradeTo15.ViewModels; +using UpgradeTo16.ViewModels; -namespace UpgradeTo15.Controllers { +namespace UpgradeTo16.Controllers { [Admin] public class FieldController : Controller { private readonly IContentDefinitionManager _contentDefinitionManager; diff --git a/src/Orchard.Web/Modules/UpgradeTo16/Controllers/MenuController.cs b/src/Orchard.Web/Modules/UpgradeTo16/Controllers/MenuController.cs new file mode 100644 index 000000000..918b5a522 --- /dev/null +++ b/src/Orchard.Web/Modules/UpgradeTo16/Controllers/MenuController.cs @@ -0,0 +1,92 @@ +using System.Linq; +using System.Web.Mvc; +using Orchard; +using Orchard.ContentManagement; +using Orchard.Core.Navigation.Models; +using Orchard.Core.Navigation.Services; +using Orchard.Localization; +using Orchard.Security; +using Orchard.UI.Admin; +using Orchard.UI.Notify; +using Orchard.Widgets.Models; +using Orchard.Widgets.Services; + +namespace UpgradeTo16.Controllers { + [Admin] + public class MenuController : Controller { + private readonly IMenuService _menuService; + private readonly IOrchardServices _orchardServices; + private readonly IWidgetsService _widgetsService; + + public MenuController( + IMenuService menuService, + IOrchardServices orchardServices, + IWidgetsService widgetsService ) { + _menuService = menuService; + _orchardServices = orchardServices; + _widgetsService = widgetsService; + } + + public Localizer T { get; set; } + + public ActionResult Index() { + var menus = _menuService.GetMenus(); + + if(menus.Any()) { + _orchardServices.Notifier.Warning(T("This step is unnecessary as some menus already exist.")); + } + + return View(); + } + + [HttpPost, ActionName("Index")] + public ActionResult IndexPOST() { + if (!_orchardServices.Authorizer.Authorize(StandardPermissions.SiteOwner, T("Not allowed to migrate the navigation."))) + return new HttpUnauthorizedResult(); + + var menus = _menuService.GetMenus(); + + if (menus.Any()) { + _orchardServices.Notifier.Error(T("This step is unnecessary as some menus already exist.")); + return View(); + } + + // create a Main Menu + var mainMenu = _menuService.Create("Main Menu"); + _orchardServices.Notifier.Information(T("Main menu created")); + + // assign the Main Menu to all current menu items + foreach (var menuItem in _menuService.Get()) { + // if they don't have a position or a text, then they are not displayed + if (string.IsNullOrWhiteSpace(menuItem.MenuPosition) || string.IsNullOrEmpty(menuItem.MenuText)) { + continue; + } + menuItem.Menu = mainMenu.ContentItem; + } + _orchardServices.Notifier.Information(T("Menu items moved to Main menu")); + + // a widget should is created to display the navigation + var layer = _widgetsService.GetLayers().FirstOrDefault(x => x.Name == "Default"); + if(layer == null) { + _orchardServices.Notifier.Warning(T("Widget could not be created. Please create it manually.")); + } + + var widget = _widgetsService.CreateWidget(layer.Id, "MenuWidget", "Main Menu", "1.0", "Navigation"); + widget.RenderTitle = false; + + var menuWidget = widget.As(); + + menuWidget.Menu = mainMenu.ContentItem.Record; + + menuWidget.StartLevel = 1; + menuWidget.Levels = 1; + menuWidget.Breadcrumb = false; + menuWidget.AddHomePage = false; + menuWidget.AddCurrentPage = false; + + _orchardServices.ContentManager.Publish(menuWidget.ContentItem); + + return View("Index"); + } + } +} diff --git a/src/Orchard.Web/Modules/UpgradeTo15/Controllers/RouteController.cs b/src/Orchard.Web/Modules/UpgradeTo16/Controllers/RouteController.cs similarity index 96% rename from src/Orchard.Web/Modules/UpgradeTo15/Controllers/RouteController.cs rename to src/Orchard.Web/Modules/UpgradeTo16/Controllers/RouteController.cs index 08deafc95..ca1419fea 100644 --- a/src/Orchard.Web/Modules/UpgradeTo15/Controllers/RouteController.cs +++ b/src/Orchard.Web/Modules/UpgradeTo16/Controllers/RouteController.cs @@ -18,9 +18,9 @@ using Orchard.Reports.Services; using Orchard.Security; using Orchard.UI.Admin; using Orchard.UI.Notify; -using UpgradeTo15.ViewModels; +using UpgradeTo16.ViewModels; -namespace UpgradeTo15.Controllers { +namespace UpgradeTo16.Controllers { [Admin] public class RouteController : Controller { private readonly IContentDefinitionManager _contentDefinitionManager; @@ -73,7 +73,7 @@ namespace UpgradeTo15.Controllers { if(TryUpdateModel(viewModel)) { // creating report - _reportsCoordinator.Register("Migration", "UpgradeTo15", "Migrating " + string.Join(" ,", viewModel.ContentTypes.Where(x => x.IsChecked).Select(x => x.ContentTypeName).ToArray())); + _reportsCoordinator.Register("Migration", "UpgradeTo16", "Migrating " + string.Join(" ,", viewModel.ContentTypes.Where(x => x.IsChecked).Select(x => x.ContentTypeName).ToArray())); var contentTypesToMigrate = viewModel.ContentTypes.Where(c => c.IsChecked).Select(c => c.ContentTypeName); diff --git a/src/Orchard.Web/Modules/UpgradeTo16/Module.txt b/src/Orchard.Web/Modules/UpgradeTo16/Module.txt new file mode 100644 index 000000000..270d43b9d --- /dev/null +++ b/src/Orchard.Web/Modules/UpgradeTo16/Module.txt @@ -0,0 +1,11 @@ +Name: UpgradeTo16 +AntiForgery: enabled +Author: The Orchard Team +Website: http://orchardproject.net +Version: 1.6 +OrchardVersion: 1.5 +Description: Description for the module +Features: + UpgradeTo16: + Description: Description for feature UpgradeTo16. + Dependencies: Orchard.Autoroute, Title, Navigation \ No newline at end of file diff --git a/src/Orchard.Web/Modules/UpgradeTo15/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/UpgradeTo16/Properties/AssemblyInfo.cs similarity index 94% rename from src/Orchard.Web/Modules/UpgradeTo15/Properties/AssemblyInfo.cs rename to src/Orchard.Web/Modules/UpgradeTo16/Properties/AssemblyInfo.cs index b57d6ab15..7769f1232 100644 --- a/src/Orchard.Web/Modules/UpgradeTo15/Properties/AssemblyInfo.cs +++ b/src/Orchard.Web/Modules/UpgradeTo16/Properties/AssemblyInfo.cs @@ -6,7 +6,7 @@ using System.Security; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("UpgradeTo15")] +[assembly: AssemblyTitle("UpgradeTo16")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyProduct("Orchard")] diff --git a/src/Orchard.Web/Modules/UpgradeTo15/Scripts/Web.config b/src/Orchard.Web/Modules/UpgradeTo16/Scripts/Web.config similarity index 100% rename from src/Orchard.Web/Modules/UpgradeTo15/Scripts/Web.config rename to src/Orchard.Web/Modules/UpgradeTo16/Scripts/Web.config diff --git a/src/Orchard.Web/Modules/UpgradeTo15/Styles/Web.config b/src/Orchard.Web/Modules/UpgradeTo16/Styles/Web.config similarity index 100% rename from src/Orchard.Web/Modules/UpgradeTo15/Styles/Web.config rename to src/Orchard.Web/Modules/UpgradeTo16/Styles/Web.config diff --git a/src/Orchard.Web/Modules/UpgradeTo15/UpgradeTo15.csproj b/src/Orchard.Web/Modules/UpgradeTo16/UpgradeTo16.csproj similarity index 91% rename from src/Orchard.Web/Modules/UpgradeTo15/UpgradeTo15.csproj rename to src/Orchard.Web/Modules/UpgradeTo16/UpgradeTo16.csproj index 1e51b9398..c8f9e093c 100644 --- a/src/Orchard.Web/Modules/UpgradeTo15/UpgradeTo15.csproj +++ b/src/Orchard.Web/Modules/UpgradeTo16/UpgradeTo16.csproj @@ -10,8 +10,8 @@ {fae04ec0-301f-11d3-bf4b-00c04f79efbc} Library Properties - UpgradeTo15 - UpgradeTo15 + UpgradeTo16 + UpgradeTo16 v4.0 false @@ -88,9 +88,14 @@ {66FCCD76-2761-47E3-8D11-B45D0001DDAA} Orchard.Autoroute + + {194D3CCC-1153-474D-8176-FDE8D7D0D0BD} + Orchard.Widgets + + @@ -102,6 +107,9 @@ + + + 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) diff --git a/src/Orchard.Web/Modules/UpgradeTo15/ViewModels/MigrateViewModel.cs b/src/Orchard.Web/Modules/UpgradeTo16/ViewModels/MigrateViewModel.cs similarity index 85% rename from src/Orchard.Web/Modules/UpgradeTo15/ViewModels/MigrateViewModel.cs rename to src/Orchard.Web/Modules/UpgradeTo16/ViewModels/MigrateViewModel.cs index a26027d86..92c29c31f 100644 --- a/src/Orchard.Web/Modules/UpgradeTo15/ViewModels/MigrateViewModel.cs +++ b/src/Orchard.Web/Modules/UpgradeTo16/ViewModels/MigrateViewModel.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace UpgradeTo15.ViewModels { +namespace UpgradeTo16.ViewModels { public class MigrateViewModel { public IList ContentTypes { get; set; } } diff --git a/src/Orchard.Web/Modules/UpgradeTo15/Views/Field/Index.cshtml b/src/Orchard.Web/Modules/UpgradeTo16/Views/Field/Index.cshtml similarity index 94% rename from src/Orchard.Web/Modules/UpgradeTo15/Views/Field/Index.cshtml rename to src/Orchard.Web/Modules/UpgradeTo16/Views/Field/Index.cshtml index 5ceaf7b0c..11c0d0bd9 100644 --- a/src/Orchard.Web/Modules/UpgradeTo15/Views/Field/Index.cshtml +++ b/src/Orchard.Web/Modules/UpgradeTo16/Views/Field/Index.cshtml @@ -1,5 +1,5 @@ @using Orchard.Utility.Extensions -@model UpgradeTo15.ViewModels.MigrateViewModel +@model UpgradeTo16.ViewModels.MigrateViewModel @{ Layout.Title = T("Migrate Fields").ToString(); } diff --git a/src/Orchard.Web/Modules/UpgradeTo16/Views/Menu/Index.cshtml b/src/Orchard.Web/Modules/UpgradeTo16/Views/Menu/Index.cshtml new file mode 100644 index 000000000..c7c798dbe --- /dev/null +++ b/src/Orchard.Web/Modules/UpgradeTo16/Views/Menu/Index.cshtml @@ -0,0 +1,14 @@ +@using Orchard.Utility.Extensions + +@{ Layout.Title = T("Migrate Menu").ToString(); } + +@using (Html.BeginFormAntiForgeryPost()) { + Html.ValidationSummary(); +
+ @T("Migrating Menu:") + @T("This migration step will create a new Menu named \"Main Menu\" and add all your previous menu items to it. Finally it will create a new \"Menu Widget\" instance to render this menu on the website.") +
+
+ +
+} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/UpgradeTo15/Views/Route/Index.cshtml b/src/Orchard.Web/Modules/UpgradeTo16/Views/Route/Index.cshtml similarity index 94% rename from src/Orchard.Web/Modules/UpgradeTo15/Views/Route/Index.cshtml rename to src/Orchard.Web/Modules/UpgradeTo16/Views/Route/Index.cshtml index 48937d3d1..008aa9b52 100644 --- a/src/Orchard.Web/Modules/UpgradeTo15/Views/Route/Index.cshtml +++ b/src/Orchard.Web/Modules/UpgradeTo16/Views/Route/Index.cshtml @@ -1,5 +1,5 @@ @using Orchard.Utility.Extensions -@model UpgradeTo15.ViewModels.MigrateViewModel +@model UpgradeTo16.ViewModels.MigrateViewModel @{ Layout.Title = T("Migrate Routes").ToString(); } diff --git a/src/Orchard.Web/Modules/UpgradeTo15/Views/Web.config b/src/Orchard.Web/Modules/UpgradeTo16/Views/Web.config similarity index 100% rename from src/Orchard.Web/Modules/UpgradeTo15/Views/Web.config rename to src/Orchard.Web/Modules/UpgradeTo16/Views/Web.config diff --git a/src/Orchard.Web/Modules/UpgradeTo15/Web.config b/src/Orchard.Web/Modules/UpgradeTo16/Web.config similarity index 100% rename from src/Orchard.Web/Modules/UpgradeTo15/Web.config rename to src/Orchard.Web/Modules/UpgradeTo16/Web.config diff --git a/src/Orchard.sln b/src/Orchard.sln index e4099beb9..f5ebbe78c 100644 --- a/src/Orchard.sln +++ b/src/Orchard.sln @@ -142,7 +142,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.ContentPermissions" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SysCache", "Orchard.Web\Modules\SysCache\SysCache.csproj", "{3BD22132-D538-48C6-8854-F71333C798EB}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UpgradeTo15", "Orchard.Web\Modules\UpgradeTo15\UpgradeTo15.csproj", "{8A9FDB57-342D-49C2-BAFC-D885AAE5CC7C}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UpgradeTo16", "Orchard.Web\Modules\UpgradeTo16\UpgradeTo16.csproj", "{8A9FDB57-342D-49C2-BAFC-D885AAE5CC7C}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution