From d57af5860a53bc77ca0182384f2a85b26e378c8d Mon Sep 17 00:00:00 2001 From: Matteo Piovanelli Date: Thu, 16 Apr 2020 19:13:30 +0200 Subject: [PATCH 001/112] Added tokenizable default value to ContentPickerFields (#8351) --- .../Drivers/ContentPickerFieldDriver.cs | 33 +++++++++++++++++-- .../Fields/ContentPickerField.cs | 21 +++++++++--- .../Orchard.ContentPicker.csproj | 5 +++ .../ContentPickerFieldEditorEvents.cs | 1 + .../Settings/ContentPickerFieldSettings.cs | 2 ++ .../ContentPickerFieldSettings.cshtml | 13 ++++++-- 6 files changed, 66 insertions(+), 9 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.ContentPicker/Drivers/ContentPickerFieldDriver.cs b/src/Orchard.Web/Modules/Orchard.ContentPicker/Drivers/ContentPickerFieldDriver.cs index ab2c1d60d..98317ee4b 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentPicker/Drivers/ContentPickerFieldDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.ContentPicker/Drivers/ContentPickerFieldDriver.cs @@ -7,13 +7,20 @@ using Orchard.ContentManagement.Handlers; using Orchard.ContentPicker.ViewModels; using Orchard.Localization; using Orchard.Utility.Extensions; +using Orchard.ContentPicker.Fields; +using Orchard.Tokens; +using System.Collections.Generic; namespace Orchard.ContentPicker.Drivers { public class ContentPickerFieldDriver : ContentFieldDriver { private readonly IContentManager _contentManager; + private readonly ITokenizer _tokenizer; - public ContentPickerFieldDriver(IContentManager contentManager) { + public ContentPickerFieldDriver( + IContentManager contentManager, + ITokenizer tokenizer) { _contentManager = contentManager; + _tokenizer = tokenizer; T = NullLocalizer.Instance; } @@ -41,18 +48,38 @@ namespace Orchard.ContentPicker.Drivers { protected override DriverResult Editor(ContentPart part, Fields.ContentPickerField field, dynamic shapeHelper) { return ContentShape("Fields_ContentPicker_Edit", GetDifferentiator(field, part), () => { + var ids = part.IsNew() + ? GetDefaultids(part, field) + : field.Ids; var model = new ContentPickerFieldViewModel { Field = field, Part = part, - ContentItems = _contentManager.GetMany(field.Ids, VersionOptions.Latest, QueryHints.Empty).ToList() + ContentItems = _contentManager + .GetMany(ids, VersionOptions.Latest, QueryHints.Empty).ToList() }; - model.SelectedIds = string.Join(",", field.Ids); + model.SelectedIds = string.Join(",", ids); return shapeHelper.EditorTemplate(TemplateName: "Fields/ContentPicker.Edit", Model: model, Prefix: GetPrefix(field, part)); }); } + private int[] GetDefaultids(ContentPart part, Fields.ContentPickerField field) { + var ids = new int[] { }; + var settings = field.PartFieldDefinition.Settings.GetModel(); + if (!string.IsNullOrWhiteSpace(settings?.DefaultValue)) { + var defaultIds = _tokenizer + .Replace(settings.DefaultValue, + new Dictionary { { "Content", part.ContentItem } }); + if (!string.IsNullOrWhiteSpace(defaultIds)) { + // attempt to parse the string we populated from tokens + ids = ContentPickerField.DecodeIds(defaultIds); + } + } + + return ids; + } + protected override DriverResult Editor(ContentPart part, Fields.ContentPickerField field, IUpdateModel updater, dynamic shapeHelper) { var model = new ContentPickerFieldViewModel { SelectedIds = string.Join(",", field.Ids) }; diff --git a/src/Orchard.Web/Modules/Orchard.ContentPicker/Fields/ContentPickerField.cs b/src/Orchard.Web/Modules/Orchard.ContentPicker/Fields/ContentPickerField.cs index f4ad2b3cf..4d0a40493 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentPicker/Fields/ContentPickerField.cs +++ b/src/Orchard.Web/Modules/Orchard.ContentPicker/Fields/ContentPickerField.cs @@ -21,7 +21,7 @@ namespace Orchard.ContentPicker.Fields { } } - private string EncodeIds(ICollection ids) { + private static string EncodeIds(ICollection ids) { if (ids == null || !ids.Any()) { return string.Empty; } @@ -30,12 +30,25 @@ namespace Orchard.ContentPicker.Fields { return "{" + string.Join("},{", ids.ToArray()) + "}"; } - private int[] DecodeIds(string ids) { + public static int[] DecodeIds(string ids) { if(String.IsNullOrWhiteSpace(ids)) { return new int[0]; } - - return ids.Split(separator, StringSplitOptions.RemoveEmptyEntries).Select(int.Parse).ToArray(); + // if some of the slices of the string cannot be properly parsed, + // we still will return those that can. + return ids + .Split(separator, StringSplitOptions.RemoveEmptyEntries) + .Select(s => { + int i = -1; + if(int.TryParse(s, out i)) { + return i; + } + // if we can't parse return a negative value + return -1; + }) + // take only those that parsed properly + .Where(i => i > 0) + .ToArray(); } } } diff --git a/src/Orchard.Web/Modules/Orchard.ContentPicker/Orchard.ContentPicker.csproj b/src/Orchard.Web/Modules/Orchard.ContentPicker/Orchard.ContentPicker.csproj index c02def65e..00720d8c2 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentPicker/Orchard.ContentPicker.csproj +++ b/src/Orchard.Web/Modules/Orchard.ContentPicker/Orchard.ContentPicker.csproj @@ -26,6 +26,7 @@ + true @@ -196,6 +197,10 @@ {fbc8b571-ed50-49d8-8d9d-64ab7454a0d6} Orchard.Localization + + {6f759635-13d7-4e94-bcc9-80445d63f117} + Orchard.Tokens + diff --git a/src/Orchard.Web/Modules/Orchard.ContentPicker/Settings/ContentPickerFieldEditorEvents.cs b/src/Orchard.Web/Modules/Orchard.ContentPicker/Settings/ContentPickerFieldEditorEvents.cs index 7d7120532..a3e3baec6 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentPicker/Settings/ContentPickerFieldEditorEvents.cs +++ b/src/Orchard.Web/Modules/Orchard.ContentPicker/Settings/ContentPickerFieldEditorEvents.cs @@ -28,6 +28,7 @@ namespace Orchard.ContentPicker.Settings { builder.WithSetting("ContentPickerFieldSettings.Multiple", model.Multiple.ToString(CultureInfo.InvariantCulture)); builder.WithSetting("ContentPickerFieldSettings.ShowContentTab", model.ShowContentTab.ToString(CultureInfo.InvariantCulture)); builder.WithSetting("ContentPickerFieldSettings.DisplayedContentTypes", model.DisplayedContentTypes); + builder.WithSetting("ContentPickerFieldSettings.DefaultValue", model.DefaultValue); } yield return DefinitionTemplate(model); diff --git a/src/Orchard.Web/Modules/Orchard.ContentPicker/Settings/ContentPickerFieldSettings.cs b/src/Orchard.Web/Modules/Orchard.ContentPicker/Settings/ContentPickerFieldSettings.cs index eab5555d1..7fb70b56d 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentPicker/Settings/ContentPickerFieldSettings.cs +++ b/src/Orchard.Web/Modules/Orchard.ContentPicker/Settings/ContentPickerFieldSettings.cs @@ -10,5 +10,7 @@ public bool ShowContentTab { get; set; } public string DisplayedContentTypes { get; set; } + + public string DefaultValue { get; set; } } } diff --git a/src/Orchard.Web/Modules/Orchard.ContentPicker/Views/DefinitionTemplates/ContentPickerFieldSettings.cshtml b/src/Orchard.Web/Modules/Orchard.ContentPicker/Views/DefinitionTemplates/ContentPickerFieldSettings.cshtml index 1191c5629..4d6cb9dd6 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentPicker/Views/DefinitionTemplates/ContentPickerFieldSettings.cshtml +++ b/src/Orchard.Web/Modules/Orchard.ContentPicker/Views/DefinitionTemplates/ContentPickerFieldSettings.cshtml @@ -14,7 +14,7 @@
- @Html.TextAreaFor(m => m.Hint, new { @class = "text medium", rows = "5" } ) + @Html.TextAreaFor(m => m.Hint, new { @class = "text medium", rows = "5" }) @T("The help text is written under the field when authors are selecting content items.") @Html.ValidationMessageFor(m => m.Hint)
@@ -27,7 +27,16 @@
- @Html.TextBoxFor(m => m.DisplayedContentTypes) + @Html.TextBoxFor(m => m.DisplayedContentTypes) @T("A comma separated value of all the content types or content parts to display.")
+
+
+ + @Html.TextBoxFor(m => m.DefaultValue, new { @class = "text large tokenized"}) + @T("A comma separated list of the ids of selected Items. It also accepts {{ or }} as separators, in line with the serialization normally used for this field.") +
+
+ +@Display.TokenHint() \ No newline at end of file From 21cb5319494cf3e145256abc702c810029bb5809 Mon Sep 17 00:00:00 2001 From: Hermes Sbicego Date: Thu, 16 Apr 2020 19:17:56 +0200 Subject: [PATCH 002/112] Fixes errors during Indexing (#8349) --- .../Handlers/InfosetFieldIndexingHandler.cs | 4 +-- .../Services/IndexingTaskExecutor.cs | 28 +++++++++++-------- .../Handlers/DescribeMembersContext.cs | 17 +++++++++-- 3 files changed, 33 insertions(+), 16 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.Indexing/Handlers/InfosetFieldIndexingHandler.cs b/src/Orchard.Web/Modules/Orchard.Indexing/Handlers/InfosetFieldIndexingHandler.cs index f9a8ea469..6c92ad773 100644 --- a/src/Orchard.Web/Modules/Orchard.Indexing/Handlers/InfosetFieldIndexingHandler.cs +++ b/src/Orchard.Web/Modules/Orchard.Indexing/Handlers/InfosetFieldIndexingHandler.cs @@ -45,7 +45,7 @@ namespace Orchard.Indexing.Handlers { var fieldStorage = _fieldStorageProvider.BindStorage(localPart, localField); var indexName = infosetPart.TypeDefinition.Name.ToLower() + "-" + field.Name.ToLower(); - var membersContext = new DescribeMembersContext(fieldStorage, values => { + var membersContext = new DescribeMembersContext(null, fieldStorage, values => { foreach (var value in values) { @@ -92,7 +92,7 @@ namespace Orchard.Indexing.Handlers { break; } } - }); + }, localField); foreach (var driver in drivers) { driver.Describe(membersContext); diff --git a/src/Orchard.Web/Modules/Orchard.Indexing/Services/IndexingTaskExecutor.cs b/src/Orchard.Web/Modules/Orchard.Indexing/Services/IndexingTaskExecutor.cs index 2e44fb903..13df13c0e 100644 --- a/src/Orchard.Web/Modules/Orchard.Indexing/Services/IndexingTaskExecutor.cs +++ b/src/Orchard.Web/Modules/Orchard.Indexing/Services/IndexingTaskExecutor.cs @@ -20,8 +20,7 @@ namespace Orchard.Indexing.Services { /// This class is synchronized using a lock file as both command line and web workers can potentially use it, /// and singleton locks would not be shared accross those two. /// - public class IndexingTaskExecutor : IIndexingTaskExecutor, IIndexStatisticsProvider - { + public class IndexingTaskExecutor : IIndexingTaskExecutor, IIndexStatisticsProvider { private readonly IRepository _taskRepository; private readonly IRepository _contentRepository; private IIndexProvider _indexProvider; @@ -160,13 +159,22 @@ namespace Orchard.Indexing.Services { .OrderBy(versionRecord => versionRecord.Id) .Take(ContentItemsPerLoop) .ToList() + .Select(versionRecord => { + try { + // In some rare cases a ContentItemVersionRecord without a ContentItemRecord can end up in the DB. + // in that case ContentManager throws a ObjectNotFoundException. + // e.g. NHibernate.ObjectNotFoundException: No row with the given identifier exists[Orchard.ContentManagement.Records.ContentItemRecord#148] + return _contentManager.Get(versionRecord.ContentItemRecord.Id, VersionOptions.VersionRecord(versionRecord.Id)); + } + catch { + return null; + } + }) // In some rare cases a ContentItemRecord without a ContentType can end up in the DB. // We need to filter out such records, otherwise they will crash the ContentManager. - .Where(x => x.ContentItemRecord != null && x.ContentItemRecord.ContentType != null) - .Select(versionRecord => _contentManager.Get(versionRecord.ContentItemRecord.Id, VersionOptions.VersionRecord(versionRecord.Id))) + .Where(content => content != null && content.ContentType != null) .Distinct() .ToList(); - // if no more elements to index, switch to update mode if (contentItems.Count == 0) { indexSettings.Mode = IndexingMode.Update; @@ -288,7 +296,7 @@ namespace Orchard.Indexing.Services { } } while (loop); - } + } // save current state of the index indexSettings.LastIndexedUtc = _clock.UtcNow; @@ -328,12 +336,10 @@ namespace Orchard.Indexing.Services { /// /// Loads the settings file or create a new default one if it doesn't exist /// - public IndexSettings LoadSettings(string indexName) - { + public IndexSettings LoadSettings(string indexName) { var indexSettings = new IndexSettings(); var settingsFilename = GetSettingsFileName(indexName); - if (_appDataFolder.FileExists(settingsFilename)) - { + if (_appDataFolder.FileExists(settingsFilename)) { var content = _appDataFolder.ReadFile(settingsFilename); indexSettings = IndexSettings.Parse(content); } @@ -372,7 +378,7 @@ namespace Orchard.Indexing.Services { if (contentItem == null || contentItem.TypeDefinition == null || contentItem.TypeDefinition.Settings == null) { - return new TypeIndexing {Indexes = ""}; + return new TypeIndexing { Indexes = "" }; } return contentItem.TypeDefinition.Settings.GetModel(); } diff --git a/src/Orchard/ContentManagement/Handlers/DescribeMembersContext.cs b/src/Orchard/ContentManagement/Handlers/DescribeMembersContext.cs index 3fdce3a6d..522afa690 100644 --- a/src/Orchard/ContentManagement/Handlers/DescribeMembersContext.cs +++ b/src/Orchard/ContentManagement/Handlers/DescribeMembersContext.cs @@ -1,6 +1,7 @@ using System; using System.Collections; using Orchard.ContentManagement.FieldStorage; +using Orchard.ContentManagement.MetaData.Models; using Orchard.Localization; namespace Orchard.ContentManagement.Handlers { @@ -8,18 +9,25 @@ namespace Orchard.ContentManagement.Handlers { private readonly Action _processMember; private readonly IFieldStorage _storage; private readonly Action _apply; + private readonly ContentPartFieldDefinition _contentPartFieldDefinition; - public DescribeMembersContext(Action processMember) : this(processMember, null, null) { + public DescribeMembersContext(Action processMember) + : this(processMember, null, null, null) { } public DescribeMembersContext(IFieldStorage storage, Action apply) - : this(null, storage, apply) { + : this(null, storage, apply, null) { } - public DescribeMembersContext(Action processMember, IFieldStorage storage, Action apply) { + public DescribeMembersContext(Action processMember, IFieldStorage storage, Action apply) + : this(null, storage, apply, null) { + } + + public DescribeMembersContext(Action processMember, IFieldStorage storage, Action apply, ContentPartFieldDefinition contentPartFieldDefinition) { _processMember = processMember; _storage = storage; _apply = apply; + _contentPartFieldDefinition = contentPartFieldDefinition; } public DescribeMembersContext Member(string storageName, Type storageType) { @@ -43,6 +51,9 @@ namespace Orchard.ContentManagement.Handlers { var f = enumerate(); var field = Activator.CreateInstance(); field.Storage = _storage; + if (field.PartFieldDefinition == null) { + field.PartFieldDefinition = _contentPartFieldDefinition; + } _apply(f(field)); } From b523b342d646a9a96a3af3bad460081bb86d78c8 Mon Sep 17 00:00:00 2001 From: Matteo Piovanelli Date: Thu, 16 Apr 2020 19:22:20 +0200 Subject: [PATCH 003/112] Added admin search permissions (#8346) --- .../Orchard.Search/ContentAdminMenu.cs | 49 +++++++-- .../Controllers/AdminController.cs | 100 ++++++++++++++++-- 2 files changed, 135 insertions(+), 14 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.Search/ContentAdminMenu.cs b/src/Orchard.Web/Modules/Orchard.Search/ContentAdminMenu.cs index 7edc873fa..716686632 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/ContentAdminMenu.cs +++ b/src/Orchard.Web/Modules/Orchard.Search/ContentAdminMenu.cs @@ -1,11 +1,29 @@ -using Orchard.Environment.Extensions; +using System.Linq; +using Orchard.ContentManagement; +using Orchard.ContentManagement.MetaData; +using Orchard.Core.Contents; +using Orchard.Core.Contents.Settings; +using Orchard.Environment.Extensions; using Orchard.Localization; +using Orchard.Security; using Orchard.UI.Navigation; namespace Orchard.Search { [OrchardFeature("Orchard.Search.Content")] public class ContentAdminMenu : INavigationProvider { - public ContentAdminMenu() { + private readonly IContentDefinitionManager _contentDefinitionManager; + private readonly IContentManager _contentManager; + private readonly IAuthorizer _authorizer; + + public ContentAdminMenu( + IContentDefinitionManager contentDefinitionManager, + IContentManager contentManager, + IAuthorizer authorizer) { + + _contentDefinitionManager = contentDefinitionManager; + _contentManager = contentManager; + _authorizer = authorizer; + T = NullLocalizer.Instance; } @@ -16,11 +34,28 @@ namespace Orchard.Search { } public void GetNavigation(NavigationBuilder builder) { - builder.Add(T("Content"), - menu => menu - .Add(T("Search"), "1.5", item => item.Action("Index", "Admin", new {area = "Orchard.Search"}).LocalNav()) - ); - + // if the user may edit at least one type of Listable content, + // we add the link to the admin menu for them. This is the same + // logic used for Orcahrd.Core.Contents admin menu + var contentTypeDefinitions = _contentDefinitionManager + .ListTypeDefinitions() + .OrderBy(d => d.Name); + var listableContentTypes = contentTypeDefinitions + .Where(ctd => ctd + .Settings + .GetModel() + .Listable); + ContentItem listableCi = null; + foreach (var contentTypeDefinition in listableContentTypes) { + listableCi = _contentManager.New(contentTypeDefinition.Name); + if (_authorizer.Authorize(Permissions.EditContent, listableCi)) { + builder.Add(T("Content"), + menu => menu + .Add(T("Search"), "1.5", item => item.Action("Index", "Admin", new { area = "Orchard.Search" }).LocalNav()) + ); + break; + } + } } } } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Search/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.Search/Controllers/AdminController.cs index bb55f3f35..36b77bef0 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/Controllers/AdminController.cs +++ b/src/Orchard.Web/Modules/Orchard.Search/Controllers/AdminController.cs @@ -1,15 +1,22 @@ using System; +using System.Collections.Generic; +using System.Globalization; using System.Linq; using System.Web.Mvc; using Orchard.Collections; using Orchard.ContentManagement; +using Orchard.ContentManagement.MetaData; +using Orchard.Core.Contents; +using Orchard.Core.Contents.Settings; using Orchard.Environment.Extensions; using Orchard.Indexing; using Orchard.Localization; +using Orchard.Localization.Services; using Orchard.Logging; using Orchard.Search.Helpers; using Orchard.Search.Models; using Orchard.Search.Services; +using Orchard.Security; using Orchard.Settings; using Orchard.UI.Navigation; using Orchard.UI.Notify; @@ -19,14 +26,31 @@ namespace Orchard.Search.Controllers { public class AdminController : Controller { private readonly ISearchService _searchService; private readonly ISiteService _siteService; + private readonly IIndexManager _indexManager; + private readonly IContentDefinitionManager _contentDefinitionManager; + private readonly IContentManager _contentManager; + private readonly IAuthorizer _authorizer; + private readonly ICultureManager _cultureManager; public AdminController( IOrchardServices orchardServices, ISearchService searchService, - ISiteService siteService) { + ISiteService siteService, + IIndexManager indexManager, + IContentDefinitionManager contentDefinitionManager, + IContentManager contentManager, + IAuthorizer authorizer, + ICultureManager cultureManager) { + _searchService = searchService; _siteService = siteService; Services = orchardServices; + _indexManager = indexManager; + _contentDefinitionManager = contentDefinitionManager; + _contentManager = contentManager; + _authorizer = authorizer; + _cultureManager = cultureManager; + T = NullLocalizer.Instance; Logger = NullLogger.Instance; } @@ -42,13 +66,75 @@ namespace Orchard.Search.Controllers { IPageOfItems searchHits = new PageOfItems(new ISearchHit[] { }); try { + // replicate a logic similar to ContentPickerController, but here + // we want to filter results based on authorized types. This is also + // partially replicates the logic in SearchService.Search. + if (!string.IsNullOrWhiteSpace(searchText)) { + // select types + var contentTypeDefinitions = _contentDefinitionManager + .ListTypeDefinitions() + .OrderBy(d => d.Name); + var listableContentTypes = contentTypeDefinitions + .Where(ctd => ctd + .Settings + .GetModel() + .Listable); + ContentItem listableCi = null; + var searchableTypes = new List(); + foreach (var contentTypeDefinition in listableContentTypes) { + listableCi = _contentManager.New(contentTypeDefinition.Name); + if (_authorizer.Authorize(Permissions.EditContent, listableCi)) { + // add the type to the list of types we will filter for + searchableTypes.Add(contentTypeDefinition.Name); + } + } + // we don't even search if no type is allowed + if (searchableTypes.Any()) { + var searchBuilder = _indexManager.HasIndexProvider() + ? _indexManager + .GetSearchIndexProvider() + .CreateSearchBuilder(adminSearchSettingsPart.SearchIndex) + : new NullSearchBuilder(); - searchHits = _searchService.Query( - searchText, pager.Page, pager.PageSize, - searchSettingsPart.FilterCulture, - adminSearchSettingsPart.SearchIndex, - searchSettingsPart.GetSearchFields(adminSearchSettingsPart.SearchIndex), - searchHit => searchHit); + searchBuilder + .Parse(searchSettingsPart + .GetSearchFields(adminSearchSettingsPart.SearchIndex), + searchText); + + foreach (var searchableType in searchableTypes) { + // filter by type + searchBuilder + .WithField("type", searchableType) + .NotAnalyzed() + .AsFilter(); + } + // filter by culture? + if (searchSettingsPart.FilterCulture) { + var culture = _cultureManager.GetCurrentCulture(Services.WorkContext.HttpContext); + + // use LCID as the text representation gets analyzed by the query parser + searchBuilder + .WithField("culture", CultureInfo.GetCultureInfo(culture).LCID) + .AsFilter(); + } + // pagination + var totalCount = searchBuilder.Count(); + if (pager != null) { + searchBuilder = searchBuilder + .Slice( + (pager.Page > 0 ? pager.Page - 1 : 0) * pager.PageSize, + pager.PageSize); + } + // search + var searchResults = searchBuilder.Search(); + // prepare the shape for the page + searchHits = new PageOfItems(searchResults.Select(searchHit => searchHit)) { + PageNumber = pager != null ? pager.Page : 0, + PageSize = pager != null ? (pager.PageSize != 0 ? pager.PageSize : totalCount) : totalCount, + TotalItemCount = totalCount + }; + } + } } catch (Exception exception) { Logger.Error(T("Invalid search query: {0}", exception.Message).Text); From c1374f9be9150b131b1ce3157a760438630ba558 Mon Sep 17 00:00:00 2001 From: Hermes Sbicego Date: Thu, 30 Apr 2020 19:05:57 +0200 Subject: [PATCH 004/112] Reuse Settings_ShellDescriptorRecord during an http request (#8355) --- .../Core/Settings/Descriptor/ShellDescriptorManager.cs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Orchard.Web/Core/Settings/Descriptor/ShellDescriptorManager.cs b/src/Orchard.Web/Core/Settings/Descriptor/ShellDescriptorManager.cs index faf80b3ec..7fd7dcbd4 100644 --- a/src/Orchard.Web/Core/Settings/Descriptor/ShellDescriptorManager.cs +++ b/src/Orchard.Web/Core/Settings/Descriptor/ShellDescriptorManager.cs @@ -13,7 +13,7 @@ namespace Orchard.Core.Settings.Descriptor { private readonly IRepository _shellDescriptorRepository; private readonly IShellDescriptorManagerEventHandler _events; private readonly ShellSettings _shellSettings; - + private ShellDescriptorRecord _shellDescriptorRecord; public ShellDescriptorManager( IRepository shellDescriptorRepository, IShellDescriptorManagerEventHandler events, @@ -51,7 +51,10 @@ namespace Orchard.Core.Settings.Descriptor { } private ShellDescriptorRecord GetDescriptorRecord() { - return _shellDescriptorRepository.Get(x => x != null); + if (_shellDescriptorRecord == null) { + _shellDescriptorRecord = _shellDescriptorRepository.Get(x => x != null); + } + return _shellDescriptorRecord; } public void UpdateShellDescriptor(int priorSerialNumber, IEnumerable enabledFeatures, IEnumerable parameters) { From b2a8e92a5324216a0f00811676231e64327a359c Mon Sep 17 00:00:00 2001 From: Matteo Piovanelli Date: Thu, 30 Apr 2020 19:08:10 +0200 Subject: [PATCH 005/112] Added a new index to CommonPartRecord (#8362) --- src/Orchard.Web/Core/Common/Migrations.cs | 41 +++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/src/Orchard.Web/Core/Common/Migrations.cs b/src/Orchard.Web/Core/Common/Migrations.cs index 99282779d..a3491fb4f 100644 --- a/src/Orchard.Web/Core/Common/Migrations.cs +++ b/src/Orchard.Web/Core/Common/Migrations.cs @@ -136,5 +136,46 @@ namespace Orchard.Core.Common { return 6; } + + public int UpdateFrom6() { + // Studying SQL Server query execution plans we noticed that when the system + // tries to find content items for requests such as + // "The items of type TTT owned by me, ordered from the most recent" + // the existing indexes are not used. SQL Server does an index scan on the + // Primary key for CommonPartRecord. This may lead to annoying deadlocks when + // there are two concurrent transactions that are doing both this kind of query + // as well as an update (or insert) in the CommonPartRecord. + // Tests show that this can be easily fixed by adding a non-clustered index + // with these keys: OwnerId, {one of PublishedUTC, ModifiedUTC, CreatedUTC}. + // That means we need three indexes (one for each DateTime) to support ordering + // on either of them. + + // The queries we analyzed look like (in pseudo sql) + // SELECT TOP (N) * + // FROM + // ContentItemVersionRecord this_ + // inner join ContentItemRecord contentite1_ on this_.ContentItemRecord_id=contentite1_.Id + // inner join CommonPartRecord commonpart2_ on contentite1_.Id=commonpart2.Id + // left outer join ContentTypeRecord contenttyp6_ on contentite1_.ContentType_id=contenttyp6_.Id + // WHERE + // contentite1.ContentType_id = {TTT} + // and commonpart2_.OwnerId = {userid} + // and this_.Published = 1 + // ORDER BY + // commonpart2_PublishedUtc desc + + SchemaBuilder.AlterTable(nameof(CommonPartRecord), table => { + table.CreateIndex($"IDX_{nameof(CommonPartRecord)}_OwnedBy_ByCreation", + nameof(CommonPartRecord.OwnerId), + nameof(CommonPartRecord.CreatedUtc)); + table.CreateIndex($"IDX_{nameof(CommonPartRecord)}_OwnedBy_ByModification", + nameof(CommonPartRecord.OwnerId), + nameof(CommonPartRecord.ModifiedUtc)); + table.CreateIndex($"IDX_{nameof(CommonPartRecord)}_OwnedBy_ByPublication", + nameof(CommonPartRecord.OwnerId), + nameof(CommonPartRecord.PublishedUtc)); + }); + return 7; + } } } \ No newline at end of file From a75203b883442065e42ede86897a091bc28002dc Mon Sep 17 00:00:00 2001 From: Matteo Piovanelli Date: Thu, 30 Apr 2020 19:09:33 +0200 Subject: [PATCH 006/112] Attempted AutoroutePart improvement (#8360) This should ease Database issues, because it short circuits some code paths through aliases. --- .../Implementation/DefaultAliasService.cs | 2 +- .../Services/AutorouteService.cs | 32 +++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/src/Orchard.Web/Modules/Orchard.Alias/Implementation/DefaultAliasService.cs b/src/Orchard.Web/Modules/Orchard.Alias/Implementation/DefaultAliasService.cs index ff6c7471b..ce27e81c2 100644 --- a/src/Orchard.Web/Modules/Orchard.Alias/Implementation/DefaultAliasService.cs +++ b/src/Orchard.Web/Modules/Orchard.Alias/Implementation/DefaultAliasService.cs @@ -28,7 +28,7 @@ namespace Orchard.Alias.Implementation { } public RouteValueDictionary Get(string aliasPath) { - return _aliasStorage.Get(aliasPath).ToRouteValueDictionary(); + return _aliasStorage.Get(aliasPath)?.ToRouteValueDictionary(); } public void Set(string aliasPath, RouteValueDictionary routeValues, string aliasSource, bool isManaged) { diff --git a/src/Orchard.Web/Modules/Orchard.Autoroute/Services/AutorouteService.cs b/src/Orchard.Web/Modules/Orchard.Autoroute/Services/AutorouteService.cs index dbbb46979..b3b90f12e 100644 --- a/src/Orchard.Web/Modules/Orchard.Autoroute/Services/AutorouteService.cs +++ b/src/Orchard.Web/Modules/Orchard.Autoroute/Services/AutorouteService.cs @@ -208,6 +208,38 @@ namespace Orchard.Autoroute.Services { } public bool ProcessPath(AutoroutePart part) { + // Try to get the path from the alias service + var pathRoute = _aliasService.Get(part.Path); + // If we got a route that matches that path + if (pathRoute != null) { + // and that route matches the route for the content item + var itemRoute = _contentManager.GetItemMetadata(part).DisplayRouteValues; + if (itemRoute != null + && pathRoute.Count == itemRoute.Count + && pathRoute.All(x => + // ensure value exists in the other dictionary + itemRoute[x.Key] != null + && x.Value.ToString() + // compare them as strings + .Equals(itemRoute[x.Key].ToString(), StringComparison.InvariantCultureIgnoreCase))) { + // then the path is fine as it is + return true; + } + // How does the above behave in different cases: + // 1. Part with new original path + // The route is not found among the aliases, so processing for it falls + // back to the original code below. + // 2. Path hasn't changed + // If the item is Published, the code above finds it among the aliases + // and this method ends. + // 3. Path is not original (there would be a collision) + // We find from the aliases the item the path points to. Comparing routes, + // we discover they do not match and fall back to the original code below. + // This code branch is basically a short circuit for the case where a ContentItem + // is being updated or published without changes to its path. Hence, it does not + // fix all issues we have with AutoroutePart and concurrency, but it is an + // attempt at mitigating them by preventing database operations in some cases. + } var pathsLikeThis = GetSimilarPaths(part.Path).ToArray(); // Don't include *this* part in the list From 60464035f71617f105dcf88dc65251cc29d0919f Mon Sep 17 00:00:00 2001 From: Matteo Piovanelli Date: Thu, 7 May 2020 19:29:58 +0200 Subject: [PATCH 007/112] Save MemberBindingRecords in memory (#8371) Prevent fetching the same table from the database 5+ times per request by loading it and saving it in a private property for a request. --- .../Services/CustomMemberBindingProvider.cs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.Projections/Services/CustomMemberBindingProvider.cs b/src/Orchard.Web/Modules/Orchard.Projections/Services/CustomMemberBindingProvider.cs index 5b28d941e..20c35d24b 100644 --- a/src/Orchard.Web/Modules/Orchard.Projections/Services/CustomMemberBindingProvider.cs +++ b/src/Orchard.Web/Modules/Orchard.Projections/Services/CustomMemberBindingProvider.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; using System.Linq; using System.Reflection; using Orchard.Data; @@ -16,11 +17,18 @@ namespace Orchard.Projections.Services { _sessionFactoryHolder = sessionFactoryHolder; } + private List memberBindings; public void GetMemberBindings(BindingBuilder builder) { var recordBluePrints = _sessionFactoryHolder.GetSessionFactoryParameters().RecordDescriptors; - foreach(var member in _repository.Table.ToList()) { + // save this in memory once per request, to avoid hitting the database 5+ + // times per projection per request. + if (memberBindings == null) { + memberBindings = _repository.Table.ToList(); + } + + foreach (var member in memberBindings) { var record = recordBluePrints.FirstOrDefault(r => String.Equals(r.Type.FullName, member.Type, StringComparison.OrdinalIgnoreCase)); if (record == null) { @@ -28,7 +36,7 @@ namespace Orchard.Projections.Services { } var property = record.Type.GetProperty(member.Member, BindingFlags.Instance | BindingFlags.Public); - if(property == null) { + if (property == null) { continue; } From 9392718d3e63c056fcea0a59883b288f6491bb30 Mon Sep 17 00:00:00 2001 From: Matteo Piovanelli Date: Thu, 7 May 2020 19:35:53 +0200 Subject: [PATCH 008/112] Cache list of configured layers (#8373) On every page load on frontend we were querying for all existing layers to test for the ones that are currently active. Since that information is not bound to change often, we added a cache layer to prevent querying every time. The cache is evicted whenever a Layer gets updated. --- .../Handlers/LayerPartHandler.cs | 26 +++++++++++++++++-- .../Orchard.Widgets/Models/LayerPart.cs | 5 ++++ .../Services/DefaultLayerEvaluationService.cs | 22 ++++++++++++++-- 3 files changed, 49 insertions(+), 4 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Handlers/LayerPartHandler.cs b/src/Orchard.Web/Modules/Orchard.Widgets/Handlers/LayerPartHandler.cs index 89d929582..22f6e12d0 100644 --- a/src/Orchard.Web/Modules/Orchard.Widgets/Handlers/LayerPartHandler.cs +++ b/src/Orchard.Web/Modules/Orchard.Widgets/Handlers/LayerPartHandler.cs @@ -1,12 +1,30 @@ -using Orchard.ContentManagement; +using Orchard.Caching; +using Orchard.ContentManagement; using Orchard.ContentManagement.Handlers; using Orchard.Data; using Orchard.Widgets.Models; namespace Orchard.Widgets.Handlers { public class LayerPartHandler : ContentHandler { - public LayerPartHandler(IRepository layersRepository) { + private readonly ISignals _signals; + public LayerPartHandler( + IRepository layersRepository, + ISignals signals) { + Filters.Add(StorageFilter.For(layersRepository)); + _signals = signals; + + // Evict cached content when updated, removed or destroyed. + OnUpdated( + (context, part) => Invalidate()); + OnImported( + (context, part) => Invalidate()); + OnPublished( + (context, part) => Invalidate()); + OnRemoved( + (context, part) => Invalidate()); + OnDestroyed( + (context, part) => Invalidate()); } protected override void GetItemMetadata(GetContentItemMetadataContext context) { @@ -16,5 +34,9 @@ namespace Orchard.Widgets.Handlers { context.Metadata.Identity.Add("Layer.LayerName", part.Name); } } + + private void Invalidate() { + _signals.Trigger(LayerPart.AllLayersCacheEvictSignal); + } } } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Models/LayerPart.cs b/src/Orchard.Web/Modules/Orchard.Widgets/Models/LayerPart.cs index 02f728819..2ee3ede03 100644 --- a/src/Orchard.Web/Modules/Orchard.Widgets/Models/LayerPart.cs +++ b/src/Orchard.Web/Modules/Orchard.Widgets/Models/LayerPart.cs @@ -29,5 +29,10 @@ namespace Orchard.Widgets.Models { get { return Retrieve(x => x.LayerRule); } set { Store(x => x.LayerRule, value); } } + + public static string AllLayersCacheEvictSignal = + "LayerPart_AllLayers_EvictCache"; + public static string AllLayersCacheKey = + "LayerPart_AllLayers_CacheKey"; } } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Services/DefaultLayerEvaluationService.cs b/src/Orchard.Web/Modules/Orchard.Widgets/Services/DefaultLayerEvaluationService.cs index 4f9633deb..8cb36a26a 100644 --- a/src/Orchard.Web/Modules/Orchard.Widgets/Services/DefaultLayerEvaluationService.cs +++ b/src/Orchard.Web/Modules/Orchard.Widgets/Services/DefaultLayerEvaluationService.cs @@ -6,17 +6,27 @@ using Orchard.Logging; using Orchard.Widgets.Models; using Orchard.ContentManagement; using Orchard.ContentManagement.Utilities; +using Orchard.Caching; namespace Orchard.Widgets.Services{ public class DefaultLayerEvaluationService : ILayerEvaluationService { private readonly IConditionManager _conditionManager; private readonly IOrchardServices _orchardServices; + private readonly ICacheManager _cacheManager; + private readonly ISignals _signals; private readonly LazyField _activeLayerIDs; - public DefaultLayerEvaluationService(IConditionManager conditionManager, IOrchardServices orchardServices) { + public DefaultLayerEvaluationService( + IConditionManager conditionManager, + IOrchardServices orchardServices, + ICacheManager cacheManager, + ISignals signals) { + _conditionManager = conditionManager; _orchardServices = orchardServices; + _cacheManager = cacheManager; + _signals = signals; Logger = NullLogger.Instance; T = NullLocalizer.Instance; @@ -42,7 +52,15 @@ namespace Orchard.Widgets.Services{ // Once the Condition Engine is done: // Get Layers and filter by zone and rule // NOTE: .ForType("Layer") is faster than .Query() - var activeLayers = _orchardServices.ContentManager.Query().ForType("Layer").List(); + var activeLayers = _cacheManager.Get(LayerPart.AllLayersCacheKey, true, ctx => { + // invalidation signal + ctx.Monitor(_signals.When(LayerPart.AllLayersCacheEvictSignal)); + // cache + return _orchardServices + .ContentManager + .Query() + .ForType("Layer").List(); + }); var activeLayerIds = new List(); foreach (var activeLayer in activeLayers) { From f581d235d2e23994fea5ad5073262b3b345aa453 Mon Sep 17 00:00:00 2001 From: Matteo Piovanelli Date: Thu, 14 May 2020 19:29:59 +0200 Subject: [PATCH 009/112] Memorize query results in blog service (#8374) The query for all published blogs is being called twice while building the admin menu, so we are memorizing its results. --- .../Modules/Orchard.Blogs/Services/BlogService.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Services/BlogService.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Services/BlogService.cs index b431dabca..9ed5f9b1e 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Services/BlogService.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Services/BlogService.cs @@ -51,8 +51,14 @@ namespace Orchard.Blogs.Services { return blogPart == null ? null : blogPart.ContentItem; } + private IEnumerable _publishedBlogs; public IEnumerable Get() { - return Get(VersionOptions.Published); + // this is currently called at least twice per request on the + // back-office, both times by the code building the admin menu. + if (_publishedBlogs == null) { + _publishedBlogs = Get(VersionOptions.Published); + } + return _publishedBlogs; } public IEnumerable Get(VersionOptions versionOptions) { From 488e18d11a5aea36f0b2f5b19fc6871ceab1c2a7 Mon Sep 17 00:00:00 2001 From: Matteo Piovanelli Date: Thu, 21 May 2020 19:08:12 +0200 Subject: [PATCH 010/112] Updated UI for projections (#8380) Some textboxes were too small for the actual text users would generally write in them. Those meant to hold HTML have been converted to textareas. --- .../Providers/Layouts/GridLayoutForms.cs | 2 +- .../Providers/Layouts/RawLayoutForms.cs | 6 +++--- .../Orchard.Projections/Views/Property/Edit.cshtml | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.Projections/Providers/Layouts/GridLayoutForms.cs b/src/Orchard.Web/Modules/Orchard.Projections/Providers/Layouts/GridLayoutForms.cs index bf4ddd123..897155547 100644 --- a/src/Orchard.Web/Modules/Orchard.Projections/Providers/Layouts/GridLayoutForms.cs +++ b/src/Orchard.Web/Modules/Orchard.Projections/Providers/Layouts/GridLayoutForms.cs @@ -86,7 +86,7 @@ namespace Orchard.Projections.Providers.Layouts { Description: T("The class to provide on each cell."), Classes: new[] { "text medium", "tokenized" } ), - _EmptyCell: Shape.TextBox( + _EmptyCell: Shape.TextArea( Id: "empty-cell", Name: "EmptyCell", Title: T("Empty Cell"), Description: T("The HTML to render as empty cells to fill a row. (e.g.,  "), diff --git a/src/Orchard.Web/Modules/Orchard.Projections/Providers/Layouts/RawLayoutForms.cs b/src/Orchard.Web/Modules/Orchard.Projections/Providers/Layouts/RawLayoutForms.cs index d2aaf6535..393b48582 100644 --- a/src/Orchard.Web/Modules/Orchard.Projections/Providers/Layouts/RawLayoutForms.cs +++ b/src/Orchard.Web/Modules/Orchard.Projections/Providers/Layouts/RawLayoutForms.cs @@ -53,19 +53,19 @@ namespace Orchard.Projections.Providers.Layouts { Description: T("The class to provide on each item."), Classes: new[] { "text medium", "tokenized" } ), - _Prepend: Shape.TextBox( + _Prepend: Shape.TextArea( Id: "prepend", Name: "Prepend", Title: T("Prepend"), Description: T("Some HTML to insert before the first element."), Classes: new[] { "text medium", "tokenized" } ), - _Separator: Shape.TextBox( + _Separator: Shape.TextArea( Id: "separator", Name: "Separator", Title: T("Separator"), Description: T("Some HTML to insert between two items."), Classes: new[] { "text medium", "tokenized" } ), - _Append: Shape.TextBox( + _Append: Shape.TextArea( Id: "append", Name: "Append", Title: T("Append"), Description: T("Some HTML to insert after the last element."), diff --git a/src/Orchard.Web/Modules/Orchard.Projections/Views/Property/Edit.cshtml b/src/Orchard.Web/Modules/Orchard.Projections/Views/Property/Edit.cshtml index 8496db382..4d07192d6 100644 --- a/src/Orchard.Web/Modules/Orchard.Projections/Views/Property/Edit.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Projections/Views/Property/Edit.cshtml @@ -49,8 +49,8 @@
- @Html.TextBoxFor(m => m.Label, new { @class = "text medium tokenized" }) - @T("The text to display as a label for this property.") + @Html.TextBoxFor(m => m.Label, new { @class = "text large tokenized" }) + @T("The text to display as a label for this property. It may include HTML.")
@@ -117,7 +117,7 @@
- @Html.TextBoxFor(m => m.NoResultText, new { @class = "text medium tokenized" }) + @Html.TextBoxFor(m => m.NoResultText, new { @class = "text large tokenized" }) @T("Text to display when the property is empty.")
@@ -149,7 +149,7 @@
- @Html.TextBoxFor(m => m.RewriteText, new { @class = "text large tokenized" }) + @Html.TextAreaFor(m => m.RewriteText, new { @class = "text large tokenized" }) @T("The text to write for this field. It may include HTML. {Text} can be used to inject the current property text.")
From f0c5b62b2076b451f3fb611f683989993f587c04 Mon Sep 17 00:00:00 2001 From: Matteo Piovanelli Date: Fri, 5 Jun 2020 12:37:21 +0200 Subject: [PATCH 011/112] Process ignored paths while being aware of RequestUrlPrefix (#8384) * Process ignored paths while being aware of RequestUrlPrefix * Fix: I had moved a Trim to the wrong place * Fixed issue with empty/uninitialized null set of ignored urls --- .../Filters/OutputCacheFilter.cs | 70 ++++++++++++++++++- 1 file changed, 69 insertions(+), 1 deletion(-) diff --git a/src/Orchard.Web/Modules/Orchard.OutputCache/Filters/OutputCacheFilter.cs b/src/Orchard.Web/Modules/Orchard.OutputCache/Filters/OutputCacheFilter.cs index 154c85c26..49743977d 100644 --- a/src/Orchard.Web/Modules/Orchard.OutputCache/Filters/OutputCacheFilter.cs +++ b/src/Orchard.Web/Modules/Orchard.OutputCache/Filters/OutputCacheFilter.cs @@ -80,6 +80,7 @@ namespace Orchard.OutputCache.Filters { private string _invariantCacheKey; private bool _transformRedirect; private bool _isCachingRequest; + private IEnumerable _ignoredRelativePaths; public void OnActionExecuting(ActionExecutingContext filterContext) { @@ -325,7 +326,7 @@ namespace Orchard.OutputCache.Filters { } // Don't cache ignored URLs. - if (IsIgnoredUrl(filterContext.RequestContext.HttpContext.Request.AppRelativeCurrentExecutionFilePath, CacheSettings.IgnoredUrls)) { + if (IsIgnoredUrl(filterContext.RequestContext.HttpContext.Request.AppRelativeCurrentExecutionFilePath)) { Logger.Debug("Request for item '{0}' ignored because the URL is configured as ignored.", itemDescriptor); return false; } @@ -490,6 +491,19 @@ namespace Orchard.OutputCache.Filters { } } + private IEnumerable IgnoredRelativePaths { + get { + return _ignoredRelativePaths + ?? (_ignoredRelativePaths = _cacheManager.Get($"{CacheSettings.CacheKey}_IgnoredUrls", true, ContextBoundObject => { + ContextBoundObject.Monitor(_signals.When(CacheSettings.CacheKey)); + return CacheSettings.IgnoredUrls + ?.Select(s => s.TrimStart(new[] { '~' }).Trim()) + ?.Where(s => !string.IsNullOrWhiteSpace(s) && !s.StartsWith("#")) + ?? Enumerable.Empty(); + })); + } + } + private void ServeCachedItem(ActionExecutingContext filterContext, CacheItem cacheItem) { var response = filterContext.HttpContext.Response; var request = filterContext.HttpContext.Request; @@ -574,6 +588,37 @@ namespace Orchard.OutputCache.Filters { } } + protected virtual bool IsIgnoredUrl(string url) { + if (IgnoredRelativePaths == null || !IgnoredRelativePaths.Any()) { + return false; + } + + url = url.TrimStart(new[] { '~' }); + + if (string.IsNullOrWhiteSpace(_shellSettings.RequestUrlPrefix)) { + foreach (var relativePath in IgnoredRelativePaths) { + if (String.Equals(relativePath, url, StringComparison.OrdinalIgnoreCase)) { + return true; + } + } + } else { + // if there is a RequestUrlPrefix, we want to check by also removing it from the + // url we are verifying, because the configuration might have been done without it + var tmp = url.TrimStart(new[] { '/' }); + if (tmp.StartsWith(_shellSettings.RequestUrlPrefix)) { + tmp = tmp.Substring(_shellSettings.RequestUrlPrefix.Length); + } + foreach (var relativePath in IgnoredRelativePaths) { + if (String.Equals(relativePath, url, StringComparison.OrdinalIgnoreCase) + || String.Equals(relativePath, tmp, StringComparison.OrdinalIgnoreCase)) { + return true; + } + } + } + + return false; + } + protected virtual bool IsIgnoredUrl(string url, IEnumerable ignoredUrls) { if (ignoredUrls == null || !ignoredUrls.Any()) { return false; @@ -596,6 +641,29 @@ namespace Orchard.OutputCache.Filters { return true; } } + // repeat the check by removing the RequestUrlPrefix if it exists. + if (!string.IsNullOrWhiteSpace(_shellSettings.RequestUrlPrefix)) { + var tmp = url.TrimStart(new[] { '/' }); + if (tmp.StartsWith(_shellSettings.RequestUrlPrefix)) { + tmp = tmp.Substring(_shellSettings.RequestUrlPrefix.Length); + foreach (var ignoredUrl in ignoredUrls) { + var relativePath = ignoredUrl.TrimStart(new[] { '~' }).Trim(); + if (String.IsNullOrWhiteSpace(relativePath)) { + continue; + } + + // Ignore comments + if (relativePath.StartsWith("#")) { + continue; + } + + if (String.Equals(relativePath, tmp, StringComparison.OrdinalIgnoreCase)) { + return true; + } + } + } + } + return false; } From 2bc7079593d6336edf593d40c6f235b23d62cdcd Mon Sep 17 00:00:00 2001 From: Matteo Piovanelli Date: Fri, 5 Jun 2020 12:37:35 +0200 Subject: [PATCH 012/112] tokens sort criteria (#8382) * Tokenized state for sort criteria * Tokenized state also in the other place where sort criteria are used --- .../Services/ProjectionManager.cs | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.Projections/Services/ProjectionManager.cs b/src/Orchard.Web/Modules/Orchard.Projections/Services/ProjectionManager.cs index 6f03d1c94..6a1a0368e 100644 --- a/src/Orchard.Web/Modules/Orchard.Projections/Services/ProjectionManager.cs +++ b/src/Orchard.Web/Modules/Orchard.Projections/Services/ProjectionManager.cs @@ -166,10 +166,12 @@ namespace Orchard.Projections.Services { // iterate over each sort criteria to apply the alterations to the query object foreach (var sortCriterion in queryRecord.SortCriteria.OrderBy(s => s.Position)) { + var tokenizedState = _tokenizer.Replace(sortCriterion.State, tokens); var sortCriterionContext = new SortCriterionContext { Query = groupQuery, - State = FormParametersHelper.ToDynamic(sortCriterion.State), - QueryPartRecord = queryRecord + State = FormParametersHelper.ToDynamic(tokenizedState), + QueryPartRecord = queryRecord, + Tokens = tokens }; string category = sortCriterion.Category; @@ -212,7 +214,8 @@ namespace Orchard.Projections.Services { var filterContext = new FilterContext { Query = contentQuery, State = FormParametersHelper.ToDynamic(tokenizedState), - QueryPartRecord = queryRecord + QueryPartRecord = queryRecord, + Tokens = tokens }; string category = filter.Category; @@ -236,10 +239,12 @@ namespace Orchard.Projections.Services { // iterate over each sort criteria to apply the alterations to the query object foreach (var sortCriterion in sortCriteria.OrderBy(s => s.Position)) { + var tokenizedState = _tokenizer.Replace(sortCriterion.State, tokens); var sortCriterionContext = new SortCriterionContext { Query = contentQuery, - State = FormParametersHelper.ToDynamic(sortCriterion.State), - QueryPartRecord = queryRecord + State = FormParametersHelper.ToDynamic(tokenizedState), + QueryPartRecord = queryRecord, + Tokens = tokens }; string category = sortCriterion.Category; From df2bdb3e5cc7bdf3357450c25b49fe7cc5f61a9b Mon Sep 17 00:00:00 2001 From: Imran Azad Date: Thu, 18 Jun 2020 18:19:44 +0100 Subject: [PATCH 013/112] Remove lock from the dictionary when the task has completed. (#8395) Fixes #8391 --- src/Orchard/Tasks/Locking/Services/DistributedLockService.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Orchard/Tasks/Locking/Services/DistributedLockService.cs b/src/Orchard/Tasks/Locking/Services/DistributedLockService.cs index 078e40a6d..c66e7d1fb 100644 --- a/src/Orchard/Tasks/Locking/Services/DistributedLockService.cs +++ b/src/Orchard/Tasks/Locking/Services/DistributedLockService.cs @@ -104,6 +104,7 @@ namespace Orchard.Tasks.Locking.Services { Logger.Debug("Record for lock '{0}' already owned by current machine or was successfully created; creating lock object.", internalName); dLock = new DistributedLock(name, internalName, releaseLockAction: () => { + _locks.Remove(monitorObj); Monitor.Exit(monitorObj); DeleteDistributedLockRecord(internalName); }); From c62203116f5977c37d46d86ea71a0192360c998d Mon Sep 17 00:00:00 2001 From: Imran Azad Date: Thu, 9 Jul 2020 18:09:35 +0100 Subject: [PATCH 014/112] Update DistributedLockService.cs (#8398) --- .../Tasks/Locking/Services/DistributedLockService.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Orchard/Tasks/Locking/Services/DistributedLockService.cs b/src/Orchard/Tasks/Locking/Services/DistributedLockService.cs index c66e7d1fb..efa506a9e 100644 --- a/src/Orchard/Tasks/Locking/Services/DistributedLockService.cs +++ b/src/Orchard/Tasks/Locking/Services/DistributedLockService.cs @@ -46,7 +46,7 @@ namespace Orchard.Tasks.Locking.Services { return true; } - Logger.Warning("Failed to acquire lock '{0}' within the specified timeout ({1}).", name, timeout); + Logger.Debug("Failed to acquire lock '{0}' within the specified timeout ({1}).", name, timeout); } catch (Exception ex) { Logger.Error(ex, "Error while trying to acquire lock '{0}'.", name); @@ -112,7 +112,6 @@ namespace Orchard.Tasks.Locking.Services { _locks.Add(monitorObj, dLock); return true; } - return false; }); @@ -121,7 +120,9 @@ namespace Orchard.Tasks.Locking.Services { if (throwOnTimeout) throw new TimeoutException(String.Format("Failed to acquire lock '{0}' within the specified timeout ({1}).", internalName, timeout)); - + else + Monitor.Exit(monitorObj); + return null; } } From 868ce12ad63de121703222ad86afdb739d3e864c Mon Sep 17 00:00:00 2001 From: Matteo Piovanelli Date: Thu, 30 Jul 2020 19:04:43 +0200 Subject: [PATCH 015/112] fix for CPF when other scripts are also adding to sessionStorage (#8404) --- .../Modules/Orchard.ContentPicker/ResourceManifest.cs | 2 +- .../Scripts/SelectableContentTab.js | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.ContentPicker/ResourceManifest.cs b/src/Orchard.Web/Modules/Orchard.ContentPicker/ResourceManifest.cs index 021889434..ad8e46a55 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentPicker/ResourceManifest.cs +++ b/src/Orchard.Web/Modules/Orchard.ContentPicker/ResourceManifest.cs @@ -5,7 +5,7 @@ namespace Orchard.ContentPicker { public void BuildManifests(ResourceManifestBuilder builder) { var manifest = builder.Add(); manifest.DefineScript("ContentPicker").SetUrl("ContentPicker.js", "ContentPicker.js").SetDependencies("jQuery"); - manifest.DefineScript("SelectableContentTab").SetUrl("SelectableContentTab.js", "SelectableContentTab.js").SetDependencies("jQuery"); + manifest.DefineScript("SelectableContentTab").SetUrl("SelectableContentTab.js?v=1.1", "SelectableContentTab.js?v=1.1").SetDependencies("jQuery"); } } } diff --git a/src/Orchard.Web/Modules/Orchard.ContentPicker/Scripts/SelectableContentTab.js b/src/Orchard.Web/Modules/Orchard.ContentPicker/Scripts/SelectableContentTab.js index 3e230a5b8..cfd8c8a60 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentPicker/Scripts/SelectableContentTab.js +++ b/src/Orchard.Web/Modules/Orchard.ContentPicker/Scripts/SelectableContentTab.js @@ -32,8 +32,13 @@ $('.button.addSelected').on('click', function () { var itemsToAdd = new Array(); for (var i = 0; i < sessionStorage.length; i++) { - var data = window.sessionStorage.getItem(sessionStorage.key(i)); - itemsToAdd.push(JSON.parse(data)); + var key = sessionStorage.key(i); + // only add the item if the key is an integer: other scripts may be + // adding stuff to sessionStorage + if (!isNaN(key - parseInt(key))) { + var data = window.sessionStorage.getItem(sessionStorage.key(i)); + itemsToAdd.push(JSON.parse(data)); + } } window.sessionStorage.clear(); window.opener.jQuery[query("callback")](itemsToAdd); From c566e12abde4552a1f47f797f66edc7e3024520c Mon Sep 17 00:00:00 2001 From: Hermes Sbicego Date: Thu, 3 Sep 2020 19:07:47 +0200 Subject: [PATCH 016/112] Fixes Boolean Conversion error (#8393) --- .../Mvc/ModelBinders/BooleanBinderProvider.cs | 26 +++++++++++++++++++ src/Orchard/Orchard.Framework.csproj | 1 + 2 files changed, 27 insertions(+) create mode 100644 src/Orchard/Mvc/ModelBinders/BooleanBinderProvider.cs diff --git a/src/Orchard/Mvc/ModelBinders/BooleanBinderProvider.cs b/src/Orchard/Mvc/ModelBinders/BooleanBinderProvider.cs new file mode 100644 index 000000000..4de20c9a5 --- /dev/null +++ b/src/Orchard/Mvc/ModelBinders/BooleanBinderProvider.cs @@ -0,0 +1,26 @@ +using System; +using System.Collections.Generic; +using System.Web.Mvc; + +namespace Orchard.Mvc.ModelBinders { + public class BooleanBinderProvider : IModelBinderProvider, IModelBinder { + + public IEnumerable GetModelBinders() { + return new[] { + new ModelBinderDescriptor { + ModelBinder = this, + Type = typeof(bool) + } + }; + } + + public object BindModel(ControllerContext controllerContext, ModelBindingContext bindingContext) { + var value = false; + var requestBooleanValue = controllerContext.HttpContext.Request[bindingContext.ModelName].Split(',')[0]; //Html.CheckBox and Html.CheckBoxFor return "true,false" string + if (!bool.TryParse(requestBooleanValue, out value)) { + bindingContext.ModelState.AddModelError(bindingContext.ModelName, new FormatException()); + } + return value; + } + } +} diff --git a/src/Orchard/Orchard.Framework.csproj b/src/Orchard/Orchard.Framework.csproj index c9f494184..60e9f9128 100644 --- a/src/Orchard/Orchard.Framework.csproj +++ b/src/Orchard/Orchard.Framework.csproj @@ -182,6 +182,7 @@ + From 3ceda381c54ca24cbcaa2ea17db4898fc9a12df1 Mon Sep 17 00:00:00 2001 From: Hermes Sbicego Date: Fri, 4 Sep 2020 09:12:10 +0200 Subject: [PATCH 017/112] Fix/8392 remeber me model state exception (#8410) @sebastienros this fixes the possible NRE that would happen for absent models from merged #8393 (see your comment there https://github.com/OrchardCMS/Orchard/pull/8393#issuecomment-686630198) --- src/Orchard/Mvc/ModelBinders/BooleanBinderProvider.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Orchard/Mvc/ModelBinders/BooleanBinderProvider.cs b/src/Orchard/Mvc/ModelBinders/BooleanBinderProvider.cs index 4de20c9a5..13905d3b8 100644 --- a/src/Orchard/Mvc/ModelBinders/BooleanBinderProvider.cs +++ b/src/Orchard/Mvc/ModelBinders/BooleanBinderProvider.cs @@ -16,6 +16,7 @@ namespace Orchard.Mvc.ModelBinders { public object BindModel(ControllerContext controllerContext, ModelBindingContext bindingContext) { var value = false; + if (string.IsNullOrWhiteSpace(controllerContext.HttpContext.Request[bindingContext.ModelName])) return false; var requestBooleanValue = controllerContext.HttpContext.Request[bindingContext.ModelName].Split(',')[0]; //Html.CheckBox and Html.CheckBoxFor return "true,false" string if (!bool.TryParse(requestBooleanValue, out value)) { bindingContext.ModelState.AddModelError(bindingContext.ModelName, new FormatException()); From 6dc4f62a9810e8a50f4a765690f116d83e006836 Mon Sep 17 00:00:00 2001 From: Matteo Piovanelli Date: Mon, 7 Sep 2020 16:20:31 +0200 Subject: [PATCH 018/112] Removed changes to model bindings (#8412) This is the same as reverting 1.10.x to commit 868ce12ad63de121703222ad86afdb739d3e864c --- .../Mvc/ModelBinders/BooleanBinderProvider.cs | 27 ------------------- src/Orchard/Orchard.Framework.csproj | 1 - 2 files changed, 28 deletions(-) delete mode 100644 src/Orchard/Mvc/ModelBinders/BooleanBinderProvider.cs diff --git a/src/Orchard/Mvc/ModelBinders/BooleanBinderProvider.cs b/src/Orchard/Mvc/ModelBinders/BooleanBinderProvider.cs deleted file mode 100644 index 13905d3b8..000000000 --- a/src/Orchard/Mvc/ModelBinders/BooleanBinderProvider.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Web.Mvc; - -namespace Orchard.Mvc.ModelBinders { - public class BooleanBinderProvider : IModelBinderProvider, IModelBinder { - - public IEnumerable GetModelBinders() { - return new[] { - new ModelBinderDescriptor { - ModelBinder = this, - Type = typeof(bool) - } - }; - } - - public object BindModel(ControllerContext controllerContext, ModelBindingContext bindingContext) { - var value = false; - if (string.IsNullOrWhiteSpace(controllerContext.HttpContext.Request[bindingContext.ModelName])) return false; - var requestBooleanValue = controllerContext.HttpContext.Request[bindingContext.ModelName].Split(',')[0]; //Html.CheckBox and Html.CheckBoxFor return "true,false" string - if (!bool.TryParse(requestBooleanValue, out value)) { - bindingContext.ModelState.AddModelError(bindingContext.ModelName, new FormatException()); - } - return value; - } - } -} diff --git a/src/Orchard/Orchard.Framework.csproj b/src/Orchard/Orchard.Framework.csproj index 60e9f9128..c9f494184 100644 --- a/src/Orchard/Orchard.Framework.csproj +++ b/src/Orchard/Orchard.Framework.csproj @@ -182,7 +182,6 @@ - From b528ecd1e0c2b6169f8756240bdbae38207d588c Mon Sep 17 00:00:00 2001 From: Matteo Piovanelli Date: Fri, 11 Sep 2020 11:02:53 +0200 Subject: [PATCH 019/112] New version of Boolean Binder Provider (#8413) * New version of Boolean Binder Provider * Use Convert.ToBoolean(string) rather than ValueProviderResult.ConvertTo(bool) --- .../Mvc/ModelBinders/BooleanBinderProvider.cs | 27 +++++++++++++++++++ src/Orchard/Orchard.Framework.csproj | 1 + 2 files changed, 28 insertions(+) create mode 100644 src/Orchard/Mvc/ModelBinders/BooleanBinderProvider.cs diff --git a/src/Orchard/Mvc/ModelBinders/BooleanBinderProvider.cs b/src/Orchard/Mvc/ModelBinders/BooleanBinderProvider.cs new file mode 100644 index 000000000..50cae3434 --- /dev/null +++ b/src/Orchard/Mvc/ModelBinders/BooleanBinderProvider.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.Web.Mvc; + +namespace Orchard.Mvc.ModelBinders { + public class BooleanBinderProvider : IModelBinderProvider, IModelBinder { + + public IEnumerable GetModelBinders() { + return new[] { + new ModelBinderDescriptor { + ModelBinder = this, + Type = typeof(bool) + } + }; + } + + public object BindModel(ControllerContext controllerContext, ModelBindingContext bindingContext) { + var value = false; + try { + value = Convert.ToBoolean(bindingContext.ValueProvider.GetValue(bindingContext.ModelName).AttemptedValue); + } catch { + bindingContext.ModelState.AddModelError(bindingContext.ModelName, new FormatException()); + } + return value; + } + } +} diff --git a/src/Orchard/Orchard.Framework.csproj b/src/Orchard/Orchard.Framework.csproj index c9f494184..60e9f9128 100644 --- a/src/Orchard/Orchard.Framework.csproj +++ b/src/Orchard/Orchard.Framework.csproj @@ -182,6 +182,7 @@ + From f67e6b3695d1cc488d01ed5a12bd54ed2d0405f9 Mon Sep 17 00:00:00 2001 From: Matteo Piovanelli Date: Fri, 18 Sep 2020 08:40:44 +0200 Subject: [PATCH 020/112] Upgrade host resolution (#8387) * Reverted changes to RunningShellTable and then changed the way shells are sorted, so we can correctly give "priority" to tenants based on their prefix. Added test adapter reference to Orchard.Framework.Tests so tests can be run in the latest VS 2017. Fixed a test that was failing to account for the order the shells were being processed. * Removed some stuff from csproj that vs had added --- .../Environment/RunningShellTableTests.cs | 3 ++- .../Orchard.Framework.Tests.csproj | 1 + src/Orchard.Tests/packages.config | 1 + src/Orchard/Environment/RunningShellTable.cs | 27 +++++++++++-------- 4 files changed, 20 insertions(+), 12 deletions(-) diff --git a/src/Orchard.Tests/Environment/RunningShellTableTests.cs b/src/Orchard.Tests/Environment/RunningShellTableTests.cs index 0d5097128..88fe962a5 100644 --- a/src/Orchard.Tests/Environment/RunningShellTableTests.cs +++ b/src/Orchard.Tests/Environment/RunningShellTableTests.cs @@ -128,9 +128,10 @@ namespace Orchard.Tests.Environment { var settingsG = new ShellSettings { Name = "Gamma", RequestUrlHost = "wiki.example.com" }; var settingsD = new ShellSettings { Name = "Delta", RequestUrlPrefix = "Quux" }; table.Add(settings); + // add this shell first, because the order the shells where processed used to matter + table.Add(settingsG); table.Add(settingsA); table.Add(settingsB); - table.Add(settingsG); table.Add(settingsD); Assert.That(table.Match(new StubHttpContext("~/foo/bar", "wiki.example.com")), Is.EqualTo(settingsA).Using(new ShellComparer())); diff --git a/src/Orchard.Tests/Orchard.Framework.Tests.csproj b/src/Orchard.Tests/Orchard.Framework.Tests.csproj index 89155c400..a3ccd07a6 100644 --- a/src/Orchard.Tests/Orchard.Framework.Tests.csproj +++ b/src/Orchard.Tests/Orchard.Framework.Tests.csproj @@ -1,5 +1,6 @@  + Debug AnyCPU diff --git a/src/Orchard.Tests/packages.config b/src/Orchard.Tests/packages.config index c43cb3d10..786c65803 100644 --- a/src/Orchard.Tests/packages.config +++ b/src/Orchard.Tests/packages.config @@ -17,4 +17,5 @@ + \ No newline at end of file diff --git a/src/Orchard/Environment/RunningShellTable.cs b/src/Orchard/Environment/RunningShellTable.cs index b5322f7c4..b4c2f1ee7 100644 --- a/src/Orchard/Environment/RunningShellTable.cs +++ b/src/Orchard/Environment/RunningShellTable.cs @@ -84,7 +84,12 @@ namespace Orchard.Environment { .Select(h => new ShellSettings(s) {RequestUrlHost = h})) .GroupBy(s => s.RequestUrlHost ?? string.Empty) .OrderByDescending(g => g.Key.Length) - .ToDictionary(x => x.Key, x => x.AsEnumerable(), StringComparer.OrdinalIgnoreCase); + .ToDictionary( + x => x.Key, + // we want to keep this ordered so that, for the same host, shells with a configured + // RequestUrlPrefix are tested first when trying to match them to coming requests. + x => x.OrderByDescending(ss => (ss.RequestUrlPrefix ?? "").Length).AsEnumerable(), + StringComparer.OrdinalIgnoreCase); if (unqualified.Count() == 1) { // only one shell had no request url criteria @@ -164,20 +169,20 @@ namespace Orchard.Environment { shells = _shellsByHost[subHostKey]; } } - + // looking for a request url prefix match var mostQualifiedMatch = shells.FirstOrDefault(settings => { - if (settings.State == TenantState.Disabled) { - return false; - } + if (settings.State == TenantState.Disabled) { + return false; + } - if (String.IsNullOrWhiteSpace(settings.RequestUrlPrefix)) { - return true; - } - - return key.Equals(host + "/" + settings.RequestUrlPrefix, StringComparison.OrdinalIgnoreCase); - }); + if (String.IsNullOrWhiteSpace(settings.RequestUrlPrefix)) { + return true; + } + return key.Equals(host + "/" + settings.RequestUrlPrefix, StringComparison.OrdinalIgnoreCase); + }); + return mostQualifiedMatch ?? _fallback; }); From 66a611fbf373f0f8563536aeb3d0ceee7a9ca264 Mon Sep 17 00:00:00 2001 From: Matteo Piovanelli Date: Fri, 18 Sep 2020 08:40:56 +0200 Subject: [PATCH 021/112] Handle the case where a form sends more than one attempted value for a boolean (#8416) --- .../Mvc/ModelBinders/BooleanBinderProvider.cs | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/Orchard/Mvc/ModelBinders/BooleanBinderProvider.cs b/src/Orchard/Mvc/ModelBinders/BooleanBinderProvider.cs index 50cae3434..2896d8325 100644 --- a/src/Orchard/Mvc/ModelBinders/BooleanBinderProvider.cs +++ b/src/Orchard/Mvc/ModelBinders/BooleanBinderProvider.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Web.Mvc; +using System.Linq; namespace Orchard.Mvc.ModelBinders { public class BooleanBinderProvider : IModelBinderProvider, IModelBinder { @@ -17,7 +18,20 @@ namespace Orchard.Mvc.ModelBinders { public object BindModel(ControllerContext controllerContext, ModelBindingContext bindingContext) { var value = false; try { - value = Convert.ToBoolean(bindingContext.ValueProvider.GetValue(bindingContext.ModelName).AttemptedValue); + var attemptedValues = bindingContext.ValueProvider + .GetValue(bindingContext.ModelName) + .AttemptedValue + // for bool, AttemptedValue may be "true,false" because in the form there may be + // a checkbox and an hidden input. + .Split(new char[] { ',' }); + value = attemptedValues + .Select(v => Convert.ToBoolean(v)) + // This Aggregate operation works because the "true" is normally only there when + // the checkbox was selected, while the false is always there thanks to the hidden + // input. + .Aggregate((a, b) => a || b); + // The steps above don't affect binding booleans from any where other than a form, + // because those won't give us here a list of possible values to aggregate. } catch { bindingContext.ModelState.AddModelError(bindingContext.ModelName, new FormatException()); } From 993e57d7fd24d96fca3abb3c6350ca4d4af6a83b Mon Sep 17 00:00:00 2001 From: LorenzoFrediani-Laser Date: Thu, 24 Sep 2020 19:15:07 +0200 Subject: [PATCH 022/112] fix record mapping nhibernate (#8415) --- .../Modules/Orchard.Projections/Models/LayoutRecord.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Orchard.Web/Modules/Orchard.Projections/Models/LayoutRecord.cs b/src/Orchard.Web/Modules/Orchard.Projections/Models/LayoutRecord.cs index 3f28c2ae7..be8bd03d8 100644 --- a/src/Orchard.Web/Modules/Orchard.Projections/Models/LayoutRecord.cs +++ b/src/Orchard.Web/Modules/Orchard.Projections/Models/LayoutRecord.cs @@ -12,6 +12,7 @@ namespace Orchard.Projections.Models { public virtual string Description { get; set; } public virtual string Category { get; set; } public virtual string Type { get; set; } + [StringLengthMax] public virtual string State { get; set; } public virtual int Display { get; set; } From 0a411994516f211c87783dd84f6642fde887fc2c Mon Sep 17 00:00:00 2001 From: Matteo Piovanelli Date: Thu, 24 Sep 2020 19:15:18 +0200 Subject: [PATCH 023/112] Allow downstream methods to set default value (#8419) Moreover, this won't try to set a default value to the bool when it's not sent. This will allow calls with missing required parameters to fail as they should. --- src/Orchard/Mvc/ModelBinders/BooleanBinderProvider.cs | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/Orchard/Mvc/ModelBinders/BooleanBinderProvider.cs b/src/Orchard/Mvc/ModelBinders/BooleanBinderProvider.cs index 2896d8325..ce2753c50 100644 --- a/src/Orchard/Mvc/ModelBinders/BooleanBinderProvider.cs +++ b/src/Orchard/Mvc/ModelBinders/BooleanBinderProvider.cs @@ -16,7 +16,16 @@ namespace Orchard.Mvc.ModelBinders { } public object BindModel(ControllerContext controllerContext, ModelBindingContext bindingContext) { + // returning null from here allows the downstream method to set its own default var value = false; + if (bindingContext != null) { + if (bindingContext.ValueProvider + ?.GetValue(bindingContext.ModelName) == null) { + // this is the case where we are not receiving a possible value for the boolean. + // Returning null is ok here, and will let the downstream method set its own defaults. + return null; + } + } try { var attemptedValues = bindingContext.ValueProvider .GetValue(bindingContext.ModelName) @@ -34,6 +43,7 @@ namespace Orchard.Mvc.ModelBinders { // because those won't give us here a list of possible values to aggregate. } catch { bindingContext.ModelState.AddModelError(bindingContext.ModelName, new FormatException()); + return null; } return value; } From b583f8f0f02273cb7186223e6d4b216524bb88d4 Mon Sep 17 00:00:00 2001 From: ElenaRepository <50620495+ElenaRepository@users.noreply.github.com> Date: Thu, 3 Dec 2020 19:06:49 +0100 Subject: [PATCH 024/112] Fixed Media Library Picker Style (#8433) --- .../Styles/media-library-picker-admin.css | 6 +++++- .../Orchard.MediaLibrary/Views/MediaLibraryPicker.cshtml | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Styles/media-library-picker-admin.css b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Styles/media-library-picker-admin.css index 91da8aa06..6838bdaee 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Styles/media-library-picker-admin.css +++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Styles/media-library-picker-admin.css @@ -48,13 +48,17 @@ text-align: right; font-size: 12px; opacity: 0.6; + height: 40px; + overflow: hidden; } .overlay h3 { padding-right:5px; font-size: 12px; - height: 40px; overflow: hidden; + height: 1rem; + white-space: nowrap; + text-overflow: ellipsis; } .media-thumbnail { diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/MediaLibraryPicker.cshtml b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/MediaLibraryPicker.cshtml index eab2cad24..57310d3c1 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/MediaLibraryPicker.cshtml +++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/MediaLibraryPicker.cshtml @@ -45,7 +45,7 @@
@Display(BuildDisplay(contentItem, "Thumbnail"))
-

@Html.ItemDisplayText(contentItem)

+

@Html.ItemDisplayText(contentItem)

From 6e410a321d01014ba8c0ef69f48224ba3e3de6f4 Mon Sep 17 00:00:00 2001 From: Matteo Piovanelli Date: Thu, 3 Dec 2020 19:12:31 +0100 Subject: [PATCH 025/112] Removed check preventing reassignment of loader delegates (#8436) --- .../Modules/Orchard.Taxonomies/Handlers/TermsPartHandler.cs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.Taxonomies/Handlers/TermsPartHandler.cs b/src/Orchard.Web/Modules/Orchard.Taxonomies/Handlers/TermsPartHandler.cs index efa6e25d3..2abf96d34 100644 --- a/src/Orchard.Web/Modules/Orchard.Taxonomies/Handlers/TermsPartHandler.cs +++ b/src/Orchard.Web/Modules/Orchard.Taxonomies/Handlers/TermsPartHandler.cs @@ -57,10 +57,6 @@ namespace Orchard.Taxonomies.Handlers { } private void InitializerTermsLoader(TermsPart part) { - if (part._termParts != null) { - return; - } - var queryHint = new QueryHints() .ExpandRecords("ContentTypeRecord", "CommonPartRecord", "TermsPartRecord"); From d3aca80447c4feabbe4e6e5f994c2601fa3e588e Mon Sep 17 00:00:00 2001 From: Matteo Piovanelli Date: Thu, 17 Dec 2020 19:05:21 +0100 Subject: [PATCH 026/112] =?UTF-8?q?Added=20an=20event=20activity=20for=20w?= =?UTF-8?q?orkflows=20that=20activates=20on=20the=20first=20Upd=E2=80=A6?= =?UTF-8?q?=20(#8438)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Activities/ContentActivity.cs | 10 ++++++ .../Handlers/WorkflowContentHandler.cs | 35 +++++++++++++++++-- 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.Workflows/Activities/ContentActivity.cs b/src/Orchard.Web/Modules/Orchard.Workflows/Activities/ContentActivity.cs index eb69fe0ba..67c8437bb 100644 --- a/src/Orchard.Web/Modules/Orchard.Workflows/Activities/ContentActivity.cs +++ b/src/Orchard.Web/Modules/Orchard.Workflows/Activities/ContentActivity.cs @@ -78,6 +78,16 @@ namespace Orchard.Workflows.Activities { } } + public class ContentFirstUpdatedActivity : ContentActivity { + public override string Name { + get { return "ContentFirstUpdated"; } + } + + public override LocalizedString Description { + get { return T("Content is updated for the first time."); } + } + } + public class ContentPublishedActivity : ContentActivity { public override string Name { get { return "ContentPublished"; } diff --git a/src/Orchard.Web/Modules/Orchard.Workflows/Handlers/WorkflowContentHandler.cs b/src/Orchard.Web/Modules/Orchard.Workflows/Handlers/WorkflowContentHandler.cs index 378b83e0a..76a32f42b 100644 --- a/src/Orchard.Web/Modules/Orchard.Workflows/Handlers/WorkflowContentHandler.cs +++ b/src/Orchard.Web/Modules/Orchard.Workflows/Handlers/WorkflowContentHandler.cs @@ -6,8 +6,16 @@ using Orchard.Workflows.Services; namespace Orchard.Workflows.Handlers { public class WorkflowContentHandler : ContentHandler { + // Used to memorize the ids of ContentItems for which we go through the + // OnCreated handler. + private HashSet _createdItems; + // Used to memorize the ids of ContentItems for which we go through the + // OnUpdated handler. + private HashSet _updatedItems; public WorkflowContentHandler(IWorkflowManager workflowManager) { + _createdItems = new HashSet(); + _updatedItems = new HashSet(); OnPublished( (context, part) => @@ -34,9 +42,15 @@ namespace Orchard.Workflows.Handlers { () => new Dictionary { { "Content", context.BuildingContentItem } })); OnCreated( - (context, part) => + (context, part) => { + + if (context.ContentItem != null) { // sanity check + _createdItems.Add(context.ContentItem.Id); + } + workflowManager.TriggerEvent("ContentCreated", context.ContentItem, - () => new Dictionary { { "Content", context.ContentItem } })); + () => new Dictionary { { "Content", context.ContentItem } }); + }); OnUpdated( (context, part) => { @@ -44,11 +58,28 @@ namespace Orchard.Workflows.Handlers { return; } + if (context.ContentItem != null) { // sanity check + if (!_updatedItems.Contains(context.ContentItem.Id)) { + // in case a further update is invoked, this would prevent + // the FirstUpdate event to be fired again + _updatedItems.Add(context.ContentItem.Id); + if (_createdItems.Contains(context.ContentItem.Id)) { + // first update after creation of item + workflowManager.TriggerEvent( + "ContentFirstUpdated", + context.ContentItem, + () => new Dictionary { { "Content", context.ContentItem } } + ); + } + } + } + workflowManager.TriggerEvent( "ContentUpdated", context.ContentItem, () => new Dictionary { { "Content", context.ContentItem } } ); + }); } } From 700b029a342e3bb2bb3cb745eb31c398b6e122b0 Mon Sep 17 00:00:00 2001 From: Hermes Sbicego Date: Thu, 7 Jan 2021 19:07:38 +0100 Subject: [PATCH 027/112] target framework 4.8 to all projects (#8444) --- .../Orchard.Azure.Web.csproj | 6 +-- .../Orchard.Core.Tests.csproj | 6 +-- src/Orchard.Core.Tests/packages.config | 24 +++++----- src/Orchard.Profile/Orchard.Profile.csproj | 6 +-- src/Orchard.Profile/packages.config | 8 ++-- src/Orchard.Specs/App.Config | 6 +-- src/Orchard.Specs/Orchard.Specs.csproj | 6 +-- src/Orchard.Specs/packages.config | 32 ++++++------- src/Orchard.Tests.Modules/App.config | 5 +- .../Orchard.Tests.Modules.csproj | 6 +-- src/Orchard.Tests.Modules/packages.config | 40 ++++++++-------- src/Orchard.Tests/App.config | 5 +- .../Orchard.Framework.Tests.csproj | 6 +-- src/Orchard.Tests/packages.config | 40 ++++++++-------- .../Orchard.WarmupStarter.csproj | 6 +-- .../Orchard.Web.Tests.csproj | 6 +-- src/Orchard.Web.Tests/packages.config | 10 ++-- src/Orchard.Web/Core/Orchard.Core.csproj | 6 +-- src/Orchard.Web/Core/Web.config | 5 +- src/Orchard.Web/Core/packages.config | 14 +++--- src/Orchard.Web/Modules/Lucene/Lucene.csproj | 6 +-- src/Orchard.Web/Modules/Lucene/Web.config | 5 +- .../Modules/Lucene/packages.config | 18 ++++---- .../Modules/Markdown/Markdown.csproj | 6 +-- src/Orchard.Web/Modules/Markdown/Web.config | 5 +- .../Modules/Markdown/packages.config | 16 +++---- .../Orchard.Alias/Orchard.Alias.csproj | 5 +- .../Modules/Orchard.Alias/Web.config | 5 +- .../Modules/Orchard.Alias/packages.config | 14 +++--- .../Orchard.AntiSpam/Orchard.AntiSpam.csproj | 6 +-- .../Modules/Orchard.AntiSpam/Web.config | 5 +- .../Modules/Orchard.AntiSpam/packages.config | 16 +++---- .../Orchard.ArchiveLater.csproj | 6 +-- .../Modules/Orchard.ArchiveLater/Web.config | 5 +- .../Orchard.ArchiveLater/packages.config | 14 +++--- .../Orchard.AuditTrail.csproj | 6 +-- .../Modules/Orchard.AuditTrail/Web.config | 5 +- .../Orchard.AuditTrail/packages.config | 22 ++++----- .../Orchard.Autoroute.csproj | 6 +-- .../Modules/Orchard.Autoroute/Web.config | 5 +- .../Modules/Orchard.Autoroute/packages.config | 14 +++--- .../Orchard.Azure.MediaServices.csproj | 6 +-- .../Orchard.Azure.MediaServices/Web.config | 5 +- .../packages.config | 46 +++++++++---------- .../Orchard.Azure/Orchard.Azure.csproj | 6 +-- .../Modules/Orchard.Azure/Web.config | 5 +- .../Modules/Orchard.Azure/packages.config | 38 +++++++-------- .../Orchard.Blogs/Orchard.Blogs.csproj | 6 +-- .../Modules/Orchard.Blogs/Web.config | 5 +- .../Modules/Orchard.Blogs/packages.config | 14 +++--- .../Orchard.Caching/Orchard.Caching.csproj | 6 +-- .../Modules/Orchard.Caching/Web.config | 5 +- .../Modules/Orchard.Caching/packages.config | 12 ++--- .../Orchard.CodeGeneration.csproj | 6 +-- .../Modules/Orchard.CodeGeneration/Web.config | 5 +- .../Orchard.CodeGeneration/packages.config | 12 ++--- .../Orchard.Comments/Orchard.Comments.csproj | 6 +-- .../Modules/Orchard.Comments/Web.config | 5 +- .../Modules/Orchard.Comments/packages.config | 14 +++--- .../Orchard.Conditions.csproj | 6 +-- .../Modules/Orchard.Conditions/Web.config | 5 +- .../Orchard.Conditions/packages.config | 12 ++--- .../Orchard.ContentPermissions.csproj | 6 +-- .../Orchard.ContentPermissions/Web.config | 5 +- .../packages.config | 14 +++--- .../Orchard.ContentPicker.csproj | 6 +-- .../Modules/Orchard.ContentPicker/Web.config | 5 +- .../Orchard.ContentPicker/packages.config | 18 ++++---- .../Orchard.ContentTypes.csproj | 6 +-- .../Modules/Orchard.ContentTypes/Web.config | 5 +- .../Orchard.ContentTypes/packages.config | 14 +++--- .../Orchard.CustomForms.csproj | 6 +-- .../Modules/Orchard.CustomForms/Web.config | 5 +- .../Orchard.CustomForms/packages.config | 14 +++--- .../Orchard.Dashboards.csproj | 6 +-- .../Modules/Orchard.Dashboards/Web.config | 5 +- .../Orchard.Dashboards/packages.config | 14 +++--- .../Orchard.DesignerTools.csproj | 6 +-- .../Modules/Orchard.DesignerTools/Web.config | 5 +- .../Orchard.DesignerTools/packages.config | 14 +++--- .../Orchard.DynamicForms.csproj | 6 +-- .../Modules/Orchard.DynamicForms/Web.config | 5 +- .../Orchard.DynamicForms/packages.config | 16 +++---- .../Orchard.Email/Orchard.Email.csproj | 6 +-- .../Modules/Orchard.Email/Web.config | 5 +- .../Modules/Orchard.Email/packages.config | 16 +++---- .../Orchard.Fields/Orchard.Fields.csproj | 6 +-- .../Modules/Orchard.Fields/Web.config | 5 +- .../Modules/Orchard.Fields/packages.config | 14 +++--- .../Orchard.Forms/Orchard.Forms.csproj | 6 +-- .../Modules/Orchard.Forms/Web.config | 5 +- .../Modules/Orchard.Forms/packages.config | 14 +++--- .../Orchard.ImageEditor.csproj | 6 +-- .../Modules/Orchard.ImageEditor/Web.config | 5 +- .../Orchard.ImageEditor/packages.config | 14 +++--- .../Orchard.ImportExport.csproj | 6 +-- .../Modules/Orchard.ImportExport/Web.config | 5 +- .../Orchard.ImportExport/packages.config | 20 ++++---- .../Orchard.Indexing/Orchard.Indexing.csproj | 6 +-- .../Modules/Orchard.Indexing/Web.config | 5 +- .../Modules/Orchard.Indexing/packages.config | 14 +++--- .../Orchard.JobsQueue.csproj | 6 +-- .../Modules/Orchard.JobsQueue/Web.config | 5 +- .../Modules/Orchard.JobsQueue/packages.config | 16 +++---- .../Orchard.Layouts/Orchard.Layouts.csproj | 6 +-- .../Modules/Orchard.Layouts/Web.config | 5 +- .../Modules/Orchard.Layouts/packages.config | 22 ++++----- .../Orchard.Lists/Orchard.Lists.csproj | 6 +-- .../Modules/Orchard.Lists/Web.config | 5 +- .../Modules/Orchard.Lists/packages.config | 14 +++--- .../Orchard.Localization.csproj | 6 +-- .../Modules/Orchard.Localization/Web.config | 5 +- .../Orchard.Localization/packages.config | 16 +++---- .../Orchard.Media/Orchard.Media.csproj | 6 +-- .../Modules/Orchard.Media/Web.config | 5 +- .../Modules/Orchard.Media/packages.config | 16 +++---- .../Orchard.MediaLibrary.csproj | 6 +-- .../Modules/Orchard.MediaLibrary/Web.config | 5 +- .../Orchard.MediaLibrary/packages.config | 16 +++---- .../Orchard.MediaPicker.csproj | 6 +-- .../Modules/Orchard.MediaPicker/Web.config | 5 +- .../Orchard.MediaPicker/packages.config | 14 +++--- .../Orchard.MediaProcessing.csproj | 6 +-- .../Orchard.MediaProcessing/Web.config | 5 +- .../Orchard.MediaProcessing/packages.config | 16 +++---- .../Orchard.MessageBus.csproj | 6 +-- .../Modules/Orchard.MessageBus/Web.config | 5 +- .../Orchard.MessageBus/packages.config | 16 +++---- .../Orchard.Migrations.csproj | 6 +-- .../Modules/Orchard.Migrations/Web.config | 5 +- .../Orchard.Migrations/packages.config | 12 ++--- .../Orchard.Modules/Orchard.Modules.csproj | 6 +-- .../Modules/Orchard.Modules/Web.config | 5 +- .../Modules/Orchard.Modules/packages.config | 16 +++---- .../Orchard.MultiTenancy.csproj | 6 +-- .../Modules/Orchard.MultiTenancy/Web.config | 5 +- .../Orchard.MultiTenancy/packages.config | 20 ++++---- .../Orchard.OutputCache.csproj | 5 +- .../Modules/Orchard.OutputCache/Web.config | 5 +- .../Orchard.OutputCache/packages.config | 16 +++---- .../Orchard.Packaging.csproj | 6 +-- .../Modules/Orchard.Packaging/Web.config | 5 +- .../Modules/Orchard.Packaging/packages.config | 16 +++---- .../Orchard.Pages/Orchard.Pages.csproj | 6 +-- .../Modules/Orchard.Pages/Web.config | 5 +- .../Orchard.Projections.csproj | 6 +-- .../Tests/Orchard.Projections.Tests.csproj | 6 +-- .../Orchard.Projections/Tests/packages.config | 16 +++---- .../Modules/Orchard.Projections/Web.config | 5 +- .../Orchard.Projections/packages.config | 18 ++++---- .../Orchard.PublishLater.csproj | 6 +-- .../Modules/Orchard.PublishLater/Web.config | 5 +- .../Orchard.PublishLater/packages.config | 14 +++--- .../Orchard.Recipes/Orchard.Recipes.csproj | 6 +-- .../Modules/Orchard.Recipes/Web.config | 6 +-- .../Modules/Orchard.Recipes/packages.config | 18 ++++---- .../Orchard.Redis/Orchard.Redis.csproj | 6 +-- .../Modules/Orchard.Redis/Web.config | 5 +- .../Modules/Orchard.Redis/packages.config | 12 ++--- .../Orchard.Resources.csproj | 6 +-- .../Modules/Orchard.Resources/Web.config | 5 +- .../Modules/Orchard.Resources/packages.config | 14 +++--- .../Orchard.Roles/Orchard.Roles.csproj | 6 +-- .../Modules/Orchard.Roles/Web.config | 5 +- .../Modules/Orchard.Roles/packages.config | 14 +++--- .../Orchard.Rules/Orchard.Rules.csproj | 6 +-- .../Modules/Orchard.Rules/Web.config | 5 +- .../Modules/Orchard.Rules/packages.config | 14 +++--- .../Orchard.Scripting.CSharp.csproj | 6 +-- .../Orchard.Scripting.CSharp/Web.config | 5 +- .../Orchard.Scripting.CSharp/packages.config | 16 +++---- .../Orchard.Scripting.Dlr.csproj | 6 +-- .../Modules/Orchard.Scripting.Dlr/Web.config | 5 +- .../Orchard.Scripting.Dlr/packages.config | 6 +-- .../Orchard.Scripting.csproj | 6 +-- .../Modules/Orchard.Scripting/Web.config | 5 +- .../Orchard.Search/Orchard.Search.csproj | 6 +-- .../Modules/Orchard.Search/Web.config | 5 +- .../Modules/Orchard.Search/packages.config | 14 +++--- .../Orchard.SecureSocketsLayer.csproj | 6 +-- .../Orchard.SecureSocketsLayer/Web.config | 5 +- .../packages.config | 18 ++++---- .../Orchard.Setup/Orchard.Setup.csproj | 6 +-- .../Modules/Orchard.Setup/Web.config | 5 +- .../Modules/Orchard.Setup/packages.config | 16 +++---- .../Modules/Orchard.Tags/Orchard.Tags.csproj | 6 +-- .../Modules/Orchard.Tags/Web.config | 5 +- .../Modules/Orchard.Tags/packages.config | 18 ++++---- .../Orchard.TaskLease.csproj | 6 +-- .../Modules/Orchard.TaskLease/Web.config | 5 +- .../Modules/Orchard.TaskLease/packages.config | 6 +-- .../Orchard.Taxonomies.csproj | 6 +-- .../Modules/Orchard.Taxonomies/Web.config | 5 +- .../Orchard.Taxonomies/packages.config | 20 ++++---- .../Orchard.Templates.csproj | 6 +-- .../Modules/Orchard.Templates/Web.config | 5 +- .../Modules/Orchard.Templates/packages.config | 14 +++--- .../Orchard.Themes/Orchard.Themes.csproj | 6 +-- .../Modules/Orchard.Themes/Web.config | 5 +- .../Modules/Orchard.Themes/packages.config | 14 +++--- .../Orchard.Tokens/Orchard.Tokens.csproj | 6 +-- .../Tests/Orchard.Tokens.Tests.csproj | 6 +-- .../Orchard.Tokens/Tests/packages.config | 8 ++-- .../Modules/Orchard.Tokens/Web.config | 5 +- .../Modules/Orchard.Tokens/packages.config | 14 +++--- .../Orchard.Users/Orchard.Users.csproj | 6 +-- .../Modules/Orchard.Users/Web.config | 5 +- .../Modules/Orchard.Users/packages.config | 14 +++--- .../Orchard.Warmup/Orchard.Warmup.csproj | 6 +-- .../Modules/Orchard.Warmup/Web.config | 5 +- .../Modules/Orchard.Warmup/packages.config | 14 +++--- .../Orchard.Widgets/Orchard.Widgets.csproj | 6 +-- .../Modules/Orchard.Widgets/Web.config | 5 +- .../Modules/Orchard.Widgets/packages.config | 14 +++--- .../Orchard.Workflows.csproj | 6 +-- .../Modules/Orchard.Workflows/Web.config | 5 +- .../Modules/Orchard.Workflows/packages.config | 16 +++---- .../Orchard.jQuery/Orchard.jQuery.csproj | 6 +-- .../Modules/Orchard.jQuery/Web.config | 5 +- .../Modules/Orchard.jQuery/packages.config | 14 +++--- .../Modules/SysCache/SysCache.csproj | 6 +-- src/Orchard.Web/Modules/SysCache/Web.config | 5 +- .../Modules/SysCache/packages.config | 10 ++-- .../Modules/TinyMce/TinyMce.csproj | 6 +-- src/Orchard.Web/Modules/TinyMce/Web.config | 5 +- .../Modules/TinyMce/packages.config | 14 +++--- .../Modules/Upgrade/Upgrade.csproj | 6 +-- src/Orchard.Web/Modules/Upgrade/Web.config | 5 +- .../Modules/Upgrade/packages.config | 24 +++++----- src/Orchard.Web/Orchard.Web.csproj | 6 +-- src/Orchard.Web/Themes/Themes.csproj | 6 +-- src/Orchard.Web/Themes/Web.config | 5 +- src/Orchard.Web/Themes/packages.config | 14 +++--- src/Orchard.Web/Web.config | 4 +- src/Orchard.Web/packages.config | 32 ++++++------- src/Orchard/Orchard.Framework.csproj | 6 +-- src/Orchard/app.config | 5 +- src/Orchard/packages.config | 38 +++++++-------- .../MSBuild.Orchard.Tasks.csproj | 6 +-- src/Tools/Orchard.Tests/Orchard.Tests.csproj | 6 +-- src/Tools/Orchard.Tests/packages.config | 8 ++-- src/Tools/Orchard/Orchard.csproj | 6 +-- src/Tools/Orchard/app.config | 3 +- 243 files changed, 1161 insertions(+), 1085 deletions(-) diff --git a/src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj b/src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj index a453cb66d..5a749f29b 100644 --- a/src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj +++ b/src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj @@ -1,4 +1,4 @@ - + @@ -14,7 +14,7 @@ Properties Orchard.Azure.Web Orchard.Azure.Web - v4.5.2 + v4.8 false false @@ -669,4 +669,4 @@ del "$(TargetDir)\Media" - \ No newline at end of file + diff --git a/src/Orchard.Core.Tests/Orchard.Core.Tests.csproj b/src/Orchard.Core.Tests/Orchard.Core.Tests.csproj index 04efe9ad3..ae0e60a43 100644 --- a/src/Orchard.Core.Tests/Orchard.Core.Tests.csproj +++ b/src/Orchard.Core.Tests/Orchard.Core.Tests.csproj @@ -1,4 +1,4 @@ - + Debug @@ -10,7 +10,7 @@ Properties Orchard.Core.Tests Orchard.Core.Tests - v4.5.2 + v4.8 512 @@ -211,4 +211,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Core.Tests/packages.config b/src/Orchard.Core.Tests/packages.config index 60de4ba33..7d9cf6980 100644 --- a/src/Orchard.Core.Tests/packages.config +++ b/src/Orchard.Core.Tests/packages.config @@ -1,13 +1,13 @@ - + - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + diff --git a/src/Orchard.Profile/Orchard.Profile.csproj b/src/Orchard.Profile/Orchard.Profile.csproj index b8910c5e8..ec20b38ba 100644 --- a/src/Orchard.Profile/Orchard.Profile.csproj +++ b/src/Orchard.Profile/Orchard.Profile.csproj @@ -1,4 +1,4 @@ - + Debug @@ -10,7 +10,7 @@ Properties Orchard.Profile Orchard.Profile - v4.5.2 + v4.8 512 @@ -146,4 +146,4 @@ --> - \ No newline at end of file + diff --git a/src/Orchard.Profile/packages.config b/src/Orchard.Profile/packages.config index da65d4008..05379e707 100644 --- a/src/Orchard.Profile/packages.config +++ b/src/Orchard.Profile/packages.config @@ -1,5 +1,5 @@ - + - - - \ No newline at end of file + + + diff --git a/src/Orchard.Specs/App.Config b/src/Orchard.Specs/App.Config index 65befcd64..f5c0fd9bc 100644 --- a/src/Orchard.Specs/App.Config +++ b/src/Orchard.Specs/App.Config @@ -1,10 +1,10 @@ - +
- + @@ -29,4 +29,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Specs/Orchard.Specs.csproj b/src/Orchard.Specs/Orchard.Specs.csproj index cc89b96a8..21c53fbc9 100644 --- a/src/Orchard.Specs/Orchard.Specs.csproj +++ b/src/Orchard.Specs/Orchard.Specs.csproj @@ -1,4 +1,4 @@ - + Debug @@ -10,7 +10,7 @@ Properties Orchard.Specs Orchard.Specs - v4.5.2 + v4.8 512 @@ -554,4 +554,4 @@ --> - \ No newline at end of file + diff --git a/src/Orchard.Specs/packages.config b/src/Orchard.Specs/packages.config index 0d97f7f46..661d7d35e 100644 --- a/src/Orchard.Specs/packages.config +++ b/src/Orchard.Specs/packages.config @@ -1,17 +1,17 @@ - + - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + diff --git a/src/Orchard.Tests.Modules/App.config b/src/Orchard.Tests.Modules/App.config index 93a8f27c4..5e21211b5 100644 --- a/src/Orchard.Tests.Modules/App.config +++ b/src/Orchard.Tests.Modules/App.config @@ -1,4 +1,4 @@ - + @@ -10,7 +10,7 @@ - + @@ -37,3 +37,4 @@ + diff --git a/src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj b/src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj index 19e74635a..fced16be6 100644 --- a/src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj +++ b/src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj @@ -1,4 +1,4 @@ - + Debug @@ -10,7 +10,7 @@ Properties Orchard.Tests.Modules Orchard.Tests.Modules - v4.5.2 + v4.8 512 @@ -427,4 +427,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Tests.Modules/packages.config b/src/Orchard.Tests.Modules/packages.config index 56b374523..c537252d1 100644 --- a/src/Orchard.Tests.Modules/packages.config +++ b/src/Orchard.Tests.Modules/packages.config @@ -1,21 +1,21 @@ - + - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Tests/App.config b/src/Orchard.Tests/App.config index 93a8f27c4..5e21211b5 100644 --- a/src/Orchard.Tests/App.config +++ b/src/Orchard.Tests/App.config @@ -1,4 +1,4 @@ - + @@ -10,7 +10,7 @@ - + @@ -37,3 +37,4 @@ + diff --git a/src/Orchard.Tests/Orchard.Framework.Tests.csproj b/src/Orchard.Tests/Orchard.Framework.Tests.csproj index a3ccd07a6..d096ac953 100644 --- a/src/Orchard.Tests/Orchard.Framework.Tests.csproj +++ b/src/Orchard.Tests/Orchard.Framework.Tests.csproj @@ -1,4 +1,4 @@ - + @@ -11,7 +11,7 @@ Properties Orchard.Tests Orchard.Framework.Tests - v4.5.2 + v4.8 512 @@ -460,4 +460,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Tests/packages.config b/src/Orchard.Tests/packages.config index 786c65803..498a65f07 100644 --- a/src/Orchard.Tests/packages.config +++ b/src/Orchard.Tests/packages.config @@ -1,21 +1,21 @@ - + - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.WarmupStarter/Orchard.WarmupStarter.csproj b/src/Orchard.WarmupStarter/Orchard.WarmupStarter.csproj index 33cfafdb3..98b48abfe 100644 --- a/src/Orchard.WarmupStarter/Orchard.WarmupStarter.csproj +++ b/src/Orchard.WarmupStarter/Orchard.WarmupStarter.csproj @@ -1,4 +1,4 @@ - + Debug @@ -10,7 +10,7 @@ Properties Orchard.WarmupStarter Orchard.WarmupStarter - v4.5.2 + v4.8 512 @@ -55,4 +55,4 @@ --> - \ 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 0c1b29c80..32d0d8e54 100644 --- a/src/Orchard.Web.Tests/Orchard.Web.Tests.csproj +++ b/src/Orchard.Web.Tests/Orchard.Web.Tests.csproj @@ -1,4 +1,4 @@ - + Debug @@ -10,7 +10,7 @@ Properties Orchard.Web.Tests Orchard.Web.Tests - v4.5.2 + v4.8 512 @@ -137,4 +137,4 @@ --> - \ No newline at end of file + diff --git a/src/Orchard.Web.Tests/packages.config b/src/Orchard.Web.Tests/packages.config index c3a3b9b5d..d6cae7a60 100644 --- a/src/Orchard.Web.Tests/packages.config +++ b/src/Orchard.Web.Tests/packages.config @@ -1,6 +1,6 @@ - + - - - - \ No newline at end of file + + + + diff --git a/src/Orchard.Web/Core/Orchard.Core.csproj b/src/Orchard.Web/Core/Orchard.Core.csproj index f2c9b7883..5d0d67fa7 100644 --- a/src/Orchard.Web/Core/Orchard.Core.csproj +++ b/src/Orchard.Web/Core/Orchard.Core.csproj @@ -1,4 +1,4 @@ - + @@ -12,7 +12,7 @@ Properties Orchard.Core Orchard.Core - v4.5.2 + v4.8 false @@ -660,4 +660,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Core/Web.config b/src/Orchard.Web/Core/Web.config index 31c7dd5b3..013c24e70 100644 --- a/src/Orchard.Web/Core/Web.config +++ b/src/Orchard.Web/Core/Web.config @@ -1,4 +1,4 @@ - + @@ -31,7 +31,7 @@ - + @@ -66,3 +66,4 @@ + diff --git a/src/Orchard.Web/Core/packages.config b/src/Orchard.Web/Core/packages.config index e807cea03..77c61debb 100644 --- a/src/Orchard.Web/Core/packages.config +++ b/src/Orchard.Web/Core/packages.config @@ -1,8 +1,8 @@ - + - - - - - - \ No newline at end of file + + + + + + diff --git a/src/Orchard.Web/Modules/Lucene/Lucene.csproj b/src/Orchard.Web/Modules/Lucene/Lucene.csproj index 71ae28ba0..1d01fc15c 100644 --- a/src/Orchard.Web/Modules/Lucene/Lucene.csproj +++ b/src/Orchard.Web/Modules/Lucene/Lucene.csproj @@ -1,4 +1,4 @@ - + @@ -13,7 +13,7 @@ Properties Lucene Lucene - v4.5.2 + v4.8 false false @@ -177,4 +177,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Lucene/Web.config b/src/Orchard.Web/Modules/Lucene/Web.config index 5df21a9d9..37ba89226 100644 --- a/src/Orchard.Web/Modules/Lucene/Web.config +++ b/src/Orchard.Web/Modules/Lucene/Web.config @@ -1,4 +1,4 @@ - + @@ -31,7 +31,7 @@ - + @@ -65,3 +65,4 @@ + diff --git a/src/Orchard.Web/Modules/Lucene/packages.config b/src/Orchard.Web/Modules/Lucene/packages.config index ba3ef38be..059ff9edb 100644 --- a/src/Orchard.Web/Modules/Lucene/packages.config +++ b/src/Orchard.Web/Modules/Lucene/packages.config @@ -1,10 +1,10 @@ - + - - - - - - - - \ No newline at end of file + + + + + + + + diff --git a/src/Orchard.Web/Modules/Markdown/Markdown.csproj b/src/Orchard.Web/Modules/Markdown/Markdown.csproj index 61a918e69..2c633ea61 100644 --- a/src/Orchard.Web/Modules/Markdown/Markdown.csproj +++ b/src/Orchard.Web/Modules/Markdown/Markdown.csproj @@ -1,4 +1,4 @@ - + @@ -12,7 +12,7 @@ Properties Markdown Markdown - v4.5.2 + v4.8 false @@ -226,4 +226,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Markdown/Web.config b/src/Orchard.Web/Modules/Markdown/Web.config index 871ff2ee6..90feec293 100644 --- a/src/Orchard.Web/Modules/Markdown/Web.config +++ b/src/Orchard.Web/Modules/Markdown/Web.config @@ -1,4 +1,4 @@ - + @@ -31,7 +31,7 @@ - + @@ -66,3 +66,4 @@ + diff --git a/src/Orchard.Web/Modules/Markdown/packages.config b/src/Orchard.Web/Modules/Markdown/packages.config index 3f81f03ed..a3611dc1f 100644 --- a/src/Orchard.Web/Modules/Markdown/packages.config +++ b/src/Orchard.Web/Modules/Markdown/packages.config @@ -1,9 +1,9 @@ - + - - - - - - - \ No newline at end of file + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Alias/Orchard.Alias.csproj b/src/Orchard.Web/Modules/Orchard.Alias/Orchard.Alias.csproj index e559faecc..1893d5242 100644 --- a/src/Orchard.Web/Modules/Orchard.Alias/Orchard.Alias.csproj +++ b/src/Orchard.Web/Modules/Orchard.Alias/Orchard.Alias.csproj @@ -1,4 +1,4 @@ - + @@ -12,7 +12,7 @@ Properties Orchard.Alias Orchard.Alias - v4.5.2 + v4.8 false @@ -201,3 +201,4 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.Alias/Web.config b/src/Orchard.Web/Modules/Orchard.Alias/Web.config index 871ff2ee6..90feec293 100644 --- a/src/Orchard.Web/Modules/Orchard.Alias/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Alias/Web.config @@ -1,4 +1,4 @@ - + @@ -31,7 +31,7 @@ - + @@ -66,3 +66,4 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.Alias/packages.config b/src/Orchard.Web/Modules/Orchard.Alias/packages.config index e807cea03..77c61debb 100644 --- a/src/Orchard.Web/Modules/Orchard.Alias/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Alias/packages.config @@ -1,8 +1,8 @@ - + - - - - - - \ No newline at end of file + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.AntiSpam/Orchard.AntiSpam.csproj b/src/Orchard.Web/Modules/Orchard.AntiSpam/Orchard.AntiSpam.csproj index 5bdc3ea26..711c86396 100644 --- a/src/Orchard.Web/Modules/Orchard.AntiSpam/Orchard.AntiSpam.csproj +++ b/src/Orchard.Web/Modules/Orchard.AntiSpam/Orchard.AntiSpam.csproj @@ -1,4 +1,4 @@ - + @@ -12,7 +12,7 @@ Properties Orchard.AntiSpam Orchard.AntiSpam - v4.5.2 + v4.8 false @@ -258,4 +258,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.AntiSpam/Web.config b/src/Orchard.Web/Modules/Orchard.AntiSpam/Web.config index 871ff2ee6..90feec293 100644 --- a/src/Orchard.Web/Modules/Orchard.AntiSpam/Web.config +++ b/src/Orchard.Web/Modules/Orchard.AntiSpam/Web.config @@ -1,4 +1,4 @@ - + @@ -31,7 +31,7 @@ - + @@ -66,3 +66,4 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.AntiSpam/packages.config b/src/Orchard.Web/Modules/Orchard.AntiSpam/packages.config index 9244ea4c7..2aa425ab5 100644 --- a/src/Orchard.Web/Modules/Orchard.AntiSpam/packages.config +++ b/src/Orchard.Web/Modules/Orchard.AntiSpam/packages.config @@ -1,9 +1,9 @@ - + - - - - - - - \ No newline at end of file + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Orchard.ArchiveLater.csproj b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Orchard.ArchiveLater.csproj index 6eff0cfb1..81e673c85 100644 --- a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Orchard.ArchiveLater.csproj +++ b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Orchard.ArchiveLater.csproj @@ -1,4 +1,4 @@ - + @@ -13,7 +13,7 @@ Properties Orchard.ArchiveLater Orchard.ArchiveLater - v4.5.2 + v4.8 false @@ -173,4 +173,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Web.config b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Web.config index 871ff2ee6..90feec293 100644 --- a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Web.config +++ b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Web.config @@ -1,4 +1,4 @@ - + @@ -31,7 +31,7 @@ - + @@ -66,3 +66,4 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.ArchiveLater/packages.config b/src/Orchard.Web/Modules/Orchard.ArchiveLater/packages.config index e807cea03..77c61debb 100644 --- a/src/Orchard.Web/Modules/Orchard.ArchiveLater/packages.config +++ b/src/Orchard.Web/Modules/Orchard.ArchiveLater/packages.config @@ -1,8 +1,8 @@ - + - - - - - - \ No newline at end of file + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.AuditTrail/Orchard.AuditTrail.csproj b/src/Orchard.Web/Modules/Orchard.AuditTrail/Orchard.AuditTrail.csproj index ebf275329..882f736a7 100644 --- a/src/Orchard.Web/Modules/Orchard.AuditTrail/Orchard.AuditTrail.csproj +++ b/src/Orchard.Web/Modules/Orchard.AuditTrail/Orchard.AuditTrail.csproj @@ -1,4 +1,4 @@ - + @@ -12,7 +12,7 @@ Properties Orchard.AuditTrail Orchard.AuditTrail - v4.5.2 + v4.8 false @@ -410,4 +410,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.AuditTrail/Web.config b/src/Orchard.Web/Modules/Orchard.AuditTrail/Web.config index 5fb355fc1..5c097a969 100644 --- a/src/Orchard.Web/Modules/Orchard.AuditTrail/Web.config +++ b/src/Orchard.Web/Modules/Orchard.AuditTrail/Web.config @@ -1,4 +1,4 @@ - + @@ -31,7 +31,7 @@ - + @@ -67,3 +67,4 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.AuditTrail/packages.config b/src/Orchard.Web/Modules/Orchard.AuditTrail/packages.config index 15cb79221..7a0e783a7 100644 --- a/src/Orchard.Web/Modules/Orchard.AuditTrail/packages.config +++ b/src/Orchard.Web/Modules/Orchard.AuditTrail/packages.config @@ -1,12 +1,12 @@ - + - - - - - - - - - - \ No newline at end of file + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Autoroute/Orchard.Autoroute.csproj b/src/Orchard.Web/Modules/Orchard.Autoroute/Orchard.Autoroute.csproj index f1a4cc213..de0708b14 100644 --- a/src/Orchard.Web/Modules/Orchard.Autoroute/Orchard.Autoroute.csproj +++ b/src/Orchard.Web/Modules/Orchard.Autoroute/Orchard.Autoroute.csproj @@ -1,4 +1,4 @@ - + @@ -12,7 +12,7 @@ Properties Orchard.Autoroute Orchard.Autoroute - v4.5.2 + v4.8 false @@ -220,4 +220,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.Autoroute/Web.config b/src/Orchard.Web/Modules/Orchard.Autoroute/Web.config index b35d97161..50dba4456 100644 --- a/src/Orchard.Web/Modules/Orchard.Autoroute/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Autoroute/Web.config @@ -1,4 +1,4 @@ - + @@ -30,7 +30,7 @@ - + @@ -65,3 +65,4 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.Autoroute/packages.config b/src/Orchard.Web/Modules/Orchard.Autoroute/packages.config index e807cea03..77c61debb 100644 --- a/src/Orchard.Web/Modules/Orchard.Autoroute/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Autoroute/packages.config @@ -1,8 +1,8 @@ - + - - - - - - \ No newline at end of file + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Orchard.Azure.MediaServices.csproj b/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Orchard.Azure.MediaServices.csproj index ac8e3e02b..b84a6bc05 100644 --- a/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Orchard.Azure.MediaServices.csproj +++ b/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Orchard.Azure.MediaServices.csproj @@ -1,4 +1,4 @@ - + @@ -12,7 +12,7 @@ Properties Orchard.Azure.MediaServices Orchard.Azure.MediaServices - v4.5.2 + v4.8 false @@ -603,4 +603,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Web.config b/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Web.config index 9e07f5846..0ebb8eef8 100644 --- a/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Web.config @@ -1,4 +1,4 @@ - + @@ -31,7 +31,7 @@ - + @@ -87,3 +87,4 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/packages.config b/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/packages.config index 707fab1ac..fb0f1686d 100644 --- a/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/packages.config @@ -1,24 +1,24 @@ - + - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Azure/Orchard.Azure.csproj b/src/Orchard.Web/Modules/Orchard.Azure/Orchard.Azure.csproj index 33e8b16ff..a66ea0a58 100644 --- a/src/Orchard.Web/Modules/Orchard.Azure/Orchard.Azure.csproj +++ b/src/Orchard.Web/Modules/Orchard.Azure/Orchard.Azure.csproj @@ -1,4 +1,4 @@ - + @@ -12,7 +12,7 @@ Properties Orchard.Azure Orchard.Azure - v4.5.2 + v4.8 false @@ -245,4 +245,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.Azure/Web.config b/src/Orchard.Web/Modules/Orchard.Azure/Web.config index f5680c08e..1a1324c43 100644 --- a/src/Orchard.Web/Modules/Orchard.Azure/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Azure/Web.config @@ -1,4 +1,4 @@ - + @@ -22,7 +22,7 @@ - + @@ -79,3 +79,4 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.Azure/packages.config b/src/Orchard.Web/Modules/Orchard.Azure/packages.config index 523b375f6..37482ea3d 100644 --- a/src/Orchard.Web/Modules/Orchard.Azure/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Azure/packages.config @@ -1,20 +1,20 @@ - + - - - - - - - - - - - - - - - - - - \ 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 fc61fa334..6a0cba663 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj @@ -1,4 +1,4 @@ - + @@ -12,7 +12,7 @@ Properties Orchard.Blogs Orchard.Blogs - v4.5.2 + v4.8 false @@ -274,4 +274,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Web.config b/src/Orchard.Web/Modules/Orchard.Blogs/Web.config index 871ff2ee6..90feec293 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Web.config @@ -1,4 +1,4 @@ - + @@ -31,7 +31,7 @@ - + @@ -66,3 +66,4 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/packages.config b/src/Orchard.Web/Modules/Orchard.Blogs/packages.config index e807cea03..77c61debb 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Blogs/packages.config @@ -1,8 +1,8 @@ - + - - - - - - \ No newline at end of file + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Caching/Orchard.Caching.csproj b/src/Orchard.Web/Modules/Orchard.Caching/Orchard.Caching.csproj index aafc6a9a2..ac978e622 100644 --- a/src/Orchard.Web/Modules/Orchard.Caching/Orchard.Caching.csproj +++ b/src/Orchard.Web/Modules/Orchard.Caching/Orchard.Caching.csproj @@ -1,4 +1,4 @@ - + @@ -12,7 +12,7 @@ Properties Orchard.Caching Orchard.Caching - v4.5.2 + v4.8 false @@ -156,4 +156,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.Caching/Web.config b/src/Orchard.Web/Modules/Orchard.Caching/Web.config index 314606a77..bb4f1406b 100644 --- a/src/Orchard.Web/Modules/Orchard.Caching/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Caching/Web.config @@ -1,4 +1,4 @@ - + @@ -22,7 +22,7 @@ - + @@ -55,3 +55,4 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.Caching/packages.config b/src/Orchard.Web/Modules/Orchard.Caching/packages.config index 6729ced49..885a0b634 100644 --- a/src/Orchard.Web/Modules/Orchard.Caching/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Caching/packages.config @@ -1,7 +1,7 @@ - + - - - - - \ No newline at end of file + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.CodeGeneration/Orchard.CodeGeneration.csproj b/src/Orchard.Web/Modules/Orchard.CodeGeneration/Orchard.CodeGeneration.csproj index f8165fc8e..c709fe806 100644 --- a/src/Orchard.Web/Modules/Orchard.CodeGeneration/Orchard.CodeGeneration.csproj +++ b/src/Orchard.Web/Modules/Orchard.CodeGeneration/Orchard.CodeGeneration.csproj @@ -1,4 +1,4 @@ - + @@ -13,7 +13,7 @@ Properties Orchard.CodeGeneration Orchard.CodeGeneration - v4.5.2 + v4.8 false false @@ -164,4 +164,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.CodeGeneration/Web.config b/src/Orchard.Web/Modules/Orchard.CodeGeneration/Web.config index 314606a77..bb4f1406b 100644 --- a/src/Orchard.Web/Modules/Orchard.CodeGeneration/Web.config +++ b/src/Orchard.Web/Modules/Orchard.CodeGeneration/Web.config @@ -1,4 +1,4 @@ - + @@ -22,7 +22,7 @@ - + @@ -55,3 +55,4 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.CodeGeneration/packages.config b/src/Orchard.Web/Modules/Orchard.CodeGeneration/packages.config index 6729ced49..885a0b634 100644 --- a/src/Orchard.Web/Modules/Orchard.CodeGeneration/packages.config +++ b/src/Orchard.Web/Modules/Orchard.CodeGeneration/packages.config @@ -1,7 +1,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 1d208f725..df1d97c67 100644 --- a/src/Orchard.Web/Modules/Orchard.Comments/Orchard.Comments.csproj +++ b/src/Orchard.Web/Modules/Orchard.Comments/Orchard.Comments.csproj @@ -1,4 +1,4 @@ - + @@ -12,7 +12,7 @@ Properties Orchard.Comments Orchard.Comments - v4.5.2 + v4.8 false @@ -261,4 +261,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Web.config b/src/Orchard.Web/Modules/Orchard.Comments/Web.config index 123fb9bad..e27607e8c 100644 --- a/src/Orchard.Web/Modules/Orchard.Comments/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Comments/Web.config @@ -1,4 +1,4 @@ - + @@ -31,7 +31,7 @@ - + @@ -66,3 +66,4 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.Comments/packages.config b/src/Orchard.Web/Modules/Orchard.Comments/packages.config index e807cea03..77c61debb 100644 --- a/src/Orchard.Web/Modules/Orchard.Comments/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Comments/packages.config @@ -1,8 +1,8 @@ - + - - - - - - \ No newline at end of file + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Conditions/Orchard.Conditions.csproj b/src/Orchard.Web/Modules/Orchard.Conditions/Orchard.Conditions.csproj index 9845ced6d..c767633b7 100644 --- a/src/Orchard.Web/Modules/Orchard.Conditions/Orchard.Conditions.csproj +++ b/src/Orchard.Web/Modules/Orchard.Conditions/Orchard.Conditions.csproj @@ -1,4 +1,4 @@ - + @@ -12,7 +12,7 @@ Properties Orchard.Conditions Orchard.Conditions - v4.5.2 + v4.8 false @@ -170,4 +170,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.Conditions/Web.config b/src/Orchard.Web/Modules/Orchard.Conditions/Web.config index 104465f24..612d16692 100644 --- a/src/Orchard.Web/Modules/Orchard.Conditions/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Conditions/Web.config @@ -1,4 +1,4 @@ - + @@ -22,7 +22,7 @@ - + @@ -57,3 +57,4 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.Conditions/packages.config b/src/Orchard.Web/Modules/Orchard.Conditions/packages.config index 6729ced49..885a0b634 100644 --- a/src/Orchard.Web/Modules/Orchard.Conditions/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Conditions/packages.config @@ -1,7 +1,7 @@ - + - - - - - \ No newline at end of file + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.ContentPermissions/Orchard.ContentPermissions.csproj b/src/Orchard.Web/Modules/Orchard.ContentPermissions/Orchard.ContentPermissions.csproj index 336e6e0d5..a320821c7 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentPermissions/Orchard.ContentPermissions.csproj +++ b/src/Orchard.Web/Modules/Orchard.ContentPermissions/Orchard.ContentPermissions.csproj @@ -1,4 +1,4 @@ - + @@ -12,7 +12,7 @@ Properties Orchard.ContentPermissions Orchard.ContentPermissions - v4.5.2 + v4.8 false @@ -208,4 +208,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.ContentPermissions/Web.config b/src/Orchard.Web/Modules/Orchard.ContentPermissions/Web.config index 871ff2ee6..90feec293 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentPermissions/Web.config +++ b/src/Orchard.Web/Modules/Orchard.ContentPermissions/Web.config @@ -1,4 +1,4 @@ - + @@ -31,7 +31,7 @@ - + @@ -66,3 +66,4 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.ContentPermissions/packages.config b/src/Orchard.Web/Modules/Orchard.ContentPermissions/packages.config index e807cea03..77c61debb 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentPermissions/packages.config +++ b/src/Orchard.Web/Modules/Orchard.ContentPermissions/packages.config @@ -1,8 +1,8 @@ - + - - - - - - \ No newline at end of file + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.ContentPicker/Orchard.ContentPicker.csproj b/src/Orchard.Web/Modules/Orchard.ContentPicker/Orchard.ContentPicker.csproj index 00720d8c2..85d8fd138 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentPicker/Orchard.ContentPicker.csproj +++ b/src/Orchard.Web/Modules/Orchard.ContentPicker/Orchard.ContentPicker.csproj @@ -1,4 +1,4 @@ - + @@ -12,7 +12,7 @@ Properties Orchard.ContentPicker Orchard.ContentPicker - v4.5.2 + v4.8 false @@ -258,4 +258,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.ContentPicker/Web.config b/src/Orchard.Web/Modules/Orchard.ContentPicker/Web.config index 871ff2ee6..90feec293 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentPicker/Web.config +++ b/src/Orchard.Web/Modules/Orchard.ContentPicker/Web.config @@ -1,4 +1,4 @@ - + @@ -31,7 +31,7 @@ - + @@ -66,3 +66,4 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.ContentPicker/packages.config b/src/Orchard.Web/Modules/Orchard.ContentPicker/packages.config index c6cd1ab75..1675a5c87 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentPicker/packages.config +++ b/src/Orchard.Web/Modules/Orchard.ContentPicker/packages.config @@ -1,10 +1,10 @@ - + - - - - - - - - \ No newline at end of file + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Orchard.ContentTypes.csproj b/src/Orchard.Web/Modules/Orchard.ContentTypes/Orchard.ContentTypes.csproj index 93741670e..8c8b9fa34 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Orchard.ContentTypes.csproj +++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Orchard.ContentTypes.csproj @@ -1,4 +1,4 @@ - + @@ -13,7 +13,7 @@ Properties Orchard.ContentTypes Orchard.ContentTypes - v4.5.2 + v4.8 false false @@ -253,4 +253,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Web.config b/src/Orchard.Web/Modules/Orchard.ContentTypes/Web.config index 871ff2ee6..90feec293 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Web.config +++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Web.config @@ -1,4 +1,4 @@ - + @@ -31,7 +31,7 @@ - + @@ -66,3 +66,4 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/packages.config b/src/Orchard.Web/Modules/Orchard.ContentTypes/packages.config index e807cea03..77c61debb 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentTypes/packages.config +++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/packages.config @@ -1,8 +1,8 @@ - + - - - - - - \ No newline at end of file + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.CustomForms/Orchard.CustomForms.csproj b/src/Orchard.Web/Modules/Orchard.CustomForms/Orchard.CustomForms.csproj index 5f5873efb..4e52299bf 100644 --- a/src/Orchard.Web/Modules/Orchard.CustomForms/Orchard.CustomForms.csproj +++ b/src/Orchard.Web/Modules/Orchard.CustomForms/Orchard.CustomForms.csproj @@ -1,4 +1,4 @@ - + @@ -12,7 +12,7 @@ Properties Orchard.CustomForms Orchard.CustomForms - v4.5.2 + v4.8 false @@ -231,4 +231,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.CustomForms/Web.config b/src/Orchard.Web/Modules/Orchard.CustomForms/Web.config index 871ff2ee6..90feec293 100644 --- a/src/Orchard.Web/Modules/Orchard.CustomForms/Web.config +++ b/src/Orchard.Web/Modules/Orchard.CustomForms/Web.config @@ -1,4 +1,4 @@ - + @@ -31,7 +31,7 @@ - + @@ -66,3 +66,4 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.CustomForms/packages.config b/src/Orchard.Web/Modules/Orchard.CustomForms/packages.config index e807cea03..77c61debb 100644 --- a/src/Orchard.Web/Modules/Orchard.CustomForms/packages.config +++ b/src/Orchard.Web/Modules/Orchard.CustomForms/packages.config @@ -1,8 +1,8 @@ - + - - - - - - \ No newline at end of file + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Dashboards/Orchard.Dashboards.csproj b/src/Orchard.Web/Modules/Orchard.Dashboards/Orchard.Dashboards.csproj index 90a66bee4..b34974927 100644 --- a/src/Orchard.Web/Modules/Orchard.Dashboards/Orchard.Dashboards.csproj +++ b/src/Orchard.Web/Modules/Orchard.Dashboards/Orchard.Dashboards.csproj @@ -1,4 +1,4 @@ - + @@ -12,7 +12,7 @@ Properties Orchard.Dashboards Orchard.Dashboards - v4.5.2 + v4.8 false @@ -196,4 +196,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.Dashboards/Web.config b/src/Orchard.Web/Modules/Orchard.Dashboards/Web.config index 06d798370..60d8b0060 100644 --- a/src/Orchard.Web/Modules/Orchard.Dashboards/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Dashboards/Web.config @@ -1,4 +1,4 @@ - + @@ -31,7 +31,7 @@ - + @@ -66,3 +66,4 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.Dashboards/packages.config b/src/Orchard.Web/Modules/Orchard.Dashboards/packages.config index e807cea03..77c61debb 100644 --- a/src/Orchard.Web/Modules/Orchard.Dashboards/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Dashboards/packages.config @@ -1,8 +1,8 @@ - + - - - - - - \ No newline at end of file + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.DesignerTools/Orchard.DesignerTools.csproj b/src/Orchard.Web/Modules/Orchard.DesignerTools/Orchard.DesignerTools.csproj index 3f3fd158f..27b644362 100644 --- a/src/Orchard.Web/Modules/Orchard.DesignerTools/Orchard.DesignerTools.csproj +++ b/src/Orchard.Web/Modules/Orchard.DesignerTools/Orchard.DesignerTools.csproj @@ -1,4 +1,4 @@ - + @@ -12,7 +12,7 @@ Properties Orchard.DesignerTools Orchard.DesignerTools - v4.5.2 + v4.8 false @@ -197,4 +197,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.DesignerTools/Web.config b/src/Orchard.Web/Modules/Orchard.DesignerTools/Web.config index 5fb355fc1..5c097a969 100644 --- a/src/Orchard.Web/Modules/Orchard.DesignerTools/Web.config +++ b/src/Orchard.Web/Modules/Orchard.DesignerTools/Web.config @@ -1,4 +1,4 @@ - + @@ -31,7 +31,7 @@ - + @@ -67,3 +67,4 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.DesignerTools/packages.config b/src/Orchard.Web/Modules/Orchard.DesignerTools/packages.config index e807cea03..77c61debb 100644 --- a/src/Orchard.Web/Modules/Orchard.DesignerTools/packages.config +++ b/src/Orchard.Web/Modules/Orchard.DesignerTools/packages.config @@ -1,8 +1,8 @@ - + - - - - - - \ No newline at end of file + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Orchard.DynamicForms.csproj b/src/Orchard.Web/Modules/Orchard.DynamicForms/Orchard.DynamicForms.csproj index 72ec815c2..189df6723 100644 --- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Orchard.DynamicForms.csproj +++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Orchard.DynamicForms.csproj @@ -1,4 +1,4 @@ - + @@ -12,7 +12,7 @@ Properties Orchard.DynamicForms Orchard.DynamicForms - v4.5.2 + v4.8 false @@ -606,4 +606,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Web.config b/src/Orchard.Web/Modules/Orchard.DynamicForms/Web.config index dc15c8b18..c09f509f1 100644 --- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Web.config +++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Web.config @@ -1,4 +1,4 @@ - + @@ -31,7 +31,7 @@ - + @@ -69,3 +69,4 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/packages.config b/src/Orchard.Web/Modules/Orchard.DynamicForms/packages.config index 9244ea4c7..2aa425ab5 100644 --- a/src/Orchard.Web/Modules/Orchard.DynamicForms/packages.config +++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/packages.config @@ -1,9 +1,9 @@ - + - - - - - - - \ No newline at end of file + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Email/Orchard.Email.csproj b/src/Orchard.Web/Modules/Orchard.Email/Orchard.Email.csproj index 31de23843..e04c6daa7 100644 --- a/src/Orchard.Web/Modules/Orchard.Email/Orchard.Email.csproj +++ b/src/Orchard.Web/Modules/Orchard.Email/Orchard.Email.csproj @@ -1,4 +1,4 @@ - + @@ -12,7 +12,7 @@ Properties Orchard.Email Orchard.Email - v4.5.2 + v4.8 false @@ -217,4 +217,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.Email/Web.config b/src/Orchard.Web/Modules/Orchard.Email/Web.config index 871ff2ee6..90feec293 100644 --- a/src/Orchard.Web/Modules/Orchard.Email/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Email/Web.config @@ -1,4 +1,4 @@ - + @@ -31,7 +31,7 @@ - + @@ -66,3 +66,4 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.Email/packages.config b/src/Orchard.Web/Modules/Orchard.Email/packages.config index 9244ea4c7..2aa425ab5 100644 --- a/src/Orchard.Web/Modules/Orchard.Email/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Email/packages.config @@ -1,9 +1,9 @@ - + - - - - - - - \ No newline at end of file + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Fields/Orchard.Fields.csproj b/src/Orchard.Web/Modules/Orchard.Fields/Orchard.Fields.csproj index c723f5cf8..28f98c4da 100644 --- a/src/Orchard.Web/Modules/Orchard.Fields/Orchard.Fields.csproj +++ b/src/Orchard.Web/Modules/Orchard.Fields/Orchard.Fields.csproj @@ -1,4 +1,4 @@ - + @@ -12,7 +12,7 @@ Properties Orchard.Fields Orchard.Fields - v4.5.2 + v4.8 false @@ -230,4 +230,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.Fields/Web.config b/src/Orchard.Web/Modules/Orchard.Fields/Web.config index 4d020166a..beb96b4c7 100644 --- a/src/Orchard.Web/Modules/Orchard.Fields/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Fields/Web.config @@ -1,4 +1,4 @@ - + @@ -32,7 +32,7 @@ - + @@ -66,3 +66,4 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.Fields/packages.config b/src/Orchard.Web/Modules/Orchard.Fields/packages.config index e807cea03..77c61debb 100644 --- a/src/Orchard.Web/Modules/Orchard.Fields/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Fields/packages.config @@ -1,8 +1,8 @@ - + - - - - - - \ No newline at end of file + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Forms/Orchard.Forms.csproj b/src/Orchard.Web/Modules/Orchard.Forms/Orchard.Forms.csproj index f2f45b6b2..f288e9c9e 100644 --- a/src/Orchard.Web/Modules/Orchard.Forms/Orchard.Forms.csproj +++ b/src/Orchard.Web/Modules/Orchard.Forms/Orchard.Forms.csproj @@ -1,4 +1,4 @@ - + @@ -12,7 +12,7 @@ Properties Orchard.Forms Orchard.Forms - v4.5.2 + v4.8 false @@ -181,4 +181,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.Forms/Web.config b/src/Orchard.Web/Modules/Orchard.Forms/Web.config index a3cb5df90..a54f9e98a 100644 --- a/src/Orchard.Web/Modules/Orchard.Forms/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Forms/Web.config @@ -1,4 +1,4 @@ - + @@ -22,7 +22,7 @@ - + @@ -57,3 +57,4 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.Forms/packages.config b/src/Orchard.Web/Modules/Orchard.Forms/packages.config index 1ea27eef9..65331d2bb 100644 --- a/src/Orchard.Web/Modules/Orchard.Forms/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Forms/packages.config @@ -1,8 +1,8 @@ - + - - - - - - \ No newline at end of file + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.ImageEditor/Orchard.ImageEditor.csproj b/src/Orchard.Web/Modules/Orchard.ImageEditor/Orchard.ImageEditor.csproj index e601da152..d841c514a 100644 --- a/src/Orchard.Web/Modules/Orchard.ImageEditor/Orchard.ImageEditor.csproj +++ b/src/Orchard.Web/Modules/Orchard.ImageEditor/Orchard.ImageEditor.csproj @@ -1,4 +1,4 @@ - + @@ -12,7 +12,7 @@ Properties Orchard.ImageEditor Orchard.ImageEditor - v4.5.2 + v4.8 false @@ -236,4 +236,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.ImageEditor/Web.config b/src/Orchard.Web/Modules/Orchard.ImageEditor/Web.config index 3ec9b6b0a..636dc811d 100644 --- a/src/Orchard.Web/Modules/Orchard.ImageEditor/Web.config +++ b/src/Orchard.Web/Modules/Orchard.ImageEditor/Web.config @@ -1,4 +1,4 @@ - + @@ -31,7 +31,7 @@ - + @@ -67,3 +67,4 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.ImageEditor/packages.config b/src/Orchard.Web/Modules/Orchard.ImageEditor/packages.config index e807cea03..77c61debb 100644 --- a/src/Orchard.Web/Modules/Orchard.ImageEditor/packages.config +++ b/src/Orchard.Web/Modules/Orchard.ImageEditor/packages.config @@ -1,8 +1,8 @@ - + - - - - - - \ 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 fd111a6b7..2be7d1cdf 100644 --- a/src/Orchard.Web/Modules/Orchard.ImportExport/Orchard.ImportExport.csproj +++ b/src/Orchard.Web/Modules/Orchard.ImportExport/Orchard.ImportExport.csproj @@ -1,4 +1,4 @@ - + @@ -13,7 +13,7 @@ Properties Orchard.ImportExport Orchard.ImportExport - v4.5.2 + v4.8 false @@ -232,4 +232,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.ImportExport/Web.config b/src/Orchard.Web/Modules/Orchard.ImportExport/Web.config index 871ff2ee6..90feec293 100644 --- a/src/Orchard.Web/Modules/Orchard.ImportExport/Web.config +++ b/src/Orchard.Web/Modules/Orchard.ImportExport/Web.config @@ -1,4 +1,4 @@ - + @@ -31,7 +31,7 @@ - + @@ -66,3 +66,4 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.ImportExport/packages.config b/src/Orchard.Web/Modules/Orchard.ImportExport/packages.config index 5acbddda3..65cd1a01f 100644 --- a/src/Orchard.Web/Modules/Orchard.ImportExport/packages.config +++ b/src/Orchard.Web/Modules/Orchard.ImportExport/packages.config @@ -1,11 +1,11 @@ - + - - - - - - - - - \ No newline at end of file + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Indexing/Orchard.Indexing.csproj b/src/Orchard.Web/Modules/Orchard.Indexing/Orchard.Indexing.csproj index 31b3ed0e4..cb01bb903 100644 --- a/src/Orchard.Web/Modules/Orchard.Indexing/Orchard.Indexing.csproj +++ b/src/Orchard.Web/Modules/Orchard.Indexing/Orchard.Indexing.csproj @@ -1,4 +1,4 @@ - + @@ -12,7 +12,7 @@ Properties Orchard.Indexing Orchard.Indexing - v4.5.2 + v4.8 @@ -186,4 +186,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.Indexing/Web.config b/src/Orchard.Web/Modules/Orchard.Indexing/Web.config index 871ff2ee6..90feec293 100644 --- a/src/Orchard.Web/Modules/Orchard.Indexing/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Indexing/Web.config @@ -1,4 +1,4 @@ - + @@ -31,7 +31,7 @@ - + @@ -66,3 +66,4 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.Indexing/packages.config b/src/Orchard.Web/Modules/Orchard.Indexing/packages.config index e807cea03..77c61debb 100644 --- a/src/Orchard.Web/Modules/Orchard.Indexing/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Indexing/packages.config @@ -1,8 +1,8 @@ - + - - - - - - \ No newline at end of file + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.JobsQueue/Orchard.JobsQueue.csproj b/src/Orchard.Web/Modules/Orchard.JobsQueue/Orchard.JobsQueue.csproj index fd749ab98..b77411037 100644 --- a/src/Orchard.Web/Modules/Orchard.JobsQueue/Orchard.JobsQueue.csproj +++ b/src/Orchard.Web/Modules/Orchard.JobsQueue/Orchard.JobsQueue.csproj @@ -1,4 +1,4 @@ - + @@ -13,7 +13,7 @@ Properties Orchard.JobsQueue Orchard.JobsQueue - v4.5.2 + v4.8 @@ -203,4 +203,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.JobsQueue/Web.config b/src/Orchard.Web/Modules/Orchard.JobsQueue/Web.config index 871ff2ee6..90feec293 100644 --- a/src/Orchard.Web/Modules/Orchard.JobsQueue/Web.config +++ b/src/Orchard.Web/Modules/Orchard.JobsQueue/Web.config @@ -1,4 +1,4 @@ - + @@ -31,7 +31,7 @@ - + @@ -66,3 +66,4 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.JobsQueue/packages.config b/src/Orchard.Web/Modules/Orchard.JobsQueue/packages.config index 9244ea4c7..2aa425ab5 100644 --- a/src/Orchard.Web/Modules/Orchard.JobsQueue/packages.config +++ b/src/Orchard.Web/Modules/Orchard.JobsQueue/packages.config @@ -1,9 +1,9 @@ - + - - - - - - - \ No newline at end of file + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj b/src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj index 7e98fdac3..8b40e4e1f 100644 --- a/src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj +++ b/src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj @@ -1,4 +1,4 @@ - + @@ -12,7 +12,7 @@ Properties Orchard.Layouts Orchard.Layouts - v4.5.2 + v4.8 false @@ -640,4 +640,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/Web.config b/src/Orchard.Web/Modules/Orchard.Layouts/Web.config index 39f5948b3..303f20556 100644 --- a/src/Orchard.Web/Modules/Orchard.Layouts/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Layouts/Web.config @@ -1,4 +1,4 @@ - + @@ -31,7 +31,7 @@ - + @@ -66,3 +66,4 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/packages.config b/src/Orchard.Web/Modules/Orchard.Layouts/packages.config index 741a7cec6..5bb0400b4 100644 --- a/src/Orchard.Web/Modules/Orchard.Layouts/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Layouts/packages.config @@ -1,12 +1,12 @@ - + - - - - - - - - - - \ No newline at end of file + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Lists/Orchard.Lists.csproj b/src/Orchard.Web/Modules/Orchard.Lists/Orchard.Lists.csproj index 7b0c909eb..c745ea575 100644 --- a/src/Orchard.Web/Modules/Orchard.Lists/Orchard.Lists.csproj +++ b/src/Orchard.Web/Modules/Orchard.Lists/Orchard.Lists.csproj @@ -1,4 +1,4 @@ - + @@ -12,7 +12,7 @@ Properties Orchard.Lists Orchard.Lists - v4.5.2 + v4.8 false @@ -278,4 +278,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.Lists/Web.config b/src/Orchard.Web/Modules/Orchard.Lists/Web.config index 871ff2ee6..90feec293 100644 --- a/src/Orchard.Web/Modules/Orchard.Lists/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Lists/Web.config @@ -1,4 +1,4 @@ - + @@ -31,7 +31,7 @@ - + @@ -66,3 +66,4 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.Lists/packages.config b/src/Orchard.Web/Modules/Orchard.Lists/packages.config index e807cea03..77c61debb 100644 --- a/src/Orchard.Web/Modules/Orchard.Lists/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Lists/packages.config @@ -1,8 +1,8 @@ - + - - - - - - \ No newline at end of file + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Localization/Orchard.Localization.csproj b/src/Orchard.Web/Modules/Orchard.Localization/Orchard.Localization.csproj index 42844a468..68deaafb7 100644 --- a/src/Orchard.Web/Modules/Orchard.Localization/Orchard.Localization.csproj +++ b/src/Orchard.Web/Modules/Orchard.Localization/Orchard.Localization.csproj @@ -1,4 +1,4 @@ - + @@ -13,7 +13,7 @@ Properties Orchard.Localization Orchard.Localization - v4.5.2 + v4.8 false @@ -236,4 +236,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.Localization/Web.config b/src/Orchard.Web/Modules/Orchard.Localization/Web.config index 871ff2ee6..90feec293 100644 --- a/src/Orchard.Web/Modules/Orchard.Localization/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Localization/Web.config @@ -1,4 +1,4 @@ - + @@ -31,7 +31,7 @@ - + @@ -66,3 +66,4 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.Localization/packages.config b/src/Orchard.Web/Modules/Orchard.Localization/packages.config index 17c4ab138..3694cc99e 100644 --- a/src/Orchard.Web/Modules/Orchard.Localization/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Localization/packages.config @@ -1,9 +1,9 @@ - + - - - - - - - \ 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 78b663376..78ab7cd0e 100644 --- a/src/Orchard.Web/Modules/Orchard.Media/Orchard.Media.csproj +++ b/src/Orchard.Web/Modules/Orchard.Media/Orchard.Media.csproj @@ -1,4 +1,4 @@ - + @@ -12,7 +12,7 @@ Properties Orchard.Media Orchard.Media - v4.5.2 + v4.8 false @@ -213,4 +213,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.Media/Web.config b/src/Orchard.Web/Modules/Orchard.Media/Web.config index 871ff2ee6..90feec293 100644 --- a/src/Orchard.Web/Modules/Orchard.Media/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Media/Web.config @@ -1,4 +1,4 @@ - + @@ -31,7 +31,7 @@ - + @@ -66,3 +66,4 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.Media/packages.config b/src/Orchard.Web/Modules/Orchard.Media/packages.config index 660825412..51a7dbcf8 100644 --- a/src/Orchard.Web/Modules/Orchard.Media/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Media/packages.config @@ -1,9 +1,9 @@ - + - - - - - - - \ No newline at end of file + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Orchard.MediaLibrary.csproj b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Orchard.MediaLibrary.csproj index f5cda0ee0..834994deb 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Orchard.MediaLibrary.csproj +++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Orchard.MediaLibrary.csproj @@ -1,4 +1,4 @@ - + @@ -12,7 +12,7 @@ Properties Orchard.MediaLibrary Orchard.MediaLibrary - v4.5.2 + v4.8 false @@ -459,4 +459,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Web.config b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Web.config index 5fb355fc1..5c097a969 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Web.config +++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Web.config @@ -1,4 +1,4 @@ - + @@ -31,7 +31,7 @@ - + @@ -67,3 +67,4 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/packages.config b/src/Orchard.Web/Modules/Orchard.MediaLibrary/packages.config index 9244ea4c7..2aa425ab5 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/packages.config +++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/packages.config @@ -1,9 +1,9 @@ - + - - - - - - - \ No newline at end of file + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.MediaPicker/Orchard.MediaPicker.csproj b/src/Orchard.Web/Modules/Orchard.MediaPicker/Orchard.MediaPicker.csproj index fdc1165b6..9c8f8a114 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaPicker/Orchard.MediaPicker.csproj +++ b/src/Orchard.Web/Modules/Orchard.MediaPicker/Orchard.MediaPicker.csproj @@ -1,4 +1,4 @@ - + @@ -12,7 +12,7 @@ Properties Orchard.MediaPicker Orchard.MediaPicker - v4.5.2 + v4.8 false @@ -236,4 +236,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.MediaPicker/Web.config b/src/Orchard.Web/Modules/Orchard.MediaPicker/Web.config index 871ff2ee6..90feec293 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaPicker/Web.config +++ b/src/Orchard.Web/Modules/Orchard.MediaPicker/Web.config @@ -1,4 +1,4 @@ - + @@ -31,7 +31,7 @@ - + @@ -66,3 +66,4 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.MediaPicker/packages.config b/src/Orchard.Web/Modules/Orchard.MediaPicker/packages.config index e807cea03..77c61debb 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaPicker/packages.config +++ b/src/Orchard.Web/Modules/Orchard.MediaPicker/packages.config @@ -1,8 +1,8 @@ - + - - - - - - \ No newline at end of file + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.MediaProcessing/Orchard.MediaProcessing.csproj b/src/Orchard.Web/Modules/Orchard.MediaProcessing/Orchard.MediaProcessing.csproj index 02f50f943..8d6436a65 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaProcessing/Orchard.MediaProcessing.csproj +++ b/src/Orchard.Web/Modules/Orchard.MediaProcessing/Orchard.MediaProcessing.csproj @@ -1,4 +1,4 @@ - + @@ -12,7 +12,7 @@ Properties Orchard.MediaProcessing Orchard.MediaProcessing - v4.5.2 + v4.8 false @@ -240,4 +240,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.MediaProcessing/Web.config b/src/Orchard.Web/Modules/Orchard.MediaProcessing/Web.config index 871ff2ee6..90feec293 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaProcessing/Web.config +++ b/src/Orchard.Web/Modules/Orchard.MediaProcessing/Web.config @@ -1,4 +1,4 @@ - + @@ -31,7 +31,7 @@ - + @@ -66,3 +66,4 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.MediaProcessing/packages.config b/src/Orchard.Web/Modules/Orchard.MediaProcessing/packages.config index 12d51b53f..86e86601b 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaProcessing/packages.config +++ b/src/Orchard.Web/Modules/Orchard.MediaProcessing/packages.config @@ -1,9 +1,9 @@ - + - - - - - - - \ No newline at end of file + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.MessageBus/Orchard.MessageBus.csproj b/src/Orchard.Web/Modules/Orchard.MessageBus/Orchard.MessageBus.csproj index 37a3e7c01..89d78f835 100644 --- a/src/Orchard.Web/Modules/Orchard.MessageBus/Orchard.MessageBus.csproj +++ b/src/Orchard.Web/Modules/Orchard.MessageBus/Orchard.MessageBus.csproj @@ -1,4 +1,4 @@ - + @@ -12,7 +12,7 @@ Properties Orchard.MessageBus Orchard.MessageBus - v4.5.2 + v4.8 false @@ -183,4 +183,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.MessageBus/Web.config b/src/Orchard.Web/Modules/Orchard.MessageBus/Web.config index 314606a77..bb4f1406b 100644 --- a/src/Orchard.Web/Modules/Orchard.MessageBus/Web.config +++ b/src/Orchard.Web/Modules/Orchard.MessageBus/Web.config @@ -1,4 +1,4 @@ - + @@ -22,7 +22,7 @@ - + @@ -55,3 +55,4 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.MessageBus/packages.config b/src/Orchard.Web/Modules/Orchard.MessageBus/packages.config index 96e09a989..ed8a60214 100644 --- a/src/Orchard.Web/Modules/Orchard.MessageBus/packages.config +++ b/src/Orchard.Web/Modules/Orchard.MessageBus/packages.config @@ -1,9 +1,9 @@ - + - - - - - - - \ No newline at end of file + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Migrations/Orchard.Migrations.csproj b/src/Orchard.Web/Modules/Orchard.Migrations/Orchard.Migrations.csproj index f3fc1e0e6..61f36e07d 100644 --- a/src/Orchard.Web/Modules/Orchard.Migrations/Orchard.Migrations.csproj +++ b/src/Orchard.Web/Modules/Orchard.Migrations/Orchard.Migrations.csproj @@ -1,4 +1,4 @@ - + @@ -13,7 +13,7 @@ Properties Orchard.Migrations Orchard.Migrations - v4.5.2 + v4.8 false @@ -147,4 +147,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.Migrations/Web.config b/src/Orchard.Web/Modules/Orchard.Migrations/Web.config index 314606a77..bb4f1406b 100644 --- a/src/Orchard.Web/Modules/Orchard.Migrations/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Migrations/Web.config @@ -1,4 +1,4 @@ - + @@ -22,7 +22,7 @@ - + @@ -55,3 +55,4 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.Migrations/packages.config b/src/Orchard.Web/Modules/Orchard.Migrations/packages.config index 6729ced49..885a0b634 100644 --- a/src/Orchard.Web/Modules/Orchard.Migrations/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Migrations/packages.config @@ -1,7 +1,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 df19510be..1e19fdd07 100644 --- a/src/Orchard.Web/Modules/Orchard.Modules/Orchard.Modules.csproj +++ b/src/Orchard.Web/Modules/Orchard.Modules/Orchard.Modules.csproj @@ -1,4 +1,4 @@ - + @@ -12,7 +12,7 @@ Properties Orchard.Modules Orchard.Modules - v4.5.2 + v4.8 false @@ -209,4 +209,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Web.config b/src/Orchard.Web/Modules/Orchard.Modules/Web.config index 5df21a9d9..37ba89226 100644 --- a/src/Orchard.Web/Modules/Orchard.Modules/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Modules/Web.config @@ -1,4 +1,4 @@ - + @@ -31,7 +31,7 @@ - + @@ -65,3 +65,4 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.Modules/packages.config b/src/Orchard.Web/Modules/Orchard.Modules/packages.config index 53b84a4ec..b6b88daa0 100644 --- a/src/Orchard.Web/Modules/Orchard.Modules/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Modules/packages.config @@ -1,9 +1,9 @@ - + - - - - - - - \ 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 04cffca64..c57eed68d 100644 --- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Orchard.MultiTenancy.csproj +++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Orchard.MultiTenancy.csproj @@ -1,4 +1,4 @@ - + @@ -12,7 +12,7 @@ Properties Orchard.MultiTenancy Orchard.MultiTenancy - v4.5.2 + v4.8 false @@ -206,4 +206,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Web.config b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Web.config index 5df21a9d9..37ba89226 100644 --- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Web.config +++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Web.config @@ -1,4 +1,4 @@ - + @@ -31,7 +31,7 @@ - + @@ -65,3 +65,4 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/packages.config b/src/Orchard.Web/Modules/Orchard.MultiTenancy/packages.config index 5acbddda3..65cd1a01f 100644 --- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/packages.config +++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/packages.config @@ -1,11 +1,11 @@ - + - - - - - - - - - \ 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 c3911517e..40828c169 100644 --- a/src/Orchard.Web/Modules/Orchard.OutputCache/Orchard.OutputCache.csproj +++ b/src/Orchard.Web/Modules/Orchard.OutputCache/Orchard.OutputCache.csproj @@ -1,4 +1,4 @@ - + @@ -12,7 +12,7 @@ Properties Orchard.OutputCache Orchard.OutputCache - v4.5.2 + v4.8 false @@ -212,3 +212,4 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.OutputCache/Web.config b/src/Orchard.Web/Modules/Orchard.OutputCache/Web.config index a6b6c2d8f..cd712d064 100644 --- a/src/Orchard.Web/Modules/Orchard.OutputCache/Web.config +++ b/src/Orchard.Web/Modules/Orchard.OutputCache/Web.config @@ -1,4 +1,4 @@ - + @@ -31,7 +31,7 @@ - + @@ -66,3 +66,4 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.OutputCache/packages.config b/src/Orchard.Web/Modules/Orchard.OutputCache/packages.config index 53b84a4ec..b6b88daa0 100644 --- a/src/Orchard.Web/Modules/Orchard.OutputCache/packages.config +++ b/src/Orchard.Web/Modules/Orchard.OutputCache/packages.config @@ -1,9 +1,9 @@ - + - - - - - - - \ No newline at end of file + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Orchard.Packaging.csproj b/src/Orchard.Web/Modules/Orchard.Packaging/Orchard.Packaging.csproj index d71facbb8..683937147 100644 --- a/src/Orchard.Web/Modules/Orchard.Packaging/Orchard.Packaging.csproj +++ b/src/Orchard.Web/Modules/Orchard.Packaging/Orchard.Packaging.csproj @@ -1,4 +1,4 @@ - + @@ -13,7 +13,7 @@ Properties Orchard.Packaging Orchard.Packaging - v4.5.2 + v4.8 false false @@ -258,4 +258,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Web.config b/src/Orchard.Web/Modules/Orchard.Packaging/Web.config index 8fe507c9f..38da45380 100644 --- a/src/Orchard.Web/Modules/Orchard.Packaging/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Packaging/Web.config @@ -1,4 +1,4 @@ - + @@ -31,7 +31,7 @@ - + @@ -66,3 +66,4 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/packages.config b/src/Orchard.Web/Modules/Orchard.Packaging/packages.config index 4a6f15c13..e96a9edcb 100644 --- a/src/Orchard.Web/Modules/Orchard.Packaging/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Packaging/packages.config @@ -1,9 +1,9 @@ - + - - - - - - - \ 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 7c9d64bae..d944ad78b 100644 --- a/src/Orchard.Web/Modules/Orchard.Pages/Orchard.Pages.csproj +++ b/src/Orchard.Web/Modules/Orchard.Pages/Orchard.Pages.csproj @@ -1,4 +1,4 @@ - + @@ -13,7 +13,7 @@ Properties Orchard.Pages Orchard.Pages - v4.5.2 + v4.8 @@ -130,4 +130,4 @@ --> - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.Pages/Web.config b/src/Orchard.Web/Modules/Orchard.Pages/Web.config index a3cb5df90..a54f9e98a 100644 --- a/src/Orchard.Web/Modules/Orchard.Pages/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Pages/Web.config @@ -1,4 +1,4 @@ - + @@ -22,7 +22,7 @@ - + @@ -57,3 +57,4 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.Projections/Orchard.Projections.csproj b/src/Orchard.Web/Modules/Orchard.Projections/Orchard.Projections.csproj index cd1652bc8..71bb1404e 100644 --- a/src/Orchard.Web/Modules/Orchard.Projections/Orchard.Projections.csproj +++ b/src/Orchard.Web/Modules/Orchard.Projections/Orchard.Projections.csproj @@ -1,4 +1,4 @@ - + @@ -12,7 +12,7 @@ Properties Orchard.Projections Orchard.Projections - v4.5.2 + v4.8 false @@ -382,4 +382,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 41b59dc55..89be4a4b1 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 @@ -1,4 +1,4 @@ - + Debug @@ -10,7 +10,7 @@ Properties Orchard.Projections.Tests Orchard.Projections.Tests - v4.5.2 + v4.8 512 @@ -124,4 +124,4 @@ --> - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.Projections/Tests/packages.config b/src/Orchard.Web/Modules/Orchard.Projections/Tests/packages.config index c9898a6c3..013f51872 100644 --- a/src/Orchard.Web/Modules/Orchard.Projections/Tests/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Projections/Tests/packages.config @@ -1,9 +1,9 @@ - + - - - - - - - \ No newline at end of file + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Projections/Web.config b/src/Orchard.Web/Modules/Orchard.Projections/Web.config index 871ff2ee6..90feec293 100644 --- a/src/Orchard.Web/Modules/Orchard.Projections/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Projections/Web.config @@ -1,4 +1,4 @@ - + @@ -31,7 +31,7 @@ - + @@ -66,3 +66,4 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.Projections/packages.config b/src/Orchard.Web/Modules/Orchard.Projections/packages.config index c6cd1ab75..1675a5c87 100644 --- a/src/Orchard.Web/Modules/Orchard.Projections/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Projections/packages.config @@ -1,10 +1,10 @@ - + - - - - - - - - \ No newline at end of file + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.PublishLater/Orchard.PublishLater.csproj b/src/Orchard.Web/Modules/Orchard.PublishLater/Orchard.PublishLater.csproj index b9d73a7b5..9d39fcf6b 100644 --- a/src/Orchard.Web/Modules/Orchard.PublishLater/Orchard.PublishLater.csproj +++ b/src/Orchard.Web/Modules/Orchard.PublishLater/Orchard.PublishLater.csproj @@ -1,4 +1,4 @@ - + @@ -13,7 +13,7 @@ Properties Orchard.PublishLater Orchard.PublishLater - v4.5.2 + v4.8 false @@ -190,4 +190,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.PublishLater/Web.config b/src/Orchard.Web/Modules/Orchard.PublishLater/Web.config index 033d0825a..60e3af701 100644 --- a/src/Orchard.Web/Modules/Orchard.PublishLater/Web.config +++ b/src/Orchard.Web/Modules/Orchard.PublishLater/Web.config @@ -1,4 +1,4 @@ - + @@ -31,7 +31,7 @@ - + @@ -78,3 +78,4 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.PublishLater/packages.config b/src/Orchard.Web/Modules/Orchard.PublishLater/packages.config index e807cea03..77c61debb 100644 --- a/src/Orchard.Web/Modules/Orchard.PublishLater/packages.config +++ b/src/Orchard.Web/Modules/Orchard.PublishLater/packages.config @@ -1,8 +1,8 @@ - + - - - - - - \ 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 777f4ed43..8910fba28 100644 --- a/src/Orchard.Web/Modules/Orchard.Recipes/Orchard.Recipes.csproj +++ b/src/Orchard.Web/Modules/Orchard.Recipes/Orchard.Recipes.csproj @@ -1,4 +1,4 @@ - + @@ -13,7 +13,7 @@ Properties Orchard.Recipes Orchard.Recipes - v4.5.2 + v4.8 false @@ -220,4 +220,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.Recipes/Web.config b/src/Orchard.Web/Modules/Orchard.Recipes/Web.config index 9f89edd71..00bdc6b7a 100644 --- a/src/Orchard.Web/Modules/Orchard.Recipes/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Recipes/Web.config @@ -1,4 +1,4 @@ - + @@ -31,7 +31,7 @@ - + @@ -63,4 +63,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.Recipes/packages.config b/src/Orchard.Web/Modules/Orchard.Recipes/packages.config index 55bcca44e..8b3d0a48b 100644 --- a/src/Orchard.Web/Modules/Orchard.Recipes/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Recipes/packages.config @@ -1,10 +1,10 @@ - + - - - - - - - - \ No newline at end of file + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Redis/Orchard.Redis.csproj b/src/Orchard.Web/Modules/Orchard.Redis/Orchard.Redis.csproj index 93f6c63d3..e01ac0e72 100644 --- a/src/Orchard.Web/Modules/Orchard.Redis/Orchard.Redis.csproj +++ b/src/Orchard.Web/Modules/Orchard.Redis/Orchard.Redis.csproj @@ -1,4 +1,4 @@ - + @@ -12,7 +12,7 @@ Properties Orchard.Redis Orchard.Redis - v4.5.2 + v4.8 false @@ -166,4 +166,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.Redis/Web.config b/src/Orchard.Web/Modules/Orchard.Redis/Web.config index 314606a77..bb4f1406b 100644 --- a/src/Orchard.Web/Modules/Orchard.Redis/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Redis/Web.config @@ -1,4 +1,4 @@ - + @@ -22,7 +22,7 @@ - + @@ -55,3 +55,4 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.Redis/packages.config b/src/Orchard.Web/Modules/Orchard.Redis/packages.config index a998bafc5..80d9b3d9e 100644 --- a/src/Orchard.Web/Modules/Orchard.Redis/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Redis/packages.config @@ -1,7 +1,7 @@ - + - - - - - \ No newline at end of file + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Resources/Orchard.Resources.csproj b/src/Orchard.Web/Modules/Orchard.Resources/Orchard.Resources.csproj index b5fcd4b5e..e4bd0fc29 100644 --- a/src/Orchard.Web/Modules/Orchard.Resources/Orchard.Resources.csproj +++ b/src/Orchard.Web/Modules/Orchard.Resources/Orchard.Resources.csproj @@ -1,4 +1,4 @@ - + @@ -12,7 +12,7 @@ Properties Orchard.Resources Orchard.Resources - v4.5.2 + v4.8 false @@ -1108,4 +1108,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.Resources/Web.config b/src/Orchard.Web/Modules/Orchard.Resources/Web.config index 9dc534aae..b9d0c8210 100644 --- a/src/Orchard.Web/Modules/Orchard.Resources/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Resources/Web.config @@ -1,4 +1,4 @@ - + @@ -31,7 +31,7 @@ - + @@ -86,3 +86,4 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.Resources/packages.config b/src/Orchard.Web/Modules/Orchard.Resources/packages.config index e807cea03..77c61debb 100644 --- a/src/Orchard.Web/Modules/Orchard.Resources/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Resources/packages.config @@ -1,8 +1,8 @@ - + - - - - - - \ 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 13e702c19..8b9634367 100644 --- a/src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj +++ b/src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj @@ -1,4 +1,4 @@ - + @@ -12,7 +12,7 @@ Properties Orchard.Roles Orchard.Roles - v4.5.2 + v4.8 false @@ -252,4 +252,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Web.config b/src/Orchard.Web/Modules/Orchard.Roles/Web.config index 871ff2ee6..90feec293 100644 --- a/src/Orchard.Web/Modules/Orchard.Roles/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Roles/Web.config @@ -1,4 +1,4 @@ - + @@ -31,7 +31,7 @@ - + @@ -66,3 +66,4 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.Roles/packages.config b/src/Orchard.Web/Modules/Orchard.Roles/packages.config index e807cea03..77c61debb 100644 --- a/src/Orchard.Web/Modules/Orchard.Roles/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Roles/packages.config @@ -1,8 +1,8 @@ - + - - - - - - \ No newline at end of file + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Rules/Orchard.Rules.csproj b/src/Orchard.Web/Modules/Orchard.Rules/Orchard.Rules.csproj index 8ae0b99d3..286086c5f 100644 --- a/src/Orchard.Web/Modules/Orchard.Rules/Orchard.Rules.csproj +++ b/src/Orchard.Web/Modules/Orchard.Rules/Orchard.Rules.csproj @@ -1,4 +1,4 @@ - + @@ -12,7 +12,7 @@ Properties Orchard.Rules Orchard.Rules - v4.5.2 + v4.8 false @@ -247,4 +247,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.Rules/Web.config b/src/Orchard.Web/Modules/Orchard.Rules/Web.config index da2aa5fb9..378982fa8 100644 --- a/src/Orchard.Web/Modules/Orchard.Rules/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Rules/Web.config @@ -1,4 +1,4 @@ - + @@ -34,7 +34,7 @@ - + @@ -69,3 +69,4 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.Rules/packages.config b/src/Orchard.Web/Modules/Orchard.Rules/packages.config index e807cea03..77c61debb 100644 --- a/src/Orchard.Web/Modules/Orchard.Rules/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Rules/packages.config @@ -1,8 +1,8 @@ - + - - - - - - \ No newline at end of file + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Orchard.Scripting.CSharp.csproj b/src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Orchard.Scripting.CSharp.csproj index 94ff2d758..7d82fa489 100644 --- a/src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Orchard.Scripting.CSharp.csproj +++ b/src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Orchard.Scripting.CSharp.csproj @@ -1,4 +1,4 @@ - + @@ -12,7 +12,7 @@ Properties Orchard.Scripting.CSharp Orchard.Scripting.CSharp - v4.5.2 + v4.8 false @@ -202,4 +202,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Web.config b/src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Web.config index 871ff2ee6..90feec293 100644 --- a/src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Web.config @@ -1,4 +1,4 @@ - + @@ -31,7 +31,7 @@ - + @@ -66,3 +66,4 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.Scripting.CSharp/packages.config b/src/Orchard.Web/Modules/Orchard.Scripting.CSharp/packages.config index 2b235d70d..f4f6082e2 100644 --- a/src/Orchard.Web/Modules/Orchard.Scripting.CSharp/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Scripting.CSharp/packages.config @@ -1,9 +1,9 @@ - + - - - - - - - \ 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 432ead579..6af39863c 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 @@ -1,4 +1,4 @@ - + @@ -13,7 +13,7 @@ Properties Orchard.Scripting.Dlr Orchard.Scripting.Dlr - v4.5.2 + v4.8 false false @@ -145,4 +145,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.Scripting.Dlr/Web.config b/src/Orchard.Web/Modules/Orchard.Scripting.Dlr/Web.config index 314606a77..bb4f1406b 100644 --- a/src/Orchard.Web/Modules/Orchard.Scripting.Dlr/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Scripting.Dlr/Web.config @@ -1,4 +1,4 @@ - + @@ -22,7 +22,7 @@ - + @@ -55,3 +55,4 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.Scripting.Dlr/packages.config b/src/Orchard.Web/Modules/Orchard.Scripting.Dlr/packages.config index 224495f63..506c9d98c 100644 --- a/src/Orchard.Web/Modules/Orchard.Scripting.Dlr/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Scripting.Dlr/packages.config @@ -1,4 +1,4 @@ - + - - \ No newline at end of file + + diff --git a/src/Orchard.Web/Modules/Orchard.Scripting/Orchard.Scripting.csproj b/src/Orchard.Web/Modules/Orchard.Scripting/Orchard.Scripting.csproj index 383ab022f..60784775f 100644 --- a/src/Orchard.Web/Modules/Orchard.Scripting/Orchard.Scripting.csproj +++ b/src/Orchard.Web/Modules/Orchard.Scripting/Orchard.Scripting.csproj @@ -1,4 +1,4 @@ - + @@ -13,7 +13,7 @@ Properties Orchard.Scripting Orchard.Scripting - v4.5.2 + v4.8 false false @@ -131,4 +131,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.Scripting/Web.config b/src/Orchard.Web/Modules/Orchard.Scripting/Web.config index 314606a77..bb4f1406b 100644 --- a/src/Orchard.Web/Modules/Orchard.Scripting/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Scripting/Web.config @@ -1,4 +1,4 @@ - + @@ -22,7 +22,7 @@ - + @@ -55,3 +55,4 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj b/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj index db170e452..1a5be58bc 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj +++ b/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj @@ -1,4 +1,4 @@ - + @@ -13,7 +13,7 @@ Properties Orchard.Search Orchard.Search - v4.5.2 + v4.8 false false @@ -244,4 +244,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.Search/Web.config b/src/Orchard.Web/Modules/Orchard.Search/Web.config index 871ff2ee6..90feec293 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Search/Web.config @@ -1,4 +1,4 @@ - + @@ -31,7 +31,7 @@ - + @@ -66,3 +66,4 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.Search/packages.config b/src/Orchard.Web/Modules/Orchard.Search/packages.config index e807cea03..77c61debb 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Search/packages.config @@ -1,8 +1,8 @@ - + - - - - - - \ No newline at end of file + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Orchard.SecureSocketsLayer.csproj b/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Orchard.SecureSocketsLayer.csproj index 94548f66a..7738dc128 100644 --- a/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Orchard.SecureSocketsLayer.csproj +++ b/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Orchard.SecureSocketsLayer.csproj @@ -1,4 +1,4 @@ - + @@ -12,7 +12,7 @@ Properties Orchard.SecureSocketsLayer Orchard.SecureSocketsLayer - v4.5.2 + v4.8 false @@ -192,4 +192,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Web.config b/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Web.config index 871ff2ee6..90feec293 100644 --- a/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Web.config +++ b/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Web.config @@ -1,4 +1,4 @@ - + @@ -31,7 +31,7 @@ - + @@ -66,3 +66,4 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/packages.config b/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/packages.config index 159d9a931..34080915f 100644 --- a/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/packages.config +++ b/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/packages.config @@ -1,10 +1,10 @@ - + - - - - - - - - \ 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 c888e62f7..81fec75c6 100644 --- a/src/Orchard.Web/Modules/Orchard.Setup/Orchard.Setup.csproj +++ b/src/Orchard.Web/Modules/Orchard.Setup/Orchard.Setup.csproj @@ -1,4 +1,4 @@ - + @@ -12,7 +12,7 @@ Properties Orchard.Setup Orchard.Setup - v4.5.2 + v4.8 false @@ -213,4 +213,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Web.config b/src/Orchard.Web/Modules/Orchard.Setup/Web.config index 871ff2ee6..90feec293 100644 --- a/src/Orchard.Web/Modules/Orchard.Setup/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Setup/Web.config @@ -1,4 +1,4 @@ - + @@ -31,7 +31,7 @@ - + @@ -66,3 +66,4 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.Setup/packages.config b/src/Orchard.Web/Modules/Orchard.Setup/packages.config index 53b84a4ec..b6b88daa0 100644 --- a/src/Orchard.Web/Modules/Orchard.Setup/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Setup/packages.config @@ -1,9 +1,9 @@ - + - - - - - - - \ 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 acdc81409..db9c4ba0c 100644 --- a/src/Orchard.Web/Modules/Orchard.Tags/Orchard.Tags.csproj +++ b/src/Orchard.Web/Modules/Orchard.Tags/Orchard.Tags.csproj @@ -1,4 +1,4 @@ - + @@ -12,7 +12,7 @@ Properties Orchard.Tags Orchard.Tags - v4.5.2 + v4.8 false @@ -247,4 +247,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Web.config b/src/Orchard.Web/Modules/Orchard.Tags/Web.config index 871ff2ee6..90feec293 100644 --- a/src/Orchard.Web/Modules/Orchard.Tags/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Tags/Web.config @@ -1,4 +1,4 @@ - + @@ -31,7 +31,7 @@ - + @@ -66,3 +66,4 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.Tags/packages.config b/src/Orchard.Web/Modules/Orchard.Tags/packages.config index c6cd1ab75..1675a5c87 100644 --- a/src/Orchard.Web/Modules/Orchard.Tags/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Tags/packages.config @@ -1,10 +1,10 @@ - + - - - - - - - - \ 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 79e1c7a57..778313f95 100644 --- a/src/Orchard.Web/Modules/Orchard.TaskLease/Orchard.TaskLease.csproj +++ b/src/Orchard.Web/Modules/Orchard.TaskLease/Orchard.TaskLease.csproj @@ -1,4 +1,4 @@ - + @@ -12,7 +12,7 @@ Properties Orchard.TaskLease Orchard.TaskLease - v4.5.2 + v4.8 false @@ -138,4 +138,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.TaskLease/Web.config b/src/Orchard.Web/Modules/Orchard.TaskLease/Web.config index f65725879..826b7267d 100644 --- a/src/Orchard.Web/Modules/Orchard.TaskLease/Web.config +++ b/src/Orchard.Web/Modules/Orchard.TaskLease/Web.config @@ -1,4 +1,4 @@ - + @@ -22,7 +22,7 @@ - + @@ -67,3 +67,4 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.TaskLease/packages.config b/src/Orchard.Web/Modules/Orchard.TaskLease/packages.config index 7bc87e890..4170942c4 100644 --- a/src/Orchard.Web/Modules/Orchard.TaskLease/packages.config +++ b/src/Orchard.Web/Modules/Orchard.TaskLease/packages.config @@ -1,4 +1,4 @@ - + - - \ No newline at end of file + + diff --git a/src/Orchard.Web/Modules/Orchard.Taxonomies/Orchard.Taxonomies.csproj b/src/Orchard.Web/Modules/Orchard.Taxonomies/Orchard.Taxonomies.csproj index 2e55a4164..ac54fab93 100644 --- a/src/Orchard.Web/Modules/Orchard.Taxonomies/Orchard.Taxonomies.csproj +++ b/src/Orchard.Web/Modules/Orchard.Taxonomies/Orchard.Taxonomies.csproj @@ -1,4 +1,4 @@ - + @@ -13,7 +13,7 @@ Properties Orchard.Taxonomies Orchard.Taxonomies - v4.5.2 + v4.8 false false @@ -299,4 +299,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.Taxonomies/Web.config b/src/Orchard.Web/Modules/Orchard.Taxonomies/Web.config index a625e1a7c..75c913b28 100644 --- a/src/Orchard.Web/Modules/Orchard.Taxonomies/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Taxonomies/Web.config @@ -1,4 +1,4 @@ - + @@ -30,7 +30,7 @@ - + @@ -64,3 +64,4 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.Taxonomies/packages.config b/src/Orchard.Web/Modules/Orchard.Taxonomies/packages.config index a19c7f1c6..033a79099 100644 --- a/src/Orchard.Web/Modules/Orchard.Taxonomies/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Taxonomies/packages.config @@ -1,11 +1,11 @@ - + - - - - - - - - - \ No newline at end of file + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Templates/Orchard.Templates.csproj b/src/Orchard.Web/Modules/Orchard.Templates/Orchard.Templates.csproj index 2b20969b2..22aff06ef 100644 --- a/src/Orchard.Web/Modules/Orchard.Templates/Orchard.Templates.csproj +++ b/src/Orchard.Web/Modules/Orchard.Templates/Orchard.Templates.csproj @@ -1,4 +1,4 @@ - + @@ -12,7 +12,7 @@ Properties Orchard.Templates Orchard.Templates - v4.5.2 + v4.8 false @@ -279,4 +279,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.Templates/Web.config b/src/Orchard.Web/Modules/Orchard.Templates/Web.config index 871ff2ee6..90feec293 100644 --- a/src/Orchard.Web/Modules/Orchard.Templates/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Templates/Web.config @@ -1,4 +1,4 @@ - + @@ -31,7 +31,7 @@ - + @@ -66,3 +66,4 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.Templates/packages.config b/src/Orchard.Web/Modules/Orchard.Templates/packages.config index e807cea03..77c61debb 100644 --- a/src/Orchard.Web/Modules/Orchard.Templates/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Templates/packages.config @@ -1,8 +1,8 @@ - + - - - - - - \ 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 73df0e9a6..34f4a9d46 100644 --- a/src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj +++ b/src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj @@ -1,4 +1,4 @@ - + @@ -12,7 +12,7 @@ Properties Orchard.Themes Orchard.Themes - v4.5.2 + v4.8 false @@ -209,4 +209,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Web.config b/src/Orchard.Web/Modules/Orchard.Themes/Web.config index 871ff2ee6..90feec293 100644 --- a/src/Orchard.Web/Modules/Orchard.Themes/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Themes/Web.config @@ -1,4 +1,4 @@ - + @@ -31,7 +31,7 @@ - + @@ -66,3 +66,4 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.Themes/packages.config b/src/Orchard.Web/Modules/Orchard.Themes/packages.config index e807cea03..77c61debb 100644 --- a/src/Orchard.Web/Modules/Orchard.Themes/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Themes/packages.config @@ -1,8 +1,8 @@ - + - - - - - - \ No newline at end of file + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Tokens/Orchard.Tokens.csproj b/src/Orchard.Web/Modules/Orchard.Tokens/Orchard.Tokens.csproj index b1677983d..85c794700 100644 --- a/src/Orchard.Web/Modules/Orchard.Tokens/Orchard.Tokens.csproj +++ b/src/Orchard.Web/Modules/Orchard.Tokens/Orchard.Tokens.csproj @@ -1,4 +1,4 @@ - + @@ -12,7 +12,7 @@ Properties Orchard.Tokens Orchard.Tokens - v4.5.2 + v4.8 false @@ -212,4 +212,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 6fabad23e..9438dfd4b 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 @@ -1,4 +1,4 @@ - + Debug @@ -10,7 +10,7 @@ Properties Orchard.Tokens.Tests Orchard.Tokens.Tests - v4.5.2 + v4.8 512 @@ -110,4 +110,4 @@ --> - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.Tokens/Tests/packages.config b/src/Orchard.Web/Modules/Orchard.Tokens/Tests/packages.config index 79a38d228..af02dada6 100644 --- a/src/Orchard.Web/Modules/Orchard.Tokens/Tests/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Tokens/Tests/packages.config @@ -1,5 +1,5 @@ - + - - - \ No newline at end of file + + + diff --git a/src/Orchard.Web/Modules/Orchard.Tokens/Web.config b/src/Orchard.Web/Modules/Orchard.Tokens/Web.config index 871ff2ee6..90feec293 100644 --- a/src/Orchard.Web/Modules/Orchard.Tokens/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Tokens/Web.config @@ -1,4 +1,4 @@ - + @@ -31,7 +31,7 @@ - + @@ -66,3 +66,4 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.Tokens/packages.config b/src/Orchard.Web/Modules/Orchard.Tokens/packages.config index e807cea03..77c61debb 100644 --- a/src/Orchard.Web/Modules/Orchard.Tokens/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Tokens/packages.config @@ -1,8 +1,8 @@ - + - - - - - - \ 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 d2f36b916..d22ce66bd 100644 --- a/src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj +++ b/src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj @@ -1,4 +1,4 @@ - + @@ -12,7 +12,7 @@ Properties Orchard.Users Orchard.Users - v4.5.2 + v4.8 false @@ -285,4 +285,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.Users/Web.config b/src/Orchard.Web/Modules/Orchard.Users/Web.config index 871ff2ee6..90feec293 100644 --- a/src/Orchard.Web/Modules/Orchard.Users/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Users/Web.config @@ -1,4 +1,4 @@ - + @@ -31,7 +31,7 @@ - + @@ -66,3 +66,4 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.Users/packages.config b/src/Orchard.Web/Modules/Orchard.Users/packages.config index e807cea03..77c61debb 100644 --- a/src/Orchard.Web/Modules/Orchard.Users/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Users/packages.config @@ -1,8 +1,8 @@ - + - - - - - - \ No newline at end of file + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Warmup/Orchard.Warmup.csproj b/src/Orchard.Web/Modules/Orchard.Warmup/Orchard.Warmup.csproj index 9e357be5c..184b46a0d 100644 --- a/src/Orchard.Web/Modules/Orchard.Warmup/Orchard.Warmup.csproj +++ b/src/Orchard.Web/Modules/Orchard.Warmup/Orchard.Warmup.csproj @@ -1,4 +1,4 @@ - + @@ -12,7 +12,7 @@ Properties Orchard.Warmup Orchard.Warmup - v4.5.2 + v4.8 false @@ -200,4 +200,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.Warmup/Web.config b/src/Orchard.Web/Modules/Orchard.Warmup/Web.config index 871ff2ee6..90feec293 100644 --- a/src/Orchard.Web/Modules/Orchard.Warmup/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Warmup/Web.config @@ -1,4 +1,4 @@ - + @@ -31,7 +31,7 @@ - + @@ -66,3 +66,4 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.Warmup/packages.config b/src/Orchard.Web/Modules/Orchard.Warmup/packages.config index e807cea03..77c61debb 100644 --- a/src/Orchard.Web/Modules/Orchard.Warmup/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Warmup/packages.config @@ -1,8 +1,8 @@ - + - - - - - - \ No newline at end of file + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj b/src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj index 5e57e9d27..065f90e8c 100644 --- a/src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj +++ b/src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj @@ -1,4 +1,4 @@ - + @@ -13,7 +13,7 @@ Properties Orchard.Widgets Orchard.Widgets - v4.5.2 + v4.8 false false @@ -286,4 +286,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Web.config b/src/Orchard.Web/Modules/Orchard.Widgets/Web.config index 871ff2ee6..90feec293 100644 --- a/src/Orchard.Web/Modules/Orchard.Widgets/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Widgets/Web.config @@ -1,4 +1,4 @@ - + @@ -31,7 +31,7 @@ - + @@ -66,3 +66,4 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/packages.config b/src/Orchard.Web/Modules/Orchard.Widgets/packages.config index e807cea03..77c61debb 100644 --- a/src/Orchard.Web/Modules/Orchard.Widgets/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Widgets/packages.config @@ -1,8 +1,8 @@ - + - - - - - - \ No newline at end of file + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Workflows/Orchard.Workflows.csproj b/src/Orchard.Web/Modules/Orchard.Workflows/Orchard.Workflows.csproj index ad2a9293f..c6aeb0c9f 100644 --- a/src/Orchard.Web/Modules/Orchard.Workflows/Orchard.Workflows.csproj +++ b/src/Orchard.Web/Modules/Orchard.Workflows/Orchard.Workflows.csproj @@ -1,4 +1,4 @@ - + @@ -12,7 +12,7 @@ Properties Orchard.Workflows Orchard.Workflows - v4.5.2 + v4.8 false @@ -315,4 +315,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.Workflows/Web.config b/src/Orchard.Web/Modules/Orchard.Workflows/Web.config index 871ff2ee6..90feec293 100644 --- a/src/Orchard.Web/Modules/Orchard.Workflows/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Workflows/Web.config @@ -1,4 +1,4 @@ - + @@ -31,7 +31,7 @@ - + @@ -66,3 +66,4 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.Workflows/packages.config b/src/Orchard.Web/Modules/Orchard.Workflows/packages.config index e0bdd4c68..268f0e9a7 100644 --- a/src/Orchard.Web/Modules/Orchard.Workflows/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Workflows/packages.config @@ -1,9 +1,9 @@ - + - - - - - - - \ No newline at end of file + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.jQuery/Orchard.jQuery.csproj b/src/Orchard.Web/Modules/Orchard.jQuery/Orchard.jQuery.csproj index 2bb033fa5..bde8bdfc9 100644 --- a/src/Orchard.Web/Modules/Orchard.jQuery/Orchard.jQuery.csproj +++ b/src/Orchard.Web/Modules/Orchard.jQuery/Orchard.jQuery.csproj @@ -1,4 +1,4 @@ - + @@ -12,7 +12,7 @@ Properties Orchard.jQuery Orchard.jQuery - v4.5.2 + v4.8 false @@ -664,4 +664,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.jQuery/Web.config b/src/Orchard.Web/Modules/Orchard.jQuery/Web.config index 871ff2ee6..90feec293 100644 --- a/src/Orchard.Web/Modules/Orchard.jQuery/Web.config +++ b/src/Orchard.Web/Modules/Orchard.jQuery/Web.config @@ -1,4 +1,4 @@ - + @@ -31,7 +31,7 @@ - + @@ -66,3 +66,4 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.jQuery/packages.config b/src/Orchard.Web/Modules/Orchard.jQuery/packages.config index e807cea03..77c61debb 100644 --- a/src/Orchard.Web/Modules/Orchard.jQuery/packages.config +++ b/src/Orchard.Web/Modules/Orchard.jQuery/packages.config @@ -1,8 +1,8 @@ - + - - - - - - \ No newline at end of file + + + + + + diff --git a/src/Orchard.Web/Modules/SysCache/SysCache.csproj b/src/Orchard.Web/Modules/SysCache/SysCache.csproj index f49eb9324..8afd57a2c 100644 --- a/src/Orchard.Web/Modules/SysCache/SysCache.csproj +++ b/src/Orchard.Web/Modules/SysCache/SysCache.csproj @@ -1,4 +1,4 @@ - + @@ -12,7 +12,7 @@ Properties SysCache SysCache - v4.5.2 + v4.8 false @@ -142,4 +142,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/SysCache/Web.config b/src/Orchard.Web/Modules/SysCache/Web.config index f65725879..826b7267d 100644 --- a/src/Orchard.Web/Modules/SysCache/Web.config +++ b/src/Orchard.Web/Modules/SysCache/Web.config @@ -1,4 +1,4 @@ - + @@ -22,7 +22,7 @@ - + @@ -67,3 +67,4 @@ + diff --git a/src/Orchard.Web/Modules/SysCache/packages.config b/src/Orchard.Web/Modules/SysCache/packages.config index cb4f271d8..f29711f1f 100644 --- a/src/Orchard.Web/Modules/SysCache/packages.config +++ b/src/Orchard.Web/Modules/SysCache/packages.config @@ -1,6 +1,6 @@ - + - - - - \ 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 d8ff5010f..51a9d0489 100644 --- a/src/Orchard.Web/Modules/TinyMce/TinyMce.csproj +++ b/src/Orchard.Web/Modules/TinyMce/TinyMce.csproj @@ -1,4 +1,4 @@ - + @@ -12,7 +12,7 @@ Properties TinyMce TinyMce - v4.5.2 + v4.8 false @@ -427,4 +427,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/TinyMce/Web.config b/src/Orchard.Web/Modules/TinyMce/Web.config index 8bdf13bbe..2899f80e6 100644 --- a/src/Orchard.Web/Modules/TinyMce/Web.config +++ b/src/Orchard.Web/Modules/TinyMce/Web.config @@ -1,4 +1,4 @@ - + @@ -31,7 +31,7 @@ - + @@ -85,3 +85,4 @@ + diff --git a/src/Orchard.Web/Modules/TinyMce/packages.config b/src/Orchard.Web/Modules/TinyMce/packages.config index e807cea03..77c61debb 100644 --- a/src/Orchard.Web/Modules/TinyMce/packages.config +++ b/src/Orchard.Web/Modules/TinyMce/packages.config @@ -1,8 +1,8 @@ - + - - - - - - \ No newline at end of file + + + + + + diff --git a/src/Orchard.Web/Modules/Upgrade/Upgrade.csproj b/src/Orchard.Web/Modules/Upgrade/Upgrade.csproj index bf60a6fa4..14109f798 100644 --- a/src/Orchard.Web/Modules/Upgrade/Upgrade.csproj +++ b/src/Orchard.Web/Modules/Upgrade/Upgrade.csproj @@ -1,4 +1,4 @@ - + @@ -12,7 +12,7 @@ Properties Upgrade Upgrade - v4.5.2 + v4.8 false @@ -238,4 +238,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Upgrade/Web.config b/src/Orchard.Web/Modules/Upgrade/Web.config index f06c1296a..aa026c41d 100644 --- a/src/Orchard.Web/Modules/Upgrade/Web.config +++ b/src/Orchard.Web/Modules/Upgrade/Web.config @@ -1,4 +1,4 @@ - + @@ -31,7 +31,7 @@ - + @@ -67,3 +67,4 @@ + diff --git a/src/Orchard.Web/Modules/Upgrade/packages.config b/src/Orchard.Web/Modules/Upgrade/packages.config index 0a376cc03..ded84906d 100644 --- a/src/Orchard.Web/Modules/Upgrade/packages.config +++ b/src/Orchard.Web/Modules/Upgrade/packages.config @@ -1,13 +1,13 @@ - + - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + diff --git a/src/Orchard.Web/Orchard.Web.csproj b/src/Orchard.Web/Orchard.Web.csproj index 463191618..cbf019f31 100644 --- a/src/Orchard.Web/Orchard.Web.csproj +++ b/src/Orchard.Web/Orchard.Web.csproj @@ -1,4 +1,4 @@ - + @@ -12,7 +12,7 @@ Properties Orchard.Web Orchard.Web - v4.5.2 + v4.8 false true 44300 @@ -302,4 +302,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Themes/Themes.csproj b/src/Orchard.Web/Themes/Themes.csproj index 87eb0e61a..3d088e36d 100644 --- a/src/Orchard.Web/Themes/Themes.csproj +++ b/src/Orchard.Web/Themes/Themes.csproj @@ -1,4 +1,4 @@ - + @@ -12,7 +12,7 @@ Properties Themes Themes - v4.5.2 + v4.8 false @@ -250,4 +250,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Themes/Web.config b/src/Orchard.Web/Themes/Web.config index 4c9ae8e88..ea485f068 100644 --- a/src/Orchard.Web/Themes/Web.config +++ b/src/Orchard.Web/Themes/Web.config @@ -1,4 +1,4 @@ - + @@ -44,7 +44,7 @@ - + @@ -124,3 +124,4 @@ + diff --git a/src/Orchard.Web/Themes/packages.config b/src/Orchard.Web/Themes/packages.config index e807cea03..77c61debb 100644 --- a/src/Orchard.Web/Themes/packages.config +++ b/src/Orchard.Web/Themes/packages.config @@ -1,8 +1,8 @@ - + - - - - - - \ No newline at end of file + + + + + + diff --git a/src/Orchard.Web/Web.config b/src/Orchard.Web/Web.config index c2c90c89d..4165d2638 100644 --- a/src/Orchard.Web/Web.config +++ b/src/Orchard.Web/Web.config @@ -58,8 +58,8 @@ - - + + diff --git a/src/Orchard.Web/packages.config b/src/Orchard.Web/packages.config index bda2bbea7..048139d02 100644 --- a/src/Orchard.Web/packages.config +++ b/src/Orchard.Web/packages.config @@ -1,17 +1,17 @@ - + - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + diff --git a/src/Orchard/Orchard.Framework.csproj b/src/Orchard/Orchard.Framework.csproj index 60e9f9128..8123c3347 100644 --- a/src/Orchard/Orchard.Framework.csproj +++ b/src/Orchard/Orchard.Framework.csproj @@ -1,4 +1,4 @@ - + Debug @@ -10,7 +10,7 @@ Properties Orchard Orchard.Framework - v4.5.2 + v4.8 512 @@ -1087,4 +1087,4 @@ - \ No newline at end of file + diff --git a/src/Orchard/app.config b/src/Orchard/app.config index 646c8dd95..98dc38b4a 100644 --- a/src/Orchard/app.config +++ b/src/Orchard/app.config @@ -1,4 +1,4 @@ - + @@ -24,4 +24,5 @@ - + + diff --git a/src/Orchard/packages.config b/src/Orchard/packages.config index 5c2e7b0e5..099851833 100644 --- a/src/Orchard/packages.config +++ b/src/Orchard/packages.config @@ -1,20 +1,20 @@ - + - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + diff --git a/src/Tools/MSBuild.Orchard.Tasks/MSBuild.Orchard.Tasks.csproj b/src/Tools/MSBuild.Orchard.Tasks/MSBuild.Orchard.Tasks.csproj index 9c0b039d0..6613004a0 100644 --- a/src/Tools/MSBuild.Orchard.Tasks/MSBuild.Orchard.Tasks.csproj +++ b/src/Tools/MSBuild.Orchard.Tasks/MSBuild.Orchard.Tasks.csproj @@ -1,4 +1,4 @@ - + Debug @@ -10,7 +10,7 @@ Properties MSBuild.Orchard.Tasks MSBuild.Orchard.Tasks - v4.5.2 + v4.8 512 @@ -102,4 +102,4 @@ --> - \ No newline at end of file + diff --git a/src/Tools/Orchard.Tests/Orchard.Tests.csproj b/src/Tools/Orchard.Tests/Orchard.Tests.csproj index 7d305967c..e1e673744 100644 --- a/src/Tools/Orchard.Tests/Orchard.Tests.csproj +++ b/src/Tools/Orchard.Tests/Orchard.Tests.csproj @@ -1,4 +1,4 @@ - + Debug @@ -10,7 +10,7 @@ Properties Orchard.Tests Orchard.Tests - v4.5.2 + v4.8 512 @@ -128,4 +128,4 @@ --> - \ No newline at end of file + diff --git a/src/Tools/Orchard.Tests/packages.config b/src/Tools/Orchard.Tests/packages.config index e0f8fbf73..9ccc0ab0f 100644 --- a/src/Tools/Orchard.Tests/packages.config +++ b/src/Tools/Orchard.Tests/packages.config @@ -1,5 +1,5 @@ - + - - - \ No newline at end of file + + + diff --git a/src/Tools/Orchard/Orchard.csproj b/src/Tools/Orchard/Orchard.csproj index 780bfde4a..52f0e1bf8 100644 --- a/src/Tools/Orchard/Orchard.csproj +++ b/src/Tools/Orchard/Orchard.csproj @@ -1,4 +1,4 @@ - + Debug @@ -10,7 +10,7 @@ Properties Orchard Orchard - v4.5.2 + v4.8 512 @@ -125,4 +125,4 @@ --> - \ No newline at end of file + diff --git a/src/Tools/Orchard/app.config b/src/Tools/Orchard/app.config index 3b0d55ed4..a48f9d65f 100644 --- a/src/Tools/Orchard/app.config +++ b/src/Tools/Orchard/app.config @@ -1,6 +1,7 @@ - + + From 0c34ca3dd51fbdd11122446daaf79aa89286ec1e Mon Sep 17 00:00:00 2001 From: Hermes Sbicego Date: Thu, 4 Feb 2021 19:05:50 +0100 Subject: [PATCH 028/112] Feature/8445 libraries update (#8446) --- CalculateBindingRedirects.ps1 | 34 ++ .../Orchard.Azure.Web/Web.config | 93 +--- src/Orchard.Core.Tests/App.config | 12 +- .../Orchard.Core.Tests.csproj | 31 +- src/Orchard.Core.Tests/packages.config | 8 +- src/Orchard.Profile/App.config | 4 +- src/Orchard.Profile/Orchard.Profile.csproj | 6 +- src/Orchard.Profile/packages.config | 2 +- src/Orchard.Specs/App.Config | 25 +- .../Hosting/Orchard.Web/Core/Web.config | 4 +- .../Hosting/Orchard.Web/Themes/Web.config | 8 +- .../Hosting/Orchard.Web/Web.config | 104 +--- .../Hosting/Simple.Web/Web.config | 86 +--- src/Orchard.Specs/Orchard.Specs.csproj | 45 +- src/Orchard.Specs/packages.config | 12 +- src/Orchard.Tests.Modules/App.config | 15 +- .../Orchard.Tests.Modules.csproj | 58 +-- .../Packaging/Services/Hello.World.csproj.txt | 2 +- src/Orchard.Tests.Modules/packages.config | 14 +- src/Orchard.Tests/App.config | 15 +- .../Orchard.Framework.Tests.csproj | 67 +-- src/Orchard.Tests/packages.config | 16 +- .../Orchard.Web.Tests.csproj | 7 +- src/Orchard.Web.Tests/app.config | 16 +- src/Orchard.Web.Tests/packages.config | 2 +- src/Orchard.Web/Core/Orchard.Core.csproj | 38 +- src/Orchard.Web/Core/Web.config | 71 +-- src/Orchard.Web/Core/packages.config | 8 +- src/Orchard.Web/Modules/Lucene/Lucene.csproj | 47 +- src/Orchard.Web/Modules/Lucene/Web.config | 71 +-- .../Modules/Lucene/packages.config | 10 +- .../Modules/Markdown/Markdown.csproj | 52 +- src/Orchard.Web/Modules/Markdown/Web.config | 71 +-- .../Modules/Markdown/packages.config | 14 +- .../Orchard.Alias/Orchard.Alias.csproj | 39 +- .../Modules/Orchard.Alias/Web.config | 71 +-- .../Modules/Orchard.Alias/packages.config | 8 +- .../Orchard.AntiSpam/Orchard.AntiSpam.csproj | 41 +- .../Modules/Orchard.AntiSpam/Web.config | 71 +-- .../Modules/Orchard.AntiSpam/packages.config | 10 +- .../Orchard.ArchiveLater.csproj | 36 +- .../Modules/Orchard.ArchiveLater/Web.config | 71 +-- .../Orchard.ArchiveLater/packages.config | 8 +- .../Orchard.AuditTrail.csproj | 45 +- .../Modules/Orchard.AuditTrail/Web.config | 55 +- .../Orchard.AuditTrail/packages.config | 10 +- .../Orchard.Autoroute.csproj | 36 +- .../Modules/Orchard.Autoroute/Web.config | 71 +-- .../Modules/Orchard.Autoroute/packages.config | 8 +- .../Orchard.Azure.MediaServices.csproj | 62 +-- .../Orchard.Azure.MediaServices/Web.config | 107 ++-- .../packages.config | 14 +- .../Orchard.Azure/Orchard.Azure.csproj | 53 +- .../Modules/Orchard.Azure/Web.config | 127 +++-- .../Modules/Orchard.Azure/packages.config | 12 +- .../Orchard.Blogs/Orchard.Blogs.csproj | 36 +- .../Modules/Orchard.Blogs/Web.config | 71 +-- .../Modules/Orchard.Blogs/packages.config | 8 +- .../Orchard.Caching/Orchard.Caching.csproj | 26 +- .../Modules/Orchard.Caching/Web.config | 60 ++- .../Modules/Orchard.Caching/packages.config | 8 +- .../CodeGenerationTemplates/ModuleCsProj.txt | 18 +- .../ModulePackagesConfig.txt | 12 +- .../ModuleRootWebConfig.txt | 8 +- .../ModuleTestsCsProj.txt | 4 +- .../Orchard.CodeGeneration.csproj | 28 +- .../Modules/Orchard.CodeGeneration/Web.config | 60 ++- .../Orchard.CodeGeneration/packages.config | 8 +- .../Orchard.Comments/Orchard.Comments.csproj | 36 +- .../Modules/Orchard.Comments/Web.config | 71 +-- .../Modules/Orchard.Comments/packages.config | 8 +- .../Orchard.Conditions.csproj | 26 +- .../Modules/Orchard.Conditions/Web.config | 59 ++- .../Orchard.Conditions/packages.config | 8 +- .../Orchard.ContentPermissions.csproj | 36 +- .../Orchard.ContentPermissions/Web.config | 71 +-- .../packages.config | 8 +- .../Orchard.ContentPicker.csproj | 41 +- .../Modules/Orchard.ContentPicker/Web.config | 71 +-- .../Orchard.ContentPicker/packages.config | 8 +- .../Orchard.ContentTypes.csproj | 35 +- .../Modules/Orchard.ContentTypes/Web.config | 71 +-- .../Orchard.ContentTypes/packages.config | 8 +- .../Orchard.CustomForms.csproj | 38 +- .../Modules/Orchard.CustomForms/Web.config | 71 +-- .../Orchard.CustomForms/packages.config | 8 +- .../Orchard.Dashboards.csproj | 36 +- .../Modules/Orchard.Dashboards/Web.config | 70 +-- .../Orchard.Dashboards/packages.config | 8 +- .../Orchard.DesignerTools.csproj | 38 +- .../Modules/Orchard.DesignerTools/Web.config | 71 +-- .../Orchard.DesignerTools/packages.config | 8 +- .../Orchard.DynamicForms.csproj | 42 +- .../Modules/Orchard.DynamicForms/Web.config | 71 +-- .../Orchard.DynamicForms/packages.config | 10 +- .../Orchard.Email/Orchard.Email.csproj | 41 +- .../Modules/Orchard.Email/Web.config | 71 +-- .../Modules/Orchard.Email/packages.config | 10 +- .../Orchard.Fields/Orchard.Fields.csproj | 36 +- .../Modules/Orchard.Fields/Web.config | 71 +-- .../Modules/Orchard.Fields/packages.config | 8 +- .../Orchard.Forms/Orchard.Forms.csproj | 31 +- .../Modules/Orchard.Forms/Web.config | 60 ++- .../Modules/Orchard.Forms/packages.config | 10 +- .../Orchard.ImageEditor.csproj | 36 +- .../Modules/Orchard.ImageEditor/Web.config | 71 +-- .../Orchard.ImageEditor/packages.config | 8 +- .../Orchard.ImportExport.csproj | 45 +- .../Modules/Orchard.ImportExport/Web.config | 71 +-- .../Orchard.ImportExport/packages.config | 8 +- .../Orchard.Indexing/Orchard.Indexing.csproj | 36 +- .../Modules/Orchard.Indexing/Web.config | 71 +-- .../Modules/Orchard.Indexing/packages.config | 8 +- .../Orchard.JobsQueue.csproj | 41 +- .../Modules/Orchard.JobsQueue/Web.config | 71 +-- .../Modules/Orchard.JobsQueue/packages.config | 10 +- .../Orchard.Layouts/Orchard.Layouts.csproj | 56 +-- .../LocalizedStringYamlConverter.cs | 4 +- .../Modules/Orchard.Layouts/Web.config | 79 +-- .../Modules/Orchard.Layouts/packages.config | 16 +- .../Orchard.Lists/Orchard.Lists.csproj | 37 +- .../Modules/Orchard.Lists/Web.config | 71 +-- .../Modules/Orchard.Lists/packages.config | 8 +- .../Orchard.Localization.csproj | 37 +- .../Modules/Orchard.Localization/Web.config | 71 +-- .../Orchard.Localization/packages.config | 8 +- .../Orchard.Media/Orchard.Media.csproj | 38 +- .../Modules/Orchard.Media/Web.config | 71 +-- .../Modules/Orchard.Media/packages.config | 10 +- .../Orchard.MediaLibrary.csproj | 41 +- .../Modules/Orchard.MediaLibrary/Web.config | 71 +-- .../Orchard.MediaLibrary/packages.config | 10 +- .../Orchard.MediaPicker.csproj | 36 +- .../Modules/Orchard.MediaPicker/Web.config | 71 +-- .../Orchard.MediaPicker/packages.config | 8 +- .../Orchard.MediaProcessing.csproj | 41 +- .../Orchard.MediaProcessing/Web.config | 71 +-- .../Orchard.MediaProcessing/packages.config | 10 +- .../Orchard.MessageBus.csproj | 28 +- .../Modules/Orchard.MessageBus/Web.config | 60 ++- .../Orchard.MessageBus/packages.config | 8 +- .../Orchard.Migrations.csproj | 26 +- .../Modules/Orchard.Migrations/Web.config | 60 ++- .../Orchard.Migrations/packages.config | 8 +- .../Orchard.Modules/Orchard.Modules.csproj | 37 +- .../Modules/Orchard.Modules/Web.config | 71 +-- .../Modules/Orchard.Modules/packages.config | 8 +- .../Orchard.MultiTenancy.csproj | 39 +- .../Modules/Orchard.MultiTenancy/Web.config | 71 +-- .../Orchard.MultiTenancy/packages.config | 8 +- .../Orchard.OutputCache.csproj | 38 +- .../Modules/Orchard.OutputCache/Web.config | 71 +-- .../Orchard.OutputCache/packages.config | 8 +- .../Orchard.Packaging.csproj | 37 +- .../Modules/Orchard.Packaging/Web.config | 71 +-- .../Modules/Orchard.Packaging/packages.config | 8 +- .../Modules/Orchard.Pages/Web.config | 48 +- .../Orchard.Projections.csproj | 40 +- .../Tests/Orchard.Projections.Tests.csproj | 10 +- .../Orchard.Projections/Tests/app.config | 12 +- .../Orchard.Projections/Tests/packages.config | 2 +- .../Modules/Orchard.Projections/Web.config | 71 +-- .../Orchard.Projections/packages.config | 8 +- .../Orchard.PublishLater.csproj | 36 +- .../Modules/Orchard.PublishLater/Web.config | 83 ++- .../Orchard.PublishLater/packages.config | 8 +- .../Orchard.Recipes/Orchard.Recipes.csproj | 42 +- .../Modules/Orchard.Recipes/Web.config | 70 +-- .../Modules/Orchard.Recipes/packages.config | 10 +- .../Orchard.Redis/Orchard.Redis.csproj | 13 +- .../Modules/Orchard.Redis/Web.config | 48 +- .../Modules/Orchard.Redis/packages.config | 4 +- .../Orchard.Resources.csproj | 36 +- .../Modules/Orchard.Resources/Web.config | 90 ++-- .../Modules/Orchard.Resources/packages.config | 8 +- .../Orchard.Roles/Orchard.Roles.csproj | 38 +- .../Modules/Orchard.Roles/Web.config | 71 +-- .../Modules/Orchard.Roles/packages.config | 8 +- .../Orchard.Rules/Orchard.Rules.csproj | 36 +- .../Modules/Orchard.Rules/Web.config | 71 +-- .../Modules/Orchard.Rules/packages.config | 8 +- .../Orchard.Scripting.CSharp.csproj | 37 +- .../Orchard.Scripting.CSharp/Web.config | 71 +-- .../Orchard.Scripting.CSharp/packages.config | 8 +- .../Orchard.Scripting.Dlr.csproj | 11 +- .../Modules/Orchard.Scripting.Dlr/Web.config | 48 +- .../Orchard.Scripting.Dlr/packages.config | 2 +- .../Modules/Orchard.Scripting/Web.config | 48 +- .../Orchard.Search/Orchard.Search.csproj | 36 +- .../Modules/Orchard.Search/Web.config | 71 +-- .../Modules/Orchard.Search/packages.config | 8 +- .../Orchard.SecureSocketsLayer.csproj | 42 +- .../Orchard.SecureSocketsLayer/Web.config | 71 +-- .../packages.config | 10 +- .../Orchard.Setup/Orchard.Setup.csproj | 37 +- .../Modules/Orchard.Setup/Web.config | 71 +-- .../Modules/Orchard.Setup/packages.config | 8 +- .../Modules/Orchard.Tags/Orchard.Tags.csproj | 39 +- .../Modules/Orchard.Tags/Web.config | 71 +-- .../Modules/Orchard.Tags/packages.config | 8 +- .../Orchard.TaskLease.csproj | 6 +- .../Modules/Orchard.TaskLease/Web.config | 60 +-- .../Modules/Orchard.TaskLease/packages.config | 2 +- .../Orchard.Taxonomies.csproj | 51 +- .../Modules/Orchard.Taxonomies/Web.config | 79 +-- .../Orchard.Taxonomies/packages.config | 14 +- .../Orchard.Templates.csproj | 38 +- .../Modules/Orchard.Templates/Web.config | 71 +-- .../Modules/Orchard.Templates/packages.config | 8 +- .../Orchard.Themes/Orchard.Themes.csproj | 36 +- .../Modules/Orchard.Themes/Web.config | 71 +-- .../Modules/Orchard.Themes/packages.config | 8 +- .../Orchard.Tokens/Orchard.Tokens.csproj | 36 +- .../Tests/Orchard.Tokens.Tests.csproj | 6 +- .../Modules/Orchard.Tokens/Tests/app.config | 12 +- .../Orchard.Tokens/Tests/packages.config | 2 +- .../Modules/Orchard.Tokens/Web.config | 71 +-- .../Modules/Orchard.Tokens/packages.config | 8 +- .../Orchard.Users/Orchard.Users.csproj | 36 +- .../Modules/Orchard.Users/Web.config | 71 +-- .../Modules/Orchard.Users/packages.config | 8 +- .../Orchard.Warmup/Orchard.Warmup.csproj | 36 +- .../Modules/Orchard.Warmup/Web.config | 71 +-- .../Modules/Orchard.Warmup/packages.config | 8 +- .../Orchard.Widgets/Orchard.Widgets.csproj | 36 +- .../Modules/Orchard.Widgets/Web.config | 71 +-- .../Modules/Orchard.Widgets/packages.config | 8 +- .../Orchard.Workflows.csproj | 41 +- .../Modules/Orchard.Workflows/Web.config | 71 +-- .../Modules/Orchard.Workflows/packages.config | 12 +- .../Orchard.jQuery/Orchard.jQuery.csproj | 37 +- .../Modules/Orchard.jQuery/Web.config | 71 +-- .../Modules/Orchard.jQuery/packages.config | 8 +- .../Modules/SysCache/SysCache.csproj | 8 +- src/Orchard.Web/Modules/SysCache/Web.config | 60 +-- .../Modules/SysCache/packages.config | 2 +- .../Modules/TinyMce/TinyMce.csproj | 39 +- src/Orchard.Web/Modules/TinyMce/Web.config | 91 ++-- .../Modules/TinyMce/packages.config | 8 +- .../Modules/Upgrade/Upgrade.csproj | 55 +- src/Orchard.Web/Modules/Upgrade/Web.config | 80 +-- .../Modules/Upgrade/packages.config | 14 +- src/Orchard.Web/Orchard.Web.csproj | 60 +-- src/Orchard.Web/Themes/Themes.csproj | 36 +- src/Orchard.Web/Themes/Web.config | 110 ++-- src/Orchard.Web/Themes/packages.config | 8 +- src/Orchard.Web/Web.config | 472 +++++++++--------- src/Orchard.Web/packages.config | 16 +- src/Orchard/Orchard.Framework.csproj | 60 +-- src/Orchard/app.config | 13 +- src/Orchard/packages.config | 20 +- src/Tools/Orchard.Tests/Orchard.Tests.csproj | 6 +- src/Tools/Orchard.Tests/packages.config | 2 +- 253 files changed, 4968 insertions(+), 4658 deletions(-) create mode 100644 CalculateBindingRedirects.ps1 diff --git a/CalculateBindingRedirects.ps1 b/CalculateBindingRedirects.ps1 new file mode 100644 index 000000000..45f279b3f --- /dev/null +++ b/CalculateBindingRedirects.ps1 @@ -0,0 +1,34 @@ +[Reflection.Assembly]::LoadWithPartialName("System.Xml") | Out-Null +[Reflection.Assembly]::LoadWithPartialName("System.Xml.Linq") | Out-Null +[System.Xml.Linq.XNamespace]$ns1 = "urn:schemas-microsoft-com:asm.v1" + +$currentPath = (Get-Item -Path ".\").FullName +$orchardWebConfigFullPath = $currentPath+"\src\Orchard.Web\Web.Config" +[XML] $orchardWebConfig = Get-Content ($orchardWebConfigFullPath) +$configFiles = Get-ChildItem -Path ($currentPath +"\src\") -Filter web.config -Recurse -ErrorAction SilentlyContinue -Force +foreach ($configFile in $configFiles) { + $configFullPath = $configFile.FullName + Write-Host "Processing $configFullPath ..." + + if ($configFullPath.ToLower().EndsWith("\orchard.web\web.config")) { #skip orchard.web config files + continue + } + [XML] $projectWebConfig = Get-Content ($configFullPath) + $elements = $projectWebConfig.configuration.runtime.assemblyBinding.dependentAssembly + foreach ($element in $elements){ + Write-Host "Checking" $element.assemblyIdentity.name + $hasBinding = $orchardWebConfig.configuration.runtime.assemblyBinding.dependentAssembly.assemblyIdentity.Where({ $_.name -eq $element.assemblyIdentity.name -and $_.publicKeyToken -eq $element.assemblyIdentity.publicKeyToken -and $_.culture -eq $element.assemblyIdentity.culture }, 'First').Count -gt 0 + if (-not $hasBinding){ + # add the node in $webConfig + Write-Host "Adding" $element.assemblyIdentity.name + $newNode = $orchardWebConfig.ImportNode($element, $true); + $orchardWebConfig.configuration.runtime.assemblyBinding.AppendChild($newNode) + Write-Host "Added " $element.assemblyIdentity.name + } else { + Write-Host "Skipped" $element.assemblyIdentity.name + } + } + Write-Host "Processed $configFullPath ..." +} + +$orchardWebConfig.Save($orchardWebConfigFullPath) diff --git a/src/Orchard.Azure/Orchard.Azure.Web/Web.config b/src/Orchard.Azure/Orchard.Azure.Web/Web.config index 7a9df3767..44fc9e28b 100644 --- a/src/Orchard.Azure/Orchard.Azure.Web/Web.config +++ b/src/Orchard.Azure/Orchard.Azure.Web/Web.config @@ -1,6 +1,5 @@  -
@@ -8,15 +7,13 @@
- - - + @@ -30,13 +27,11 @@ - - @@ -46,11 +41,9 @@ - - @@ -58,7 +51,7 @@ - + @@ -107,7 +100,6 @@ - @@ -134,91 +126,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Orchard.Core.Tests/App.config b/src/Orchard.Core.Tests/App.config index b04735a1b..1d39b06b2 100644 --- a/src/Orchard.Core.Tests/App.config +++ b/src/Orchard.Core.Tests/App.config @@ -16,8 +16,16 @@ - + + + + + + + + + - \ No newline at end of file + diff --git a/src/Orchard.Core.Tests/Orchard.Core.Tests.csproj b/src/Orchard.Core.Tests/Orchard.Core.Tests.csproj index ae0e60a43..d339a8c79 100644 --- a/src/Orchard.Core.Tests/Orchard.Core.Tests.csproj +++ b/src/Orchard.Core.Tests/Orchard.Core.Tests.csproj @@ -1,4 +1,4 @@ - + Debug @@ -61,39 +61,30 @@ ..\packages\Autofac.3.5.2\lib\net40\Autofac.dll - True ..\packages\FluentNHibernate.2.0.3.0\lib\net40\FluentNHibernate.dll - True ..\packages\Iesi.Collections.4.0.1.4000\lib\net40\Iesi.Collections.dll - True ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True ..\packages\Moq.4.0.10827\lib\NET40\Moq.dll - True ..\packages\NHibernate.4.0.1.4000\lib\net40\NHibernate.dll - True ..\packages\NUnit.2.5.10.11092\lib\nunit.framework.dll - True ..\packages\NUnit.2.5.10.11092\lib\nunit.mocks.dll - True ..\packages\NUnit.2.5.10.11092\lib\pnunit.framework.dll - True @@ -109,31 +100,25 @@ 3.5 - ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll 3.5 - ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll diff --git a/src/Orchard.Core.Tests/packages.config b/src/Orchard.Core.Tests/packages.config index 7d9cf6980..fd4cca6c3 100644 --- a/src/Orchard.Core.Tests/packages.config +++ b/src/Orchard.Core.Tests/packages.config @@ -1,11 +1,11 @@ - + - - - + + + diff --git a/src/Orchard.Profile/App.config b/src/Orchard.Profile/App.config index 8f6a4f767..77c2a35fc 100644 --- a/src/Orchard.Profile/App.config +++ b/src/Orchard.Profile/App.config @@ -3,7 +3,9 @@
+ + - \ No newline at end of file + diff --git a/src/Orchard.Profile/Orchard.Profile.csproj b/src/Orchard.Profile/Orchard.Profile.csproj index ec20b38ba..7bb3d6da7 100644 --- a/src/Orchard.Profile/Orchard.Profile.csproj +++ b/src/Orchard.Profile/Orchard.Profile.csproj @@ -1,4 +1,4 @@ - + Debug @@ -60,15 +60,12 @@ ..\packages\NUnit.2.5.10.11092\lib\nunit.framework.dll - True ..\packages\NUnit.2.5.10.11092\lib\nunit.mocks.dll - True ..\packages\NUnit.2.5.10.11092\lib\pnunit.framework.dll - True @@ -85,7 +82,6 @@ ..\packages\SpecFlow.1.9.0\lib\net35\TechTalk.SpecFlow.dll - True diff --git a/src/Orchard.Profile/packages.config b/src/Orchard.Profile/packages.config index 05379e707..c269027a4 100644 --- a/src/Orchard.Profile/packages.config +++ b/src/Orchard.Profile/packages.config @@ -1,4 +1,4 @@ - + diff --git a/src/Orchard.Specs/App.Config b/src/Orchard.Specs/App.Config index f5c0fd9bc..d03822e85 100644 --- a/src/Orchard.Specs/App.Config +++ b/src/Orchard.Specs/App.Config @@ -1,14 +1,13 @@ - +
+ - - - + @@ -25,8 +24,22 @@ - + + + + + + + + + + + + + - + + + diff --git a/src/Orchard.Specs/Hosting/Orchard.Web/Core/Web.config b/src/Orchard.Specs/Hosting/Orchard.Web/Core/Web.config index aae1f8b80..ee374d515 100644 --- a/src/Orchard.Specs/Hosting/Orchard.Web/Core/Web.config +++ b/src/Orchard.Specs/Hosting/Orchard.Web/Core/Web.config @@ -11,13 +11,13 @@ - + - + diff --git a/src/Orchard.Specs/Hosting/Orchard.Web/Themes/Web.config b/src/Orchard.Specs/Hosting/Orchard.Web/Themes/Web.config index 4e47f2823..bbec2d93f 100644 --- a/src/Orchard.Specs/Hosting/Orchard.Web/Themes/Web.config +++ b/src/Orchard.Specs/Hosting/Orchard.Web/Themes/Web.config @@ -18,18 +18,18 @@ To change this behavior apply the ValidateInputAttribute to a controller or action. --> - + - + - + - + diff --git a/src/Orchard.Specs/Hosting/Orchard.Web/Web.config b/src/Orchard.Specs/Hosting/Orchard.Web/Web.config index 164e9f913..60d4e5b50 100644 --- a/src/Orchard.Specs/Hosting/Orchard.Web/Web.config +++ b/src/Orchard.Specs/Hosting/Orchard.Web/Web.config @@ -1,22 +1,19 @@ -
- - - + @@ -30,39 +27,36 @@ - - - - + - + - + - + @@ -103,7 +97,6 @@ - @@ -148,91 +141,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Orchard.Specs/Hosting/Simple.Web/Web.config b/src/Orchard.Specs/Hosting/Simple.Web/Web.config index 17707ca24..c5c75ff1a 100644 --- a/src/Orchard.Specs/Hosting/Simple.Web/Web.config +++ b/src/Orchard.Specs/Hosting/Simple.Web/Web.config @@ -1,5 +1,4 @@ - - - @@ -24,12 +21,10 @@ machine.config.comments usually located in - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/src/Orchard.Web/Core/packages.config b/src/Orchard.Web/Core/packages.config index 77c61debb..0938ac40a 100644 --- a/src/Orchard.Web/Core/packages.config +++ b/src/Orchard.Web/Core/packages.config @@ -1,8 +1,8 @@ - + - - - + + + diff --git a/src/Orchard.Web/Modules/Lucene/Lucene.csproj b/src/Orchard.Web/Modules/Lucene/Lucene.csproj index 1d01fc15c..e8e23cd63 100644 --- a/src/Orchard.Web/Modules/Lucene/Lucene.csproj +++ b/src/Orchard.Web/Modules/Lucene/Lucene.csproj @@ -1,5 +1,6 @@ - + + Debug @@ -27,6 +28,9 @@ + + + true @@ -51,22 +55,18 @@ false - - ..\..\..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll - True + + ..\..\..\packages\SharpZipLib.1.3.1\lib\net45\ICSharpCode.SharpZipLib.dll ..\..\..\packages\Lucene.Net.3.0.3\lib\NET40\Lucene.Net.dll - True ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True @@ -76,28 +76,22 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -135,16 +129,15 @@ Designer - - - - + + + 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) @@ -177,4 +170,10 @@ + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + diff --git a/src/Orchard.Web/Modules/Lucene/Web.config b/src/Orchard.Web/Modules/Lucene/Web.config index 37ba89226..48faf432a 100644 --- a/src/Orchard.Web/Modules/Lucene/Web.config +++ b/src/Orchard.Web/Modules/Lucene/Web.config @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + @@ -25,11 +25,6 @@ - - - - - @@ -37,32 +32,48 @@ - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/src/Orchard.Web/Modules/Lucene/packages.config b/src/Orchard.Web/Modules/Lucene/packages.config index 059ff9edb..430c6cf5b 100644 --- a/src/Orchard.Web/Modules/Lucene/packages.config +++ b/src/Orchard.Web/Modules/Lucene/packages.config @@ -1,10 +1,10 @@ - + - - - + + + - + diff --git a/src/Orchard.Web/Modules/Markdown/Markdown.csproj b/src/Orchard.Web/Modules/Markdown/Markdown.csproj index 2c633ea61..487906453 100644 --- a/src/Orchard.Web/Modules/Markdown/Markdown.csproj +++ b/src/Orchard.Web/Modules/Markdown/Markdown.csproj @@ -1,5 +1,6 @@ - + + Debug @@ -27,6 +28,8 @@ + + true @@ -52,48 +55,53 @@ false - - ..\..\..\packages\Markdig.Signed.0.18.0\lib\net40\Markdig.Signed.dll + + ..\..\..\packages\Markdig.Signed.0.22.1\lib\net452\Markdig.Signed.dll ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True + + ..\..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll + + + ..\..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll + + + + ..\..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll + + + ..\..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -180,7 +188,7 @@ - + 10.0 @@ -226,4 +234,10 @@ + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + diff --git a/src/Orchard.Web/Modules/Markdown/Web.config b/src/Orchard.Web/Modules/Markdown/Web.config index 90feec293..6fcfa6d7c 100644 --- a/src/Orchard.Web/Modules/Markdown/Web.config +++ b/src/Orchard.Web/Modules/Markdown/Web.config @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + @@ -25,11 +25,6 @@ - - - - - @@ -37,33 +32,49 @@ - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/src/Orchard.Web/Modules/Markdown/packages.config b/src/Orchard.Web/Modules/Markdown/packages.config index a3611dc1f..ce060fffd 100644 --- a/src/Orchard.Web/Modules/Markdown/packages.config +++ b/src/Orchard.Web/Modules/Markdown/packages.config @@ -1,9 +1,13 @@ - + - - - - + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Alias/Orchard.Alias.csproj b/src/Orchard.Web/Modules/Orchard.Alias/Orchard.Alias.csproj index 1893d5242..9758cd737 100644 --- a/src/Orchard.Web/Modules/Orchard.Alias/Orchard.Alias.csproj +++ b/src/Orchard.Web/Modules/Orchard.Alias/Orchard.Alias.csproj @@ -1,5 +1,6 @@ - + + Debug @@ -26,6 +27,9 @@ + + + true @@ -51,14 +55,12 @@ false - ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True + ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True @@ -73,29 +75,23 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -154,7 +150,7 @@ - + 10.0 @@ -200,5 +196,10 @@ + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + - diff --git a/src/Orchard.Web/Modules/Orchard.Alias/Web.config b/src/Orchard.Web/Modules/Orchard.Alias/Web.config index 90feec293..6fcfa6d7c 100644 --- a/src/Orchard.Web/Modules/Orchard.Alias/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Alias/Web.config @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + @@ -25,11 +25,6 @@ - - - - - @@ -37,33 +32,49 @@ - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/src/Orchard.Web/Modules/Orchard.Alias/packages.config b/src/Orchard.Web/Modules/Orchard.Alias/packages.config index 77c61debb..0938ac40a 100644 --- a/src/Orchard.Web/Modules/Orchard.Alias/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Alias/packages.config @@ -1,8 +1,8 @@ - + - - - + + + diff --git a/src/Orchard.Web/Modules/Orchard.AntiSpam/Orchard.AntiSpam.csproj b/src/Orchard.Web/Modules/Orchard.AntiSpam/Orchard.AntiSpam.csproj index 711c86396..acc75aa8f 100644 --- a/src/Orchard.Web/Modules/Orchard.AntiSpam/Orchard.AntiSpam.csproj +++ b/src/Orchard.Web/Modules/Orchard.AntiSpam/Orchard.AntiSpam.csproj @@ -1,5 +1,6 @@ - + + Debug @@ -26,6 +27,9 @@ + + + true @@ -53,16 +57,13 @@ ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True - - ..\..\..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll - True + + ..\..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll @@ -77,29 +78,23 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -212,7 +207,7 @@ - + 10.0 @@ -258,4 +253,10 @@ + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + diff --git a/src/Orchard.Web/Modules/Orchard.AntiSpam/Web.config b/src/Orchard.Web/Modules/Orchard.AntiSpam/Web.config index 90feec293..6fcfa6d7c 100644 --- a/src/Orchard.Web/Modules/Orchard.AntiSpam/Web.config +++ b/src/Orchard.Web/Modules/Orchard.AntiSpam/Web.config @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + @@ -25,11 +25,6 @@ - - - - - @@ -37,33 +32,49 @@ - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/src/Orchard.Web/Modules/Orchard.AntiSpam/packages.config b/src/Orchard.Web/Modules/Orchard.AntiSpam/packages.config index 2aa425ab5..63841a016 100644 --- a/src/Orchard.Web/Modules/Orchard.AntiSpam/packages.config +++ b/src/Orchard.Web/Modules/Orchard.AntiSpam/packages.config @@ -1,9 +1,9 @@ - + - - - + + + - + diff --git a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Orchard.ArchiveLater.csproj b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Orchard.ArchiveLater.csproj index 81e673c85..6d1ff64dd 100644 --- a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Orchard.ArchiveLater.csproj +++ b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Orchard.ArchiveLater.csproj @@ -1,5 +1,6 @@ - + + Debug @@ -27,6 +28,9 @@ + + + true @@ -53,12 +57,10 @@ ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True @@ -68,28 +70,22 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -139,7 +135,7 @@ - + 10.0 @@ -173,4 +169,10 @@ + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + diff --git a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Web.config b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Web.config index 90feec293..6fcfa6d7c 100644 --- a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Web.config +++ b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Web.config @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + @@ -25,11 +25,6 @@ - - - - - @@ -37,33 +32,49 @@ - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/src/Orchard.Web/Modules/Orchard.ArchiveLater/packages.config b/src/Orchard.Web/Modules/Orchard.ArchiveLater/packages.config index 77c61debb..0938ac40a 100644 --- a/src/Orchard.Web/Modules/Orchard.ArchiveLater/packages.config +++ b/src/Orchard.Web/Modules/Orchard.ArchiveLater/packages.config @@ -1,8 +1,8 @@ - + - - - + + + diff --git a/src/Orchard.Web/Modules/Orchard.AuditTrail/Orchard.AuditTrail.csproj b/src/Orchard.Web/Modules/Orchard.AuditTrail/Orchard.AuditTrail.csproj index 882f736a7..0c8bb6ef3 100644 --- a/src/Orchard.Web/Modules/Orchard.AuditTrail/Orchard.AuditTrail.csproj +++ b/src/Orchard.Web/Modules/Orchard.AuditTrail/Orchard.AuditTrail.csproj @@ -1,5 +1,6 @@ - + + Debug @@ -25,6 +26,9 @@ + + + true @@ -52,24 +56,19 @@ ..\..\..\packages\Iesi.Collections.4.0.1.4000\lib\net40\Iesi.Collections.dll - True ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True - - ..\..\..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll - True + + ..\..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll ..\..\..\packages\NHibernate.4.0.1.4000\lib\net40\NHibernate.dll - True @@ -84,40 +83,32 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll ..\..\..\packages\XMLDiffPatch.1.0.8.28\lib\net\XmlDiffPatch.dll - True ..\..\..\packages\XMLDiffPatch.1.0.8.28\lib\net\XmlDiffPatch.View.dll - True @@ -364,7 +355,7 @@ - + 10.0 @@ -410,4 +401,10 @@ + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + diff --git a/src/Orchard.Web/Modules/Orchard.AuditTrail/Web.config b/src/Orchard.Web/Modules/Orchard.AuditTrail/Web.config index 5c097a969..ad39ef6bc 100644 --- a/src/Orchard.Web/Modules/Orchard.AuditTrail/Web.config +++ b/src/Orchard.Web/Modules/Orchard.AuditTrail/Web.config @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + @@ -25,11 +25,6 @@ - - - - - @@ -37,7 +32,7 @@ - + @@ -45,26 +40,42 @@ - - - + + - - + + - - + + - - + + - - + + - - + + + + + + + + + + + + + + + + + + + + - diff --git a/src/Orchard.Web/Modules/Orchard.AuditTrail/packages.config b/src/Orchard.Web/Modules/Orchard.AuditTrail/packages.config index 7a0e783a7..b422b9627 100644 --- a/src/Orchard.Web/Modules/Orchard.AuditTrail/packages.config +++ b/src/Orchard.Web/Modules/Orchard.AuditTrail/packages.config @@ -1,12 +1,12 @@ - + - - - + + + - + diff --git a/src/Orchard.Web/Modules/Orchard.Autoroute/Orchard.Autoroute.csproj b/src/Orchard.Web/Modules/Orchard.Autoroute/Orchard.Autoroute.csproj index de0708b14..e64f09a2b 100644 --- a/src/Orchard.Web/Modules/Orchard.Autoroute/Orchard.Autoroute.csproj +++ b/src/Orchard.Web/Modules/Orchard.Autoroute/Orchard.Autoroute.csproj @@ -1,5 +1,6 @@ - + + Debug @@ -26,6 +27,9 @@ + + + true @@ -53,12 +57,10 @@ ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True @@ -73,29 +75,23 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -174,7 +170,7 @@ - + 10.0 @@ -220,4 +216,10 @@ + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + diff --git a/src/Orchard.Web/Modules/Orchard.Autoroute/Web.config b/src/Orchard.Web/Modules/Orchard.Autoroute/Web.config index 50dba4456..ac22cfb93 100644 --- a/src/Orchard.Web/Modules/Orchard.Autoroute/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Autoroute/Web.config @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + @@ -24,11 +24,6 @@ - - - - - @@ -36,33 +31,49 @@ - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/src/Orchard.Web/Modules/Orchard.Autoroute/packages.config b/src/Orchard.Web/Modules/Orchard.Autoroute/packages.config index 77c61debb..0938ac40a 100644 --- a/src/Orchard.Web/Modules/Orchard.Autoroute/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Autoroute/packages.config @@ -1,8 +1,8 @@ - + - - - + + + diff --git a/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Orchard.Azure.MediaServices.csproj b/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Orchard.Azure.MediaServices.csproj index b84a6bc05..b562dc0f4 100644 --- a/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Orchard.Azure.MediaServices.csproj +++ b/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Orchard.Azure.MediaServices.csproj @@ -1,5 +1,6 @@ - + + Debug @@ -25,6 +26,9 @@ + + + true @@ -52,76 +56,58 @@ ..\..\..\packages\FluentNHibernate.2.0.3.0\lib\net40\FluentNHibernate.dll - True - - ..\..\..\packages\HtmlAgilityPack.1.4.9\lib\Net45\HtmlAgilityPack.dll - True + + ..\..\..\packages\HtmlAgilityPack.1.4.9.5\lib\Net45\HtmlAgilityPack.dll ..\..\..\packages\Iesi.Collections.4.0.1.4000\lib\net40\Iesi.Collections.dll - True ..\..\..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll - True ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Data.Edm.5.8.4\lib\net40\Microsoft.Data.Edm.dll - True ..\..\..\packages\Microsoft.Data.OData.5.8.4\lib\net40\Microsoft.Data.OData.dll - True ..\..\..\packages\Microsoft.Data.Services.Client.5.8.4\lib\net40\Microsoft.Data.Services.Client.dll - True ..\..\..\packages\TransientFaultHandling.Core.5.1.1209.1\lib\NET4\Microsoft.Practices.TransientFaultHandling.Core.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True ..\..\..\packages\Microsoft.WindowsAzure.ConfigurationManager.3.1.0\lib\net40\Microsoft.WindowsAzure.Configuration.dll - True ..\..\..\packages\Orchard.WindowsAzure.Diagnostics.2.7.0.0\lib\Microsoft.WindowsAzure.Diagnostics.dll - True ..\..\..\packages\windowsazure.mediaservices.3.4.0.0\lib\net45\Microsoft.WindowsAzure.MediaServices.Client.dll - True ..\..\..\packages\windowsazure.mediaservices.3.4.0.0\lib\net45\Microsoft.WindowsAzure.MediaServices.Client.Common.BlobTransfer.dll - True ..\..\..\packages\windowsazure.mediaservices.3.4.0.0\lib\net45\Microsoft.WindowsAzure.MediaServices.Client.Common.FileEncryption.dll - True ..\..\..\packages\WindowsAzure.Storage.5.0.2\lib\net40\Microsoft.WindowsAzure.Storage.dll - True - - ..\..\..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll - True + + ..\..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll ..\..\..\packages\NHibernate.4.0.1.4000\lib\net40\NHibernate.dll - True @@ -131,11 +117,9 @@ ..\..\..\packages\System.IdentityModel.Tokens.Jwt.4.0.2.206221351\lib\net45\System.IdentityModel.Tokens.Jwt.dll - True ..\..\..\packages\System.Spatial.5.8.4\lib\net40\System.Spatial.dll - True @@ -144,29 +128,23 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -550,7 +528,7 @@ - + @@ -603,4 +581,10 @@ + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + diff --git a/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Web.config b/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Web.config index 0ebb8eef8..bca388fa2 100644 --- a/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Web.config @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + @@ -25,11 +25,6 @@ - - - - - @@ -38,53 +33,65 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/packages.config b/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/packages.config index fb0f1686d..71c7b2af9 100644 --- a/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/packages.config @@ -1,19 +1,19 @@ - + - + - - - + + + + - - + diff --git a/src/Orchard.Web/Modules/Orchard.Azure/Orchard.Azure.csproj b/src/Orchard.Web/Modules/Orchard.Azure/Orchard.Azure.csproj index a66ea0a58..59e62ff28 100644 --- a/src/Orchard.Web/Modules/Orchard.Azure/Orchard.Azure.csproj +++ b/src/Orchard.Web/Modules/Orchard.Azure/Orchard.Azure.csproj @@ -1,4 +1,4 @@ - + @@ -25,6 +25,7 @@ + true @@ -52,79 +53,60 @@ ..\..\..\packages\Iesi.Collections.4.0.1.4000\lib\net40\Iesi.Collections.dll - True - - ..\..\..\packages\log4net.2.0.3\lib\net40-full\log4net.dll - True + + ..\..\..\packages\log4net.2.0.12\lib\net45\log4net.dll ..\..\..\packages\Microsoft.WindowsAzure.Caching.2.4.0.0\lib\net40-full\Microsoft.ApplicationServer.Caching.AzureClientHelper.dll - True ..\..\..\packages\Microsoft.WindowsAzure.Caching.2.4.0.0\lib\net40-full\Microsoft.ApplicationServer.Caching.AzureCommon.dll - True ..\..\..\packages\Microsoft.WindowsAzure.Caching.2.4.0.0\lib\net40-full\Microsoft.ApplicationServer.Caching.Client.dll - True ..\..\..\packages\Microsoft.WindowsAzure.Caching.2.4.0.0\lib\net40-full\Microsoft.ApplicationServer.Caching.Core.dll - True ..\..\..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll - True ..\..\..\packages\Microsoft.Data.Edm.5.8.4\lib\net40\Microsoft.Data.Edm.dll - True ..\..\..\packages\Microsoft.Data.OData.5.8.4\lib\net40\Microsoft.Data.OData.dll - True ..\..\..\packages\Microsoft.Data.Services.Client.5.8.4\lib\net40\Microsoft.Data.Services.Client.dll - True ..\..\..\packages\Microsoft.WindowsAzure.Caching.2.4.0.0\lib\net40-full\Microsoft.Web.DistributedCache.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True ..\..\..\packages\Microsoft.WindowsAzure.ConfigurationManager.3.1.0\lib\net40\Microsoft.WindowsAzure.Configuration.dll - True ..\..\..\packages\Orchard.WindowsAzure.ServiceRuntime.2.7.0.0\lib\Microsoft.WindowsAzure.ServiceRuntime.dll - True ..\..\..\packages\WindowsAzure.Storage.5.0.2\lib\net40\Microsoft.WindowsAzure.Storage.dll - True ..\..\..\packages\Microsoft.WindowsAzure.Caching.2.4.0.0\lib\net40-full\Microsoft.WindowsFabric.Common.dll - True ..\..\..\packages\Microsoft.WindowsAzure.Caching.2.4.0.0\lib\net40-full\Microsoft.WindowsFabric.Data.Common.dll - True - - ..\..\..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll - True + + ..\..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll ..\..\..\packages\NHibernate.4.0.1.4000\lib\net40\NHibernate.dll - True @@ -132,7 +114,6 @@ ..\..\..\packages\System.Spatial.5.8.4\lib\net40\System.Spatial.dll - True @@ -140,28 +121,22 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -199,7 +174,7 @@ - + 10.0 diff --git a/src/Orchard.Web/Modules/Orchard.Azure/Web.config b/src/Orchard.Web/Modules/Orchard.Azure/Web.config index 1a1324c43..c0f4668d8 100644 --- a/src/Orchard.Web/Modules/Orchard.Azure/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Azure/Web.config @@ -1,13 +1,13 @@ - +
- +
- + @@ -28,55 +28,80 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Azure/packages.config b/src/Orchard.Web/Modules/Orchard.Azure/packages.config index 37482ea3d..5ce36dd18 100644 --- a/src/Orchard.Web/Modules/Orchard.Azure/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Azure/packages.config @@ -1,10 +1,10 @@ - + - - - - + + + + @@ -12,7 +12,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj b/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj index 6a0cba663..dd17cfa07 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj @@ -1,5 +1,6 @@ - + + Debug @@ -26,6 +27,9 @@ + + + true @@ -53,12 +57,10 @@ ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True @@ -71,28 +73,22 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -240,7 +236,7 @@ - + 10.0 @@ -274,4 +270,10 @@ + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Web.config b/src/Orchard.Web/Modules/Orchard.Blogs/Web.config index 90feec293..6fcfa6d7c 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Web.config @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + @@ -25,11 +25,6 @@ - - - - - @@ -37,33 +32,49 @@ - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/packages.config b/src/Orchard.Web/Modules/Orchard.Blogs/packages.config index 77c61debb..0938ac40a 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Blogs/packages.config @@ -1,8 +1,8 @@ - + - - - + + + diff --git a/src/Orchard.Web/Modules/Orchard.Caching/Orchard.Caching.csproj b/src/Orchard.Web/Modules/Orchard.Caching/Orchard.Caching.csproj index ac978e622..e5287c073 100644 --- a/src/Orchard.Web/Modules/Orchard.Caching/Orchard.Caching.csproj +++ b/src/Orchard.Web/Modules/Orchard.Caching/Orchard.Caching.csproj @@ -1,4 +1,4 @@ - + @@ -25,6 +25,7 @@ + true @@ -52,7 +53,6 @@ ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True @@ -64,29 +64,23 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -110,7 +104,7 @@ - + 10.0 diff --git a/src/Orchard.Web/Modules/Orchard.Caching/Web.config b/src/Orchard.Web/Modules/Orchard.Caching/Web.config index bb4f1406b..6e0ecb2fe 100644 --- a/src/Orchard.Web/Modules/Orchard.Caching/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Caching/Web.config @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + @@ -28,31 +28,41 @@ - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/src/Orchard.Web/Modules/Orchard.Caching/packages.config b/src/Orchard.Web/Modules/Orchard.Caching/packages.config index 885a0b634..84f4c1e13 100644 --- a/src/Orchard.Web/Modules/Orchard.Caching/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Caching/packages.config @@ -1,7 +1,7 @@ - + - - - + + + diff --git a/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleCsProj.txt b/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleCsProj.txt index 64c916029..6e02b105d 100644 --- a/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleCsProj.txt +++ b/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleCsProj.txt @@ -12,7 +12,7 @@ Properties $$ModuleName$$ $$ModuleName$$ - v4.5.2 + v4.8 false @@ -69,27 +69,27 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll True - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll True - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll True - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll True - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll True - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll True @@ -128,4 +128,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModulePackagesConfig.txt b/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModulePackagesConfig.txt index e807cea03..0938ac40a 100644 --- a/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModulePackagesConfig.txt +++ b/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModulePackagesConfig.txt @@ -1,8 +1,8 @@  - - - - - - \ No newline at end of file + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleRootWebConfig.txt b/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleRootWebConfig.txt index 9232359cf..5a21d7120 100644 --- a/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleRootWebConfig.txt +++ b/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleRootWebConfig.txt @@ -7,7 +7,7 @@ - + @@ -31,13 +31,13 @@ - + - + @@ -48,7 +48,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleTestsCsProj.txt b/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleTestsCsProj.txt index 4a5a2aa49..2b5b84b8a 100644 --- a/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleTestsCsProj.txt +++ b/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleTestsCsProj.txt @@ -9,7 +9,7 @@ Properties $$ProjectName$$ $$ProjectName$$ - v4.5.2 + v4.8 4.0 @@ -70,4 +70,4 @@ $$OrchardReferences$$ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.CodeGeneration/Orchard.CodeGeneration.csproj b/src/Orchard.Web/Modules/Orchard.CodeGeneration/Orchard.CodeGeneration.csproj index c709fe806..cc3443d7a 100644 --- a/src/Orchard.Web/Modules/Orchard.CodeGeneration/Orchard.CodeGeneration.csproj +++ b/src/Orchard.Web/Modules/Orchard.CodeGeneration/Orchard.CodeGeneration.csproj @@ -1,4 +1,4 @@ - + @@ -27,6 +27,7 @@ + true @@ -54,7 +55,6 @@ ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True @@ -65,28 +65,22 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -115,7 +109,6 @@ - Designer @@ -132,6 +125,9 @@ $(MvcBuildViews) + + + 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) diff --git a/src/Orchard.Web/Modules/Orchard.CodeGeneration/Web.config b/src/Orchard.Web/Modules/Orchard.CodeGeneration/Web.config index bb4f1406b..6e0ecb2fe 100644 --- a/src/Orchard.Web/Modules/Orchard.CodeGeneration/Web.config +++ b/src/Orchard.Web/Modules/Orchard.CodeGeneration/Web.config @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + @@ -28,31 +28,41 @@ - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/src/Orchard.Web/Modules/Orchard.CodeGeneration/packages.config b/src/Orchard.Web/Modules/Orchard.CodeGeneration/packages.config index 885a0b634..84f4c1e13 100644 --- a/src/Orchard.Web/Modules/Orchard.CodeGeneration/packages.config +++ b/src/Orchard.Web/Modules/Orchard.CodeGeneration/packages.config @@ -1,7 +1,7 @@ - + - - - + + + diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Orchard.Comments.csproj b/src/Orchard.Web/Modules/Orchard.Comments/Orchard.Comments.csproj index df1d97c67..d4ee4936f 100644 --- a/src/Orchard.Web/Modules/Orchard.Comments/Orchard.Comments.csproj +++ b/src/Orchard.Web/Modules/Orchard.Comments/Orchard.Comments.csproj @@ -1,5 +1,6 @@ - + + Debug @@ -26,6 +27,9 @@ + + + true @@ -53,12 +57,10 @@ ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True @@ -71,28 +73,22 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -215,7 +211,7 @@ - + 10.0 @@ -261,4 +257,10 @@ + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Web.config b/src/Orchard.Web/Modules/Orchard.Comments/Web.config index e27607e8c..d75bcace6 100644 --- a/src/Orchard.Web/Modules/Orchard.Comments/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Comments/Web.config @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + @@ -25,11 +25,6 @@ - - - - - @@ -37,33 +32,49 @@ - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/src/Orchard.Web/Modules/Orchard.Comments/packages.config b/src/Orchard.Web/Modules/Orchard.Comments/packages.config index 77c61debb..0938ac40a 100644 --- a/src/Orchard.Web/Modules/Orchard.Comments/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Comments/packages.config @@ -1,8 +1,8 @@ - + - - - + + + diff --git a/src/Orchard.Web/Modules/Orchard.Conditions/Orchard.Conditions.csproj b/src/Orchard.Web/Modules/Orchard.Conditions/Orchard.Conditions.csproj index c767633b7..fdb3c93b3 100644 --- a/src/Orchard.Web/Modules/Orchard.Conditions/Orchard.Conditions.csproj +++ b/src/Orchard.Web/Modules/Orchard.Conditions/Orchard.Conditions.csproj @@ -1,4 +1,4 @@ - + @@ -25,6 +25,7 @@ + true @@ -53,7 +54,6 @@ ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True @@ -65,29 +65,23 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -124,7 +118,7 @@ - + 10.0 diff --git a/src/Orchard.Web/Modules/Orchard.Conditions/Web.config b/src/Orchard.Web/Modules/Orchard.Conditions/Web.config index 612d16692..5d7d6521c 100644 --- a/src/Orchard.Web/Modules/Orchard.Conditions/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Conditions/Web.config @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + @@ -28,7 +28,7 @@ - + @@ -36,25 +36,36 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/src/Orchard.Web/Modules/Orchard.Conditions/packages.config b/src/Orchard.Web/Modules/Orchard.Conditions/packages.config index 885a0b634..84f4c1e13 100644 --- a/src/Orchard.Web/Modules/Orchard.Conditions/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Conditions/packages.config @@ -1,7 +1,7 @@ - + - - - + + + diff --git a/src/Orchard.Web/Modules/Orchard.ContentPermissions/Orchard.ContentPermissions.csproj b/src/Orchard.Web/Modules/Orchard.ContentPermissions/Orchard.ContentPermissions.csproj index a320821c7..52fcda4f7 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentPermissions/Orchard.ContentPermissions.csproj +++ b/src/Orchard.Web/Modules/Orchard.ContentPermissions/Orchard.ContentPermissions.csproj @@ -1,5 +1,6 @@ - + + Debug @@ -26,6 +27,9 @@ + + + true @@ -53,12 +57,10 @@ ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True @@ -73,29 +75,23 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -162,7 +158,7 @@ - + 10.0 @@ -208,4 +204,10 @@ + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + diff --git a/src/Orchard.Web/Modules/Orchard.ContentPermissions/Web.config b/src/Orchard.Web/Modules/Orchard.ContentPermissions/Web.config index 90feec293..6fcfa6d7c 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentPermissions/Web.config +++ b/src/Orchard.Web/Modules/Orchard.ContentPermissions/Web.config @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + @@ -25,11 +25,6 @@ - - - - - @@ -37,33 +32,49 @@ - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/src/Orchard.Web/Modules/Orchard.ContentPermissions/packages.config b/src/Orchard.Web/Modules/Orchard.ContentPermissions/packages.config index 77c61debb..0938ac40a 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentPermissions/packages.config +++ b/src/Orchard.Web/Modules/Orchard.ContentPermissions/packages.config @@ -1,8 +1,8 @@ - + - - - + + + diff --git a/src/Orchard.Web/Modules/Orchard.ContentPicker/Orchard.ContentPicker.csproj b/src/Orchard.Web/Modules/Orchard.ContentPicker/Orchard.ContentPicker.csproj index 85d8fd138..8942e5f60 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentPicker/Orchard.ContentPicker.csproj +++ b/src/Orchard.Web/Modules/Orchard.ContentPicker/Orchard.ContentPicker.csproj @@ -1,5 +1,6 @@ - + + Debug @@ -27,6 +28,8 @@ + + true @@ -54,20 +57,16 @@ ..\..\..\packages\Iesi.Collections.4.0.1.4000\lib\net40\Iesi.Collections.dll - True ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True ..\..\..\packages\NHibernate.4.0.1.4000\lib\net40\NHibernate.dll - True @@ -77,28 +76,22 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -205,15 +198,15 @@ - - - + + + 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) @@ -258,4 +251,10 @@ + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + diff --git a/src/Orchard.Web/Modules/Orchard.ContentPicker/Web.config b/src/Orchard.Web/Modules/Orchard.ContentPicker/Web.config index 90feec293..6fcfa6d7c 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentPicker/Web.config +++ b/src/Orchard.Web/Modules/Orchard.ContentPicker/Web.config @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + @@ -25,11 +25,6 @@ - - - - - @@ -37,33 +32,49 @@ - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/src/Orchard.Web/Modules/Orchard.ContentPicker/packages.config b/src/Orchard.Web/Modules/Orchard.ContentPicker/packages.config index 1675a5c87..128126181 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentPicker/packages.config +++ b/src/Orchard.Web/Modules/Orchard.ContentPicker/packages.config @@ -1,9 +1,9 @@ - + - - - + + + diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Orchard.ContentTypes.csproj b/src/Orchard.Web/Modules/Orchard.ContentTypes/Orchard.ContentTypes.csproj index 8c8b9fa34..a9cc1beb6 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Orchard.ContentTypes.csproj +++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Orchard.ContentTypes.csproj @@ -1,5 +1,6 @@ - + + Debug @@ -28,6 +29,8 @@ + + true @@ -54,12 +57,10 @@ ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True @@ -70,28 +71,22 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -219,7 +214,7 @@ - + 10.0 @@ -253,4 +248,10 @@ + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Web.config b/src/Orchard.Web/Modules/Orchard.ContentTypes/Web.config index 90feec293..6fcfa6d7c 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Web.config +++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Web.config @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + @@ -25,11 +25,6 @@ - - - - - @@ -37,33 +32,49 @@ - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/packages.config b/src/Orchard.Web/Modules/Orchard.ContentTypes/packages.config index 77c61debb..0938ac40a 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentTypes/packages.config +++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/packages.config @@ -1,8 +1,8 @@ - + - - - + + + diff --git a/src/Orchard.Web/Modules/Orchard.CustomForms/Orchard.CustomForms.csproj b/src/Orchard.Web/Modules/Orchard.CustomForms/Orchard.CustomForms.csproj index 4e52299bf..90bbce9a4 100644 --- a/src/Orchard.Web/Modules/Orchard.CustomForms/Orchard.CustomForms.csproj +++ b/src/Orchard.Web/Modules/Orchard.CustomForms/Orchard.CustomForms.csproj @@ -1,5 +1,6 @@ - + + Debug @@ -26,6 +27,9 @@ + + + true @@ -53,12 +57,10 @@ ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True @@ -73,29 +75,23 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -183,9 +179,7 @@ - - Designer - + 10.0 @@ -231,4 +225,10 @@ + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + diff --git a/src/Orchard.Web/Modules/Orchard.CustomForms/Web.config b/src/Orchard.Web/Modules/Orchard.CustomForms/Web.config index 90feec293..6fcfa6d7c 100644 --- a/src/Orchard.Web/Modules/Orchard.CustomForms/Web.config +++ b/src/Orchard.Web/Modules/Orchard.CustomForms/Web.config @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + @@ -25,11 +25,6 @@ - - - - - @@ -37,33 +32,49 @@ - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/src/Orchard.Web/Modules/Orchard.CustomForms/packages.config b/src/Orchard.Web/Modules/Orchard.CustomForms/packages.config index 77c61debb..0938ac40a 100644 --- a/src/Orchard.Web/Modules/Orchard.CustomForms/packages.config +++ b/src/Orchard.Web/Modules/Orchard.CustomForms/packages.config @@ -1,8 +1,8 @@ - + - - - + + + diff --git a/src/Orchard.Web/Modules/Orchard.Dashboards/Orchard.Dashboards.csproj b/src/Orchard.Web/Modules/Orchard.Dashboards/Orchard.Dashboards.csproj index b34974927..50ae13350 100644 --- a/src/Orchard.Web/Modules/Orchard.Dashboards/Orchard.Dashboards.csproj +++ b/src/Orchard.Web/Modules/Orchard.Dashboards/Orchard.Dashboards.csproj @@ -1,5 +1,6 @@ - + + Debug @@ -25,6 +26,9 @@ + + + true @@ -52,12 +56,10 @@ ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True @@ -69,29 +71,23 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -150,7 +146,7 @@ - + 10.0 @@ -196,4 +192,10 @@ + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + diff --git a/src/Orchard.Web/Modules/Orchard.Dashboards/Web.config b/src/Orchard.Web/Modules/Orchard.Dashboards/Web.config index 60d8b0060..a8acf499b 100644 --- a/src/Orchard.Web/Modules/Orchard.Dashboards/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Dashboards/Web.config @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + @@ -25,11 +25,6 @@ - - - - - @@ -37,7 +32,7 @@ - + @@ -45,25 +40,42 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/src/Orchard.Web/Modules/Orchard.Dashboards/packages.config b/src/Orchard.Web/Modules/Orchard.Dashboards/packages.config index 77c61debb..0938ac40a 100644 --- a/src/Orchard.Web/Modules/Orchard.Dashboards/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Dashboards/packages.config @@ -1,8 +1,8 @@ - + - - - + + + diff --git a/src/Orchard.Web/Modules/Orchard.DesignerTools/Orchard.DesignerTools.csproj b/src/Orchard.Web/Modules/Orchard.DesignerTools/Orchard.DesignerTools.csproj index 27b644362..fbfdaf7d5 100644 --- a/src/Orchard.Web/Modules/Orchard.DesignerTools/Orchard.DesignerTools.csproj +++ b/src/Orchard.Web/Modules/Orchard.DesignerTools/Orchard.DesignerTools.csproj @@ -1,5 +1,6 @@ - + + Debug @@ -26,6 +27,9 @@ + + + true @@ -53,40 +57,32 @@ ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -148,10 +144,10 @@ - + - + 10.0 @@ -197,4 +193,10 @@ + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + diff --git a/src/Orchard.Web/Modules/Orchard.DesignerTools/Web.config b/src/Orchard.Web/Modules/Orchard.DesignerTools/Web.config index 5c097a969..801d56c21 100644 --- a/src/Orchard.Web/Modules/Orchard.DesignerTools/Web.config +++ b/src/Orchard.Web/Modules/Orchard.DesignerTools/Web.config @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + @@ -25,11 +25,6 @@ - - - - - @@ -37,7 +32,7 @@ - + @@ -45,26 +40,42 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/src/Orchard.Web/Modules/Orchard.DesignerTools/packages.config b/src/Orchard.Web/Modules/Orchard.DesignerTools/packages.config index 77c61debb..0938ac40a 100644 --- a/src/Orchard.Web/Modules/Orchard.DesignerTools/packages.config +++ b/src/Orchard.Web/Modules/Orchard.DesignerTools/packages.config @@ -1,8 +1,8 @@ - + - - - + + + diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Orchard.DynamicForms.csproj b/src/Orchard.Web/Modules/Orchard.DynamicForms/Orchard.DynamicForms.csproj index 189df6723..82e620c76 100644 --- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Orchard.DynamicForms.csproj +++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Orchard.DynamicForms.csproj @@ -1,5 +1,6 @@ - + + Debug @@ -27,6 +28,8 @@ Latest + + true @@ -54,16 +57,13 @@ ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True - - ..\..\..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll - True + + ..\..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll @@ -78,29 +78,23 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -556,10 +550,10 @@ - + - + 10.0 @@ -606,4 +600,10 @@ + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Web.config b/src/Orchard.Web/Modules/Orchard.DynamicForms/Web.config index c09f509f1..b9b06741d 100644 --- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Web.config +++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Web.config @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + @@ -25,11 +25,6 @@ - - - - - @@ -37,7 +32,7 @@ - + @@ -47,26 +42,42 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/packages.config b/src/Orchard.Web/Modules/Orchard.DynamicForms/packages.config index 2aa425ab5..63841a016 100644 --- a/src/Orchard.Web/Modules/Orchard.DynamicForms/packages.config +++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/packages.config @@ -1,9 +1,9 @@ - + - - - + + + - + diff --git a/src/Orchard.Web/Modules/Orchard.Email/Orchard.Email.csproj b/src/Orchard.Web/Modules/Orchard.Email/Orchard.Email.csproj index e04c6daa7..f61f1f1f1 100644 --- a/src/Orchard.Web/Modules/Orchard.Email/Orchard.Email.csproj +++ b/src/Orchard.Web/Modules/Orchard.Email/Orchard.Email.csproj @@ -1,5 +1,6 @@ - + + Debug @@ -26,6 +27,9 @@ + + + true @@ -53,16 +57,13 @@ ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True - - ..\..\..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll - True + + ..\..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll @@ -75,28 +76,22 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -167,7 +162,7 @@ - + 10.0 @@ -217,4 +212,10 @@ + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + diff --git a/src/Orchard.Web/Modules/Orchard.Email/Web.config b/src/Orchard.Web/Modules/Orchard.Email/Web.config index 90feec293..6fcfa6d7c 100644 --- a/src/Orchard.Web/Modules/Orchard.Email/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Email/Web.config @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + @@ -25,11 +25,6 @@ - - - - - @@ -37,33 +32,49 @@ - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/src/Orchard.Web/Modules/Orchard.Email/packages.config b/src/Orchard.Web/Modules/Orchard.Email/packages.config index 2aa425ab5..63841a016 100644 --- a/src/Orchard.Web/Modules/Orchard.Email/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Email/packages.config @@ -1,9 +1,9 @@ - + - - - + + + - + diff --git a/src/Orchard.Web/Modules/Orchard.Fields/Orchard.Fields.csproj b/src/Orchard.Web/Modules/Orchard.Fields/Orchard.Fields.csproj index 28f98c4da..2e82cbb42 100644 --- a/src/Orchard.Web/Modules/Orchard.Fields/Orchard.Fields.csproj +++ b/src/Orchard.Web/Modules/Orchard.Fields/Orchard.Fields.csproj @@ -1,5 +1,6 @@ - + + Debug @@ -26,6 +27,9 @@ + + + true @@ -53,12 +57,10 @@ ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True @@ -73,29 +75,23 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -184,7 +180,7 @@ - + 10.0 @@ -230,4 +226,10 @@ + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + diff --git a/src/Orchard.Web/Modules/Orchard.Fields/Web.config b/src/Orchard.Web/Modules/Orchard.Fields/Web.config index beb96b4c7..c0496530c 100644 --- a/src/Orchard.Web/Modules/Orchard.Fields/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Fields/Web.config @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + @@ -26,11 +26,6 @@ - - - - - @@ -38,32 +33,48 @@ - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/src/Orchard.Web/Modules/Orchard.Fields/packages.config b/src/Orchard.Web/Modules/Orchard.Fields/packages.config index 77c61debb..0938ac40a 100644 --- a/src/Orchard.Web/Modules/Orchard.Fields/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Fields/packages.config @@ -1,8 +1,8 @@ - + - - - + + + diff --git a/src/Orchard.Web/Modules/Orchard.Forms/Orchard.Forms.csproj b/src/Orchard.Web/Modules/Orchard.Forms/Orchard.Forms.csproj index f288e9c9e..115a14552 100644 --- a/src/Orchard.Web/Modules/Orchard.Forms/Orchard.Forms.csproj +++ b/src/Orchard.Web/Modules/Orchard.Forms/Orchard.Forms.csproj @@ -1,4 +1,4 @@ - + @@ -26,6 +26,7 @@ + true @@ -54,11 +55,9 @@ ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True - - ..\..\..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll - True + + ..\..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll @@ -74,29 +73,23 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -135,7 +128,7 @@ - + 10.0 diff --git a/src/Orchard.Web/Modules/Orchard.Forms/Web.config b/src/Orchard.Web/Modules/Orchard.Forms/Web.config index a54f9e98a..aef4172fa 100644 --- a/src/Orchard.Web/Modules/Orchard.Forms/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Forms/Web.config @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + @@ -28,33 +28,43 @@ - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/src/Orchard.Web/Modules/Orchard.Forms/packages.config b/src/Orchard.Web/Modules/Orchard.Forms/packages.config index 65331d2bb..96de43e4a 100644 --- a/src/Orchard.Web/Modules/Orchard.Forms/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Forms/packages.config @@ -1,8 +1,8 @@ - + - - - + + + - + diff --git a/src/Orchard.Web/Modules/Orchard.ImageEditor/Orchard.ImageEditor.csproj b/src/Orchard.Web/Modules/Orchard.ImageEditor/Orchard.ImageEditor.csproj index d841c514a..c22876130 100644 --- a/src/Orchard.Web/Modules/Orchard.ImageEditor/Orchard.ImageEditor.csproj +++ b/src/Orchard.Web/Modules/Orchard.ImageEditor/Orchard.ImageEditor.csproj @@ -1,5 +1,6 @@ - + + Debug @@ -25,6 +26,9 @@ + + + true @@ -52,12 +56,10 @@ ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True @@ -72,29 +74,23 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -190,7 +186,7 @@ - + 10.0 @@ -236,4 +232,10 @@ + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + diff --git a/src/Orchard.Web/Modules/Orchard.ImageEditor/Web.config b/src/Orchard.Web/Modules/Orchard.ImageEditor/Web.config index 636dc811d..90bd98bfc 100644 --- a/src/Orchard.Web/Modules/Orchard.ImageEditor/Web.config +++ b/src/Orchard.Web/Modules/Orchard.ImageEditor/Web.config @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + @@ -25,11 +25,6 @@ - - - - - @@ -37,7 +32,7 @@ - + @@ -45,26 +40,42 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/src/Orchard.Web/Modules/Orchard.ImageEditor/packages.config b/src/Orchard.Web/Modules/Orchard.ImageEditor/packages.config index 77c61debb..0938ac40a 100644 --- a/src/Orchard.Web/Modules/Orchard.ImageEditor/packages.config +++ b/src/Orchard.Web/Modules/Orchard.ImageEditor/packages.config @@ -1,8 +1,8 @@ - + - - - + + + diff --git a/src/Orchard.Web/Modules/Orchard.ImportExport/Orchard.ImportExport.csproj b/src/Orchard.Web/Modules/Orchard.ImportExport/Orchard.ImportExport.csproj index 2be7d1cdf..fc2546940 100644 --- a/src/Orchard.Web/Modules/Orchard.ImportExport/Orchard.ImportExport.csproj +++ b/src/Orchard.Web/Modules/Orchard.ImportExport/Orchard.ImportExport.csproj @@ -1,5 +1,6 @@ - + + Debug @@ -26,6 +27,9 @@ + + + true @@ -52,24 +56,19 @@ ..\..\..\packages\Autofac.3.5.2\lib\net40\Autofac.dll - True - - - ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Iesi.Collections.4.0.1.4000\lib\net40\Iesi.Collections.dll - True + + + ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True ..\..\..\packages\NHibernate.4.0.1.4000\lib\net40\NHibernate.dll - True @@ -80,28 +79,22 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -197,7 +190,7 @@ - + 10.0 @@ -232,4 +225,10 @@ + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + diff --git a/src/Orchard.Web/Modules/Orchard.ImportExport/Web.config b/src/Orchard.Web/Modules/Orchard.ImportExport/Web.config index 90feec293..6fcfa6d7c 100644 --- a/src/Orchard.Web/Modules/Orchard.ImportExport/Web.config +++ b/src/Orchard.Web/Modules/Orchard.ImportExport/Web.config @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + @@ -25,11 +25,6 @@ - - - - - @@ -37,33 +32,49 @@ - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/src/Orchard.Web/Modules/Orchard.ImportExport/packages.config b/src/Orchard.Web/Modules/Orchard.ImportExport/packages.config index 65cd1a01f..cb7b9c751 100644 --- a/src/Orchard.Web/Modules/Orchard.ImportExport/packages.config +++ b/src/Orchard.Web/Modules/Orchard.ImportExport/packages.config @@ -1,10 +1,10 @@ - + - - - + + + diff --git a/src/Orchard.Web/Modules/Orchard.Indexing/Orchard.Indexing.csproj b/src/Orchard.Web/Modules/Orchard.Indexing/Orchard.Indexing.csproj index cb01bb903..9a8b92ae5 100644 --- a/src/Orchard.Web/Modules/Orchard.Indexing/Orchard.Indexing.csproj +++ b/src/Orchard.Web/Modules/Orchard.Indexing/Orchard.Indexing.csproj @@ -1,5 +1,6 @@ - + + Debug @@ -26,6 +27,9 @@ + + + true @@ -53,12 +57,10 @@ ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True @@ -68,28 +70,22 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -151,7 +147,7 @@ - + 10.0 @@ -186,4 +182,10 @@ + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + diff --git a/src/Orchard.Web/Modules/Orchard.Indexing/Web.config b/src/Orchard.Web/Modules/Orchard.Indexing/Web.config index 90feec293..6fcfa6d7c 100644 --- a/src/Orchard.Web/Modules/Orchard.Indexing/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Indexing/Web.config @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + @@ -25,11 +25,6 @@ - - - - - @@ -37,33 +32,49 @@ - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/src/Orchard.Web/Modules/Orchard.Indexing/packages.config b/src/Orchard.Web/Modules/Orchard.Indexing/packages.config index 77c61debb..0938ac40a 100644 --- a/src/Orchard.Web/Modules/Orchard.Indexing/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Indexing/packages.config @@ -1,8 +1,8 @@ - + - - - + + + diff --git a/src/Orchard.Web/Modules/Orchard.JobsQueue/Orchard.JobsQueue.csproj b/src/Orchard.Web/Modules/Orchard.JobsQueue/Orchard.JobsQueue.csproj index b77411037..6e0d7d1fb 100644 --- a/src/Orchard.Web/Modules/Orchard.JobsQueue/Orchard.JobsQueue.csproj +++ b/src/Orchard.Web/Modules/Orchard.JobsQueue/Orchard.JobsQueue.csproj @@ -1,5 +1,6 @@ - + + Debug @@ -27,6 +28,9 @@ + + + true @@ -54,15 +58,12 @@ ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True - - ..\..\..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll - True + + ..\..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll @@ -74,28 +75,22 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -168,7 +163,7 @@ - + 10.0 @@ -203,4 +198,10 @@ + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + diff --git a/src/Orchard.Web/Modules/Orchard.JobsQueue/Web.config b/src/Orchard.Web/Modules/Orchard.JobsQueue/Web.config index 90feec293..6fcfa6d7c 100644 --- a/src/Orchard.Web/Modules/Orchard.JobsQueue/Web.config +++ b/src/Orchard.Web/Modules/Orchard.JobsQueue/Web.config @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + @@ -25,11 +25,6 @@ - - - - - @@ -37,33 +32,49 @@ - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/src/Orchard.Web/Modules/Orchard.JobsQueue/packages.config b/src/Orchard.Web/Modules/Orchard.JobsQueue/packages.config index 2aa425ab5..63841a016 100644 --- a/src/Orchard.Web/Modules/Orchard.JobsQueue/packages.config +++ b/src/Orchard.Web/Modules/Orchard.JobsQueue/packages.config @@ -1,9 +1,9 @@ - + - - - + + + - + diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj b/src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj index 8b40e4e1f..a4b7236d1 100644 --- a/src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj +++ b/src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj @@ -1,5 +1,6 @@ - + + Debug @@ -25,6 +26,9 @@ + + + true @@ -52,16 +56,13 @@ ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True - - ..\..\..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll - True + + ..\..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll @@ -69,48 +70,39 @@ 3.5 - - ..\..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll - True + + ..\..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll - True + + ..\..\..\packages\Microsoft.AspNet.WebApi.Core.5.2.7\lib\net45\System.Web.Http.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll - - ..\..\..\packages\YamlDotNet.5.3.0\lib\net45\YamlDotNet.dll - True + + ..\..\..\packages\YamlDotNet.9.1.3\lib\net45\YamlDotNet.dll @@ -594,7 +586,7 @@ - + 10.0 @@ -640,4 +632,10 @@ + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/Serialization/LocalizedStringYamlConverter.cs b/src/Orchard.Web/Modules/Orchard.Layouts/Serialization/LocalizedStringYamlConverter.cs index 01ab2499e..b5779c293 100644 --- a/src/Orchard.Web/Modules/Orchard.Layouts/Serialization/LocalizedStringYamlConverter.cs +++ b/src/Orchard.Web/Modules/Orchard.Layouts/Serialization/LocalizedStringYamlConverter.cs @@ -8,9 +8,9 @@ namespace Orchard.Layouts.Serialization { public class LocalizedStringYamlConverter : IYamlTypeConverter { public bool Accepts(Type type) => type == typeof(LocalizedString); - public object ReadYaml(IParser parser, Type type) => new LocalizedString(parser.Expect()?.Value); + public object ReadYaml(IParser parser, Type type) => new LocalizedString(parser.Consume()?.Value); public void WriteYaml(IEmitter emitter, object value, Type type) => emitter.Emit(new Scalar((value as LocalizedString)?.Text ?? "")); } -} \ No newline at end of file +} diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/Web.config b/src/Orchard.Web/Modules/Orchard.Layouts/Web.config index 303f20556..4e28755b0 100644 --- a/src/Orchard.Web/Modules/Orchard.Layouts/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Layouts/Web.config @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + @@ -25,11 +25,6 @@ - - - - - @@ -37,33 +32,57 @@ - + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/packages.config b/src/Orchard.Web/Modules/Orchard.Layouts/packages.config index 5bb0400b4..c75dbd3d5 100644 --- a/src/Orchard.Web/Modules/Orchard.Layouts/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Layouts/packages.config @@ -1,12 +1,12 @@ - + - - - - - + + + + + - - + + diff --git a/src/Orchard.Web/Modules/Orchard.Lists/Orchard.Lists.csproj b/src/Orchard.Web/Modules/Orchard.Lists/Orchard.Lists.csproj index c745ea575..b5c154b6a 100644 --- a/src/Orchard.Web/Modules/Orchard.Lists/Orchard.Lists.csproj +++ b/src/Orchard.Web/Modules/Orchard.Lists/Orchard.Lists.csproj @@ -1,5 +1,6 @@ - + + Debug @@ -26,6 +27,9 @@ + + + true @@ -53,13 +57,12 @@ ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True + @@ -67,28 +70,22 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -232,7 +229,7 @@ - + 10.0 @@ -278,4 +275,10 @@ + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + diff --git a/src/Orchard.Web/Modules/Orchard.Lists/Web.config b/src/Orchard.Web/Modules/Orchard.Lists/Web.config index 90feec293..6fcfa6d7c 100644 --- a/src/Orchard.Web/Modules/Orchard.Lists/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Lists/Web.config @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + @@ -25,11 +25,6 @@ - - - - - @@ -37,33 +32,49 @@ - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/src/Orchard.Web/Modules/Orchard.Lists/packages.config b/src/Orchard.Web/Modules/Orchard.Lists/packages.config index 77c61debb..0938ac40a 100644 --- a/src/Orchard.Web/Modules/Orchard.Lists/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Lists/packages.config @@ -1,8 +1,8 @@ - + - - - + + + diff --git a/src/Orchard.Web/Modules/Orchard.Localization/Orchard.Localization.csproj b/src/Orchard.Web/Modules/Orchard.Localization/Orchard.Localization.csproj index 68deaafb7..4aa0b798a 100644 --- a/src/Orchard.Web/Modules/Orchard.Localization/Orchard.Localization.csproj +++ b/src/Orchard.Web/Modules/Orchard.Localization/Orchard.Localization.csproj @@ -1,5 +1,6 @@ - + + Debug @@ -26,6 +27,9 @@ + + + true @@ -53,43 +57,34 @@ ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True ..\..\..\packages\Orchard.MSTranslitTools.6.0.0.0\lib\MSTranslitTools.DLL - True - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -201,7 +196,7 @@ - + 10.0 @@ -236,4 +231,10 @@ + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + diff --git a/src/Orchard.Web/Modules/Orchard.Localization/Web.config b/src/Orchard.Web/Modules/Orchard.Localization/Web.config index 90feec293..6fcfa6d7c 100644 --- a/src/Orchard.Web/Modules/Orchard.Localization/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Localization/Web.config @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + @@ -25,11 +25,6 @@ - - - - - @@ -37,33 +32,49 @@ - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/src/Orchard.Web/Modules/Orchard.Localization/packages.config b/src/Orchard.Web/Modules/Orchard.Localization/packages.config index 3694cc99e..a858bdbde 100644 --- a/src/Orchard.Web/Modules/Orchard.Localization/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Localization/packages.config @@ -1,8 +1,8 @@ - + - - - + + + diff --git a/src/Orchard.Web/Modules/Orchard.Media/Orchard.Media.csproj b/src/Orchard.Web/Modules/Orchard.Media/Orchard.Media.csproj index 78ab7cd0e..ddc4045e3 100644 --- a/src/Orchard.Web/Modules/Orchard.Media/Orchard.Media.csproj +++ b/src/Orchard.Web/Modules/Orchard.Media/Orchard.Media.csproj @@ -1,5 +1,6 @@ - + + Debug @@ -27,6 +28,8 @@ + + true @@ -52,17 +55,14 @@ false - + ..\..\..\packages\DotNetZip.1.12.0\lib\net20\DotNetZip.dll - True ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True @@ -73,28 +73,22 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -167,7 +161,7 @@ - + 10.0 @@ -213,4 +207,10 @@ + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + diff --git a/src/Orchard.Web/Modules/Orchard.Media/Web.config b/src/Orchard.Web/Modules/Orchard.Media/Web.config index 90feec293..6fcfa6d7c 100644 --- a/src/Orchard.Web/Modules/Orchard.Media/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Media/Web.config @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + @@ -25,11 +25,6 @@ - - - - - @@ -37,33 +32,49 @@ - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/src/Orchard.Web/Modules/Orchard.Media/packages.config b/src/Orchard.Web/Modules/Orchard.Media/packages.config index 51a7dbcf8..80b4cf92f 100644 --- a/src/Orchard.Web/Modules/Orchard.Media/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Media/packages.config @@ -1,9 +1,9 @@ - + - - - - + + + + diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Orchard.MediaLibrary.csproj b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Orchard.MediaLibrary.csproj index 834994deb..31af4c04c 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Orchard.MediaLibrary.csproj +++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Orchard.MediaLibrary.csproj @@ -1,5 +1,6 @@ - + + Debug @@ -25,6 +26,9 @@ + + + true @@ -52,16 +56,13 @@ ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True - - ..\..\..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll - True + + ..\..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll @@ -77,29 +78,23 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -410,7 +405,7 @@ - + 10.0 @@ -459,4 +454,10 @@ + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Web.config b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Web.config index 5c097a969..801d56c21 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Web.config +++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Web.config @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + @@ -25,11 +25,6 @@ - - - - - @@ -37,7 +32,7 @@ - + @@ -45,26 +40,42 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/packages.config b/src/Orchard.Web/Modules/Orchard.MediaLibrary/packages.config index 2aa425ab5..63841a016 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/packages.config +++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/packages.config @@ -1,9 +1,9 @@ - + - - - + + + - + diff --git a/src/Orchard.Web/Modules/Orchard.MediaPicker/Orchard.MediaPicker.csproj b/src/Orchard.Web/Modules/Orchard.MediaPicker/Orchard.MediaPicker.csproj index 9c8f8a114..b8d8e01e1 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaPicker/Orchard.MediaPicker.csproj +++ b/src/Orchard.Web/Modules/Orchard.MediaPicker/Orchard.MediaPicker.csproj @@ -1,5 +1,6 @@ - + + Debug @@ -26,6 +27,9 @@ + + + true @@ -53,12 +57,10 @@ ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True @@ -73,29 +75,23 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -190,7 +186,7 @@ - + 10.0 @@ -236,4 +232,10 @@ + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + diff --git a/src/Orchard.Web/Modules/Orchard.MediaPicker/Web.config b/src/Orchard.Web/Modules/Orchard.MediaPicker/Web.config index 90feec293..6fcfa6d7c 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaPicker/Web.config +++ b/src/Orchard.Web/Modules/Orchard.MediaPicker/Web.config @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + @@ -25,11 +25,6 @@ - - - - - @@ -37,33 +32,49 @@ - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/src/Orchard.Web/Modules/Orchard.MediaPicker/packages.config b/src/Orchard.Web/Modules/Orchard.MediaPicker/packages.config index 77c61debb..0938ac40a 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaPicker/packages.config +++ b/src/Orchard.Web/Modules/Orchard.MediaPicker/packages.config @@ -1,8 +1,8 @@ - + - - - + + + diff --git a/src/Orchard.Web/Modules/Orchard.MediaProcessing/Orchard.MediaProcessing.csproj b/src/Orchard.Web/Modules/Orchard.MediaProcessing/Orchard.MediaProcessing.csproj index 8d6436a65..a505f057e 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaProcessing/Orchard.MediaProcessing.csproj +++ b/src/Orchard.Web/Modules/Orchard.MediaProcessing/Orchard.MediaProcessing.csproj @@ -1,5 +1,6 @@ - + + Debug @@ -26,6 +27,9 @@ + + + true @@ -51,18 +55,15 @@ false - - ..\..\..\packages\ImageResizer.3.4.3\lib\ImageResizer.dll - True + + ..\..\..\packages\ImageResizer.4.2.8\lib\net45\ImageResizer.dll ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True @@ -78,29 +79,23 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -194,7 +189,7 @@ - + 10.0 @@ -240,4 +235,10 @@ + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + diff --git a/src/Orchard.Web/Modules/Orchard.MediaProcessing/Web.config b/src/Orchard.Web/Modules/Orchard.MediaProcessing/Web.config index 90feec293..6fcfa6d7c 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaProcessing/Web.config +++ b/src/Orchard.Web/Modules/Orchard.MediaProcessing/Web.config @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + @@ -25,11 +25,6 @@ - - - - - @@ -37,33 +32,49 @@ - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/src/Orchard.Web/Modules/Orchard.MediaProcessing/packages.config b/src/Orchard.Web/Modules/Orchard.MediaProcessing/packages.config index 86e86601b..eb78f16d5 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaProcessing/packages.config +++ b/src/Orchard.Web/Modules/Orchard.MediaProcessing/packages.config @@ -1,9 +1,9 @@ - + - - - - + + + + diff --git a/src/Orchard.Web/Modules/Orchard.MessageBus/Orchard.MessageBus.csproj b/src/Orchard.Web/Modules/Orchard.MessageBus/Orchard.MessageBus.csproj index 89d78f835..09ba9a65c 100644 --- a/src/Orchard.Web/Modules/Orchard.MessageBus/Orchard.MessageBus.csproj +++ b/src/Orchard.Web/Modules/Orchard.MessageBus/Orchard.MessageBus.csproj @@ -1,4 +1,4 @@ - + @@ -25,6 +25,7 @@ + true @@ -52,16 +53,13 @@ ..\..\..\packages\Iesi.Collections.4.0.1.4000\lib\net40\Iesi.Collections.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True ..\..\..\packages\NHibernate.4.0.1.4000\lib\net40\NHibernate.dll - True @@ -73,29 +71,23 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -137,7 +129,7 @@ - + 10.0 diff --git a/src/Orchard.Web/Modules/Orchard.MessageBus/Web.config b/src/Orchard.Web/Modules/Orchard.MessageBus/Web.config index bb4f1406b..6e0ecb2fe 100644 --- a/src/Orchard.Web/Modules/Orchard.MessageBus/Web.config +++ b/src/Orchard.Web/Modules/Orchard.MessageBus/Web.config @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + @@ -28,31 +28,41 @@ - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/src/Orchard.Web/Modules/Orchard.MessageBus/packages.config b/src/Orchard.Web/Modules/Orchard.MessageBus/packages.config index ed8a60214..825ae1bbd 100644 --- a/src/Orchard.Web/Modules/Orchard.MessageBus/packages.config +++ b/src/Orchard.Web/Modules/Orchard.MessageBus/packages.config @@ -1,9 +1,9 @@ - + - - - + + + diff --git a/src/Orchard.Web/Modules/Orchard.Migrations/Orchard.Migrations.csproj b/src/Orchard.Web/Modules/Orchard.Migrations/Orchard.Migrations.csproj index 61f36e07d..bbd18622d 100644 --- a/src/Orchard.Web/Modules/Orchard.Migrations/Orchard.Migrations.csproj +++ b/src/Orchard.Web/Modules/Orchard.Migrations/Orchard.Migrations.csproj @@ -1,4 +1,4 @@ - + @@ -27,6 +27,7 @@ + true @@ -54,7 +55,6 @@ ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True @@ -64,28 +64,22 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -113,7 +107,7 @@ - + 10.0 diff --git a/src/Orchard.Web/Modules/Orchard.Migrations/Web.config b/src/Orchard.Web/Modules/Orchard.Migrations/Web.config index bb4f1406b..6e0ecb2fe 100644 --- a/src/Orchard.Web/Modules/Orchard.Migrations/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Migrations/Web.config @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + @@ -28,31 +28,41 @@ - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/src/Orchard.Web/Modules/Orchard.Migrations/packages.config b/src/Orchard.Web/Modules/Orchard.Migrations/packages.config index 885a0b634..84f4c1e13 100644 --- a/src/Orchard.Web/Modules/Orchard.Migrations/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Migrations/packages.config @@ -1,7 +1,7 @@ - + - - - + + + diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Orchard.Modules.csproj b/src/Orchard.Web/Modules/Orchard.Modules/Orchard.Modules.csproj index 1e19fdd07..6583302aa 100644 --- a/src/Orchard.Web/Modules/Orchard.Modules/Orchard.Modules.csproj +++ b/src/Orchard.Web/Modules/Orchard.Modules/Orchard.Modules.csproj @@ -1,5 +1,6 @@ - + + Debug @@ -26,6 +27,9 @@ + + + true @@ -53,16 +57,13 @@ ..\..\..\packages\Autofac.3.5.2\lib\net40\Autofac.dll - True ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True @@ -72,28 +73,22 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -175,7 +170,7 @@ - + 10.0 @@ -209,4 +204,10 @@ + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Web.config b/src/Orchard.Web/Modules/Orchard.Modules/Web.config index 37ba89226..48faf432a 100644 --- a/src/Orchard.Web/Modules/Orchard.Modules/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Modules/Web.config @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + @@ -25,11 +25,6 @@ - - - - - @@ -37,32 +32,48 @@ - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/src/Orchard.Web/Modules/Orchard.Modules/packages.config b/src/Orchard.Web/Modules/Orchard.Modules/packages.config index b6b88daa0..40d0dc821 100644 --- a/src/Orchard.Web/Modules/Orchard.Modules/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Modules/packages.config @@ -1,9 +1,9 @@ - + - - - + + + diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Orchard.MultiTenancy.csproj b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Orchard.MultiTenancy.csproj index c57eed68d..180cd8f72 100644 --- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Orchard.MultiTenancy.csproj +++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Orchard.MultiTenancy.csproj @@ -1,5 +1,6 @@ - + + Debug @@ -26,6 +27,9 @@ + + + true @@ -53,23 +57,18 @@ ..\..\..\packages\Autofac.3.5.2\lib\net40\Autofac.dll - True ..\..\..\packages\Iesi.Collections.4.0.1.4000\lib\net40\Iesi.Collections.dll - True ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True ..\..\..\packages\NHibernate.4.0.1.4000\lib\net40\NHibernate.dll - True @@ -83,28 +82,22 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -172,7 +165,7 @@ - + 10.0 @@ -206,4 +199,10 @@ + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Web.config b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Web.config index 37ba89226..48faf432a 100644 --- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Web.config +++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Web.config @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + @@ -25,11 +25,6 @@ - - - - - @@ -37,32 +32,48 @@ - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/packages.config b/src/Orchard.Web/Modules/Orchard.MultiTenancy/packages.config index 65cd1a01f..cb7b9c751 100644 --- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/packages.config +++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/packages.config @@ -1,10 +1,10 @@ - + - - - + + + diff --git a/src/Orchard.Web/Modules/Orchard.OutputCache/Orchard.OutputCache.csproj b/src/Orchard.Web/Modules/Orchard.OutputCache/Orchard.OutputCache.csproj index 40828c169..39da5a44c 100644 --- a/src/Orchard.Web/Modules/Orchard.OutputCache/Orchard.OutputCache.csproj +++ b/src/Orchard.Web/Modules/Orchard.OutputCache/Orchard.OutputCache.csproj @@ -1,5 +1,6 @@ - + + Debug @@ -26,6 +27,9 @@ + + + true @@ -53,16 +57,13 @@ ..\..\..\packages\Autofac.3.5.2\lib\net40\Autofac.dll - True ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True @@ -77,29 +78,23 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -165,7 +160,7 @@ - + 10.0 @@ -211,5 +206,10 @@ + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + - diff --git a/src/Orchard.Web/Modules/Orchard.OutputCache/Web.config b/src/Orchard.Web/Modules/Orchard.OutputCache/Web.config index cd712d064..45547aa50 100644 --- a/src/Orchard.Web/Modules/Orchard.OutputCache/Web.config +++ b/src/Orchard.Web/Modules/Orchard.OutputCache/Web.config @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + @@ -25,11 +25,6 @@ - - - - - @@ -37,33 +32,49 @@ - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/src/Orchard.Web/Modules/Orchard.OutputCache/packages.config b/src/Orchard.Web/Modules/Orchard.OutputCache/packages.config index b6b88daa0..40d0dc821 100644 --- a/src/Orchard.Web/Modules/Orchard.OutputCache/packages.config +++ b/src/Orchard.Web/Modules/Orchard.OutputCache/packages.config @@ -1,9 +1,9 @@ - + - - - + + + diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Orchard.Packaging.csproj b/src/Orchard.Web/Modules/Orchard.Packaging/Orchard.Packaging.csproj index 683937147..178f5ca04 100644 --- a/src/Orchard.Web/Modules/Orchard.Packaging/Orchard.Packaging.csproj +++ b/src/Orchard.Web/Modules/Orchard.Packaging/Orchard.Packaging.csproj @@ -1,5 +1,6 @@ - + + Debug @@ -27,6 +28,9 @@ + + + true @@ -53,16 +57,13 @@ ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True ..\..\..\packages\Orchard.NuGet.Core.1.1.0.0\lib\NuGet.Core.dll - True @@ -79,28 +80,22 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -224,7 +219,7 @@ - + 10.0 @@ -258,4 +253,10 @@ + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Web.config b/src/Orchard.Web/Modules/Orchard.Packaging/Web.config index 38da45380..d412d124f 100644 --- a/src/Orchard.Web/Modules/Orchard.Packaging/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Packaging/Web.config @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + @@ -25,11 +25,6 @@ - - - - - @@ -37,33 +32,49 @@ - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/packages.config b/src/Orchard.Web/Modules/Orchard.Packaging/packages.config index e96a9edcb..b9fffc84c 100644 --- a/src/Orchard.Web/Modules/Orchard.Packaging/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Packaging/packages.config @@ -1,8 +1,8 @@ - + - - - + + + diff --git a/src/Orchard.Web/Modules/Orchard.Pages/Web.config b/src/Orchard.Web/Modules/Orchard.Pages/Web.config index a54f9e98a..5a06ff94b 100644 --- a/src/Orchard.Web/Modules/Orchard.Pages/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Pages/Web.config @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + @@ -28,33 +28,31 @@ - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - diff --git a/src/Orchard.Web/Modules/Orchard.Projections/Orchard.Projections.csproj b/src/Orchard.Web/Modules/Orchard.Projections/Orchard.Projections.csproj index 71bb1404e..82af5fa65 100644 --- a/src/Orchard.Web/Modules/Orchard.Projections/Orchard.Projections.csproj +++ b/src/Orchard.Web/Modules/Orchard.Projections/Orchard.Projections.csproj @@ -1,5 +1,6 @@ - + + Debug @@ -26,6 +27,9 @@ + + + true @@ -53,20 +57,16 @@ ..\..\..\packages\Iesi.Collections.4.0.1.4000\lib\net40\Iesi.Collections.dll - True ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True ..\..\..\packages\NHibernate.4.0.1.4000\lib\net40\NHibernate.dll - True @@ -82,29 +82,23 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -333,10 +327,10 @@ - + - + 10.0 @@ -382,4 +376,10 @@ + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + 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 89be4a4b1..d9dcbde63 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 @@ -1,4 +1,4 @@ - + Debug @@ -39,35 +39,27 @@ ..\..\..\..\packages\Autofac.3.5.2\lib\net40\Autofac.dll - True ..\..\..\..\packages\FluentNHibernate.2.0.3.0\lib\net40\FluentNHibernate.dll - True ..\..\..\..\packages\Iesi.Collections.4.0.1.4000\lib\net40\Iesi.Collections.dll - True ..\..\..\..\packages\Moq.4.0.10827\lib\NET40\Moq.dll - True ..\..\..\..\packages\NHibernate.4.0.1.4000\lib\net40\NHibernate.dll - True ..\..\..\..\packages\NUnit.2.5.10.11092\lib\nunit.framework.dll - True ..\..\..\..\packages\NUnit.2.5.10.11092\lib\nunit.mocks.dll - True ..\..\..\..\packages\NUnit.2.5.10.11092\lib\pnunit.framework.dll - True diff --git a/src/Orchard.Web/Modules/Orchard.Projections/Tests/app.config b/src/Orchard.Web/Modules/Orchard.Projections/Tests/app.config index b04735a1b..1d39b06b2 100644 --- a/src/Orchard.Web/Modules/Orchard.Projections/Tests/app.config +++ b/src/Orchard.Web/Modules/Orchard.Projections/Tests/app.config @@ -16,8 +16,16 @@ - + + + + + + + + + - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.Projections/Tests/packages.config b/src/Orchard.Web/Modules/Orchard.Projections/Tests/packages.config index 013f51872..419e39e66 100644 --- a/src/Orchard.Web/Modules/Orchard.Projections/Tests/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Projections/Tests/packages.config @@ -1,4 +1,4 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Projections/Web.config b/src/Orchard.Web/Modules/Orchard.Projections/Web.config index 90feec293..6fcfa6d7c 100644 --- a/src/Orchard.Web/Modules/Orchard.Projections/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Projections/Web.config @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + @@ -25,11 +25,6 @@ - - - - - @@ -37,33 +32,49 @@ - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/src/Orchard.Web/Modules/Orchard.Projections/packages.config b/src/Orchard.Web/Modules/Orchard.Projections/packages.config index 1675a5c87..128126181 100644 --- a/src/Orchard.Web/Modules/Orchard.Projections/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Projections/packages.config @@ -1,9 +1,9 @@ - + - - - + + + diff --git a/src/Orchard.Web/Modules/Orchard.PublishLater/Orchard.PublishLater.csproj b/src/Orchard.Web/Modules/Orchard.PublishLater/Orchard.PublishLater.csproj index 9d39fcf6b..dfe10580f 100644 --- a/src/Orchard.Web/Modules/Orchard.PublishLater/Orchard.PublishLater.csproj +++ b/src/Orchard.Web/Modules/Orchard.PublishLater/Orchard.PublishLater.csproj @@ -1,5 +1,6 @@ - + + Debug @@ -27,6 +28,9 @@ + + + true @@ -53,12 +57,10 @@ ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True @@ -68,28 +70,22 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -156,7 +152,7 @@ - + 10.0 @@ -190,4 +186,10 @@ + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + diff --git a/src/Orchard.Web/Modules/Orchard.PublishLater/Web.config b/src/Orchard.Web/Modules/Orchard.PublishLater/Web.config index 60e3af701..6fcfa6d7c 100644 --- a/src/Orchard.Web/Modules/Orchard.PublishLater/Web.config +++ b/src/Orchard.Web/Modules/Orchard.PublishLater/Web.config @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + @@ -25,11 +25,6 @@ - - - - - @@ -37,45 +32,49 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/src/Orchard.Web/Modules/Orchard.PublishLater/packages.config b/src/Orchard.Web/Modules/Orchard.PublishLater/packages.config index 77c61debb..0938ac40a 100644 --- a/src/Orchard.Web/Modules/Orchard.PublishLater/packages.config +++ b/src/Orchard.Web/Modules/Orchard.PublishLater/packages.config @@ -1,8 +1,8 @@ - + - - - + + + diff --git a/src/Orchard.Web/Modules/Orchard.Recipes/Orchard.Recipes.csproj b/src/Orchard.Web/Modules/Orchard.Recipes/Orchard.Recipes.csproj index 8910fba28..e07c1e4f4 100644 --- a/src/Orchard.Web/Modules/Orchard.Recipes/Orchard.Recipes.csproj +++ b/src/Orchard.Web/Modules/Orchard.Recipes/Orchard.Recipes.csproj @@ -1,5 +1,6 @@ - + + Debug @@ -26,6 +27,9 @@ + + + true @@ -52,20 +56,16 @@ ..\..\..\packages\Autofac.3.5.2\lib\net40\Autofac.dll - True - - ..\..\..\packages\log4net.2.0.3\lib\net40-full\log4net.dll - True + + ..\..\..\packages\log4net.2.0.12\lib\net45\log4net.dll ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True @@ -75,28 +75,22 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -185,7 +179,7 @@ - + 10.0 @@ -220,4 +214,10 @@ + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + diff --git a/src/Orchard.Web/Modules/Orchard.Recipes/Web.config b/src/Orchard.Web/Modules/Orchard.Recipes/Web.config index 00bdc6b7a..f6418c6d9 100644 --- a/src/Orchard.Web/Modules/Orchard.Recipes/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Recipes/Web.config @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + @@ -25,11 +25,6 @@ - - - - - @@ -37,30 +32,47 @@ - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Recipes/packages.config b/src/Orchard.Web/Modules/Orchard.Recipes/packages.config index 8b3d0a48b..f9f2e4978 100644 --- a/src/Orchard.Web/Modules/Orchard.Recipes/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Recipes/packages.config @@ -1,10 +1,10 @@ - + - - - - + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Redis/Orchard.Redis.csproj b/src/Orchard.Web/Modules/Orchard.Redis/Orchard.Redis.csproj index e01ac0e72..7e687ea62 100644 --- a/src/Orchard.Web/Modules/Orchard.Redis/Orchard.Redis.csproj +++ b/src/Orchard.Web/Modules/Orchard.Redis/Orchard.Redis.csproj @@ -1,4 +1,4 @@ - + @@ -25,6 +25,7 @@ + true @@ -52,20 +53,16 @@ ..\..\..\packages\Iesi.Collections.4.0.1.4000\lib\net40\Iesi.Collections.dll - True - - ..\..\..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll - True + + ..\..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll ..\..\..\packages\NHibernate.4.0.1.4000\lib\net40\NHibernate.dll - True ..\..\..\packages\StackExchange.Redis.1.0.481\lib\net45\StackExchange.Redis.dll - True @@ -120,7 +117,7 @@ - + 10.0 diff --git a/src/Orchard.Web/Modules/Orchard.Redis/Web.config b/src/Orchard.Web/Modules/Orchard.Redis/Web.config index bb4f1406b..25b223611 100644 --- a/src/Orchard.Web/Modules/Orchard.Redis/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Redis/Web.config @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + @@ -28,31 +28,29 @@ - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - diff --git a/src/Orchard.Web/Modules/Orchard.Redis/packages.config b/src/Orchard.Web/Modules/Orchard.Redis/packages.config index 80d9b3d9e..29f4bb8d8 100644 --- a/src/Orchard.Web/Modules/Orchard.Redis/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Redis/packages.config @@ -1,7 +1,7 @@ - + - + diff --git a/src/Orchard.Web/Modules/Orchard.Resources/Orchard.Resources.csproj b/src/Orchard.Web/Modules/Orchard.Resources/Orchard.Resources.csproj index e4bd0fc29..e7d339c94 100644 --- a/src/Orchard.Web/Modules/Orchard.Resources/Orchard.Resources.csproj +++ b/src/Orchard.Web/Modules/Orchard.Resources/Orchard.Resources.csproj @@ -1,5 +1,6 @@ - + + Debug @@ -25,6 +26,9 @@ + + + true @@ -52,12 +56,10 @@ ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True @@ -69,29 +71,23 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -1062,7 +1058,7 @@ - + 10.0 @@ -1108,4 +1104,10 @@ + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + diff --git a/src/Orchard.Web/Modules/Orchard.Resources/Web.config b/src/Orchard.Web/Modules/Orchard.Resources/Web.config index b9d0c8210..558a1d26f 100644 --- a/src/Orchard.Web/Modules/Orchard.Resources/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Resources/Web.config @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + @@ -25,11 +25,6 @@ - - - - - @@ -37,7 +32,7 @@ - + @@ -45,45 +40,42 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/src/Orchard.Web/Modules/Orchard.Resources/packages.config b/src/Orchard.Web/Modules/Orchard.Resources/packages.config index 77c61debb..0938ac40a 100644 --- a/src/Orchard.Web/Modules/Orchard.Resources/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Resources/packages.config @@ -1,8 +1,8 @@ - + - - - + + + diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj b/src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj index 8b9634367..7a56c0812 100644 --- a/src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj +++ b/src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj @@ -1,5 +1,6 @@ - + + Debug @@ -26,6 +27,9 @@ + + + true @@ -53,12 +57,10 @@ ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True @@ -69,28 +71,22 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -203,10 +199,10 @@ - + - + 10.0 @@ -252,4 +248,10 @@ + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Web.config b/src/Orchard.Web/Modules/Orchard.Roles/Web.config index 90feec293..6fcfa6d7c 100644 --- a/src/Orchard.Web/Modules/Orchard.Roles/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Roles/Web.config @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + @@ -25,11 +25,6 @@ - - - - - @@ -37,33 +32,49 @@ - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/src/Orchard.Web/Modules/Orchard.Roles/packages.config b/src/Orchard.Web/Modules/Orchard.Roles/packages.config index 77c61debb..0938ac40a 100644 --- a/src/Orchard.Web/Modules/Orchard.Roles/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Roles/packages.config @@ -1,8 +1,8 @@ - + - - - + + + diff --git a/src/Orchard.Web/Modules/Orchard.Rules/Orchard.Rules.csproj b/src/Orchard.Web/Modules/Orchard.Rules/Orchard.Rules.csproj index 286086c5f..31423090b 100644 --- a/src/Orchard.Web/Modules/Orchard.Rules/Orchard.Rules.csproj +++ b/src/Orchard.Web/Modules/Orchard.Rules/Orchard.Rules.csproj @@ -1,5 +1,6 @@ - + + Debug @@ -26,6 +27,9 @@ + + + true @@ -53,12 +57,10 @@ ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True @@ -73,29 +75,23 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -201,7 +197,7 @@ - + 10.0 @@ -247,4 +243,10 @@ + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + diff --git a/src/Orchard.Web/Modules/Orchard.Rules/Web.config b/src/Orchard.Web/Modules/Orchard.Rules/Web.config index 378982fa8..bd7bcb759 100644 --- a/src/Orchard.Web/Modules/Orchard.Rules/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Rules/Web.config @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + @@ -28,11 +28,6 @@ - - - - - @@ -40,33 +35,49 @@ - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/src/Orchard.Web/Modules/Orchard.Rules/packages.config b/src/Orchard.Web/Modules/Orchard.Rules/packages.config index 77c61debb..0938ac40a 100644 --- a/src/Orchard.Web/Modules/Orchard.Rules/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Rules/packages.config @@ -1,8 +1,8 @@ - + - - - + + + diff --git a/src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Orchard.Scripting.CSharp.csproj b/src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Orchard.Scripting.CSharp.csproj index 7d82fa489..3ed509c0e 100644 --- a/src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Orchard.Scripting.CSharp.csproj +++ b/src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Orchard.Scripting.CSharp.csproj @@ -1,5 +1,6 @@ - + + Debug @@ -25,6 +26,9 @@ + + + true @@ -52,16 +56,13 @@ ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True ..\..\..\packages\Mono.CSharp.4.0.0.143\lib\4.5\Mono.CSharp.dll - True @@ -76,29 +77,23 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -156,7 +151,7 @@ - + 10.0 @@ -202,4 +197,10 @@ + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + diff --git a/src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Web.config b/src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Web.config index 90feec293..6fcfa6d7c 100644 --- a/src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Web.config @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + @@ -25,11 +25,6 @@ - - - - - @@ -37,33 +32,49 @@ - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/src/Orchard.Web/Modules/Orchard.Scripting.CSharp/packages.config b/src/Orchard.Web/Modules/Orchard.Scripting.CSharp/packages.config index f4f6082e2..59b517a69 100644 --- a/src/Orchard.Web/Modules/Orchard.Scripting.CSharp/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Scripting.CSharp/packages.config @@ -1,8 +1,8 @@ - + - - - + + + 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 6af39863c..cad62acd2 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 @@ -1,4 +1,4 @@ - + @@ -27,6 +27,7 @@ + true @@ -53,28 +54,22 @@ ..\..\..\packages\IronRuby.1.1.3\lib\IronRuby.dll - True ..\..\..\packages\IronRuby.1.1.3\lib\IronRuby.Libraries.dll - True ..\..\..\packages\IronRuby.1.1.3\lib\IronRuby.Libraries.Yaml.dll - True ..\..\..\packages\IronRuby.1.1.3\lib\Microsoft.Dynamic.dll - True ..\..\..\packages\IronRuby.1.1.3\lib\Microsoft.Scripting.dll - True ..\..\..\packages\IronRuby.1.1.3\lib\Microsoft.Scripting.Metadata.dll - True @@ -111,7 +106,7 @@ - + 10.0 diff --git a/src/Orchard.Web/Modules/Orchard.Scripting.Dlr/Web.config b/src/Orchard.Web/Modules/Orchard.Scripting.Dlr/Web.config index bb4f1406b..25b223611 100644 --- a/src/Orchard.Web/Modules/Orchard.Scripting.Dlr/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Scripting.Dlr/Web.config @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + @@ -28,31 +28,29 @@ - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - diff --git a/src/Orchard.Web/Modules/Orchard.Scripting.Dlr/packages.config b/src/Orchard.Web/Modules/Orchard.Scripting.Dlr/packages.config index 506c9d98c..1e4f5b488 100644 --- a/src/Orchard.Web/Modules/Orchard.Scripting.Dlr/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Scripting.Dlr/packages.config @@ -1,4 +1,4 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Scripting/Web.config b/src/Orchard.Web/Modules/Orchard.Scripting/Web.config index bb4f1406b..25b223611 100644 --- a/src/Orchard.Web/Modules/Orchard.Scripting/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Scripting/Web.config @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + @@ -28,31 +28,29 @@ - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - diff --git a/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj b/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj index 1a5be58bc..c992378c0 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj +++ b/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj @@ -1,5 +1,6 @@ - + + Debug @@ -27,6 +28,9 @@ + + + true @@ -53,12 +57,10 @@ ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True @@ -69,28 +71,22 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -210,7 +206,7 @@ - + 10.0 @@ -244,4 +240,10 @@ + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + diff --git a/src/Orchard.Web/Modules/Orchard.Search/Web.config b/src/Orchard.Web/Modules/Orchard.Search/Web.config index 90feec293..6fcfa6d7c 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Search/Web.config @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + @@ -25,11 +25,6 @@ - - - - - @@ -37,33 +32,49 @@ - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/src/Orchard.Web/Modules/Orchard.Search/packages.config b/src/Orchard.Web/Modules/Orchard.Search/packages.config index 77c61debb..0938ac40a 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Search/packages.config @@ -1,8 +1,8 @@ - + - - - + + + diff --git a/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Orchard.SecureSocketsLayer.csproj b/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Orchard.SecureSocketsLayer.csproj index 7738dc128..21d5c5e34 100644 --- a/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Orchard.SecureSocketsLayer.csproj +++ b/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Orchard.SecureSocketsLayer.csproj @@ -1,5 +1,6 @@ - + + Debug @@ -25,6 +26,9 @@ + + + true @@ -52,20 +56,16 @@ ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True - - ..\..\..\packages\Microsoft.Owin.3.0.0\lib\net45\Microsoft.Owin.dll - True + + ..\..\..\packages\Microsoft.Owin.4.1.1\lib\net45\Microsoft.Owin.dll ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True ..\..\..\packages\Owin.1.0\lib\net40\Owin.dll - True @@ -80,29 +80,23 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -146,7 +140,7 @@ - + 10.0 @@ -192,4 +186,10 @@ + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + diff --git a/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Web.config b/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Web.config index 90feec293..6fcfa6d7c 100644 --- a/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Web.config +++ b/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Web.config @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + @@ -25,11 +25,6 @@ - - - - - @@ -37,33 +32,49 @@ - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/packages.config b/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/packages.config index 34080915f..b77a2bcfd 100644 --- a/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/packages.config +++ b/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/packages.config @@ -1,10 +1,10 @@ - + - - - + + + - + diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Orchard.Setup.csproj b/src/Orchard.Web/Modules/Orchard.Setup/Orchard.Setup.csproj index 81fec75c6..189ecc99d 100644 --- a/src/Orchard.Web/Modules/Orchard.Setup/Orchard.Setup.csproj +++ b/src/Orchard.Web/Modules/Orchard.Setup/Orchard.Setup.csproj @@ -1,5 +1,6 @@ - + + Debug @@ -26,6 +27,9 @@ + + + true @@ -53,15 +57,12 @@ ..\..\..\packages\Autofac.3.5.2\lib\net40\Autofac.dll - True ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True @@ -76,28 +77,22 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -167,7 +162,7 @@ - + 10.0 @@ -213,4 +208,10 @@ + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Web.config b/src/Orchard.Web/Modules/Orchard.Setup/Web.config index 90feec293..6fcfa6d7c 100644 --- a/src/Orchard.Web/Modules/Orchard.Setup/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Setup/Web.config @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + @@ -25,11 +25,6 @@ - - - - - @@ -37,33 +32,49 @@ - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/src/Orchard.Web/Modules/Orchard.Setup/packages.config b/src/Orchard.Web/Modules/Orchard.Setup/packages.config index b6b88daa0..40d0dc821 100644 --- a/src/Orchard.Web/Modules/Orchard.Setup/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Setup/packages.config @@ -1,9 +1,9 @@ - + - - - + + + diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Orchard.Tags.csproj b/src/Orchard.Web/Modules/Orchard.Tags/Orchard.Tags.csproj index db9c4ba0c..3b7520287 100644 --- a/src/Orchard.Web/Modules/Orchard.Tags/Orchard.Tags.csproj +++ b/src/Orchard.Web/Modules/Orchard.Tags/Orchard.Tags.csproj @@ -1,5 +1,6 @@ - + + Debug @@ -26,6 +27,9 @@ + + + true @@ -53,20 +57,16 @@ ..\..\..\packages\Iesi.Collections.4.0.1.4000\lib\net40\Iesi.Collections.dll - True ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True ..\..\..\packages\NHibernate.4.0.1.4000\lib\net40\NHibernate.dll - True @@ -77,28 +77,22 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -200,9 +194,8 @@ - + - 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) @@ -247,4 +240,10 @@ + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Web.config b/src/Orchard.Web/Modules/Orchard.Tags/Web.config index 90feec293..6fcfa6d7c 100644 --- a/src/Orchard.Web/Modules/Orchard.Tags/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Tags/Web.config @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + @@ -25,11 +25,6 @@ - - - - - @@ -37,33 +32,49 @@ - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/src/Orchard.Web/Modules/Orchard.Tags/packages.config b/src/Orchard.Web/Modules/Orchard.Tags/packages.config index 1675a5c87..128126181 100644 --- a/src/Orchard.Web/Modules/Orchard.Tags/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Tags/packages.config @@ -1,9 +1,9 @@ - + - - - + + + diff --git a/src/Orchard.Web/Modules/Orchard.TaskLease/Orchard.TaskLease.csproj b/src/Orchard.Web/Modules/Orchard.TaskLease/Orchard.TaskLease.csproj index 778313f95..f411e6f57 100644 --- a/src/Orchard.Web/Modules/Orchard.TaskLease/Orchard.TaskLease.csproj +++ b/src/Orchard.Web/Modules/Orchard.TaskLease/Orchard.TaskLease.csproj @@ -1,4 +1,4 @@ - + @@ -26,6 +26,7 @@ + true @@ -53,7 +54,6 @@ ..\..\..\packages\Autofac.3.5.2\lib\net40\Autofac.dll - True @@ -92,7 +92,7 @@ - + 10.0 diff --git a/src/Orchard.Web/Modules/Orchard.TaskLease/Web.config b/src/Orchard.Web/Modules/Orchard.TaskLease/Web.config index 826b7267d..25b223611 100644 --- a/src/Orchard.Web/Modules/Orchard.TaskLease/Web.config +++ b/src/Orchard.Web/Modules/Orchard.TaskLease/Web.config @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + @@ -28,43 +28,29 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - diff --git a/src/Orchard.Web/Modules/Orchard.TaskLease/packages.config b/src/Orchard.Web/Modules/Orchard.TaskLease/packages.config index 4170942c4..5bcf9dec4 100644 --- a/src/Orchard.Web/Modules/Orchard.TaskLease/packages.config +++ b/src/Orchard.Web/Modules/Orchard.TaskLease/packages.config @@ -1,4 +1,4 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Taxonomies/Orchard.Taxonomies.csproj b/src/Orchard.Web/Modules/Orchard.Taxonomies/Orchard.Taxonomies.csproj index ac54fab93..2e2e019db 100644 --- a/src/Orchard.Web/Modules/Orchard.Taxonomies/Orchard.Taxonomies.csproj +++ b/src/Orchard.Web/Modules/Orchard.Taxonomies/Orchard.Taxonomies.csproj @@ -1,5 +1,6 @@ - + + Debug @@ -27,6 +28,9 @@ + + + true @@ -53,16 +57,13 @@ ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True - - ..\..\..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll - True + + ..\..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll @@ -70,9 +71,8 @@ - - ..\..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll - True + + ..\..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll @@ -81,33 +81,26 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll - True + + ..\..\..\packages\Microsoft.AspNet.WebApi.Core.5.2.7\lib\net45\System.Web.Http.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -265,7 +258,7 @@ - + 10.0 @@ -299,4 +292,10 @@ + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + diff --git a/src/Orchard.Web/Modules/Orchard.Taxonomies/Web.config b/src/Orchard.Web/Modules/Orchard.Taxonomies/Web.config index 75c913b28..cfd8fc518 100644 --- a/src/Orchard.Web/Modules/Orchard.Taxonomies/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Taxonomies/Web.config @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + @@ -24,11 +24,6 @@ - - - - - @@ -36,32 +31,56 @@ - + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Taxonomies/packages.config b/src/Orchard.Web/Modules/Orchard.Taxonomies/packages.config index 033a79099..e7f80fae2 100644 --- a/src/Orchard.Web/Modules/Orchard.Taxonomies/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Taxonomies/packages.config @@ -1,11 +1,11 @@ - + - - - - - + + + + + - + diff --git a/src/Orchard.Web/Modules/Orchard.Templates/Orchard.Templates.csproj b/src/Orchard.Web/Modules/Orchard.Templates/Orchard.Templates.csproj index 22aff06ef..edd109e2e 100644 --- a/src/Orchard.Web/Modules/Orchard.Templates/Orchard.Templates.csproj +++ b/src/Orchard.Web/Modules/Orchard.Templates/Orchard.Templates.csproj @@ -1,5 +1,6 @@ - + + Debug @@ -25,6 +26,9 @@ + + + true @@ -52,12 +56,10 @@ ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True @@ -72,29 +74,23 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -230,10 +226,10 @@ - + - + 10.0 @@ -279,4 +275,10 @@ + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + diff --git a/src/Orchard.Web/Modules/Orchard.Templates/Web.config b/src/Orchard.Web/Modules/Orchard.Templates/Web.config index 90feec293..6fcfa6d7c 100644 --- a/src/Orchard.Web/Modules/Orchard.Templates/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Templates/Web.config @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + @@ -25,11 +25,6 @@ - - - - - @@ -37,33 +32,49 @@ - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/src/Orchard.Web/Modules/Orchard.Templates/packages.config b/src/Orchard.Web/Modules/Orchard.Templates/packages.config index 77c61debb..0938ac40a 100644 --- a/src/Orchard.Web/Modules/Orchard.Templates/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Templates/packages.config @@ -1,8 +1,8 @@ - + - - - + + + diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj b/src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj index 34f4a9d46..604a20741 100644 --- a/src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj +++ b/src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj @@ -1,5 +1,6 @@ - + + Debug @@ -26,6 +27,9 @@ + + + true @@ -53,12 +57,10 @@ ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True @@ -68,28 +70,22 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -175,7 +171,7 @@ - + 10.0 @@ -209,4 +205,10 @@ + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Web.config b/src/Orchard.Web/Modules/Orchard.Themes/Web.config index 90feec293..6fcfa6d7c 100644 --- a/src/Orchard.Web/Modules/Orchard.Themes/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Themes/Web.config @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + @@ -25,11 +25,6 @@ - - - - - @@ -37,33 +32,49 @@ - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/src/Orchard.Web/Modules/Orchard.Themes/packages.config b/src/Orchard.Web/Modules/Orchard.Themes/packages.config index 77c61debb..0938ac40a 100644 --- a/src/Orchard.Web/Modules/Orchard.Themes/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Themes/packages.config @@ -1,8 +1,8 @@ - + - - - + + + diff --git a/src/Orchard.Web/Modules/Orchard.Tokens/Orchard.Tokens.csproj b/src/Orchard.Web/Modules/Orchard.Tokens/Orchard.Tokens.csproj index 85c794700..a2f8dec65 100644 --- a/src/Orchard.Web/Modules/Orchard.Tokens/Orchard.Tokens.csproj +++ b/src/Orchard.Web/Modules/Orchard.Tokens/Orchard.Tokens.csproj @@ -1,5 +1,6 @@ - + + Debug @@ -26,6 +27,9 @@ + + + true @@ -53,12 +57,10 @@ ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True @@ -73,29 +75,23 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -166,7 +162,7 @@ - + 10.0 @@ -212,4 +208,10 @@ + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + 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 9438dfd4b..cfee32461 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 @@ -1,4 +1,4 @@ - + Debug @@ -39,19 +39,15 @@ ..\..\..\..\packages\Autofac.3.5.2\lib\net40\Autofac.dll - True ..\..\..\..\packages\NUnit.2.5.10.11092\lib\nunit.framework.dll - True ..\..\..\..\packages\NUnit.2.5.10.11092\lib\nunit.mocks.dll - True ..\..\..\..\packages\NUnit.2.5.10.11092\lib\pnunit.framework.dll - True diff --git a/src/Orchard.Web/Modules/Orchard.Tokens/Tests/app.config b/src/Orchard.Web/Modules/Orchard.Tokens/Tests/app.config index 6f233ad3e..d8c287814 100644 --- a/src/Orchard.Web/Modules/Orchard.Tokens/Tests/app.config +++ b/src/Orchard.Web/Modules/Orchard.Tokens/Tests/app.config @@ -16,8 +16,16 @@ - + + + + + + + + + - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.Tokens/Tests/packages.config b/src/Orchard.Web/Modules/Orchard.Tokens/Tests/packages.config index af02dada6..8bf2f2c76 100644 --- a/src/Orchard.Web/Modules/Orchard.Tokens/Tests/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Tokens/Tests/packages.config @@ -1,4 +1,4 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Tokens/Web.config b/src/Orchard.Web/Modules/Orchard.Tokens/Web.config index 90feec293..6fcfa6d7c 100644 --- a/src/Orchard.Web/Modules/Orchard.Tokens/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Tokens/Web.config @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + @@ -25,11 +25,6 @@ - - - - - @@ -37,33 +32,49 @@ - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/src/Orchard.Web/Modules/Orchard.Tokens/packages.config b/src/Orchard.Web/Modules/Orchard.Tokens/packages.config index 77c61debb..0938ac40a 100644 --- a/src/Orchard.Web/Modules/Orchard.Tokens/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Tokens/packages.config @@ -1,8 +1,8 @@ - + - - - + + + diff --git a/src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj b/src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj index d22ce66bd..153ff2700 100644 --- a/src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj +++ b/src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj @@ -1,5 +1,6 @@ - + + Debug @@ -26,6 +27,9 @@ + + + true @@ -53,12 +57,10 @@ ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True @@ -71,28 +73,22 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -239,7 +235,7 @@ - + 10.0 @@ -285,4 +281,10 @@ + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + diff --git a/src/Orchard.Web/Modules/Orchard.Users/Web.config b/src/Orchard.Web/Modules/Orchard.Users/Web.config index 90feec293..6fcfa6d7c 100644 --- a/src/Orchard.Web/Modules/Orchard.Users/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Users/Web.config @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + @@ -25,11 +25,6 @@ - - - - - @@ -37,33 +32,49 @@ - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/src/Orchard.Web/Modules/Orchard.Users/packages.config b/src/Orchard.Web/Modules/Orchard.Users/packages.config index 77c61debb..0938ac40a 100644 --- a/src/Orchard.Web/Modules/Orchard.Users/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Users/packages.config @@ -1,8 +1,8 @@ - + - - - + + + diff --git a/src/Orchard.Web/Modules/Orchard.Warmup/Orchard.Warmup.csproj b/src/Orchard.Web/Modules/Orchard.Warmup/Orchard.Warmup.csproj index 184b46a0d..5ce724032 100644 --- a/src/Orchard.Web/Modules/Orchard.Warmup/Orchard.Warmup.csproj +++ b/src/Orchard.Web/Modules/Orchard.Warmup/Orchard.Warmup.csproj @@ -1,5 +1,6 @@ - + + Debug @@ -26,6 +27,9 @@ + + + true @@ -53,12 +57,10 @@ ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True @@ -73,29 +75,23 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -154,7 +150,7 @@ - + 10.0 @@ -200,4 +196,10 @@ + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + diff --git a/src/Orchard.Web/Modules/Orchard.Warmup/Web.config b/src/Orchard.Web/Modules/Orchard.Warmup/Web.config index 90feec293..6fcfa6d7c 100644 --- a/src/Orchard.Web/Modules/Orchard.Warmup/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Warmup/Web.config @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + @@ -25,11 +25,6 @@ - - - - - @@ -37,33 +32,49 @@ - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/src/Orchard.Web/Modules/Orchard.Warmup/packages.config b/src/Orchard.Web/Modules/Orchard.Warmup/packages.config index 77c61debb..0938ac40a 100644 --- a/src/Orchard.Web/Modules/Orchard.Warmup/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Warmup/packages.config @@ -1,8 +1,8 @@ - + - - - + + + diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj b/src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj index 065f90e8c..aecd87d27 100644 --- a/src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj +++ b/src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj @@ -1,5 +1,6 @@ - + + Debug @@ -27,6 +28,9 @@ + + + true @@ -53,12 +57,10 @@ ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True @@ -69,28 +71,22 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -252,7 +248,7 @@ - + 10.0 @@ -286,4 +282,10 @@ + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Web.config b/src/Orchard.Web/Modules/Orchard.Widgets/Web.config index 90feec293..6fcfa6d7c 100644 --- a/src/Orchard.Web/Modules/Orchard.Widgets/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Widgets/Web.config @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + @@ -25,11 +25,6 @@ - - - - - @@ -37,33 +32,49 @@ - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/packages.config b/src/Orchard.Web/Modules/Orchard.Widgets/packages.config index 77c61debb..0938ac40a 100644 --- a/src/Orchard.Web/Modules/Orchard.Widgets/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Widgets/packages.config @@ -1,8 +1,8 @@ - + - - - + + + diff --git a/src/Orchard.Web/Modules/Orchard.Workflows/Orchard.Workflows.csproj b/src/Orchard.Web/Modules/Orchard.Workflows/Orchard.Workflows.csproj index c6aeb0c9f..e4c2a91a4 100644 --- a/src/Orchard.Web/Modules/Orchard.Workflows/Orchard.Workflows.csproj +++ b/src/Orchard.Web/Modules/Orchard.Workflows/Orchard.Workflows.csproj @@ -1,5 +1,6 @@ - + + Debug @@ -25,6 +26,9 @@ + + + true @@ -52,16 +56,13 @@ ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True - - ..\..\..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll - True + + ..\..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll @@ -77,28 +78,22 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -269,7 +264,7 @@ - + 10.0 @@ -315,4 +310,10 @@ + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + diff --git a/src/Orchard.Web/Modules/Orchard.Workflows/Web.config b/src/Orchard.Web/Modules/Orchard.Workflows/Web.config index 90feec293..6fcfa6d7c 100644 --- a/src/Orchard.Web/Modules/Orchard.Workflows/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Workflows/Web.config @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + @@ -25,11 +25,6 @@ - - - - - @@ -37,33 +32,49 @@ - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/src/Orchard.Web/Modules/Orchard.Workflows/packages.config b/src/Orchard.Web/Modules/Orchard.Workflows/packages.config index 268f0e9a7..63841a016 100644 --- a/src/Orchard.Web/Modules/Orchard.Workflows/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Workflows/packages.config @@ -1,9 +1,9 @@ - + - - - - + + + - + + diff --git a/src/Orchard.Web/Modules/Orchard.jQuery/Orchard.jQuery.csproj b/src/Orchard.Web/Modules/Orchard.jQuery/Orchard.jQuery.csproj index bde8bdfc9..7c37aa8ea 100644 --- a/src/Orchard.Web/Modules/Orchard.jQuery/Orchard.jQuery.csproj +++ b/src/Orchard.Web/Modules/Orchard.jQuery/Orchard.jQuery.csproj @@ -1,5 +1,6 @@ - + + Debug @@ -26,6 +27,9 @@ + + + true @@ -53,40 +57,33 @@ ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True + - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -618,7 +615,7 @@ - + 10.0 @@ -664,4 +661,10 @@ + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + diff --git a/src/Orchard.Web/Modules/Orchard.jQuery/Web.config b/src/Orchard.Web/Modules/Orchard.jQuery/Web.config index 90feec293..6fcfa6d7c 100644 --- a/src/Orchard.Web/Modules/Orchard.jQuery/Web.config +++ b/src/Orchard.Web/Modules/Orchard.jQuery/Web.config @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + @@ -25,11 +25,6 @@ - - - - - @@ -37,33 +32,49 @@ - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/src/Orchard.Web/Modules/Orchard.jQuery/packages.config b/src/Orchard.Web/Modules/Orchard.jQuery/packages.config index 77c61debb..0938ac40a 100644 --- a/src/Orchard.Web/Modules/Orchard.jQuery/packages.config +++ b/src/Orchard.Web/Modules/Orchard.jQuery/packages.config @@ -1,8 +1,8 @@ - + - - - + + + diff --git a/src/Orchard.Web/Modules/SysCache/SysCache.csproj b/src/Orchard.Web/Modules/SysCache/SysCache.csproj index 8afd57a2c..77911bf09 100644 --- a/src/Orchard.Web/Modules/SysCache/SysCache.csproj +++ b/src/Orchard.Web/Modules/SysCache/SysCache.csproj @@ -1,4 +1,4 @@ - + @@ -26,6 +26,7 @@ + true @@ -53,16 +54,13 @@ ..\..\..\packages\Iesi.Collections.4.0.1.4000\lib\net40\Iesi.Collections.dll - True ..\..\..\packages\NHibernate.4.0.1.4000\lib\net40\NHibernate.dll - True ..\..\..\packages\NHibernate.Caches.SysCache2.4.0.0.4000\lib\net40\NHibernate.Caches.SysCache2.dll - True @@ -96,7 +94,7 @@ - + 10.0 diff --git a/src/Orchard.Web/Modules/SysCache/Web.config b/src/Orchard.Web/Modules/SysCache/Web.config index 826b7267d..25b223611 100644 --- a/src/Orchard.Web/Modules/SysCache/Web.config +++ b/src/Orchard.Web/Modules/SysCache/Web.config @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + @@ -28,43 +28,29 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - diff --git a/src/Orchard.Web/Modules/SysCache/packages.config b/src/Orchard.Web/Modules/SysCache/packages.config index f29711f1f..9395dcd30 100644 --- a/src/Orchard.Web/Modules/SysCache/packages.config +++ b/src/Orchard.Web/Modules/SysCache/packages.config @@ -1,4 +1,4 @@ - + diff --git a/src/Orchard.Web/Modules/TinyMce/TinyMce.csproj b/src/Orchard.Web/Modules/TinyMce/TinyMce.csproj index 51a9d0489..e0ce2db4b 100644 --- a/src/Orchard.Web/Modules/TinyMce/TinyMce.csproj +++ b/src/Orchard.Web/Modules/TinyMce/TinyMce.csproj @@ -1,5 +1,6 @@ - + + Debug @@ -27,6 +28,8 @@ + + true @@ -54,12 +57,10 @@ ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True @@ -69,28 +70,22 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -368,9 +363,6 @@ - - - Designer @@ -383,6 +375,9 @@ + + + 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) @@ -427,4 +422,10 @@ + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + diff --git a/src/Orchard.Web/Modules/TinyMce/Web.config b/src/Orchard.Web/Modules/TinyMce/Web.config index 2899f80e6..48faf432a 100644 --- a/src/Orchard.Web/Modules/TinyMce/Web.config +++ b/src/Orchard.Web/Modules/TinyMce/Web.config @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + @@ -25,11 +25,6 @@ - - - - - @@ -37,52 +32,48 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/src/Orchard.Web/Modules/TinyMce/packages.config b/src/Orchard.Web/Modules/TinyMce/packages.config index 77c61debb..0938ac40a 100644 --- a/src/Orchard.Web/Modules/TinyMce/packages.config +++ b/src/Orchard.Web/Modules/TinyMce/packages.config @@ -1,8 +1,8 @@ - + - - - + + + diff --git a/src/Orchard.Web/Modules/Upgrade/Upgrade.csproj b/src/Orchard.Web/Modules/Upgrade/Upgrade.csproj index 14109f798..ca679a883 100644 --- a/src/Orchard.Web/Modules/Upgrade/Upgrade.csproj +++ b/src/Orchard.Web/Modules/Upgrade/Upgrade.csproj @@ -1,5 +1,6 @@ - + + Debug @@ -25,6 +26,9 @@ + + + true @@ -52,24 +56,19 @@ ..\..\..\packages\Iesi.Collections.4.0.1.4000\lib\net40\Iesi.Collections.dll - True ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True - - ..\..\..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll - True + + ..\..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll ..\..\..\packages\NHibernate.4.0.1.4000\lib\net40\NHibernate.dll - True @@ -77,9 +76,8 @@ 3.5 - - ..\..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll - True + + ..\..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll @@ -87,33 +85,26 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll - True + + ..\..\..\packages\Microsoft.AspNet.WebApi.Core.5.2.7\lib\net45\System.Web.Http.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -189,10 +180,10 @@ - + - + 10.0 @@ -238,4 +229,10 @@ + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + diff --git a/src/Orchard.Web/Modules/Upgrade/Web.config b/src/Orchard.Web/Modules/Upgrade/Web.config index aa026c41d..72eaf39de 100644 --- a/src/Orchard.Web/Modules/Upgrade/Web.config +++ b/src/Orchard.Web/Modules/Upgrade/Web.config @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + @@ -25,11 +25,6 @@ - - - - - @@ -37,7 +32,7 @@ - + @@ -45,26 +40,51 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Upgrade/packages.config b/src/Orchard.Web/Modules/Upgrade/packages.config index ded84906d..818f27466 100644 --- a/src/Orchard.Web/Modules/Upgrade/packages.config +++ b/src/Orchard.Web/Modules/Upgrade/packages.config @@ -1,13 +1,13 @@ - + - - - - - + + + + + - + diff --git a/src/Orchard.Web/Orchard.Web.csproj b/src/Orchard.Web/Orchard.Web.csproj index cbf019f31..62bc43401 100644 --- a/src/Orchard.Web/Orchard.Web.csproj +++ b/src/Orchard.Web/Orchard.Web.csproj @@ -1,5 +1,6 @@ - + + Debug @@ -23,6 +24,7 @@ true + true @@ -54,51 +56,39 @@ ..\packages\Autofac.3.5.2\lib\net40\Autofac.dll - True - - ..\packages\log4net.2.0.3\lib\net40-full\log4net.dll - True + + ..\packages\log4net.2.0.12\lib\net45\log4net.dll ..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True - - ..\packages\Microsoft.Owin.3.0.0\lib\net45\Microsoft.Owin.dll - True + + ..\packages\Microsoft.Owin.4.1.1\lib\net45\Microsoft.Owin.dll - - ..\packages\Microsoft.Owin.Host.SystemWeb.3.0.0\lib\net45\Microsoft.Owin.Host.SystemWeb.dll - True + + ..\packages\Microsoft.Owin.Host.SystemWeb.4.1.1\lib\net45\Microsoft.Owin.Host.SystemWeb.dll ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True ..\packages\Npgsql.2.2.3\lib\net45\Mono.Security.dll - True ..\packages\MySql.Data.6.7.9\lib\net45\MySql.Data.dll - True - - ..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll - True + + ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll ..\packages\Npgsql.2.2.3\lib\net45\Npgsql.dll - True ..\packages\Orchard.NuGet.Core.1.1.0.0\lib\NuGet.Core.dll - True ..\packages\Owin.1.0\lib\net40\Owin.dll - True @@ -118,29 +108,23 @@ - ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -185,7 +169,7 @@ - + Web.config @@ -302,4 +286,10 @@ + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + diff --git a/src/Orchard.Web/Themes/Themes.csproj b/src/Orchard.Web/Themes/Themes.csproj index 3d088e36d..7a299d787 100644 --- a/src/Orchard.Web/Themes/Themes.csproj +++ b/src/Orchard.Web/Themes/Themes.csproj @@ -1,5 +1,6 @@ - + + Debug @@ -26,6 +27,9 @@ + + + true @@ -53,11 +57,9 @@ ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True @@ -66,28 +68,22 @@ - ..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -211,7 +207,7 @@ - + 10.0 @@ -250,4 +246,10 @@ + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + diff --git a/src/Orchard.Web/Themes/Web.config b/src/Orchard.Web/Themes/Web.config index ea485f068..78606b1b2 100644 --- a/src/Orchard.Web/Themes/Web.config +++ b/src/Orchard.Web/Themes/Web.config @@ -1,4 +1,4 @@ - + @@ -11,7 +11,7 @@ - + @@ -26,11 +26,6 @@ - - - - - - + - + @@ -50,7 +45,7 @@ - + @@ -67,61 +62,42 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/src/Orchard.Web/Themes/packages.config b/src/Orchard.Web/Themes/packages.config index 77c61debb..0938ac40a 100644 --- a/src/Orchard.Web/Themes/packages.config +++ b/src/Orchard.Web/Themes/packages.config @@ -1,8 +1,8 @@ - + - - - + + + diff --git a/src/Orchard.Web/Web.config b/src/Orchard.Web/Web.config index 4165d2638..a4628b4a5 100644 --- a/src/Orchard.Web/Web.config +++ b/src/Orchard.Web/Web.config @@ -1,247 +1,241 @@  - - - -
-
- - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/packages.config b/src/Orchard.Web/packages.config index 048139d02..79b64a8a4 100644 --- a/src/Orchard.Web/packages.config +++ b/src/Orchard.Web/packages.config @@ -1,16 +1,16 @@ - + - - - - + + + + - - + + - + diff --git a/src/Orchard/Orchard.Framework.csproj b/src/Orchard/Orchard.Framework.csproj index 8123c3347..8fad07896 100644 --- a/src/Orchard/Orchard.Framework.csproj +++ b/src/Orchard/Orchard.Framework.csproj @@ -1,4 +1,4 @@ - + Debug @@ -63,44 +63,34 @@ ..\packages\Autofac.3.5.2\lib\net40\Autofac.dll - True ..\packages\Autofac.Configuration.3.3.0\lib\net40\Autofac.Configuration.dll - True ..\packages\Castle.Core.3.3.1\lib\net45\Castle.Core.dll - True ..\packages\FluentNHibernate.2.0.3.0\lib\net40\FluentNHibernate.dll - True ..\packages\Iesi.Collections.4.0.1.4000\lib\net40\Iesi.Collections.dll - True - - ..\packages\log4net.2.0.3\lib\net40-full\log4net.dll - True + + ..\packages\log4net.2.0.12\lib\net45\log4net.dll - - ..\packages\Microsoft.Owin.3.0.0\lib\net45\Microsoft.Owin.dll - True + + ..\packages\Microsoft.Owin.4.1.1\lib\net45\Microsoft.Owin.dll ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True - - ..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll - True + + ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll ..\packages\NHibernate.4.0.1.4000\lib\net40\NHibernate.dll - True False @@ -108,7 +98,6 @@ ..\packages\Owin.1.0\lib\net40\Owin.dll - True @@ -122,9 +111,8 @@ True - - ..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll - True + + ..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll 3.0 @@ -135,36 +123,28 @@ - ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll - True + + ..\packages\Microsoft.AspNet.WebApi.Core.5.2.7\lib\net45\System.Web.Http.dll - - ..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.3\lib\net45\System.Web.Http.WebHost.dll - True + + ..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.7\lib\net45\System.Web.Http.WebHost.dll - - ..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll diff --git a/src/Orchard/app.config b/src/Orchard/app.config index 98dc38b4a..13f534a72 100644 --- a/src/Orchard/app.config +++ b/src/Orchard/app.config @@ -1,4 +1,4 @@ - + @@ -20,9 +20,16 @@ - + + + + + + + + + - diff --git a/src/Orchard/packages.config b/src/Orchard/packages.config index 099851833..65a8bf398 100644 --- a/src/Orchard/packages.config +++ b/src/Orchard/packages.config @@ -1,20 +1,20 @@ - + - - - - - - - - + + + + + + + + - + diff --git a/src/Tools/Orchard.Tests/Orchard.Tests.csproj b/src/Tools/Orchard.Tests/Orchard.Tests.csproj index e1e673744..82497d6a7 100644 --- a/src/Tools/Orchard.Tests/Orchard.Tests.csproj +++ b/src/Tools/Orchard.Tests/Orchard.Tests.csproj @@ -1,4 +1,4 @@ - + Debug @@ -60,19 +60,15 @@ ..\..\packages\Moq.4.0.10827\lib\NET40\Moq.dll - True ..\..\packages\NUnit.2.5.10.11092\lib\nunit.framework.dll - True ..\..\packages\NUnit.2.5.10.11092\lib\nunit.mocks.dll - True ..\..\packages\NUnit.2.5.10.11092\lib\pnunit.framework.dll - True diff --git a/src/Tools/Orchard.Tests/packages.config b/src/Tools/Orchard.Tests/packages.config index 9ccc0ab0f..a32206fe5 100644 --- a/src/Tools/Orchard.Tests/packages.config +++ b/src/Tools/Orchard.Tests/packages.config @@ -1,4 +1,4 @@ - + From 76fc64f48e7e744cbefeda7342987c1959738731 Mon Sep 17 00:00:00 2001 From: Matteo Piovanelli Date: Thu, 4 Feb 2021 19:06:04 +0100 Subject: [PATCH 029/112] Fixed conflict with style for layouts (#8456) the .overlay is used for different things in MediaLibraryPickerField and Layouts, and as it was the styles would conflict. This should fix it. --- .../Styles/media-library-picker-admin.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Styles/media-library-picker-admin.css b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Styles/media-library-picker-admin.css index 6838bdaee..c55f76d2a 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Styles/media-library-picker-admin.css +++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Styles/media-library-picker-admin.css @@ -48,6 +48,8 @@ text-align: right; font-size: 12px; opacity: 0.6; +} +.thumbnail .overlay { height: 40px; overflow: hidden; } @@ -56,6 +58,8 @@ padding-right:5px; font-size: 12px; overflow: hidden; +} +.thumbnail .overlay h3 { height: 1rem; white-space: nowrap; text-overflow: ellipsis; From c5240678bde4a573227185e3e2f1ff9d1ab8f93b Mon Sep 17 00:00:00 2001 From: Hermes Sbicego Date: Thu, 18 Feb 2021 19:06:24 +0100 Subject: [PATCH 030/112] Feature/upgradable libraries (#8457) --- src/Orchard.Core.Tests/Orchard.Core.Tests.csproj | 6 +++--- src/Orchard.Core.Tests/packages.config | 4 ++-- src/Orchard.Specs/Hosting/Orchard.Web/Web.config | 2 +- .../Orchard.Tests.Modules.csproj | 6 +++--- src/Orchard.Tests.Modules/packages.config | 4 ++-- src/Orchard.Tests/Orchard.Framework.Tests.csproj | 6 +++--- src/Orchard.Tests/packages.config | 4 ++-- .../Orchard.Azure.MediaServices.csproj | 16 +++++++++++++--- .../Orchard.Azure.MediaServices/packages.config | 7 +++++-- .../ModuleTestsCsProj.txt | 4 ++-- .../Tests/Orchard.Projections.Tests.csproj | 6 +++--- .../Orchard.Projections/Tests/packages.config | 4 ++-- src/Orchard.Web/Web.config | 2 +- src/Tools/Orchard.Tests/Orchard.Tests.csproj | 6 +++--- src/Tools/Orchard.Tests/packages.config | 4 ++-- 15 files changed, 47 insertions(+), 34 deletions(-) diff --git a/src/Orchard.Core.Tests/Orchard.Core.Tests.csproj b/src/Orchard.Core.Tests/Orchard.Core.Tests.csproj index d339a8c79..2d681498d 100644 --- a/src/Orchard.Core.Tests/Orchard.Core.Tests.csproj +++ b/src/Orchard.Core.Tests/Orchard.Core.Tests.csproj @@ -71,8 +71,8 @@ ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - ..\packages\Moq.4.0.10827\lib\NET40\Moq.dll + + ..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll ..\packages\NHibernate.4.0.1.4000\lib\net40\NHibernate.dll @@ -196,4 +196,4 @@ - + \ No newline at end of file diff --git a/src/Orchard.Core.Tests/packages.config b/src/Orchard.Core.Tests/packages.config index fd4cca6c3..281af0b9a 100644 --- a/src/Orchard.Core.Tests/packages.config +++ b/src/Orchard.Core.Tests/packages.config @@ -7,7 +7,7 @@ - + - + \ No newline at end of file diff --git a/src/Orchard.Specs/Hosting/Orchard.Web/Web.config b/src/Orchard.Specs/Hosting/Orchard.Web/Web.config index 60d4e5b50..1319a3e7b 100644 --- a/src/Orchard.Specs/Hosting/Orchard.Web/Web.config +++ b/src/Orchard.Specs/Hosting/Orchard.Web/Web.config @@ -49,6 +49,7 @@ + @@ -56,7 +57,6 @@ - diff --git a/src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj b/src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj index 15cd8e590..e2c999fb2 100644 --- a/src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj +++ b/src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj @@ -105,8 +105,8 @@ ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - ..\packages\Moq.4.0.10827\lib\NET40\Moq.dll + + ..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll @@ -399,4 +399,4 @@ - + \ No newline at end of file diff --git a/src/Orchard.Tests.Modules/packages.config b/src/Orchard.Tests.Modules/packages.config index cbf8367e8..5b87e0145 100644 --- a/src/Orchard.Tests.Modules/packages.config +++ b/src/Orchard.Tests.Modules/packages.config @@ -11,11 +11,11 @@ - + - + \ 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 c0ca1548b..7d971ba4c 100644 --- a/src/Orchard.Tests/Orchard.Framework.Tests.csproj +++ b/src/Orchard.Tests/Orchard.Framework.Tests.csproj @@ -102,8 +102,8 @@ ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - ..\packages\Moq.4.0.10827\lib\NET40\Moq.dll + + ..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll @@ -441,4 +441,4 @@ - + \ No newline at end of file diff --git a/src/Orchard.Tests/packages.config b/src/Orchard.Tests/packages.config index 88e910414..f55f8de5b 100644 --- a/src/Orchard.Tests/packages.config +++ b/src/Orchard.Tests/packages.config @@ -13,9 +13,9 @@ - + - + \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Orchard.Azure.MediaServices.csproj b/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Orchard.Azure.MediaServices.csproj index b562dc0f4..4118ffd78 100644 --- a/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Orchard.Azure.MediaServices.csproj +++ b/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Orchard.Azure.MediaServices.csproj @@ -79,6 +79,15 @@ ..\..\..\packages\Microsoft.Data.Services.Client.5.8.4\lib\net40\Microsoft.Data.Services.Client.dll + + ..\..\..\packages\Microsoft.IdentityModel.JsonWebTokens.5.2.4\lib\net451\Microsoft.IdentityModel.JsonWebTokens.dll + + + ..\..\..\packages\Microsoft.IdentityModel.Logging.5.2.4\lib\net451\Microsoft.IdentityModel.Logging.dll + + + ..\..\..\packages\Microsoft.IdentityModel.Tokens.5.2.4\lib\net451\Microsoft.IdentityModel.Tokens.dll + ..\..\..\packages\TransientFaultHandling.Core.5.1.1209.1\lib\NET4\Microsoft.Practices.TransientFaultHandling.Core.dll @@ -115,9 +124,10 @@ 3.5 - - ..\..\..\packages\System.IdentityModel.Tokens.Jwt.4.0.2.206221351\lib\net45\System.IdentityModel.Tokens.Jwt.dll + + ..\..\..\packages\System.IdentityModel.Tokens.Jwt.5.2.4\lib\net451\System.IdentityModel.Tokens.Jwt.dll + ..\..\..\packages\System.Spatial.5.8.4\lib\net40\System.Spatial.dll @@ -587,4 +597,4 @@ - + \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/packages.config b/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/packages.config index 71c7b2af9..736fe1e14 100644 --- a/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/packages.config @@ -11,14 +11,17 @@ + + + - + - + \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleTestsCsProj.txt b/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleTestsCsProj.txt index 2b5b84b8a..3afe9ae3d 100644 --- a/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleTestsCsProj.txt +++ b/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleTestsCsProj.txt @@ -39,8 +39,8 @@ ..\..\..\..\packages\Autofac.3.5.2\lib\net40\Autofac.dll - - ..\..\..\..\packages\Moq.4.0.10827\lib\NET40\Moq.dll + + ..\..\..\..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll ..\..\..\..\packages\NHibernate.4.0.1.4000\lib\net40\NHibernate.dll 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 d9dcbde63..85b440be2 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 @@ -46,8 +46,8 @@ ..\..\..\..\packages\Iesi.Collections.4.0.1.4000\lib\net40\Iesi.Collections.dll - - ..\..\..\..\packages\Moq.4.0.10827\lib\NET40\Moq.dll + + ..\..\..\..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll ..\..\..\..\packages\NHibernate.4.0.1.4000\lib\net40\NHibernate.dll @@ -116,4 +116,4 @@ --> - + \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Projections/Tests/packages.config b/src/Orchard.Web/Modules/Orchard.Projections/Tests/packages.config index 419e39e66..71bda6817 100644 --- a/src/Orchard.Web/Modules/Orchard.Projections/Tests/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Projections/Tests/packages.config @@ -3,7 +3,7 @@ - + - + \ No newline at end of file diff --git a/src/Orchard.Web/Web.config b/src/Orchard.Web/Web.config index a4628b4a5..f9e28bee3 100644 --- a/src/Orchard.Web/Web.config +++ b/src/Orchard.Web/Web.config @@ -49,6 +49,7 @@ + @@ -56,7 +57,6 @@ - diff --git a/src/Tools/Orchard.Tests/Orchard.Tests.csproj b/src/Tools/Orchard.Tests/Orchard.Tests.csproj index 82497d6a7..1367ee9b9 100644 --- a/src/Tools/Orchard.Tests/Orchard.Tests.csproj +++ b/src/Tools/Orchard.Tests/Orchard.Tests.csproj @@ -58,8 +58,8 @@ false - - ..\..\packages\Moq.4.0.10827\lib\NET40\Moq.dll + + ..\..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll ..\..\packages\NUnit.2.5.10.11092\lib\nunit.framework.dll @@ -124,4 +124,4 @@ --> - + \ No newline at end of file diff --git a/src/Tools/Orchard.Tests/packages.config b/src/Tools/Orchard.Tests/packages.config index a32206fe5..442b6f5ad 100644 --- a/src/Tools/Orchard.Tests/packages.config +++ b/src/Tools/Orchard.Tests/packages.config @@ -1,5 +1,5 @@  - + - + \ No newline at end of file From 3b9c5fef06ac2a3ada5103571bd6793a30e355b3 Mon Sep 17 00:00:00 2001 From: Matteo Piovanelli Date: Fri, 26 Feb 2021 09:56:23 +0100 Subject: [PATCH 031/112] Updated Migration for CommonPartRecord and IdentityPartRecord (#8459) This orders the operations differently than what is in dev for retrocompatibility in both environments. --- src/Orchard.Web/Core/Common/Migrations.cs | 40 ++++++++++++++++++++--- 1 file changed, 36 insertions(+), 4 deletions(-) diff --git a/src/Orchard.Web/Core/Common/Migrations.cs b/src/Orchard.Web/Core/Common/Migrations.cs index a3491fb4f..63dfcac02 100644 --- a/src/Orchard.Web/Core/Common/Migrations.cs +++ b/src/Orchard.Web/Core/Common/Migrations.cs @@ -34,6 +34,18 @@ namespace Orchard.Core.Common { table.CreateIndex($"IDX_{nameof(CommonPartRecord)}_{nameof(CommonPartRecord.CreatedUtc)}", nameof(CommonPartRecord.CreatedUtc)); table.CreateIndex($"IDX_{nameof(CommonPartRecord)}_{nameof(CommonPartRecord.ModifiedUtc)}", nameof(CommonPartRecord.ModifiedUtc)); table.CreateIndex($"IDX_{nameof(CommonPartRecord)}_{nameof(CommonPartRecord.PublishedUtc)}", nameof(CommonPartRecord.PublishedUtc)); + // This originally in UpdateFrom8 + table.CreateIndex($"IDX_{nameof(CommonPartRecord)}_Container_id", "Container_id"); + // This originally in UpdateFrom6 + table.CreateIndex($"IDX_{nameof(CommonPartRecord)}_OwnedBy_ByCreation", + nameof(CommonPartRecord.OwnerId), + nameof(CommonPartRecord.CreatedUtc)); + table.CreateIndex($"IDX_{nameof(CommonPartRecord)}_OwnedBy_ByModification", + nameof(CommonPartRecord.OwnerId), + nameof(CommonPartRecord.ModifiedUtc)); + table.CreateIndex($"IDX_{nameof(CommonPartRecord)}_OwnedBy_ByPublication", + nameof(CommonPartRecord.OwnerId), + nameof(CommonPartRecord.PublishedUtc)); }); SchemaBuilder.CreateTable("CommonPartVersionRecord", @@ -49,10 +61,13 @@ namespace Orchard.Core.Common { table.CreateIndex($"IDX_{nameof(CommonPartVersionRecord)}_{nameof(CommonPartVersionRecord.PublishedUtc)}", nameof(CommonPartVersionRecord.PublishedUtc)); }); - SchemaBuilder.CreateTable("IdentityPartRecord", - table => table + SchemaBuilder + .CreateTable("IdentityPartRecord",table => table .ContentPartRecord() - .Column("Identifier", column => column.WithLength(255)) + .Column("Identifier", column => column.WithLength(255))) + .AlterTable(nameof(IdentityPartRecord), table => table + // This originally in UpdateFrom7 + .CreateIndex($"IDX_{nameof(IdentityPartRecord)}_{nameof(IdentityPartRecord.Identifier)}", nameof(IdentityPartRecord.Identifier)) ); ContentDefinitionManager.AlterPartDefinition("BodyPart", builder => builder @@ -67,7 +82,7 @@ namespace Orchard.Core.Common { .Attachable() .WithDescription("Automatically generates a unique identity for the content item, which is required in import/export scenarios where one content item references another.")); - return 6; + return 9; } public int UpdateFrom1() { @@ -177,5 +192,22 @@ namespace Orchard.Core.Common { }); return 7; } + + public int UpdateFrom7() { + SchemaBuilder.AlterTable(nameof(IdentityPartRecord), table => table + .CreateIndex($"IDX_{nameof(IdentityPartRecord)}_{nameof(IdentityPartRecord.Identifier)}", nameof(IdentityPartRecord.Identifier))); + + return 8; + } + + public int UpdateFrom8() { + // The Container_Id is basically a foreign key, used in several queries + SchemaBuilder.AlterTable(nameof(CommonPartRecord), table => { + table.CreateIndex($"IDX_{nameof(CommonPartRecord)}_Container_id", + "Container_id"); + }); + + return 9; + } } } \ No newline at end of file From 089bc1d068cab651d18cb1ea1754ebd3ce2b1c33 Mon Sep 17 00:00:00 2001 From: Hermes Sbicego Date: Fri, 19 Mar 2021 08:13:06 +0100 Subject: [PATCH 032/112] Prevents throwing exception when Href is null (#8461) --- src/Orchard/UI/Navigation/NavigationHelper.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Orchard/UI/Navigation/NavigationHelper.cs b/src/Orchard/UI/Navigation/NavigationHelper.cs index 3d7c577bc..172dba06f 100644 --- a/src/Orchard/UI/Navigation/NavigationHelper.cs +++ b/src/Orchard/UI/Navigation/NavigationHelper.cs @@ -124,7 +124,7 @@ namespace Orchard.UI.Navigation { string appPath = currentRequest.ApplicationPath ?? "/"; string requestUrl = currentRequest.Path.StartsWith(appPath) ? currentRequest.Path.Substring(appPath.Length) : currentRequest.Path; - string modelUrl = menuItem.Href.Replace("~/", appPath); + string modelUrl = menuItem.Href?.Replace("~/", appPath) ?? ""; modelUrl = modelUrl.StartsWith(appPath) ? modelUrl.Substring(appPath.Length) : modelUrl; if (requestUrl.Equals(modelUrl, StringComparison.OrdinalIgnoreCase) || (!string.IsNullOrEmpty(modelUrl) && requestUrl.StartsWith(modelUrl + "/", StringComparison.OrdinalIgnoreCase))) { From f407af594f69e97480a7fb0cd4d3782536d59150 Mon Sep 17 00:00:00 2001 From: ElenaRepository <50620495+ElenaRepository@users.noreply.github.com> Date: Mon, 19 Apr 2021 11:03:31 +0200 Subject: [PATCH 033/112] added culture in widgets page (#8466) * added culture in widgets page Co-authored-by: elena.lampugnani Co-authored-by: Hermes Sbicego --- .../Modules/Orchard.Widgets/Orchard.Widgets.csproj | 4 ++++ .../Orchard.Widgets/Views/WidgetPlacement.Zones.cshtml | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj b/src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj index aecd87d27..61f164689 100644 --- a/src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj +++ b/src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj @@ -172,6 +172,10 @@ {6bd8b2fa-f2e3-4ac8-a4c3-2925a653889a} Orchard.Layouts + + {fbc8b571-ed50-49d8-8d9d-64ab7454a0d6} + Orchard.Localization + {99002B65-86F7-415E-BF4A-381AA8AB9CCC} Orchard.Scripting diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Views/WidgetPlacement.Zones.cshtml b/src/Orchard.Web/Modules/Orchard.Widgets/Views/WidgetPlacement.Zones.cshtml index 7e4a03378..3f9ad2bfa 100644 --- a/src/Orchard.Web/Modules/Orchard.Widgets/Views/WidgetPlacement.Zones.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Widgets/Views/WidgetPlacement.Zones.cshtml @@ -2,6 +2,7 @@ @using Orchard.Core.Contents; @using Orchard.Utility.Extensions; @using Orchard.Widgets.Models; +@using Orchard.Localization.Models; @{ Style.Require("WidgetsAdmin"); IEnumerable widgets = Model.Widgets; @@ -26,7 +27,8 @@ foreach (WidgetPart widget in widgets.Where(w => w.Zone == zone).OrderBy(w => w.Position, new Orchard.UI.FlatPositionComparer())) {
  • @using (Html.BeginFormAntiForgeryPost()) { -

    @Html.ActionLink(HasText(widget.Title) ? widget.Title : widget.TypeDefinition.DisplayName, "EditWidget", new { @widget.Id, returnUrl })

    - @widget.TypeDefinition.DisplayName
    + var contentLocalization = (widget.ContentItem.As() != null && widget.ContentItem.As().Culture != null) ? " (" + widget.ContentItem.As().Culture.Culture + ")" : string.Empty; +

    @Html.ActionLink((HasText(widget.Title) ? widget.Title : widget.TypeDefinition.DisplayName) + contentLocalization, "EditWidget", new { @widget.Id, returnUrl })

    - @widget.TypeDefinition.DisplayName
    @if (widget.HasPublished()) { if (widget.HasDraft()) { From 1d8c5890553ae19fdb6367eecaecd282da9693e0 Mon Sep 17 00:00:00 2001 From: Hermes Sbicego Date: Thu, 22 Apr 2021 19:03:46 +0200 Subject: [PATCH 034/112] Show disable action for deprecated features even if they are categorized as "Core" (#8468) --- .../Modules/Orchard.Modules/Views/Admin/Features.cshtml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Features.cshtml b/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Features.cshtml index 8c9db9489..3e4740b9b 100644 --- a/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Features.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Features.cshtml @@ -91,7 +91,8 @@ select (from f in Model.Features where f.Descriptor.Id.Equals(d, StringComparison.OrdinalIgnoreCase) select f).SingleOrDefault()).Where(f => f != null).OrderBy(f => f.Descriptor.Name); var missingDependencies = feature.Descriptor.Dependencies .Where(d => !Model.Features.Any(f => f.Descriptor.Id.Equals(d, StringComparison.OrdinalIgnoreCase))); - var showDisable = categoryName.ToString() != "Core"; + var showDisable = categoryName.ToString() != "Core" + || lifecycleStatus == LifecycleStatus.Deprecated; // we should always be able to disable deprecated features even if they are categorized as "Core" var showEnable = Model.IsAllowed(feature.Descriptor.Extension) && !missingDependencies.Any() && feature.Descriptor.Id != "Orchard.Setup"; if (missingDependencies.Any()) { From 6d0a29af53d1e137d027a747c28419141b0fe506 Mon Sep 17 00:00:00 2001 From: Hermes Sbicego Date: Wed, 12 May 2021 17:59:16 +0200 Subject: [PATCH 035/112] Upgrades YamlDotNet from 9.1.3 to 11.1.1 because 9.1.3 is not more available as nuget package (#8472) --- .../Modules/Orchard.Layouts/Orchard.Layouts.csproj | 6 +++--- src/Orchard.Web/Modules/Orchard.Layouts/packages.config | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj b/src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj index a4b7236d1..d0fd1dd7d 100644 --- a/src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj +++ b/src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj @@ -101,8 +101,8 @@ - - ..\..\..\packages\YamlDotNet.9.1.3\lib\net45\YamlDotNet.dll + + ..\..\..\packages\YamlDotNet.11.1.1\lib\net45\YamlDotNet.dll @@ -638,4 +638,4 @@ - + \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/packages.config b/src/Orchard.Web/Modules/Orchard.Layouts/packages.config index c75dbd3d5..3352b0062 100644 --- a/src/Orchard.Web/Modules/Orchard.Layouts/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Layouts/packages.config @@ -8,5 +8,5 @@ - - + + \ No newline at end of file From 230dfc30da661fbd0dad380bb040d0f5ba29a56c Mon Sep 17 00:00:00 2001 From: Hermes Sbicego Date: Fri, 14 May 2021 10:01:43 +0200 Subject: [PATCH 036/112] Bypass cache for XSRF Tokens (#8470) Fixes #8469 --- .../Filters/OutputCacheFilter.cs | 88 ++++++++++++++++--- 1 file changed, 76 insertions(+), 12 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.OutputCache/Filters/OutputCacheFilter.cs b/src/Orchard.Web/Modules/Orchard.OutputCache/Filters/OutputCacheFilter.cs index 49743977d..0fadac8d5 100644 --- a/src/Orchard.Web/Modules/Orchard.OutputCache/Filters/OutputCacheFilter.cs +++ b/src/Orchard.Web/Modules/Orchard.OutputCache/Filters/OutputCacheFilter.cs @@ -5,6 +5,7 @@ using System.Globalization; using System.Linq; using System.Net; using System.Text; +using System.Text.RegularExpressions; using System.Threading; using System.Web; using System.Web.Mvc; @@ -16,6 +17,7 @@ using Orchard.Environment.Configuration; using Orchard.Logging; using Orchard.Mvc.Extensions; using Orchard.Mvc.Filters; +using Orchard.Mvc.Html; using Orchard.OutputCache.Helpers; using Orchard.OutputCache.Models; using Orchard.OutputCache.Services; @@ -26,7 +28,8 @@ using Orchard.Utility.Extensions; namespace Orchard.OutputCache.Filters { public class OutputCacheFilter : FilterProvider, IActionFilter, IResultFilter, IDisposable { - + private const string REQUEST_VERIFICATION_TOKEN_BEACON_TAG = "<$request-verification-token-beacon-for-hidden-field />"; + private const string REQUEST_VERIFICATION_TOKEN_INVARIANT_TAG = " _ignoredRelativePaths; public void OnActionExecuting(ActionExecutingContext filterContext) { @@ -192,7 +196,7 @@ namespace Orchard.OutputCache.Filters { Logger.Debug("Item '{0}' was rendered.", _cacheKey); - + if (!ResponseIsCacheable(filterContext)) { filterContext.HttpContext.Response.Cache.SetCacheability(HttpCacheability.NoCache); filterContext.HttpContext.Response.Cache.SetNoStore(); @@ -233,12 +237,14 @@ namespace Orchard.OutputCache.Filters { return; } + var cachedOutput = ReplaceRequestVerificationTokenWithBeaconTag(output, response.ContentEncoding); + using (var scope = _workContextAccessor.CreateWorkContextScope()) { var cacheItem = new CacheItem() { CachedOnUtc = _now, Duration = cacheDuration, GraceTime = cacheGraceTime, - Output = output, + Output = cachedOutput, ContentType = response.ContentType, QueryString = filterContext.HttpContext.Request.Url.Query, CacheKey = _cacheKey, @@ -394,7 +400,7 @@ namespace Orchard.OutputCache.Filters { // Vary by configured request headers. var requestHeaders = filterContext.RequestContext.HttpContext.Request.Headers; foreach (var varyByRequestHeader in CacheSettings.VaryByRequestHeaders) { - if (requestHeaders[varyByRequestHeader]!=null) + if (requestHeaders[varyByRequestHeader] != null) result["HEADER:" + varyByRequestHeader] = requestHeaders[varyByRequestHeader]; } @@ -516,27 +522,42 @@ namespace Orchard.OutputCache.Filters { response.AddHeader("X-Cached-On", cacheItem.CachedOnUtc.ToString("r")); response.AddHeader("X-Cached-Until", cacheItem.ValidUntilUtc.ToString("r")); } - + // Shorcut action execution. - filterContext.Result = new FileContentResult(cacheItem.Output, cacheItem.ContentType); + filterContext.Result = new FileContentResult( + ReplaceBeaconTagWithFreshRequestVerificationToken(cacheItem.Output, response.ContentEncoding), // replace the beacon created by the ReplaceRequestVerificationTokenWithBeacon method witha fresh new one + cacheItem.ContentType); response.StatusCode = cacheItem.StatusCode; // Add ETag header + var itemETag = cacheItem.ETag; if (HttpRuntime.UsingIntegratedPipeline && response.Headers.Get("ETag") == null && cacheItem.ETag != null) { - response.Headers["ETag"] = cacheItem.ETag; + if (_etagNeedsRefresh) { + // Add ETag header for the newly created item + var newEtag = Guid.NewGuid().ToString("n"); + itemETag = ""; + if (HttpRuntime.UsingIntegratedPipeline) { + if (response.Headers.Get("ETag") == null) { + response.Headers["ETag"] = newEtag; + itemETag = newEtag; + } + } + } + else { + response.Headers["ETag"] = itemETag; + } } // Check ETag in request // https://www.w3.org/2005/MWI/BPWG/techs/CachingWithETag.html var etag = request.Headers["If-None-Match"]; - if (!String.IsNullOrEmpty(etag)) { - if (String.Equals(etag, cacheItem.ETag, StringComparison.Ordinal)) { + if (!String.IsNullOrEmpty(etag) && !_etagNeedsRefresh) { + if (String.Equals(etag, itemETag, StringComparison.Ordinal)) { // ETag matches the cached item, we return a 304 filterContext.Result = new HttpStatusCodeResult(HttpStatusCode.NotModified); return; } } - ApplyCacheControl(response); } @@ -588,6 +609,48 @@ namespace Orchard.OutputCache.Filters { } } + private byte[] ReplaceRequestVerificationTokenWithBeaconTag(byte[] source, Encoding encoding) { + // Because of the __RequestVerificationToken hidden field vary by the user, before caching the output, we need to replace the + // __RequestVerificationToken hidden field with a "beacon" text that will be replaced before rendering the page + // with a fresh new __RequestVerificationToken hidden field. + // What we do is to replace every with + // <$request-verification-token-beacon-for-hidden-field /> + if (PreventCachingRequestVerificationToken()) { + var outputString = encoding.GetString(source); + var resultString = new StringBuilder(); + var startIndex = 0; + var verificationTokenTagStartIndex = outputString.IndexOf(REQUEST_VERIFICATION_TOKEN_INVARIANT_TAG, startIndex); //searches in the outputString first byte of RequestVerificationToken input tag + while (verificationTokenTagStartIndex >= 0) { + resultString.Append(outputString.Substring(startIndex, verificationTokenTagStartIndex - startIndex)); //appends to resultString the text before RequestVerificationToken input tag + resultString.Append(REQUEST_VERIFICATION_TOKEN_BEACON_TAG); //appends the beacon placeholder tag + startIndex = outputString.IndexOf("/>", verificationTokenTagStartIndex) + 2; // set the new starting index after the replaced RequestVerificationToken input tag + verificationTokenTagStartIndex = outputString.IndexOf(REQUEST_VERIFICATION_TOKEN_INVARIANT_TAG, startIndex);// searches in the outputString next first byte of RequestVerificationToken input tag + } + resultString.Append(outputString.Substring(startIndex)); // completes the resultString appending the remaining characters + return encoding.GetBytes(resultString.ToString()); + } + return source; + } + + private byte[] ReplaceBeaconTagWithFreshRequestVerificationToken(byte[] source, Encoding encoding) { + // Because of the __RequestVerificationToken hidden field vary by the user, we replace the beacon generated by the ReplaceRequestVerificationTokenWithBeacon method + // with a fresh new __RequestVerificationToken hidden field. + // What we do is to replace every <$request-verification-token-beacon-for-hidden-field /> with + // + if (PreventCachingRequestVerificationToken()) { + var outputString = encoding.GetString(source); + var antiForgeyToken = new HtmlHelper(new ViewContext(), new ViewDataContainer()).AntiForgeryTokenOrchard(); + var resultString = outputString.Replace(REQUEST_VERIFICATION_TOKEN_BEACON_TAG, antiForgeyToken.ToString()); + _etagNeedsRefresh = outputString != resultString; + return encoding.GetBytes(resultString); + } + return source; + } + + private bool PreventCachingRequestVerificationToken() { + return _cacheSettings.CacheAuthenticatedRequests && (!_cacheSettings.VaryByAuthenticationState || _workContext.CurrentUser != null); + } + protected virtual bool IsIgnoredUrl(string url) { if (IgnoredRelativePaths == null || !IgnoredRelativePaths.Any()) { return false; @@ -601,7 +664,8 @@ namespace Orchard.OutputCache.Filters { return true; } } - } else { + } + else { // if there is a RequestUrlPrefix, we want to check by also removing it from the // url we are verifying, because the configuration might have been done without it var tmp = url.TrimStart(new[] { '/' }); @@ -722,7 +786,7 @@ namespace Orchard.OutputCache.Filters { // Ensure locks are released even after an unexpected exception Dispose(false); } - + } public class ViewDataContainer : IViewDataContainer { From f23d9292c54d81a00484ffc97ba52c76ab26cd9d Mon Sep 17 00:00:00 2001 From: ElenaRepository <50620495+ElenaRepository@users.noreply.github.com> Date: Mon, 21 Jun 2021 09:42:59 +0200 Subject: [PATCH 037/112] flag exclude children for taxonomies (#8481) --- .../Orchard.Taxonomies/Projections/TermsFilter.cs | 7 +++++-- .../Orchard.Taxonomies/Projections/TermsFilterForms.cs | 9 +++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.Taxonomies/Projections/TermsFilter.cs b/src/Orchard.Web/Modules/Orchard.Taxonomies/Projections/TermsFilter.cs index d9eca7382..f07415f8b 100644 --- a/src/Orchard.Web/Modules/Orchard.Taxonomies/Projections/TermsFilter.cs +++ b/src/Orchard.Web/Modules/Orchard.Taxonomies/Projections/TermsFilter.cs @@ -47,8 +47,11 @@ namespace Orchard.Taxonomies.Projections { var terms = ids.Select(_taxonomyService.GetTerm).ToList(); var allChildren = new List(); foreach (var term in terms) { - allChildren.AddRange(_taxonomyService.GetChildren(term)); - allChildren.Add(term); + bool.TryParse(context.State.ExcludeChildren?.Value, out bool excludeChildren); + if (!excludeChildren) + allChildren.AddRange(_taxonomyService.GetChildren(term)); + if (term != null) + allChildren.Add(term); } allChildren = allChildren.Distinct().ToList(); diff --git a/src/Orchard.Web/Modules/Orchard.Taxonomies/Projections/TermsFilterForms.cs b/src/Orchard.Web/Modules/Orchard.Taxonomies/Projections/TermsFilterForms.cs index 297b93b6c..c6cc27a4b 100644 --- a/src/Orchard.Web/Modules/Orchard.Taxonomies/Projections/TermsFilterForms.cs +++ b/src/Orchard.Web/Modules/Orchard.Taxonomies/Projections/TermsFilterForms.cs @@ -48,8 +48,13 @@ namespace Orchard.Taxonomies.Projections { Id: "operator-is-all-of", Name: "Operator", Title: T("Is all of"), Value: "1" ) - ) - ); + ), + _ExcludeChildren: Shape.Checkbox( + Id: "ExcludeChildren", Name: "ExcludeChildren", + Title: T("Automatically exclude children terms in filtering"), + Value: "true" + ) + ); foreach (var taxonomy in _taxonomyService.GetTaxonomies()) { f._Terms.Add(new SelectListItem { Value = String.Empty, Text = taxonomy.Name }); From 7131970e91d19a4ac5ec92b10fae885e50bd1fb5 Mon Sep 17 00:00:00 2001 From: Matteo Piovanelli Date: Fri, 25 Jun 2021 10:35:13 +0200 Subject: [PATCH 038/112] Remove cache by tag on Unpublished (#8483) As it was, cached lists/projections would not be evicted when a ContentItem they contained was unpublished. --- .../Handlers/CacheItemInvalidationHandler.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Orchard.Web/Modules/Orchard.OutputCache/Handlers/CacheItemInvalidationHandler.cs b/src/Orchard.Web/Modules/Orchard.OutputCache/Handlers/CacheItemInvalidationHandler.cs index 0850dd716..1661883e0 100644 --- a/src/Orchard.Web/Modules/Orchard.OutputCache/Handlers/CacheItemInvalidationHandler.cs +++ b/src/Orchard.Web/Modules/Orchard.OutputCache/Handlers/CacheItemInvalidationHandler.cs @@ -13,6 +13,7 @@ namespace Orchard.OutputCache.Handlers { // Evict cached content when updated, removed or destroyed. OnPublished((context, part) => Invalidate(part)); + OnUnpublished((context, part) => Invalidate(part)); OnRemoved((context, part) => Invalidate(part)); OnDestroyed((context, part) => Invalidate(part)); } @@ -30,4 +31,4 @@ namespace Orchard.OutputCache.Handlers { } } } -} \ No newline at end of file +} From af42947c9cfc8ef95a39e7ff672ae8fc0ecf629c Mon Sep 17 00:00:00 2001 From: Matteo Piovanelli Date: Fri, 30 Jul 2021 08:40:53 +0200 Subject: [PATCH 039/112] Cloning doesn't overwrite identity (#8487) Fixes #8486 --- src/Orchard.Web/Core/Common/Handlers/IdentityPartHandler.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Orchard.Web/Core/Common/Handlers/IdentityPartHandler.cs b/src/Orchard.Web/Core/Common/Handlers/IdentityPartHandler.cs index 66356eefa..216e93197 100644 --- a/src/Orchard.Web/Core/Common/Handlers/IdentityPartHandler.cs +++ b/src/Orchard.Web/Core/Common/Handlers/IdentityPartHandler.cs @@ -10,7 +10,7 @@ namespace Orchard.Core.Common.Handlers { IContentManager contentManager) { Filters.Add(StorageFilter.For(identityRepository)); OnInitializing((ctx, part) => AssignIdentity(part)); - OnCloning((ctx, part) => AssignIdentity(part)); + OnCloning((ctx, part) => AssignIdentity(ctx.CloneContentItem.As())); OnIndexing((context, part) => { context.DocumentIndex.Add("identifier", part.Identifier).Store(); @@ -32,4 +32,4 @@ namespace Orchard.Core.Common.Handlers { } } } -} \ No newline at end of file +} From b37256fc943864f79f2a46a899081a745792040b Mon Sep 17 00:00:00 2001 From: Matteo Piovanelli Date: Fri, 30 Jul 2021 08:41:53 +0200 Subject: [PATCH 040/112] Update nhibernate (#8488) * Update nHibernate to version 4.1.2.4000 # Conflicts: # src/Orchard.Web/Modules/Orchard.ContentPicker/packages.config # src/Orchard.Web/Modules/Orchard.ImportExport/packages.config # src/Orchard.Web/Modules/Orchard.MessageBus/packages.config # src/Orchard.Web/Modules/Orchard.MultiTenancy/packages.config # src/Orchard.Web/Modules/Orchard.Projections/packages.config # src/Orchard.Web/Modules/Orchard.Tags/packages.config # src/Orchard.Web/Modules/Upgrade/packages.config # src/Orchard.Web/Web.config * Update AssemblyBindings for NHibernate --- src/Orchard.Core.Tests/App.config | 2 +- src/Orchard.Core.Tests/Orchard.Core.Tests.csproj | 4 ++-- src/Orchard.Core.Tests/packages.config | 2 +- src/Orchard.Specs/App.Config | 2 +- src/Orchard.Specs/Orchard.Specs.csproj | 4 ++-- src/Orchard.Specs/packages.config | 2 +- src/Orchard.Tests.Modules/App.config | 2 +- src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj | 4 ++-- src/Orchard.Tests.Modules/packages.config | 2 +- src/Orchard.Tests/App.config | 2 +- src/Orchard.Tests/Orchard.Framework.Tests.csproj | 4 ++-- src/Orchard.Tests/packages.config | 2 +- src/Orchard.Web.Tests/app.config | 2 +- src/Orchard.Web/Core/Web.config | 2 +- src/Orchard.Web/Modules/Lucene/Web.config | 2 +- src/Orchard.Web/Modules/Markdown/Web.config | 2 +- src/Orchard.Web/Modules/Orchard.Alias/Web.config | 2 +- src/Orchard.Web/Modules/Orchard.AntiSpam/Web.config | 2 +- src/Orchard.Web/Modules/Orchard.ArchiveLater/Web.config | 2 +- .../Modules/Orchard.AuditTrail/Orchard.AuditTrail.csproj | 6 +++--- src/Orchard.Web/Modules/Orchard.AuditTrail/Web.config | 2 +- src/Orchard.Web/Modules/Orchard.AuditTrail/packages.config | 2 +- src/Orchard.Web/Modules/Orchard.Autoroute/Web.config | 2 +- .../Orchard.Azure.MediaServices.csproj | 4 ++-- .../Modules/Orchard.Azure.MediaServices/Web.config | 2 +- .../Modules/Orchard.Azure.MediaServices/packages.config | 2 +- src/Orchard.Web/Modules/Orchard.Azure/Orchard.Azure.csproj | 4 ++-- src/Orchard.Web/Modules/Orchard.Azure/Web.config | 2 +- src/Orchard.Web/Modules/Orchard.Azure/packages.config | 2 +- src/Orchard.Web/Modules/Orchard.Blogs/Web.config | 2 +- src/Orchard.Web/Modules/Orchard.Caching/Web.config | 2 +- .../CodeGenerationTemplates/ModuleRootWebConfig.txt | 2 +- src/Orchard.Web/Modules/Orchard.CodeGeneration/Web.config | 2 +- src/Orchard.Web/Modules/Orchard.Comments/Web.config | 2 +- src/Orchard.Web/Modules/Orchard.Conditions/Web.config | 2 +- .../Modules/Orchard.ContentPermissions/Web.config | 2 +- .../Orchard.ContentPicker/Orchard.ContentPicker.csproj | 6 +++--- src/Orchard.Web/Modules/Orchard.ContentPicker/Web.config | 2 +- .../Modules/Orchard.ContentPicker/packages.config | 2 +- src/Orchard.Web/Modules/Orchard.ContentTypes/Web.config | 2 +- src/Orchard.Web/Modules/Orchard.CustomForms/Web.config | 2 +- src/Orchard.Web/Modules/Orchard.Dashboards/Web.config | 2 +- src/Orchard.Web/Modules/Orchard.DesignerTools/Web.config | 2 +- src/Orchard.Web/Modules/Orchard.DynamicForms/Web.config | 2 +- src/Orchard.Web/Modules/Orchard.Email/Web.config | 2 +- src/Orchard.Web/Modules/Orchard.Fields/Web.config | 2 +- src/Orchard.Web/Modules/Orchard.Forms/Web.config | 2 +- src/Orchard.Web/Modules/Orchard.ImageEditor/Web.config | 2 +- .../Orchard.ImportExport/Orchard.ImportExport.csproj | 6 +++--- src/Orchard.Web/Modules/Orchard.ImportExport/Web.config | 2 +- .../Modules/Orchard.ImportExport/packages.config | 2 +- src/Orchard.Web/Modules/Orchard.Indexing/Web.config | 2 +- src/Orchard.Web/Modules/Orchard.JobsQueue/Web.config | 2 +- src/Orchard.Web/Modules/Orchard.Layouts/Web.config | 2 +- src/Orchard.Web/Modules/Orchard.Lists/Web.config | 2 +- src/Orchard.Web/Modules/Orchard.Localization/Web.config | 2 +- src/Orchard.Web/Modules/Orchard.Media/Web.config | 2 +- src/Orchard.Web/Modules/Orchard.MediaLibrary/Web.config | 2 +- src/Orchard.Web/Modules/Orchard.MediaPicker/Web.config | 2 +- src/Orchard.Web/Modules/Orchard.MediaProcessing/Web.config | 2 +- .../Modules/Orchard.MessageBus/Orchard.MessageBus.csproj | 4 ++-- src/Orchard.Web/Modules/Orchard.MessageBus/Web.config | 2 +- src/Orchard.Web/Modules/Orchard.MessageBus/packages.config | 2 +- src/Orchard.Web/Modules/Orchard.Migrations/Web.config | 2 +- src/Orchard.Web/Modules/Orchard.Modules/Web.config | 2 +- .../Orchard.MultiTenancy/Orchard.MultiTenancy.csproj | 6 +++--- src/Orchard.Web/Modules/Orchard.MultiTenancy/Web.config | 2 +- .../Modules/Orchard.MultiTenancy/packages.config | 2 +- src/Orchard.Web/Modules/Orchard.OutputCache/Web.config | 2 +- src/Orchard.Web/Modules/Orchard.Packaging/Web.config | 2 +- src/Orchard.Web/Modules/Orchard.Pages/Web.config | 2 +- .../Modules/Orchard.Projections/Orchard.Projections.csproj | 6 +++--- .../Tests/Orchard.Projections.Tests.csproj | 4 ++-- .../Modules/Orchard.Projections/Tests/app.config | 2 +- .../Modules/Orchard.Projections/Tests/packages.config | 2 +- src/Orchard.Web/Modules/Orchard.Projections/Web.config | 2 +- src/Orchard.Web/Modules/Orchard.Projections/packages.config | 2 +- src/Orchard.Web/Modules/Orchard.PublishLater/Web.config | 2 +- src/Orchard.Web/Modules/Orchard.Recipes/Web.config | 2 +- src/Orchard.Web/Modules/Orchard.Redis/Orchard.Redis.csproj | 4 ++-- src/Orchard.Web/Modules/Orchard.Redis/Web.config | 2 +- src/Orchard.Web/Modules/Orchard.Redis/packages.config | 2 +- src/Orchard.Web/Modules/Orchard.Resources/Web.config | 2 +- src/Orchard.Web/Modules/Orchard.Roles/Web.config | 2 +- src/Orchard.Web/Modules/Orchard.Rules/Web.config | 2 +- src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Web.config | 2 +- src/Orchard.Web/Modules/Orchard.Scripting.Dlr/Web.config | 2 +- src/Orchard.Web/Modules/Orchard.Scripting/Web.config | 2 +- src/Orchard.Web/Modules/Orchard.Search/Web.config | 2 +- .../Modules/Orchard.SecureSocketsLayer/Web.config | 2 +- src/Orchard.Web/Modules/Orchard.Setup/Web.config | 2 +- src/Orchard.Web/Modules/Orchard.Tags/Orchard.Tags.csproj | 6 +++--- src/Orchard.Web/Modules/Orchard.Tags/Web.config | 2 +- src/Orchard.Web/Modules/Orchard.Tags/packages.config | 2 +- src/Orchard.Web/Modules/Orchard.TaskLease/Web.config | 2 +- src/Orchard.Web/Modules/Orchard.Taxonomies/Web.config | 2 +- src/Orchard.Web/Modules/Orchard.Templates/Web.config | 2 +- src/Orchard.Web/Modules/Orchard.Themes/Web.config | 2 +- src/Orchard.Web/Modules/Orchard.Tokens/Tests/app.config | 2 +- src/Orchard.Web/Modules/Orchard.Tokens/Web.config | 2 +- src/Orchard.Web/Modules/Orchard.Users/Web.config | 2 +- src/Orchard.Web/Modules/Orchard.Warmup/Web.config | 2 +- src/Orchard.Web/Modules/Orchard.Widgets/Web.config | 2 +- src/Orchard.Web/Modules/Orchard.Workflows/Web.config | 2 +- src/Orchard.Web/Modules/Orchard.jQuery/Web.config | 2 +- src/Orchard.Web/Modules/SysCache/SysCache.csproj | 4 ++-- src/Orchard.Web/Modules/SysCache/Web.config | 2 +- src/Orchard.Web/Modules/SysCache/packages.config | 2 +- src/Orchard.Web/Modules/TinyMce/Web.config | 2 +- src/Orchard.Web/Modules/Upgrade/Upgrade.csproj | 6 +++--- src/Orchard.Web/Modules/Upgrade/Web.config | 2 +- src/Orchard.Web/Modules/Upgrade/packages.config | 2 +- src/Orchard.Web/Themes/Web.config | 2 +- src/Orchard.Web/Web.config | 2 +- src/Orchard/Orchard.Framework.csproj | 4 ++-- src/Orchard/app.config | 2 +- src/Orchard/packages.config | 2 +- 117 files changed, 142 insertions(+), 142 deletions(-) diff --git a/src/Orchard.Core.Tests/App.config b/src/Orchard.Core.Tests/App.config index 1d39b06b2..9493cfeea 100644 --- a/src/Orchard.Core.Tests/App.config +++ b/src/Orchard.Core.Tests/App.config @@ -4,7 +4,7 @@ - + diff --git a/src/Orchard.Core.Tests/Orchard.Core.Tests.csproj b/src/Orchard.Core.Tests/Orchard.Core.Tests.csproj index 2d681498d..5975afdfc 100644 --- a/src/Orchard.Core.Tests/Orchard.Core.Tests.csproj +++ b/src/Orchard.Core.Tests/Orchard.Core.Tests.csproj @@ -74,8 +74,8 @@ ..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll - - ..\packages\NHibernate.4.0.1.4000\lib\net40\NHibernate.dll + + ..\packages\NHibernate.4.1.2.4000\lib\net40\NHibernate.dll ..\packages\NUnit.2.5.10.11092\lib\nunit.framework.dll diff --git a/src/Orchard.Core.Tests/packages.config b/src/Orchard.Core.Tests/packages.config index 281af0b9a..5dfae4e76 100644 --- a/src/Orchard.Core.Tests/packages.config +++ b/src/Orchard.Core.Tests/packages.config @@ -8,6 +8,6 @@ - + \ No newline at end of file diff --git a/src/Orchard.Specs/App.Config b/src/Orchard.Specs/App.Config index d03822e85..4e78cca42 100644 --- a/src/Orchard.Specs/App.Config +++ b/src/Orchard.Specs/App.Config @@ -12,7 +12,7 @@ - + diff --git a/src/Orchard.Specs/Orchard.Specs.csproj b/src/Orchard.Specs/Orchard.Specs.csproj index db93ea19a..787f44c65 100644 --- a/src/Orchard.Specs/Orchard.Specs.csproj +++ b/src/Orchard.Specs/Orchard.Specs.csproj @@ -83,8 +83,8 @@ ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - ..\packages\NHibernate.4.0.1.4000\lib\net40\NHibernate.dll + + ..\packages\NHibernate.4.1.2.4000\lib\net40\NHibernate.dll ..\packages\NUnit.2.5.10.11092\lib\nunit.framework.dll diff --git a/src/Orchard.Specs/packages.config b/src/Orchard.Specs/packages.config index 4e36423e3..840821420 100644 --- a/src/Orchard.Specs/packages.config +++ b/src/Orchard.Specs/packages.config @@ -10,7 +10,7 @@ - + diff --git a/src/Orchard.Tests.Modules/App.config b/src/Orchard.Tests.Modules/App.config index a9ecc2457..a5baeb2d4 100644 --- a/src/Orchard.Tests.Modules/App.config +++ b/src/Orchard.Tests.Modules/App.config @@ -20,7 +20,7 @@ - + diff --git a/src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj b/src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj index e2c999fb2..0c143f833 100644 --- a/src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj +++ b/src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj @@ -111,8 +111,8 @@ ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll - - ..\packages\NHibernate.4.0.1.4000\lib\net40\NHibernate.dll + + ..\packages\NHibernate.4.1.2.4000\lib\net40\NHibernate.dll ..\packages\Orchard.NuGet.Core.1.1.0.0\lib\NuGet.Core.dll diff --git a/src/Orchard.Tests.Modules/packages.config b/src/Orchard.Tests.Modules/packages.config index 5b87e0145..c66e5ff69 100644 --- a/src/Orchard.Tests.Modules/packages.config +++ b/src/Orchard.Tests.Modules/packages.config @@ -13,7 +13,7 @@ - + diff --git a/src/Orchard.Tests/App.config b/src/Orchard.Tests/App.config index a9ecc2457..a5baeb2d4 100644 --- a/src/Orchard.Tests/App.config +++ b/src/Orchard.Tests/App.config @@ -20,7 +20,7 @@ - + diff --git a/src/Orchard.Tests/Orchard.Framework.Tests.csproj b/src/Orchard.Tests/Orchard.Framework.Tests.csproj index 7d971ba4c..1449ee13c 100644 --- a/src/Orchard.Tests/Orchard.Framework.Tests.csproj +++ b/src/Orchard.Tests/Orchard.Framework.Tests.csproj @@ -108,8 +108,8 @@ ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll - - ..\packages\NHibernate.4.0.1.4000\lib\net40\NHibernate.dll + + ..\packages\NHibernate.4.1.2.4000\lib\net40\NHibernate.dll ..\packages\NUnit.2.5.10.11092\lib\nunit.framework.dll diff --git a/src/Orchard.Tests/packages.config b/src/Orchard.Tests/packages.config index f55f8de5b..56276c608 100644 --- a/src/Orchard.Tests/packages.config +++ b/src/Orchard.Tests/packages.config @@ -15,7 +15,7 @@ - + \ No newline at end of file diff --git a/src/Orchard.Web.Tests/app.config b/src/Orchard.Web.Tests/app.config index e158b8bdf..7688d926e 100644 --- a/src/Orchard.Web.Tests/app.config +++ b/src/Orchard.Web.Tests/app.config @@ -8,7 +8,7 @@ - + diff --git a/src/Orchard.Web/Core/Web.config b/src/Orchard.Web/Core/Web.config index 5a9ed8ac3..800649354 100644 --- a/src/Orchard.Web/Core/Web.config +++ b/src/Orchard.Web/Core/Web.config @@ -47,7 +47,7 @@ - + diff --git a/src/Orchard.Web/Modules/Lucene/Web.config b/src/Orchard.Web/Modules/Lucene/Web.config index 48faf432a..714b1ff87 100644 --- a/src/Orchard.Web/Modules/Lucene/Web.config +++ b/src/Orchard.Web/Modules/Lucene/Web.config @@ -46,7 +46,7 @@ - + diff --git a/src/Orchard.Web/Modules/Markdown/Web.config b/src/Orchard.Web/Modules/Markdown/Web.config index 6fcfa6d7c..3cd573478 100644 --- a/src/Orchard.Web/Modules/Markdown/Web.config +++ b/src/Orchard.Web/Modules/Markdown/Web.config @@ -47,7 +47,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Alias/Web.config b/src/Orchard.Web/Modules/Orchard.Alias/Web.config index 6fcfa6d7c..3cd573478 100644 --- a/src/Orchard.Web/Modules/Orchard.Alias/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Alias/Web.config @@ -47,7 +47,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.AntiSpam/Web.config b/src/Orchard.Web/Modules/Orchard.AntiSpam/Web.config index 6fcfa6d7c..3cd573478 100644 --- a/src/Orchard.Web/Modules/Orchard.AntiSpam/Web.config +++ b/src/Orchard.Web/Modules/Orchard.AntiSpam/Web.config @@ -47,7 +47,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Web.config b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Web.config index 6fcfa6d7c..3cd573478 100644 --- a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Web.config +++ b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Web.config @@ -47,7 +47,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.AuditTrail/Orchard.AuditTrail.csproj b/src/Orchard.Web/Modules/Orchard.AuditTrail/Orchard.AuditTrail.csproj index 0c8bb6ef3..8a5a77d4a 100644 --- a/src/Orchard.Web/Modules/Orchard.AuditTrail/Orchard.AuditTrail.csproj +++ b/src/Orchard.Web/Modules/Orchard.AuditTrail/Orchard.AuditTrail.csproj @@ -67,8 +67,8 @@ ..\..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll - - ..\..\..\packages\NHibernate.4.0.1.4000\lib\net40\NHibernate.dll + + ..\..\..\packages\NHibernate.4.1.2.4000\lib\net40\NHibernate.dll @@ -407,4 +407,4 @@ - + \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.AuditTrail/Web.config b/src/Orchard.Web/Modules/Orchard.AuditTrail/Web.config index ad39ef6bc..d27f3e6d4 100644 --- a/src/Orchard.Web/Modules/Orchard.AuditTrail/Web.config +++ b/src/Orchard.Web/Modules/Orchard.AuditTrail/Web.config @@ -48,7 +48,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.AuditTrail/packages.config b/src/Orchard.Web/Modules/Orchard.AuditTrail/packages.config index b422b9627..09d7889ca 100644 --- a/src/Orchard.Web/Modules/Orchard.AuditTrail/packages.config +++ b/src/Orchard.Web/Modules/Orchard.AuditTrail/packages.config @@ -7,6 +7,6 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Autoroute/Web.config b/src/Orchard.Web/Modules/Orchard.Autoroute/Web.config index ac22cfb93..d15f3618b 100644 --- a/src/Orchard.Web/Modules/Orchard.Autoroute/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Autoroute/Web.config @@ -46,7 +46,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Orchard.Azure.MediaServices.csproj b/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Orchard.Azure.MediaServices.csproj index 4118ffd78..2982601dd 100644 --- a/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Orchard.Azure.MediaServices.csproj +++ b/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Orchard.Azure.MediaServices.csproj @@ -115,8 +115,8 @@ ..\..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll - - ..\..\..\packages\NHibernate.4.0.1.4000\lib\net40\NHibernate.dll + + ..\..\..\packages\NHibernate.4.1.2.4000\lib\net40\NHibernate.dll diff --git a/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Web.config b/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Web.config index bca388fa2..479b701eb 100644 --- a/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Web.config @@ -68,7 +68,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/packages.config b/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/packages.config index 736fe1e14..37fac939c 100644 --- a/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/packages.config @@ -17,7 +17,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Azure/Orchard.Azure.csproj b/src/Orchard.Web/Modules/Orchard.Azure/Orchard.Azure.csproj index 59e62ff28..e50ce9762 100644 --- a/src/Orchard.Web/Modules/Orchard.Azure/Orchard.Azure.csproj +++ b/src/Orchard.Web/Modules/Orchard.Azure/Orchard.Azure.csproj @@ -105,8 +105,8 @@ ..\..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll - - ..\..\..\packages\NHibernate.4.0.1.4000\lib\net40\NHibernate.dll + + ..\..\..\packages\NHibernate.4.1.2.4000\lib\net40\NHibernate.dll diff --git a/src/Orchard.Web/Modules/Orchard.Azure/Web.config b/src/Orchard.Web/Modules/Orchard.Azure/Web.config index c0f4668d8..6a4fb0f7e 100644 --- a/src/Orchard.Web/Modules/Orchard.Azure/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Azure/Web.config @@ -71,7 +71,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Azure/packages.config b/src/Orchard.Web/Modules/Orchard.Azure/packages.config index 5ce36dd18..1caf16749 100644 --- a/src/Orchard.Web/Modules/Orchard.Azure/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Azure/packages.config @@ -13,7 +13,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Web.config b/src/Orchard.Web/Modules/Orchard.Blogs/Web.config index 6fcfa6d7c..3cd573478 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Web.config @@ -47,7 +47,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Caching/Web.config b/src/Orchard.Web/Modules/Orchard.Caching/Web.config index 6e0ecb2fe..9b5d042d1 100644 --- a/src/Orchard.Web/Modules/Orchard.Caching/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Caching/Web.config @@ -41,7 +41,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleRootWebConfig.txt b/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleRootWebConfig.txt index 5a21d7120..8ac009d41 100644 --- a/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleRootWebConfig.txt +++ b/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleRootWebConfig.txt @@ -52,7 +52,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.CodeGeneration/Web.config b/src/Orchard.Web/Modules/Orchard.CodeGeneration/Web.config index 6e0ecb2fe..9b5d042d1 100644 --- a/src/Orchard.Web/Modules/Orchard.CodeGeneration/Web.config +++ b/src/Orchard.Web/Modules/Orchard.CodeGeneration/Web.config @@ -41,7 +41,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Web.config b/src/Orchard.Web/Modules/Orchard.Comments/Web.config index d75bcace6..064f21f91 100644 --- a/src/Orchard.Web/Modules/Orchard.Comments/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Comments/Web.config @@ -47,7 +47,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Conditions/Web.config b/src/Orchard.Web/Modules/Orchard.Conditions/Web.config index 5d7d6521c..326a39614 100644 --- a/src/Orchard.Web/Modules/Orchard.Conditions/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Conditions/Web.config @@ -44,7 +44,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.ContentPermissions/Web.config b/src/Orchard.Web/Modules/Orchard.ContentPermissions/Web.config index 6fcfa6d7c..3cd573478 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentPermissions/Web.config +++ b/src/Orchard.Web/Modules/Orchard.ContentPermissions/Web.config @@ -47,7 +47,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.ContentPicker/Orchard.ContentPicker.csproj b/src/Orchard.Web/Modules/Orchard.ContentPicker/Orchard.ContentPicker.csproj index 8942e5f60..f9c5f9899 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentPicker/Orchard.ContentPicker.csproj +++ b/src/Orchard.Web/Modules/Orchard.ContentPicker/Orchard.ContentPicker.csproj @@ -65,8 +65,8 @@ ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - ..\..\..\packages\NHibernate.4.0.1.4000\lib\net40\NHibernate.dll + + ..\..\..\packages\NHibernate.4.1.2.4000\lib\net40\NHibernate.dll @@ -257,4 +257,4 @@ - + \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.ContentPicker/Web.config b/src/Orchard.Web/Modules/Orchard.ContentPicker/Web.config index 6fcfa6d7c..3cd573478 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentPicker/Web.config +++ b/src/Orchard.Web/Modules/Orchard.ContentPicker/Web.config @@ -47,7 +47,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.ContentPicker/packages.config b/src/Orchard.Web/Modules/Orchard.ContentPicker/packages.config index 128126181..178fa800f 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentPicker/packages.config +++ b/src/Orchard.Web/Modules/Orchard.ContentPicker/packages.config @@ -6,5 +6,5 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Web.config b/src/Orchard.Web/Modules/Orchard.ContentTypes/Web.config index 6fcfa6d7c..3cd573478 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Web.config +++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Web.config @@ -47,7 +47,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.CustomForms/Web.config b/src/Orchard.Web/Modules/Orchard.CustomForms/Web.config index 6fcfa6d7c..3cd573478 100644 --- a/src/Orchard.Web/Modules/Orchard.CustomForms/Web.config +++ b/src/Orchard.Web/Modules/Orchard.CustomForms/Web.config @@ -47,7 +47,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Dashboards/Web.config b/src/Orchard.Web/Modules/Orchard.Dashboards/Web.config index a8acf499b..6d767e071 100644 --- a/src/Orchard.Web/Modules/Orchard.Dashboards/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Dashboards/Web.config @@ -48,7 +48,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.DesignerTools/Web.config b/src/Orchard.Web/Modules/Orchard.DesignerTools/Web.config index 801d56c21..8e7f62a2a 100644 --- a/src/Orchard.Web/Modules/Orchard.DesignerTools/Web.config +++ b/src/Orchard.Web/Modules/Orchard.DesignerTools/Web.config @@ -48,7 +48,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Web.config b/src/Orchard.Web/Modules/Orchard.DynamicForms/Web.config index b9b06741d..053a0e5fb 100644 --- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Web.config +++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Web.config @@ -50,7 +50,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Email/Web.config b/src/Orchard.Web/Modules/Orchard.Email/Web.config index 6fcfa6d7c..3cd573478 100644 --- a/src/Orchard.Web/Modules/Orchard.Email/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Email/Web.config @@ -47,7 +47,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Fields/Web.config b/src/Orchard.Web/Modules/Orchard.Fields/Web.config index c0496530c..9d6f4ce5a 100644 --- a/src/Orchard.Web/Modules/Orchard.Fields/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Fields/Web.config @@ -47,7 +47,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Forms/Web.config b/src/Orchard.Web/Modules/Orchard.Forms/Web.config index aef4172fa..68cba4a35 100644 --- a/src/Orchard.Web/Modules/Orchard.Forms/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Forms/Web.config @@ -43,7 +43,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.ImageEditor/Web.config b/src/Orchard.Web/Modules/Orchard.ImageEditor/Web.config index 90bd98bfc..038e10560 100644 --- a/src/Orchard.Web/Modules/Orchard.ImageEditor/Web.config +++ b/src/Orchard.Web/Modules/Orchard.ImageEditor/Web.config @@ -48,7 +48,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.ImportExport/Orchard.ImportExport.csproj b/src/Orchard.Web/Modules/Orchard.ImportExport/Orchard.ImportExport.csproj index fc2546940..245fefdb7 100644 --- a/src/Orchard.Web/Modules/Orchard.ImportExport/Orchard.ImportExport.csproj +++ b/src/Orchard.Web/Modules/Orchard.ImportExport/Orchard.ImportExport.csproj @@ -67,8 +67,8 @@ ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - ..\..\..\packages\NHibernate.4.0.1.4000\lib\net40\NHibernate.dll + + ..\..\..\packages\NHibernate.4.1.2.4000\lib\net40\NHibernate.dll @@ -231,4 +231,4 @@ - + \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.ImportExport/Web.config b/src/Orchard.Web/Modules/Orchard.ImportExport/Web.config index 6fcfa6d7c..3cd573478 100644 --- a/src/Orchard.Web/Modules/Orchard.ImportExport/Web.config +++ b/src/Orchard.Web/Modules/Orchard.ImportExport/Web.config @@ -47,7 +47,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.ImportExport/packages.config b/src/Orchard.Web/Modules/Orchard.ImportExport/packages.config index cb7b9c751..16effe48d 100644 --- a/src/Orchard.Web/Modules/Orchard.ImportExport/packages.config +++ b/src/Orchard.Web/Modules/Orchard.ImportExport/packages.config @@ -7,5 +7,5 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Indexing/Web.config b/src/Orchard.Web/Modules/Orchard.Indexing/Web.config index 6fcfa6d7c..3cd573478 100644 --- a/src/Orchard.Web/Modules/Orchard.Indexing/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Indexing/Web.config @@ -47,7 +47,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.JobsQueue/Web.config b/src/Orchard.Web/Modules/Orchard.JobsQueue/Web.config index 6fcfa6d7c..3cd573478 100644 --- a/src/Orchard.Web/Modules/Orchard.JobsQueue/Web.config +++ b/src/Orchard.Web/Modules/Orchard.JobsQueue/Web.config @@ -47,7 +47,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/Web.config b/src/Orchard.Web/Modules/Orchard.Layouts/Web.config index 4e28755b0..aa29b29dc 100644 --- a/src/Orchard.Web/Modules/Orchard.Layouts/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Layouts/Web.config @@ -52,7 +52,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Lists/Web.config b/src/Orchard.Web/Modules/Orchard.Lists/Web.config index 6fcfa6d7c..3cd573478 100644 --- a/src/Orchard.Web/Modules/Orchard.Lists/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Lists/Web.config @@ -47,7 +47,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Localization/Web.config b/src/Orchard.Web/Modules/Orchard.Localization/Web.config index 6fcfa6d7c..3cd573478 100644 --- a/src/Orchard.Web/Modules/Orchard.Localization/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Localization/Web.config @@ -47,7 +47,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Media/Web.config b/src/Orchard.Web/Modules/Orchard.Media/Web.config index 6fcfa6d7c..3cd573478 100644 --- a/src/Orchard.Web/Modules/Orchard.Media/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Media/Web.config @@ -47,7 +47,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Web.config b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Web.config index 801d56c21..8e7f62a2a 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Web.config +++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Web.config @@ -48,7 +48,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.MediaPicker/Web.config b/src/Orchard.Web/Modules/Orchard.MediaPicker/Web.config index 6fcfa6d7c..3cd573478 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaPicker/Web.config +++ b/src/Orchard.Web/Modules/Orchard.MediaPicker/Web.config @@ -47,7 +47,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.MediaProcessing/Web.config b/src/Orchard.Web/Modules/Orchard.MediaProcessing/Web.config index 6fcfa6d7c..3cd573478 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaProcessing/Web.config +++ b/src/Orchard.Web/Modules/Orchard.MediaProcessing/Web.config @@ -47,7 +47,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.MessageBus/Orchard.MessageBus.csproj b/src/Orchard.Web/Modules/Orchard.MessageBus/Orchard.MessageBus.csproj index 09ba9a65c..1c1638884 100644 --- a/src/Orchard.Web/Modules/Orchard.MessageBus/Orchard.MessageBus.csproj +++ b/src/Orchard.Web/Modules/Orchard.MessageBus/Orchard.MessageBus.csproj @@ -58,8 +58,8 @@ ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - ..\..\..\packages\NHibernate.4.0.1.4000\lib\net40\NHibernate.dll + + ..\..\..\packages\NHibernate.4.1.2.4000\lib\net40\NHibernate.dll diff --git a/src/Orchard.Web/Modules/Orchard.MessageBus/Web.config b/src/Orchard.Web/Modules/Orchard.MessageBus/Web.config index 6e0ecb2fe..9b5d042d1 100644 --- a/src/Orchard.Web/Modules/Orchard.MessageBus/Web.config +++ b/src/Orchard.Web/Modules/Orchard.MessageBus/Web.config @@ -41,7 +41,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.MessageBus/packages.config b/src/Orchard.Web/Modules/Orchard.MessageBus/packages.config index 825ae1bbd..5d8a49534 100644 --- a/src/Orchard.Web/Modules/Orchard.MessageBus/packages.config +++ b/src/Orchard.Web/Modules/Orchard.MessageBus/packages.config @@ -5,5 +5,5 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Migrations/Web.config b/src/Orchard.Web/Modules/Orchard.Migrations/Web.config index 6e0ecb2fe..9b5d042d1 100644 --- a/src/Orchard.Web/Modules/Orchard.Migrations/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Migrations/Web.config @@ -41,7 +41,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Web.config b/src/Orchard.Web/Modules/Orchard.Modules/Web.config index 48faf432a..714b1ff87 100644 --- a/src/Orchard.Web/Modules/Orchard.Modules/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Modules/Web.config @@ -46,7 +46,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Orchard.MultiTenancy.csproj b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Orchard.MultiTenancy.csproj index 180cd8f72..d2d17ae6d 100644 --- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Orchard.MultiTenancy.csproj +++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Orchard.MultiTenancy.csproj @@ -67,8 +67,8 @@ ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - ..\..\..\packages\NHibernate.4.0.1.4000\lib\net40\NHibernate.dll + + ..\..\..\packages\NHibernate.4.1.2.4000\lib\net40\NHibernate.dll @@ -205,4 +205,4 @@ - + \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Web.config b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Web.config index 48faf432a..714b1ff87 100644 --- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Web.config +++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Web.config @@ -46,7 +46,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/packages.config b/src/Orchard.Web/Modules/Orchard.MultiTenancy/packages.config index cb7b9c751..16effe48d 100644 --- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/packages.config +++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/packages.config @@ -7,5 +7,5 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.OutputCache/Web.config b/src/Orchard.Web/Modules/Orchard.OutputCache/Web.config index 45547aa50..7e0f5ba8c 100644 --- a/src/Orchard.Web/Modules/Orchard.OutputCache/Web.config +++ b/src/Orchard.Web/Modules/Orchard.OutputCache/Web.config @@ -47,7 +47,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Web.config b/src/Orchard.Web/Modules/Orchard.Packaging/Web.config index d412d124f..dbc112dce 100644 --- a/src/Orchard.Web/Modules/Orchard.Packaging/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Packaging/Web.config @@ -47,7 +47,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Pages/Web.config b/src/Orchard.Web/Modules/Orchard.Pages/Web.config index 5a06ff94b..55653b53f 100644 --- a/src/Orchard.Web/Modules/Orchard.Pages/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Pages/Web.config @@ -43,7 +43,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Projections/Orchard.Projections.csproj b/src/Orchard.Web/Modules/Orchard.Projections/Orchard.Projections.csproj index 82af5fa65..51ab51f0d 100644 --- a/src/Orchard.Web/Modules/Orchard.Projections/Orchard.Projections.csproj +++ b/src/Orchard.Web/Modules/Orchard.Projections/Orchard.Projections.csproj @@ -65,8 +65,8 @@ ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - ..\..\..\packages\NHibernate.4.0.1.4000\lib\net40\NHibernate.dll + + ..\..\..\packages\NHibernate.4.1.2.4000\lib\net40\NHibernate.dll @@ -382,4 +382,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 85b440be2..a1817948d 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 @@ -49,8 +49,8 @@ ..\..\..\..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll - - ..\..\..\..\packages\NHibernate.4.0.1.4000\lib\net40\NHibernate.dll + + ..\..\..\..\packages\NHibernate.4.1.2.4000\lib\net40\NHibernate.dll ..\..\..\..\packages\NUnit.2.5.10.11092\lib\nunit.framework.dll diff --git a/src/Orchard.Web/Modules/Orchard.Projections/Tests/app.config b/src/Orchard.Web/Modules/Orchard.Projections/Tests/app.config index 1d39b06b2..9493cfeea 100644 --- a/src/Orchard.Web/Modules/Orchard.Projections/Tests/app.config +++ b/src/Orchard.Web/Modules/Orchard.Projections/Tests/app.config @@ -4,7 +4,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Projections/Tests/packages.config b/src/Orchard.Web/Modules/Orchard.Projections/Tests/packages.config index 71bda6817..1646f9355 100644 --- a/src/Orchard.Web/Modules/Orchard.Projections/Tests/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Projections/Tests/packages.config @@ -4,6 +4,6 @@ - + \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Projections/Web.config b/src/Orchard.Web/Modules/Orchard.Projections/Web.config index 6fcfa6d7c..3cd573478 100644 --- a/src/Orchard.Web/Modules/Orchard.Projections/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Projections/Web.config @@ -47,7 +47,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Projections/packages.config b/src/Orchard.Web/Modules/Orchard.Projections/packages.config index 128126181..178fa800f 100644 --- a/src/Orchard.Web/Modules/Orchard.Projections/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Projections/packages.config @@ -6,5 +6,5 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.PublishLater/Web.config b/src/Orchard.Web/Modules/Orchard.PublishLater/Web.config index 6fcfa6d7c..3cd573478 100644 --- a/src/Orchard.Web/Modules/Orchard.PublishLater/Web.config +++ b/src/Orchard.Web/Modules/Orchard.PublishLater/Web.config @@ -47,7 +47,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Recipes/Web.config b/src/Orchard.Web/Modules/Orchard.Recipes/Web.config index f6418c6d9..ffaf46a2b 100644 --- a/src/Orchard.Web/Modules/Orchard.Recipes/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Recipes/Web.config @@ -45,7 +45,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Redis/Orchard.Redis.csproj b/src/Orchard.Web/Modules/Orchard.Redis/Orchard.Redis.csproj index 7e687ea62..759fa3446 100644 --- a/src/Orchard.Web/Modules/Orchard.Redis/Orchard.Redis.csproj +++ b/src/Orchard.Web/Modules/Orchard.Redis/Orchard.Redis.csproj @@ -58,8 +58,8 @@ ..\..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll - - ..\..\..\packages\NHibernate.4.0.1.4000\lib\net40\NHibernate.dll + + ..\..\..\packages\NHibernate.4.1.2.4000\lib\net40\NHibernate.dll ..\..\..\packages\StackExchange.Redis.1.0.481\lib\net45\StackExchange.Redis.dll diff --git a/src/Orchard.Web/Modules/Orchard.Redis/Web.config b/src/Orchard.Web/Modules/Orchard.Redis/Web.config index 25b223611..050c8f125 100644 --- a/src/Orchard.Web/Modules/Orchard.Redis/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Redis/Web.config @@ -41,7 +41,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Redis/packages.config b/src/Orchard.Web/Modules/Orchard.Redis/packages.config index 29f4bb8d8..9e7bf972f 100644 --- a/src/Orchard.Web/Modules/Orchard.Redis/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Redis/packages.config @@ -2,6 +2,6 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Resources/Web.config b/src/Orchard.Web/Modules/Orchard.Resources/Web.config index 558a1d26f..17d5c0db7 100644 --- a/src/Orchard.Web/Modules/Orchard.Resources/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Resources/Web.config @@ -48,7 +48,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Web.config b/src/Orchard.Web/Modules/Orchard.Roles/Web.config index 6fcfa6d7c..3cd573478 100644 --- a/src/Orchard.Web/Modules/Orchard.Roles/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Roles/Web.config @@ -47,7 +47,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Rules/Web.config b/src/Orchard.Web/Modules/Orchard.Rules/Web.config index bd7bcb759..16465b7a4 100644 --- a/src/Orchard.Web/Modules/Orchard.Rules/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Rules/Web.config @@ -50,7 +50,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Web.config b/src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Web.config index 6fcfa6d7c..3cd573478 100644 --- a/src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Web.config @@ -47,7 +47,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Scripting.Dlr/Web.config b/src/Orchard.Web/Modules/Orchard.Scripting.Dlr/Web.config index 25b223611..050c8f125 100644 --- a/src/Orchard.Web/Modules/Orchard.Scripting.Dlr/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Scripting.Dlr/Web.config @@ -41,7 +41,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Scripting/Web.config b/src/Orchard.Web/Modules/Orchard.Scripting/Web.config index 25b223611..050c8f125 100644 --- a/src/Orchard.Web/Modules/Orchard.Scripting/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Scripting/Web.config @@ -41,7 +41,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Search/Web.config b/src/Orchard.Web/Modules/Orchard.Search/Web.config index 6fcfa6d7c..3cd573478 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Search/Web.config @@ -47,7 +47,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Web.config b/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Web.config index 6fcfa6d7c..3cd573478 100644 --- a/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Web.config +++ b/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Web.config @@ -47,7 +47,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Web.config b/src/Orchard.Web/Modules/Orchard.Setup/Web.config index 6fcfa6d7c..3cd573478 100644 --- a/src/Orchard.Web/Modules/Orchard.Setup/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Setup/Web.config @@ -47,7 +47,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Orchard.Tags.csproj b/src/Orchard.Web/Modules/Orchard.Tags/Orchard.Tags.csproj index 3b7520287..af5f2ab45 100644 --- a/src/Orchard.Web/Modules/Orchard.Tags/Orchard.Tags.csproj +++ b/src/Orchard.Web/Modules/Orchard.Tags/Orchard.Tags.csproj @@ -65,8 +65,8 @@ ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - ..\..\..\packages\NHibernate.4.0.1.4000\lib\net40\NHibernate.dll + + ..\..\..\packages\NHibernate.4.1.2.4000\lib\net40\NHibernate.dll @@ -246,4 +246,4 @@ - + \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Web.config b/src/Orchard.Web/Modules/Orchard.Tags/Web.config index 6fcfa6d7c..3cd573478 100644 --- a/src/Orchard.Web/Modules/Orchard.Tags/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Tags/Web.config @@ -47,7 +47,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Tags/packages.config b/src/Orchard.Web/Modules/Orchard.Tags/packages.config index 128126181..178fa800f 100644 --- a/src/Orchard.Web/Modules/Orchard.Tags/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Tags/packages.config @@ -6,5 +6,5 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.TaskLease/Web.config b/src/Orchard.Web/Modules/Orchard.TaskLease/Web.config index 25b223611..050c8f125 100644 --- a/src/Orchard.Web/Modules/Orchard.TaskLease/Web.config +++ b/src/Orchard.Web/Modules/Orchard.TaskLease/Web.config @@ -41,7 +41,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Taxonomies/Web.config b/src/Orchard.Web/Modules/Orchard.Taxonomies/Web.config index cfd8fc518..4b7f36504 100644 --- a/src/Orchard.Web/Modules/Orchard.Taxonomies/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Taxonomies/Web.config @@ -50,7 +50,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Templates/Web.config b/src/Orchard.Web/Modules/Orchard.Templates/Web.config index 6fcfa6d7c..3cd573478 100644 --- a/src/Orchard.Web/Modules/Orchard.Templates/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Templates/Web.config @@ -47,7 +47,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Web.config b/src/Orchard.Web/Modules/Orchard.Themes/Web.config index 6fcfa6d7c..3cd573478 100644 --- a/src/Orchard.Web/Modules/Orchard.Themes/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Themes/Web.config @@ -47,7 +47,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Tokens/Tests/app.config b/src/Orchard.Web/Modules/Orchard.Tokens/Tests/app.config index d8c287814..cda2fe9df 100644 --- a/src/Orchard.Web/Modules/Orchard.Tokens/Tests/app.config +++ b/src/Orchard.Web/Modules/Orchard.Tokens/Tests/app.config @@ -8,7 +8,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Tokens/Web.config b/src/Orchard.Web/Modules/Orchard.Tokens/Web.config index 6fcfa6d7c..3cd573478 100644 --- a/src/Orchard.Web/Modules/Orchard.Tokens/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Tokens/Web.config @@ -47,7 +47,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Users/Web.config b/src/Orchard.Web/Modules/Orchard.Users/Web.config index 6fcfa6d7c..3cd573478 100644 --- a/src/Orchard.Web/Modules/Orchard.Users/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Users/Web.config @@ -47,7 +47,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Warmup/Web.config b/src/Orchard.Web/Modules/Orchard.Warmup/Web.config index 6fcfa6d7c..3cd573478 100644 --- a/src/Orchard.Web/Modules/Orchard.Warmup/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Warmup/Web.config @@ -47,7 +47,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Web.config b/src/Orchard.Web/Modules/Orchard.Widgets/Web.config index 6fcfa6d7c..3cd573478 100644 --- a/src/Orchard.Web/Modules/Orchard.Widgets/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Widgets/Web.config @@ -47,7 +47,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Workflows/Web.config b/src/Orchard.Web/Modules/Orchard.Workflows/Web.config index 6fcfa6d7c..3cd573478 100644 --- a/src/Orchard.Web/Modules/Orchard.Workflows/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Workflows/Web.config @@ -47,7 +47,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.jQuery/Web.config b/src/Orchard.Web/Modules/Orchard.jQuery/Web.config index 6fcfa6d7c..3cd573478 100644 --- a/src/Orchard.Web/Modules/Orchard.jQuery/Web.config +++ b/src/Orchard.Web/Modules/Orchard.jQuery/Web.config @@ -47,7 +47,7 @@ - + diff --git a/src/Orchard.Web/Modules/SysCache/SysCache.csproj b/src/Orchard.Web/Modules/SysCache/SysCache.csproj index 77911bf09..7487a2d49 100644 --- a/src/Orchard.Web/Modules/SysCache/SysCache.csproj +++ b/src/Orchard.Web/Modules/SysCache/SysCache.csproj @@ -56,8 +56,8 @@ ..\..\..\packages\Iesi.Collections.4.0.1.4000\lib\net40\Iesi.Collections.dll - - ..\..\..\packages\NHibernate.4.0.1.4000\lib\net40\NHibernate.dll + + ..\..\..\packages\NHibernate.4.1.2.4000\lib\net40\NHibernate.dll ..\..\..\packages\NHibernate.Caches.SysCache2.4.0.0.4000\lib\net40\NHibernate.Caches.SysCache2.dll diff --git a/src/Orchard.Web/Modules/SysCache/Web.config b/src/Orchard.Web/Modules/SysCache/Web.config index 25b223611..050c8f125 100644 --- a/src/Orchard.Web/Modules/SysCache/Web.config +++ b/src/Orchard.Web/Modules/SysCache/Web.config @@ -41,7 +41,7 @@ - + diff --git a/src/Orchard.Web/Modules/SysCache/packages.config b/src/Orchard.Web/Modules/SysCache/packages.config index 9395dcd30..dbf931380 100644 --- a/src/Orchard.Web/Modules/SysCache/packages.config +++ b/src/Orchard.Web/Modules/SysCache/packages.config @@ -1,6 +1,6 @@  - + diff --git a/src/Orchard.Web/Modules/TinyMce/Web.config b/src/Orchard.Web/Modules/TinyMce/Web.config index 48faf432a..714b1ff87 100644 --- a/src/Orchard.Web/Modules/TinyMce/Web.config +++ b/src/Orchard.Web/Modules/TinyMce/Web.config @@ -46,7 +46,7 @@ - + diff --git a/src/Orchard.Web/Modules/Upgrade/Upgrade.csproj b/src/Orchard.Web/Modules/Upgrade/Upgrade.csproj index ca679a883..0b128ac4e 100644 --- a/src/Orchard.Web/Modules/Upgrade/Upgrade.csproj +++ b/src/Orchard.Web/Modules/Upgrade/Upgrade.csproj @@ -67,8 +67,8 @@ ..\..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll - - ..\..\..\packages\NHibernate.4.0.1.4000\lib\net40\NHibernate.dll + + ..\..\..\packages\NHibernate.4.1.2.4000\lib\net40\NHibernate.dll @@ -235,4 +235,4 @@ - + \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Upgrade/Web.config b/src/Orchard.Web/Modules/Upgrade/Web.config index 72eaf39de..0e487e9d9 100644 --- a/src/Orchard.Web/Modules/Upgrade/Web.config +++ b/src/Orchard.Web/Modules/Upgrade/Web.config @@ -53,7 +53,7 @@ - + diff --git a/src/Orchard.Web/Modules/Upgrade/packages.config b/src/Orchard.Web/Modules/Upgrade/packages.config index 818f27466..3910fe4b5 100644 --- a/src/Orchard.Web/Modules/Upgrade/packages.config +++ b/src/Orchard.Web/Modules/Upgrade/packages.config @@ -9,5 +9,5 @@ - + diff --git a/src/Orchard.Web/Themes/Web.config b/src/Orchard.Web/Themes/Web.config index 78606b1b2..a9ab08f59 100644 --- a/src/Orchard.Web/Themes/Web.config +++ b/src/Orchard.Web/Themes/Web.config @@ -70,7 +70,7 @@ - + diff --git a/src/Orchard.Web/Web.config b/src/Orchard.Web/Web.config index f9e28bee3..6fe7614ce 100644 --- a/src/Orchard.Web/Web.config +++ b/src/Orchard.Web/Web.config @@ -151,7 +151,7 @@ - + diff --git a/src/Orchard/Orchard.Framework.csproj b/src/Orchard/Orchard.Framework.csproj index 8fad07896..6ae73dc2d 100644 --- a/src/Orchard/Orchard.Framework.csproj +++ b/src/Orchard/Orchard.Framework.csproj @@ -89,8 +89,8 @@ ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll - - ..\packages\NHibernate.4.0.1.4000\lib\net40\NHibernate.dll + + ..\packages\NHibernate.4.1.2.4000\lib\net40\NHibernate.dll False diff --git a/src/Orchard/app.config b/src/Orchard/app.config index 13f534a72..88432b48a 100644 --- a/src/Orchard/app.config +++ b/src/Orchard/app.config @@ -12,7 +12,7 @@ - + diff --git a/src/Orchard/packages.config b/src/Orchard/packages.config index 65a8bf398..70633e18b 100644 --- a/src/Orchard/packages.config +++ b/src/Orchard/packages.config @@ -15,6 +15,6 @@ - + From 074a0b140d3fd054ea606f760c37aa9ff2192a53 Mon Sep 17 00:00:00 2001 From: Matteo Piovanelli Date: Fri, 30 Jul 2021 08:42:13 +0200 Subject: [PATCH 041/112] Fixes disposed LifetimeScope issue (#8490) * fixed scope in in recomputing the context to figure out whether an antiforgery token needs replacing --- .../Orchard.OutputCache/Filters/OutputCacheFilter.cs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.OutputCache/Filters/OutputCacheFilter.cs b/src/Orchard.Web/Modules/Orchard.OutputCache/Filters/OutputCacheFilter.cs index 0fadac8d5..156179484 100644 --- a/src/Orchard.Web/Modules/Orchard.OutputCache/Filters/OutputCacheFilter.cs +++ b/src/Orchard.Web/Modules/Orchard.OutputCache/Filters/OutputCacheFilter.cs @@ -236,10 +236,11 @@ namespace Orchard.OutputCache.Filters { Logger.Debug("Response for item '{0}' will not be cached because status code was set to {1} during rendering.", _cacheKey, response.StatusCode); return; } - - var cachedOutput = ReplaceRequestVerificationTokenWithBeaconTag(output, response.ContentEncoding); - using (var scope = _workContextAccessor.CreateWorkContextScope()) { + // ask for the WorkContext again so it refreshes in case the scope has been disposed + _workContext = _workContextAccessor.GetContext(filterContext.HttpContext); + var cachedOutput = ReplaceRequestVerificationTokenWithBeaconTag(output, response.ContentEncoding); + var cacheItem = new CacheItem() { CachedOnUtc = _now, Duration = cacheDuration, @@ -648,7 +649,9 @@ namespace Orchard.OutputCache.Filters { } private bool PreventCachingRequestVerificationToken() { - return _cacheSettings.CacheAuthenticatedRequests && (!_cacheSettings.VaryByAuthenticationState || _workContext.CurrentUser != null); + return _cacheSettings.CacheAuthenticatedRequests + && (!_cacheSettings.VaryByAuthenticationState + || _workContext.CurrentUser != null); } protected virtual bool IsIgnoredUrl(string url) { From d2e535fbc8cad825ece0388a7ccfbfb08437bc8a Mon Sep 17 00:00:00 2001 From: Matteo Piovanelli Date: Thu, 5 Aug 2021 17:52:13 +0200 Subject: [PATCH 042/112] Revert "Cloning doesn't overwrite identity (#8487)" (#8495) This reverts commit af42947c9cfc8ef95a39e7ff672ae8fc0ecf629c. --- src/Orchard.Web/Core/Common/Handlers/IdentityPartHandler.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Orchard.Web/Core/Common/Handlers/IdentityPartHandler.cs b/src/Orchard.Web/Core/Common/Handlers/IdentityPartHandler.cs index 216e93197..66356eefa 100644 --- a/src/Orchard.Web/Core/Common/Handlers/IdentityPartHandler.cs +++ b/src/Orchard.Web/Core/Common/Handlers/IdentityPartHandler.cs @@ -10,7 +10,7 @@ namespace Orchard.Core.Common.Handlers { IContentManager contentManager) { Filters.Add(StorageFilter.For(identityRepository)); OnInitializing((ctx, part) => AssignIdentity(part)); - OnCloning((ctx, part) => AssignIdentity(ctx.CloneContentItem.As())); + OnCloning((ctx, part) => AssignIdentity(part)); OnIndexing((context, part) => { context.DocumentIndex.Add("identifier", part.Identifier).Store(); @@ -32,4 +32,4 @@ namespace Orchard.Core.Common.Handlers { } } } -} +} \ No newline at end of file From 08597931e64d8810dce078428350e58c27f476fd Mon Sep 17 00:00:00 2001 From: Matteo Piovanelli Date: Fri, 3 Sep 2021 08:58:01 +0200 Subject: [PATCH 043/112] Remove whitespace when importing list of permissions (#8499) Similarly to what's already being done when we import features. this allows to go to a new line in the xml that we import, and even tabulate for readability and maintenance. --- .../Modules/Orchard.Roles/Recipes/Executors/RolesStep.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Recipes/Executors/RolesStep.cs b/src/Orchard.Web/Modules/Orchard.Roles/Recipes/Executors/RolesStep.cs index 6c2a00adb..5a305a8ee 100644 --- a/src/Orchard.Web/Modules/Orchard.Roles/Recipes/Executors/RolesStep.cs +++ b/src/Orchard.Web/Modules/Orchard.Roles/Recipes/Executors/RolesStep.cs @@ -35,7 +35,7 @@ namespace Orchard.Roles.Recipes.Executors { role = _roleService.GetRoleByName(roleName); } - var permissions = roleElement.Attribute("Permissions").Value.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries); + var permissions = roleElement.Attribute("Permissions").Value.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries).Select(value => value.Trim()); // Only import permissions for currenlty installed modules. var permissionsValid = permissions.Where(permission => installedPermissions.Any(x => x.Name == permission)).ToList(); @@ -49,4 +49,4 @@ namespace Orchard.Roles.Recipes.Executors { } } } -} \ No newline at end of file +} From b00678abf4c00970195fd421c7aa513304308938 Mon Sep 17 00:00:00 2001 From: Matteo Piovanelli Date: Fri, 3 Sep 2021 09:01:01 +0200 Subject: [PATCH 044/112] Force enumeration of list of permissions. Without this, imported permissions (#8492) would always replace existing ones: i.e. if an existing permission is not in the list being imported it would be removed for the role. --- .../Modules/Orchard.Roles/Recipes/Executors/RolesStep.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Recipes/Executors/RolesStep.cs b/src/Orchard.Web/Modules/Orchard.Roles/Recipes/Executors/RolesStep.cs index 5a305a8ee..42ac238b5 100644 --- a/src/Orchard.Web/Modules/Orchard.Roles/Recipes/Executors/RolesStep.cs +++ b/src/Orchard.Web/Modules/Orchard.Roles/Recipes/Executors/RolesStep.cs @@ -40,7 +40,7 @@ namespace Orchard.Roles.Recipes.Executors { var permissionsValid = permissions.Where(permission => installedPermissions.Any(x => x.Name == permission)).ToList(); // Union to keep existing permissions. - _roleService.UpdateRole(role.Id, role.Name, permissionsValid.Union(role.RolesPermissions.Select(p => p.Permission.Name))); + _roleService.UpdateRole(role.Id, role.Name, permissionsValid.Union(role.RolesPermissions.Select(p => p.Permission.Name)).ToList()); } catch (Exception ex) { Logger.Error(ex, "Error while importing role '{0}'.", roleName); From 4e69612d90175d28249a7051d938a9e25e826344 Mon Sep 17 00:00:00 2001 From: Hermes Sbicego Date: Fri, 3 Sep 2021 09:03:27 +0200 Subject: [PATCH 045/112] Projection default settings (#8497) * added settings in projection part * read settings into driver * commit files setting * add logic of filter query * added logic of filter query setting * managed import/export * fixed migration * added message information Co-authored-by: elena.lampugnani --- .../Drivers/ProjectionPartDriver.cs | 147 +++++++--- .../Drivers/QueryPartDriver.cs | 2 + .../Modules/Orchard.Projections/Migrations.cs | 24 +- .../Models/LayoutRecord.cs | 1 + .../Orchard.Projections.csproj | 7 + .../Settings/ProjectionPartEditorEvents.cs | 264 ++++++++++++++++++ .../Settings/ProjectionPartSettings.cs | 31 ++ .../ViewModels/ProjectionPartEditViewModel.cs | 18 +- .../ProjectionPartSettings.cshtml | 112 ++++++++ .../Parts/ProjectionPart.cshtml | 151 +++++++--- 10 files changed, 673 insertions(+), 84 deletions(-) create mode 100644 src/Orchard.Web/Modules/Orchard.Projections/Settings/ProjectionPartEditorEvents.cs create mode 100644 src/Orchard.Web/Modules/Orchard.Projections/Settings/ProjectionPartSettings.cs create mode 100644 src/Orchard.Web/Modules/Orchard.Projections/Views/DefinitionTemplates/ProjectionPartSettings.cshtml diff --git a/src/Orchard.Web/Modules/Orchard.Projections/Drivers/ProjectionPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Projections/Drivers/ProjectionPartDriver.cs index 0283d3bda..352368fe6 100644 --- a/src/Orchard.Web/Modules/Orchard.Projections/Drivers/ProjectionPartDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.Projections/Drivers/ProjectionPartDriver.cs @@ -16,6 +16,7 @@ using Orchard.Projections.Descriptors.Layout; using Orchard.Projections.Descriptors.Property; using Orchard.Projections.Models; using Orchard.Projections.Services; +using Orchard.Projections.Settings; using Orchard.Projections.ViewModels; using Orchard.Tokens; using Orchard.UI.Navigation; @@ -59,7 +60,7 @@ namespace Orchard.Projections.Drivers { // retrieving paging parameters var queryString = Services.WorkContext.HttpContext.Request.QueryString; - + var pageKey = String.IsNullOrWhiteSpace(part.Record.PagerSuffix) ? "page" : "page-" + part.Record.PagerSuffix; var page = 0; @@ -97,7 +98,7 @@ namespace Orchard.Projections.Drivers { return Combined( ContentShape("Parts_ProjectionPart_Pager", shape => { - if(!part.Record.DisplayPager) { + if (!part.Record.DisplayPager) { return null; } @@ -189,7 +190,7 @@ namespace Orchard.Projections.Drivers { var groups = layoutComponents.GroupBy( x => { var propertyShape = ((IEnumerable)x.Properties.Items).First(p => ((PropertyRecord)p.Property).Id == groupPropertyId); - + // clear the wrappers, as they shouldn't be needed to generate the grouping key itself // otherwise the DisplayContext.View is null, and throws an exception if a wrapper is rendered (#18558) ((IShape)propertyShape).Metadata.Wrappers.Clear(); @@ -224,41 +225,76 @@ namespace Orchard.Projections.Drivers { protected override DriverResult Editor(ProjectionPart part, dynamic shapeHelper) { return ContentShape("Parts_ProjectionPart_Edit", () => { + var model = new ProjectionPartEditViewModel(); - var model = new ProjectionPartEditViewModel { - DisplayPager = part.Record.DisplayPager, - Items = part.Record.Items, - ItemsPerPage = part.Record.ItemsPerPage, - Skip = part.Record.Skip, - PagerSuffix = part.Record.PagerSuffix, - MaxItems = part.Record.MaxItems, - QueryLayoutRecordId = "-1", - }; - - // concatenated Query and Layout ids for the view - if (part.Record.QueryPartRecord != null) { - model.QueryLayoutRecordId = part.Record.QueryPartRecord.Id + ";"; - } - - if (part.Record.LayoutRecord != null) { - model.QueryLayoutRecordId += part.Record.LayoutRecord.Id.ToString(); + // for create read the setting values + var settings = part.TypePartDefinition.Settings.GetModel(); + if (part.Id == 0) { + model = new ProjectionPartEditViewModel { + DisplayPager = settings.DisplayPager, + Items = settings.Items, + Skip = settings.Skip, + PagerSuffix = settings.PagerSuffix, + MaxItems = settings.MaxItems, + QueryLayoutRecordId = settings.QueryLayoutRecordId + }; } else { - model.QueryLayoutRecordId += "-1"; + model = new ProjectionPartEditViewModel { + DisplayPager = part.Record.DisplayPager, + Items = part.Record.Items, + ItemsPerPage = part.Record.ItemsPerPage, + Skip = part.Record.Skip, + PagerSuffix = part.Record.PagerSuffix, + MaxItems = part.Record.MaxItems, + QueryLayoutRecordId = "-1" + }; + // concatenated Query and Layout ids for the view + if (part.Record.QueryPartRecord != null) { + model.QueryLayoutRecordId = part.Record.QueryPartRecord.Id + ";"; + } + + if (part.Record.LayoutRecord != null) { + model.QueryLayoutRecordId += part.Record.LayoutRecord.Id.ToString(); + } + else { + model.QueryLayoutRecordId += "-1"; + } } + model.PartId = part.Id; + + // lock fields + model.LockEditingItems = settings.LockEditingItems; + model.LockEditingSkip = settings.LockEditingSkip; + model.LockEditingMaxItems = settings.LockEditingMaxItems; + model.LockEditingPagerSuffix = settings.LockEditingPagerSuffix; + model.LockEditingDisplayPager = settings.LockEditingDisplayPager; + // populating the list of queries and layouts var layouts = _projectionManager.DescribeLayouts().SelectMany(x => x.Descriptors).ToList(); model.QueryRecordEntries = Services.ContentManager.Query().Join().OrderBy(x => x.Title).List() - .Select(x => new QueryRecordEntry { - Id = x.Id, - Name = x.Name, - LayoutRecordEntries = x.Layouts.Select( l => new LayoutRecordEntry { - Id = l.Id, - Description = GetLayoutDescription(layouts, l) - }) - }); + .Select(x => new QueryRecordEntry { + Id = x.Id, + Name = x.Name, + LayoutRecordEntries = x.Layouts.Select(l => new LayoutRecordEntry { + Id = l.Id, + Description = GetLayoutDescription(layouts, l) + }) + }); + // if any values, use default list of the settings + if (!string.IsNullOrWhiteSpace(settings.FilterQueryRecordId)) { + var filterQueryRecordId = settings.FilterQueryRecordId.Split('&'); + model.QueryRecordIdFilterEntries = filterQueryRecordId + .Select(x => new QueryRecordFilterEntry { + Id = x.Split(';')[0], + LayoutId = x.Split(';')[1] + }); + } + else { + model.QueryRecordIdFilterEntries = new List(); + } return shapeHelper.EditorTemplate(TemplateName: TemplateName, Model: model, Prefix: Prefix); }); @@ -266,28 +302,58 @@ namespace Orchard.Projections.Drivers { private static string GetLayoutDescription(IEnumerable layouts, LayoutRecord l) { var descriptor = layouts.FirstOrDefault(x => l.Category == x.Category && l.Type == x.Type); - return String.IsNullOrWhiteSpace(l.Description) ? descriptor.Display(new LayoutContext {State = FormParametersHelper.ToDynamic(l.State)}).Text : l.Description; + return String.IsNullOrWhiteSpace(l.Description) ? descriptor.Display(new LayoutContext { State = FormParametersHelper.ToDynamic(l.State) }).Text : l.Description; } protected override DriverResult Editor(ProjectionPart part, IUpdateModel updater, dynamic shapeHelper) { + var settings = part.TypePartDefinition.Settings.GetModel(); + var model = new ProjectionPartEditViewModel(); - if (updater.TryUpdateModel(model, Prefix, null, null)) { - - var queryLayoutIds = model.QueryLayoutRecordId.Split(new[] {';'}); + updater.TryUpdateModel(model, Prefix, null, null); + model.PartId = part.Id; + + // check the setting, if it is unlocked, assign the setting value + if (settings.LockEditingDisplayPager) { + part.Record.DisplayPager = settings.DisplayPager; + } + else { part.Record.DisplayPager = model.DisplayPager; + } + if (settings.LockEditingItems) { + part.Record.Items = settings.Items; + } + else { part.Record.Items = model.Items; - part.Record.ItemsPerPage = model.ItemsPerPage; + } + part.Record.ItemsPerPage = model.ItemsPerPage; + if (settings.LockEditingSkip) { + part.Record.Skip = settings.Skip; + } + else { part.Record.Skip = model.Skip; + } + if (settings.LockEditingMaxItems) { + part.Record.MaxItems = settings.MaxItems; + } + else { part.Record.MaxItems = model.MaxItems; + } + if (settings.LockEditingPagerSuffix) { + part.Record.PagerSuffix = (settings.PagerSuffix ?? String.Empty).Trim(); + } + else { part.Record.PagerSuffix = (model.PagerSuffix ?? String.Empty).Trim(); - part.Record.QueryPartRecord = _queryRepository.Get(Int32.Parse(queryLayoutIds[0])); - part.Record.LayoutRecord = part.Record.QueryPartRecord.Layouts.FirstOrDefault(x => x.Id == Int32.Parse(queryLayoutIds[1])); + } - if(!String.IsNullOrWhiteSpace(part.Record.PagerSuffix) && !String.Equals(part.Record.PagerSuffix.ToSafeName(), part.Record.PagerSuffix, StringComparison.OrdinalIgnoreCase)) { - updater.AddModelError("PagerSuffix", T("Suffix should not contain special characters.")); - } + var queryLayoutIds = model.QueryLayoutRecordId.Split(new[] { ';' }); + + part.Record.QueryPartRecord = _queryRepository.Get(Int32.Parse(queryLayoutIds[0])); + part.Record.LayoutRecord = part.Record.QueryPartRecord.Layouts.FirstOrDefault(x => x.Id == Int32.Parse(queryLayoutIds[1])); + + if (!String.IsNullOrWhiteSpace(part.Record.PagerSuffix) && !String.Equals(part.Record.PagerSuffix.ToSafeName(), part.Record.PagerSuffix, StringComparison.OrdinalIgnoreCase)) { + updater.AddModelError("PagerSuffix", T("Suffix should not contain special characters.")); } return Editor(part, shapeHelper); @@ -310,7 +376,7 @@ namespace Orchard.Projections.Drivers { protected override void ImportCompleted(ProjectionPart part, ImportContentContext context) { // Assign the query only when everything is imported. var query = context.Attribute(part.PartDefinition.Name, "Query"); - if (query != null) { + if (query != null && context.GetItemFromSession(query).As()!=null) { part.Record.QueryPartRecord = context.GetItemFromSession(query).As().Record; var layoutIndex = context.Attribute(part.PartDefinition.Name, "LayoutIndex"); int layoutIndexValue; @@ -346,3 +412,4 @@ namespace Orchard.Projections.Drivers { } } } + diff --git a/src/Orchard.Web/Modules/Orchard.Projections/Drivers/QueryPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Projections/Drivers/QueryPartDriver.cs index 9d9a4f740..f737ee6cc 100644 --- a/src/Orchard.Web/Modules/Orchard.Projections/Drivers/QueryPartDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.Projections/Drivers/QueryPartDriver.cs @@ -105,6 +105,7 @@ namespace Orchard.Projections.Drivers { new XAttribute("Display", layout.Display), new XAttribute("DisplayType", layout.DisplayType ?? ""), new XAttribute("Type", layout.Type ?? ""), + new XAttribute("GUIdentifier", layout.GUIdentifier ?? ""), // Properties new XElement("Properties", layout.Properties.Select(GetPropertyXml)), @@ -194,6 +195,7 @@ namespace Orchard.Projections.Drivers { DisplayType = layout.Attribute("DisplayType").Value, State = state, Type = type, + GUIdentifier = string.IsNullOrWhiteSpace(layout.Attribute("GUIdentifier").Value) ? Guid.NewGuid().ToString() : layout.Attribute("GUIdentifier").Value, Properties = layout.Element("Properties").Elements("Property").Select(GetProperty).ToList(), GroupProperty = GetProperty(layout.Element("Group").Element("Property")) }; diff --git a/src/Orchard.Web/Modules/Orchard.Projections/Migrations.cs b/src/Orchard.Web/Modules/Orchard.Projections/Migrations.cs index aad20e82f..7c5583888 100644 --- a/src/Orchard.Web/Modules/Orchard.Projections/Migrations.cs +++ b/src/Orchard.Web/Modules/Orchard.Projections/Migrations.cs @@ -1,4 +1,7 @@ -using System.Data; +using System; +using System.Data; +using System.Linq; +using Orchard.ContentManagement; using Orchard.ContentManagement.MetaData; using Orchard.Core.Common.Models; using Orchard.Core.Contents.Extensions; @@ -11,9 +14,14 @@ using Orchard.Projections.Models; namespace Orchard.Projections { public class Migrations : DataMigrationImpl { private readonly IRepository _memberBindingRepository; + private readonly IRepository _layoutRepository; - public Migrations(IRepository memberBindingRepository) { + + public Migrations( + IRepository memberBindingRepository, + IRepository layoutRepository) { _memberBindingRepository = memberBindingRepository; + _layoutRepository = layoutRepository; T = NullLocalizer.Instance; } @@ -311,5 +319,17 @@ namespace Orchard.Projections { .AddColumn("VersionScope", c => c.WithLength(15))); return 5; } + + public int UpdateFrom5() { + SchemaBuilder.AlterTable("LayoutRecord", t => t.AddColumn("GUIdentifier", + column => column.WithLength(68))); + + var layoutRecords = _layoutRepository.Table.Where(l => l.GUIdentifier == null || l.GUIdentifier == "").ToList(); + foreach (var layout in layoutRecords) { + layout.GUIdentifier = Guid.NewGuid().ToString(); + } + + return 6; + } } } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Projections/Models/LayoutRecord.cs b/src/Orchard.Web/Modules/Orchard.Projections/Models/LayoutRecord.cs index be8bd03d8..9a249b41e 100644 --- a/src/Orchard.Web/Modules/Orchard.Projections/Models/LayoutRecord.cs +++ b/src/Orchard.Web/Modules/Orchard.Projections/Models/LayoutRecord.cs @@ -9,6 +9,7 @@ namespace Orchard.Projections.Models { } public virtual int Id { get; set; } + public virtual string GUIdentifier { get; set; } public virtual string Description { get; set; } public virtual string Category { get; set; } public virtual string Type { get; set; } diff --git a/src/Orchard.Web/Modules/Orchard.Projections/Orchard.Projections.csproj b/src/Orchard.Web/Modules/Orchard.Projections/Orchard.Projections.csproj index 51ab51f0d..482790ceb 100644 --- a/src/Orchard.Web/Modules/Orchard.Projections/Orchard.Projections.csproj +++ b/src/Orchard.Web/Modules/Orchard.Projections/Orchard.Projections.csproj @@ -141,6 +141,10 @@ Orchard.Core $(MvcBuildViews) + + {0E7646E8-FE8F-43C1-8799-D97860925EC4} + Orchard.ContentTypes + {642A49D7-8752-4177-80D6-BFBBCFAD3DE0} Orchard.Forms @@ -183,6 +187,8 @@ + + @@ -331,6 +337,7 @@ + 10.0 diff --git a/src/Orchard.Web/Modules/Orchard.Projections/Settings/ProjectionPartEditorEvents.cs b/src/Orchard.Web/Modules/Orchard.Projections/Settings/ProjectionPartEditorEvents.cs new file mode 100644 index 000000000..5be65381a --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.Projections/Settings/ProjectionPartEditorEvents.cs @@ -0,0 +1,264 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using Orchard.ContentManagement; +using Orchard.ContentManagement.MetaData; +using Orchard.ContentManagement.MetaData.Builders; +using Orchard.ContentManagement.MetaData.Models; +using Orchard.ContentManagement.ViewModels; +using Orchard.ContentTypes.Events; +using Orchard.Core.Title.Models; +using Orchard.Data; +using Orchard.Forms.Services; +using Orchard.Localization; +using Orchard.Projections.Descriptors.Layout; +using Orchard.Projections.Models; +using Orchard.Projections.Services; +using Orchard.Projections.ViewModels; +using Orchard.UI.Notify; + +namespace Orchard.Projections.Settings { + public class ProjectionPartEditorEvents : ContentDefinitionEditorEventsBase, IContentDefinitionEventHandler { + private readonly IProjectionManagerExtension _projectionManager; + private readonly IContentManager _contentManager; + private readonly IRepository _layoutRepository; + private readonly IContentDefinitionManager _contentDefinitionManager; + + public ProjectionPartEditorEvents( + IOrchardServices services, + IProjectionManagerExtension projectionManager, + IContentManager contentManager, + IRepository layoutRepository, + IContentDefinitionManager contentDefinitionManager) { + + _projectionManager = projectionManager; + _contentManager = contentManager; + _layoutRepository = layoutRepository; + _contentDefinitionManager = contentDefinitionManager; + Services = services; + T = NullLocalizer.Instance; + } + public Localizer T { get; set; } + + public IOrchardServices Services { get; set; } + + public override IEnumerable TypePartEditor(ContentTypePartDefinition definition) { + if (definition.PartDefinition.Name == "ProjectionPart") { + var model = definition.Settings.GetModel(); + model.QueryRecordEntries = GetQueriesRecordEntry(); + if (!string.IsNullOrWhiteSpace(model.FilterQueryRecordId)) { + model.FilterQueryRecordsId = model.FilterQueryRecordId.Split('&'); + } + yield return DefinitionTemplate(model); + } + } + + public override IEnumerable TypePartEditorUpdate(ContentTypePartDefinitionBuilder builder, IUpdateModel updateModel) { + if (builder.Name != "ProjectionPart") { + yield break; + } + + var model = new ProjectionPartSettings(); + model.QueryRecordEntries = GetQueriesRecordEntry(); + + + if(updateModel.TryUpdateModel(model, "ProjectionPartSettings", null, null)) { + if (model.FilterQueryRecordsId != null && model.FilterQueryRecordsId.Count()>0) { + // check if default query selected is in filter queries list + if (!model.FilterQueryRecordsId.Contains(model.QueryLayoutRecordId) && model.QueryLayoutRecordId!="-1") { + updateModel.AddModelError("ProjectionPart", T("The default query must be one of the selected queries")); + } + + // also save the identity part of the query and guid of the layout to be used in the import + model.IdentityQueryLayoutRecord = GetIdentityQueryLayout(model.QueryLayoutRecordId); + + model.FilterQueryRecordId = string.Join("&", model.FilterQueryRecordsId); + + List identityForFilterQuery = new List(); + foreach (var record in model.FilterQueryRecordsId) { + identityForFilterQuery.Add(GetIdentityQueryLayout(record)); + } + model.IdentityFilterQueryRecord = string.Join("&", identityForFilterQuery); + } + + builder + .WithSetting("ProjectionPartSettings.QueryLayoutRecordId", model.QueryLayoutRecordId) + .WithSetting("ProjectionPartSettings.IdentityQueryLayoutRecord", model.IdentityQueryLayoutRecord) + .WithSetting("ProjectionPartSettings.FilterQueryRecordId", model.FilterQueryRecordId) + .WithSetting("ProjectionPartSettings.IdentityFilterQueryRecord", model.IdentityFilterQueryRecord) + .WithSetting("ProjectionPartSettings.Items", model.Items.ToString()) + .WithSetting("ProjectionPartSettings.LockEditingItems", model.LockEditingItems.ToString()) + .WithSetting("ProjectionPartSettings.Skip", model.Skip.ToString()) + .WithSetting("ProjectionPartSettings.LockEditingSkip", model.LockEditingSkip.ToString()) + .WithSetting("ProjectionPartSettings.MaxItems", model.MaxItems.ToString()) + .WithSetting("ProjectionPartSettings.LockEditingMaxItems", model.LockEditingMaxItems.ToString()) + .WithSetting("ProjectionPartSettings.PagerSuffix", model.PagerSuffix) + .WithSetting("ProjectionPartSettings.LockEditingPagerSuffix", model.LockEditingPagerSuffix.ToString()) + .WithSetting("ProjectionPartSettings.DisplayPager", model.DisplayPager.ToString()) + .WithSetting("ProjectionPartSettings.LockEditingDisplayPager", model.LockEditingDisplayPager.ToString()); + } + yield return DefinitionTemplate(model); + } + + #region Implementation interface + public void ContentFieldAttached(ContentFieldAttachedContext context) { + } + + public void ContentFieldDetached(ContentFieldDetachedContext context) { + } + + public void ContentPartAttached(ContentPartAttachedContext context) { + } + + public void ContentPartCreated(ContentPartCreatedContext context) { + } + + public void ContentPartDetached(ContentPartDetachedContext context) { + } + + public void ContentPartImported(ContentPartImportedContext context) { + } + + public void ContentPartImporting(ContentPartImportingContext context) { + } + + public void ContentPartRemoved(ContentPartRemovedContext context) { + } + + public void ContentTypeCreated(ContentTypeCreatedContext context) { + } + + public void ContentTypeImported(ContentTypeImportedContext context) { + var part = context.ContentTypeDefinition.Parts + .ToList() + .Where(p => p.PartDefinition.Name == "ProjectionPart") + .FirstOrDefault(); + if (part != null) { + var settings = part.Settings.GetModel(); + + // from identity part of the query and guid of the layout find reference + settings.QueryLayoutRecordId = GetQueryLayoutRecord(settings.IdentityQueryLayoutRecord); + + List identityForFilterQuery = new List(); + foreach (var record in settings.IdentityFilterQueryRecord.Split('&').ToList()) { + var correctId = GetQueryLayoutRecord(record); + if (!string.IsNullOrEmpty(correctId)) { + identityForFilterQuery.Add(correctId); + } + } + settings.FilterQueryRecordId = string.Join("&", identityForFilterQuery); + + _contentDefinitionManager.AlterTypeDefinition(context.ContentTypeDefinition.Name, cfg => cfg + .WithPart(part.PartDefinition.Name, + pb => pb + .WithSetting("ProjectionPartSettings.QueryLayoutRecordId", settings.QueryLayoutRecordId) + .WithSetting("ProjectionPartSettings.FilterQueryRecordId", settings.FilterQueryRecordId)) + ); + } + } + + public void ContentTypeImporting(ContentTypeImportingContext context) { + } + + public void ContentTypeRemoved(ContentTypeRemovedContext context) { + } + #endregion + + private string GetQueryLayoutRecord(string record) { + var ids = record.Split(';'); + if (ids.Count() == 1) { + // if is present only -1, the default query has not been selected + return ids[0]; + } + else { + string stringIds = string.Empty; + + var ciIdentity = _contentManager.ResolveIdentity(new ContentIdentity(ids[0])); + if (ciIdentity != null) { + stringIds = ciIdentity.Id.ToString() + ";"; + + if (ids[1] == "-1") { + // default layout + stringIds += "-1"; + } + else { + var recordLayout = _layoutRepository.Fetch(l => l.GUIdentifier == ids[1]).FirstOrDefault(); + if (recordLayout != null) { + stringIds += recordLayout.Id.ToString(); + } + } + } + return stringIds; + } + } + private string GetIdentityQueryLayout(string record) { + + var ids = record.Split(';'); + if (ids.Count() == 1) { + // if is present only -1, the default query has not been selected + return ids[0]; + } + else { + // ids[0] is id of query + // ids[1] is record id of layout + var identityQueryLayout = string.Empty; + // identity part to identify the query + var content = _contentManager.Get(int.Parse(ids[0])); + if (content != null) { + var identity = _contentManager.GetItemMetadata(content).Identity; + if (identity != null) { + identityQueryLayout = identity.ToString() + ";"; + } + else { + Services.Notifier.Error(T("ProjectionPart - Query - The loaded id {0} does not exist", ids[0])); + } + } + // guid id to identify the layout + if (ids[1] == "-1") { + // default layout + identityQueryLayout += ids[1]; + } + else { + var layoutRecord = _layoutRepository.Get(int.Parse(ids[1])); + if (layoutRecord != null) { + identityQueryLayout += layoutRecord.GUIdentifier; + } + else { + Services.Notifier.Error(T("ProjectionPart - Layout of query - The loaded id {0} does not exist", ids[1])); + } + } + return identityQueryLayout; + } + } + + private IEnumerable GetQueriesRecordEntry() { + // populating the list of queries and layouts + var layouts = _projectionManager.DescribeLayouts().SelectMany(x => x.Descriptors).ToList(); + + List records = new List(); + records.Add(new QueryRecordEntry { + Id = -1, + Name = T("No default").Text, + LayoutRecordEntries = new List() + }); + + records.AddRange(Services.ContentManager.Query().Join().OrderBy(x => x.Title).List() + .Select(x => new QueryRecordEntry { + Id = x.Id, + Name = x.Name, + LayoutRecordEntries = x.Layouts + .Select(l => new LayoutRecordEntry { + Id = l.Id, + Description = GetLayoutDescription(layouts, l) + }) + .ToList() + })); + return records; + } + + private string GetLayoutDescription(IEnumerable layouts, LayoutRecord l) { + var descriptor = layouts.FirstOrDefault(x => l.Category == x.Category && l.Type == x.Type); + return String.IsNullOrWhiteSpace(l.Description) ? descriptor.Display(new LayoutContext { State = FormParametersHelper.ToDynamic(l.State) }).Text : l.Description; + } + } +} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Projections/Settings/ProjectionPartSettings.cs b/src/Orchard.Web/Modules/Orchard.Projections/Settings/ProjectionPartSettings.cs new file mode 100644 index 000000000..e86184a29 --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.Projections/Settings/ProjectionPartSettings.cs @@ -0,0 +1,31 @@ +using System.Collections.Generic; +using System.ComponentModel; +using Orchard.Projections.ViewModels; + +namespace Orchard.Projections.Settings { + public class ProjectionPartSettings { + public ProjectionPartSettings() { + FilterQueryRecordsId = new List(); + } + + public string QueryLayoutRecordId { get; set; } + // saved identity part for import + public string IdentityQueryLayoutRecord { get; set; } + public IEnumerable QueryRecordEntries { get; set; } + public IEnumerable FilterQueryRecordsId { get; set; } + public string FilterQueryRecordId { get; set; } + // saved identity part for import + public string IdentityFilterQueryRecord { get; set; } + public int Items { get; set; } + public bool LockEditingItems { get; set; } + [DisplayName("Offset")] + public int Skip { get; set; } + public bool LockEditingSkip { get; set; } + public int MaxItems { get; set; } + public bool LockEditingMaxItems { get; set; } + public string PagerSuffix { get; set; } + public bool LockEditingPagerSuffix { get; set; } + public bool DisplayPager { get; set; } + public bool LockEditingDisplayPager { get; set; } + } +} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Projections/ViewModels/ProjectionPartEditViewModel.cs b/src/Orchard.Web/Modules/Orchard.Projections/ViewModels/ProjectionPartEditViewModel.cs index 8a707e1e0..8ae4fbad8 100644 --- a/src/Orchard.Web/Modules/Orchard.Projections/ViewModels/ProjectionPartEditViewModel.cs +++ b/src/Orchard.Web/Modules/Orchard.Projections/ViewModels/ProjectionPartEditViewModel.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; +using System.ComponentModel; using System.ComponentModel.DataAnnotations; namespace Orchard.Projections.ViewModels { @@ -10,7 +11,7 @@ namespace Orchard.Projections.ViewModels { [Required, Range(0, int.MaxValue)] public int ItemsPerPage { get; set; } - [Required, Range(0, int.MaxValue)] + [Required, Range(0, int.MaxValue),DisplayName("Offset")] public int Skip { get; set; } public string PagerSuffix { get; set; } @@ -24,6 +25,17 @@ namespace Orchard.Projections.ViewModels { public string QueryLayoutRecordId { get; set; } public IEnumerable QueryRecordEntries { get; set; } + public IEnumerable QueryRecordIdFilterEntries { get; set; } + + public int PartId { get; set; } + + // manage Lock items + public bool LockEditingItems { get; set; } + public bool LockEditingSkip { get; set; } + public bool LockEditingMaxItems { get; set; } + public bool LockEditingPagerSuffix { get; set; } + public bool LockEditingDisplayPager { get; set; } + } public class QueryRecordEntry { @@ -36,4 +48,8 @@ namespace Orchard.Projections.ViewModels { public int Id { get; set; } public string Description { get; set; } } + public class QueryRecordFilterEntry { + public string Id { get; set; } + public string LayoutId { get; set; } + } } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Projections/Views/DefinitionTemplates/ProjectionPartSettings.cshtml b/src/Orchard.Web/Modules/Orchard.Projections/Views/DefinitionTemplates/ProjectionPartSettings.cshtml new file mode 100644 index 000000000..c1d210a6e --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.Projections/Views/DefinitionTemplates/ProjectionPartSettings.cshtml @@ -0,0 +1,112 @@ +@model Orchard.Projections.Settings.ProjectionPartSettings +@using Orchard.Projections.Models; +@using Orchard.Projections.ViewModels; + +
    + @Html.LabelFor(m => m.QueryLayoutRecordId, T("Default Query")) + + @T("The query to display.") +
    +
    + @T("Select lock editing to prevent the user from editing the default choice") + +
    +
    +
    + @Html.LabelFor(m => m.Items, T("Items to display")) + @Html.TextBoxFor(m => m.Items, new { @class = "text small" }) +
    +
    + @Html.CheckBoxFor(m => m.LockEditingItems) + +
    +
    + @T("The number of items to display. Enter 0 for no limit. When using pagination, this is the number of items per page.") +
    + +
    +
    +
    + @Html.LabelFor(m => m.Skip, T("Offset")) + @Html.TextBoxFor(m => m.Skip, new { @class = "text small" }) +
    +
    + @Html.CheckBoxFor(m => m.LockEditingSkip) + +
    +
    + @T("The number of items to skip (e.g., if 2 is entered, the first 2 items won't be diplayed).") +
    + +
    +
    +
    + @Html.LabelFor(m => m.MaxItems, T("Maximum items")) + @Html.TextBoxFor(m => m.MaxItems, new { @class = "text small" }) +
    +
    + @Html.CheckBoxFor(m => m.LockEditingMaxItems) + +
    +
    + @T("Maximum number of items which can be queried at once. Use 0 for unlimited. This is only used as a failsafe when the number of items comes from a user-provided source such as the query string.") +
    + +
    +
    +
    + @Html.LabelFor(m => m.PagerSuffix, T("Suffix")) + @Html.TextBoxFor(m => m.PagerSuffix, new { @class = "text" }) +
    +
    + @Html.CheckBoxFor(m => m.LockEditingPagerSuffix) + +
    +
    + @T("Optional. Provide a suffix to use when multiple pagers are displayed on the same page, e.g., when using multiple Projection Widgets, or to define alternates.") +
    + +
    +
    +
    + @Html.CheckBoxFor(m => m.DisplayPager) + +
    +
    + @Html.CheckBoxFor(m => m.LockEditingDisplayPager) + +
    +
    + @T("Check to add a pager to the list.") +
    +
    +
    + @Html.LabelFor(m => m.FilterQueryRecordId, T("Filter Queries")) + + @T("Select which queries to display to the user. If there are no selections, all queries will be used.") +
    \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Projections/Views/EditorTemplates/Parts/ProjectionPart.cshtml b/src/Orchard.Web/Modules/Orchard.Projections/Views/EditorTemplates/Parts/ProjectionPart.cshtml index 78610823b..faef261e1 100644 --- a/src/Orchard.Web/Modules/Orchard.Projections/Views/EditorTemplates/Parts/ProjectionPart.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Projections/Views/EditorTemplates/Parts/ProjectionPart.cshtml @@ -4,71 +4,140 @@ @{ var selectedQueryRecordId = -1; + + var filterQuery = Model.QueryRecordIdFilterEntries.Any(); + var checkQuery = false; } -
    - @Html.LabelFor(m => m.QueryLayoutRecordId, T("For Query")) - + @foreach (QueryRecordEntry queryRecord in Model.QueryRecordEntries.OrderBy(x => x.Name)) { + // check condition for design option group + bool designDefaultQuery = Model.QueryRecordIdFilterEntries.Any(x => x.Id == queryRecord.Id.ToString() && x.LayoutId == "-1"); + bool designAnotherLayout = Model.QueryRecordIdFilterEntries.Any(x => queryRecord.LayoutRecordEntries.Select(q => q.Id.ToString()).Contains(x.LayoutId)); + + + if (!filterQuery || designDefaultQuery || designAnotherLayout) { + + @if (!filterQuery || designDefaultQuery) { + @Html.SelectOption(Model.QueryLayoutRecordId, queryRecord.Id + ";-1", queryRecord.Name + " " + T("(Default Layout)").Text) + if (Model.QueryLayoutRecordId == queryRecord.Id + ";-1") { + selectedQueryRecordId = queryRecord.Id; + checkQuery = true; + } + } + @foreach (LayoutRecordEntry layoutRecord in queryRecord.LayoutRecordEntries.OrderBy(x => x.Description)) { + if (!filterQuery || Model.QueryRecordIdFilterEntries.Any(x => x.Id == queryRecord.Id.ToString() && x.LayoutId == layoutRecord.Id.ToString())) { + @Html.SelectOption(Model.QueryLayoutRecordId, queryRecord.Id + ";" + layoutRecord.Id, queryRecord.Name + " " + T("({0})", layoutRecord.Description).Text) + if (Model.QueryLayoutRecordId == queryRecord.Id + ";" + layoutRecord.Id) { + selectedQueryRecordId = queryRecord.Id; + checkQuery = true; + } + } + } + } } - + + if (!checkQuery && Model.PartId != 0) { + + } } - - @if (selectedQueryRecordId != -1) { - @Html.ActionLink(T("Edit Query").Text, "Edit", new { area = "Orchard.Projections", id = selectedQueryRecordId }, new { }) - } - @T("The query to display.") -
    + @if (selectedQueryRecordId != -1) { + @Html.ActionLink(T("Edit Query").Text, "Edit", new { area = "Orchard.Projections", id = selectedQueryRecordId }, new { }) + } + @T("The query to display.") +
    - @Html.LabelFor(m => m.Items, T("Items to display")) - @Html.TextBoxFor(m => m.Items, new { @class = "text small" }) - @T("The number of items to display. Enter 0 for no limit. When using pagination, this is the number of items per page.") + @if (Model.LockEditingItems) { + @Model.Items + @Html.HiddenFor(m => m.Items) + @HintFromLockedField(T("The number of items to display. If equals 0 no limit. When using pagination, this is the number of items per page.").Text) + } + else { + @Html.LabelFor(m => m.Items, T("Items to display")) + @Html.TextBoxFor(m => m.Items, new { @class = "text small" }) + @T("The number of items to display. Enter 0 for no limit. When using pagination, this is the number of items per page.") + }
    - @Html.LabelFor(m => m.Skip, T("Offset")) - @Html.TextBoxFor(m => m.Skip, new { @class = "text small" }) - @T("The number of items to skip (e.g., if 2 is entered, the first 2 items won't be diplayed).") + @if (Model.LockEditingSkip) { + @Model.Skip + @Html.HiddenFor(m => m.Skip) + @HintFromLockedField(T("The number of items to skip (e.g., if 2 is entered, the first 2 items won't be diplayed).").Text) + } + else { + @Html.LabelFor(m => m.Skip, T("Offset")) + @Html.TextBoxFor(m => m.Skip, new { @class = "text small" }) + @T("The number of items to skip (e.g., if 2 is entered, the first 2 items won't be diplayed).") + }
    - @Html.LabelFor(m => m.MaxItems, T("Maximum items")) - @Html.TextBoxFor(m => m.MaxItems, new { @class = "text small" }) - @T("Maximum number of items which can be queried at once. Use 0 for unlimited. This is only used as a failsafe when the number of items comes from a user-provided source such as the query string.") + @if (Model.LockEditingMaxItems) { + @Model.MaxItems + @Html.HiddenFor(m => m.MaxItems) + @HintFromLockedField(T("Maximum number of items which can be queried at once. Use 0 for unlimited. This is only used as a failsafe when the number of items comes from a user-provided source such as the query string.").Text) + } + else { + @Html.LabelFor(m => m.MaxItems, T("Maximum items")) + @Html.TextBoxFor(m => m.MaxItems, new { @class = "text small" }) + @T("Maximum number of items which can be queried at once. Use 0 for unlimited. This is only used as a failsafe when the number of items comes from a user-provided source such as the query string.") + }
    - @Html.LabelFor(m => m.PagerSuffix, T("Suffix")) - @Html.TextBoxFor(m => m.PagerSuffix, new { @class = "text" }) - @T("Optional. Provide a suffix to use when multiple pagers are displayed on the same page, e.g., when using multiple Projection Widgets, or to define alternates.") + @if (Model.LockEditingPagerSuffix) { + if (!string.IsNullOrEmpty(Model.PagerSuffix)) { + @Model.PagerSuffix + @HintFromLockedField(T("Optional. Provide a suffix to use when multiple pagers are displayed on the same page, e.g., when using multiple Projection Widgets, or to define alternates.").Text) + } + @Html.HiddenFor(m => m.PagerSuffix) + } + else { + @Html.LabelFor(m => m.PagerSuffix, T("Suffix")) + @Html.TextBoxFor(m => m.PagerSuffix, new { @class = "text small" }) + @T("Optional. Provide a suffix to use when multiple pagers are displayed on the same page, e.g., when using multiple Projection Widgets, or to define alternates.") + }
    - @Html.CheckBoxFor(m => m.DisplayPager) - - @T("Check to add a pager to the list.") + @if (Model.LockEditingDisplayPager) { + + if (Model.DisplayPager) { + @T("True") + } + else { + @T("False") + } + @Html.HiddenFor(m => m.DisplayPager) + @HintFromLockedField(T("Flag used to add a pager to the list.").Text) + } + else { + @Html.CheckBoxFor(m => m.DisplayPager) + + @T("Check to add a pager to the list.") + }
    @using (Script.Foot()) { - + } \ No newline at end of file From e447561cfe2a8d16afbc5195e05eb6b5b10fdfb5 Mon Sep 17 00:00:00 2001 From: Andrea Piovanelli <83577153+AndreaPiovanelliLaser@users.noreply.github.com> Date: Fri, 10 Sep 2021 08:52:11 +0200 Subject: [PATCH 046/112] HtmlDecode token (#8501) Added HtmlDecode token management. Needed for #8500 --- .../Modules/Orchard.Tokens/Providers/TextTokens.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Orchard.Web/Modules/Orchard.Tokens/Providers/TextTokens.cs b/src/Orchard.Web/Modules/Orchard.Tokens/Providers/TextTokens.cs index c19752c57..357ebc3d3 100644 --- a/src/Orchard.Web/Modules/Orchard.Tokens/Providers/TextTokens.cs +++ b/src/Orchard.Web/Modules/Orchard.Tokens/Providers/TextTokens.cs @@ -22,6 +22,7 @@ namespace Orchard.Tokens.Providers { .Token("TrimStart:*", T("TrimStart:"), T("Trims the specified characters or number of them from the beginning of the string.")) .Token("UrlEncode", T("Url Encode"), T("Encodes a URL string."), "Text") .Token("HtmlEncode", T("Html Encode"), T("Encodes an HTML string."), "Text") + .Token("HtmlDecode", T("HtmlDecode"), T("Decodes an HTML string."), "Text") .Token("JavaScriptEncode", T("JavaScript Encode"), T("Encodes a JavaScript string."), "Text") .Token("LineEncode", T("Line Encode"), T("Replaces new lines with
    tags."), "Text") ; @@ -53,6 +54,8 @@ namespace Orchard.Tokens.Providers { .Chain("UrlEncode", "Text", HttpUtility.UrlEncode) .Token("HtmlEncode", HttpUtility.HtmlEncode) .Chain("HtmlEncode", "Text", HttpUtility.HtmlEncode) + .Token("HtmlDecode", HttpUtility.HtmlDecode) + .Chain("HtmlDecode", "Text", HttpUtility.HtmlDecode) .Token("JavaScriptEncode", HttpUtility.JavaScriptStringEncode) .Chain("JavaScriptEncode", "Text", HttpUtility.JavaScriptStringEncode) .Token("LineEncode", text => ReplaceNewLineCharacters(text)) @@ -195,4 +198,4 @@ namespace Orchard.Tokens.Providers { } } -} \ No newline at end of file +} From d51418b2c11d4f3c02a8440e49e983b9bf53e374 Mon Sep 17 00:00:00 2001 From: Hermes Sbicego Date: Thu, 16 Sep 2021 19:03:00 +0200 Subject: [PATCH 047/112] Sets SSL redirection as permanent for SEO reasons (#8503) Fixes #8502 --- .../Filters/SecureSocketsLayersFilter.cs | 8 ++++---- .../Orchard.SecureSocketsLayer/Models/SslSettingsPart.cs | 9 +++++++++ .../Services/SecureSocketsLayerService.cs | 3 ++- .../Parts/SecureSocketsLayer.Settings.cshtml | 5 +++++ 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Filters/SecureSocketsLayersFilter.cs b/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Filters/SecureSocketsLayersFilter.cs index 6c51f60d3..317c491d0 100644 --- a/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Filters/SecureSocketsLayersFilter.cs +++ b/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Filters/SecureSocketsLayersFilter.cs @@ -29,7 +29,7 @@ namespace Orchard.SecureSocketsLayer.Filters { var secure = (user != null && user.Identity.IsAuthenticated) || _sslService.ShouldBeSecure(filterContext); - + var usePermanentRedirect = settings.UsePermanentRedirect; var request = filterContext.HttpContext.Request; // redirect to a secured connection ? @@ -41,7 +41,7 @@ namespace Orchard.SecureSocketsLayer.Filters { filterContext.ActionDescriptor.ControllerDescriptor.ControllerName, filterContext.RequestContext.RouteData.Values)); - filterContext.Result = new RedirectResult(secureActionUrl); + filterContext.Result = new RedirectResult(secureActionUrl, usePermanentRedirect); return; } @@ -56,7 +56,7 @@ namespace Orchard.SecureSocketsLayer.Filters { filterContext.ActionDescriptor.ControllerDescriptor.ControllerName, filterContext.RequestContext.RouteData.Values)); - filterContext.Result = new RedirectResult(insecureActionUrl); + filterContext.Result = new RedirectResult(insecureActionUrl, usePermanentRedirect); } } @@ -67,4 +67,4 @@ namespace Orchard.SecureSocketsLayer.Filters { return url; } } -} \ No newline at end of file +} diff --git a/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Models/SslSettingsPart.cs b/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Models/SslSettingsPart.cs index 4d1f1b445..f377e8b7b 100644 --- a/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Models/SslSettingsPart.cs +++ b/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Models/SslSettingsPart.cs @@ -6,6 +6,7 @@ using Orchard.ContentManagement.FieldStorage.InfosetStorage; namespace Orchard.SecureSocketsLayer.Models { public class SslSettings { public bool Enabled { get; set; } + public bool UsePermanentRedirect { get; set; } public string Urls { get; set; } public bool SecureEverything { get; set; } public bool CustomEnabled { get; set; } @@ -37,6 +38,14 @@ namespace Orchard.SecureSocketsLayer.Models { set { this.As().Set("Enabled", value.ToString()); } } + public bool UsePermanentRedirect { + get { + var attributeValue = this.As().Get("UsePermanentRedirect"); + return !String.IsNullOrWhiteSpace(attributeValue) && Convert.ToBoolean(attributeValue); + } + set { this.As().Set("UsePermanentRedirect", value.ToString()); } + } + public bool CustomEnabled { get { var attributeValue = this.As().Get("CustomEnabled"); diff --git a/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Services/SecureSocketsLayerService.cs b/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Services/SecureSocketsLayerService.cs index a3e3ced50..6c94f9a1f 100644 --- a/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Services/SecureSocketsLayerService.cs +++ b/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Services/SecureSocketsLayerService.cs @@ -205,7 +205,8 @@ namespace Orchard.SecureSocketsLayer.Services { SecureEverything = settingsPart.SecureEverything, SecureHostName = settingsPart.SecureHostName, InsecureHostName = settingsPart.InsecureHostName, - Enabled = settingsPart.Enabled + Enabled = settingsPart.Enabled, + UsePermanentRedirect = settingsPart.UsePermanentRedirect }; }); } diff --git a/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Views/EditorTemplates/Parts/SecureSocketsLayer.Settings.cshtml b/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Views/EditorTemplates/Parts/SecureSocketsLayer.Settings.cshtml index c7aad106e..0a864e961 100644 --- a/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Views/EditorTemplates/Parts/SecureSocketsLayer.Settings.cshtml +++ b/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Views/EditorTemplates/Parts/SecureSocketsLayer.Settings.cshtml @@ -18,6 +18,11 @@ @Html.TextBoxFor(m => m.InsecureHostName, new { @class = "textMedium" }) @Html.Hint(T("(Mandatory) The host name non-secured traffic should be redirected to (e.g. localhost:30321, mydomain.com). Don't include the protocol or anything else than the host name. A port can be specified after a colon if necessary (e.g. dev.127-0-0-1.org.uk:4333)."))
    +
    + @Html.EditorFor(m => m.UsePermanentRedirect) + + @Html.ValidationMessage("UsePermanentRedirect", "*") +
    @Html.EditorFor(m => m.SecureEverything) From e771a56c42b64b29074bbdedd388de37632dc685 Mon Sep 17 00:00:00 2001 From: Matteo Piovanelli Date: Fri, 24 Sep 2021 08:37:25 +0200 Subject: [PATCH 048/112] Added null checks (#8511) The added null checks manage properly importing definitions that do not contain the properties. --- .../Settings/ProjectionPartEditorEvents.cs | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.Projections/Settings/ProjectionPartEditorEvents.cs b/src/Orchard.Web/Modules/Orchard.Projections/Settings/ProjectionPartEditorEvents.cs index 5be65381a..fde554ddb 100644 --- a/src/Orchard.Web/Modules/Orchard.Projections/Settings/ProjectionPartEditorEvents.cs +++ b/src/Orchard.Web/Modules/Orchard.Projections/Settings/ProjectionPartEditorEvents.cs @@ -137,16 +137,21 @@ namespace Orchard.Projections.Settings { var settings = part.Settings.GetModel(); // from identity part of the query and guid of the layout find reference - settings.QueryLayoutRecordId = GetQueryLayoutRecord(settings.IdentityQueryLayoutRecord); + settings.QueryLayoutRecordId = string.IsNullOrWhiteSpace(settings.IdentityQueryLayoutRecord) + ? "-1" : GetQueryLayoutRecord(settings.IdentityQueryLayoutRecord); - List identityForFilterQuery = new List(); - foreach (var record in settings.IdentityFilterQueryRecord.Split('&').ToList()) { - var correctId = GetQueryLayoutRecord(record); - if (!string.IsNullOrEmpty(correctId)) { - identityForFilterQuery.Add(correctId); + if (!string.IsNullOrWhiteSpace(settings.IdentityFilterQueryRecord)) { + List identityForFilterQuery = new List(); + foreach (var record in settings.IdentityFilterQueryRecord.Split('&').ToList()) { + var correctId = GetQueryLayoutRecord(record); + if (!string.IsNullOrEmpty(correctId)) { + identityForFilterQuery.Add(correctId); + } } + settings.FilterQueryRecordId = string.Join("&", identityForFilterQuery); + } else { + settings.FilterQueryRecordId = string.Empty; } - settings.FilterQueryRecordId = string.Join("&", identityForFilterQuery); _contentDefinitionManager.AlterTypeDefinition(context.ContentTypeDefinition.Name, cfg => cfg .WithPart(part.PartDefinition.Name, @@ -261,4 +266,4 @@ namespace Orchard.Projections.Settings { return String.IsNullOrWhiteSpace(l.Description) ? descriptor.Display(new LayoutContext { State = FormParametersHelper.ToDynamic(l.State) }).Text : l.Description; } } -} \ No newline at end of file +} From a8de3afc0f6d89bb328d0188d45072c15f9d1e6b Mon Sep 17 00:00:00 2001 From: Andrea Piovanelli <83577153+AndreaPiovanelliLaser@users.noreply.github.com> Date: Mon, 25 Oct 2021 09:19:50 +0200 Subject: [PATCH 049/112] Fix/editmenulink (#8515) * Removed useless spaces * Corrections on ProjectionPart query link (it didn't update the link when changing the selected query). Added edit link for menu in MenuWidget. * Added menuId parameter to menu edit link --- .../Parts.MenuWidget.Edit.cshtml | 29 ++++++++++++++++++- .../Parts/ProjectionPart.cshtml | 16 +++++++++- 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/src/Orchard.Web/Core/Navigation/Views/EditorTemplates/Parts.MenuWidget.Edit.cshtml b/src/Orchard.Web/Core/Navigation/Views/EditorTemplates/Parts.MenuWidget.Edit.cshtml index c9a6aa8ef..f00790a18 100644 --- a/src/Orchard.Web/Core/Navigation/Views/EditorTemplates/Parts.MenuWidget.Edit.cshtml +++ b/src/Orchard.Web/Core/Navigation/Views/EditorTemplates/Parts.MenuWidget.Edit.cshtml @@ -2,13 +2,23 @@ @using Orchard.ContentManagement +@{ + var selectedMenuId = -1; +} +
    @Html.LabelFor(m => m.CurrentMenuId, T("For Menu")) + @if (selectedMenuId != -1) { + @Html.ActionLink(T("Edit Menu").Text, "Index", new { area = "Navigation", menuId = selectedMenuId }, new { id = "editMenuLink" }) + } @T("Select which menu you want to display")
    @@ -48,4 +58,21 @@ @Html.EditorFor(m => m.ShowFullMenu) @T("Check for the menu to be displayed without filtering the selected current page.") - \ No newline at end of file + + +@using (Script.Foot()) { + +} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Projections/Views/EditorTemplates/Parts/ProjectionPart.cshtml b/src/Orchard.Web/Modules/Orchard.Projections/Views/EditorTemplates/Parts/ProjectionPart.cshtml index faef261e1..de113faba 100644 --- a/src/Orchard.Web/Modules/Orchard.Projections/Views/EditorTemplates/Parts/ProjectionPart.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Projections/Views/EditorTemplates/Parts/ProjectionPart.cshtml @@ -52,7 +52,7 @@ } } @if (selectedQueryRecordId != -1) { - @Html.ActionLink(T("Edit Query").Text, "Edit", new { area = "Orchard.Projections", id = selectedQueryRecordId }, new { }) + @Html.ActionLink(T("Edit Query").Text, "Edit", new { area = "Orchard.Projections", id = selectedQueryRecordId }, new { id = "editQueryLink-" + Model.PartId.ToString() }) } @T("The query to display.") @@ -137,7 +137,21 @@ // m.QueryLayoutRecordId)").change(function (sender) { + var selected = $(this).val(); + // Removing layout id + selected = selected.substr(0, selected.indexOf(';')); + + var anchor = $("#editQueryLink-@Model.PartId.ToString()"); + var url = anchor.attr("href"); + // Now I need to replace the last part of the url (which is the QueryLayoutRecordId) with the selected id to make to link work properly. + var newUrl = url.substr(0, url.lastIndexOf("/") + 1); + newUrl = newUrl + selected; + anchor.attr("href", newUrl); + }); })(jQuery); + //]]> } \ No newline at end of file From 987291c3cfb21c63ca4ff44b96d1012d8f91c80f Mon Sep 17 00:00:00 2001 From: Andrea Piovanelli <83577153+AndreaPiovanelliLaser@users.noreply.github.com> Date: Fri, 29 Oct 2021 08:39:38 +0200 Subject: [PATCH 050/112] Fixed various typos: (#8512) --- .../ContainerTypePartSettingsViewModel.cshtml | 2 +- .../Orchard.Azure.MediaServices/Controllers/AssetController.cs | 2 +- .../Orchard.Azure.MediaServices/Controllers/JobController.cs | 2 +- .../Orchard.Azure.MediaServices/Controllers/MediaController.cs | 2 +- .../Modules/Orchard.Users/Activities/UserActivity.cs | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Orchard.Web/Core/Containers/Views/DefinitionTemplates/ContainerTypePartSettingsViewModel.cshtml b/src/Orchard.Web/Core/Containers/Views/DefinitionTemplates/ContainerTypePartSettingsViewModel.cshtml index f640b679a..8e72ad707 100644 --- a/src/Orchard.Web/Core/Containers/Views/DefinitionTemplates/ContainerTypePartSettingsViewModel.cshtml +++ b/src/Orchard.Web/Core/Containers/Views/DefinitionTemplates/ContainerTypePartSettingsViewModel.cshtml @@ -22,7 +22,7 @@
    @Html.LabelFor(m => m.EnablePositioning, @T("Enable drag and drop")) @Html.EditorFor(m => m.EnablePositioning) - @T("Check this option to enable manual repositioning of items using. If not set, this option will be configurable on the list content item itself.") + @T("Check this option to enable manual repositioning of items using drag and drop. If not set, this option will be configurable on the content item itself.")
    @Html.LabelFor(m => m.AdminListViewName, @T("List View")) diff --git a/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Controllers/AssetController.cs b/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Controllers/AssetController.cs index 57892711d..d839632d5 100644 --- a/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Controllers/AssetController.cs +++ b/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Controllers/AssetController.cs @@ -147,7 +147,7 @@ namespace Orchard.Azure.MediaServices.Controllers { _transactionManager.Cancel(); Logger.Error(ex, "Error while deleting asset with ID {0}.", id); - _notifier.Error(T("Ar error occurred while deleting the asset '{0}':\n{1}", asset.Name, ex.Message)); + _notifier.Error(T("An error occurred while deleting the asset '{0}':\n{1}", asset.Name, ex.Message)); } return Redirect(Url.ItemEditUrl(cloudVideoPart)); diff --git a/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Controllers/JobController.cs b/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Controllers/JobController.cs index bf50b9438..efdd0fb0a 100644 --- a/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Controllers/JobController.cs +++ b/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Controllers/JobController.cs @@ -164,7 +164,7 @@ namespace Orchard.Azure.MediaServices.Controllers { _transactionManager.Cancel(); Logger.Error(ex, "Error while creating job with task of type {0} on cloud video item with ID {1}.", task, id); - _notifier.Error(T("Ar error occurred while creating the job:\n{0}", ex.Message)); + _notifier.Error(T("An error occurred while creating the job:\n{0}", ex.Message)); } } diff --git a/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Controllers/MediaController.cs b/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Controllers/MediaController.cs index caf05adda..51863c583 100644 --- a/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Controllers/MediaController.cs +++ b/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Controllers/MediaController.cs @@ -154,7 +154,7 @@ namespace Orchard.Azure.MediaServices.Controllers { _transactionManager.Cancel(); Logger.Error(ex, "Error while saving cloud video item with ID {0}.", part.Id); - _notifier.Error(T("Ar error occurred while saving the cloud video item:\n{1}", ex.Message)); + _notifier.Error(T("An error occurred while saving the cloud video item:\n{0}", ex.Message)); } return RedirectToAction("Edit", new { id = part.Id }); diff --git a/src/Orchard.Web/Modules/Orchard.Users/Activities/UserActivity.cs b/src/Orchard.Web/Modules/Orchard.Users/Activities/UserActivity.cs index 01ff766ad..10f638145 100644 --- a/src/Orchard.Web/Modules/Orchard.Users/Activities/UserActivity.cs +++ b/src/Orchard.Web/Modules/Orchard.Users/Activities/UserActivity.cs @@ -128,7 +128,7 @@ namespace Orchard.Users.Activities { } public override LocalizedString Description { - get { return T("User send challenge email."); } + get { return T("User sent challenge email."); } } } From ea3c7d89b12fced63753ddd4b614a85d839ef4f7 Mon Sep 17 00:00:00 2001 From: Matteo Piovanelli Date: Fri, 10 Dec 2021 08:31:16 +0100 Subject: [PATCH 051/112] Added descriptor to audit trail context (#8517) --- .../Modules/Orchard.AuditTrail/Services/AuditTrailManager.cs | 3 ++- .../Orchard.AuditTrail/Services/Models/AuditTrailContext.cs | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Orchard.Web/Modules/Orchard.AuditTrail/Services/AuditTrailManager.cs b/src/Orchard.Web/Modules/Orchard.AuditTrail/Services/AuditTrailManager.cs index 0b7377db0..77662e59d 100644 --- a/src/Orchard.Web/Modules/Orchard.AuditTrail/Services/AuditTrailManager.cs +++ b/src/Orchard.Web/Modules/Orchard.AuditTrail/Services/AuditTrailManager.cs @@ -173,7 +173,8 @@ namespace Orchard.AuditTrail.Services { Properties = properties, EventData = eventData, EventFilterKey = eventFilterKey, - EventFilterData = eventFilterData + EventFilterData = eventFilterData, + EventDescriptor = eventDescriptor }; _auditTrailEventHandlers.Create(context); diff --git a/src/Orchard.Web/Modules/Orchard.AuditTrail/Services/Models/AuditTrailContext.cs b/src/Orchard.Web/Modules/Orchard.AuditTrail/Services/Models/AuditTrailContext.cs index 30b1303c4..9e65e1289 100644 --- a/src/Orchard.Web/Modules/Orchard.AuditTrail/Services/Models/AuditTrailContext.cs +++ b/src/Orchard.Web/Modules/Orchard.AuditTrail/Services/Models/AuditTrailContext.cs @@ -13,5 +13,6 @@ namespace Orchard.AuditTrail.Services.Models { public IDictionary EventData { get; set; } public string EventFilterKey { get; set; } public string EventFilterData { get; set; } + public AuditTrailEventDescriptor EventDescriptor { get; set; } } } \ No newline at end of file From 88a79cb7688775856596d57a16fa09ab631967e0 Mon Sep 17 00:00:00 2001 From: Andrea Piovanelli <83577153+AndreaPiovanelliLaser@users.noreply.github.com> Date: Wed, 9 Feb 2022 10:20:30 +0100 Subject: [PATCH 052/112] Added LayoutSaving call to context in WidgetElementHarvester to properly update the container of widgets. (#8534) --- .../Providers/WidgetElementHarvester.cs | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Layouts/Providers/WidgetElementHarvester.cs b/src/Orchard.Web/Modules/Orchard.Widgets/Layouts/Providers/WidgetElementHarvester.cs index e9f224633..081608a7d 100644 --- a/src/Orchard.Web/Modules/Orchard.Widgets/Layouts/Providers/WidgetElementHarvester.cs +++ b/src/Orchard.Web/Modules/Orchard.Widgets/Layouts/Providers/WidgetElementHarvester.cs @@ -47,11 +47,30 @@ namespace Orchard.Widgets.Layouts.Providers { Importing = ImportElement, StateBag = new Dictionary { { "ContentTypeName", contentTypeDefinition.Name } - } + }, + LayoutSaving = LayoutSaving }; }); } + private void LayoutSaving(ElementSavingContext context) { + // I need to save the widget element container. + var element = (Widget)context.Element; + if (element == null) { + return; + } + var widgetId = element.WidgetId; + var widget = _contentManager.Value.Get(widgetId.Value, VersionOptions.Latest); + if (widget == null) { + return; + } + + var commonPart = widget.As(); + if (commonPart != null) { + commonPart.Container = context.Content; + } + } + private void Displaying(ElementDisplayingContext context) { var contentTypeName = (string)context.Element.Descriptor.StateBag["ContentTypeName"]; var element = (Widget)context.Element; From ebfd03df0ed8a051c5b10491d2b114ddf980f5a7 Mon Sep 17 00:00:00 2001 From: Matteo Piovanelli Date: Thu, 17 Mar 2022 18:06:46 +0100 Subject: [PATCH 053/112] Use a variable with an actual path to a base url to find the actual path to (#8546) the medialibrary --- .../TinyMce/Scripts/plugins/medialibrary/plugin.js | 4 +--- .../TinyMce/Scripts/plugins/medialibrary/plugin.min.js | 5 +---- .../Modules/TinyMce/Views/Body-Html.Editor.cshtml | 8 +++++++- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/Orchard.Web/Modules/TinyMce/Scripts/plugins/medialibrary/plugin.js b/src/Orchard.Web/Modules/TinyMce/Scripts/plugins/medialibrary/plugin.js index 26cf7fa8f..e2d2496c9 100644 --- a/src/Orchard.Web/Modules/TinyMce/Scripts/plugins/medialibrary/plugin.js +++ b/src/Orchard.Web/Modules/TinyMce/Scripts/plugins/medialibrary/plugin.js @@ -17,9 +17,7 @@ // Register the command so that it can be invoked by using tinyMCE.activeEditor.execCommand('mceMediaPicker'); ed.addCommand('mceMediaLibrary', function () { ed.focus(); - var adminIndex = location.href.toLowerCase().indexOf("/admin/"); - if (adminIndex === -1) return; - var url = location.href.substr(0, adminIndex) + "/Admin/Orchard.MediaLibrary?dialog=true"; + var url = baseOrchardPath + "Admin/Orchard.MediaLibrary?dialog=true"; $.colorbox({ href: url, iframe: true, diff --git a/src/Orchard.Web/Modules/TinyMce/Scripts/plugins/medialibrary/plugin.min.js b/src/Orchard.Web/Modules/TinyMce/Scripts/plugins/medialibrary/plugin.min.js index 96ed4b31c..35bc0b3e0 100644 --- a/src/Orchard.Web/Modules/TinyMce/Scripts/plugins/medialibrary/plugin.min.js +++ b/src/Orchard.Web/Modules/TinyMce/Scripts/plugins/medialibrary/plugin.min.js @@ -1,4 +1 @@ -(function(){tinymce.create("tinymce.plugins.Orchard.MediaLibrary",{init:function(n){n.addCommand("mceMediaLibrary",function(){var t,i;(n.focus(),t=location.href.toLowerCase().indexOf("/admin/"),t!==-1)&&(i=location.href.substr(0,t)+"/Admin/Orchard.MediaLibrary?dialog=true",$.colorbox({href:i,iframe:!0,reposition:!0,width:"90%",height:"90%",onLoad:function(){$("html, body").css("overflow","hidden")},onClosed:function(){var n,r,i,u;if($("html, body").css("overflow",""),n=$.colorbox.selectedData,n!=null){for(r="",i=0;i(); + var urlPrefix = WorkContext.Resolve().RequestUrlPrefix; + if (!string.IsNullOrWhiteSpace(urlPrefix)) { + urlPrefix += "/"; + } } @{ From 5b0c82d1ad39526253eb2a5caf74dbcb8615860a Mon Sep 17 00:00:00 2001 From: Matteo Piovanelli Date: Fri, 18 Mar 2022 12:26:06 +0100 Subject: [PATCH 054/112] Added specific permission to change owner of content item (#8539) --- .../Common/OwnerEditor/OwnerEditorDriver.cs | 2 +- .../OwnerEditor/OwnerEditorPermissions.cs | 30 +++++++++++++++++++ src/Orchard.Web/Core/Orchard.Core.csproj | 3 +- 3 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 src/Orchard.Web/Core/Common/OwnerEditor/OwnerEditorPermissions.cs diff --git a/src/Orchard.Web/Core/Common/OwnerEditor/OwnerEditorDriver.cs b/src/Orchard.Web/Core/Common/OwnerEditor/OwnerEditorDriver.cs index 3707a35a4..03cab2834 100644 --- a/src/Orchard.Web/Core/Common/OwnerEditor/OwnerEditorDriver.cs +++ b/src/Orchard.Web/Core/Common/OwnerEditor/OwnerEditorDriver.cs @@ -35,7 +35,7 @@ namespace Orchard.Core.Common.OwnerEditor { protected override DriverResult Editor(CommonPart part, IUpdateModel updater, dynamic shapeHelper) { var currentUser = _authenticationService.GetAuthenticatedUser(); - if (!_authorizationService.TryCheckAccess(StandardPermissions.SiteOwner, currentUser, part)) { + if (!_authorizationService.TryCheckAccess(OwnerEditorPermissions.MayEditContentOwner, currentUser, part)) { return null; } diff --git a/src/Orchard.Web/Core/Common/OwnerEditor/OwnerEditorPermissions.cs b/src/Orchard.Web/Core/Common/OwnerEditor/OwnerEditorPermissions.cs new file mode 100644 index 000000000..40bd7c46a --- /dev/null +++ b/src/Orchard.Web/Core/Common/OwnerEditor/OwnerEditorPermissions.cs @@ -0,0 +1,30 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using Orchard.Environment.Extensions.Models; +using Orchard.Security; +using Orchard.Security.Permissions; + +namespace Orchard.Core.Common.OwnerEditor { + public class OwnerEditorPermissions : IPermissionProvider { + + public static readonly Permission MayEditContentOwner = new Permission { + Description = "Edit the Owner of content items", + Name = "MayEditContentOwner", + ImpliedBy = new[] { StandardPermissions.SiteOwner } }; + + public virtual Feature Feature { get; set; } + + public IEnumerable GetDefaultStereotypes() { + return new[] {new PermissionStereotype { + Name = "Administrator", + Permissions = new[] { MayEditContentOwner } + } }; + } + + public IEnumerable GetPermissions() { + return new[] { MayEditContentOwner }; + } + } +} \ No newline at end of file diff --git a/src/Orchard.Web/Core/Orchard.Core.csproj b/src/Orchard.Web/Core/Orchard.Core.csproj index 00f8def8f..fb8d4634d 100644 --- a/src/Orchard.Web/Core/Orchard.Core.csproj +++ b/src/Orchard.Web/Core/Orchard.Core.csproj @@ -98,6 +98,7 @@ + @@ -662,4 +663,4 @@ - + \ No newline at end of file From ab7c0f242eee53aba0b5ca1bf52b22f8b31eacf1 Mon Sep 17 00:00:00 2001 From: ElenaRepository <50620495+ElenaRepository@users.noreply.github.com> Date: Fri, 18 Mar 2022 12:26:49 +0100 Subject: [PATCH 055/112] checked null part (#8543) Co-authored-by: elena.lampugnani --- .../Handlers/TemplateFilterForPart.cs | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/Orchard/ContentManagement/Handlers/TemplateFilterForPart.cs b/src/Orchard/ContentManagement/Handlers/TemplateFilterForPart.cs index 29074ab71..6b92ef897 100644 --- a/src/Orchard/ContentManagement/Handlers/TemplateFilterForPart.cs +++ b/src/Orchard/ContentManagement/Handlers/TemplateFilterForPart.cs @@ -40,8 +40,10 @@ namespace Orchard.ContentManagement.Handlers { return; var templatePart = part.As(); - var templateShape = context.New.EditorTemplate(TemplateName: _templateName, Model: templatePart, Prefix: _prefix); - context.Shape.Zones[_location].Add(templateShape, _position); + if (templatePart != null) { + var templateShape = context.New.EditorTemplate(TemplateName: _templateName, Model: templatePart, Prefix: _prefix); + context.Shape.Zones[_location].Add(templateShape, _position); + } } protected override void UpdateEditorShape(UpdateEditorContext context, ContentPart part) { @@ -49,8 +51,10 @@ namespace Orchard.ContentManagement.Handlers { return; var templatePart = part.As(); - context.Updater.TryUpdateModel(templatePart, _prefix, null, null); - BuildEditorShape(context, part); + if (templatePart != null) { + context.Updater.TryUpdateModel(templatePart, _prefix, null, null); + BuildEditorShape(context, part); + } } } } From 863d4a92a6f1b2c5a28362b37dcc9eb949b05e81 Mon Sep 17 00:00:00 2001 From: Andrea Piovanelli <83577153+AndreaPiovanelliLaser@users.noreply.github.com> Date: Fri, 18 Mar 2022 12:27:11 +0100 Subject: [PATCH 056/112] Layout elements cloning (#8538) * Created a new element when session widget has a different container than the widget in the import context (to ensure actual cloning of the elements and not just adding a reference to the old element from the original container). * Some comment has been rewritten for clarity --- .../Layouts/Providers/WidgetElementHarvester.cs | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Layouts/Providers/WidgetElementHarvester.cs b/src/Orchard.Web/Modules/Orchard.Widgets/Layouts/Providers/WidgetElementHarvester.cs index 081608a7d..4249dec74 100644 --- a/src/Orchard.Web/Modules/Orchard.Widgets/Layouts/Providers/WidgetElementHarvester.cs +++ b/src/Orchard.Web/Modules/Orchard.Widgets/Layouts/Providers/WidgetElementHarvester.cs @@ -13,6 +13,7 @@ using Orchard.Layouts.Framework.Drivers; using Orchard.Layouts.Framework.Elements; using Orchard.Layouts.Framework.Harvesters; using Orchard.Layouts.Helpers; +using Orchard.Layouts.Models; using Orchard.Mvc.Html; using Orchard.Security; using Orchard.Widgets.Layouts.Elements; @@ -54,7 +55,7 @@ namespace Orchard.Widgets.Layouts.Providers { } private void LayoutSaving(ElementSavingContext context) { - // I need to save the widget element container. + // First, widget element container has to be stored. var element = (Widget)context.Element; if (element == null) { return; @@ -185,6 +186,18 @@ namespace Orchard.Widgets.Layouts.Providers { return; var widget = context.Session.GetItemFromSession(widgetIdentity); + + // A new widget needs to be created and saved. + // This is to avoid the fact the very same element ending up in multiple layouts, causing issues when e.g. deleting a LayoutWidget of a cloned ContentItem (which would delete the elements of multiple layouts). + // The new widget is needed only when the container of the original element is different from the container of the cloned element, to ensure doing it when cloning elements and avoid doing the same when importing content. + var cp = widget.As(); + if (cp != null) { + var lp = cp.Container.As(); + if (lp != null && lp.Id != context.Layout.Id) { + widget = _contentManager.Value.Clone(widget); + } + } + var element = (Widget)context.Element; element.WidgetId = widget != null ? widget.Id : default(int?); From a5f657540aefe2af925c89698ec96d9cc0a3ff64 Mon Sep 17 00:00:00 2001 From: Matteo Piovanelli Date: Fri, 1 Apr 2022 14:14:49 +0200 Subject: [PATCH 057/112] Fixed bug with medialibrary plugin where I had forgotten to replace an instance (#8547) of the previous way to compute the admin url --- .../Modules/TinyMce/Scripts/plugins/medialibrary/plugin.js | 2 +- .../Modules/TinyMce/Scripts/plugins/medialibrary/plugin.min.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Orchard.Web/Modules/TinyMce/Scripts/plugins/medialibrary/plugin.js b/src/Orchard.Web/Modules/TinyMce/Scripts/plugins/medialibrary/plugin.js index e2d2496c9..5a468ca7a 100644 --- a/src/Orchard.Web/Modules/TinyMce/Scripts/plugins/medialibrary/plugin.js +++ b/src/Orchard.Web/Modules/TinyMce/Scripts/plugins/medialibrary/plugin.js @@ -39,7 +39,7 @@ var newContent = ''; for (var i = 0; i < selectedData.length; i++) { - var renderMedia = location.href.substr(0, adminIndex) + "/Admin/Orchard.MediaLibrary/MediaItem/" + selectedData[i].id + "?displayType=Raw"; + var renderMedia = baseOrchardPath + "/Admin/Orchard.MediaLibrary/MediaItem/" + selectedData[i].id + "?displayType=Raw"; $.ajax({ async: false, type: 'GET', diff --git a/src/Orchard.Web/Modules/TinyMce/Scripts/plugins/medialibrary/plugin.min.js b/src/Orchard.Web/Modules/TinyMce/Scripts/plugins/medialibrary/plugin.min.js index 35bc0b3e0..37ae3eab7 100644 --- a/src/Orchard.Web/Modules/TinyMce/Scripts/plugins/medialibrary/plugin.min.js +++ b/src/Orchard.Web/Modules/TinyMce/Scripts/plugins/medialibrary/plugin.min.js @@ -1 +1 @@ -tinymce.create("tinymce.plugins.Orchard.MediaLibrary",{init:function(ed,url){ed.addCommand("mceMediaLibrary",(function(){ed.focus();var url=baseOrchardPath+"Admin/Orchard.MediaLibrary?dialog=true";$.colorbox({href:url,iframe:!0,reposition:!0,width:"90%",height:"90%",onLoad:function(){$("html, body").css("overflow","hidden")},onClosed:function(){$("html, body").css("overflow","");var selectedData=$.colorbox.selectedData;if(null!=selectedData){for(var newContent="",i=0;i Date: Fri, 1 Apr 2022 14:15:04 +0200 Subject: [PATCH 058/112] Handlers to redirect creating and editing users to the correct controller (#8549) --- .../Orchard.Users/Handlers/UserPartHandler.cs | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/Orchard.Web/Modules/Orchard.Users/Handlers/UserPartHandler.cs b/src/Orchard.Web/Modules/Orchard.Users/Handlers/UserPartHandler.cs index 28e87eaf4..3e6d628f3 100644 --- a/src/Orchard.Web/Modules/Orchard.Users/Handlers/UserPartHandler.cs +++ b/src/Orchard.Web/Modules/Orchard.Users/Handlers/UserPartHandler.cs @@ -2,6 +2,7 @@ using Orchard.Data; using Orchard.ContentManagement.Handlers; using Orchard.Users.Models; +using System.Web.Routing; namespace Orchard.Users.Handlers { public class UserPartHandler : ContentHandler { @@ -16,6 +17,19 @@ namespace Orchard.Users.Handlers { if (part != null) { context.Metadata.Identity.Add("User.UserName", part.UserName); context.Metadata.DisplayText = part.UserName; + + // Configure routing metadata to make back-office experience more robust + context.Metadata.CreateRouteValues = new RouteValueDictionary { + {"Area", "Orchard.Users"}, + {"Controller", "Admin"}, + {"Action", "Create"} + }; + context.Metadata.EditorRouteValues = new RouteValueDictionary { + {"Area", "Orchard.Users"}, + {"Controller", "Admin"}, + {"Action", "Edit"}, + {"id", context.ContentItem.Id} + }; } } } From 0973810c0998ee567d53507bbb0171cc4c04f6b2 Mon Sep 17 00:00:00 2001 From: ElenaRepository <50620495+ElenaRepository@users.noreply.github.com> Date: Fri, 1 Apr 2022 14:15:49 +0200 Subject: [PATCH 059/112] added the missing minification files (#8553) Co-authored-by: elena.lampugnani --- .../Modules/Orchard.Blogs/Orchard.Blogs.csproj | 5 ++++- .../Modules/Orchard.Blogs/ResourceManifest.cs | 10 +++++++--- .../Scripts/orchard-blogs-archives.min.js | 1 + .../Orchard.Blogs/Styles/orchard-blogs-admin.min.css | 1 + .../Styles/orchard-blogs-archives.min.css | 1 + 5 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 src/Orchard.Web/Modules/Orchard.Blogs/Scripts/orchard-blogs-archives.min.js create mode 100644 src/Orchard.Web/Modules/Orchard.Blogs/Styles/orchard-blogs-admin.min.css create mode 100644 src/Orchard.Web/Modules/Orchard.Blogs/Styles/orchard-blogs-archives.min.css diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj b/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj index dd17cfa07..ce1cda30c 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj @@ -153,10 +153,13 @@ + + + @@ -276,4 +279,4 @@ - + \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/ResourceManifest.cs b/src/Orchard.Web/Modules/Orchard.Blogs/ResourceManifest.cs index 73cec5442..46b2ab3c1 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/ResourceManifest.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/ResourceManifest.cs @@ -4,10 +4,14 @@ namespace Orchard.Blogs { public class ResourceManifest : IResourceManifestProvider { public void BuildManifests(ResourceManifestBuilder builder) { var manifest = builder.Add(); - manifest.DefineStyle("BlogsAdmin").SetUrl("orchard-blogs-admin.css"); - manifest.DefineStyle("BlogsArchives").SetUrl("orchard-blogs-archives.css"); + manifest.DefineStyle("BlogsAdmin") + .SetUrl("orchard-blogs-admin.min.css", "orchard-blogs-admin.css"); + manifest.DefineStyle("BlogsArchives") + .SetUrl("orchard-blogs-archives.min.css", "orchard-blogs-archives.css"); - manifest.DefineScript("BlogsArchives").SetUrl("orchard-blogs-archives.js").SetDependencies("jQuery"); + manifest.DefineScript("BlogsArchives") + .SetUrl("orchard-blogs-archives.min.js", "orchard-blogs-archives.js") + .SetDependencies("jQuery"); } } } diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Scripts/orchard-blogs-archives.min.js b/src/Orchard.Web/Modules/Orchard.Blogs/Scripts/orchard-blogs-archives.min.js new file mode 100644 index 000000000..f88f74ff1 --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Scripts/orchard-blogs-archives.min.js @@ -0,0 +1 @@ +!function($){$((function(){$(".archives ul.years li.previous").each((function(){$(this).click((function(ev){ev&&!$(ev.target).not("a").size()||($(this).toggleClass("open"),$(this).find("h4>span").toggle(),$(this).children("ul").toggle())}))}))}))}(jQuery); \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Styles/orchard-blogs-admin.min.css b/src/Orchard.Web/Modules/Orchard.Blogs/Styles/orchard-blogs-admin.min.css new file mode 100644 index 000000000..d88e1f4c5 --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Styles/orchard-blogs-admin.min.css @@ -0,0 +1 @@ +#main .blog-description p{margin-bottom:1em} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Styles/orchard-blogs-archives.min.css b/src/Orchard.Web/Modules/Orchard.Blogs/Styles/orchard-blogs-archives.min.css new file mode 100644 index 000000000..3eb325a8c --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Styles/orchard-blogs-archives.min.css @@ -0,0 +1 @@ +.archives h3{margin-bottom:0}.archives ul{margin:0;padding:0}.archives ul .archives li{list-style-type:none}.archives ul.years li{list-style-type:none;margin:.6em 0 0}.archives ul.archiveMonthList li{margin:.2em 0}.archives ul.archiveMonthList li.first{margin-top:0}.archives ul.archiveMonthList li.last{margin-bottom:0}.archives ul.years li.previous h4 span{display:none}html.dyn .archives ul.years li.previous h4 span{display:inline}html.dyn .archives ul.years li h4,html.dyn .archives ul.years li ul{margin:.2em .2ex}html.dyn .archives ul.years li.previous h4:before{content:"⇓ "}html.dyn .archives ul.years li.previous{cursor:pointer;padding:.1em .2ex .2em 2ex;margin:0 -2ex}html.dyn .archives ul.years li.previous.hover{background-position:0 6px}html.dyn .archives ul.years li.previous.open h4:before{content:"⇑ "}html.dyn .archives ul.years li.previous.open.hover{background-position:0 6px}html.dyn .archives ul.years li.previous ul{display:none;margin-left:2ex} \ No newline at end of file From f161693d5240882135810a213030c20b28dba158 Mon Sep 17 00:00:00 2001 From: Andrea Piovanelli <83577153+AndreaPiovanelliLaser@users.noreply.github.com> Date: Fri, 17 Jun 2022 08:50:56 +0200 Subject: [PATCH 060/112] Moved ShapeTracing js includes at head (#8560) --- .../Views/ShapeTracingWrapper.cshtml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.DesignerTools/Views/ShapeTracingWrapper.cshtml b/src/Orchard.Web/Modules/Orchard.DesignerTools/Views/ShapeTracingWrapper.cshtml index 4d189d9f4..7585c312a 100644 --- a/src/Orchard.Web/Modules/Orchard.DesignerTools/Views/ShapeTracingWrapper.cshtml +++ b/src/Orchard.Web/Modules/Orchard.DesignerTools/Views/ShapeTracingWrapper.cshtml @@ -17,17 +17,17 @@ } // Code Mirror - Script.Include("CodeMirror/codemirror.js"); + Script.Include("CodeMirror/codemirror.js").AtHead(); Style.Include("CodeMirror/codemirror.css"); - Script.Include("CodeMirror/razor.js"); + Script.Include("CodeMirror/razor.js").AtHead(); Style.Include("CodeMirror/razor.css"); - Script.Include("CodeMirror/javascript.js"); - Style.Include("CodeMirror/javascript.css"); - Script.Include("CodeMirror/css.js"); + Script.Include("CodeMirror/javascript.js").AtHead(); + Style.Include("CodeMirror/javascript.css").AtHead(); + Script.Include("CodeMirror/css.js").AtHead(); Style.Include("CodeMirror/css.css"); - Script.Include("CodeMirror/htmlmixed.js"); + Script.Include("CodeMirror/htmlmixed.js").AtHead(); - Script.Include("jquery.tmpl.min.js"); + Script.Include("jquery.tmpl.min.js").AtHead(); } @Display(Model.Metadata.ChildContent) From 9f37c23dd729ae4378da614a26a2c62bc057fb8e Mon Sep 17 00:00:00 2001 From: Andrea Piovanelli <83577153+AndreaPiovanelliLaser@users.noreply.github.com> Date: Fri, 17 Jun 2022 08:51:25 +0200 Subject: [PATCH 061/112] allow RecipeManager to affect execution timeout (#8572) Co-authored-by: matteo.piovanelli --- .../Orchard.Recipes/Services/RecipeManager.cs | 29 ++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/src/Orchard.Web/Modules/Orchard.Recipes/Services/RecipeManager.cs b/src/Orchard.Web/Modules/Orchard.Recipes/Services/RecipeManager.cs index 41ae6ac9c..c787a212f 100644 --- a/src/Orchard.Web/Modules/Orchard.Recipes/Services/RecipeManager.cs +++ b/src/Orchard.Web/Modules/Orchard.Recipes/Services/RecipeManager.cs @@ -12,17 +12,38 @@ namespace Orchard.Recipes.Services { private readonly IRecipeScheduler _recipeScheduler; private readonly IRecipeExecuteEventHandler _recipeExecuteEventHandler; private readonly IRepository _recipeStepResultRecordRepository; + private readonly IWorkContextAccessor _workContextAccessor; public RecipeManager( IRecipeStepQueue recipeStepQueue, IRecipeScheduler recipeScheduler, IRecipeExecuteEventHandler recipeExecuteEventHandler, - IRepository recipeStepResultRecordRepository) { + IRepository recipeStepResultRecordRepository, + IWorkContextAccessor workContextAccessor) { _recipeStepQueue = recipeStepQueue; _recipeScheduler = recipeScheduler; _recipeExecuteEventHandler = recipeExecuteEventHandler; _recipeStepResultRecordRepository = recipeStepResultRecordRepository; + _workContextAccessor = workContextAccessor; + + RecipeExecutionTimeout = 600; + } + + public int RecipeExecutionTimeout { + get; set; + // The public setter allows injecting this from Sites.MyTenant.Config or Sites.config, by using + // an AutoFac component: + /* + + + + + + + */ } public string Execute(Recipe recipe) { @@ -35,6 +56,12 @@ namespace Orchard.Recipes.Services { return null; } + // Sets the request timeout to a configurable amount of seconds to give enough time to execute custom recipes. + var workContext = _workContextAccessor.GetContext(); + if (workContext?.HttpContext != null) { + workContext.HttpContext.Server.ScriptTimeout = RecipeExecutionTimeout; + } + var executionId = Guid.NewGuid().ToString("n"); ThreadContext.Properties["ExecutionId"] = executionId; From d0bd8d0af060612ffb5a0f95b80e93461e92516d Mon Sep 17 00:00:00 2001 From: Hermes Sbicego Date: Fri, 8 Jul 2022 16:49:56 +0200 Subject: [PATCH 062/112] Create unique HTML element ids for boolean fields edited via radio buttons (#8598) --- .../Views/EditorTemplates/Fields/Boolean.Edit.cshtml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.Fields/Views/EditorTemplates/Fields/Boolean.Edit.cshtml b/src/Orchard.Web/Modules/Orchard.Fields/Views/EditorTemplates/Fields/Boolean.Edit.cshtml index f2b8ca3fe..f0b1188b9 100644 --- a/src/Orchard.Web/Modules/Orchard.Fields/Views/EditorTemplates/Fields/Boolean.Edit.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Fields/Views/EditorTemplates/Fields/Boolean.Edit.cshtml @@ -13,17 +13,17 @@ case SelectionMode.Radiobutton: if (settings.Optional) {
    - checked="checked" } /> - + checked="checked" } /> +
    }
    - checked="checked" } /> - + checked="checked" } /> +
    - checked="checked" } /> - + checked="checked" } /> +
    break; case SelectionMode.Dropdown: From c38e6814a90bc6a999334c3e3ae06028eb8a623a Mon Sep 17 00:00:00 2001 From: Andrea Piovanelli <83577153+AndreaPiovanelliLaser@users.noreply.github.com> Date: Fri, 8 Jul 2022 16:51:07 +0200 Subject: [PATCH 063/112] Feature/blogposts search (#8570) --- .../Modules/Orchard.Blogs/AdminMenu.cs | 2 +- .../BlogPostLocalNavigationProvider.cs | 40 +++++ .../Controllers/BlogAdminController.cs | 25 ++- .../Orchard.Blogs/Orchard.Blogs.csproj | 1 + .../Orchard.Blogs/Views/BlogAdmin/Item.cshtml | 4 +- .../BlogPostsLocalNavigationProvider.cs | 42 +++++ .../Modules/Orchard.Search/Constants.cs | 12 ++ .../Controllers/BlogSearchController.cs | 162 ++++++++++++++++++ .../Modules/Orchard.Search/Migrations.cs | 19 ++ .../Modules/Orchard.Search/Module.txt | 5 + .../Orchard.Search/Orchard.Search.csproj | 10 +- .../Modules/Orchard.Search/Routes.cs | 15 ++ .../Views/BlogSearch/Index.cshtml | 21 +++ .../Themes/TheAdmin/Views/LocalMenu.cshtml | 12 +- 14 files changed, 356 insertions(+), 14 deletions(-) create mode 100644 src/Orchard.Web/Modules/Orchard.Blogs/BlogPostLocalNavigationProvider.cs create mode 100644 src/Orchard.Web/Modules/Orchard.Search/BlogPostsLocalNavigationProvider.cs create mode 100644 src/Orchard.Web/Modules/Orchard.Search/Constants.cs create mode 100644 src/Orchard.Web/Modules/Orchard.Search/Controllers/BlogSearchController.cs create mode 100644 src/Orchard.Web/Modules/Orchard.Search/Views/BlogSearch/Index.cshtml diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/AdminMenu.cs b/src/Orchard.Web/Modules/Orchard.Blogs/AdminMenu.cs index 090905c5d..617a9baa9 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/AdminMenu.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/AdminMenu.cs @@ -41,7 +41,7 @@ namespace Orchard.Blogs { if (singleBlog != null) menu.Add(T("New Post"), "1.1", item => - item.Action("Create", "BlogPostAdmin", new {area = "Orchard.Blogs", blogId = singleBlog.Id}).Permission(Permissions.MetaListOwnBlogs)); + item.Action("Create", "BlogPostAdmin", new { area = "Orchard.Blogs", blogId = singleBlog.Id }).Permission(Permissions.MetaListOwnBlogs)); menu.Add(T("New Blog"), "1.2", item => diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/BlogPostLocalNavigationProvider.cs b/src/Orchard.Web/Modules/Orchard.Blogs/BlogPostLocalNavigationProvider.cs new file mode 100644 index 000000000..5e20fbdaa --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.Blogs/BlogPostLocalNavigationProvider.cs @@ -0,0 +1,40 @@ +using Orchard.Blogs.Services; +using Orchard.Localization; +using Orchard.Security; +using Orchard.UI.Navigation; + +namespace Orchard.Blogs { + public class BlogPostsLocalNavigationProvider : INavigationProvider { + private readonly IBlogService _blogService; + private readonly IAuthorizationService _authorizationService; + private readonly IWorkContextAccessor _workContextAccessor; + + public BlogPostsLocalNavigationProvider( + IBlogService blogService, + IAuthorizationService authorizationService, + IWorkContextAccessor workContextAccessor) { + + T = NullLocalizer.Instance; + _blogService = blogService; + _authorizationService = authorizationService; + _workContextAccessor = workContextAccessor; + } + + public Localizer T { get; set; } + + public string MenuName { + get { return "blogposts-navigation"; } + } + + public void GetNavigation(NavigationBuilder builder) { + var blogId = 0; + int.TryParse(_workContextAccessor.GetContext().HttpContext.Request.RequestContext.RouteData.Values["blogId"]?.ToString(), out blogId); + if (blogId > 0) { + builder.Add(T("Blog posts"), + item => item.Action("Item", "BlogAdmin", new { area = "Orchard.Blogs", blogId }) + .LocalNav() + .Permission(Permissions.MetaListOwnBlogs)); + } + } + } +} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogAdminController.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogAdminController.cs index 001ef9fbf..796aa0c6e 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogAdminController.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogAdminController.cs @@ -2,7 +2,6 @@ using System.Linq; using System.Web.Mvc; using Orchard.Blogs.Extensions; using Orchard.Blogs.Models; -using Orchard.Blogs.Routing; using Orchard.Blogs.Services; using Orchard.ContentManagement; using Orchard.Data; @@ -13,6 +12,7 @@ using Orchard.UI.Admin; using Orchard.UI.Navigation; using Orchard.UI.Notify; using Orchard.Settings; +using System.Collections.Generic; namespace Orchard.Blogs.Controllers { @@ -21,6 +21,7 @@ namespace Orchard.Blogs.Controllers { private readonly IBlogService _blogService; private readonly IBlogPostService _blogPostService; private readonly IContentManager _contentManager; + private readonly INavigationManager _navigationManager; private readonly ITransactionManager _transactionManager; private readonly ISiteService _siteService; @@ -29,6 +30,7 @@ namespace Orchard.Blogs.Controllers { IBlogService blogService, IBlogPostService blogPostService, IContentManager contentManager, + INavigationManager navigationManager, ITransactionManager transactionManager, ISiteService siteService, IShapeFactory shapeFactory) { @@ -36,6 +38,7 @@ namespace Orchard.Blogs.Controllers { _blogService = blogService; _blogPostService = blogPostService; _contentManager = contentManager; + _navigationManager = navigationManager; _transactionManager = transactionManager; _siteService = siteService; T = NullLocalizer.Instance; @@ -151,10 +154,10 @@ namespace Orchard.Blogs.Controllers { list.AddRange(_blogService.Get(VersionOptions.Latest) .Where(x => Services.Authorizer.Authorize(Permissions.MetaListOwnBlogs, x)) .Select(b => { - var blog = Services.ContentManager.BuildDisplay(b, "SummaryAdmin"); - blog.TotalPostCount = _blogPostService.PostCount(b, VersionOptions.Latest); - return blog; - })); + var blog = Services.ContentManager.BuildDisplay(b, "SummaryAdmin"); + blog.TotalPostCount = _blogPostService.PostCount(b, VersionOptions.Latest); + return blog; + })); var viewModel = Services.New.ViewModel() .ContentItems(list); @@ -179,6 +182,18 @@ namespace Orchard.Blogs.Controllers { var totalItemCount = _blogPostService.PostCount(blogPart, VersionOptions.Latest); blog.Content.Add(Shape.Pager(pager).TotalItemCount(totalItemCount), "Content:after"); + // Adds LocalMenus; + var menuItems = _navigationManager.BuildMenu("blogposts-navigation"); + var request = Services.WorkContext.HttpContext.Request; + + // Set the currently selected path + Stack selectedPath = NavigationHelper.SetSelectedPath(menuItems, request, request.RequestContext.RouteData); + + // Populate local nav + dynamic localMenuShape = Shape.LocalMenu().MenuName("local-admin"); + // NavigationHelper.PopulateLocalMenu(Shape, localMenuShape, localMenuShape, selectedPath); + NavigationHelper.PopulateLocalMenu(Shape, localMenuShape, localMenuShape, menuItems); + Services.WorkContext.Layout.LocalNavigation.Add(localMenuShape); return View(blog); } diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj b/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj index ce1cda30c..b28fc95df 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj @@ -95,6 +95,7 @@ + diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogAdmin/Item.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogAdmin/Item.cshtml index 6534c6b2f..76581b42c 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogAdmin/Item.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogAdmin/Item.cshtml @@ -1,5 +1,5 @@ @{ Layout.Title = T("Manage Blog").ToString(); } - @* Model is a Shape, calling Display() so that it is rendered using the most specific template for its Shape type *@ - @Display(Model) +@* Model is a Shape, calling Display() so that it is rendered using the most specific template for its Shape type *@ +@Display(Model) diff --git a/src/Orchard.Web/Modules/Orchard.Search/BlogPostsLocalNavigationProvider.cs b/src/Orchard.Web/Modules/Orchard.Search/BlogPostsLocalNavigationProvider.cs new file mode 100644 index 000000000..03acc6638 --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.Search/BlogPostsLocalNavigationProvider.cs @@ -0,0 +1,42 @@ +using System.Linq; +using Orchard.Blogs; +using Orchard.Blogs.Services; +using Orchard.Environment.Extensions; +using Orchard.Localization; +using Orchard.Security; +using Orchard.UI.Navigation; + +namespace Orchard.Search { + [OrchardFeature("Orchard.Search.Blogs")] + public class BlogPostsLocalNavigationProvider : INavigationProvider { + private readonly IBlogService _blogService; + private readonly IAuthorizationService _authorizationService; + private readonly IWorkContextAccessor _workContextAccessor; + + public BlogPostsLocalNavigationProvider( + IBlogService blogService, + IAuthorizationService authorizationService, + IWorkContextAccessor workContextAccessor) { + + T = NullLocalizer.Instance; + _blogService = blogService; + _authorizationService = authorizationService; + _workContextAccessor = workContextAccessor; + } + + public Localizer T { get; set; } + + public string MenuName { + get { return "blogposts-navigation"; } + } + public void GetNavigation(NavigationBuilder builder) { + var blogId = 0; + int.TryParse(_workContextAccessor.GetContext().HttpContext.Request.RequestContext.RouteData.Values["blogId"]?.ToString(), out blogId); + if (blogId > 0) { + builder.Add(T("Search Posts"), "2.0", item => item.Action("Index", "BlogSearch", new { area = "Orchard.Search", blogId }) + .LocalNav() + .Permission(Permissions.MetaListOwnBlogs)); + } + } + } +} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Search/Constants.cs b/src/Orchard.Web/Modules/Orchard.Search/Constants.cs new file mode 100644 index 000000000..696a300ca --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.Search/Constants.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using Orchard.Environment.Extensions; + +namespace Orchard.Search { + [OrchardFeature("Orchard.Search.Blogs")] + public class BlogSearchConstants { + public static string ADMIN_BLOGPOSTS_INDEX = "AdminBlogPosts"; + } +} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Search/Controllers/BlogSearchController.cs b/src/Orchard.Web/Modules/Orchard.Search/Controllers/BlogSearchController.cs new file mode 100644 index 000000000..6497eaa9b --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.Search/Controllers/BlogSearchController.cs @@ -0,0 +1,162 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web.Mvc; +using Orchard.Collections; +using Orchard.ContentManagement; +using Orchard.ContentManagement.MetaData; +using Orchard.DisplayManagement; +using Orchard.Environment.Extensions; +using Orchard.Indexing; +using Orchard.Localization; +using Orchard.Localization.Services; +using Orchard.Logging; +using Orchard.Search.Helpers; +using Orchard.Search.Models; +using Orchard.Search.Services; +using Orchard.Security; +using Orchard.Settings; +using Orchard.UI.Admin; +using Orchard.UI.Navigation; +using Orchard.UI.Notify; + +namespace Orchard.Search.Controllers { + [OrchardFeature("Orchard.Search.Blogs")] + [Admin] + public class BlogSearchController : Controller { + private readonly ISearchService _searchService; + private readonly ISiteService _siteService; + private readonly IIndexManager _indexManager; + private readonly IContentDefinitionManager _contentDefinitionManager; + private readonly IContentManager _contentManager; + private readonly IAuthorizer _authorizer; + private readonly ICultureManager _cultureManager; + private readonly INavigationManager _navigationManager; + + public BlogSearchController( + IOrchardServices orchardServices, + ISearchService searchService, + ISiteService siteService, + IIndexManager indexManager, + IContentDefinitionManager contentDefinitionManager, + IContentManager contentManager, + IAuthorizer authorizer, + ICultureManager cultureManager, + INavigationManager navigationManager, + IShapeFactory shapeFactory) { + + _searchService = searchService; + _siteService = siteService; + Services = orchardServices; + _indexManager = indexManager; + _contentDefinitionManager = contentDefinitionManager; + _contentManager = contentManager; + _authorizer = authorizer; + _cultureManager = cultureManager; + _navigationManager = navigationManager; + Shape = shapeFactory; + T = NullLocalizer.Instance; + Logger = NullLogger.Instance; + } + + public IOrchardServices Services { get; set; } + public ILogger Logger { get; set; } + public Localizer T { get; set; } + public dynamic Shape { get; set; } + + public ActionResult Index(int blogId, PagerParameters pagerParameters, string searchText = "") { + var pager = new Pager(_siteService.GetSiteSettings(), pagerParameters); + var searchSettingsPart = Services.WorkContext.CurrentSite.As(); + + IPageOfItems searchHits = new PageOfItems(new ISearchHit[] { }); + try { + if (!string.IsNullOrWhiteSpace(searchText)) { + var searchableTypes = new List(); + // add the type to the list of types we will filter for + // BlogPost for now but we would add more types in the future (i.e. "Article") + searchableTypes.Add("BlogPost"); + var searchBuilder = _indexManager.HasIndexProvider() + ? _indexManager + .GetSearchIndexProvider() + .CreateSearchBuilder(BlogSearchConstants.ADMIN_BLOGPOSTS_INDEX) + : new NullSearchBuilder(); + + searchBuilder + .Parse(searchSettingsPart + .GetSearchFields(BlogSearchConstants.ADMIN_BLOGPOSTS_INDEX), + searchText); + + // filter by Blog + searchBuilder + .WithField("container-id", blogId) + .Mandatory() + .NotAnalyzed() + .AsFilter(); + + foreach (var searchableType in searchableTypes) { + // filter by type + searchBuilder + .WithField("type", searchableType) + .NotAnalyzed() + .AsFilter(); + } + // pagination + var totalCount = searchBuilder.Count(); + if (pager != null) { + searchBuilder = searchBuilder + .Slice( + (pager.Page > 0 ? pager.Page - 1 : 0) * pager.PageSize, + pager.PageSize); + } + // search + var searchResults = searchBuilder.Search(); + // prepare the shape for the page + searchHits = new PageOfItems(searchResults.Select(searchHit => searchHit)) { + PageNumber = pager != null ? pager.Page : 0, + PageSize = pager != null ? (pager.PageSize != 0 ? pager.PageSize : totalCount) : totalCount, + TotalItemCount = totalCount + }; + } + + } + catch (Exception exception) { + Logger.Error(T("Invalid search query: {0}", exception.Message).Text); + Services.Notifier.Error(T("Invalid search query: {0}", exception.Message)); + } + + var list = Services.New.List(); + foreach (var contentItem in Services.ContentManager.GetMany(searchHits.Select(x => x.ContentItemId), VersionOptions.Latest, QueryHints.Empty)) { + // ignore search results which content item has been removed + if (contentItem == null) { + searchHits.TotalItemCount--; + continue; + } + + list.Add(Services.ContentManager.BuildDisplay(contentItem, "SummaryAdmin")); + } + + var pagerShape = Services.New.Pager(pager).TotalItemCount(searchHits.TotalItemCount); + + var viewModel = Services.New.ViewModel() + .ContentItems(list) + .Pager(pagerShape) + .SearchText(searchText) + .BlogId(blogId); + + // Adds LocalMenus; + var menuItems = _navigationManager.BuildMenu("blogposts-navigation"); + var request = Services.WorkContext.HttpContext.Request; + + // Set the currently selected path + Stack selectedPath = NavigationHelper.SetSelectedPath(menuItems, request, request.RequestContext.RouteData); + + // Populate local nav + dynamic localMenuShape = Shape.LocalMenu().MenuName("local-admin"); + + NavigationHelper.PopulateLocalMenu(Shape, localMenuShape, localMenuShape, menuItems); + Services.WorkContext.Layout.LocalNavigation.Add(localMenuShape); + + return View(viewModel); + } + } +} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Search/Migrations.cs b/src/Orchard.Web/Modules/Orchard.Search/Migrations.cs index a680469c0..f03156f00 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/Migrations.cs +++ b/src/Orchard.Web/Modules/Orchard.Search/Migrations.cs @@ -69,4 +69,23 @@ namespace Orchard.Search { return 1; } } + + [OrchardFeature("Orchard.Search.Blogs")] + public class BlogsMigration : DataMigrationImpl { + private readonly IIndexManager _indexManager; + + public BlogsMigration(IIndexManager indexManager) { + _indexManager = indexManager; + } + + public int Create() { + + _indexManager.GetSearchIndexProvider().CreateIndex(BlogSearchConstants.ADMIN_BLOGPOSTS_INDEX); + + ContentDefinitionManager.AlterTypeDefinition("BlogPost", cfg => cfg.WithSetting("TypeIndexing.Indexes", BlogSearchConstants.ADMIN_BLOGPOSTS_INDEX + ":latest")); + + return 1; + } + } + } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Search/Module.txt b/src/Orchard.Web/Modules/Orchard.Search/Module.txt index ccbce4fc6..c40d8c5ad 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/Module.txt +++ b/src/Orchard.Web/Modules/Orchard.Search/Module.txt @@ -26,4 +26,9 @@ Features: Name: Media Library Search Description: Provides search menu item in the Media Library explorer. Dependencies: Orchard.MediaLibrary, Orchard.Search + Category: Search + Orchard.Search.Blogs: + Name: Blog posts Search + Description: Provides search menu item in the Blog section. + Dependencies: Orchard.Blogs, Orchard.Search Category: Search \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj b/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj index c992378c0..8c1fb4f02 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj +++ b/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj @@ -93,7 +93,10 @@ + + + @@ -134,6 +137,10 @@ Orchard.Core $(MvcBuildViews) + + {63FBD4D9-E1DA-4A7B-AA6A-D6074FE50867} + Orchard.Blogs + {73a7688a-5bd3-4f7e-adfa-ce36c5a10e3b} Orchard.MediaLibrary @@ -207,6 +214,7 @@ + 10.0 @@ -246,4 +254,4 @@ - + \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Search/Routes.cs b/src/Orchard.Web/Modules/Orchard.Search/Routes.cs index 4cd35d055..738ec9af7 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/Routes.cs +++ b/src/Orchard.Web/Modules/Orchard.Search/Routes.cs @@ -41,6 +41,21 @@ namespace Orchard.Search { {"area", "Orchard.Search"} }, new MvcRouteHandler()) + }, + new RouteDescriptor { + Priority = 5, + Route = new Route("Admin/Search/BlogSearch/{blogId}", + new RouteValueDictionary { + {"area", "Orchard.Search"}, + {"controller", "BlogSearch"}, + {"action", "Index"}, + {"blogId", UrlParameter.Optional} + }, + null, + new RouteValueDictionary { + {"area", "Orchard.Search"} + }, + new MvcRouteHandler()) } }; } diff --git a/src/Orchard.Web/Modules/Orchard.Search/Views/BlogSearch/Index.cshtml b/src/Orchard.Web/Modules/Orchard.Search/Views/BlogSearch/Index.cshtml new file mode 100644 index 000000000..e0a9b88de --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.Search/Views/BlogSearch/Index.cshtml @@ -0,0 +1,21 @@ +@{ + var pageTitle = T("Search Content"); + Layout.Title = pageTitle; +} + +@using (Html.BeginFormAntiForgeryPost(Url.Action("index", new { controller = "BlogSearch", area = "Orchard.Search", blogId = Model.BlogId }), FormMethod.Get)) { + + @Html.TextBox("searchText", (string)Model.SearchText, new { @class = "text medium", autofocus = "autofocus" }) + + + +
    + @Display(Model.ContentItems) +
    + + if (HasText(Model.SearchText) && Model.ContentItems.Items.Count == 0) { + @T("There are no results") + } + + @Display(Model.Pager) +} \ No newline at end of file diff --git a/src/Orchard.Web/Themes/TheAdmin/Views/LocalMenu.cshtml b/src/Orchard.Web/Themes/TheAdmin/Views/LocalMenu.cshtml index 87dc8244d..efdc9129b 100644 --- a/src/Orchard.Web/Themes/TheAdmin/Views/LocalMenu.cshtml +++ b/src/Orchard.Web/Themes/TheAdmin/Views/LocalMenu.cshtml @@ -6,8 +6,9 @@ Model.Attributes.Add("role", "local-navigation"); var tag = Tag(Model, "ul"); } -@tag.StartElement - @foreach(var firstLevelMenuItem in Model) { +@if (Model.Items!=null && Model.Items.Count > 0) { + @tag.StartElement + foreach (var firstLevelMenuItem in Model) { if (firstLevelMenuItem.LocalNav) { string sectionHeaderText = firstLevelMenuItem.Text.Text; @@ -34,8 +35,9 @@ firstLevelMenuItem.Classes.Add("local-section-" + sectionHeaderText.HtmlClassify()); var firstLevelTag = Tag(firstLevelMenuItem, "li"); @firstLevelTag.StartElement - @sectionHeaderMarkup - @firstLevelTag.EndElement + @sectionHeaderMarkup + @firstLevelTag.EndElement } } -@tag.EndElement + @tag.EndElement +} \ No newline at end of file From 343ceb777b3aaa786ed6581e78ecd6a383c5fea1 Mon Sep 17 00:00:00 2001 From: Andrea Piovanelli <83577153+AndreaPiovanelliLaser@users.noreply.github.com> Date: Fri, 15 Jul 2022 08:38:03 +0200 Subject: [PATCH 064/112] 8599 nullable field values (#8600) * Added nullable type to DescribeMemberContext for BooleanField and NumericField. * Rollback of nullable member value for NumericFieldDriver, which is unnecessary because Editor function doesn't let a null value to be saved. --- .../Modules/Orchard.Fields/Drivers/BooleanFieldDriver.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Orchard.Web/Modules/Orchard.Fields/Drivers/BooleanFieldDriver.cs b/src/Orchard.Web/Modules/Orchard.Fields/Drivers/BooleanFieldDriver.cs index 09dcda02f..c580e932e 100644 --- a/src/Orchard.Web/Modules/Orchard.Fields/Drivers/BooleanFieldDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.Fields/Drivers/BooleanFieldDriver.cs @@ -67,7 +67,7 @@ namespace Orchard.Fields.Drivers { protected override void Describe(DescribeMembersContext context) { context - .Member(null, typeof(Boolean), T("Value"), T("The boolean value of the field.")) + .Member(null, typeof(Boolean?), T("Value"), T("The boolean value of the field.")) .Enumerate(() => field => new [] { field.Value }) ; } From ddc56c8baa2dd18c526a391dfd19d64c9698b63f Mon Sep 17 00:00:00 2001 From: Andrea Piovanelli <83577153+AndreaPiovanelliLaser@users.noreply.github.com> Date: Mon, 5 Sep 2022 09:01:30 +0200 Subject: [PATCH 065/112] Moved logic for max file path length in file storage provider (#8603) Co-authored-by: matteo.piovanelli --- .../Services/ImageProfileManager.cs | 2 ++ .../Media/FileSystemStorageProvider.cs | 28 +++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/src/Orchard.Web/Modules/Orchard.MediaProcessing/Services/ImageProfileManager.cs b/src/Orchard.Web/Modules/Orchard.MediaProcessing/Services/ImageProfileManager.cs index cc5ec742b..d1d521a41 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaProcessing/Services/ImageProfileManager.cs +++ b/src/Orchard.Web/Modules/Orchard.MediaProcessing/Services/ImageProfileManager.cs @@ -171,6 +171,8 @@ namespace Orchard.MediaProcessing.Services { } } } + // the storage provider may have altered the filepath + filterContext.FilePath = newFile.GetPath(); } } catch(Exception e) { diff --git a/src/Orchard/FileSystems/Media/FileSystemStorageProvider.cs b/src/Orchard/FileSystems/Media/FileSystemStorageProvider.cs index 782590892..e932271dc 100644 --- a/src/Orchard/FileSystems/Media/FileSystemStorageProvider.cs +++ b/src/Orchard/FileSystems/Media/FileSystemStorageProvider.cs @@ -34,10 +34,27 @@ namespace Orchard.FileSystems.Media { _publicPath = appPath + "Media/" + settings.Name + "/"; T = NullLocalizer.Instance; + MaxPathLength = 260; } public Localizer T { get; set; } + public int MaxPathLength { + get; set; + // The public setter allows injecting this from Sites.MyTenant.Config or Sites.config, by using + // an AutoFac component: + /* + + + + + + + */ + } + /// /// Maps a relative path into the storage path. /// @@ -335,6 +352,17 @@ namespace Orchard.FileSystems.Media { if (!Directory.Exists(dirName)) { Directory.CreateDirectory(dirName); } + //Path.GetFileNameWithoutExtension(fileInfo.Name) + // If absolute path is longer than the maximum path length (260 characters), file cannot be saved. + if (fileInfo.FullName.Length > MaxPathLength) { + var fileName = Path.GetFileNameWithoutExtension(fileInfo.Name); + var extension = fileInfo.Extension; + // try to generate a shorter path for the file + var nameHash = fileName.GetHashCode().ToString("x"); + // Hopefully this new path is short enough now + path = Combine(Path.GetDirectoryName(path), nameHash + extension); + fileInfo = new FileInfo(MapStorage(path)); + } File.WriteAllBytes(fileInfo.FullName, new byte[0]); return new FileSystemStorageFile(Fix(path), fileInfo); From a402c82c23c726911dd0e704b3985e76de43c529 Mon Sep 17 00:00:00 2001 From: Matteo Piovanelli Date: Mon, 19 Sep 2022 08:41:21 +0200 Subject: [PATCH 066/112] Bump version for owin packages. (#8617) * Bump version for owin packages. * restored project settings that had been altered when updating packages --- src/Orchard.Specs/App.Config | 2 +- src/Orchard.Web.Tests/app.config | 2 +- .../Orchard.SecureSocketsLayer.csproj | 6 +++--- .../Modules/Orchard.SecureSocketsLayer/packages.config | 4 ++-- src/Orchard.Web/Orchard.Web.csproj | 6 +++--- src/Orchard.Web/Web.config | 6 +++++- src/Orchard.Web/packages.config | 4 ++-- src/Orchard/Orchard.Framework.csproj | 6 +++--- src/Orchard/packages.config | 4 ++-- 9 files changed, 22 insertions(+), 18 deletions(-) diff --git a/src/Orchard.Specs/App.Config b/src/Orchard.Specs/App.Config index 4e78cca42..ac77472da 100644 --- a/src/Orchard.Specs/App.Config +++ b/src/Orchard.Specs/App.Config @@ -36,7 +36,7 @@ - + diff --git a/src/Orchard.Web.Tests/app.config b/src/Orchard.Web.Tests/app.config index 7688d926e..35fa94aea 100644 --- a/src/Orchard.Web.Tests/app.config +++ b/src/Orchard.Web.Tests/app.config @@ -28,7 +28,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Orchard.SecureSocketsLayer.csproj b/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Orchard.SecureSocketsLayer.csproj index 21d5c5e34..d9cdbc18e 100644 --- a/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Orchard.SecureSocketsLayer.csproj +++ b/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Orchard.SecureSocketsLayer.csproj @@ -58,8 +58,8 @@ ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - - ..\..\..\packages\Microsoft.Owin.4.1.1\lib\net45\Microsoft.Owin.dll + + ..\..\..\packages\Microsoft.Owin.4.2.2\lib\net45\Microsoft.Owin.dll ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll @@ -192,4 +192,4 @@ - + \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/packages.config b/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/packages.config index b77a2bcfd..db2954460 100644 --- a/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/packages.config +++ b/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/packages.config @@ -4,7 +4,7 @@ - + - + \ No newline at end of file diff --git a/src/Orchard.Web/Orchard.Web.csproj b/src/Orchard.Web/Orchard.Web.csproj index 62bc43401..b0edf8bd8 100644 --- a/src/Orchard.Web/Orchard.Web.csproj +++ b/src/Orchard.Web/Orchard.Web.csproj @@ -63,8 +63,8 @@ ..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - - ..\packages\Microsoft.Owin.4.1.1\lib\net45\Microsoft.Owin.dll + + ..\packages\Microsoft.Owin.4.2.2\lib\net45\Microsoft.Owin.dll ..\packages\Microsoft.Owin.Host.SystemWeb.4.1.1\lib\net45\Microsoft.Owin.Host.SystemWeb.dll @@ -292,4 +292,4 @@ - + \ No newline at end of file diff --git a/src/Orchard.Web/Web.config b/src/Orchard.Web/Web.config index 6fe7614ce..0d024841d 100644 --- a/src/Orchard.Web/Web.config +++ b/src/Orchard.Web/Web.config @@ -49,7 +49,7 @@ - + @@ -223,6 +223,10 @@ + + + + diff --git a/src/Orchard.Web/packages.config b/src/Orchard.Web/packages.config index 79b64a8a4..c24d273a4 100644 --- a/src/Orchard.Web/packages.config +++ b/src/Orchard.Web/packages.config @@ -6,7 +6,7 @@ - + @@ -14,4 +14,4 @@ - + \ No newline at end of file diff --git a/src/Orchard/Orchard.Framework.csproj b/src/Orchard/Orchard.Framework.csproj index 6ae73dc2d..1ed5bd2d1 100644 --- a/src/Orchard/Orchard.Framework.csproj +++ b/src/Orchard/Orchard.Framework.csproj @@ -80,8 +80,8 @@ ..\packages\log4net.2.0.12\lib\net45\log4net.dll - - ..\packages\Microsoft.Owin.4.1.1\lib\net45\Microsoft.Owin.dll + + ..\packages\Microsoft.Owin.4.2.2\lib\net45\Microsoft.Owin.dll ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll @@ -1067,4 +1067,4 @@ - + \ No newline at end of file diff --git a/src/Orchard/packages.config b/src/Orchard/packages.config index 70633e18b..ae21c35d4 100644 --- a/src/Orchard/packages.config +++ b/src/Orchard/packages.config @@ -12,9 +12,9 @@ - + - + \ No newline at end of file From 8f7329940614b35c368662a7d983edb5a5724ef1 Mon Sep 17 00:00:00 2001 From: Matteo Piovanelli Date: Fri, 14 Oct 2022 08:55:52 +0200 Subject: [PATCH 067/112] Added cachekey parameter to discriminate between ajax and "normal" calls (#8630) --- .../Modules/Orchard.OutputCache/Filters/OutputCacheFilter.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Orchard.Web/Modules/Orchard.OutputCache/Filters/OutputCacheFilter.cs b/src/Orchard.Web/Modules/Orchard.OutputCache/Filters/OutputCacheFilter.cs index 156179484..8e80aff39 100644 --- a/src/Orchard.Web/Modules/Orchard.OutputCache/Filters/OutputCacheFilter.cs +++ b/src/Orchard.Web/Modules/Orchard.OutputCache/Filters/OutputCacheFilter.cs @@ -390,6 +390,9 @@ namespace Orchard.OutputCache.Filters { // Vary by theme. result.Add("theme", _workContext.CurrentTheme.Id.ToLowerInvariant()); + // Vary for ajax vs "normal" calls + result.Add("isajax", filterContext.HttpContext.Request.IsAjaxRequest().ToString()); + // Vary by configured query string parameters. var queryString = filterContext.RequestContext.HttpContext.Request.QueryString; foreach (var key in queryString.AllKeys) { From ba5873aece68945f2f04ddc4125e755786c29b70 Mon Sep 17 00:00:00 2001 From: Alessandro Agostini <102729761+AgostiniAlessandro@users.noreply.github.com> Date: Fri, 14 Oct 2022 08:57:44 +0200 Subject: [PATCH 068/112] Fix for issue 8631: field values are reset when imported (#8632) * If there is nothing to import for MediaLibraryPickerField and ContentPickerField, the field doesn't need to be reset. * Checked the presence of the field inside the import context to avoid resetting the field value even if the field isn't imported. This applies to ContentPickerField, MediaLibraryPickerField and NumericField. --- .../Drivers/ContentPickerFieldDriver.cs | 23 +++++++++++-------- .../Drivers/NumericFieldDriver.cs | 8 ++++++- .../Drivers/MediaLibraryPickerFieldDriver.cs | 22 +++++++++++------- 3 files changed, 34 insertions(+), 19 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.ContentPicker/Drivers/ContentPickerFieldDriver.cs b/src/Orchard.Web/Modules/Orchard.ContentPicker/Drivers/ContentPickerFieldDriver.cs index 98317ee4b..ce9c3bca7 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentPicker/Drivers/ContentPickerFieldDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.ContentPicker/Drivers/ContentPickerFieldDriver.cs @@ -89,8 +89,7 @@ namespace Orchard.ContentPicker.Drivers { if (String.IsNullOrEmpty(model.SelectedIds)) { field.Ids = new int[0]; - } - else { + } else { field.Ids = model.SelectedIds.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries).Select(int.Parse).ToArray(); } @@ -102,14 +101,18 @@ namespace Orchard.ContentPicker.Drivers { } protected override void Importing(ContentPart part, Fields.ContentPickerField field, ImportContentContext context) { - var contentItemIds = context.Attribute(field.FieldDefinition.Name + "." + field.Name, "ContentItems"); - if (contentItemIds != null) { - field.Ids = contentItemIds.Split(',') - .Select(context.GetItemFromSession) - .Select(contentItem => contentItem.Id).ToArray(); - } - else { - field.Ids = new int[0]; + // If nothing about the field is inside the context, field is not modified. + // For this reason, check if the current element is inside the ImportContentContext. + var element = context.Data.Element(field.FieldDefinition.Name + "." + field.Name); + if (element != null) { + var contentItemIds = context.Attribute(field.FieldDefinition.Name + "." + field.Name, "ContentItems"); + if (contentItemIds != null) { + field.Ids = contentItemIds.Split(',') + .Select(context.GetItemFromSession) + .Select(contentItem => contentItem.Id).ToArray(); + } else { + field.Ids = new int[0]; + } } } diff --git a/src/Orchard.Web/Modules/Orchard.Fields/Drivers/NumericFieldDriver.cs b/src/Orchard.Web/Modules/Orchard.Fields/Drivers/NumericFieldDriver.cs index 493b40d97..8182a97f7 100644 --- a/src/Orchard.Web/Modules/Orchard.Fields/Drivers/NumericFieldDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.Fields/Drivers/NumericFieldDriver.cs @@ -102,7 +102,13 @@ namespace Orchard.Fields.Drivers { } protected override void Importing(ContentPart part, NumericField field, ImportContentContext context) { - context.ImportAttribute(field.FieldDefinition.Name + "." + field.Name, "Value", v => field.Value = decimal.Parse(v, CultureInfo.InvariantCulture), () => field.Value = (decimal?)null); + Action empty = (() => field.Value = (decimal?)null); + var element = context.Data.Element(field.FieldDefinition.Name + "." + field.Name); + // If element is not in the ImportContentContext, field must not be reset. + if (element == null) { + empty = () => { }; + } + context.ImportAttribute(field.FieldDefinition.Name + "." + field.Name, "Value", v => field.Value = decimal.Parse(v, CultureInfo.InvariantCulture), empty); } protected override void Exporting(ContentPart part, NumericField field, ExportContentContext context) { diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Drivers/MediaLibraryPickerFieldDriver.cs b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Drivers/MediaLibraryPickerFieldDriver.cs index e0bc19991..3c86ec400 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Drivers/MediaLibraryPickerFieldDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Drivers/MediaLibraryPickerFieldDriver.cs @@ -72,14 +72,20 @@ namespace Orchard.MediaLibrary.Drivers { } protected override void Importing(ContentPart part, Fields.MediaLibraryPickerField field, ImportContentContext context) { - var contentItemIds = context.Attribute(field.FieldDefinition.Name + "." + field.Name, "ContentItems"); - if (contentItemIds != null) { - field.Ids = contentItemIds.Split(',') - .Select(context.GetItemFromSession) - .Select(contentItem => contentItem.Id).ToArray(); - } - else { - field.Ids = new int[0]; + // If nothing about the field is inside the context, field is not modified. + // For this reason, check if the current element is inside the ImportContentContext. + var element = context.Data.Element(field.FieldDefinition.Name + "." + field.Name); + if (element != null) { + var contentItemIds = context.Attribute(field.FieldDefinition.Name + "." + field.Name, "ContentItems"); + if (contentItemIds != null) { + if (!string.IsNullOrWhiteSpace(contentItemIds)) { + field.Ids = contentItemIds.Split(',') + .Select(context.GetItemFromSession) + .Select(contentItem => contentItem.Id).ToArray(); + } + } else { + field.Ids = new int[0]; + } } } From f76f7bd428c0ff890177491fd5597f6a5378a6fe Mon Sep 17 00:00:00 2001 From: Matteo Piovanelli Date: Thu, 20 Oct 2022 19:07:50 +0200 Subject: [PATCH 069/112] Updated SharpZipLib to 1.3.3 (#8633) --- src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj | 4 ++-- src/Orchard.Tests.Modules/packages.config | 2 +- src/Orchard.Web/Modules/Lucene/Lucene.csproj | 6 +++--- src/Orchard.Web/Modules/Lucene/packages.config | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj b/src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj index 0c143f833..7f9be8c46 100644 --- a/src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj +++ b/src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj @@ -74,8 +74,8 @@ ..\packages\Orchard.FluentPath.1.0.0.1\lib\FluentPath.dll - - ..\packages\SharpZipLib.1.3.1\lib\net45\ICSharpCode.SharpZipLib.dll + + ..\packages\SharpZipLib.1.3.3\lib\net45\ICSharpCode.SharpZipLib.dll ..\packages\Iesi.Collections.4.0.1.4000\lib\net40\Iesi.Collections.dll diff --git a/src/Orchard.Tests.Modules/packages.config b/src/Orchard.Tests.Modules/packages.config index c66e5ff69..7ee686fd9 100644 --- a/src/Orchard.Tests.Modules/packages.config +++ b/src/Orchard.Tests.Modules/packages.config @@ -17,5 +17,5 @@ - + \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Lucene/Lucene.csproj b/src/Orchard.Web/Modules/Lucene/Lucene.csproj index e8e23cd63..b4004ea11 100644 --- a/src/Orchard.Web/Modules/Lucene/Lucene.csproj +++ b/src/Orchard.Web/Modules/Lucene/Lucene.csproj @@ -55,8 +55,8 @@ false - - ..\..\..\packages\SharpZipLib.1.3.1\lib\net45\ICSharpCode.SharpZipLib.dll + + ..\..\..\packages\SharpZipLib.1.3.3\lib\net45\ICSharpCode.SharpZipLib.dll ..\..\..\packages\Lucene.Net.3.0.3\lib\NET40\Lucene.Net.dll @@ -176,4 +176,4 @@ - + \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Lucene/packages.config b/src/Orchard.Web/Modules/Lucene/packages.config index 430c6cf5b..606c51d16 100644 --- a/src/Orchard.Web/Modules/Lucene/packages.config +++ b/src/Orchard.Web/Modules/Lucene/packages.config @@ -6,5 +6,5 @@ - - + + \ No newline at end of file From 2a1b0b3af3a3eac55c4b8db590904d7f0164e2e3 Mon Sep 17 00:00:00 2001 From: Alessandro Agostini <102729761+AgostiniAlessandro@users.noreply.github.com> Date: Tue, 6 Dec 2022 09:26:34 +0100 Subject: [PATCH 070/112] Added hints to show technical names in list of content types and content field definition edit (#8640) * Added hint in EditField view * Added hint to EditTypeViewModel.cshtml to show technical name in list of content types * fixed typo * Clarified hint displaying technical name. Co-authored-by: Andrea Piovanelli --- .../Views/Admin/EditField.cshtml | 15 ++++++++------- .../DisplayTemplates/EditTypeViewModel.cshtml | 1 + 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/EditField.cshtml b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/EditField.cshtml index feec86179..c259852d7 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/EditField.cshtml +++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/EditField.cshtml @@ -12,13 +12,14 @@ @using (Html.BeginFormAntiForgeryPost()) { @Html.ValidationSummary() -
    - - @Html.TextBoxFor(m => m.DisplayName, new {@class = "text medium", autofocus = "autofocus"}) - @T("Name of the field as it will be displayed in screens.") - - @Html.HiddenFor(m => m.Name) -
    +
    + + @Html.TextBoxFor(m => m.DisplayName, new { @class = "text medium", autofocus = "autofocus" }) + @T("Name of the field as it will be displayed in screens.") + @T("Content Field Id: {0}", Model.Name) + + @Html.HiddenFor(m => m.Name) +
    @if (!String.IsNullOrWhiteSpace(returnUrl) && Request.IsLocalUrl(returnUrl)) { diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/EditTypeViewModel.cshtml b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/EditTypeViewModel.cshtml index 21d8d07b1..aedd6a85e 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/EditTypeViewModel.cshtml +++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/EditTypeViewModel.cshtml @@ -11,6 +11,7 @@

    @Model.DisplayName

    @if (!string.IsNullOrWhiteSpace(stereotype)) { - @stereotype } + @if (!Model.DisplayName.Equals(Model.Name, StringComparison.OrdinalIgnoreCase)) { @T("Content Type name: {0}", Model.Name) } @if (settings.Creatable) {

    @Html.ActionLink(T("Create New {0}", Html.Raw(Model.DisplayName)).Text, "Create", new {area = "Contents", id = Model.Name})

    From eed4a6a11bcd70f669a1bbe8a44d27d53e9753cd Mon Sep 17 00:00:00 2001 From: Andrea Piovanelli <83577153+AndreaPiovanelliLaser@users.noreply.github.com> Date: Fri, 13 Jan 2023 09:00:54 +0100 Subject: [PATCH 071/112] Checked page parameter to ensure a integer numeric value is provided. (#8644) --- .../Modules/Orchard.Taxonomies/Drivers/TermPartDriver.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Orchard.Web/Modules/Orchard.Taxonomies/Drivers/TermPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Taxonomies/Drivers/TermPartDriver.cs index c99b638a6..42c718b5b 100644 --- a/src/Orchard.Web/Modules/Orchard.Taxonomies/Drivers/TermPartDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.Taxonomies/Drivers/TermPartDriver.cs @@ -51,7 +51,11 @@ namespace Orchard.Taxonomies.Drivers { var pagerParameters = new PagerParameters(); var httpContext = _httpContextAccessor.Current(); if (httpContext != null) { - pagerParameters.Page = Convert.ToInt32(httpContext.Request.QueryString["page"]); + // Check if "page" parameter is a valid number. + int page = 0; + if (int.TryParse(httpContext.Request.QueryString["page"], out page)) { + pagerParameters.Page = page; + } } var pager = new Pager(_siteService.GetSiteSettings(), pagerParameters); From 7bf78ef852a80582495a5c2c7a2c67b3d358029d Mon Sep 17 00:00:00 2001 From: Alessandro Agostini <102729761+AgostiniAlessandro@users.noreply.github.com> Date: Fri, 20 Jan 2023 12:12:24 +0100 Subject: [PATCH 072/112] check the culture is supported (#8646) * check the culture is supported * changed == to equals --- .../Localization/Services/CurrentCultureWorkContext.cs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/Orchard/Localization/Services/CurrentCultureWorkContext.cs b/src/Orchard/Localization/Services/CurrentCultureWorkContext.cs index 16208ccbf..7efe5c68e 100644 --- a/src/Orchard/Localization/Services/CurrentCultureWorkContext.cs +++ b/src/Orchard/Localization/Services/CurrentCultureWorkContext.cs @@ -7,11 +7,14 @@ namespace Orchard.Localization.Services { public class CurrentCultureWorkContext : IWorkContextStateProvider { private readonly IEnumerable _cultureSelectors; private readonly IHttpContextAccessor _httpContextAccessor; + private readonly ICultureManager _cultureManager; public CurrentCultureWorkContext(IEnumerable cultureSelectors, - IHttpContextAccessor httpContextAccessor) { + IHttpContextAccessor httpContextAccessor, + ICultureManager cultureManager) { _cultureSelectors = cultureSelectors; _httpContextAccessor = httpContextAccessor; + _cultureManager = cultureManager; } public Func Get(string name) { @@ -25,11 +28,13 @@ namespace Orchard.Localization.Services { private string GetCurrentCulture() { var httpContext = _httpContextAccessor.Current(); + var supportedCultures = _cultureManager.ListCultures().ToList(); + var culture = _cultureSelectors .Select(c => c.GetCulture(httpContext)) .Where(c => c != null) .OrderByDescending(c => c.Priority) - .FirstOrDefault(c => !String.IsNullOrEmpty(c.CultureName)); + .FirstOrDefault(c => !String.IsNullOrEmpty(c.CultureName) && supportedCultures.Any(s => s.Equals(c.CultureName, StringComparison.OrdinalIgnoreCase))); return culture == null ? String.Empty : culture.CultureName; } From babe1d665d8d5960120ac486455ee5fcd85ad022 Mon Sep 17 00:00:00 2001 From: Andrea Piovanelli <83577153+AndreaPiovanelliLaser@users.noreply.github.com> Date: Mon, 27 Feb 2023 08:43:53 +0100 Subject: [PATCH 073/112] Added sequential upload parameter to fileupload() parameters when importing media (#8650) * Added sequential upload parameter to fileupload() parameters when importing media. * Added setting to limit concurrent uploads --- .../Models/MediaLibrarySettingsPart.cs | 5 +++++ .../Views/ClientStorage/Index.cshtml | 18 ++++++++++++------ .../MediaLibrary.MediaLibrarySettings.cshtml | 3 +++ 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Models/MediaLibrarySettingsPart.cs b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Models/MediaLibrarySettingsPart.cs index b061059bc..4d549cec9 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Models/MediaLibrarySettingsPart.cs +++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Models/MediaLibrarySettingsPart.cs @@ -13,6 +13,11 @@ namespace Orchard.MediaLibrary.Models { set { this.Store(x => x.UploadAllowedFileTypeWhitelist, value); } } + public int LimitConcurrentUploads { + get { return this.Retrieve(x => x.LimitConcurrentUploads); } + set { this.Store(x => x.LimitConcurrentUploads, value); } + } + public bool IsFileAllowed(string filename) { var allowedExtensions = (UploadAllowedFileTypeWhitelist ?? "") diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/ClientStorage/Index.cshtml b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/ClientStorage/Index.cshtml index cf1d393db..9e73aa879 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/ClientStorage/Index.cshtml +++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/ClientStorage/Index.cshtml @@ -1,4 +1,7 @@ -@model Orchard.MediaLibrary.ViewModels.ImportMediaViewModel +@using Orchard.MediaLibrary.Models; +@using Orchard.ContentManagement; + +@model Orchard.MediaLibrary.ViewModels.ImportMediaViewModel @@ -12,6 +15,8 @@ Script.Require("jQueryFileUpload").AtFoot(); Script.Require("Knockout").AtFoot(); + + var settings = WorkContext.CurrentSite.As(); } @Display.Metas() @@ -23,7 +28,7 @@
    @T("Click here, Drop files or Paste images")
    - multiple="multiple" } > + multiple="multiple" } />
    • @@ -36,9 +41,9 @@
    - + @using (Script.Foot()) { - + } - + @Display.FootScripts() \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/EditorTemplates/Parts/MediaLibrary.MediaLibrarySettings.cshtml b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/EditorTemplates/Parts/MediaLibrary.MediaLibrarySettings.cshtml index 82fdaf19c..dc07b9b1c 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/EditorTemplates/Parts/MediaLibrary.MediaLibrarySettings.cshtml +++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/EditorTemplates/Parts/MediaLibrary.MediaLibrarySettings.cshtml @@ -6,5 +6,8 @@ @Html.TextBoxFor(m => m.UploadAllowedFileTypeWhitelist, new { @class = "text large"}) @T("A comma separated list of file extensions, e.g., \".jpg, .avi, .txt\". Leave empty to accept any file types.") + + @Html.TextBoxFor(m => m.LimitConcurrentUploads, new { @class = "text medium"}) + @T("To limit the number of concurrent uploads, set this value to an integer greater than 0")
    \ No newline at end of file From 97288315564d6aed63c6a1925628669b030ab094 Mon Sep 17 00:00:00 2001 From: Andrea Piovanelli <83577153+AndreaPiovanelliLaser@users.noreply.github.com> Date: Fri, 17 Mar 2023 08:59:24 +0100 Subject: [PATCH 074/112] 8657 roleactivities: adds role event activities and handlers for workflows (#8658) * Added Role Event Activities and Handlers for workflows. * Removed and sorted using * Added user as the Content parameter for worflow triggers when possible (UserAdded and UserRemoved role events). --- .../Activities/RoleEventActivity.cs | 54 +++++++++++++ .../Orchard.Roles/Events/RoleEventHandler.cs | 77 +++++++++++++++++++ .../Orchard.Roles/Orchard.Roles.csproj | 2 + 3 files changed, 133 insertions(+) create mode 100644 src/Orchard.Web/Modules/Orchard.Roles/Activities/RoleEventActivity.cs create mode 100644 src/Orchard.Web/Modules/Orchard.Roles/Events/RoleEventHandler.cs diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Activities/RoleEventActivity.cs b/src/Orchard.Web/Modules/Orchard.Roles/Activities/RoleEventActivity.cs new file mode 100644 index 000000000..ed2305343 --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.Roles/Activities/RoleEventActivity.cs @@ -0,0 +1,54 @@ +using System.Collections.Generic; +using Orchard.Localization; +using Orchard.Workflows.Models; +using Orchard.Workflows.Services; + +namespace Orchard.Roles.Activities { + public class RoleEventActivity : Event { + public Localizer T { get; set; } + + public RoleEventActivity() { + T = NullLocalizer.Instance; + } + + public override bool CanStartWorkflow { + get { return true; } + } + + public override string Name { + get { + return "OnRoleEvent"; + } + } + + public override LocalizedString Category { + get { + return T("Roles"); + } + } + + public override LocalizedString Description { + get { + return T("Manage Role Event"); + } + } + + public override IEnumerable Execute(WorkflowContext workflowContext, ActivityContext activityContext) { + string operatore = workflowContext.Tokens["Action"].ToString(); + LocalizedString msg = T(operatore); + yield return msg; + } + + public override IEnumerable GetPossibleOutcomes(WorkflowContext workflowContext, ActivityContext activityContext) { + return new[] { + T("Created"), + T("Removed"), + T("Renamed"), + T("UserAdded"), + T("UserRemoved"), + T("PermissionAdded"), + T("PermissionRemoved") + }; + } + } +} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Events/RoleEventHandler.cs b/src/Orchard.Web/Modules/Orchard.Roles/Events/RoleEventHandler.cs new file mode 100644 index 000000000..795c72cd2 --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.Roles/Events/RoleEventHandler.cs @@ -0,0 +1,77 @@ +using System.Collections.Generic; +using Orchard.Workflows.Services; + +namespace Orchard.Roles.Events { + public class RoleEventHandler : IRoleEventHandler { + private readonly IWorkflowManager _workflowManager; + + public RoleEventHandler(IWorkflowManager workflowManager) { + _workflowManager = workflowManager; + } + + public void Created(RoleCreatedContext context) { + _workflowManager.TriggerEvent("OnRoleEvent", + null, + () => new Dictionary { + { "Role", context.Role }, + { "Action", "RoleCreated" } }); + } + + public void PermissionAdded(PermissionAddedContext context) { + _workflowManager.TriggerEvent("OnRoleEvent", + null, + () => new Dictionary { + { "Role", context.Role }, + { "Permission", context.Permission }, + { "Action", "PermissionAdded" } }); + } + + public void PermissionRemoved(PermissionRemovedContext context) { + _workflowManager.TriggerEvent("OnRoleEvent", + null, + () => new Dictionary { + { "Role", context.Role }, + { "Permission", context.Permission }, + { "Action", "PermissionRemoved" } }); + } + + public void Removed(RoleRemovedContext context) { + _workflowManager.TriggerEvent("OnRoleEvent", + null, + () => new Dictionary { + { "Role", context.Role }, + { "Action", "RoleRemoved" } }); + } + + public void Renamed(RoleRenamedContext context) { + _workflowManager.TriggerEvent("OnRoleEvent", + null, + () => new Dictionary { + { "PreviousName", context.PreviousRoleName }, + { "NewName", context.NewRoleName }, + { "Action", "RoleRenamed" } }); + } + + public void UserAdded(UserAddedContext context) { + // Content of workflow event is the user + var content = context.User.ContentItem; + _workflowManager.TriggerEvent("OnRoleEvent", + content, + () => new Dictionary { + { "Role", context.Role }, + { "User", context.User }, + { "Action", "UserAdded" } }); + } + + public void UserRemoved(UserRemovedContext context) { + // Content of workflow event is the user + var content = context.User.ContentItem; + _workflowManager.TriggerEvent("OnRoleEvent", + content, + () => new Dictionary { + { "Role", context.Role }, + { "User", context.User }, + { "Action", "UserRemoved" } }); + } + } +} \ 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 7a56c0812..6d8fb1509 100644 --- a/src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj +++ b/src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj @@ -92,6 +92,7 @@     + @@ -107,6 +108,7 @@ + From 7ac17272d20179dbf6686816b3eee979934fd720 Mon Sep 17 00:00:00 2001 From: Andrea Piovanelli <83577153+AndreaPiovanelliLaser@users.noreply.github.com> Date: Fri, 17 Mar 2023 09:11:09 +0100 Subject: [PATCH 075/112] If MenuPart is a ContentMenuItem, check if the content is published before adding it to the NavigationBuilder. (#8653) --- .../Services/DefaultMenuProvider.cs | 28 +++++++++++++------ 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/src/Orchard.Web/Core/Navigation/Services/DefaultMenuProvider.cs b/src/Orchard.Web/Core/Navigation/Services/DefaultMenuProvider.cs index 036801c05..5a25e62d7 100644 --- a/src/Orchard.Web/Core/Navigation/Services/DefaultMenuProvider.cs +++ b/src/Orchard.Web/Core/Navigation/Services/DefaultMenuProvider.cs @@ -23,17 +23,27 @@ namespace Orchard.Core.Navigation.Services { if (menuPart != null) { var part = menuPart; - string culture = null; - // fetch the culture of the content menu item, if any - var localized = part.As(); - if (localized != null) { - culture = localized.Culture; + var showItem = true; + // If the menu item is a ContentMenuItemPart (from Orchard.ContentPicker), check the ContentItem is published. + // If there is no published version of the ContentItem, the item must not be added to NavigationBuilder. + var cmip = ((dynamic)part).ContentMenuItemPart; + if (cmip != null) { + showItem = cmip.Content != null; } - if (part.Is()) - builder.Add(new LocalizedString(HttpUtility.HtmlEncode(part.MenuText)), part.MenuPosition, item => item.Url(part.As().Url).Content(part).Culture(culture).Permission(Contents.Permissions.ViewContent)); - else - builder.Add(new LocalizedString(HttpUtility.HtmlEncode(part.MenuText)), part.MenuPosition, item => item.Action(_contentManager.GetItemMetadata(part.ContentItem).DisplayRouteValues).Content(part).Culture(culture).Permission(Contents.Permissions.ViewContent)); + if (showItem) { + string culture = null; + // fetch the culture of the content menu item, if any + var localized = part.As(); + if (localized != null) { + culture = localized.Culture; + } + + if (part.Is()) + builder.Add(new LocalizedString(HttpUtility.HtmlEncode(part.MenuText)), part.MenuPosition, item => item.Url(part.As().Url).Content(part).Culture(culture).Permission(Contents.Permissions.ViewContent)); + else + builder.Add(new LocalizedString(HttpUtility.HtmlEncode(part.MenuText)), part.MenuPosition, item => item.Action(_contentManager.GetItemMetadata(part.ContentItem).DisplayRouteValues).Content(part).Culture(culture).Permission(Contents.Permissions.ViewContent)); + } } } } From d5acf2dc411986467bb808d07a5fe3d215868b11 Mon Sep 17 00:00:00 2001 From: Alessandro Agostini <102729761+AgostiniAlessandro@users.noreply.github.com> Date: Fri, 17 Mar 2023 09:12:18 +0100 Subject: [PATCH 076/112] Email confirmation fail on multiple confirmation attempts (#8656) If an user already confirmed his email address and tries to confirm it again it should fail. --- .../Modules/Orchard.Users/Services/UserService.cs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.Users/Services/UserService.cs b/src/Orchard.Web/Modules/Orchard.Users/Services/UserService.cs index f6257305a..e52e8520e 100644 --- a/src/Orchard.Web/Modules/Orchard.Users/Services/UserService.cs +++ b/src/Orchard.Web/Modules/Orchard.Users/Services/UserService.cs @@ -120,7 +120,11 @@ namespace Orchard.Users.Services { var user = _membershipService.GetUser(username); if (user == null) return null; - + + if (user.As().EmailStatus == UserStatus.Approved) { + return null; + } + user.As().EmailStatus = UserStatus.Approved; return user; @@ -195,4 +199,4 @@ namespace Orchard.Users.Services { return user; } } -} \ No newline at end of file +} From 10e50789560da1e6986a29b80bdb0347e7093e4e Mon Sep 17 00:00:00 2001 From: Andrea Piovanelli <83577153+AndreaPiovanelliLaser@users.noreply.github.com> Date: Fri, 31 Mar 2023 09:43:29 +0200 Subject: [PATCH 077/112] Corrected RoleEvent actions to match activity outcomes (RoleRenamed -> Renamed, RoleCreated -> Created, RoleRemoved -> Removed) (#8659) --- .../Modules/Orchard.Roles/Events/RoleEventHandler.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Events/RoleEventHandler.cs b/src/Orchard.Web/Modules/Orchard.Roles/Events/RoleEventHandler.cs index 795c72cd2..86634d9b2 100644 --- a/src/Orchard.Web/Modules/Orchard.Roles/Events/RoleEventHandler.cs +++ b/src/Orchard.Web/Modules/Orchard.Roles/Events/RoleEventHandler.cs @@ -14,7 +14,7 @@ namespace Orchard.Roles.Events { null, () => new Dictionary { { "Role", context.Role }, - { "Action", "RoleCreated" } }); + { "Action", "Created" } }); } public void PermissionAdded(PermissionAddedContext context) { @@ -40,7 +40,7 @@ namespace Orchard.Roles.Events { null, () => new Dictionary { { "Role", context.Role }, - { "Action", "RoleRemoved" } }); + { "Action", "Removed" } }); } public void Renamed(RoleRenamedContext context) { @@ -49,7 +49,7 @@ namespace Orchard.Roles.Events { () => new Dictionary { { "PreviousName", context.PreviousRoleName }, { "NewName", context.NewRoleName }, - { "Action", "RoleRenamed" } }); + { "Action", "Renamed" } }); } public void UserAdded(UserAddedContext context) { From 55ec9e2335232b7ced565d5c11d0942f05534a79 Mon Sep 17 00:00:00 2001 From: Andrea Piovanelli <83577153+AndreaPiovanelliLaser@users.noreply.github.com> Date: Fri, 21 Apr 2023 08:53:55 +0200 Subject: [PATCH 078/112] No term selection option in TaxonomyField (#8667) * Added no term selection option when taxonomy field is not required and is set to be shown as a radio button set (single choice without autocomplete) * Correctly checked the "no selection" option when SingleTermId == 0. --- .../Fields/TaxonomyField.cshtml | 45 +++++++++++-------- 1 file changed, 26 insertions(+), 19 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.Taxonomies/Views/EditorTemplates/Fields/TaxonomyField.cshtml b/src/Orchard.Web/Modules/Orchard.Taxonomies/Views/EditorTemplates/Fields/TaxonomyField.cshtml index 02d9d615b..294ead70c 100644 --- a/src/Orchard.Web/Modules/Orchard.Taxonomies/Views/EditorTemplates/Fields/TaxonomyField.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Taxonomies/Views/EditorTemplates/Fields/TaxonomyField.cshtml @@ -11,6 +11,8 @@ int termIndex = 0; var settings = Model.Settings; + + var noSelectionId = Guid.NewGuid(); }
    @@ -21,26 +23,31 @@ @Model.Settings.Hint } -
      - @foreach (var entry in Model.Terms) { - var ti = termIndex; -
    • - @* Tabs for levels *@ @for (var i = 1; i <= entry.GetLevels(); i++) {   } - @{ - var disabled = !entry.Selectable || (Model.Settings.LeavesOnly && Model.Terms.Any(t => t.Path.Contains(entry.Path + entry.Id))); - if (Model.Settings.SingleChoice) { - disabled="disabled" } type="radio" value="@Model.Terms[ti].Id" @if (entry.Id == Model.SingleTermId) { checked="checked" } name="@Html.FieldNameFor(m => m.SingleTermId)" id="@Html.FieldIdFor(m => m.Terms[ti].IsChecked)" data-term="@entry.Name.ToLower()" /> - } - else { - disabled="disabled" } type="checkbox" value="true" @if (entry.IsChecked) { checked="checked" } name="@Html.FieldNameFor(m => m.Terms[ti].IsChecked)" id="@Html.FieldIdFor(m => m.Terms[ti].IsChecked)" data-term="@entry.Name.ToLower()" /> - } +
        + @if (Model.Settings.SingleChoice && !settings.Required) { +
      • + checked="checked" } name="@Html.FieldNameFor(m => m.SingleTermId)" id="@noSelectionId" data-term="@T("No selection")" /> + +
        • + } + @foreach (var entry in Model.Terms) { + var ti = termIndex; +
      • + @* Tabs for levels *@ @for (var i = 1; i <= entry.GetLevels(); i++) { } + @{ + var disabled = !entry.Selectable || (Model.Settings.LeavesOnly && Model.Terms.Any(t => t.Path.Contains(entry.Path + entry.Id))); + if (Model.Settings.SingleChoice) { + disabled="disabled" } type="radio" value="@Model.Terms[ti].Id" @if (entry.Id == Model.SingleTermId) { checked="checked" } name="@Html.FieldNameFor(m => m.SingleTermId)" id="@Html.FieldIdFor(m => m.Terms[ti].IsChecked)" data-term="@entry.Name.ToLower()" /> + } else { + disabled="disabled" } type="checkbox" value="true" @if (entry.IsChecked) { checked="checked" } name="@Html.FieldNameFor(m => m.Terms[ti].IsChecked)" id="@Html.FieldIdFor(m => m.Terms[ti].IsChecked)" data-term="@entry.Name.ToLower()" /> } - @Html.HiddenFor(m => m.Terms[ti].Id) - -
        • - termIndex++; - } -
      + } + @Html.HiddenFor(m => m.Terms[ti].Id) + +
      • + termIndex++; + } +
    @if (Model.TaxonomyId == 0) {

    @T("You haven't specified a taxonomy for {0}", Model.DisplayName)

    From 6283106c53c02371c5a3aac85b48d055deddaca7 Mon Sep 17 00:00:00 2001 From: Hermes Sbicego Date: Fri, 28 Apr 2023 08:52:46 +0200 Subject: [PATCH 079/112] Adds the ability to insert/edit snippets of html source code (#8668) * adds a new tinyMCE plugin enabling editing a piece of html source code * - Adds the new plugin to the VS project - Adds js minified version --- .../TinyMce/Scripts/orchard-tinymce.js | 4 +- .../Scripts/plugins/htmlsnippets/plugin.js | 42 +++++++++++++++++++ .../plugins/htmlsnippets/plugin.min.js | 1 + .../Modules/TinyMce/TinyMce.csproj | 4 +- 4 files changed, 48 insertions(+), 3 deletions(-) create mode 100644 src/Orchard.Web/Modules/TinyMce/Scripts/plugins/htmlsnippets/plugin.js create mode 100644 src/Orchard.Web/Modules/TinyMce/Scripts/plugins/htmlsnippets/plugin.min.js diff --git a/src/Orchard.Web/Modules/TinyMce/Scripts/orchard-tinymce.js b/src/Orchard.Web/Modules/TinyMce/Scripts/orchard-tinymce.js index 0640d723d..e16c6b4bb 100644 --- a/src/Orchard.Web/Modules/TinyMce/Scripts/orchard-tinymce.js +++ b/src/Orchard.Web/Modules/TinyMce/Scripts/orchard-tinymce.js @@ -13,9 +13,9 @@ tinyMCE.init({ theme: "modern", schema: "html5", plugins: [ - "advlist, anchor, autolink, autoresize, charmap, code, colorpicker, contextmenu, directionality, emoticons, fullscreen, hr, image, insertdatetime, link, lists, media, nonbreaking, pagebreak, paste, preview, print, searchreplace, table, template, textcolor, textpattern, visualblocks, visualchars, wordcount" + mediaPlugins + "advlist, anchor, autolink, autoresize, charmap, code, colorpicker, contextmenu, directionality, emoticons, fullscreen, hr, image, insertdatetime, link, lists, media, nonbreaking, pagebreak, paste, preview, print, searchreplace, table, template, textcolor, textpattern, visualblocks, visualchars, wordcount, htmlsnippets" + mediaPlugins ], - toolbar: "undo redo cut copy paste | bold italic | bullist numlist outdent indent formatselect | alignleft aligncenter alignright alignjustify ltr rtl | " + mediaPlugins + " link unlink charmap | code fullscreen", + toolbar: "undo redo cut copy paste | bold italic | bullist numlist outdent indent formatselect | alignleft aligncenter alignright alignjustify ltr rtl | " + mediaPlugins + " link unlink charmap | code htmlsnippetsbutton fullscreen", convert_urls: false, valid_elements: "*[*]", // Shouldn't be needed due to the valid_elements setting, but TinyMCE would strip script.src without it. diff --git a/src/Orchard.Web/Modules/TinyMce/Scripts/plugins/htmlsnippets/plugin.js b/src/Orchard.Web/Modules/TinyMce/Scripts/plugins/htmlsnippets/plugin.js new file mode 100644 index 000000000..5a589dd79 --- /dev/null +++ b/src/Orchard.Web/Modules/TinyMce/Scripts/plugins/htmlsnippets/plugin.js @@ -0,0 +1,42 @@ + +tinymce.PluginManager.add('htmlsnippets', function(editor, url) { + var htmlSnippetAction = function() { + // Open window + var modalWindow = editor.windowManager.open({ + title: 'Insert/edit HTML snippets', + body: [ + {type: 'textbox', value: editor.selection.getContent(), multiline: true, name: 'html_snippet', label: 'HTML Snippet', minHeight:350} + ], + height: 400, + width: 600, + onsubmit: function(e) { + // Insert content when the window form is submitted + editor.insertContent(e.data.html_snippet); + } + }); + } + + // Add a button that opens a window + editor.addButton('htmlsnippetsbutton', { + image: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABmJLR0QAEABHAPK/xSSIAAAACXBIWXMAAC4jAAAuIwF4pT92AAAAvElEQVRIx+2VsRHCMAxFH3AwAR075CjSpGOfLEU6nAKmoIICJohHYANoVPjAji0nNLn8OxeSvny2vmTDDCUOQOfYb1mptpU9grDKDX12N20Nvq88OH+ZkLQGDFA7vho4SWwQdkADPIHS8ZfiOwonC1s5+R2oPPFKYka46hpegCtQ9PD3wA0452qwiXBWwlnklqhNKFGrKVFI5EdA5EYrsm8OQm1qPG0anaPRB216eI3wXNvYh2P/+eHM+MEHpr9Js1lOQvUAAAAASUVORK5CYII=', + tooltip: 'Html snippet', + onclick: htmlSnippetAction + }); + + // Adds a menu item to the tools menu + editor.addMenuItem('HTMLsnippetmenuitem ', { + text: 'Html snippet', + image: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABmJLR0QAEABHAPK/xSSIAAAACXBIWXMAAC4jAAAuIwF4pT92AAAAvElEQVRIx+2VsRHCMAxFH3AwAR075CjSpGOfLEU6nAKmoIICJohHYANoVPjAji0nNLn8OxeSvny2vmTDDCUOQOfYb1mptpU9grDKDX12N20Nvq88OH+ZkLQGDFA7vho4SWwQdkADPIHS8ZfiOwonC1s5+R2oPPFKYka46hpegCtQ9PD3wA0452qwiXBWwlnklqhNKFGrKVFI5EdA5EYrsm8OQm1qPG0anaPRB216eI3wXNvYh2P/+eHM+MEHpr9Js1lOQvUAAAAASUVORK5CYII=', + context: 'insert', + onclick: htmlSnippetAction + }); + + return { + getMetadata: function () { + return { + name: "Html snippets plugin" + //url: "http://exampleplugindocsurl.com" + }; + } + }; +}); diff --git a/src/Orchard.Web/Modules/TinyMce/Scripts/plugins/htmlsnippets/plugin.min.js b/src/Orchard.Web/Modules/TinyMce/Scripts/plugins/htmlsnippets/plugin.min.js new file mode 100644 index 000000000..ea34e83dd --- /dev/null +++ b/src/Orchard.Web/Modules/TinyMce/Scripts/plugins/htmlsnippets/plugin.min.js @@ -0,0 +1 @@ +tinymce.PluginManager.add("htmlsnippets",function(A,t){var n=function(){A.windowManager.open({title:"Insert/edit HTML snippets",body:[{type:"textbox",value:A.selection.getContent(),multiline:!0,name:"html_snippet",label:"HTML Snippet",minHeight:350}],height:400,width:600,onsubmit:function(t){A.insertContent(t.data.html_snippet)}})};return A.addButton("htmlsnippetsbutton",{image:"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABmJLR0QAEABHAPK/xSSIAAAACXBIWXMAAC4jAAAuIwF4pT92AAAAvElEQVRIx+2VsRHCMAxFH3AwAR075CjSpGOfLEU6nAKmoIICJohHYANoVPjAji0nNLn8OxeSvny2vmTDDCUOQOfYb1mptpU9grDKDX12N20Nvq88OH+ZkLQGDFA7vho4SWwQdkADPIHS8ZfiOwonC1s5+R2oPPFKYka46hpegCtQ9PD3wA0452qwiXBWwlnklqhNKFGrKVFI5EdA5EYrsm8OQm1qPG0anaPRB216eI3wXNvYh2P/+eHM+MEHpr9Js1lOQvUAAAAASUVORK5CYII=",tooltip:"Html snippet",onclick:n}),A.addMenuItem("HTMLsnippetmenuitem ",{text:"Html snippet",image:"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABmJLR0QAEABHAPK/xSSIAAAACXBIWXMAAC4jAAAuIwF4pT92AAAAvElEQVRIx+2VsRHCMAxFH3AwAR075CjSpGOfLEU6nAKmoIICJohHYANoVPjAji0nNLn8OxeSvny2vmTDDCUOQOfYb1mptpU9grDKDX12N20Nvq88OH+ZkLQGDFA7vho4SWwQdkADPIHS8ZfiOwonC1s5+R2oPPFKYka46hpegCtQ9PD3wA0452qwiXBWwlnklqhNKFGrKVFI5EdA5EYrsm8OQm1qPG0anaPRB216eI3wXNvYh2P/+eHM+MEHpr9Js1lOQvUAAAAASUVORK5CYII=",context:"insert",onclick:n}),{getMetadata:function(){return{name:"Html snippets plugin"}}}}); \ 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 e0ce2db4b..2589e1a65 100644 --- a/src/Orchard.Web/Modules/TinyMce/TinyMce.csproj +++ b/src/Orchard.Web/Modules/TinyMce/TinyMce.csproj @@ -220,6 +220,8 @@ + + @@ -428,4 +430,4 @@ - + \ No newline at end of file From ff2f222695d6d4cd2e0ab5d90461138d6467225a Mon Sep 17 00:00:00 2001 From: Matteo Piovanelli Date: Fri, 5 May 2023 08:49:25 +0200 Subject: [PATCH 080/112] added orchardFeature attribute where it was missing in Orchard.Roles (#8680) --- .../Modules/Orchard.Roles/Activities/RoleEventActivity.cs | 2 ++ .../Modules/Orchard.Roles/Events/RoleEventHandler.cs | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Activities/RoleEventActivity.cs b/src/Orchard.Web/Modules/Orchard.Roles/Activities/RoleEventActivity.cs index ed2305343..d48415838 100644 --- a/src/Orchard.Web/Modules/Orchard.Roles/Activities/RoleEventActivity.cs +++ b/src/Orchard.Web/Modules/Orchard.Roles/Activities/RoleEventActivity.cs @@ -1,9 +1,11 @@ using System.Collections.Generic; +using Orchard.Environment.Extensions; using Orchard.Localization; using Orchard.Workflows.Models; using Orchard.Workflows.Services; namespace Orchard.Roles.Activities { + [OrchardFeature("Orchard.Roles.Workflows")] public class RoleEventActivity : Event { public Localizer T { get; set; } diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Events/RoleEventHandler.cs b/src/Orchard.Web/Modules/Orchard.Roles/Events/RoleEventHandler.cs index 86634d9b2..6dd6af0a8 100644 --- a/src/Orchard.Web/Modules/Orchard.Roles/Events/RoleEventHandler.cs +++ b/src/Orchard.Web/Modules/Orchard.Roles/Events/RoleEventHandler.cs @@ -1,7 +1,9 @@ using System.Collections.Generic; +using Orchard.Environment.Extensions; using Orchard.Workflows.Services; namespace Orchard.Roles.Events { + [OrchardFeature("Orchard.Roles.Workflows")] public class RoleEventHandler : IRoleEventHandler { private readonly IWorkflowManager _workflowManager; From bf8cc139220ac42192a008553e355530820b504a Mon Sep 17 00:00:00 2001 From: Matteo Piovanelli Date: Fri, 5 May 2023 08:56:22 +0200 Subject: [PATCH 081/112] Perf: ExtensionManager (#8677) * WIP extension manager allowing serial loading of features * Proper comments in HostComponents.config. Removed test/dev logs in ExtensionManager. --- src/Orchard.Web/Config/HostComponents.config | 8 ++++ .../Extensions/ExtensionManager.cs | 45 +++++++++++++++++-- 2 files changed, 49 insertions(+), 4 deletions(-) diff --git a/src/Orchard.Web/Config/HostComponents.config b/src/Orchard.Web/Config/HostComponents.config index 888cdb0a6..7abf51805 100644 --- a/src/Orchard.Web/Config/HostComponents.config +++ b/src/Orchard.Web/Config/HostComponents.config @@ -80,6 +80,14 @@ + + + + + + + diff --git a/src/Orchard/Environment/Extensions/ExtensionManager.cs b/src/Orchard/Environment/Extensions/ExtensionManager.cs index d1dab4feb..0c275be01 100644 --- a/src/Orchard/Environment/Extensions/ExtensionManager.cs +++ b/src/Orchard/Environment/Extensions/ExtensionManager.cs @@ -10,6 +10,13 @@ using Orchard.Logging; using Orchard.Utility; using Orchard.Utility.Extensions; using Orchard.Exceptions; +using System.Diagnostics; +using NHibernate.Cfg; +using NHibernate.Linq.Functions; +using System.Web.Http.Results; +using System.Threading; +using System.Security.Cryptography; +using System.Text; namespace Orchard.Environment.Extensions { public class ExtensionManager : IExtensionManager { @@ -22,6 +29,11 @@ namespace Orchard.Environment.Extensions { public Localizer T { get; set; } public ILogger Logger { get; set; } + /// + /// Allow disabling parallel behavior through HostComponents.config + /// + public bool ParallelizationDisabled { get; set; } + public ExtensionManager( IEnumerable folders, IEnumerable loaders, @@ -36,8 +48,11 @@ namespace Orchard.Environment.Extensions { _loaders = loaders.OrderBy(x => x.Order).ToArray(); T = NullLocalizer.Instance; Logger = NullLogger.Instance; + + _md5 = MD5.Create(); } + private MD5 _md5; // This method does not load extension types, simply parses extension manifests from // the filesystem. public ExtensionDescriptor GetExtension(string id) { @@ -91,10 +106,32 @@ namespace Orchard.Environment.Extensions { public IEnumerable LoadFeatures(IEnumerable featureDescriptors) { Logger.Information("Loading features"); - var result = - _parallelCacheContext - .RunInParallel(featureDescriptors, descriptor => _cacheManager.Get(descriptor.Id, true, ctx => LoadFeature(descriptor))) - .ToArray(); + // generate a cachekey by hashing the ids of all feature descriptors + var cacheKey = BitConverter.ToString( + _md5.ComputeHash( + Encoding.UTF8.GetBytes( + string.Join(";", + featureDescriptors + .Select(fd => fd.Id) + .OrderBy(x => x))))); + + + var result = _cacheManager.Get(cacheKey, + true, + ctk => { + if (ParallelizationDisabled) { + return featureDescriptors.Select(descriptor => _cacheManager + .Get(descriptor.Id, true, ctx => LoadFeature(descriptor))) + .ToArray(); + } + else { + return _parallelCacheContext + .RunInParallel(featureDescriptors, + descriptor => _cacheManager + .Get(descriptor.Id, true, ctx => LoadFeature(descriptor))) + .ToArray(); + } + }); Logger.Information("Done loading features"); return result; From 12e9f066898db957afcdf582a4efbe4589f4f2b2 Mon Sep 17 00:00:00 2001 From: Matteo Piovanelli Date: Fri, 5 May 2023 09:43:02 +0200 Subject: [PATCH 082/112] Perf: shapetable sorting (#8676) * Grouped ShapeAlteration by feature before sorting them * removed stopwatches * Sorting approach can be selected by setting the GroupByFeatures option in HostComponents.config --- src/Orchard.Web/Config/HostComponents.config | 8 +++ .../Descriptors/DefaultShapeTableManager.cs | 63 ++++++++++++++++--- 2 files changed, 64 insertions(+), 7 deletions(-) diff --git a/src/Orchard.Web/Config/HostComponents.config b/src/Orchard.Web/Config/HostComponents.config index 7abf51805..c0da7b4d5 100644 --- a/src/Orchard.Web/Config/HostComponents.config +++ b/src/Orchard.Web/Config/HostComponents.config @@ -9,6 +9,14 @@ + + + + + + + diff --git a/src/Orchard/DisplayManagement/Descriptors/DefaultShapeTableManager.cs b/src/Orchard/DisplayManagement/Descriptors/DefaultShapeTableManager.cs index 758dcc373..0c84c900d 100644 --- a/src/Orchard/DisplayManagement/Descriptors/DefaultShapeTableManager.cs +++ b/src/Orchard/DisplayManagement/Descriptors/DefaultShapeTableManager.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using Autofac.Features.Metadata; using Orchard.Caching; +using Orchard.ContentManagement; using Orchard.Environment; using Orchard.Environment.Extensions; using Orchard.Environment.Extensions.Models; @@ -19,6 +20,16 @@ namespace Orchard.DisplayManagement.Descriptors { private readonly IParallelCacheContext _parallelCacheContext; private readonly Work> _shapeTableEventHandlersWork; + /// + /// Group all ShapeAlterations by Feature, so we may more easily sort those by their + /// priorities and dependencies. The reason for this is that we may often end up with + /// orders of magnitude more ShapeAlterations than Features, so sorting directly the + /// former may end up being too expensive. + /// We can enable this through HostComponents.config as a safety measure in case this + /// breaks some frontend. + /// + public bool GroupByFeatures { get; set; } + public DefaultShapeTableManager( IEnumerable> bindingStrategies, IExtensionManager extensionManager, @@ -50,11 +61,36 @@ namespace Orchard.DisplayManagement.Descriptors { return builder.BuildAlterations().ToReadOnlyCollection(); }); - var alterations = alterationSets - .SelectMany(shapeAlterations => shapeAlterations) - .Where(alteration => IsModuleOrRequestedTheme(alteration, themeName)) - .OrderByDependenciesAndPriorities(AlterationHasDependency, GetPriority) - .ToList(); + List alterations; + if (GroupByFeatures) { + var unsortedAlterations = alterationSets + .SelectMany(shapeAlterations => shapeAlterations) + .Where(alteration => IsModuleOrRequestedTheme(alteration, themeName)); + + // Group all ShapeAlterations by Feature, so we may more easily sort those by their + // priorities and dependencies. The reason for this is that we may often end up with + // orders of magnitude more ShapeAlterations than Features, so sorting directly the + // former may end up being too expensive. + var alterationsByFeature = unsortedAlterations + .GroupBy(sa => sa.Feature.Descriptor.Id) + .Select(g => new AlterationGroup { + Feature = g.First().Feature, + Alterations = g + }); + var orderedGroups = alterationsByFeature + .OrderByDependenciesAndPriorities(AlterationHasDependency, GetPriority); + alterations = orderedGroups + .SelectMany(g => g.Alterations) + .ToList(); + } + else { + alterations = alterationSets + .SelectMany(shapeAlterations => shapeAlterations) + .Where(alteration => IsModuleOrRequestedTheme(alteration, themeName)) + .OrderByDependenciesAndPriorities(AlterationHasDependency, GetPriority) + .ToList(); + } + var descriptors = alterations.GroupBy(alteration => alteration.ShapeType, StringComparer.OrdinalIgnoreCase) .Select(group => group.Aggregate( @@ -64,8 +100,8 @@ namespace Orchard.DisplayManagement.Descriptors { return descriptor; })).ToList(); - foreach(var descriptor in descriptors) { - foreach(var alteration in alterations.Where(a => a.ShapeType == descriptor.ShapeType).ToList()) { + foreach (var descriptor in descriptors) { + foreach (var alteration in alterations.Where(a => a.ShapeType == descriptor.ShapeType).ToList()) { var local = new ShapeDescriptor { ShapeType = descriptor.ShapeType }; alteration.Alter(local); descriptor.BindingSources.Add(local.BindingSource); @@ -131,5 +167,18 @@ namespace Orchard.DisplayManagement.Descriptors { } return false; } + + class AlterationGroup { + public Feature Feature { get; set; } + public IEnumerable Alterations { get; set; } + } + private static int GetPriority(AlterationGroup shapeAlteration) { + return shapeAlteration.Feature.Descriptor.Priority; + } + + private static bool AlterationHasDependency(AlterationGroup item, AlterationGroup subject) { + return ExtensionManager.HasDependency(item.Feature.Descriptor, subject.Feature.Descriptor); + } + } } From 05e3c196aa5afaaf71bdb8359a89699fee15fe69 Mon Sep 17 00:00:00 2001 From: Hermes Sbicego Date: Mon, 8 May 2023 09:07:05 +0200 Subject: [PATCH 083/112] Feature/tinymce contentlinks plugin (#8679) * Adds the ability to create links based on orchard contents, calculating href during the display process using tokens # Conflicts: # src/Orchard.Web/Modules/TinyMce/Scripts/orchard-tinymce.js * Adds Contentmanager.Get Tokens Adds Content Links plugin to TinyMCE * Adds settings for TextField and BodyPart in order to specify which content types or part to show in the list * Settings for Html editors built on BodyParts, TextFields, LayoutParts * Adds minified version of the plugin.js * Tests if dependencies are enabled before activating the content links settings * new .png for TinyMce * Renamed the token as suggested during last meeting --- .../Fields.Common.Text.Edit.cshtml | 2 +- .../EditorTemplates/Parts.Common.Body.cshtml | 2 +- .../Drivers/HtmlElementDriver.cs | 3 +- .../ViewModels/HtmlEditorViewModel.cs | 5 +- .../EditorTemplates/Elements.Html.cshtml | 2 +- .../Orchard.Tokens/Providers/ContentTokens.cs | 106 ++++++++++++++---- .../TinyMce/Scripts/orchard-tinymce.js | 13 ++- .../plugins/orchardcontentlinks/plugin.js | 54 +++++++++ .../plugins/orchardcontentlinks/plugin.min.js | 1 + .../TinyMce/Settings/ContentLinksSettings.cs | 5 + .../Modules/TinyMce/Settings/EditorEvents.cs | 59 ++++++++++ .../Modules/TinyMce/TinyMce.csproj | 6 + .../TinyMce/Views/Body-Html.Editor.cshtml | 19 ++++ .../ContentLinksSettings.cshtml | 8 ++ 14 files changed, 256 insertions(+), 29 deletions(-) create mode 100644 src/Orchard.Web/Modules/TinyMce/Scripts/plugins/orchardcontentlinks/plugin.js create mode 100644 src/Orchard.Web/Modules/TinyMce/Scripts/plugins/orchardcontentlinks/plugin.min.js create mode 100644 src/Orchard.Web/Modules/TinyMce/Settings/ContentLinksSettings.cs create mode 100644 src/Orchard.Web/Modules/TinyMce/Settings/EditorEvents.cs create mode 100644 src/Orchard.Web/Modules/TinyMce/Views/DefinitionTemplates/ContentLinksSettings.cshtml diff --git a/src/Orchard.Web/Core/Common/Views/EditorTemplates/Fields.Common.Text.Edit.cshtml b/src/Orchard.Web/Core/Common/Views/EditorTemplates/Fields.Common.Text.Edit.cshtml index 833887b1a..eb917bddc 100644 --- a/src/Orchard.Web/Core/Common/Views/EditorTemplates/Fields.Common.Text.Edit.cshtml +++ b/src/Orchard.Web/Core/Common/Views/EditorTemplates/Fields.Common.Text.Edit.cshtml @@ -7,7 +7,7 @@ @Html.ValidationMessageFor(m => m.Text) } else { - @Display.Body_Editor(Text: Model.Text, EditorFlavor: Model.Settings.Flavor, Required: Model.Settings.Required, ContentItem: Model.ContentItem) + @Display.Body_Editor(Text: Model.Text, EditorFlavor: Model.Settings.Flavor, Required: Model.Settings.Required, ContentItem: Model.ContentItem, Field: Model.Field) } @if (HasText(Model.Settings.Hint)) { @Model.Settings.Hint diff --git a/src/Orchard.Web/Core/Common/Views/EditorTemplates/Parts.Common.Body.cshtml b/src/Orchard.Web/Core/Common/Views/EditorTemplates/Parts.Common.Body.cshtml index 1e3e488a6..785d436ee 100644 --- a/src/Orchard.Web/Core/Common/Views/EditorTemplates/Parts.Common.Body.cshtml +++ b/src/Orchard.Web/Core/Common/Views/EditorTemplates/Parts.Common.Body.cshtml @@ -2,6 +2,6 @@ @using Orchard.Core.Common.ViewModels;
    - @Display.Body_Editor(Text: Model.Text, EditorFlavor: Model.EditorFlavor, Required: false, AutoFocus: false, ContentItem: Model.BodyPart.ContentItem) + @Display.Body_Editor(Text: Model.Text, EditorFlavor: Model.EditorFlavor, Required: false, AutoFocus: false, ContentItem: Model.BodyPart.ContentItem, Part: Model.BodyPart) @Html.ValidationMessageFor(m => m.Text)
    \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/Drivers/HtmlElementDriver.cs b/src/Orchard.Web/Modules/Orchard.Layouts/Drivers/HtmlElementDriver.cs index 09d877c5b..eb62d7616 100644 --- a/src/Orchard.Web/Modules/Orchard.Layouts/Drivers/HtmlElementDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.Layouts/Drivers/HtmlElementDriver.cs @@ -15,7 +15,8 @@ namespace Orchard.Layouts.Drivers { protected override EditorResult OnBuildEditor(Html element, ElementEditorContext context) { var viewModel = new HtmlEditorViewModel { - Text = element.Content + Text = element.Content, + Part = ((dynamic)context.Content.ContentItem).LayoutPart }; var editor = context.ShapeFactory.EditorTemplate(TemplateName: "Elements.Html", Model: viewModel); diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/ViewModels/HtmlEditorViewModel.cs b/src/Orchard.Web/Modules/Orchard.Layouts/ViewModels/HtmlEditorViewModel.cs index dc64dab09..ab84b1465 100644 --- a/src/Orchard.Web/Modules/Orchard.Layouts/ViewModels/HtmlEditorViewModel.cs +++ b/src/Orchard.Web/Modules/Orchard.Layouts/ViewModels/HtmlEditorViewModel.cs @@ -1,5 +1,8 @@ -namespace Orchard.Layouts.ViewModels { +using Orchard.ContentManagement; + +namespace Orchard.Layouts.ViewModels { public class HtmlEditorViewModel { public string Text { get; set; } + public ContentPart Part { get; set; } } } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/Views/EditorTemplates/Elements.Html.cshtml b/src/Orchard.Web/Modules/Orchard.Layouts/Views/EditorTemplates/Elements.Html.cshtml index 1df31b732..32bbe1ee9 100644 --- a/src/Orchard.Web/Modules/Orchard.Layouts/Views/EditorTemplates/Elements.Html.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Layouts/Views/EditorTemplates/Elements.Html.cshtml @@ -1,5 +1,5 @@ @model Orchard.Layouts.ViewModels.HtmlEditorViewModel
    @Html.LabelFor(m => m.Text, T("HTML")) - @Display.Body_Editor(EditorFlavor: "html", Text: Model.Text, AutoFocus: true) + @Display.Body_Editor(EditorFlavor: "html", Text: Model.Text, AutoFocus: true, Part: Model.Part)
    \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Tokens/Providers/ContentTokens.cs b/src/Orchard.Web/Modules/Orchard.Tokens/Providers/ContentTokens.cs index fb26b2500..e6ddfe22f 100644 --- a/src/Orchard.Web/Modules/Orchard.Tokens/Providers/ContentTokens.cs +++ b/src/Orchard.Web/Modules/Orchard.Tokens/Providers/ContentTokens.cs @@ -26,6 +26,9 @@ namespace Orchard.Tokens.Providers { public Localizer T { get; set; } public void Describe(DescribeContext context) { + context.For("ContentItem", T("Content Items"), T("The context to access specific content items.")) + .Token("Id:*", T("Content Item by Id"), T("The content item with the specified id.")); + context.For("Content", T("Content Items"), T("Content Items")) .Token("Id", T("Content Id"), T("Numeric primary key value of content.")) .Token("Author", T("Content Author"), T("Person in charge of the content."), "User") @@ -36,8 +39,7 @@ namespace Orchard.Tokens.Providers { .Token("DisplayUrl", T("Display Url"), T("Url to display the content."), "Url") .Token("EditUrl", T("Edit Url"), T("Url to edit the content."), "Url") .Token("Container", T("Container"), T("The container Content Item."), "Content") - .Token("Body", T("Body"), T("The body text of the content item."), "Text") - ; + .Token("Body", T("Body"), T("The body text of the content item."), "Text"); // Token descriptors for fields foreach (var typeDefinition in _contentManager.GetContentTypeDefinitions()) { @@ -72,26 +74,57 @@ namespace Orchard.Tokens.Providers { } public void Evaluate(EvaluateContext context) { + context.For("ContentItem", _contentManager) + .Token( + token => token.StartsWith("Id:", StringComparison.OrdinalIgnoreCase) ? ContentManagerGetToken(token) : "", + (token, cm) => { + // token is Id:* + if (token != "") { + var id = token.Substring("Id:".Length); + return cm.Get(Convert.ToInt32(id)); + } + else { return null; } + }) + .Chain( + token => { + var cleanToken = ContentManagerGetToken(token); // is Id:* + if (string.IsNullOrWhiteSpace(cleanToken)) return null; + int cleanTokenLength = cleanToken.Length; + var subTokens = token.Length > cleanTokenLength ? token.Substring(cleanToken.Length + 1) : ""; + return new Tuple( + cleanToken, //The specific Token Id:*, it is the key + subTokens //The subsequent Tokens (i.e Fields.PartName.FieldName) + ); + }, + "Content", + (token, cm) => { + // token is Id:* + + if (token != "") { + var id = token.Substring("Id:".Length); + return cm.Get(Convert.ToInt32(id)); + } + else { return null; } + }); context.For("Content") - .Token("Id", content => content != null ? content.Id : 0) - .Token("Author", AuthorName) - .Chain("Author", "User", content => content != null ? content.As().Owner : null) - .Token("Date", Date) - .Chain("Date", "Date", Date) - .Token("Identity", content => content != null ? _contentManager.GetItemMetadata(content).Identity.ToString() : String.Empty) - .Token("ContentType", content => content != null ? content.ContentItem.TypeDefinition.DisplayName : String.Empty) - .Chain("ContentType", "TypeDefinition", content => content != null ? content.ContentItem.TypeDefinition : null) - .Token("DisplayText", DisplayText) - .Chain("DisplayText", "Text", DisplayText) - .Token("DisplayUrl", DisplayUrl) - .Chain("DisplayUrl", "Url", DisplayUrl) - .Token("EditUrl", EditUrl) - .Chain("EditUrl", "Url", EditUrl) - .Token("Container", content => DisplayText(Container(content))) - .Chain("Container", "Content", Container) - .Token("Body", Body) - .Chain("Body", "Text", Body) - ; + .Token("Id", content => content != null ? content.Id : 0) + .Token("Author", AuthorName) + .Chain("Author", "User", content => content != null ? content.As().Owner : null) + .Token("Date", Date) + .Chain("Date", "Date", Date) + .Token("Identity", content => content != null ? _contentManager.GetItemMetadata(content).Identity.ToString() : String.Empty) + .Token("ContentType", content => content != null ? content.ContentItem.TypeDefinition.DisplayName : String.Empty) + .Chain("ContentType", "TypeDefinition", content => content != null ? content.ContentItem.TypeDefinition : null) + .Token("DisplayText", DisplayText) + .Chain("DisplayText", "Text", DisplayText) + .Token("DisplayUrl", DisplayUrl) + .Chain("DisplayUrl", "Url", DisplayUrl) + .Token("EditUrl", EditUrl) + .Chain("EditUrl", "Url", EditUrl) + .Token("Container", content => DisplayText(Container(content))) + .Chain("Container", "Content", Container) + .Token("Body", Body) + .Chain("Body", "Text", Body); if (context.Target == "Content") { var forContent = context.For("Content"); @@ -201,5 +234,36 @@ namespace Orchard.Tokens.Providers { return bodyPart.Text; } + + //returns Id:* Token + private static string ContentManagerGetToken(string token) { + string tokenPrefix, result; + int chainIndex, tokenLength; + + if (token.IndexOf(":") == -1) { + return null; + } + tokenPrefix = token.Substring(0, token.IndexOf(":")); + + chainIndex = token.IndexOf("."); + tokenLength = (tokenPrefix + ":").Length; + if (!token.StartsWith((tokenPrefix + ":"), StringComparison.OrdinalIgnoreCase) || chainIndex <= tokenLength) { + return null; + } + else if (chainIndex == 0) {// "." has not be found + result = token.Substring(tokenLength); + } + else { + result = token.Substring(0, chainIndex); + } + + // return the resulting id if it is a number, otherwise an empty string + if (int.TryParse(result.Substring(tokenPrefix.Length + 1), out var contentid)) { + return result; + } + else { + return ""; + } + } } } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/TinyMce/Scripts/orchard-tinymce.js b/src/Orchard.Web/Modules/TinyMce/Scripts/orchard-tinymce.js index e16c6b4bb..a64fd45a1 100644 --- a/src/Orchard.Web/Modules/TinyMce/Scripts/orchard-tinymce.js +++ b/src/Orchard.Web/Modules/TinyMce/Scripts/orchard-tinymce.js @@ -1,4 +1,6 @@ var mediaPlugins = ""; +var contentPickerPlugins = ""; +var contentPickerButtons = ""; if (mediaPickerEnabled) { mediaPlugins += " mediapicker"; @@ -8,14 +10,19 @@ if (mediaLibraryEnabled) { mediaPlugins += " medialibrary"; } +if (contenPickerEnabled && tokensHtmlFilterEnabled) { + contentPickerPlugins += " orchardcontentlinks" + contentPickerButtons += "orchardlink" +} + tinyMCE.init({ selector: "textarea.tinymce", theme: "modern", schema: "html5", plugins: [ - "advlist, anchor, autolink, autoresize, charmap, code, colorpicker, contextmenu, directionality, emoticons, fullscreen, hr, image, insertdatetime, link, lists, media, nonbreaking, pagebreak, paste, preview, print, searchreplace, table, template, textcolor, textpattern, visualblocks, visualchars, wordcount, htmlsnippets" + mediaPlugins + "advlist, anchor, autolink, autoresize, charmap, code, colorpicker, contextmenu, directionality, emoticons, fullscreen, hr, image, insertdatetime, link, lists, media, nonbreaking, pagebreak, paste, preview, print, searchreplace, table, template, textcolor, textpattern, visualblocks, visualchars, wordcount, htmlsnippets" + (contentPickerPlugins != "" ? ", " + contentPickerPlugins : "") + (mediaPlugins != "" ? ", " + mediaPlugins : "") ], - toolbar: "undo redo cut copy paste | bold italic | bullist numlist outdent indent formatselect | alignleft aligncenter alignright alignjustify ltr rtl | " + mediaPlugins + " link unlink charmap | code htmlsnippetsbutton fullscreen", + toolbar: "undo redo cut copy paste | bold italic | bullist numlist outdent indent formatselect | alignleft aligncenter alignright alignjustify ltr rtl | " + mediaPlugins + " link " + contentPickerButtons + " unlink charmap | code htmlsnippetsbutton fullscreen", convert_urls: false, valid_elements: "*[*]", // Shouldn't be needed due to the valid_elements setting, but TinyMCE would strip script.src without it. @@ -27,7 +34,7 @@ tinyMCE.init({ auto_focus: autofocus, directionality: directionality, setup: function (editor) { - $(document).bind("localization.ui.directionalitychanged", function(event, directionality) { + $(document).bind("localization.ui.directionalitychanged", function (event, directionality) { editor.getBody().dir = directionality; }); diff --git a/src/Orchard.Web/Modules/TinyMce/Scripts/plugins/orchardcontentlinks/plugin.js b/src/Orchard.Web/Modules/TinyMce/Scripts/plugins/orchardcontentlinks/plugin.js new file mode 100644 index 000000000..b76b79b86 --- /dev/null +++ b/src/Orchard.Web/Modules/TinyMce/Scripts/plugins/orchardcontentlinks/plugin.js @@ -0,0 +1,54 @@ +tinymce.PluginManager.add('orchardcontentlinks', function (editor, url) { + var contentPickerAction = function () { + var data = {}; + var callbackName = "_contentpicker_" + new Date().getTime(); + data.callbackName = callbackName; + $[callbackName] = function (returnData) { + delete $[callbackName]; + //the code to wrap text with link + var textLink = editor.selection.getContent(); + if (!textLink || textLink == "") { + textLink = returnData.displayText; + } + editor.insertContent("" + textLink + ""); + + }; + $[callbackName].data = data; + + // Open content picker window + var baseUrl = baseOrchardPath; + + // remove trailing slash if any + if (baseUrl.slice(-1) == '/') + baseUrl = baseUrl.substr(0, baseUrl.length - 1); + var url = baseUrl + "/Admin/Orchard.ContentPicker?"; + url += "callback=" + callbackName + "&" + (new Date() - 0); + if ($("#" + editor.id).data("content-types")) { + url += "&types=" + $("#" + editor.id).data("content-types"); + } + var w = window.open(url, "_blank", data.windowFeatures || "width=685,height=700,status=no,toolbar=no,location=no,menubar=no,resizable=no,scrollbars=yes"); + } + + // Add a button that opens a window + editor.addButton('orchardlink', { + image: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAACXBIWXMAAAsSAAALEgHS3X78AAABb0lEQVRIibWW223CQBBFDxEFUAIdJNHsf6CCkApiKgBXAFSAUgFJBdCB4X9HogSX4A6Sjx0rK8cGY5P7sw9Z93h3HvYAk4jbAk/cpgLYqPpz0wODCJDZ9NTSfBVBpk2QKuCk6tdt3EXcN5BGoFrIQ8u3bdIZeAZyIBNxf664LwBVnwPTJkhvgEGKJsiwp/dCxE2i9RFYAlsD9gIcgRHwUtkv4kVngKqf1u2LuHUMvUsMLunfAVevSMQtCUf+UvWHWwEXTyDidoSMGAF7EZfcDWDmCTC3gM6BnYgb9wZYoSSEXlP2l3LsDCiAQzTPgXd+KzMDzqr+2Amg6t+AmXXViUHGBs0MWJv7rQB25yszWpn5xsYjoR0XVYNrGkbmCSGQr4SsyYG8qWLbqjxBAqSq/hP4MNDYQL1UFloBPEbzPeEENxdWEyAl5PiIEOCcjndeVfxNngELM08NdOtfBlgnLWM3qHvC8n7bwbzUWdWnAD+rk38HDdeC5gAAAABJRU5ErkJggg==', + tooltip: 'Content link', + onclick: contentPickerAction + }); + + // Adds a menu item to the tools menu + editor.addMenuItem('orchardlink ', { + text: 'content link', + image: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAACXBIWXMAAAsSAAALEgHS3X78AAABb0lEQVRIibWW223CQBBFDxEFUAIdJNHsf6CCkApiKgBXAFSAUgFJBdCB4X9HogSX4A6Sjx0rK8cGY5P7sw9Z93h3HvYAk4jbAk/cpgLYqPpz0wODCJDZ9NTSfBVBpk2QKuCk6tdt3EXcN5BGoFrIQ8u3bdIZeAZyIBNxf664LwBVnwPTJkhvgEGKJsiwp/dCxE2i9RFYAlsD9gIcgRHwUtkv4kVngKqf1u2LuHUMvUsMLunfAVevSMQtCUf+UvWHWwEXTyDidoSMGAF7EZfcDWDmCTC3gM6BnYgb9wZYoSSEXlP2l3LsDCiAQzTPgXd+KzMDzqr+2Amg6t+AmXXViUHGBs0MWJv7rQB25yszWpn5xsYjoR0XVYNrGkbmCSGQr4SsyYG8qWLbqjxBAqSq/hP4MNDYQL1UFloBPEbzPeEENxdWEyAl5PiIEOCcjndeVfxNngELM08NdOtfBlgnLWM3qHvC8n7bwbzUWdWnAD+rk38HDdeC5gAAAABJRU5ErkJggg==', + context: 'insert', + onclick: contentPickerAction + }); + + return { + getMetadata: function () { + return { + name: "Orchard content link plugin" + }; + } + }; +}); diff --git a/src/Orchard.Web/Modules/TinyMce/Scripts/plugins/orchardcontentlinks/plugin.min.js b/src/Orchard.Web/Modules/TinyMce/Scripts/plugins/orchardcontentlinks/plugin.min.js new file mode 100644 index 000000000..f69818d12 --- /dev/null +++ b/src/Orchard.Web/Modules/TinyMce/Scripts/plugins/orchardcontentlinks/plugin.min.js @@ -0,0 +1 @@ +tinymce.PluginManager.add("orchardcontentlinks", function (A, n) { var t = function () { var n = {}, t = "_contentpicker_" + new Date().getTime(); n.callbackName = t, $[t] = function (n) { delete $[t]; var e = A.selection.getContent(); e && "" != e || (e = n.displayText), A.insertContent('' + e + "") }, $[t].data = n; var e = baseOrchardPath; "/" == e.slice(-1) && (e = e.substr(0, e.length - 1)); var g = e + "/Admin/Orchard.ContentPicker?"; g += "callback=" + t + "&" + (new Date - 0), $("#" + A.id).data("content-types") && (g += "&types=" + $("#" + A.id).data("content-types")), window.open(g, "_blank", n.windowFeatures || "width=685,height=700,status=no,toolbar=no,location=no,menubar=no,resizable=no,scrollbars=yes") }; return A.addButton("orchardlink", { image: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAACXBIWXMAAAsSAAALEgHS3X78AAABb0lEQVRIibWW223CQBBFDxEFUAIdJNHsf6CCkApiKgBXAFSAUgFJBdCB4X9HogSX4A6Sjx0rK8cGY5P7sw9Z93h3HvYAk4jbAk/cpgLYqPpz0wODCJDZ9NTSfBVBpk2QKuCk6tdt3EXcN5BGoFrIQ8u3bdIZeAZyIBNxf664LwBVnwPTJkhvgEGKJsiwp/dCxE2i9RFYAlsD9gIcgRHwUtkv4kVngKqf1u2LuHUMvUsMLunfAVevSMQtCUf+UvWHWwEXTyDidoSMGAF7EZfcDWDmCTC3gM6BnYgb9wZYoSSEXlP2l3LsDCiAQzTPgXd+KzMDzqr+2Amg6t+AmXXViUHGBs0MWJv7rQB25yszWpn5xsYjoR0XVYNrGkbmCSGQr4SsyYG8qWLbqjxBAqSq/hP4MNDYQL1UFloBPEbzPeEENxdWEyAl5PiIEOCcjndeVfxNngELM08NdOtfBlgnLWM3qHvC8n7bwbzUWdWnAD+rk38HDdeC5gAAAABJRU5ErkJggg==", tooltip: "Content link", onclick: t }), A.addMenuItem("orchardlink ", { text: "content link", image: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAACXBIWXMAAAsSAAALEgHS3X78AAABb0lEQVRIibWW223CQBBFDxEFUAIdJNHsf6CCkApiKgBXAFSAUgFJBdCB4X9HogSX4A6Sjx0rK8cGY5P7sw9Z93h3HvYAk4jbAk/cpgLYqPpz0wODCJDZ9NTSfBVBpk2QKuCk6tdt3EXcN5BGoFrIQ8u3bdIZeAZyIBNxf664LwBVnwPTJkhvgEGKJsiwp/dCxE2i9RFYAlsD9gIcgRHwUtkv4kVngKqf1u2LuHUMvUsMLunfAVevSMQtCUf+UvWHWwEXTyDidoSMGAF7EZfcDWDmCTC3gM6BnYgb9wZYoSSEXlP2l3LsDCiAQzTPgXd+KzMDzqr+2Amg6t+AmXXViUHGBs0MWJv7rQB25yszWpn5xsYjoR0XVYNrGkbmCSGQr4SsyYG8qWLbqjxBAqSq/hP4MNDYQL1UFloBPEbzPeEENxdWEyAl5PiIEOCcjndeVfxNngELM08NdOtfBlgnLWM3qHvC8n7bwbzUWdWnAD+rk38HDdeC5gAAAABJRU5ErkJggg==", context: "insert", onclick: t }), { getMetadata: function () { return { name: "Orchard content link plugin" } } } }); \ No newline at end of file diff --git a/src/Orchard.Web/Modules/TinyMce/Settings/ContentLinksSettings.cs b/src/Orchard.Web/Modules/TinyMce/Settings/ContentLinksSettings.cs new file mode 100644 index 000000000..13d97959c --- /dev/null +++ b/src/Orchard.Web/Modules/TinyMce/Settings/ContentLinksSettings.cs @@ -0,0 +1,5 @@ +namespace TinyMce.Settings { + public class ContentLinksSettings { + public string DisplayedContentTypes { get; set; } + } +} diff --git a/src/Orchard.Web/Modules/TinyMce/Settings/EditorEvents.cs b/src/Orchard.Web/Modules/TinyMce/Settings/EditorEvents.cs new file mode 100644 index 000000000..f27f69727 --- /dev/null +++ b/src/Orchard.Web/Modules/TinyMce/Settings/EditorEvents.cs @@ -0,0 +1,59 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using Orchard.ContentManagement; +using Orchard.ContentManagement.MetaData; +using Orchard.ContentManagement.MetaData.Builders; +using Orchard.ContentManagement.MetaData.Models; +using Orchard.ContentManagement.ViewModels; +using Orchard.Environment.Descriptor.Models; + +namespace TinyMce.Settings { + public class EditorEvents : ContentDefinitionEditorEventsBase { + + private string[] _htmlParts = new string[] { "BodyPart", "LayoutPart" }; + private string[] _htmlFields = new string[] { "TextField" }; + private bool _contentLinksDependenciesEnabled = false; + + public EditorEvents(ShellDescriptor shellDescriptor) { + var contenPickerEnabled = shellDescriptor.Features.Any(x => x.Name == "Orchard.ContentPicker") ? true : false; + var tokensHtmlFilterEnabled = shellDescriptor.Features.Any(x => x.Name == "Orchard.Tokens.HtmlFilter") ? true : false; + _contentLinksDependenciesEnabled = contenPickerEnabled && tokensHtmlFilterEnabled; + } + + public override IEnumerable PartFieldEditor(ContentPartFieldDefinition definition) { + if (!_contentLinksDependenciesEnabled || !_htmlFields.Any(x => x.Equals(definition.FieldDefinition.Name, StringComparison.InvariantCultureIgnoreCase))) + yield break; + var model = definition.Settings.GetModel(); + yield return DefinitionTemplate(model); + } + + public override IEnumerable PartFieldEditorUpdate(ContentPartFieldDefinitionBuilder builder, IUpdateModel updateModel) { + if (!_contentLinksDependenciesEnabled || !_htmlFields.Any(x => x.Equals(builder.Name, StringComparison.InvariantCultureIgnoreCase))) + yield break; + + var model = new ContentLinksSettings(); + updateModel.TryUpdateModel(model, "ContentLinksSettings", null, null); + builder.WithSetting("ContentLinksSettings.DisplayedContentTypes", model.DisplayedContentTypes); + + yield return DefinitionTemplate(model); + } + + public override IEnumerable TypePartEditor(ContentTypePartDefinition definition) { + if (!_contentLinksDependenciesEnabled || !_htmlParts.Any(x => x.Equals(definition.PartDefinition.Name, StringComparison.InvariantCultureIgnoreCase))) + yield break; + var model = definition.Settings.GetModel(); + yield return DefinitionTemplate(model); + } + + + public override IEnumerable TypePartEditorUpdate(ContentTypePartDefinitionBuilder builder, IUpdateModel updateModel) { + if (!_contentLinksDependenciesEnabled || !_htmlParts.Any(x => x.Equals(builder.Name, StringComparison.InvariantCultureIgnoreCase))) + yield break; + var model = new ContentLinksSettings(); + updateModel.TryUpdateModel(model, "ContentLinksSettings", null, null); + builder.WithSetting("ContentLinksSettings.DisplayedContentTypes", model.DisplayedContentTypes); + yield return DefinitionTemplate(model); + } + } +} \ 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 2589e1a65..29ae701e7 100644 --- a/src/Orchard.Web/Modules/TinyMce/TinyMce.csproj +++ b/src/Orchard.Web/Modules/TinyMce/TinyMce.csproj @@ -250,6 +250,8 @@ + + @@ -317,6 +319,8 @@ + + @@ -379,7 +383,9 @@ + + 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) diff --git a/src/Orchard.Web/Modules/TinyMce/Views/Body-Html.Editor.cshtml b/src/Orchard.Web/Modules/TinyMce/Views/Body-Html.Editor.cshtml index 893554b37..862ed6fd6 100644 --- a/src/Orchard.Web/Modules/TinyMce/Views/Body-Html.Editor.cshtml +++ b/src/Orchard.Web/Modules/TinyMce/Views/Body-Html.Editor.cshtml @@ -3,17 +3,35 @@ @using Orchard.Environment.Descriptor.Models @using Orchard.Localization @using Orchard.Mvc.Extensions +@using TinyMce.Settings; @{ var shellDescriptor = WorkContext.Resolve(); var urlPrefix = WorkContext.Resolve().RequestUrlPrefix; if (!string.IsNullOrWhiteSpace(urlPrefix)) { urlPrefix += "/"; } + var contentTypes = ""; + if (Model.Field != null) { + var settings = Model.Field.PartFieldDefinition.Settings.GetModel(); + if (settings != null) { + contentTypes = settings.DisplayedContentTypes; + } + } + else if (Model.Part != null) { + var settings = Model.Part.TypePartDefinition.Settings.GetModel(); + if (settings != null) { + contentTypes = settings.DisplayedContentTypes; + } + } + + }