Quicksilver release version 10.4.3

episerver · Mar 28, 2017 · 5023988 · 5023988
1 parent dc51296
commit 5023988
Show file tree

Hide file tree

Showing 29 changed files with 252 additions and 187 deletions.
diff --git a/Sources/AssemblyVersionAuto.cs b/Sources/AssemblyVersionAuto.cs
@@ -2,6 +2,6 @@
 
 
 
-[assembly: AssemblyVersion("10.4.2.0")]
-[assembly: AssemblyInformationalVersion("10.4.2")]
-[assembly: AssemblyFileVersion("10.4.2.2273")]
+[assembly: AssemblyVersion("10.4.3.0")]
+[assembly: AssemblyInformationalVersion("10.4.3")]
+[assembly: AssemblyFileVersion("10.4.3.2285")]
diff --git a/Sources/EPiServer.Reference.Commerce.Manager/App_GlobalResources/CommerceManager.sv.resx b/Sources/EPiServer.Reference.Commerce.Manager/App_GlobalResources/CommerceManager.sv.resx
@@ -2236,7 +2236,7 @@
     <value>lägg till/redigera klasser</value>
   </data>
   <data name="CATEGORY_ATTRIBUTE_ORDERING" xml:space="preserve">
-    <value>Beställning</value>
+    <value>Sortering</value>
   </data>
   <data name="CATEGORY_DISCOUNT" xml:space="preserve">
     <value>Rabatt</value>
@@ -2980,7 +2980,7 @@
     <value>System'Namn' får inte lämnas tomt.</value>
   </data>
   <data name="GATEWAY_ORDERING" xml:space="preserve">
-    <value>Beställning</value>
+    <value>Sortering</value>
   </data>
   <data name="GATEWAY_ISACTIVE" xml:space="preserve">
     <value>Visa för kund som alternativ</value>
@@ -4147,7 +4147,7 @@
     <value>lägg till/redigera klasser</value>
   </data>
   <data name="PAGEEDIT_ATTRIBUTE_ORDERING" xml:space="preserve">
-    <value>Beställning</value>
+    <value>Sortering</value>
   </data>
   <data name="PAGEEDIT_PAGE_TEMPLATE" xml:space="preserve">
     <value>Mall för virtuell sida</value>
@@ -4723,7 +4723,7 @@
     <value>Namn</value>
   </data>
   <data name="PRODUCTSKUS_ORDERING" xml:space="preserve">
-    <value>Beställning</value>
+    <value>Sortering</value>
   </data>
   <data name="PRODUCTSKUS_PRICE" xml:space="preserve">
     <value>Pris</value>
@@ -5104,7 +5104,7 @@
     <value>Felaktigt pris</value>
   </data>
   <data name="SHIPPINGMETHODEDIT_ORDERING" xml:space="preserve">
-    <value>Beställning</value>
+    <value>Sortering</value>
   </data>
   <data name="SHIPPINGMETHODEDIT_ISTAXABLE" xml:space="preserve">
     <value>Är skattepliktig</value>
@@ -6022,7 +6022,7 @@
     <value>Beskrivning</value>
   </data>
   <data name="STATSEVENTCATEGORIES_HDR_ORDERING" xml:space="preserve">
-    <value>Beställning</value>
+    <value>Sortering</value>
   </data>
   <data name="STATSEVENTCATEGORIES_HDR_OPTIONS" xml:space="preserve">
     <value>Alternativ</value>
@@ -6034,7 +6034,7 @@
     <value>Beskrivning</value>
   </data>
   <data name="STATSEVENTCATEGORYNEW_ORDERING" xml:space="preserve">
-    <value>Beställning</value>
+    <value>Sortering</value>
   </data>
   <data name="STATSEVENTNEW_CATEGORY" xml:space="preserve">
     <value>Category</value>

diff --git a/Sources/EPiServer.Reference.Commerce.Manager/App_GlobalResources/Order/OrderStrings.sv.resx b/Sources/EPiServer.Reference.Commerce.Manager/App_GlobalResources/Order/OrderStrings.sv.resx
@@ -535,7 +535,7 @@
     <value>OrderGroupAddressId</value>
   </data>
   <data name="Ordering" xml:space="preserve">
-    <value>Beställning</value>
+    <value>Sortering</value>
   </data>
   <data name="Friendly_Name" xml:space="preserve">
     <value>Eget namn</value>

diff --git a/Sources/EPiServer.Reference.Commerce.Manager/App_GlobalResources/SharedStrings.sv.resx b/Sources/EPiServer.Reference.Commerce.Manager/App_GlobalResources/SharedStrings.sv.resx
@@ -949,7 +949,7 @@
     <value>Ny leverans</value>
   </data>
   <data name="Ordering" xml:space="preserve">
