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

Commit 742857a

Browse files
vucuongkgvucuongkg
committed
Merge branch 'develop'
2 parents e54250d + 992180e commit 742857a

File tree

15 files changed

+204
-157
lines changed

15 files changed

+204
-157
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 ? 2019 Episerver")]
6-
[assembly: AssemblyVersion("13.11.0.0")]
7-
[assembly: AssemblyInformationalVersion("13.11.0")]
8-
[assembly: AssemblyFileVersion("13.11.0.3856")]
6+
[assembly: AssemblyVersion("13.12.0.0")]
7+
[assembly: AssemblyInformationalVersion("13.12.0")]
8+
[assembly: AssemblyFileVersion("13.12.0.3864")]

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

Lines changed: 59 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -374,111 +374,142 @@
374374
<Target Name="BeforeBuild">
375375
</Target>
376376
-->
377+
<UsingTask TaskName="UpdateLoginPage" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
378+
<ParameterGroup>
379+
<ProjectPath Required="true" />
380+
</ParameterGroup>
381+
<Task>
382+
      <Reference Include="System.IO" />
383+
      <Using Namespace="System.IO" />
384+
      <Code Type="Fragment" Language="cs">
385+
              <![CDATA[
386+
            var fileNames = new[]{ "Login", "Logout" };
387+
            foreach(var file in fileNames)
388+
            {
389+
                var pagePath = Path.Combine(ProjectPath, String.Format("Apps\\Shell\\Pages\\{0}.aspx", file));
390+
                if (!File.Exists(pagePath))
391+
                {
392+
                    Log.LogMessage(pagePath + " does not exist.", MessageImportance.High);
393+
                    return false;
394+
                }
395+
                var lines = File.ReadAllLines(pagePath);
396+
                // we want to replace the regular page's code behind with our own.
397+
                lines[0] = String.Format("<%@ Page Language=\"C#\" AutoEventWireup=\"true\" Inherits=\"EPiServer.Reference.Commerce.Manager.{0}\" CodeBehind=\"~/{0}.aspx.cs\" %>", file);
398+
                File.WriteAllLines(pagePath, lines);
399+
            }
400+
            
401+
        ]]></Code>
402+
    
