Version update

Author: RoelantVos

Virtual_EDW/CustomTabPage.cs

@@ -4,6 +4,7 @@
 using System.Drawing;
 using System.IO;
 using System.Linq;
+using System.Text.Json.Nodes;
 using System.Text.RegularExpressions;
 using System.Windows.Forms;
 using HandlebarsDotNet;
@@ -593,7 +594,12 @@ private void GenerateFromTemplate()
                     {
                         // Compile the template, and merge it with the metadata.
                         var template = Handlebars.Compile(localRichTextBoxGenerationTemplate.Text);
-                        var result = template(dataObjectMappingList);
+
+                        //string serializedMapping = System.Text.Json.JsonSerializer.Serialize(dataObjectMappingList);
+                        string jsonInput = File.ReadAllText(dataObjectMappingList.metadataFileName);
+                        JsonNode deserializedMapping = System.Text.Json.JsonSerializer.Deserialize<JsonNode>(jsonInput);
+
+                        var result = template(deserializedMapping);
 
                         // Check if the metadata needs to be displayed.
                         if (DisplayJsonFlag)

Virtual_EDW/Form_Main.cs

@@ -31,7 +31,7 @@ public FormMain()
             InitializeComponent();
 
             // Set the version of the build for everything
-            const string versionNumberForApplication = "v1.6.11";
+            const string versionNumberForApplication = "v1.6.12";
 
             Text = $"Virtual Data Warehouse - {versionNumberForApplication}";
             labelWelcome.Text = $"{labelWelcome.Text} - {versionNumberForApplication}";
@@ -649,7 +649,7 @@ internal List<LocalTemplate> GetMetadata()
                                 // Validate the file contents against the schema definition.
                                 if (File.Exists(Application.StartupPath + @"\Schema\" + GlobalParameters.JsonSchemaForDataWarehouseAutomationFileName))
                                 {
-                                    var result = JsonHandling.ValidateJsonFileAgainstSchema(Application.StartupPath + @"\Schema\" + GlobalParameters.JsonSchemaForDataWarehouseAutomationFileName, fileName);
+                                    var result = JsonValidation.ValidateJsonFileAgainstSchema(Application.StartupPath + @"\Schema\" + GlobalParameters.JsonSchemaForDataWarehouseAutomationFileName, fileName);
 
                                     foreach (var error in result.Errors)
                                     {

Virtual_EDW/Virtual_Data_Warehouse.csproj

@@ -572,7 +572,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="DataWarehouseAutomation">
-      <Version>1.2.5</Version>
+      <Version>1.3.3</Version>
     </PackageReference>
     <PackageReference Include="Handlebars.Net">
       <Version>2.1.4</Version>
@@ -581,17 +581,17 @@
       <Version>5.1.1</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Identity.Client">
-      <Version>4.53.0</Version>
+      <Version>4.55.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.SqlServer.SqlManagementObjects">
-      <Version>170.13.0</Version>
+      <Version>170.18.0</Version>
     </PackageReference>
     <PackageReference Include="Newtonsoft.Json">
       <Version>13.0.3</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.421302">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.1" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.4" />
   </ItemGroup>
 </Project>

Virtual_EDW_Installer/Virtual_EDW_Installer.vdproj

@@ -133,7 +133,7 @@
                 {
                 "Name" = "8:.NET Framework"
                 "Message" = "8:[VSDNETMSG]"
-                "FrameworkVersion" = "8:v4.6.1 "
+                "FrameworkVersion" = "8:v4.6.1  "
                 "AllowLaterVersions" = "11:FALSE"
                 "InstallUrl" = "8:http://go.microsoft.com/fwlink/?LinkId=671728"
                 }
@@ -281,15 +281,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:Virtual Data Warehouse"
-        "ProductCode" = "8:{4AF00EF6-A639-439D-8013-7D626835C38A}"
-        "PackageCode" = "8:{220173E5-C92A-434F-8C45-FBE967536476}"
+        "ProductCode" = "8:{DD960107-BA0D-4688-8E13-E6AE94F99C4D}"
+        "PackageCode" = "8:{0DB81DFB-67C0-459F-8217-BD7FB3D86EB7}"
         "UpgradeCode" = "8:{CAA37576-CF3A-4799-AF70-44CB58934E54}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:FALSE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:TRUE"
-        "ProductVersion" = "8:1.6.11"
+        "ProductVersion" = "8:1.6.12"
         "Manufacturer" = "8:RoelantVos"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:http://www.roelantvos.com/blog"