Skip to content
This repository was archived by the owner on Aug 17, 2021. It is now read-only.

Commit 7486a47

Browse files
author
Viet Anh Nguyen
committed
Merge branch 'develop'
2 parents 8774440 + 2909970 commit 7486a47

File tree

67 files changed

+5032
-160
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+5032
-160
lines changed

‎Sources/AssemblyVersionAuto.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33

44

55
[assembly: AssemblyCopyright("Copyright ? 2020 Episerver")]
6-
[assembly: AssemblyVersion("13.22.0.0")]
7-
[assembly: AssemblyInformationalVersion("13.22.0")]
8-
[assembly: AssemblyFileVersion("13.22.0.4155")]
6+
[assembly: AssemblyVersion("13.26.0.0")]
7+
[assembly: AssemblyInformationalVersion("13.26.0")]
8+
[assembly: AssemblyFileVersion("13.26.0.4223")]

‎Sources/EPiServer.Reference.Commerce.Manager/EPiServer.Reference.Commerce.Manager.csproj‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -407,101 +407,101 @@
407407
</Target>
408408
<ItemGroup>
409409
<Reference Include="EPiServer.Business.Commerce, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
410-
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.22.0\lib\net461\EPiServer.Business.Commerce.dll</HintPath>
410+
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.26.0\lib\net461\EPiServer.Business.Commerce.dll</HintPath>
411411
<Private>True</Private>
412412
</Reference>
413413
<Reference Include="EPiServer.Commerce.Reporting, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
414-
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.22.0\lib\net461\EPiServer.Commerce.Reporting.dll</HintPath>
414+
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.26.0\lib\net461\EPiServer.Commerce.Reporting.dll</HintPath>
415415
<Private>True</Private>
416416
</Reference>
417417
<Reference Include="EPiServer.Commerce.Internal.Migration, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
418-
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.22.0\lib\net461\EPiServer.Commerce.Internal.Migration.dll</HintPath>
418+
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.26.0\lib\net461\EPiServer.Commerce.Internal.Migration.dll</HintPath>
419419
<Private>True</Private>
420420
</Reference>
421421
<Reference Include="Mediachase.BusinessFoundation, Culture=neutral, PublicKeyToken=41d2e7a615ba286c, processorArchitecture=MSIL">
422-
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.22.0\lib\net461\Mediachase.BusinessFoundation.dll</HintPath>
422+
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.26.0\lib\net461\Mediachase.BusinessFoundation.dll</HintPath>
423423
<Private>True</Private>
424424
</Reference>
425425
<Reference Include="Mediachase.BusinessFoundation.Data, Culture=neutral, PublicKeyToken=41d2e7a615ba286c, processorArchitecture=MSIL">
426-
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.22.0\lib\net461\Mediachase.BusinessFoundation.Data.dll</HintPath>
426+
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.26.0\lib\net461\Mediachase.BusinessFoundation.Data.dll</HintPath>
427427
<Private>True</Private>
428428
</Reference>
429429
<Reference Include="Mediachase.Commerce, Culture=neutral, PublicKeyToken=6e58b501b34abce3, processorArchitecture=MSIL">
430-
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.22.0\lib\net461\Mediachase.Commerce.dll</HintPath>
430+
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.26.0\lib\net461\Mediachase.Commerce.dll</HintPath>
431431
<Private>True</Private>
432432
</Reference>
433433
<Reference Include="Mediachase.Commerce.Marketing.Validators, Culture=neutral, processorArchitecture=MSIL">
434-
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.22.0\lib\net461\Mediachase.Commerce.Marketing.Validators.dll</HintPath>
434+
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.26.0\lib\net461\Mediachase.Commerce.Marketing.Validators.dll</HintPath>
435435
<Private>True</Private>
436436
</Reference>
437437
<Reference Include="Mediachase.Commerce.Plugins.Payment, Culture=neutral, processorArchitecture=MSIL">
438-
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.22.0\lib\net461\Mediachase.Commerce.Plugins.Payment.dll</HintPath>
438+
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.26.0\lib\net461\Mediachase.Commerce.Plugins.Payment.dll</HintPath>
439439
<Private>True</Private>
440440
</Reference>
441441
<Reference Include="Mediachase.Commerce.Plugins.Shipping, Culture=neutral, processorArchitecture=MSIL">
442-
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.22.0\lib\net461\Mediachase.Commerce.Plugins.Shipping.dll</HintPath>
442+
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.26.0\lib\net461\Mediachase.Commerce.Plugins.Shipping.dll</HintPath>
443443
<Private>True</Private>
444444
</Reference>
445445
<Reference Include="Mediachase.Commerce.Website, Culture=neutral, PublicKeyToken=6e58b501b34abce3, processorArchitecture=MSIL">
446-
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.22.0\lib\net461\Mediachase.Commerce.Website.dll</HintPath>
446+
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.26.0\lib\net461\Mediachase.Commerce.Website.dll</HintPath>
447447
<Private>True</Private>
448448
</Reference>
449449
<Reference Include="Mediachase.Commerce.Workflow, Culture=neutral, processorArchitecture=MSIL">
450-
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.22.0\lib\net461\Mediachase.Commerce.Workflow.dll</HintPath>
450+
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.26.0\lib\net461\Mediachase.Commerce.Workflow.dll</HintPath>
451451
<Private>True</Private>
452452
</Reference>
453453
<Reference Include="Mediachase.DataProvider, Culture=neutral, PublicKeyToken=41d2e7a615ba286c, processorArchitecture=MSIL">
454-
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.22.0\lib\net461\Mediachase.DataProvider.dll</HintPath>
454+
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.26.0\lib\net461\Mediachase.DataProvider.dll</HintPath>
455455
<Private>True</Private>
456456
</Reference>
457457
<Reference Include="Mediachase.FileUploader, Culture=neutral, PublicKeyToken=41d2e7a615ba286c, processorArchitecture=MSIL">
458-
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.22.0\lib\net461\Mediachase.FileUploader.dll</HintPath>
458+
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.26.0\lib\net461\Mediachase.FileUploader.dll</HintPath>
459459
<Private>True</Private>
460460
</Reference>
461461
<Reference Include="Mediachase.MetaDataPlus, Culture=neutral, PublicKeyToken=41d2e7a615ba286c, processorArchitecture=MSIL">
462-
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.22.0\lib\net461\Mediachase.MetaDataPlus.dll</HintPath>
462+
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.26.0\lib\net461\Mediachase.MetaDataPlus.dll</HintPath>
463463
<Private>True</Private>
464464
</Reference>
465465
<Reference Include="Mediachase.Search, Culture=neutral, PublicKeyToken=6e58b501b34abce3, processorArchitecture=MSIL">
466-
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.22.0\lib\net461\Mediachase.Search.dll</HintPath>
466+
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.26.0\lib\net461\Mediachase.Search.dll</HintPath>
467467
<Private>True</Private>
468468
</Reference>
469469
<Reference Include="Mediachase.Search.Extensions, Culture=neutral, PublicKeyToken=6e58b501b34abce3, processorArchitecture=MSIL">
470-
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.22.0\lib\net461\Mediachase.Search.Extensions.dll</HintPath>
470+
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.26.0\lib\net461\Mediachase.Search.Extensions.dll</HintPath>
471471
<Private>True</Private>
472472
</Reference>
473473
<Reference Include="Mediachase.Search.LuceneSearchProvider, Culture=neutral, processorArchitecture=MSIL">
474-
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.22.0\lib\net461\Mediachase.Search.LuceneSearchProvider.dll</HintPath>
474+
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.26.0\lib\net461\Mediachase.Search.LuceneSearchProvider.dll</HintPath>
475475
<Private>True</Private>
476476
</Reference>
477477
<Reference Include="Mediachase.SqlDataProvider, Culture=neutral, PublicKeyToken=41d2e7a615ba286c, processorArchitecture=MSIL">
478-
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.22.0\lib\net461\Mediachase.SqlDataProvider.dll</HintPath>
478+
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.26.0\lib\net461\Mediachase.SqlDataProvider.dll</HintPath>
479479
<Private>True</Private>
480480
</Reference>
481481
<Reference Include="Mediachase.WebConsoleLib, Culture=neutral, processorArchitecture=MSIL">
482-
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.22.0\lib\net461\Mediachase.WebConsoleLib.dll</HintPath>
482+
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.26.0\lib\net461\Mediachase.WebConsoleLib.dll</HintPath>
483483
<Private>True</Private>
484484
</Reference>
485485
<Reference Include="Mediachase.ConsoleManager, Culture=neutral, processorArchitecture=MSIL">
486-
<HintPath>..\..\packages\EPiServer.CommerceManager.13.22.0\lib\net461\Mediachase.ConsoleManager.dll</HintPath>
486+
<HintPath>..\..\packages\EPiServer.CommerceManager.13.26.0\lib\net461\Mediachase.ConsoleManager.dll</HintPath>
487487
<Private>True</Private>
488488
</Reference>
489489
<Reference Include="AjaxControlToolkit, Version=3.0.30930.28736, Culture=neutral, PublicKeyToken=28f01b0e84b6d53e, processorArchitecture=MSIL">
490-
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.22.0\lib\net461\AjaxControlToolkit.dll</HintPath>
490+
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.26.0\lib\net461\AjaxControlToolkit.dll</HintPath>
491491
<Private>True</Private>
492492
</Reference>
493493
<Reference Include="ComponentArt.Web.UI, Version=2012.1.1016.35, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
494-
<HintPath>..\..\packages\EPiServer.CommerceManager.13.22.0\lib\net461\ComponentArt.Web.UI.dll</HintPath>
494+
<HintPath>..\..\packages\EPiServer.CommerceManager.13.26.0\lib\net461\ComponentArt.Web.UI.dll</HintPath>
495495
<Private>True</Private>
496496
</Reference>
497497
</ItemGroup>
498-
<Import Project="..\..\packages\EPiServer.CommerceManager.13.22.0\build\EPiServer.CommerceManager.targets"
499-
Condition="Exists('..\..\packages\EPiServer.CommerceManager.13.22.0\build\EPiServer.CommerceManager.targets')"/>
498+
<Import Project="..\..\packages\EPiServer.CommerceManager.13.26.0\build\EPiServer.CommerceManager.targets"
499+
Condition="Exists('..\..\packages\EPiServer.CommerceManager.13.26.0\build\EPiServer.CommerceManager.targets')"/>
500500
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
501501
<PropertyGroup>
502502
<ErrorText>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}.</ErrorText>
503503
</PropertyGroup>
504-
<Error Condition="!Exists('..\..\packages\EPiServer.CommerceManager.13.22.0\build\EPiServer.CommerceManager.targets')"
505-
Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\EPiServer.CommerceManager.13.22.0\build\EPiServer.CommerceManager.targets'))"/>
504+
<Error Condition="!Exists('..\..\packages\EPiServer.CommerceManager.13.26.0\build\EPiServer.CommerceManager.targets')"
505+
Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\EPiServer.CommerceManager.13.26.0\build\EPiServer.CommerceManager.targets'))"/>
506506
</Target>
507507
</Project>

