diff --git a/Sources/AssemblyVersionAuto.cs b/Sources/AssemblyVersionAuto.cs index 9004f585..212158d0 100644 --- a/Sources/AssemblyVersionAuto.cs +++ b/Sources/AssemblyVersionAuto.cs @@ -3,6 +3,6 @@ [assembly: AssemblyCopyright("Copyright ? 2017 Episerver")] -[assembly: AssemblyVersion("11.4.1.0")] -[assembly: AssemblyInformationalVersion("11.4.1")] -[assembly: AssemblyFileVersion("11.4.1.2785")] +[assembly: AssemblyVersion("11.5.0.0")] +[assembly: AssemblyInformationalVersion("11.5.0")] +[assembly: AssemblyFileVersion("11.5.0.2813")] 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 824a0c0a..b667cb3e 100644 --- a/Sources/EPiServer.Reference.Commerce.Manager/EPiServer.Reference.Commerce.Manager.csproj +++ b/Sources/EPiServer.Reference.Commerce.Manager/EPiServer.Reference.Commerce.Manager.csproj @@ -13,12 +13,12 @@ Properties EPiServer.Reference.Commerce.Manager EPiServer.Reference.Commerce.Manager - v4.5.2 + v4.6.1 true - - - - + 44300 + enabled + disabled + false @@ -48,13 +48,13 @@ - ..\..\packages\AuthorizeNet.1.9.2\lib\AuthorizeNet.dll + ..\..\packages\AuthorizeNet.1.9.4\lib\AuthorizeNet.dll - - ..\..\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll + + ..\..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll - - ..\..\packages\Castle.Windsor.3.3.0\lib\net45\Castle.Windsor.dll + + ..\..\packages\Castle.Windsor.4.1.0\lib\net45\Castle.Windsor.dll ..\..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll @@ -62,68 +62,74 @@ ..\..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll - - ..\..\packages\EPiServer.CMS.Core.10.10.4\lib\net45\EPiServer.dll + + ..\..\packages\EPiServer.CMS.Core.11.2.1\lib\net461\EPiServer.dll - - ..\..\packages\EPiServer.Framework.10.10.4\lib\net45\EPiServer.ApplicationModules.dll + + ..\..\packages\EPiServer.Framework.11.2.1\lib\net461\EPiServer.ApplicationModules.dll - - ..\..\packages\EPiServer.CMS.UI.Core.10.12.0\lib\net45\EPiServer.Cms.Shell.UI.dll + + ..\..\packages\EPiServer.CMS.AspNet.11.2.1\lib\net461\EPiServer.Cms.AspNet.dll - - ..\..\packages\EPiServer.CMS.UI.AspNetIdentity.10.12.0\lib\net45\EPiServer.Cms.UI.AspNetIdentity.dll + + ..\..\packages\EPiServer.CMS.UI.Core.11.1.0\lib\net461\EPiServer.Cms.Shell.UI.dll - - ..\..\packages\EPiServer.CMS.Core.10.10.4\lib\net45\EPiServer.Configuration.dll + + ..\..\packages\EPiServer.CMS.UI.AspNetIdentity.11.1.0\lib\net461\EPiServer.Cms.UI.AspNetIdentity.dll - - ..\..\packages\EPiServer.Framework.10.10.4\lib\net45\EPiServer.Data.dll + + ..\..\packages\EPiServer.CMS.AspNet.11.2.1\lib\net461\EPiServer.Configuration.dll - - ..\..\packages\EPiServer.Framework.10.10.4\lib\net45\EPiServer.Data.Cache.dll + + ..\..\packages\EPiServer.Framework.11.2.1\lib\net461\EPiServer.Data.dll - - ..\..\packages\EPiServer.CMS.Core.10.10.4\lib\net45\EPiServer.Enterprise.dll + + ..\..\packages\EPiServer.Framework.11.2.1\lib\net461\EPiServer.Data.Cache.dll - - ..\..\packages\EPiServer.Framework.10.10.4\lib\net45\EPiServer.Events.dll + + ..\..\packages\EPiServer.CMS.Core.11.2.1\lib\net461\EPiServer.Enterprise.dll - - ..\..\packages\EPiServer.Framework.10.10.4\lib\net45\EPiServer.Framework.dll + + ..\..\packages\EPiServer.Framework.11.2.1\lib\net461\EPiServer.Events.dll - - ..\..\packages\EPiServer.CMS.Core.10.10.4\lib\net45\EPiServer.ImageLibrary.dll + + ..\..\packages\EPiServer.Framework.11.2.1\lib\net461\EPiServer.Framework.dll - - ..\..\packages\EPiServer.Framework.10.10.4\lib\net45\EPiServer.Licensing.dll + + ..\..\packages\EPiServer.Framework.AspNet.11.2.1\lib\net461\EPiServer.Framework.AspNet.dll - - ..\..\packages\EPiServer.CMS.Core.10.10.4\lib\net45\EPiServer.LinkAnalyzer.dll + + ..\..\packages\EPiServer.CMS.AspNet.11.2.1\lib\net461\EPiServer.ImageLibrary.dll - - ..\..\packages\EPiServer.Logging.Log4Net.2.1.0\lib\net45\EPiServer.Logging.Log4Net.dll + + ..\..\packages\EPiServer.Framework.11.2.1\lib\net461\EPiServer.Licensing.dll - - ..\..\packages\EPiServer.CMS.UI.Core.10.12.0\lib\net45\EPiServer.Shell.dll + + ..\..\packages\EPiServer.CMS.Core.11.2.1\lib\net461\EPiServer.LinkAnalyzer.dll - - ..\..\packages\EPiServer.CMS.UI.Core.10.12.0\lib\net45\EPiServer.Shell.UI.dll + + ..\..\packages\EPiServer.Logging.Log4Net.2.2.0\lib\net461\EPiServer.Logging.Log4Net.dll - - ..\..\packages\EPiServer.CMS.UI.Core.10.12.0\lib\net45\EPiServer.UI.dll + + ..\..\packages\EPiServer.ServiceLocation.StructureMap.1.0.0\lib\net461\EPiServer.ServiceLocation.StructureMap.dll - - ..\..\packages\EPiServer.CMS.Core.10.10.4\lib\net45\EPiServer.Web.WebControls.dll + + ..\..\packages\EPiServer.CMS.UI.Core.11.1.0\lib\net461\EPiServer.Shell.dll - - ..\..\packages\EPiServer.CMS.Core.10.10.4\lib\net45\EPiServer.XForms.dll + + ..\..\packages\EPiServer.CMS.UI.Core.11.1.0\lib\net461\EPiServer.Shell.UI.dll + + + ..\..\packages\EPiServer.CMS.UI.Core.11.1.0\lib\net461\EPiServer.UI.dll + + + ..\..\packages\EPiServer.CMS.AspNet.11.2.1\lib\net461\EPiServer.Web.WebControls.dll ..\..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll - - ..\..\packages\log4net.2.0.3\lib\net40-full\log4net.dll + + ..\..\packages\log4net.2.0.8\lib\net45-full\log4net.dll ..\..\packages\Lucene.Net.3.0.3\lib\NET40\Lucene.Net.dll @@ -155,15 +161,19 @@ ..\..\packages\Microsoft.ReportViewer.Common.10.0.40219.1\lib\Microsoft.ReportViewer.Common.dll + True ..\..\packages\Microsoft.ReportViewer.Common.10.0.40219.1\lib\Microsoft.ReportViewer.DataVisualization.dll + True ..\..\packages\Microsoft.ReportViewer.Common.10.0.40219.1\lib\Microsoft.ReportViewer.ProcessingObjectModel.dll + True ..\..\packages\Microsoft.ReportViewer.WebForms.10.0.40219.1\lib\Microsoft.ReportViewer.WebForms.dll + True ..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll @@ -183,13 +193,39 @@ ..\..\packages\structuremap.web-signed.3.1.6.191\lib\net40\StructureMap.Web.dll + + ..\..\packages\System.ComponentModel.Annotations.4.4.0\lib\net461\System.ComponentModel.Annotations.dll + + + + ..\..\packages\System.Data.SqlClient.4.4.0\lib\net461\System.Data.SqlClient.dll + + + + + + ..\..\packages\System.Security.AccessControl.4.4.0\lib\net461\System.Security.AccessControl.dll + + + ..\..\packages\System.Security.Cryptography.Xml.4.4.0\lib\net461\System.Security.Cryptography.Xml.dll + + + ..\..\packages\System.Security.Permissions.4.4.0\lib\net461\System.Security.Permissions.dll + + + ..\..\packages\System.Security.Principal.Windows.4.4.0\lib\net461\System.Security.Principal.Windows.dll + + + ..\..\packages\System.Threading.AccessControl.4.4.0\lib\net461\System.Threading.AccessControl.dll + ..\..\packages\Microsoft.Tpl.Dataflow.4.5.24\lib\portable-net45+win8+wpa81\System.Threading.Tasks.Dataflow.dll True + @@ -280,7 +316,7 @@ - + Web.config @@ -378,105 +414,105 @@ - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\EPiServer.Business.Commerce.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\EPiServer.Business.Commerce.dll True - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\EPiServer.Commerce.Internal.Migration.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\EPiServer.Commerce.Internal.Migration.dll True - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\Mediachase.BusinessFoundation.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\Mediachase.BusinessFoundation.dll True - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\Mediachase.BusinessFoundation.Data.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\Mediachase.BusinessFoundation.Data.dll True - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\Mediachase.Commerce.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\Mediachase.Commerce.dll True - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\Mediachase.Commerce.Marketing.Validators.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\Mediachase.Commerce.Marketing.Validators.dll True - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\Mediachase.Commerce.Plugins.Payment.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\Mediachase.Commerce.Plugins.Payment.dll True - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\Mediachase.Commerce.Plugins.Shipping.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\Mediachase.Commerce.Plugins.Shipping.dll True - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\Mediachase.Commerce.Website.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\Mediachase.Commerce.Website.dll True - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\Mediachase.Commerce.Workflow.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\Mediachase.Commerce.Workflow.dll True - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\Mediachase.DataProvider.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\Mediachase.DataProvider.dll True - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\Mediachase.FileUploader.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\Mediachase.FileUploader.dll True - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\Mediachase.MetaDataPlus.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\Mediachase.MetaDataPlus.dll True - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\Mediachase.Search.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\Mediachase.Search.dll True - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\Mediachase.Search.Extensions.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\Mediachase.Search.Extensions.dll True - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\Mediachase.Search.LuceneSearchProvider.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\Mediachase.Search.LuceneSearchProvider.dll True - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\Mediachase.SqlDataProvider.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\Mediachase.SqlDataProvider.dll True - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\Mediachase.WebConsoleLib.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\Mediachase.WebConsoleLib.dll True - ..\..\packages\EPiServer.CommerceManager.11.4.1\lib\net452\Mediachase.ConsoleManager.dll + ..\..\packages\EPiServer.CommerceManager.11.5.0\lib\net461\Mediachase.ConsoleManager.dll True - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\AjaxControlToolkit.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\AjaxControlToolkit.dll True - ..\..\packages\EPiServer.CommerceManager.11.4.1\lib\net452\ComponentArt.Web.UI.dll + ..\..\packages\EPiServer.CommerceManager.11.5.0\lib\net461\ComponentArt.Web.UI.dll True - ..\..\packages\EPiServer.CommerceManager.11.4.1\lib\net452\RssToolkit.dll + ..\..\packages\EPiServer.CommerceManager.11.5.0\lib\net461\RssToolkit.dll True - ..\..\packages\EPiServer.CommerceManager.11.4.1\lib\net452\Validators.dll + ..\..\packages\EPiServer.CommerceManager.11.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/Login.aspx.cs b/Sources/EPiServer.Reference.Commerce.Manager/Login.aspx.cs index a8715fa9..820404b5 100644 --- a/Sources/EPiServer.Reference.Commerce.Manager/Login.aspx.cs +++ b/Sources/EPiServer.Reference.Commerce.Manager/Login.aspx.cs @@ -7,6 +7,7 @@ using System.Web.Security; using System.Web.UI; using System.Web.UI.WebControls; +using AppContext = Mediachase.Commerce.Core.AppContext; namespace EPiServer.Reference.Commerce.Manager { diff --git a/Sources/EPiServer.Reference.Commerce.Manager/packages.config b/Sources/EPiServer.Reference.Commerce.Manager/packages.config index 391c19bc..7a0b7fe7 100644 --- a/Sources/EPiServer.Reference.Commerce.Manager/packages.config +++ b/Sources/EPiServer.Reference.Commerce.Manager/packages.config @@ -1,37 +1,48 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Sources/EPiServer.Reference.Commerce.Manager/web.config b/Sources/EPiServer.Reference.Commerce.Manager/web.config index 56a9b5da..f193fe2f 100644 --- a/Sources/EPiServer.Reference.Commerce.Manager/web.config +++ b/Sources/EPiServer.Reference.Commerce.Manager/web.config @@ -36,11 +36,11 @@
-
+
-
+ @@ -234,8 +234,8 @@ - - + + @@ -243,8 +243,8 @@ - - + + @@ -336,7 +336,7 @@ - + @@ -378,55 +378,51 @@ - + - + - + - + - + - + - + - + - + - + - + - - - - - + @@ -454,7 +450,7 @@ - + @@ -466,11 +462,11 @@ - + - + @@ -502,107 +498,119 @@ - + - + - - + + - - + + - - + + - - + + - - + + - - + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -626,7 +634,7 @@ - + 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 71dff2d1..399653e1 100644 --- a/Sources/EPiServer.Reference.Commerce.Shared/EPiServer.Reference.Commerce.Shared.csproj +++ b/Sources/EPiServer.Reference.Commerce.Shared/EPiServer.Reference.Commerce.Shared.csproj @@ -9,7 +9,7 @@ Properties EPiServer.Reference.Commerce.Shared EPiServer.Reference.Commerce.Shared - v4.5.2 + v4.6.1 512 @@ -47,13 +47,13 @@ - ..\..\packages\AuthorizeNet.1.9.2\lib\AuthorizeNet.dll + ..\..\packages\AuthorizeNet.1.9.4\lib\AuthorizeNet.dll - - ..\..\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll + + ..\..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll - - ..\..\packages\Castle.Windsor.3.3.0\lib\net45\Castle.Windsor.dll + + ..\..\packages\Castle.Windsor.4.1.0\lib\net45\Castle.Windsor.dll ..\..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll @@ -61,68 +61,71 @@ ..\..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll - - ..\..\packages\EPiServer.CMS.Core.10.10.4\lib\net45\EPiServer.dll + + ..\..\packages\EPiServer.CMS.Core.11.2.1\lib\net461\EPiServer.dll - - ..\..\packages\EPiServer.Framework.10.10.4\lib\net45\EPiServer.ApplicationModules.dll + + ..\..\packages\EPiServer.Framework.11.2.1\lib\net461\EPiServer.ApplicationModules.dll - - ..\..\packages\EPiServer.CMS.UI.Core.10.12.0\lib\net45\EPiServer.Cms.Shell.UI.dll + + ..\..\packages\EPiServer.CMS.AspNet.11.2.1\lib\net461\EPiServer.Cms.AspNet.dll - - ..\..\packages\EPiServer.CMS.UI.AspNetIdentity.10.12.0\lib\net45\EPiServer.Cms.UI.AspNetIdentity.dll + + ..\..\packages\EPiServer.CMS.UI.Core.11.1.0\lib\net461\EPiServer.Cms.Shell.UI.dll - - ..\..\packages\EPiServer.CMS.Core.10.10.4\lib\net45\EPiServer.Configuration.dll + + ..\..\packages\EPiServer.CMS.UI.AspNetIdentity.11.1.0\lib\net461\EPiServer.Cms.UI.AspNetIdentity.dll - - ..\..\packages\EPiServer.Framework.10.10.4\lib\net45\EPiServer.Data.dll + + ..\..\packages\EPiServer.CMS.AspNet.11.2.1\lib\net461\EPiServer.Configuration.dll - - ..\..\packages\EPiServer.Framework.10.10.4\lib\net45\EPiServer.Data.Cache.dll + + ..\..\packages\EPiServer.Framework.11.2.1\lib\net461\EPiServer.Data.dll - - ..\..\packages\EPiServer.CMS.Core.10.10.4\lib\net45\EPiServer.Enterprise.dll + + ..\..\packages\EPiServer.Framework.11.2.1\lib\net461\EPiServer.Data.Cache.dll - - ..\..\packages\EPiServer.Framework.10.10.4\lib\net45\EPiServer.Events.dll + + ..\..\packages\EPiServer.CMS.Core.11.2.1\lib\net461\EPiServer.Enterprise.dll - - ..\..\packages\EPiServer.Framework.10.10.4\lib\net45\EPiServer.Framework.dll + + ..\..\packages\EPiServer.Framework.11.2.1\lib\net461\EPiServer.Events.dll - - ..\..\packages\EPiServer.CMS.Core.10.10.4\lib\net45\EPiServer.ImageLibrary.dll + + ..\..\packages\EPiServer.Framework.11.2.1\lib\net461\EPiServer.Framework.dll - - ..\..\packages\EPiServer.Framework.10.10.4\lib\net45\EPiServer.Licensing.dll + + ..\..\packages\EPiServer.Framework.AspNet.11.2.1\lib\net461\EPiServer.Framework.AspNet.dll - - ..\..\packages\EPiServer.CMS.Core.10.10.4\lib\net45\EPiServer.LinkAnalyzer.dll + + ..\..\packages\EPiServer.CMS.AspNet.11.2.1\lib\net461\EPiServer.ImageLibrary.dll - - ..\..\packages\EPiServer.Logging.Log4Net.2.1.0\lib\net45\EPiServer.Logging.Log4Net.dll + + ..\..\packages\EPiServer.Framework.11.2.1\lib\net461\EPiServer.Licensing.dll - - ..\..\packages\EPiServer.CMS.UI.Core.10.12.0\lib\net45\EPiServer.Shell.dll + + ..\..\packages\EPiServer.CMS.Core.11.2.1\lib\net461\EPiServer.LinkAnalyzer.dll - - ..\..\packages\EPiServer.CMS.UI.Core.10.12.0\lib\net45\EPiServer.Shell.UI.dll + + ..\..\packages\EPiServer.Logging.Log4Net.2.2.0\lib\net461\EPiServer.Logging.Log4Net.dll - - ..\..\packages\EPiServer.CMS.UI.Core.10.12.0\lib\net45\EPiServer.UI.dll + + ..\..\packages\EPiServer.CMS.UI.Core.11.1.0\lib\net461\EPiServer.Shell.dll - - ..\..\packages\EPiServer.CMS.Core.10.10.4\lib\net45\EPiServer.Web.WebControls.dll + + ..\..\packages\EPiServer.CMS.UI.Core.11.1.0\lib\net461\EPiServer.Shell.UI.dll - - ..\..\packages\EPiServer.CMS.Core.10.10.4\lib\net45\EPiServer.XForms.dll + + ..\..\packages\EPiServer.CMS.UI.Core.11.1.0\lib\net461\EPiServer.UI.dll + + + ..\..\packages\EPiServer.CMS.AspNet.11.2.1\lib\net461\EPiServer.Web.WebControls.dll ..\..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll - - ..\..\packages\log4net.2.0.3\lib\net40-full\log4net.dll + + ..\..\packages\log4net.2.0.8\lib\net45-full\log4net.dll ..\..\packages\Lucene.Net.3.0.3\lib\NET40\Lucene.Net.dll @@ -160,27 +163,45 @@ ..\..\packages\Owin.1.0\lib\net40\Owin.dll - - ..\..\packages\structuremap-signed.3.1.9.463\lib\net40\StructureMap.dll - - - ..\..\packages\structuremap-signed.3.1.9.463\lib\net40\StructureMap.Net4.dll - - - ..\..\packages\structuremap.web-signed.3.1.6.191\lib\net40\StructureMap.Web.dll - + + ..\..\packages\System.ComponentModel.Annotations.4.4.0\lib\net461\System.ComponentModel.Annotations.dll + + + + ..\..\packages\System.Data.SqlClient.4.4.0\lib\net461\System.Data.SqlClient.dll + + + ..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll + + + + ..\..\packages\System.Security.AccessControl.4.4.0\lib\net461\System.Security.AccessControl.dll + + + ..\..\packages\System.Security.Cryptography.Xml.4.4.0\lib\net461\System.Security.Cryptography.Xml.dll + + + ..\..\packages\System.Security.Permissions.4.4.0\lib\net461\System.Security.Permissions.dll + + + ..\..\packages\System.Security.Principal.Windows.4.4.0\lib\net461\System.Security.Principal.Windows.dll + + + ..\..\packages\System.Threading.AccessControl.4.4.0\lib\net461\System.Threading.AccessControl.dll + ..\..\packages\Microsoft.Tpl.Dataflow.4.5.24\lib\portable-net45+win8+wpa81\System.Threading.Tasks.Dataflow.dll True + ..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll @@ -242,79 +263,79 @@ --> - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\EPiServer.Business.Commerce.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\EPiServer.Business.Commerce.dll True - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\EPiServer.Commerce.Internal.Migration.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\EPiServer.Commerce.Internal.Migration.dll True - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\Mediachase.BusinessFoundation.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\Mediachase.BusinessFoundation.dll True - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\Mediachase.BusinessFoundation.Data.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\Mediachase.BusinessFoundation.Data.dll True - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\Mediachase.Commerce.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\Mediachase.Commerce.dll True - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\Mediachase.Commerce.Marketing.Validators.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\Mediachase.Commerce.Marketing.Validators.dll True - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\Mediachase.Commerce.Plugins.Payment.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\Mediachase.Commerce.Plugins.Payment.dll True - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\Mediachase.Commerce.Plugins.Shipping.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\Mediachase.Commerce.Plugins.Shipping.dll True - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\Mediachase.Commerce.Website.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\Mediachase.Commerce.Website.dll True - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\Mediachase.Commerce.Workflow.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\Mediachase.Commerce.Workflow.dll True - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\Mediachase.DataProvider.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\Mediachase.DataProvider.dll True - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\Mediachase.FileUploader.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\Mediachase.FileUploader.dll True - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\Mediachase.MetaDataPlus.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\Mediachase.MetaDataPlus.dll True - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\Mediachase.Search.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\Mediachase.Search.dll True - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\Mediachase.Search.Extensions.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\Mediachase.Search.Extensions.dll True - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\Mediachase.Search.LuceneSearchProvider.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\Mediachase.Search.LuceneSearchProvider.dll True - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\Mediachase.SqlDataProvider.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\Mediachase.SqlDataProvider.dll True - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\Mediachase.WebConsoleLib.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\Mediachase.WebConsoleLib.dll True - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\AjaxControlToolkit.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\AjaxControlToolkit.dll True diff --git a/Sources/EPiServer.Reference.Commerce.Shared/app.config b/Sources/EPiServer.Reference.Commerce.Shared/app.config index d595cd6f..e2e1ed72 100644 --- a/Sources/EPiServer.Reference.Commerce.Shared/app.config +++ b/Sources/EPiServer.Reference.Commerce.Shared/app.config @@ -8,7 +8,7 @@ - + @@ -16,23 +16,23 @@ - + - + - + - + - + @@ -44,56 +44,48 @@ - + - + - + - + - + - + - + - - - - - + - + - - - - @@ -118,6 +110,14 @@ + + + + + + + + diff --git a/Sources/EPiServer.Reference.Commerce.Shared/packages.config b/Sources/EPiServer.Reference.Commerce.Shared/packages.config index e02b671f..b8e06a3b 100644 --- a/Sources/EPiServer.Reference.Commerce.Shared/packages.config +++ b/Sources/EPiServer.Reference.Commerce.Shared/packages.config @@ -1,34 +1,42 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 ee0ecba4..ef791097 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 @@ -9,7 +9,7 @@ Properties EPiServer.Reference.Commerce.Site.Tests EPiServer.Reference.Commerce.Site.Tests - v4.5.2 + v4.6.1 512 {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 10.0 @@ -54,13 +54,13 @@ - ..\..\packages\AuthorizeNet.1.9.2\lib\AuthorizeNet.dll + ..\..\packages\AuthorizeNet.1.9.4\lib\AuthorizeNet.dll - - ..\..\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll + + ..\..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll - - ..\..\packages\Castle.Windsor.3.3.0\lib\net45\Castle.Windsor.dll + + ..\..\packages\Castle.Windsor.4.1.0\lib\net45\Castle.Windsor.dll ..\..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll @@ -68,68 +68,71 @@ ..\..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll - - ..\..\packages\EPiServer.CMS.Core.10.10.4\lib\net45\EPiServer.dll + + ..\..\packages\EPiServer.CMS.Core.11.2.1\lib\net461\EPiServer.dll - - ..\..\packages\EPiServer.Framework.10.10.4\lib\net45\EPiServer.ApplicationModules.dll + + ..\..\packages\EPiServer.Framework.11.2.1\lib\net461\EPiServer.ApplicationModules.dll - - ..\..\packages\EPiServer.CMS.UI.Core.10.12.0\lib\net45\EPiServer.Cms.Shell.UI.dll + + ..\..\packages\EPiServer.CMS.AspNet.11.2.1\lib\net461\EPiServer.Cms.AspNet.dll - - ..\..\packages\EPiServer.CMS.UI.AspNetIdentity.10.12.0\lib\net45\EPiServer.Cms.UI.AspNetIdentity.dll + + ..\..\packages\EPiServer.CMS.UI.Core.11.1.0\lib\net461\EPiServer.Cms.Shell.UI.dll - - ..\..\packages\EPiServer.CMS.Core.10.10.4\lib\net45\EPiServer.Configuration.dll + + ..\..\packages\EPiServer.CMS.UI.AspNetIdentity.11.1.0\lib\net461\EPiServer.Cms.UI.AspNetIdentity.dll - - ..\..\packages\EPiServer.Framework.10.10.4\lib\net45\EPiServer.Data.dll + + ..\..\packages\EPiServer.CMS.AspNet.11.2.1\lib\net461\EPiServer.Configuration.dll - - ..\..\packages\EPiServer.Framework.10.10.4\lib\net45\EPiServer.Data.Cache.dll + + ..\..\packages\EPiServer.Framework.11.2.1\lib\net461\EPiServer.Data.dll - - ..\..\packages\EPiServer.CMS.Core.10.10.4\lib\net45\EPiServer.Enterprise.dll + + ..\..\packages\EPiServer.Framework.11.2.1\lib\net461\EPiServer.Data.Cache.dll - - ..\..\packages\EPiServer.Framework.10.10.4\lib\net45\EPiServer.Events.dll + + ..\..\packages\EPiServer.CMS.Core.11.2.1\lib\net461\EPiServer.Enterprise.dll - - ..\..\packages\EPiServer.Framework.10.10.4\lib\net45\EPiServer.Framework.dll + + ..\..\packages\EPiServer.Framework.11.2.1\lib\net461\EPiServer.Events.dll - - ..\..\packages\EPiServer.CMS.Core.10.10.4\lib\net45\EPiServer.ImageLibrary.dll + + ..\..\packages\EPiServer.Framework.11.2.1\lib\net461\EPiServer.Framework.dll - - ..\..\packages\EPiServer.Framework.10.10.4\lib\net45\EPiServer.Licensing.dll + + ..\..\packages\EPiServer.Framework.AspNet.11.2.1\lib\net461\EPiServer.Framework.AspNet.dll - - ..\..\packages\EPiServer.CMS.Core.10.10.4\lib\net45\EPiServer.LinkAnalyzer.dll + + ..\..\packages\EPiServer.CMS.AspNet.11.2.1\lib\net461\EPiServer.ImageLibrary.dll - - ..\..\packages\EPiServer.Logging.Log4Net.2.1.0\lib\net45\EPiServer.Logging.Log4Net.dll + + ..\..\packages\EPiServer.Framework.11.2.1\lib\net461\EPiServer.Licensing.dll - - ..\..\packages\EPiServer.Personalization.Common.1.0.0\lib\net45\EPiServer.Personalization.Common.dll + + ..\..\packages\EPiServer.CMS.Core.11.2.1\lib\net461\EPiServer.LinkAnalyzer.dll - - ..\..\packages\EPiServer.CMS.UI.Core.10.12.0\lib\net45\EPiServer.Shell.dll + + ..\..\packages\EPiServer.Logging.Log4Net.2.2.0\lib\net461\EPiServer.Logging.Log4Net.dll - - ..\..\packages\EPiServer.CMS.UI.Core.10.12.0\lib\net45\EPiServer.Shell.UI.dll + + ..\..\packages\EPiServer.Personalization.Common.1.1.0\lib\net461\EPiServer.Personalization.Common.dll + + + ..\..\packages\EPiServer.CMS.UI.Core.11.1.0\lib\net461\EPiServer.Shell.dll + + + ..\..\packages\EPiServer.CMS.UI.Core.11.1.0\lib\net461\EPiServer.Shell.UI.dll ..\..\packages\EPiServer.Tracking.Core.1.1.0\lib\net452\EPiServer.Tracking.Core.dll - - ..\..\packages\EPiServer.CMS.UI.Core.10.12.0\lib\net45\EPiServer.UI.dll + + ..\..\packages\EPiServer.CMS.UI.Core.11.1.0\lib\net461\EPiServer.UI.dll - - ..\..\packages\EPiServer.CMS.Core.10.10.4\lib\net45\EPiServer.Web.WebControls.dll - - - ..\..\packages\EPiServer.CMS.Core.10.10.4\lib\net45\EPiServer.XForms.dll + + ..\..\packages\EPiServer.CMS.AspNet.11.2.1\lib\net461\EPiServer.Web.WebControls.dll ..\..\packages\FluentAssertions.4.18.0\lib\net45\FluentAssertions.dll @@ -140,8 +143,8 @@ ..\..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll - - ..\..\packages\log4net.2.0.3\lib\net40-full\log4net.dll + + ..\..\packages\log4net.2.0.8\lib\net45-full\log4net.dll ..\..\packages\Lucene.Net.3.0.3\lib\NET40\Lucene.Net.dll @@ -182,28 +185,46 @@ ..\..\packages\Owin.1.0\lib\net40\Owin.dll - - ..\..\packages\structuremap-signed.3.1.9.463\lib\net40\StructureMap.dll - - - ..\..\packages\structuremap-signed.3.1.9.463\lib\net40\StructureMap.Net4.dll - - - ..\..\packages\structuremap.web-signed.3.1.6.191\lib\net40\StructureMap.Web.dll - + + ..\..\packages\System.ComponentModel.Annotations.4.4.0\lib\net461\System.ComponentModel.Annotations.dll + + + + ..\..\packages\System.Data.SqlClient.4.4.0\lib\net461\System.Data.SqlClient.dll + + + ..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll + + + + ..\..\packages\System.Security.AccessControl.4.4.0\lib\net461\System.Security.AccessControl.dll + + + ..\..\packages\System.Security.Cryptography.Xml.4.4.0\lib\net461\System.Security.Cryptography.Xml.dll + + + ..\..\packages\System.Security.Permissions.4.4.0\lib\net461\System.Security.Permissions.dll + + + ..\..\packages\System.Security.Principal.Windows.4.4.0\lib\net461\System.Security.Principal.Windows.dll + + + ..\..\packages\System.Threading.AccessControl.4.4.0\lib\net461\System.Threading.AccessControl.dll + ..\..\packages\Microsoft.Tpl.Dataflow.4.5.24\lib\portable-net45+win8+wpa81\System.Threading.Tasks.Dataflow.dll True + ..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll @@ -362,87 +383,87 @@ --> - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\EPiServer.Business.Commerce.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\EPiServer.Business.Commerce.dll True - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\EPiServer.Commerce.Internal.Migration.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\EPiServer.Commerce.Internal.Migration.dll True - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\Mediachase.BusinessFoundation.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\Mediachase.BusinessFoundation.dll True - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\Mediachase.BusinessFoundation.Data.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\Mediachase.BusinessFoundation.Data.dll True - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\Mediachase.Commerce.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\Mediachase.Commerce.dll True - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\Mediachase.Commerce.Marketing.Validators.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\Mediachase.Commerce.Marketing.Validators.dll True - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\Mediachase.Commerce.Plugins.Payment.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\Mediachase.Commerce.Plugins.Payment.dll True - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\Mediachase.Commerce.Plugins.Shipping.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\Mediachase.Commerce.Plugins.Shipping.dll True - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\Mediachase.Commerce.Website.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\Mediachase.Commerce.Website.dll True - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\Mediachase.Commerce.Workflow.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\Mediachase.Commerce.Workflow.dll True - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\Mediachase.DataProvider.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\Mediachase.DataProvider.dll True - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\Mediachase.FileUploader.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\Mediachase.FileUploader.dll True - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\Mediachase.MetaDataPlus.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\Mediachase.MetaDataPlus.dll True - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\Mediachase.Search.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\Mediachase.Search.dll True - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\Mediachase.Search.Extensions.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\Mediachase.Search.Extensions.dll True - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\Mediachase.Search.LuceneSearchProvider.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\Mediachase.Search.LuceneSearchProvider.dll True - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\Mediachase.SqlDataProvider.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\Mediachase.SqlDataProvider.dll True - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\Mediachase.WebConsoleLib.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\Mediachase.WebConsoleLib.dll True - ..\..\packages\EPiServer.Tracking.Commerce.1.0.2\lib\net452\EPiServer.Tracking.Commerce.dll + ..\..\packages\EPiServer.Tracking.Commerce.1.0.3\lib\net461\EPiServer.Tracking.Commerce.dll True - ..\..\packages\EPiServer.Personalization.Commerce.1.0.2\lib\net452\EPiServer.Personalization.Commerce.dll + ..\..\packages\EPiServer.Personalization.Commerce.1.0.3\lib\net461\EPiServer.Personalization.Commerce.dll True - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\AjaxControlToolkit.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\AjaxControlToolkit.dll True diff --git a/Sources/EPiServer.Reference.Commerce.Site.Tests/app.config b/Sources/EPiServer.Reference.Commerce.Site.Tests/app.config index 6153fed4..874f4ea5 100644 --- a/Sources/EPiServer.Reference.Commerce.Site.Tests/app.config +++ b/Sources/EPiServer.Reference.Commerce.Site.Tests/app.config @@ -8,7 +8,7 @@ - + @@ -16,51 +16,51 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -100,11 +100,11 @@ - + - + @@ -112,11 +112,7 @@ - - - - - + @@ -132,7 +128,7 @@ - + @@ -140,12 +136,32 @@ - + + + + + + + + + + + + + + + + + + + + + diff --git a/Sources/EPiServer.Reference.Commerce.Site.Tests/packages.config b/Sources/EPiServer.Reference.Commerce.Site.Tests/packages.config index ec7e518b..970d863b 100644 --- a/Sources/EPiServer.Reference.Commerce.Site.Tests/packages.config +++ b/Sources/EPiServer.Reference.Commerce.Site.Tests/packages.config @@ -1,49 +1,57 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Sources/EPiServer.Reference.Commerce.Site/App_Data/GeoLiteCity.dat b/Sources/EPiServer.Reference.Commerce.Site/App_Data/GeoLiteCity.dat index 5c142365..a94bb982 100644 Binary files a/Sources/EPiServer.Reference.Commerce.Site/App_Data/GeoLiteCity.dat and b/Sources/EPiServer.Reference.Commerce.Site/App_Data/GeoLiteCity.dat differ 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 f681a742..c05cc994 100644 --- a/Sources/EPiServer.Reference.Commerce.Site/EPiServer.Reference.Commerce.Site.csproj +++ b/Sources/EPiServer.Reference.Commerce.Site/EPiServer.Reference.Commerce.Site.csproj @@ -13,7 +13,7 @@ Properties EPiServer.Reference.Commerce.Site EPiServer.Reference.Commerce.Site - v4.5.2 + v4.6.1 true 44301 enabled @@ -47,13 +47,13 @@ ..\..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll - ..\..\packages\AuthorizeNet.1.9.2\lib\AuthorizeNet.dll + ..\..\packages\AuthorizeNet.1.9.4\lib\AuthorizeNet.dll - - ..\..\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll + + ..\..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll - - ..\..\packages\Castle.Windsor.3.3.0\lib\net45\Castle.Windsor.dll + + ..\..\packages\Castle.Windsor.4.1.0\lib\net45\Castle.Windsor.dll ..\..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll @@ -61,83 +61,83 @@ ..\..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll - - ..\..\packages\EPiServer.CMS.Core.10.10.4\lib\net45\EPiServer.dll + + ..\..\packages\EPiServer.CMS.Core.11.2.1\lib\net461\EPiServer.dll - - ..\..\packages\EPiServer.Framework.10.10.4\lib\net45\EPiServer.ApplicationModules.dll + + ..\..\packages\EPiServer.Framework.11.2.1\lib\net461\EPiServer.ApplicationModules.dll - - ..\..\packages\EPiServer.CMS.UI.Core.10.12.0\lib\net45\EPiServer.Cms.Shell.UI.dll + + ..\..\packages\EPiServer.CMS.AspNet.11.2.1\lib\net461\EPiServer.Cms.AspNet.dll - - ..\..\packages\EPiServer.CMS.UI.AspNetIdentity.10.12.0\lib\net45\EPiServer.Cms.UI.AspNetIdentity.dll + + ..\..\packages\EPiServer.CMS.UI.Core.11.1.0\lib\net461\EPiServer.Cms.Shell.UI.dll - - ..\..\packages\EPiServer.CMS.Core.10.10.4\lib\net45\EPiServer.Configuration.dll + + ..\..\packages\EPiServer.CMS.TinyMce.1.0.0\lib\net461\EPiServer.Cms.TinyMce.dll - - ..\..\packages\EPiServer.Framework.10.10.4\lib\net45\EPiServer.Data.dll + + ..\..\packages\EPiServer.CMS.UI.AspNetIdentity.11.1.0\lib\net461\EPiServer.Cms.UI.AspNetIdentity.dll - - ..\..\packages\EPiServer.Framework.10.10.4\lib\net45\EPiServer.Data.Cache.dll + + ..\..\packages\EPiServer.CMS.AspNet.11.2.1\lib\net461\EPiServer.Configuration.dll - - ..\..\packages\EPiServer.CMS.Core.10.10.4\lib\net45\EPiServer.Enterprise.dll + + ..\..\packages\EPiServer.Framework.11.2.1\lib\net461\EPiServer.Data.dll - - ..\..\packages\EPiServer.Framework.10.10.4\lib\net45\EPiServer.Events.dll + + ..\..\packages\EPiServer.Framework.11.2.1\lib\net461\EPiServer.Data.Cache.dll - - ..\..\packages\EPiServer.Framework.10.10.4\lib\net45\EPiServer.Framework.dll + + ..\..\packages\EPiServer.CMS.Core.11.2.1\lib\net461\EPiServer.Enterprise.dll - - ..\..\packages\EPiServer.CMS.Core.10.10.4\lib\net45\EPiServer.ImageLibrary.dll + + ..\..\packages\EPiServer.Framework.11.2.1\lib\net461\EPiServer.Events.dll - - ..\..\packages\EPiServer.Framework.10.10.4\lib\net45\EPiServer.Licensing.dll + + ..\..\packages\EPiServer.Framework.11.2.1\lib\net461\EPiServer.Framework.dll - - ..\..\packages\EPiServer.CMS.Core.10.10.4\lib\net45\EPiServer.LinkAnalyzer.dll + + ..\..\packages\EPiServer.Framework.AspNet.11.2.1\lib\net461\EPiServer.Framework.AspNet.dll - - ..\..\packages\EPiServer.Logging.Log4Net.2.1.0\lib\net45\EPiServer.Logging.Log4Net.dll + + ..\..\packages\EPiServer.CMS.AspNet.11.2.1\lib\net461\EPiServer.ImageLibrary.dll - - ..\..\packages\EPiServer.Packaging.3.3.0\lib\net45\EPiServer.Packaging.dll + + ..\..\packages\EPiServer.Framework.11.2.1\lib\net461\EPiServer.Licensing.dll - - ..\..\packages\EPiServer.Packaging.3.3.0\lib\net45\EPiServer.Packaging.CmdAPI.dll + + ..\..\packages\EPiServer.CMS.Core.11.2.1\lib\net461\EPiServer.LinkAnalyzer.dll - - ..\..\packages\EPiServer.Packaging.UI.3.3.0\lib\net45\EPiServer.Packaging.UI.dll + + ..\..\packages\EPiServer.Logging.Log4Net.2.2.0\lib\net461\EPiServer.Logging.Log4Net.dll - - ..\..\packages\EPiServer.Personalization.Common.1.0.0\lib\net45\EPiServer.Personalization.Common.dll + + ..\..\packages\EPiServer.Personalization.Common.1.1.0\lib\net461\EPiServer.Personalization.Common.dll - - ..\..\packages\EPiServer.CMS.UI.Core.10.12.0\lib\net45\EPiServer.Shell.dll + + ..\..\packages\EPiServer.ServiceLocation.StructureMap.1.0.0\lib\net461\EPiServer.ServiceLocation.StructureMap.dll - - ..\..\packages\EPiServer.CMS.UI.Core.10.12.0\lib\net45\EPiServer.Shell.UI.dll + + ..\..\packages\EPiServer.CMS.UI.Core.11.1.0\lib\net461\EPiServer.Shell.dll + + + ..\..\packages\EPiServer.CMS.UI.Core.11.1.0\lib\net461\EPiServer.Shell.UI.dll ..\..\packages\EPiServer.Tracking.Core.1.1.0\lib\net452\EPiServer.Tracking.Core.dll - - ..\..\packages\EPiServer.CMS.UI.Core.10.12.0\lib\net45\EPiServer.UI.dll - - - ..\..\packages\EPiServer.CMS.Core.10.10.4\lib\net45\EPiServer.Web.WebControls.dll + + ..\..\packages\EPiServer.CMS.UI.Core.11.1.0\lib\net461\EPiServer.UI.dll - - ..\..\packages\EPiServer.CMS.Core.10.10.4\lib\net45\EPiServer.XForms.dll + + ..\..\packages\EPiServer.CMS.AspNet.11.2.1\lib\net461\EPiServer.Web.WebControls.dll ..\..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll - - ..\..\packages\log4net.2.0.3\lib\net40-full\log4net.dll + + ..\..\packages\log4net.2.0.8\lib\net45-full\log4net.dll ..\..\packages\Lucene.Net.3.0.3\lib\NET40\Lucene.Net.dll @@ -181,19 +181,22 @@ ..\..\packages\Microsoft.ReportViewer.Common.10.0.40219.1\lib\Microsoft.ReportViewer.Common.dll + True ..\..\packages\Microsoft.ReportViewer.Common.10.0.40219.1\lib\Microsoft.ReportViewer.DataVisualization.dll + True ..\..\packages\Microsoft.ReportViewer.Common.10.0.40219.1\lib\Microsoft.ReportViewer.ProcessingObjectModel.dll + True ..\..\packages\Microsoft.ReportViewer.WebForms.10.0.40219.1\lib\Microsoft.ReportViewer.WebForms.dll + True ..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True ..\..\packages\Microsoft.Web.Xdt.2.1.1\lib\net40\Microsoft.Web.XmlTransform.dll @@ -216,19 +219,45 @@ ..\..\packages\structuremap.web-signed.3.1.6.191\lib\net40\StructureMap.Web.dll + + ..\..\packages\System.ComponentModel.Annotations.4.4.0\lib\net461\System.ComponentModel.Annotations.dll + + + + ..\..\packages\System.Data.SqlClient.4.4.0\lib\net461\System.Data.SqlClient.dll + + ..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll + + + + ..\..\packages\System.Security.AccessControl.4.4.0\lib\net461\System.Security.AccessControl.dll + + + ..\..\packages\System.Security.Cryptography.Xml.4.4.0\lib\net461\System.Security.Cryptography.Xml.dll + + + ..\..\packages\System.Security.Permissions.4.4.0\lib\net461\System.Security.Permissions.dll + + + ..\..\packages\System.Security.Principal.Windows.4.4.0\lib\net461\System.Security.Principal.Windows.dll + + + ..\..\packages\System.Threading.AccessControl.4.4.0\lib\net461\System.Threading.AccessControl.dll + ..\..\packages\Microsoft.Tpl.Dataflow.4.5.24\lib\portable-net45+win8+wpa81\System.Threading.Tasks.Dataflow.dll True + @@ -732,18 +761,18 @@ - - - + + + + + + - - - - + Web.config @@ -954,99 +983,99 @@ - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\EPiServer.Business.Commerce.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\EPiServer.Business.Commerce.dll True - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\EPiServer.Commerce.Internal.Migration.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\EPiServer.Commerce.Internal.Migration.dll True - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\Mediachase.BusinessFoundation.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\Mediachase.BusinessFoundation.dll True - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\Mediachase.BusinessFoundation.Data.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\Mediachase.BusinessFoundation.Data.dll True - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\Mediachase.Commerce.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\Mediachase.Commerce.dll True - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\Mediachase.Commerce.Marketing.Validators.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\Mediachase.Commerce.Marketing.Validators.dll True - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\Mediachase.Commerce.Plugins.Payment.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\Mediachase.Commerce.Plugins.Payment.dll True - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\Mediachase.Commerce.Plugins.Shipping.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\Mediachase.Commerce.Plugins.Shipping.dll True - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\Mediachase.Commerce.Website.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\Mediachase.Commerce.Website.dll True - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\Mediachase.Commerce.Workflow.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\Mediachase.Commerce.Workflow.dll True - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\Mediachase.DataProvider.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\Mediachase.DataProvider.dll True - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\Mediachase.FileUploader.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\Mediachase.FileUploader.dll True - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\Mediachase.MetaDataPlus.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\Mediachase.MetaDataPlus.dll True - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\Mediachase.Search.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\Mediachase.Search.dll True - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\Mediachase.Search.Extensions.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\Mediachase.Search.Extensions.dll True - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\Mediachase.Search.LuceneSearchProvider.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\Mediachase.Search.LuceneSearchProvider.dll True - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\Mediachase.SqlDataProvider.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\Mediachase.SqlDataProvider.dll True - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\Mediachase.WebConsoleLib.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\Mediachase.WebConsoleLib.dll True - ..\..\packages\EPiServer.Commerce.UI.11.4.1\lib\net452\EPiServer.Commerce.Shell.dll + ..\..\packages\EPiServer.Commerce.UI.11.5.0\lib\net461\EPiServer.Commerce.Shell.dll True - ..\..\packages\EPiServer.Commerce.UI.ManagerIntegration.11.4.1\lib\net452\EPiServer.Commerce.Shell.ManagerIntegration.dll + ..\..\packages\EPiServer.Commerce.UI.ManagerIntegration.11.5.0\lib\net461\EPiServer.Commerce.Shell.ManagerIntegration.dll True - ..\..\packages\EPiServer.Commerce.UI.11.4.1\lib\net452\EPiServer.Commerce.UI.dll + ..\..\packages\EPiServer.Commerce.UI.11.5.0\lib\net461\EPiServer.Commerce.UI.dll True - ..\..\packages\EPiServer.Tracking.Commerce.1.0.2\lib\net452\EPiServer.Tracking.Commerce.dll + ..\..\packages\EPiServer.Tracking.Commerce.1.0.3\lib\net461\EPiServer.Tracking.Commerce.dll True - ..\..\packages\EPiServer.Personalization.Commerce.1.0.2\lib\net452\EPiServer.Personalization.Commerce.dll + ..\..\packages\EPiServer.Personalization.Commerce.1.0.3\lib\net461\EPiServer.Personalization.Commerce.dll True - ..\..\packages\EPiServer.Commerce.Core.11.4.1\lib\net452\AjaxControlToolkit.dll + ..\..\packages\EPiServer.Commerce.Core.11.5.0\lib\net461\AjaxControlToolkit.dll True diff --git a/Sources/EPiServer.Reference.Commerce.Site/EPiServerFramework.config b/Sources/EPiServer.Reference.Commerce.Site/EPiServerFramework.config index d97ec473..7534930c 100644 --- a/Sources/EPiServer.Reference.Commerce.Site/EPiServerFramework.config +++ b/Sources/EPiServer.Reference.Commerce.Site/EPiServerFramework.config @@ -26,7 +26,7 @@ + type="EPiServer.Web.Hosting.VirtualPathNonUnifiedProvider, EPiServer.Framework.AspNet"/> diff --git a/Sources/EPiServer.Reference.Commerce.Site/Infrastructure/Facades/SearchFacade.cs b/Sources/EPiServer.Reference.Commerce.Site/Infrastructure/Facades/SearchFacade.cs index e9454668..53058ad4 100644 --- a/Sources/EPiServer.Reference.Commerce.Site/Infrastructure/Facades/SearchFacade.cs +++ b/Sources/EPiServer.Reference.Commerce.Site/Infrastructure/Facades/SearchFacade.cs @@ -5,6 +5,7 @@ using Mediachase.Search; using Mediachase.Search.Extensions; using StringCollection = System.Collections.Specialized.StringCollection; +using AppContext = Mediachase.Commerce.Core.AppContext; namespace EPiServer.Reference.Commerce.Site.Infrastructure.Facades { diff --git a/Sources/EPiServer.Reference.Commerce.Site/Infrastructure/ImportSiteContent.cs b/Sources/EPiServer.Reference.Commerce.Site/Infrastructure/ImportSiteContent.cs index 6c1628a2..89fc4fc7 100644 --- a/Sources/EPiServer.Reference.Commerce.Site/Infrastructure/ImportSiteContent.cs +++ b/Sources/EPiServer.Reference.Commerce.Site/Infrastructure/ImportSiteContent.cs @@ -36,6 +36,7 @@ using System.Threading.Tasks; using System.Web; using System.Web.Hosting; +using AppContext = Mediachase.Commerce.Core.AppContext; namespace EPiServer.Reference.Commerce.Site.Infrastructure { diff --git a/Sources/EPiServer.Reference.Commerce.Site/Web.config b/Sources/EPiServer.Reference.Commerce.Site/Web.config index 76ba307c..c1a656a7 100644 --- a/Sources/EPiServer.Reference.Commerce.Site/Web.config +++ b/Sources/EPiServer.Reference.Commerce.Site/Web.config @@ -6,9 +6,7 @@
-
-
-
+
@@ -55,27 +53,27 @@ - + - + - + - + - + - + @@ -87,43 +85,43 @@ - + - + - + - + - + - + - + - + - + - + @@ -147,11 +145,11 @@ - + - + @@ -159,7 +157,7 @@ - + @@ -167,7 +165,7 @@ - + @@ -211,7 +209,7 @@ - + @@ -219,10 +217,26 @@ - + + + + + + + + + + + + + + + + + @@ -239,87 +253,87 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -350,7 +364,7 @@ - + @@ -383,14 +397,14 @@ - + - + - + @@ -422,8 +436,8 @@ - - + + @@ -475,7 +489,7 @@ - + @@ -494,7 +508,7 @@ - + @@ -511,7 +525,7 @@ - + @@ -523,7 +537,7 @@ - + @@ -531,7 +545,7 @@ - + @@ -573,29 +587,14 @@ - - - - - - - - - + + + + - - - - - - - - - - @@ -603,7 +602,6 @@ - @@ -712,7 +710,7 @@ - + diff --git a/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/CMS/CMS.zip b/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/CMS/CMS.zip index 74c52fa0..9955f902 100644 Binary files a/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/CMS/CMS.zip and b/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/CMS/CMS.zip differ 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 06dd6432..6286e33f 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.Cms.TinyMce/EPiServer.Cms.TinyMce.zip b/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/EPiServer.Cms.TinyMce/EPiServer.Cms.TinyMce.zip new file mode 100644 index 00000000..dec9043f Binary files /dev/null and b/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/EPiServer.Cms.TinyMce/EPiServer.Cms.TinyMce.zip differ diff --git a/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/EPiServer.Cms.TinyMce/web.config b/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/EPiServer.Cms.TinyMce/web.config new file mode 100644 index 00000000..2fd08033 --- /dev/null +++ b/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/EPiServer.Cms.TinyMce/web.config @@ -0,0 +1,8 @@ + + + + + + + + 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 a35e0132..79d19edc 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 24fb0954..3dfe9aab 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.Packaging.UI/EPiServer.Packaging.UI.zip b/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/EPiServer.Packaging.UI/EPiServer.Packaging.UI.zip deleted file mode 100644 index 2f07e76c..00000000 Binary files a/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/EPiServer.Packaging.UI/EPiServer.Packaging.UI.zip and /dev/null differ diff --git a/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/EPiServer.Packaging.UI/web.config b/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/EPiServer.Packaging.UI/web.config deleted file mode 100644 index b8ffd7d3..00000000 --- a/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/EPiServer.Packaging.UI/web.config +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/Shell/Shell.zip b/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/Shell/Shell.zip index 37c60b8b..0d337ce2 100644 Binary files a/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/Shell/Shell.zip and b/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/Shell/Shell.zip differ diff --git a/Sources/EPiServer.Reference.Commerce.Site/packages.config b/Sources/EPiServer.Reference.Commerce.Site/packages.config index b46970ba..8e53a2d3 100644 --- a/Sources/EPiServer.Reference.Commerce.Site/packages.config +++ b/Sources/EPiServer.Reference.Commerce.Site/packages.config @@ -1,61 +1,71 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +