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

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
Viet Anh Nguyen committed Oct 27, 2020
2 parents 8774440 + 2909970 commit 7486a47
Show file tree
Hide file tree
Showing 67 changed files with 5,032 additions and 160 deletions.
6 changes: 3 additions & 3 deletions Sources/AssemblyVersionAuto.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@


[assembly: AssemblyCopyright("Copyright ? 2020 Episerver")]
[assembly: AssemblyVersion("13.22.0.0")]
[assembly: AssemblyInformationalVersion("13.22.0")]
[assembly: AssemblyFileVersion("13.22.0.4155")]
[assembly: AssemblyVersion("13.26.0.0")]
[assembly: AssemblyInformationalVersion("13.26.0")]
[assembly: AssemblyFileVersion("13.26.0.4223")]
52 changes: 26 additions & 26 deletions Sources/EPiServer.Reference.Commerce.Manager/EPiServer.Reference.Commerce.Manager.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -407,101 +407,101 @@
</Target>
<ItemGroup>
<Reference Include="EPiServer.Business.Commerce, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.22.0\lib\net461\EPiServer.Business.Commerce.dll</HintPath>
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.26.0\lib\net461\EPiServer.Business.Commerce.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="EPiServer.Commerce.Reporting, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.22.0\lib\net461\EPiServer.Commerce.Reporting.dll</HintPath>
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.26.0\lib\net461\EPiServer.Commerce.Reporting.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="EPiServer.Commerce.Internal.Migration, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.22.0\lib\net461\EPiServer.Commerce.Internal.Migration.dll</HintPath>
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.26.0\lib\net461\EPiServer.Commerce.Internal.Migration.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Mediachase.BusinessFoundation, Culture=neutral, PublicKeyToken=41d2e7a615ba286c, processorArchitecture=MSIL">
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.22.0\lib\net461\Mediachase.BusinessFoundation.dll</HintPath>
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.26.0\lib\net461\Mediachase.BusinessFoundation.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Mediachase.BusinessFoundation.Data, Culture=neutral, PublicKeyToken=41d2e7a615ba286c, processorArchitecture=MSIL">
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.22.0\lib\net461\Mediachase.BusinessFoundation.Data.dll</HintPath>
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.26.0\lib\net461\Mediachase.BusinessFoundation.Data.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Mediachase.Commerce, Culture=neutral, PublicKeyToken=6e58b501b34abce3, processorArchitecture=MSIL">
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.22.0\lib\net461\Mediachase.Commerce.dll</HintPath>
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.26.0\lib\net461\Mediachase.Commerce.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Mediachase.Commerce.Marketing.Validators, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.22.0\lib\net461\Mediachase.Commerce.Marketing.Validators.dll</HintPath>
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.26.0\lib\net461\Mediachase.Commerce.Marketing.Validators.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Mediachase.Commerce.Plugins.Payment, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.22.0\lib\net461\Mediachase.Commerce.Plugins.Payment.dll</HintPath>
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.26.0\lib\net461\Mediachase.Commerce.Plugins.Payment.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Mediachase.Commerce.Plugins.Shipping, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.22.0\lib\net461\Mediachase.Commerce.Plugins.Shipping.dll</HintPath>
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.26.0\lib\net461\Mediachase.Commerce.Plugins.Shipping.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Mediachase.Commerce.Website, Culture=neutral, PublicKeyToken=6e58b501b34abce3, processorArchitecture=MSIL">
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.22.0\lib\net461\Mediachase.Commerce.Website.dll</HintPath>
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.26.0\lib\net461\Mediachase.Commerce.Website.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Mediachase.Commerce.Workflow, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.22.0\lib\net461\Mediachase.Commerce.Workflow.dll</HintPath>
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.26.0\lib\net461\Mediachase.Commerce.Workflow.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Mediachase.DataProvider, Culture=neutral, PublicKeyToken=41d2e7a615ba286c, processorArchitecture=MSIL">
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.22.0\lib\net461\Mediachase.DataProvider.dll</HintPath>
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.26.0\lib\net461\Mediachase.DataProvider.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Mediachase.FileUploader, Culture=neutral, PublicKeyToken=41d2e7a615ba286c, processorArchitecture=MSIL">
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.22.0\lib\net461\Mediachase.FileUploader.dll</HintPath>
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.26.0\lib\net461\Mediachase.FileUploader.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Mediachase.MetaDataPlus, Culture=neutral, PublicKeyToken=41d2e7a615ba286c, processorArchitecture=MSIL">
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.22.0\lib\net461\Mediachase.MetaDataPlus.dll</HintPath>
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.26.0\lib\net461\Mediachase.MetaDataPlus.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Mediachase.Search, Culture=neutral, PublicKeyToken=6e58b501b34abce3, processorArchitecture=MSIL">
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.22.0\lib\net461\Mediachase.Search.dll</HintPath>
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.26.0\lib\net461\Mediachase.Search.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Mediachase.Search.Extensions, Culture=neutral, PublicKeyToken=6e58b501b34abce3, processorArchitecture=MSIL">
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.22.0\lib\net461\Mediachase.Search.Extensions.dll</HintPath>
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.26.0\lib\net461\Mediachase.Search.Extensions.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Mediachase.Search.LuceneSearchProvider, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.22.0\lib\net461\Mediachase.Search.LuceneSearchProvider.dll</HintPath>
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.26.0\lib\net461\Mediachase.Search.LuceneSearchProvider.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Mediachase.SqlDataProvider, Culture=neutral, PublicKeyToken=41d2e7a615ba286c, processorArchitecture=MSIL">
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.22.0\lib\net461\Mediachase.SqlDataProvider.dll</HintPath>
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.26.0\lib\net461\Mediachase.SqlDataProvider.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Mediachase.WebConsoleLib, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.22.0\lib\net461\Mediachase.WebConsoleLib.dll</HintPath>
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.26.0\lib\net461\Mediachase.WebConsoleLib.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Mediachase.ConsoleManager, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\EPiServer.CommerceManager.13.22.0\lib\net461\Mediachase.ConsoleManager.dll</HintPath>
<HintPath>..\..\packages\EPiServer.CommerceManager.13.26.0\lib\net461\Mediachase.ConsoleManager.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="AjaxControlToolkit, Version=3.0.30930.28736, Culture=neutral, PublicKeyToken=28f01b0e84b6d53e, processorArchitecture=MSIL">
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.22.0\lib\net461\AjaxControlToolkit.dll</HintPath>
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.26.0\lib\net461\AjaxControlToolkit.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="ComponentArt.Web.UI, Version=2012.1.1016.35, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
<HintPath>..\..\packages\EPiServer.CommerceManager.13.22.0\lib\net461\ComponentArt.Web.UI.dll</HintPath>
<HintPath>..\..\packages\EPiServer.CommerceManager.13.26.0\lib\net461\ComponentArt.Web.UI.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
<Import Project="..\..\packages\EPiServer.CommerceManager.13.22.0\build\EPiServer.CommerceManager.targets"
Condition="Exists('..\..\packages\EPiServer.CommerceManager.13.22.0\build\EPiServer.CommerceManager.targets')"/>
<Import Project="..\..\packages\EPiServer.CommerceManager.13.26.0\build\EPiServer.CommerceManager.targets"
Condition="Exists('..\..\packages\EPiServer.CommerceManager.13.26.0\build\EPiServer.CommerceManager.targets')"/>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<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>
</PropertyGroup>
<Error Condition="!Exists('..\..\packages\EPiServer.CommerceManager.13.22.0\build\EPiServer.CommerceManager.targets')"
Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\EPiServer.CommerceManager.13.22.0\build\EPiServer.CommerceManager.targets'))"/>
<Error Condition="!Exists('..\..\packages\EPiServer.CommerceManager.13.26.0\build\EPiServer.CommerceManager.targets')"
Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\EPiServer.CommerceManager.13.26.0\build\EPiServer.CommerceManager.targets'))"/>
</Target>
</Project>
4 changes: 2 additions & 2 deletions Sources/EPiServer.Reference.Commerce.Manager/packages.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,6 @@
<package id="System.Security.Principal.Windows" version="4.4.0" targetFramework="net461" />
<package id="System.Threading.AccessControl" version="4.4.0" targetFramework="net461" />
<package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
<package id="EPiServer.Commerce.Core" version="13.22.0" targetFramework="net461"/>
<package id="EPiServer.CommerceManager" version="13.22.0" targetFramework="net461"/>
<package id="EPiServer.Commerce.Core" version="13.26.0" targetFramework="net461"/>
<package id="EPiServer.CommerceManager" version="13.26.0" targetFramework="net461"/>
</packages>
38 changes: 19 additions & 19 deletions Sources/EPiServer.Reference.Commerce.Manager/web.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -580,79 +580,79 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="EPiServer.Business.Commerce" publicKeyToken="8fe83dea738b45b7" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-13.22.0.0" newVersion="13.22.0.0"/>
<bindingRedirect oldVersion="0.0.0.0-13.26.0.0" newVersion="13.26.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="EPiServer.Commerce.Reporting" publicKeyToken="8fe83dea738b45b7" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-13.22.0.0" newVersion="13.22.0.0"/>
<bindingRedirect oldVersion="0.0.0.0-13.26.0.0" newVersion="13.26.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Mediachase.BusinessFoundation.Data" publicKeyToken="41d2e7a615ba286c" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-13.22.0.0" newVersion="13.22.0.0"/>
<bindingRedirect oldVersion="0.0.0.0-13.26.0.0" newVersion="13.26.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Mediachase.BusinessFoundation" publicKeyToken="41d2e7a615ba286c" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-13.22.0.0" newVersion="13.22.0.0"/>
<bindingRedirect oldVersion="0.0.0.0-13.26.0.0" newVersion="13.26.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Mediachase.Commerce" publicKeyToken="6e58b501b34abce3" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-13.22.0.0" newVersion="13.22.0.0"/>
<bindingRedirect oldVersion="0.0.0.0-13.26.0.0" newVersion="13.26.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Mediachase.Commerce.Marketing.Validators" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-13.22.0.0" newVersion="13.22.0.0"/>
<bindingRedirect oldVersion="0.0.0.0-13.26.0.0" newVersion="13.26.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Mediachase.Commerce.Plugins.Payment" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-13.22.0.0" newVersion="13.22.0.0"/>
<bindingRedirect oldVersion="0.0.0.0-13.26.0.0" newVersion="13.26.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Mediachase.Commerce.Plugins.Shipping" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-13.22.0.0" newVersion="13.22.0.0"/>
<bindingRedirect oldVersion="0.0.0.0-13.26.0.0" newVersion="13.26.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Mediachase.Commerce.Website" publicKeyToken="6e58b501b34abce3" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-13.22.0.0" newVersion="13.22.0.0"/>
<bindingRedirect oldVersion="0.0.0.0-13.26.0.0" newVersion="13.26.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Mediachase.Commerce.Workflow" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-13.22.0.0" newVersion="13.22.0.0"/>
<bindingRedirect oldVersion="0.0.0.0-13.26.0.0" newVersion="13.26.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Mediachase.DataProvider" publicKeyToken="41d2e7a615ba286c" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-13.22.0.0" newVersion="13.22.0.0"/>
<bindingRedirect oldVersion="0.0.0.0-13.26.0.0" newVersion="13.26.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Mediachase.FileUploader" publicKeyToken="41d2e7a615ba286c" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-13.22.0.0" newVersion="13.22.0.0"/>
<bindingRedirect oldVersion="0.0.0.0-13.26.0.0" newVersion="13.26.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Mediachase.MetaDataPlus" publicKeyToken="41d2e7a615ba286c" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-13.22.0.0" newVersion="13.22.0.0"/>
<bindingRedirect oldVersion="0.0.0.0-13.26.0.0" newVersion="13.26.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Mediachase.Search" publicKeyToken="6e58b501b34abce3" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-13.22.0.0" newVersion="13.22.0.0"/>
<bindingRedirect oldVersion="0.0.0.0-13.26.0.0" newVersion="13.26.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Mediachase.Search.Extensions" publicKeyToken="6e58b501b34abce3" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-13.22.0.0" newVersion="13.22.0.0"/>
<bindingRedirect oldVersion="0.0.0.0-13.26.0.0" newVersion="13.26.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Mediachase.Search.LuceneSearchProvider" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-13.22.0.0" newVersion="13.22.0.0"/>
<bindingRedirect oldVersion="0.0.0.0-13.26.0.0" newVersion="13.26.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Mediachase.SqlDataProvider" publicKeyToken="41d2e7a615ba286c" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-13.22.0.0" newVersion="13.22.0.0"/>
<bindingRedirect oldVersion="0.0.0.0-13.26.0.0" newVersion="13.26.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="EPiServer.Commerce.Internal.Migration" publicKeyToken="8fe83dea738b45b7" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-13.22.0.0" newVersion="13.22.0.0"/>
<bindingRedirect oldVersion="0.0.0.0-13.26.0.0" newVersion="13.26.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Mediachase.ConsoleManager" publicKeyToken="null" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-13.22.0.0" newVersion="13.22.0.0"/>
<bindingRedirect oldVersion="0.0.0.0-13.26.0.0" newVersion="13.26.0.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
Expand Down
Loading

0 comments on commit 7486a47

Please sign in to comment.