diff --git a/Sources/AssemblyVersionAuto.cs b/Sources/AssemblyVersionAuto.cs index 97f873c9..1cf2134b 100644 --- a/Sources/AssemblyVersionAuto.cs +++ b/Sources/AssemblyVersionAuto.cs @@ -3,6 +3,6 @@ [assembly: AssemblyCopyright("Copyright ? 2019 Episerver")] -[assembly: AssemblyVersion("13.4.0.0")] -[assembly: AssemblyInformationalVersion("13.4.0")] -[assembly: AssemblyFileVersion("13.4.0.3701")] +[assembly: AssemblyVersion("13.5.0.0")] +[assembly: AssemblyInformationalVersion("13.5.0")] +[assembly: AssemblyFileVersion("13.5.0.3705")] diff --git a/Sources/EPiServer.Reference.Commerce.Manager/Apps/MetaUIEntity/Config/View/Reference1N.xml b/Sources/EPiServer.Reference.Commerce.Manager/Apps/MetaUIEntity/Config/View/Reference1N.xml index d1d75885..b27eef69 100644 --- a/Sources/EPiServer.Reference.Commerce.Manager/Apps/MetaUIEntity/Config/View/Reference1N.xml +++ b/Sources/EPiServer.Reference.Commerce.Manager/Apps/MetaUIEntity/Config/View/Reference1N.xml @@ -1,58 +1,60 @@  - - - - - - - - - - - - - - - - - - - - OpenFrameModalPopup - {Common:SearchObjects} - ~/Apps/MetaUIEntity/Pages/EntitySelect.aspx?Classes={HttpContext:ClassName}&refreshName=SelectItems_Refresh&ReturnCommand=MC_MUI_AddSelected&MultipleSelect=1&CanCreate=1&ContainerFieldName={HttpContext:FieldName}&ContainerId={HttpContext:FieldValue} - 640 - 480 - 100 - 50 - True - ContentPanelPanel - - - Navigate - ~/Apps/MetaUIEntity/Pages/EntityEdit.aspx?ClassName={HttpContext:ClassName}&ContainerFieldName={HttpContext:FieldName}&ContainerId={HttpContext:FieldValue} - - - ServerAction - {Common:DeleteSelectedItemsConfirmation} - - ContentPanelPanel - - - ClientAction - CSManagementClient.ChangeBafView('{HttpContext:ClassName}', 'View', 'ObjectId=[ClientParam:primaryKeyId]') - - - ClientAction - CSManagementClient.ChangeBafView('{HttpContext:ClassName}', 'Edit', 'ObjectId=[ClientParam:primaryKeyId]') - - - ServerAction - - ContentPanelPanel - - - - + + + + + + + + + + + + + + + + + + + + OpenFrameModalPopup + {Common:SearchObjects} + ~/Apps/MetaUIEntity/Pages/EntitySelect.aspx?Classes={HttpContext:ClassName}&refreshName=SelectItems_Refresh&ReturnCommand=MC_MUI_AddSelected&MultipleSelect=1&CanCreate=1&ContainerFieldName={HttpContext:FieldName}&ContainerId={HttpContext:FieldValue} + 640 + 480 + 100 + 50 + True + ContentPanelPanel + + + + Navigate + ~/Apps/MetaUIEntity/Pages/EntityEdit.aspx?ClassName={HttpContext:ClassName}&ContainerFieldName={HttpContext:FieldName}&ContainerId={HttpContext:FieldValue} + + + ServerAction + {Common:DeleteSelectedItemsConfirmation} + + ContentPanelPanel + + + + ClientAction + CSManagementClient.ChangeBafView('{HttpContext:ClassName}', 'View', 'ObjectId=[ClientParam:primaryKeyId]') + + + ClientAction + CSManagementClient.ChangeBafView('{HttpContext:ClassName}', 'Edit', 'ObjectId=[ClientParam:primaryKeyId]') + + + ServerAction + + ContentPanelPanel + + + + diff --git a/Sources/EPiServer.Reference.Commerce.Manager/Apps/MetaUIEntity/Config/View/ReferenceNN.xml b/Sources/EPiServer.Reference.Commerce.Manager/Apps/MetaUIEntity/Config/View/ReferenceNN.xml index c15d1f8c..ab691e0e 100644 --- a/Sources/EPiServer.Reference.Commerce.Manager/Apps/MetaUIEntity/Config/View/ReferenceNN.xml +++ b/Sources/EPiServer.Reference.Commerce.Manager/Apps/MetaUIEntity/Config/View/ReferenceNN.xml @@ -1,50 +1,52 @@  - - - - - - - - - - - - - - - - - - - OpenFrameModalPopup - {Common:SearchObjects} - ~/Apps/MetaUIEntity/Pages/EntitySelect.aspx?Classes={HttpContext:ClassName}&refreshName=SelectItems_Refresh&ReturnCommand=MC_MUI_AddSelected&MultipleSelect=1&CanCreate=1 - 640 - 480 - 100 - 50 - True - - - ServerAction - {Common:DeleteSelectedItemsConfirmation} - - - - ClientAction - CSManagementClient.ChangeBafView('{HttpContext:ClassName}', 'View', 'ObjectId=[ClientParam:primaryKeyId]') - - - ClientAction - CSManagementClient.ChangeBafView('{HttpContext:ClassName}', 'Edit', 'ObjectId=[ClientParam:primaryKeyId]') - - - ServerAction - - - - - + + + + + + + + + + + + + + + + + + + OpenFrameModalPopup + {Common:SearchObjects} + ~/Apps/MetaUIEntity/Pages/EntitySelect.aspx?Classes={HttpContext:ClassName}&refreshName=SelectItems_Refresh&ReturnCommand=MC_MUI_AddSelected&MultipleSelect=1&CanCreate=1 + 640 + 480 + 100 + 50 + True + + + + ServerAction + {Common:DeleteSelectedItemsConfirmation} + + + + + ClientAction + CSManagementClient.ChangeBafView('{HttpContext:ClassName}', 'View', 'ObjectId=[ClientParam:primaryKeyId]') + + + ClientAction + CSManagementClient.ChangeBafView('{HttpContext:ClassName}', 'Edit', 'ObjectId=[ClientParam:primaryKeyId]') + + + ServerAction + + + + + diff --git a/Sources/EPiServer.Reference.Commerce.Manager/Apps/MetaUIEntity/Modules/EntityListReference1N.ascx b/Sources/EPiServer.Reference.Commerce.Manager/Apps/MetaUIEntity/Modules/EntityListReference1N.ascx index 52793865..4075e10c 100644 --- a/Sources/EPiServer.Reference.Commerce.Manager/Apps/MetaUIEntity/Modules/EntityListReference1N.ascx +++ b/Sources/EPiServer.Reference.Commerce.Manager/Apps/MetaUIEntity/Modules/EntityListReference1N.ascx @@ -14,8 +14,8 @@ - - + + diff --git a/Sources/EPiServer.Reference.Commerce.Manager/Apps/MetaUIEntity/Modules/EntityListReferenceNN.ascx b/Sources/EPiServer.Reference.Commerce.Manager/Apps/MetaUIEntity/Modules/EntityListReferenceNN.ascx index 2d543471..257ad98e 100644 --- a/Sources/EPiServer.Reference.Commerce.Manager/Apps/MetaUIEntity/Modules/EntityListReferenceNN.ascx +++ b/Sources/EPiServer.Reference.Commerce.Manager/Apps/MetaUIEntity/Modules/EntityListReferenceNN.ascx @@ -14,8 +14,8 @@ - - + + diff --git a/Sources/EPiServer.Reference.Commerce.Manager/Apps/Shell/Scripts/BusinessFoundation/GridViewHeaderBehavior2.js b/Sources/EPiServer.Reference.Commerce.Manager/Apps/Shell/Scripts/BusinessFoundation/GridViewHeaderBehavior2.js index 21ca8030..c19dbd0b 100644 --- a/Sources/EPiServer.Reference.Commerce.Manager/Apps/Shell/Scripts/BusinessFoundation/GridViewHeaderBehavior2.js +++ b/Sources/EPiServer.Reference.Commerce.Manager/Apps/Shell/Scripts/BusinessFoundation/GridViewHeaderBehavior2.js @@ -364,18 +364,41 @@ Mediachase.GridViewHeaderBehavior2.prototype = { if (this.divResizeProxy.parentNode.offsetWidth - 1 >= 0) this.divResizeProxy.style.width = this.divResizeProxy.parentNode.offsetWidth - 2 + 'px'; + var parentMaxHeight = this.divResizeProxy.parentNode.style.maxHeight; + var maxHeight = 0; + if (parentMaxHeight) { + maxHeight = parseInt(parentMaxHeight, 10); + } + var newHeight = 600; + if (this._layoutHandler == null && !this.dashboardMode) { this.divResizeProxy.style.height = document.body.offsetHeight - this.divResizeProxy.offsetTop - 4 + 'px'; } else { if (!this.layoutResizeEnable) { - if (this.divWrapper) - this.divResizeProxy.style.height = this.get_element().offsetHeight + this.bottomDiv.offsetHeight + this.headDiv.offsetHeight - this.get_element().offsetTop + 17 + 'px';;//this.get_element().offsetHeight + this.bottomDiv.offsetHeight + this.headDiv.offsetHeight - this.get_element().offsetTop + 17 + 'px'; //16 - eto zapas dla horizontal scrolla + if (this.divWrapper) { + newHeight = this.get_element().offsetHeight + + this.bottomDiv.offsetHeight + + this.headDiv.offsetHeight - + this.get_element().offsetTop + + 17; + if (maxHeight > 0 && newHeight > maxHeight) { + newHeight = maxHeight; + } + + this.divResizeProxy.style.height = + newHeight + + 'px'; //this.get_element().offsetHeight + this.bottomDiv.offsetHeight + this.headDiv.offsetHeight - this.get_element().offsetTop + 17 + 'px'; //16 - eto zapas dla horizontal scrolla + } } else { - this.divResizeProxy.style.height = document.body.offsetHeight - this.divResizeProxy.offsetTop - 4 + 'px'; + newHeight = document.body.offsetHeight - this.divResizeProxy.offsetTop - 4; + if (maxHeight > 0 && newHeight > maxHeight) { + newHeight = maxHeight; + } + this.divResizeProxy.style.height =newHeight + 'px'; } } diff --git a/Sources/EPiServer.Reference.Commerce.Manager/EPiServer.Reference.Commerce.Manager.csproj b/Sources/EPiServer.Reference.Commerce.Manager/EPiServer.Reference.Commerce.Manager.csproj index e41b61d8..d5fea774 100644 --- a/Sources/EPiServer.Reference.Commerce.Manager/EPiServer.Reference.Commerce.Manager.csproj +++ b/Sources/EPiServer.Reference.Commerce.Manager/EPiServer.Reference.Commerce.Manager.csproj @@ -407,109 +407,109 @@ - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\EPiServer.Business.Commerce.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\EPiServer.Business.Commerce.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\EPiServer.Commerce.Reporting.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\EPiServer.Commerce.Reporting.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\EPiServer.Commerce.Internal.Migration.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\EPiServer.Commerce.Internal.Migration.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\Mediachase.BusinessFoundation.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\Mediachase.BusinessFoundation.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\Mediachase.BusinessFoundation.Data.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\Mediachase.BusinessFoundation.Data.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\Mediachase.Commerce.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\Mediachase.Commerce.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\Mediachase.Commerce.Marketing.Validators.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\Mediachase.Commerce.Marketing.Validators.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\Mediachase.Commerce.Plugins.Payment.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\Mediachase.Commerce.Plugins.Payment.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\Mediachase.Commerce.Plugins.Shipping.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\Mediachase.Commerce.Plugins.Shipping.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\Mediachase.Commerce.Website.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\Mediachase.Commerce.Website.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\Mediachase.Commerce.Workflow.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\Mediachase.Commerce.Workflow.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\Mediachase.DataProvider.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\Mediachase.DataProvider.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\Mediachase.FileUploader.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\Mediachase.FileUploader.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\Mediachase.MetaDataPlus.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\Mediachase.MetaDataPlus.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\Mediachase.Search.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\Mediachase.Search.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\Mediachase.Search.Extensions.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\Mediachase.Search.Extensions.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\Mediachase.Search.LuceneSearchProvider.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\Mediachase.Search.LuceneSearchProvider.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\Mediachase.SqlDataProvider.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\Mediachase.SqlDataProvider.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\Mediachase.WebConsoleLib.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\Mediachase.WebConsoleLib.dll True - ..\..\packages\EPiServer.CommerceManager.13.4.0\lib\net461\Mediachase.ConsoleManager.dll + ..\..\packages\EPiServer.CommerceManager.13.5.0\lib\net461\Mediachase.ConsoleManager.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\AjaxControlToolkit.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\AjaxControlToolkit.dll True - ..\..\packages\EPiServer.CommerceManager.13.4.0\lib\net461\ComponentArt.Web.UI.dll + ..\..\packages\EPiServer.CommerceManager.13.5.0\lib\net461\ComponentArt.Web.UI.dll True - ..\..\packages\EPiServer.CommerceManager.13.4.0\lib\net461\RssToolkit.dll + ..\..\packages\EPiServer.CommerceManager.13.5.0\lib\net461\RssToolkit.dll True - ..\..\packages\EPiServer.CommerceManager.13.4.0\lib\net461\Validators.dll + ..\..\packages\EPiServer.CommerceManager.13.5.0\lib\net461\Validators.dll True - + 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/Sources/EPiServer.Reference.Commerce.Manager/packages.config b/Sources/EPiServer.Reference.Commerce.Manager/packages.config index ee0e3113..5ba4cb00 100644 --- a/Sources/EPiServer.Reference.Commerce.Manager/packages.config +++ b/Sources/EPiServer.Reference.Commerce.Manager/packages.config @@ -45,6 +45,6 @@ - - + + diff --git a/Sources/EPiServer.Reference.Commerce.Manager/web.config b/Sources/EPiServer.Reference.Commerce.Manager/web.config index 205432e2..0a6e8435 100644 --- a/Sources/EPiServer.Reference.Commerce.Manager/web.config +++ b/Sources/EPiServer.Reference.Commerce.Manager/web.config @@ -540,79 +540,79 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/Sources/EPiServer.Reference.Commerce.Shared/EPiServer.Reference.Commerce.Shared.csproj b/Sources/EPiServer.Reference.Commerce.Shared/EPiServer.Reference.Commerce.Shared.csproj index f06cfb2b..5690b0a0 100644 --- a/Sources/EPiServer.Reference.Commerce.Shared/EPiServer.Reference.Commerce.Shared.csproj +++ b/Sources/EPiServer.Reference.Commerce.Shared/EPiServer.Reference.Commerce.Shared.csproj @@ -267,79 +267,79 @@ --> - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\EPiServer.Business.Commerce.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\EPiServer.Business.Commerce.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\EPiServer.Commerce.Internal.Migration.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\EPiServer.Commerce.Internal.Migration.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\Mediachase.BusinessFoundation.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\Mediachase.BusinessFoundation.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\Mediachase.BusinessFoundation.Data.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\Mediachase.BusinessFoundation.Data.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\Mediachase.Commerce.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\Mediachase.Commerce.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\Mediachase.Commerce.Marketing.Validators.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\Mediachase.Commerce.Marketing.Validators.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\Mediachase.Commerce.Plugins.Payment.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\Mediachase.Commerce.Plugins.Payment.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\Mediachase.Commerce.Plugins.Shipping.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\Mediachase.Commerce.Plugins.Shipping.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\Mediachase.Commerce.Website.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\Mediachase.Commerce.Website.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\Mediachase.Commerce.Workflow.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\Mediachase.Commerce.Workflow.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\Mediachase.DataProvider.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\Mediachase.DataProvider.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\Mediachase.FileUploader.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\Mediachase.FileUploader.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\Mediachase.MetaDataPlus.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\Mediachase.MetaDataPlus.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\Mediachase.Search.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\Mediachase.Search.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\Mediachase.Search.Extensions.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\Mediachase.Search.Extensions.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\Mediachase.Search.LuceneSearchProvider.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\Mediachase.Search.LuceneSearchProvider.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\Mediachase.SqlDataProvider.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\Mediachase.SqlDataProvider.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\Mediachase.WebConsoleLib.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\Mediachase.WebConsoleLib.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\AjaxControlToolkit.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\AjaxControlToolkit.dll True diff --git a/Sources/EPiServer.Reference.Commerce.Shared/packages.config b/Sources/EPiServer.Reference.Commerce.Shared/packages.config index bf96516d..8571d692 100644 --- a/Sources/EPiServer.Reference.Commerce.Shared/packages.config +++ b/Sources/EPiServer.Reference.Commerce.Shared/packages.config @@ -39,5 +39,5 @@ - + diff --git a/Sources/EPiServer.Reference.Commerce.Site.Tests/EPiServer.Reference.Commerce.Site.Tests.csproj b/Sources/EPiServer.Reference.Commerce.Site.Tests/EPiServer.Reference.Commerce.Site.Tests.csproj index a2cd6aba..107d0a5b 100644 --- a/Sources/EPiServer.Reference.Commerce.Site.Tests/EPiServer.Reference.Commerce.Site.Tests.csproj +++ b/Sources/EPiServer.Reference.Commerce.Site.Tests/EPiServer.Reference.Commerce.Site.Tests.csproj @@ -395,91 +395,91 @@ --> - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\EPiServer.Business.Commerce.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\EPiServer.Business.Commerce.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\EPiServer.Commerce.Reporting.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\EPiServer.Commerce.Reporting.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\EPiServer.Commerce.Internal.Migration.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\EPiServer.Commerce.Internal.Migration.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\Mediachase.BusinessFoundation.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\Mediachase.BusinessFoundation.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\Mediachase.BusinessFoundation.Data.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\Mediachase.BusinessFoundation.Data.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\Mediachase.Commerce.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\Mediachase.Commerce.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\Mediachase.Commerce.Marketing.Validators.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\Mediachase.Commerce.Marketing.Validators.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\Mediachase.Commerce.Plugins.Payment.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\Mediachase.Commerce.Plugins.Payment.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\Mediachase.Commerce.Plugins.Shipping.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\Mediachase.Commerce.Plugins.Shipping.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\Mediachase.Commerce.Website.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\Mediachase.Commerce.Website.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\Mediachase.Commerce.Workflow.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\Mediachase.Commerce.Workflow.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\Mediachase.DataProvider.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\Mediachase.DataProvider.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\Mediachase.FileUploader.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\Mediachase.FileUploader.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\Mediachase.MetaDataPlus.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\Mediachase.MetaDataPlus.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\Mediachase.Search.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\Mediachase.Search.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\Mediachase.Search.Extensions.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\Mediachase.Search.Extensions.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\Mediachase.Search.LuceneSearchProvider.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\Mediachase.Search.LuceneSearchProvider.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\Mediachase.SqlDataProvider.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\Mediachase.SqlDataProvider.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\Mediachase.WebConsoleLib.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\Mediachase.WebConsoleLib.dll True - ..\..\packages\EPiServer.Tracking.Commerce.3.1.3\lib\net461\EPiServer.Tracking.Commerce.dll + ..\..\packages\EPiServer.Tracking.Commerce.3.1.4\lib\net461\EPiServer.Tracking.Commerce.dll True - ..\..\packages\EPiServer.Personalization.Commerce.3.1.3\lib\net461\EPiServer.Personalization.Commerce.dll + ..\..\packages\EPiServer.Personalization.Commerce.3.1.4\lib\net461\EPiServer.Personalization.Commerce.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\AjaxControlToolkit.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\AjaxControlToolkit.dll True diff --git a/Sources/EPiServer.Reference.Commerce.Site.Tests/packages.config b/Sources/EPiServer.Reference.Commerce.Site.Tests/packages.config index 458959ce..8042b6fb 100644 --- a/Sources/EPiServer.Reference.Commerce.Site.Tests/packages.config +++ b/Sources/EPiServer.Reference.Commerce.Site.Tests/packages.config @@ -54,7 +54,7 @@ - - - + + + diff --git a/Sources/EPiServer.Reference.Commerce.Site/EPiServer.Reference.Commerce.Site.csproj b/Sources/EPiServer.Reference.Commerce.Site/EPiServer.Reference.Commerce.Site.csproj index f2cf1668..6fa1ad0a 100644 --- a/Sources/EPiServer.Reference.Commerce.Site/EPiServer.Reference.Commerce.Site.csproj +++ b/Sources/EPiServer.Reference.Commerce.Site/EPiServer.Reference.Commerce.Site.csproj @@ -1008,107 +1008,107 @@ - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\EPiServer.Business.Commerce.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\EPiServer.Business.Commerce.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\EPiServer.Commerce.Internal.Migration.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\EPiServer.Commerce.Internal.Migration.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\Mediachase.BusinessFoundation.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\Mediachase.BusinessFoundation.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\Mediachase.BusinessFoundation.Data.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\Mediachase.BusinessFoundation.Data.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\Mediachase.Commerce.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\Mediachase.Commerce.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\Mediachase.Commerce.Marketing.Validators.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\Mediachase.Commerce.Marketing.Validators.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\Mediachase.Commerce.Plugins.Payment.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\Mediachase.Commerce.Plugins.Payment.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\Mediachase.Commerce.Plugins.Shipping.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\Mediachase.Commerce.Plugins.Shipping.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\Mediachase.Commerce.Website.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\Mediachase.Commerce.Website.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\Mediachase.Commerce.Workflow.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\Mediachase.Commerce.Workflow.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\Mediachase.DataProvider.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\Mediachase.DataProvider.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\Mediachase.FileUploader.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\Mediachase.FileUploader.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\Mediachase.MetaDataPlus.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\Mediachase.MetaDataPlus.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\Mediachase.Search.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\Mediachase.Search.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\Mediachase.Search.Extensions.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\Mediachase.Search.Extensions.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\Mediachase.Search.LuceneSearchProvider.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\Mediachase.Search.LuceneSearchProvider.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\Mediachase.SqlDataProvider.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\Mediachase.SqlDataProvider.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\Mediachase.WebConsoleLib.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\Mediachase.WebConsoleLib.dll True - ..\..\packages\EPiServer.Commerce.UI.13.4.0\lib\net461\EPiServer.Commerce.Shell.dll + ..\..\packages\EPiServer.Commerce.UI.13.5.0\lib\net461\EPiServer.Commerce.Shell.dll True - ..\..\packages\EPiServer.Commerce.UI.ManagerIntegration.13.4.0\lib\net461\EPiServer.Commerce.Shell.ManagerIntegration.dll + ..\..\packages\EPiServer.Commerce.UI.ManagerIntegration.13.5.0\lib\net461\EPiServer.Commerce.Shell.ManagerIntegration.dll True - ..\..\packages\EPiServer.Commerce.UI.13.4.0\lib\net461\EPiServer.Commerce.UI.dll + ..\..\packages\EPiServer.Commerce.UI.13.5.0\lib\net461\EPiServer.Commerce.UI.dll True - ..\..\packages\EPiServer.Commerce.UI.CustomerService.13.4.0\lib\net461\EPiServer.Commerce.UI.CustomerService.dll + ..\..\packages\EPiServer.Commerce.UI.CustomerService.13.5.0\lib\net461\EPiServer.Commerce.UI.CustomerService.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\EPiServer.Commerce.Reporting.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\EPiServer.Commerce.Reporting.dll True - ..\..\packages\EPiServer.Tracking.Commerce.3.1.3\lib\net461\EPiServer.Tracking.Commerce.dll + ..\..\packages\EPiServer.Tracking.Commerce.3.1.4\lib\net461\EPiServer.Tracking.Commerce.dll True - ..\..\packages\EPiServer.Personalization.Commerce.3.1.3\lib\net461\EPiServer.Personalization.Commerce.dll + ..\..\packages\EPiServer.Personalization.Commerce.3.1.4\lib\net461\EPiServer.Personalization.Commerce.dll True - ..\..\packages\EPiServer.Commerce.Core.13.4.0\lib\net461\AjaxControlToolkit.dll + ..\..\packages\EPiServer.Commerce.Core.13.5.0\lib\net461\AjaxControlToolkit.dll True diff --git a/Sources/EPiServer.Reference.Commerce.Site/Web.config b/Sources/EPiServer.Reference.Commerce.Site/Web.config index f2009ed7..a0b61bd8 100644 --- a/Sources/EPiServer.Reference.Commerce.Site/Web.config +++ b/Sources/EPiServer.Reference.Commerce.Site/Web.config @@ -249,95 +249,95 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/Commerce/Commerce.zip b/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/Commerce/Commerce.zip index e20d9219..16863435 100644 Binary files a/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/Commerce/Commerce.zip and b/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/Commerce/Commerce.zip differ diff --git a/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/EPiServer.Commerce.Shell.ManagerIntegration/EPiServer.Commerce.Shell.ManagerIntegration.zip b/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/EPiServer.Commerce.Shell.ManagerIntegration/EPiServer.Commerce.Shell.ManagerIntegration.zip index 2ccf01c9..f792a2e3 100644 Binary files a/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/EPiServer.Commerce.Shell.ManagerIntegration/EPiServer.Commerce.Shell.ManagerIntegration.zip and b/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/EPiServer.Commerce.Shell.ManagerIntegration/EPiServer.Commerce.Shell.ManagerIntegration.zip differ diff --git a/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/EPiServer.Commerce.Shell/EPiServer.Commerce.Shell.zip b/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/EPiServer.Commerce.Shell/EPiServer.Commerce.Shell.zip index dbe91857..48dc310f 100644 Binary files a/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/EPiServer.Commerce.Shell/EPiServer.Commerce.Shell.zip and b/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/EPiServer.Commerce.Shell/EPiServer.Commerce.Shell.zip differ diff --git a/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/EPiServer.Commerce.UI.CustomerService/EPiServer.Commerce.UI.CustomerService.zip b/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/EPiServer.Commerce.UI.CustomerService/EPiServer.Commerce.UI.CustomerService.zip index e5851f4a..5b1f5b73 100644 Binary files a/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/EPiServer.Commerce.UI.CustomerService/EPiServer.Commerce.UI.CustomerService.zip and b/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/EPiServer.Commerce.UI.CustomerService/EPiServer.Commerce.UI.CustomerService.zip differ diff --git a/Sources/EPiServer.Reference.Commerce.Site/packages.config b/Sources/EPiServer.Reference.Commerce.Site/packages.config index c371f8f4..ce80db34 100644 --- a/Sources/EPiServer.Reference.Commerce.Site/packages.config +++ b/Sources/EPiServer.Reference.Commerce.Site/packages.config @@ -67,11 +67,11 @@ - - - - - - - + + + + + + +