diff --git a/Sources/AssemblyVersionAuto.cs b/Sources/AssemblyVersionAuto.cs index f316ccb5..04dbb575 100644 --- a/Sources/AssemblyVersionAuto.cs +++ b/Sources/AssemblyVersionAuto.cs @@ -2,6 +2,6 @@ -[assembly: AssemblyVersion("10.2.1.0")] -[assembly: AssemblyInformationalVersion("10.2.1")] -[assembly: AssemblyFileVersion("10.2.1.2059")] +[assembly: AssemblyVersion("10.2.2.0")] +[assembly: AssemblyInformationalVersion("10.2.2")] +[assembly: AssemblyFileVersion("10.2.2.2070")] diff --git a/Sources/EPiServer.Reference.Commerce.Manager/App_Data/log/placeholder.txt b/Sources/EPiServer.Reference.Commerce.Manager/App_Data/log/placeholder.txt deleted file mode 100644 index 84337c64..00000000 --- a/Sources/EPiServer.Reference.Commerce.Manager/App_Data/log/placeholder.txt +++ /dev/null @@ -1 +0,0 @@ -This a default log file directory. \ No newline at end of file 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 50062714..dc8957b5 100644 --- a/Sources/EPiServer.Reference.Commerce.Manager/EPiServer.Reference.Commerce.Manager.csproj +++ b/Sources/EPiServer.Reference.Commerce.Manager/EPiServer.Reference.Commerce.Manager.csproj @@ -401,109 +401,109 @@ - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\EPiServer.Business.Commerce.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\EPiServer.Business.Commerce.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\EPiServer.Commerce.Internal.Migration.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\EPiServer.Commerce.Internal.Migration.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\Mediachase.BusinessFoundation.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\Mediachase.BusinessFoundation.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\Mediachase.BusinessFoundation.Data.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\Mediachase.BusinessFoundation.Data.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\Mediachase.Commerce.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\Mediachase.Commerce.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\Mediachase.Commerce.Marketing.Validators.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\Mediachase.Commerce.Marketing.Validators.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\Mediachase.Commerce.Plugins.Payment.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\Mediachase.Commerce.Plugins.Payment.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\Mediachase.Commerce.Plugins.Shipping.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\Mediachase.Commerce.Plugins.Shipping.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\Mediachase.Commerce.Website.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\Mediachase.Commerce.Website.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\Mediachase.Commerce.Workflow.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\Mediachase.Commerce.Workflow.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\Mediachase.DataProvider.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\Mediachase.DataProvider.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\Mediachase.FileUploader.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\Mediachase.FileUploader.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\Mediachase.MetaDataPlus.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\Mediachase.MetaDataPlus.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\Mediachase.Search.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\Mediachase.Search.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\Mediachase.Search.Extensions.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\Mediachase.Search.Extensions.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\Mediachase.Search.LuceneSearchProvider.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\Mediachase.Search.LuceneSearchProvider.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\Mediachase.SqlDataProvider.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\Mediachase.SqlDataProvider.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\Mediachase.WebConsoleLib.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\Mediachase.WebConsoleLib.dll True - ..\..\packages\EPiServer.CommerceManager.10.2.1\lib\net45\Mediachase.ConsoleManager.dll + ..\..\packages\EPiServer.CommerceManager.10.2.2\lib\net45\Mediachase.ConsoleManager.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\AjaxControlToolkit.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\AjaxControlToolkit.dll True - ..\..\packages\EPiServer.CommerceManager.10.2.1\lib\net45\ComponentArt.Web.UI.dll + ..\..\packages\EPiServer.CommerceManager.10.2.2\lib\net45\ComponentArt.Web.UI.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\nsoftware.IBizPay.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\nsoftware.IBizPay.dll True - ..\..\packages\EPiServer.CommerceManager.10.2.1\lib\net45\RssToolkit.dll + ..\..\packages\EPiServer.CommerceManager.10.2.2\lib\net45\RssToolkit.dll True - ..\..\packages\EPiServer.CommerceManager.10.2.1\lib\net45\Validators.dll + ..\..\packages\EPiServer.CommerceManager.10.2.2\lib\net45\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 e61c18af..db0be330 100644 --- a/Sources/EPiServer.Reference.Commerce.Manager/packages.config +++ b/Sources/EPiServer.Reference.Commerce.Manager/packages.config @@ -30,6 +30,6 @@ - - + + diff --git a/Sources/EPiServer.Reference.Commerce.Manager/web.config b/Sources/EPiServer.Reference.Commerce.Manager/web.config index 6def5cf9..bf905f16 100644 --- a/Sources/EPiServer.Reference.Commerce.Manager/web.config +++ b/Sources/EPiServer.Reference.Commerce.Manager/web.config @@ -546,75 +546,75 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + 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 e05c4337..056d16b4 100644 --- a/Sources/EPiServer.Reference.Commerce.Shared/EPiServer.Reference.Commerce.Shared.csproj +++ b/Sources/EPiServer.Reference.Commerce.Shared/EPiServer.Reference.Commerce.Shared.csproj @@ -259,83 +259,83 @@ --> - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\EPiServer.Business.Commerce.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\EPiServer.Business.Commerce.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\EPiServer.Commerce.Internal.Migration.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\EPiServer.Commerce.Internal.Migration.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\Mediachase.BusinessFoundation.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\Mediachase.BusinessFoundation.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\Mediachase.BusinessFoundation.Data.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\Mediachase.BusinessFoundation.Data.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\Mediachase.Commerce.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\Mediachase.Commerce.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\Mediachase.Commerce.Marketing.Validators.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\Mediachase.Commerce.Marketing.Validators.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\Mediachase.Commerce.Plugins.Payment.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\Mediachase.Commerce.Plugins.Payment.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\Mediachase.Commerce.Plugins.Shipping.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\Mediachase.Commerce.Plugins.Shipping.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\Mediachase.Commerce.Website.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\Mediachase.Commerce.Website.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\Mediachase.Commerce.Workflow.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\Mediachase.Commerce.Workflow.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\Mediachase.DataProvider.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\Mediachase.DataProvider.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\Mediachase.FileUploader.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\Mediachase.FileUploader.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\Mediachase.MetaDataPlus.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\Mediachase.MetaDataPlus.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\Mediachase.Search.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\Mediachase.Search.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\Mediachase.Search.Extensions.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\Mediachase.Search.Extensions.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\Mediachase.Search.LuceneSearchProvider.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\Mediachase.Search.LuceneSearchProvider.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\Mediachase.SqlDataProvider.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\Mediachase.SqlDataProvider.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\Mediachase.WebConsoleLib.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\Mediachase.WebConsoleLib.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\AjaxControlToolkit.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\AjaxControlToolkit.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\nsoftware.IBizPay.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\nsoftware.IBizPay.dll True diff --git a/Sources/EPiServer.Reference.Commerce.Shared/packages.config b/Sources/EPiServer.Reference.Commerce.Shared/packages.config index 182de623..5a6c447d 100644 --- a/Sources/EPiServer.Reference.Commerce.Shared/packages.config +++ b/Sources/EPiServer.Reference.Commerce.Shared/packages.config @@ -28,5 +28,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 5bd3c056..58f8a013 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 @@ -369,83 +369,83 @@ --> - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\EPiServer.Business.Commerce.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\EPiServer.Business.Commerce.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\EPiServer.Commerce.Internal.Migration.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\EPiServer.Commerce.Internal.Migration.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\Mediachase.BusinessFoundation.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\Mediachase.BusinessFoundation.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\Mediachase.BusinessFoundation.Data.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\Mediachase.BusinessFoundation.Data.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\Mediachase.Commerce.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\Mediachase.Commerce.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\Mediachase.Commerce.Marketing.Validators.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\Mediachase.Commerce.Marketing.Validators.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\Mediachase.Commerce.Plugins.Payment.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\Mediachase.Commerce.Plugins.Payment.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\Mediachase.Commerce.Plugins.Shipping.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\Mediachase.Commerce.Plugins.Shipping.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\Mediachase.Commerce.Website.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\Mediachase.Commerce.Website.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\Mediachase.Commerce.Workflow.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\Mediachase.Commerce.Workflow.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\Mediachase.DataProvider.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\Mediachase.DataProvider.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\Mediachase.FileUploader.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\Mediachase.FileUploader.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\Mediachase.MetaDataPlus.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\Mediachase.MetaDataPlus.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\Mediachase.Search.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\Mediachase.Search.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\Mediachase.Search.Extensions.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\Mediachase.Search.Extensions.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\Mediachase.Search.LuceneSearchProvider.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\Mediachase.Search.LuceneSearchProvider.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\Mediachase.SqlDataProvider.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\Mediachase.SqlDataProvider.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\Mediachase.WebConsoleLib.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\Mediachase.WebConsoleLib.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\AjaxControlToolkit.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\AjaxControlToolkit.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\nsoftware.IBizPay.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\nsoftware.IBizPay.dll True diff --git a/Sources/EPiServer.Reference.Commerce.Site.Tests/packages.config b/Sources/EPiServer.Reference.Commerce.Site.Tests/packages.config index aabf5348..3aa3e59c 100644 --- a/Sources/EPiServer.Reference.Commerce.Site.Tests/packages.config +++ b/Sources/EPiServer.Reference.Commerce.Site.Tests/packages.config @@ -38,5 +38,5 @@ - + 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 5c2312cd..e8e7d43e 100644 --- a/Sources/EPiServer.Reference.Commerce.Site/EPiServer.Reference.Commerce.Site.csproj +++ b/Sources/EPiServer.Reference.Commerce.Site/EPiServer.Reference.Commerce.Site.csproj @@ -964,95 +964,95 @@ - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\EPiServer.Business.Commerce.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\EPiServer.Business.Commerce.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\EPiServer.Commerce.Internal.Migration.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\EPiServer.Commerce.Internal.Migration.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\Mediachase.BusinessFoundation.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\Mediachase.BusinessFoundation.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\Mediachase.BusinessFoundation.Data.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\Mediachase.BusinessFoundation.Data.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\Mediachase.Commerce.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\Mediachase.Commerce.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\Mediachase.Commerce.Marketing.Validators.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\Mediachase.Commerce.Marketing.Validators.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\Mediachase.Commerce.Plugins.Payment.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\Mediachase.Commerce.Plugins.Payment.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\Mediachase.Commerce.Plugins.Shipping.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\Mediachase.Commerce.Plugins.Shipping.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\Mediachase.Commerce.Website.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\Mediachase.Commerce.Website.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\Mediachase.Commerce.Workflow.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\Mediachase.Commerce.Workflow.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\Mediachase.DataProvider.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\Mediachase.DataProvider.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\Mediachase.FileUploader.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\Mediachase.FileUploader.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\Mediachase.MetaDataPlus.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\Mediachase.MetaDataPlus.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\Mediachase.Search.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\Mediachase.Search.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\Mediachase.Search.Extensions.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\Mediachase.Search.Extensions.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\Mediachase.Search.LuceneSearchProvider.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\Mediachase.Search.LuceneSearchProvider.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\Mediachase.SqlDataProvider.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\Mediachase.SqlDataProvider.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\Mediachase.WebConsoleLib.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\Mediachase.WebConsoleLib.dll True - ..\..\packages\EPiServer.Commerce.UI.10.2.1\lib\net45\EPiServer.Commerce.Shell.dll + ..\..\packages\EPiServer.Commerce.UI.10.2.2\lib\net45\EPiServer.Commerce.Shell.dll True - ..\..\packages\EPiServer.Commerce.UI.ManagerIntegration.10.2.1\lib\net45\EPiServer.Commerce.Shell.ManagerIntegration.dll + ..\..\packages\EPiServer.Commerce.UI.ManagerIntegration.10.2.2\lib\net45\EPiServer.Commerce.Shell.ManagerIntegration.dll True - ..\..\packages\EPiServer.Commerce.UI.10.2.1\lib\net45\EPiServer.Commerce.UI.dll + ..\..\packages\EPiServer.Commerce.UI.10.2.2\lib\net45\EPiServer.Commerce.UI.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\AjaxControlToolkit.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\AjaxControlToolkit.dll True - ..\..\packages\EPiServer.Commerce.Core.10.2.1\lib\net45\nsoftware.IBizPay.dll + ..\..\packages\EPiServer.Commerce.Core.10.2.2\lib\net45\nsoftware.IBizPay.dll True diff --git a/Sources/EPiServer.Reference.Commerce.Site/Features/Checkout/Services/ShippingManagerFacade.cs b/Sources/EPiServer.Reference.Commerce.Site/Features/Checkout/Services/ShippingManagerFacade.cs index 26fdc0eb..9c783917 100644 --- a/Sources/EPiServer.Reference.Commerce.Site/Features/Checkout/Services/ShippingManagerFacade.cs +++ b/Sources/EPiServer.Reference.Commerce.Site/Features/Checkout/Services/ShippingManagerFacade.cs @@ -29,10 +29,20 @@ public virtual IList GetShippingMethodsByMarket(string public virtual ShippingRate GetRate(IShipment shipment, ShippingMethodInfoModel shippingMethodInfoModel, IMarket currentMarket) { var type = Type.GetType(shippingMethodInfoModel.ClassName); - var shippingGateway = (IShippingPlugin)Activator.CreateInstance(type, currentMarket); + if (type == null) + { + throw new TypeInitializationException(shippingMethodInfoModel.ClassName, null); + } + string message = null; - return shippingGateway.GetRate(shippingMethodInfoModel.MethodId, shipment, ref message); - } + var shippingInstance = Activator.CreateInstance(type, currentMarket); + var shippingPlugin = shippingInstance as IShippingPlugin; + if (shippingPlugin != null) + { + return shippingPlugin.GetRate(shippingMethodInfoModel.MethodId, shipment, ref message); + } + return ((IShippingGateway)shippingInstance).GetRate(shippingMethodInfoModel.MethodId, (Shipment)shipment, ref message); + } } } \ No newline at end of file diff --git a/Sources/EPiServer.Reference.Commerce.Site/Web.config b/Sources/EPiServer.Reference.Commerce.Site/Web.config index 961ac9a5..7f4ab25d 100644 --- a/Sources/EPiServer.Reference.Commerce.Site/Web.config +++ b/Sources/EPiServer.Reference.Commerce.Site/Web.config @@ -237,83 +237,83 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + 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 2692eb45..f3300b44 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 d18999aa..da886a05 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 b37bce80..07fd569a 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/packages.config b/Sources/EPiServer.Reference.Commerce.Site/packages.config index fa1118d6..bb42b6f5 100644 --- a/Sources/EPiServer.Reference.Commerce.Site/packages.config +++ b/Sources/EPiServer.Reference.Commerce.Site/packages.config @@ -49,8 +49,8 @@ - - - - + + + +