Merge remote-tracking branch 'origin/v1.6.0' into main

afaniuolo · Oct 7, 2022 · c33d270 · c33d270
2 parents d90904d + 1125b8c
commit c33d270
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -19,7 +19,8 @@ The following compatibility table lists the correct version of the tool that sho
 | Sitecore 9.1.x<br>Sitecore 9.2 | v1.2.2  | [download](https://github.com/afaniuolo/WFFM-Conversion-Tool/releases/tag/v1.2.2) |
 | Sitecore 9.3 | v1.3.4 | [download](https://github.com/afaniuolo/WFFM-Conversion-Tool/releases/tag/v1.3.4) |
 | Sitecore 10.0.x | v1.4.0 | [download](https://github.com/afaniuolo/WFFM-Conversion-Tool/releases/tag/v1.4.0) |
-| Sitecore 10.1+ | v1.5.0 | [download](https://github.com/afaniuolo/WFFM-Conversion-Tool/releases/tag/v1.5.0) |
+| Sitecore 10.1 | v1.5.0 | [download](https://github.com/afaniuolo/WFFM-Conversion-Tool/releases/tag/v1.5.0) |
+| Sitecore 10.2+ | v1.6.0 | [download](https://github.com/afaniuolo/WFFM-Conversion-Tool/releases/tag/v1.6.0) |
 
 
 ## Technical Requirements

diff --git a/src/WFFM.ConversionTool.Extensions.SitecoreFormsExtensions/Properties/AssemblyInfo.cs b/src/WFFM.ConversionTool.Extensions.SitecoreFormsExtensions/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
+[assembly: AssemblyVersion("1.6.0.0")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
diff --git a/src/WFFM.ConversionTool.Library/Properties/AssemblyInfo.cs b/src/WFFM.ConversionTool.Library/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
+[assembly: AssemblyVersion("1.6.0.0")]
+[assembly: AssemblyFileVersion("1.6.0.0")]
diff --git a/src/WFFM.ConversionTool.Library/WFFM.ConversionTool.Library.csproj b/src/WFFM.ConversionTool.Library/WFFM.ConversionTool.Library.csproj
@@ -54,8 +54,8 @@
     <Reference Include="MongoDB.Driver.Core, Version=2.8.1.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\MongoDB.Driver.Core.2.8.1\lib\net452\MongoDB.Driver.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="SimpleInjector, Version=4.4.3.0, Culture=neutral, PublicKeyToken=984cb50dea722e99, processorArchitecture=MSIL">
       <HintPath>..\..\packages\SimpleInjector.4.4.3\lib\net45\SimpleInjector.dll</HintPath>

diff --git a/src/WFFM.ConversionTool.Library/packages.config b/src/WFFM.ConversionTool.Library/packages.config
@@ -7,7 +7,7 @@
   <package id="MongoDB.Bson" version="2.8.1" targetFramework="net471" />
   <package id="MongoDB.Driver" version="2.8.1" targetFramework="net471" />
   <package id="MongoDB.Driver.Core" version="2.8.1" targetFramework="net471" />
-  <package id="Newtonsoft.Json" version="12.0.1" targetFramework="net471" />
+  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net471" />
   <package id="SimpleInjector" version="4.4.3" targetFramework="net471" />
   <package id="System.Buffers" version="4.4.0" targetFramework="net471" />
   <package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net471" />

diff --git a/src/WFFM.ConversionTool/Metadata/Form.json b/src/WFFM.ConversionTool/Metadata/Form.json
@@ -14,7 +14,7 @@
             {
                 "fieldType": "shared",
                 "destFieldId": "{FCE03B41-4CBB-4F7F-920F-FF04F12FA896}",
-                "value": "jquery-2.1.3.min.js|jquery.validate.min.js|jquery.validate.unobtrusive.min.js|jquery.unobtrusive-ajax.min.js|form.validate.js|form.tracking.js|form.conditions.js"
+                "value": "jquery-3.4.1.min.js|jquery.validate.min.js|jquery.validate.unobtrusive.min.js|jquery.unobtrusive-ajax.min.js|form.validate.js|form.tracking.js|form.conditions.js"
             },
             {
                 "fieldType": "shared",

diff --git a/src/WFFM.ConversionTool/Program.cs b/src/WFFM.ConversionTool/Program.cs
@@ -62,7 +62,7 @@ static void Main(string[] args)
 			System.Console.WriteLine();
 			System.Console.WriteLine("  ***********************************************************************");
 			System.Console.WriteLine("  *                                                                     *");
-			System.Console.WriteLine("  *                 WFFM Conversion Tool - v1.5.0                       *");
+			System.Console.WriteLine("  *                 WFFM Conversion Tool - v1.6.0                       *");
 			System.Console.WriteLine("  *                                                                     *");
 			System.Console.WriteLine("  ***********************************************************************");
 			System.Console.WriteLine();

diff --git a/src/WFFM.ConversionTool/Properties/AssemblyInfo.cs b/src/WFFM.ConversionTool/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
+[assembly: AssemblyVersion("1.6.0.0")]
+[assembly: AssemblyFileVersion("1.6.0.0")]