-    <value>Beställning</value>
+    <value>Sortering</value>
   </data>
   <data name="Payment_Method_Description" xml:space="preserve">
     <value>konfigurerade betalningsmetoder, vilka normalt motsvarar betalningsprocessorer</value>

diff --git a/Sources/EPiServer.Reference.Commerce.Manager/Apps/Web.config b/Sources/EPiServer.Reference.Commerce.Manager/Apps/Web.config
@@ -8,7 +8,7 @@
   </system.web>
   -->
   <appSettings>
-    <add key="epi:HelpUrl" value="http://webhelp.episerver.com/17-1/home.htm" />
+    <add key="epi:HelpUrl" value="http://webhelp.episerver.com/17-2/home.htm" />
   </appSettings>
   <system.web>
     <pages validateRequest="false" enableEventValidation="false"></pages>

diff --git a/Sources/EPiServer.Reference.Commerce.Manager/EPiServer.Reference.Commerce.Manager.csproj b/Sources/EPiServer.Reference.Commerce.Manager/EPiServer.Reference.Commerce.Manager.csproj
@@ -431,109 +431,109 @@
   </Target>
   <ItemGroup>
     <Reference Include="EPiServer.Business.Commerce, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\EPiServer.Business.Commerce.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.3\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.4.2\lib\net45\EPiServer.Commerce.Internal.Migration.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.3\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.4.2\lib\net45\Mediachase.BusinessFoundation.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.3\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.4.2\lib\net45\Mediachase.BusinessFoundation.Data.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.3\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.4.2\lib\net45\Mediachase.Commerce.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.3\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.4.2\lib\net45\Mediachase.Commerce.Marketing.Validators.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.3\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.4.2\lib\net45\Mediachase.Commerce.Plugins.Payment.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.3\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.4.2\lib\net45\Mediachase.Commerce.Plugins.Shipping.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.3\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.4.2\lib\net45\Mediachase.Commerce.Website.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.3\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.4.2\lib\net45\Mediachase.Commerce.Workflow.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.3\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.4.2\lib\net45\Mediachase.DataProvider.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.3\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.4.2\lib\net45\Mediachase.FileUploader.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.3\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.4.2\lib\net45\Mediachase.MetaDataPlus.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.3\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.4.2\lib\net45\Mediachase.Search.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.3\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.4.2\lib\net45\Mediachase.Search.Extensions.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.3\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.4.2\lib\net45\Mediachase.Search.LuceneSearchProvider.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.3\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.4.2\lib\net45\Mediachase.SqlDataProvider.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\Mediachase.SqlDataProvider.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.WebConsoleLib, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.WebConsoleLib.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.3\lib\net45\Mediachase.WebConsoleLib.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.ConsoleManager, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.CommerceManager.10.4.2\lib\net45\Mediachase.ConsoleManager.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.CommerceManager.10.4.3\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.4.2\lib\net45\AjaxControlToolkit.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.3\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.4.2\lib\net45\ComponentArt.Web.UI.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.CommerceManager.10.4.3\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.4.2\lib\net45\nsoftware.IBizPay.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.3\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.4.2\lib\net45\RssToolkit.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.CommerceManager.10.4.3\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.4.2\lib\net45\Validators.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.CommerceManager.10.4.3\lib\net45\Validators.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
-  <Import Project="..\..\packages\EPiServer.CommerceManager.10.4.2\build\EPiServer.CommerceManager.targets"
-    Condition="Exists('..\..\packages\EPiServer.CommerceManager.10.4.2\build\EPiServer.CommerceManager.targets')"/>
+  <Import Project="..\..\packages\EPiServer.CommerceManager.10.4.3\build\EPiServer.CommerceManager.targets"
+    Condition="Exists('..\..\packages\EPiServer.CommerceManager.10.4.3\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.4.2\build\EPiServer.CommerceManager.targets')"
-      Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\EPiServer.CommerceManager.10.4.2\build\EPiServer.CommerceManager.targets'))"/>
+    <Error Condition="!Exists('..\..\packages\EPiServer.CommerceManager.10.4.3\build\EPiServer.CommerceManager.targets')"
+      Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\EPiServer.CommerceManager.10.4.3\build\EPiServer.CommerceManager.targets'))"/>
   </Target>
 </Project>
diff --git a/Sources/EPiServer.Reference.Commerce.Manager/packages.config b/Sources/EPiServer.Reference.Commerce.Manager/packages.config
@@ -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.4.2" targetFramework="net452"/>
-  <package id="EPiServer.CommerceManager" version="10.4.2" targetFramework="net452"/>
+  <package id="EPiServer.Commerce.Core" version="10.4.3" targetFramework="net452"/>
+  <package id="EPiServer.CommerceManager" version="10.4.3" targetFramework="net452"/>
 </packages>