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

Commit

Permalink
Quicksilver release version 10.6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
eddielidfeldtepi committed May 16, 2017
1 parent a3bbd9a commit 7d59b02
Show file tree
Hide file tree
Showing 22 changed files with 227 additions and 169 deletions.
6 changes: 3 additions & 3 deletions Sources/AssemblyVersionAuto.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@



[assembly: AssemblyVersion("10.5.1.0")]
[assembly: AssemblyInformationalVersion("10.5.1")]
[assembly: AssemblyFileVersion("10.5.1.2349")]
[assembly: AssemblyVersion("10.6.0.0")]
[assembly: AssemblyInformationalVersion("10.6.0")]
[assembly: AssemblyFileVersion("10.6.0.2387")]
Original file line number Diff line number Diff line change
Expand Up @@ -840,4 +840,7 @@
<data name="Delete_Versions_Warning" xml:space="preserve">
<value>Warning. Updating this item through Commerce Manager will overwrite any previous and pending content versions. Such content versions may have been created through other interfaces.</value>
</data>
<data name="Invalid_Url_Characters" xml:space="preserve">
<value>Invalid characters in web address: '{0}'</value>
</data>
</root>
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
</td>
<td class="FormFieldCell">
<asp:TextBox runat="server" Width="350" ID="UrlText" MaxLength="255"></asp:TextBox><br />
<asp:CustomValidator runat="server" id="UrlValidator"
ControlToValidate="UrlText" OnServerValidate="SeoUrlValidatorCheck" Display="Dynamic" />
<asp:RegularExpressionValidator id="RegularExpressionValidator2" runat="server" ControlToValidate="UrlText" Display="Dynamic"
ErrorMessage="* Url cannot be longer than 255 characters." ValidationExpression=".{0,255}"></asp:RegularExpressionValidator>
<asp:CustomValidator runat="server" id="duplicateUrlCheck"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,7 @@
<Compile Include="..\AssemblyVersionAuto.cs">
<Link>AssemblyVersionAuto.cs</Link>
</Compile>
<Compile Include="IRIConfigurationModule.cs" />
<Compile Include="Login.aspx.designer.cs">
<DependentUpon>Login.aspx.cs</DependentUpon>
</Compile>
Expand Down Expand Up @@ -412,109 +413,109 @@
</Target>
<ItemGroup>
<Reference Include="EPiServer.Business.Commerce, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
<HintPath>..\..\packages\EPiServer.Commerce.Core.10.5.1\lib\net45\EPiServer.Business.Commerce.dll</HintPath>
<HintPath>..\..\packages\EPiServer.Commerce.Core.10.6.0\lib\net45\EPiServer.Business.Commerce.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="EPiServer.Commerce.Internal.Migration, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
<HintPath>..\..\packages\EPiServer.Commerce.Core.10.5.1\lib\net45\EPiServer.Commerce.Internal.Migration.dll</HintPath>
<HintPath>..\..\packages\EPiServer.Commerce.Core.10.6.0\lib\net45\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.10.5.1\lib\net45\Mediachase.BusinessFoundation.dll</HintPath>
<HintPath>..\..\packages\EPiServer.Commerce.Core.10.6.0\lib\net45\Mediachase.BusinessFoundation.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Mediachase.BusinessFoundation.Data, Culture=neutral, PublicKeyToken=41d2e7a615ba286c, processorArchitecture=MSIL">
<HintPath>..\..\packages\EPiServer.Commerce.Core.10.5.1\lib\net45\Mediachase.BusinessFoundation.Data.dll</HintPath>
<HintPath>..\..\packages\EPiServer.Commerce.Core.10.6.0\lib\net45\Mediachase.BusinessFoundation.Data.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Mediachase.Commerce, Culture=neutral, PublicKeyToken=6e58b501b34abce3, processorArchitecture=MSIL">
<HintPath>..\..\packages\EPiServer.Commerce.Core.10.5.1\lib\net45\Mediachase.Commerce.dll</HintPath>
<HintPath>..\..\packages\EPiServer.Commerce.Core.10.6.0\lib\net45\Mediachase.Commerce.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Mediachase.Commerce.Marketing.Validators, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\EPiServer.Commerce.Core.10.5.1\lib\net45\Mediachase.Commerce.Marketing.Validators.dll</HintPath>
<HintPath>..\..\packages\EPiServer.Commerce.Core.10.6.0\lib\net45\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.10.5.1\lib\net45\Mediachase.Commerce.Plugins.Payment.dll</HintPath>
<HintPath>..\..\packages\EPiServer.Commerce.Core.10.6.0\lib\net45\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.10.5.1\lib\net45\Mediachase.Commerce.Plugins.Shipping.dll</HintPath>
<HintPath>..\..\packages\EPiServer.Commerce.Core.10.6.0\lib\net45\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.10.5.1\lib\net45\Mediachase.Commerce.Website.dll</HintPath>
<HintPath>..\..\packages\EPiServer.Commerce.Core.10.6.0\lib\net45\Mediachase.Commerce.Website.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Mediachase.Commerce.Workflow, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\EPiServer.Commerce.Core.10.5.1\lib\net45\Mediachase.Commerce.Workflow.dll</HintPath>
<HintPath>..\..\packages\EPiServer.Commerce.Core.10.6.0\lib\net45\Mediachase.Commerce.Workflow.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Mediachase.DataProvider, Culture=neutral, PublicKeyToken=41d2e7a615ba286c, processorArchitecture=MSIL">
<HintPath>..\..\packages\EPiServer.Commerce.Core.10.5.1\lib\net45\Mediachase.DataProvider.dll</HintPath>
<HintPath>..\..\packages\EPiServer.Commerce.Core.10.6.0\lib\net45\Mediachase.DataProvider.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Mediachase.FileUploader, Culture=neutral, PublicKeyToken=41d2e7a615ba286c, processorArchitecture=MSIL">
<HintPath>..\..\packages\EPiServer.Commerce.Core.10.5.1\lib\net45\Mediachase.FileUploader.dll</HintPath>
<HintPath>..\..\packages\EPiServer.Commerce.Core.10.6.0\lib\net45\Mediachase.FileUploader.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Mediachase.MetaDataPlus, Culture=neutral, PublicKeyToken=41d2e7a615ba286c, processorArchitecture=MSIL">
<HintPath>..\..\packages\EPiServer.Commerce.Core.10.5.1\lib\net45\Mediachase.MetaDataPlus.dll</HintPath>
<HintPath>..\..\packages\EPiServer.Commerce.Core.10.6.0\lib\net45\Mediachase.MetaDataPlus.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Mediachase.Search, Culture=neutral, PublicKeyToken=6e58b501b34abce3, processorArchitecture=MSIL">
<HintPath>..\..\packages\EPiServer.Commerce.Core.10.5.1\lib\net45\Mediachase.Search.dll</HintPath>
<HintPath>..\..\packages\EPiServer.Commerce.Core.10.6.0\lib\net45\Mediachase.Search.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Mediachase.Search.Extensions, Culture=neutral, PublicKeyToken=6e58b501b34abce3, processorArchitecture=MSIL">
<HintPath>..\..\packages\EPiServer.Commerce.Core.10.5.1\lib\net45\Mediachase.Search.Extensions.dll</HintPath>
<HintPath>..\..\packages\EPiServer.Commerce.Core.10.6.0\lib\net45\Mediachase.Search.Extensions.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Mediachase.Search.LuceneSearchProvider, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\EPiServer.Commerce.Core.10.5.1\lib\net45\Mediachase.Search.LuceneSearchProvider.dll</HintPath>
<HintPath>..\..\packages\EPiServer.Commerce.Core.10.6.0\lib\net45\Mediachase.Search.LuceneSearchProvider.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Mediachase.SqlDataProvider, Culture=neutral, PublicKeyToken=41d2e7a615ba286c, processorArchitecture=MSIL">
<HintPath>..\..\packages\EPiServer.Commerce.Core.10.5.1\lib\net45\Mediachase.SqlDataProvider.dll</HintPath>
<HintPath>..\..\packages\EPiServer.Commerce.Core.10.6.0\lib\net45\Mediachase.SqlDataProvider.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Mediachase.WebConsoleLib, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\EPiServer.Commerce.Core.10.5.1\lib\net45\Mediachase.WebConsoleLib.dll</HintPath>
<HintPath>..\..\packages\EPiServer.Commerce.Core.10.6.0\lib\net45\Mediachase.WebConsoleLib.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Mediachase.ConsoleManager, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\EPiServer.CommerceManager.10.5.1\lib\net45\Mediachase.ConsoleManager.dll</HintPath>
<HintPath>..\..\packages\EPiServer.CommerceManager.10.6.0\lib\net45\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.10.5.1\lib\net45\AjaxControlToolkit.dll</HintPath>
<HintPath>..\..\packages\EPiServer.Commerce.Core.10.6.0\lib\net45\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.10.5.1\lib\net45\ComponentArt.Web.UI.dll</HintPath>
<HintPath>..\..\packages\EPiServer.CommerceManager.10.6.0\lib\net45\ComponentArt.Web.UI.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="nsoftware.IBizPay, Version=4.1.3575.0, Culture=neutral, PublicKeyToken=cdc168f89cffe9cf, processorArchitecture=MSIL">
<HintPath>..\..\packages\EPiServer.Commerce.Core.10.5.1\lib\net45\nsoftware.IBizPay.dll</HintPath>
<HintPath>..\..\packages\EPiServer.Commerce.Core.10.6.0\lib\net45\nsoftware.IBizPay.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="RssToolkit, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\EPiServer.CommerceManager.10.5.1\lib\net45\RssToolkit.dll</HintPath>
<HintPath>..\..\packages\EPiServer.CommerceManager.10.6.0\lib\net45\RssToolkit.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Validators, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\EPiServer.CommerceManager.10.5.1\lib\net45\Validators.dll</HintPath>
<HintPath>..\..\packages\EPiServer.CommerceManager.10.6.0\lib\net45\Validators.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
<Import Project="..\..\packages\EPiServer.CommerceManager.10.5.1\build\EPiServer.CommerceManager.targets"
Condition="Exists('..\..\packages\EPiServer.CommerceManager.10.5.1\build\EPiServer.CommerceManager.targets')"/>
<Import Project="..\..\packages\EPiServer.CommerceManager.10.6.0\build\EPiServer.CommerceManager.targets"
Condition="Exists('..\..\packages\EPiServer.CommerceManager.10.6.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.10.5.1\build\EPiServer.CommerceManager.targets')"
Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\EPiServer.CommerceManager.10.5.1\build\EPiServer.CommerceManager.targets'))"/>
<Error Condition="!Exists('..\..\packages\EPiServer.CommerceManager.10.6.0\build\EPiServer.CommerceManager.targets')"
Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\EPiServer.CommerceManager.10.6.0\build\EPiServer.CommerceManager.targets'))"/>
</Target>
</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
using EPiServer.Framework;
using EPiServer.Framework.Initialization;
using EPiServer.ServiceLocation;
using EPiServer.Web;