‎Sources/EPiServer.Reference.Commerce.Manager/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,6 @@
4545
<package id="System.Security.Principal.Windows" version="4.4.0" targetFramework="net461" />
4646
<package id="System.Threading.AccessControl" version="4.4.0" targetFramework="net461" />
4747
<package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
48-
<package id="EPiServer.Commerce.Core" version="13.22.0" targetFramework="net461"/>
49-
<package id="EPiServer.CommerceManager" version="13.22.0" targetFramework="net461"/>
48+
<package id="EPiServer.Commerce.Core" version="13.26.0" targetFramework="net461"/>
49+
<package id="EPiServer.CommerceManager" version="13.26.0" targetFramework="net461"/>
5050
</packages>

‎Sources/EPiServer.Reference.Commerce.Manager/web.config‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -580,79 +580,79 @@
580580
</dependentAssembly>
581581
<dependentAssembly>
582582
<assemblyIdentity name="EPiServer.Business.Commerce" publicKeyToken="8fe83dea738b45b7" culture="neutral"/>
583-
<bindingRedirect oldVersion="0.0.0.0-13.22.0.0" newVersion="13.22.0.0"/>
583+
<bindingRedirect oldVersion="0.0.0.0-13.26.0.0" newVersion="13.26.0.0"/>
584584
</dependentAssembly>
585585
<dependentAssembly>
586586
<assemblyIdentity name="EPiServer.Commerce.Reporting" publicKeyToken="8fe83dea738b45b7" culture="neutral"/>
587-
<bindingRedirect oldVersion="0.0.0.0-13.22.0.0" newVersion="13.22.0.0"/>
587+
<bindingRedirect oldVersion="0.0.0.0-13.26.0.0" newVersion="13.26.0.0"/>
588588
</dependentAssembly>
589589
<dependentAssembly>
590590
<assemblyIdentity name="Mediachase.BusinessFoundation.Data" publicKeyToken="41d2e7a615ba286c" culture="neutral"/>
591-
<bindingRedirect oldVersion="0.0.0.0-13.22.0.0" newVersion="13.22.0.0"/>
591+
<bindingRedirect oldVersion="0.0.0.0-13.26.0.0" newVersion="13.26.0.0"/>
592592
</dependentAssembly>
593593
<dependentAssembly>
594594
<assemblyIdentity name="Mediachase.BusinessFoundation" publicKeyToken="41d2e7a615ba286c" culture="neutral"/>
595-
<bindingRedirect oldVersion="0.0.0.0-13.22.0.0" newVersion="13.22.0.0"/>
595+
<bindingRedirect oldVersion="0.0.0.0-13.26.0.0" newVersion="13.26.0.0"/>
596596
</dependentAssembly>
597597
<dependentAssembly>
598598
<assemblyIdentity name="Mediachase.Commerce" publicKeyToken="6e58b501b34abce3" culture="neutral"/>
599-
<bindingRedirect oldVersion="0.0.0.0-13.22.0.0" newVersion="13.22.0.0"/>
599+
<bindingRedirect oldVersion="0.0.0.0-13.26.0.0" newVersion="13.26.0.0"/>
600600
</dependentAssembly>
601601
<dependentAssembly>
602602
<assemblyIdentity name="Mediachase.Commerce.Marketing.Validators" culture="neutral"/>
603-
<bindingRedirect oldVersion="0.0.0.0-13.22.0.0" newVersion="13.22.0.0"/>
603+
<bindingRedirect oldVersion="0.0.0.0-13.26.0.0" newVersion="13.26.0.0"/>
604604
</dependentAssembly>
605605
<dependentAssembly>
606606
<assemblyIdentity name="Mediachase.Commerce.Plugins.Payment" culture="neutral"/>
607-
<bindingRedirect oldVersion="0.0.0.0-13.22.0.0" newVersion="13.22.0.0"/>
607+
<bindingRedirect oldVersion="0.0.0.0-13.26.0.0" newVersion="13.26.0.0"/>
608608
</dependentAssembly>
609609
<dependentAssembly>
610610
<assemblyIdentity name="Mediachase.Commerce.Plugins.Shipping" culture="neutral"/>
611-
<bindingRedirect oldVersion="0.0.0.0-13.22.0.0" newVersion="13.22.0.0"/>
611+
<bindingRedirect oldVersion="0.0.0.0-13.26.0.0" newVersion="13.26.0.0"/>
612612
</dependentAssembly>
613613
<dependentAssembly>
614614
<assemblyIdentity name="Mediachase.Commerce.Website" publicKeyToken="6e58b501b34abce3" culture="neutral"/>
615-
<bindingRedirect oldVersion="0.0.0.0-13.22.0.0" newVersion="13.22.0.0"/>
615+
<bindingRedirect oldVersion="0.0.0.0-13.26.0.0" newVersion="13.26.0.0"/>
616616
</dependentAssembly>
617617
<dependentAssembly>
618618
<assemblyIdentity name="Mediachase.Commerce.Workflow" culture="neutral"/>
619-
<bindingRedirect oldVersion="0.0.0.0-13.22.0.0" newVersion="13.22.0.0"/>
619+
<bindingRedirect oldVersion="0.0.0.0-13.26.0.0" newVersion="13.26.0.0"/>
620620
</dependentAssembly>
621621
<dependentAssembly>
622622
<assemblyIdentity name="Mediachase.DataProvider" publicKeyToken="41d2e7a615ba286c" culture="neutral"/>
623-
<bindingRedirect oldVersion="0.0.0.0-13.22.0.0" newVersion="13.22.0.0"/>
623+
<bindingRedirect oldVersion="0.0.0.0-13.26.0.0" newVersion="13.26.0.0"/>
624624
</dependentAssembly>
625625
<dependentAssembly>
626626
<assemblyIdentity name="Mediachase.FileUploader" publicKeyToken="41d2e7a615ba286c" culture="neutral"/>
627-
<bindingRedirect oldVersion="0.0.0.0-13.22.0.0" newVersion="13.22.0.0"/>
627+
<bindingRedirect oldVersion="0.0.0.0-13.26.0.0" newVersion="13.26.0.0"/>
628628
</dependentAssembly>
629629
<dependentAssembly>
630630
<assemblyIdentity name="Mediachase.MetaDataPlus" publicKeyToken="41d2e7a615ba286c" culture="neutral"/>
631-
<bindingRedirect oldVersion="0.0.0.0-13.22.0.0" newVersion="13.22.0.0"/>
631+
<bindingRedirect oldVersion="0.0.0.0-13.26.0.0" newVersion="13.26.0.0"/>
632632
</dependentAssembly>
633633
<dependentAssembly>
634634
<assemblyIdentity name="Mediachase.Search" publicKeyToken="6e58b501b34abce3" culture="neutral"/>
635-
<bindingRedirect oldVersion="0.0.0.0-13.22.0.0" newVersion="13.22.0.0"/>
635+
<bindingRedirect oldVersion="0.0.0.0-13.26.0.0" newVersion="13.26.0.0"/>
636636
</dependentAssembly>
637637
<dependentAssembly>
638638
<assemblyIdentity name="Mediachase.Search.Extensions" publicKeyToken="6e58b501b34abce3" culture="neutral"/>
639-
<bindingRedirect oldVersion="0.0.0.0-13.22.0.0" newVersion="13.22.0.0"/>
639+
<bindingRedirect oldVersion="0.0.0.0-13.26.0.0" newVersion="13.26.0.0"/>
640640
</dependentAssembly>
641641
<dependentAssembly>
642642
<assemblyIdentity name="Mediachase.Search.LuceneSearchProvider" culture="neutral"/>
643-
<bindingRedirect oldVersion="0.0.0.0-13.22.0.0" newVersion="13.22.0.0"/>
643+
<bindingRedirect oldVersion="0.0.0.0-13.26.0.0" newVersion="13.26.0.0"/>
644644
</dependentAssembly>
645645
<dependentAssembly>
646646
<assemblyIdentity name="Mediachase.SqlDataProvider" publicKeyToken="41d2e7a615ba286c" culture="neutral"/>
647-
<bindingRedirect oldVersion="0.0.0.0-13.22.0.0" newVersion="13.22.0.0"/>
647+
<bindingRedirect oldVersion="0.0.0.0-13.26.0.0" newVersion="13.26.0.0"/>
648648
</dependentAssembly>
649649
<dependentAssembly>
650650
<assemblyIdentity name="EPiServer.Commerce.Internal.Migration" publicKeyToken="8fe83dea738b45b7" culture="neutral"/>
651-
<bindingRedirect oldVersion="0.0.0.0-13.22.0.0" newVersion="13.22.0.0"/>
651+
<bindingRedirect oldVersion="0.0.0.0-13.26.0.0" newVersion="13.26.0.0"/>
652652
</dependentAssembly>
653653
<dependentAssembly>
654654
<assemblyIdentity name="Mediachase.ConsoleManager" publicKeyToken="null" culture="neutral"/>
655-
<bindingRedirect oldVersion="0.0.0.0-13.22.0.0" newVersion="13.22.0.0"/>
655+
<bindingRedirect oldVersion="0.0.0.0-13.26.0.0" newVersion="13.26.0.0"/>
656656
</dependentAssembly>
657657
</assemblyBinding>
658658
</runtime>

0 commit comments

Comments
 (0)