403+
</Task>
404+
</UsingTask>
405+
<Target Name="AfterBuild">
406+
<UpdateLoginPage ProjectPath="$(ProjectDir)" />
407+
</Target>
377408
<ItemGroup>
378409
<Reference Include="EPiServer.Business.Commerce, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
379-
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.11.0\lib\net461\EPiServer.Business.Commerce.dll</HintPath>
410+
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.12.0\lib\net461\EPiServer.Business.Commerce.dll</HintPath>
380411
<Private>True</Private>
381412
</Reference>
382413
<Reference Include="EPiServer.Commerce.Reporting, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
383-
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.11.0\lib\net461\EPiServer.Commerce.Reporting.dll</HintPath>
414+
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.12.0\lib\net461\EPiServer.Commerce.Reporting.dll</HintPath>
384415
<Private>True</Private>
385416
</Reference>
386417
<Reference Include="EPiServer.Commerce.Internal.Migration, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
387-
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.11.0\lib\net461\EPiServer.Commerce.Internal.Migration.dll</HintPath>
418+
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.12.0\lib\net461\EPiServer.Commerce.Internal.Migration.dll</HintPath>
388419
<Private>True</Private>
389420
</Reference>
390421
<Reference Include="Mediachase.BusinessFoundation, Culture=neutral, PublicKeyToken=41d2e7a615ba286c, processorArchitecture=MSIL">
391-
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.11.0\lib\net461\Mediachase.BusinessFoundation.dll</HintPath>
422+
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.12.0\lib\net461\Mediachase.BusinessFoundation.dll</HintPath>
392423
<Private>True</Private>
393424
</Reference>
394425
<Reference Include="Mediachase.BusinessFoundation.Data, Culture=neutral, PublicKeyToken=41d2e7a615ba286c, processorArchitecture=MSIL">
395-
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.11.0\lib\net461\Mediachase.BusinessFoundation.Data.dll</HintPath>
426+
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.12.0\lib\net461\Mediachase.BusinessFoundation.Data.dll</HintPath>
396427
<Private>True</Private>
397428
</Reference>
398429
<Reference Include="Mediachase.Commerce, Culture=neutral, PublicKeyToken=6e58b501b34abce3, processorArchitecture=MSIL">
399-
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.11.0\lib\net461\Mediachase.Commerce.dll</HintPath>
430+
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.12.0\lib\net461\Mediachase.Commerce.dll</HintPath>
400431
<Private>True</Private>
401432
</Reference>
402433
<Reference Include="Mediachase.Commerce.Marketing.Validators, Culture=neutral, processorArchitecture=MSIL">
403-
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.11.0\lib\net461\Mediachase.Commerce.Marketing.Validators.dll</HintPath>
434+
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.12.0\lib\net461\Mediachase.Commerce.Marketing.Validators.dll</HintPath>
404435
<Private>True</Private>
405436
</Reference>
406437
<Reference Include="Mediachase.Commerce.Plugins.Payment, Culture=neutral, processorArchitecture=MSIL">
407-
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.11.0\lib\net461\Mediachase.Commerce.Plugins.Payment.dll</HintPath>
438+
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.12.0\lib\net461\Mediachase.Commerce.Plugins.Payment.dll</HintPath>
408439
<Private>True</Private>
409440
</Reference>
410441
<Reference Include="Mediachase.Commerce.Plugins.Shipping, Culture=neutral, processorArchitecture=MSIL">
411-
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.11.0\lib\net461\Mediachase.Commerce.Plugins.Shipping.dll</HintPath>
442+
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.12.0\lib\net461\Mediachase.Commerce.Plugins.Shipping.dll</HintPath>
412443
<Private>True</Private>
413444
</Reference>
414445
<Reference Include="Mediachase.Commerce.Website, Culture=neutral, PublicKeyToken=6e58b501b34abce3, processorArchitecture=MSIL">
415-
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.11.0\lib\net461\Mediachase.Commerce.Website.dll</HintPath>
446+
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.12.0\lib\net461\Mediachase.Commerce.Website.dll</HintPath>
416447
<Private>True</Private>
417448
</Reference>
418449
<Reference Include="Mediachase.Commerce.Workflow, Culture=neutral, processorArchitecture=MSIL">
419-
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.11.0\lib\net461\Mediachase.Commerce.Workflow.dll</HintPath>
450+
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.12.0\lib\net461\Mediachase.Commerce.Workflow.dll</HintPath>
420451
<Private>True</Private>
421452
</Reference>
422453
<Reference Include="Mediachase.DataProvider, Culture=neutral, PublicKeyToken=41d2e7a615ba286c, processorArchitecture=MSIL">
423-
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.11.0\lib\net461\Mediachase.DataProvider.dll</HintPath>
454+
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.12.0\lib\net461\Mediachase.DataProvider.dll</HintPath>
424455
<Private>True</Private>
425456
</Reference>
426457
<Reference Include="Mediachase.FileUploader, Culture=neutral, PublicKeyToken=41d2e7a615ba286c, processorArchitecture=MSIL">
427-
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.11.0\lib\net461\Mediachase.FileUploader.dll</HintPath>
458+
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.12.0\lib\net461\Mediachase.FileUploader.dll</HintPath>
428459
<Private>True</Private>
429460
</Reference>
430461
<Reference Include="Mediachase.MetaDataPlus, Culture=neutral, PublicKeyToken=41d2e7a615ba286c, processorArchitecture=MSIL">
431-
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.11.0\lib\net461\Mediachase.MetaDataPlus.dll</HintPath>
462+
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.12.0\lib\net461\Mediachase.MetaDataPlus.dll</HintPath>
432463
<Private>True</Private>
433464
</Reference>
434465
<Reference Include="Mediachase.Search, Culture=neutral, PublicKeyToken=6e58b501b34abce3, processorArchitecture=MSIL">
435-
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.11.0\lib\net461\Mediachase.Search.dll</HintPath>
466+
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.12.0\lib\net461\Mediachase.Search.dll</HintPath>
436467
<Private>True</Private>
437468
</Reference>
438469
<Reference Include="Mediachase.Search.Extensions, Culture=neutral, PublicKeyToken=6e58b501b34abce3, processorArchitecture=MSIL">
439-
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.11.0\lib\net461\Mediachase.Search.Extensions.dll</HintPath>
470+
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.12.0\lib\net461\Mediachase.Search.Extensions.dll</HintPath>
440471
<Private>True</Private>
441472
</Reference>
442473
<Reference Include="Mediachase.Search.LuceneSearchProvider, Culture=neutral, processorArchitecture=MSIL">
443-
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.11.0\lib\net461\Mediachase.Search.LuceneSearchProvider.dll</HintPath>
474+
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.12.0\lib\net461\Mediachase.Search.LuceneSearchProvider.dll</HintPath>
444475
<Private>True</Private>
445476
</Reference>
446477
<Reference Include="Mediachase.SqlDataProvider, Culture=neutral, PublicKeyToken=41d2e7a615ba286c, processorArchitecture=MSIL">
447-
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.11.0\lib\net461\Mediachase.SqlDataProvider.dll</HintPath>
478+
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.12.0\lib\net461\Mediachase.SqlDataProvider.dll</HintPath>
448479
<Private>True</Private>
449480
</Reference>
450481
<Reference Include="Mediachase.WebConsoleLib, Culture=neutral, processorArchitecture=MSIL">
451-
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.11.0\lib\net461\Mediachase.WebConsoleLib.dll</HintPath>
482+
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.12.0\lib\net461\Mediachase.WebConsoleLib.dll</HintPath>
452483
<Private>True</Private>
453484
</Reference>
454485
<Reference Include="Mediachase.ConsoleManager, Culture=neutral, processorArchitecture=MSIL">
455-
<HintPath>..\..\packages\EPiServer.CommerceManager.13.11.0\lib\net461\Mediachase.ConsoleManager.dll</HintPath>
486+
<HintPath>..\..\packages\EPiServer.CommerceManager.13.12.0\lib\net461\Mediachase.ConsoleManager.dll</HintPath>
456487
<Private>True</Private>
457488
</Reference>
458489
<Reference Include="AjaxControlToolkit, Version=3.0.30930.28736, Culture=neutral, PublicKeyToken=28f01b0e84b6d53e, processorArchitecture=MSIL">
459-
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.11.0\lib\net461\AjaxControlToolkit.dll</HintPath>
490+
<HintPath>..\..\packages\EPiServer.Commerce.Core.13.12.0\lib\net461\AjaxControlToolkit.dll</HintPath>
460491
<Private>True</Private>
461492
</Reference>
462493
<Reference Include="ComponentArt.Web.UI, Version=2012.1.1016.35, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
463-
<HintPath>..\..\packages\EPiServer.CommerceManager.13.11.0\lib\net461\ComponentArt.Web.UI.dll</HintPath>
494+
<HintPath>..\..\packages\EPiServer.CommerceManager.13.12.0\lib\net461\ComponentArt.Web.UI.dll</HintPath>
464495
<Private>True</Private>
465496
</Reference>
466497
<Reference Include="RssToolkit, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
467-
<HintPath>..\..\packages\EPiServer.CommerceManager.13.11.0\lib\net461\RssToolkit.dll</HintPath>
498+
<HintPath>..\..\packages\EPiServer.CommerceManager.13.12.0\lib\net461\RssToolkit.dll</HintPath>
468499
<Private>True</Private>
469500
</Reference>
470501
<Reference Include="Validators, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
471-
<HintPath>..\..\packages\EPiServer.CommerceManager.13.11.0\lib\net461\Validators.dll</HintPath>
502+
<HintPath>..\..\packages\EPiServer.CommerceManager.13.12.0\lib\net461\Validators.dll</HintPath>
472503
<Private>True</Private>
473504
</Reference>
474505
</ItemGroup>
475-
<Import Project="..\..\packages\EPiServer.CommerceManager.13.11.0\build\EPiServer.CommerceManager.targets"
476-
Condition="Exists('..\..\packages\EPiServer.CommerceManager.13.11.0\build\EPiServer.CommerceManager.targets')"/>
506+
<Import Project="..\..\packages\EPiServer.CommerceManager.13.12.0\build\EPiServer.CommerceManager.targets"
507+
Condition="Exists('..\..\packages\EPiServer.CommerceManager.13.12.0\build\EPiServer.CommerceManager.targets')"/>
477508
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
478509
<PropertyGroup>
479510
<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>
480511
</PropertyGroup>
481-
<Error Condition="!Exists('..\..\packages\EPiServer.CommerceManager.13.11.0\build\EPiServer.CommerceManager.targets')"
482-
Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\EPiServer.CommerceManager.13.11.0\build\EPiServer.CommerceManager.targets'))"/>
512+
<Error Condition="!Exists('..\..\packages\EPiServer.CommerceManager.13.12.0\build\EPiServer.CommerceManager.targets')"
513+
Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\EPiServer.CommerceManager.13.12.0\build\EPiServer.CommerceManager.targets'))"/>
483514
</Target>
484515
</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.11.0" targetFramework="net461"/>
49-
<package id="EPiServer.CommerceManager" version="13.11.0" targetFramework="net461"/>
48+
<package id="EPiServer.Commerce.Core" version="13.12.0" targetFramework="net461"/>
49+
<package id="EPiServer.CommerceManager" version="13.12.0" targetFramework="net461"/>
5050
</packages>

0 commit comments

Comments
 (0)