namespace EPiServer.Reference.Commerce.Manager
{
// To support an extended range of characters (outside of what has been defined in RFC1738) in URLs, define UNICODE_CHARACTERS_IN_URL symbol - this should be done both in Commerce Manager and Front-end site.
// More information about this feature: http://world.episerver.com/documentation/developer-guides/CMS/routing/internationalized-resource-identifiers-iris/

// The code block below will allow general Unicode letter characters.
// To support more Unicode blocks, update the regular expression for ValidUrlCharacters.
// For example, to support Thai Unicode block, add \p{IsThai} to it.
// The supported Unicode blocks can be found here: https://msdn.microsoft.com/en-us/library/20bw873z(v=vs.110).aspx#Anchor_12

#if UNICODE_CHARACTERS_IN_URL
[ModuleDependency(typeof(EPiServer.Web.InitializationModule))]
public class IRIConfigurationModule : IConfigurableModule
{
public void ConfigureContainer(ServiceConfigurationContext context)
{
context.Services.RemoveAll<UrlSegmentOptions>();
context.Services.AddSingleton<UrlSegmentOptions>(s => new UrlSegmentOptions
{
Encode = true,
ValidUrlCharacters = @"\p{L}0-9\-_~\.\$"
});
}

public void Initialize(InitializationEngine context)
{ }

public void Uninitialize(InitializationEngine context)
{ }
}
#endif
}
4 changes: 2 additions & 2 deletions Sources/EPiServer.Reference.Commerce.Manager/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@
<package id="SharpZipLib" version="0.86.0" targetFramework="net452" />
<package id="structuremap.web-signed" version="3.1.6.186" targetFramework="net452" />
<package id="structuremap-signed" version="3.1.9.463" targetFramework="net452" />
<package id="EPiServer.Commerce.Core" version="10.5.1" targetFramework="net452"/>
<package id="EPiServer.CommerceManager" version="10.5.1" targetFramework="net452"/>
<package id="EPiServer.Commerce.Core" version="10.6.0" targetFramework="net452"/>
<package id="EPiServer.CommerceManager" version="10.6.0" targetFramework="net452"/>
</packages>
Loading

0 comments on commit 7d59b02

Please sign in to comment.