Skip to content

Commit 4caf579

Browse files
RoelantVosRoelantVos
committed
Merge branch 'main' into dev
2 parents 9312fc9 + 5611824 commit 4caf579

File tree

7 files changed

+82
-36
lines changed

7 files changed

+82
-36
lines changed

‎Virtual_EDW/CustomTabPage.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,7 @@ public void SetItemList(Dictionary<string, VdwDataObjectMappingList> itemList)
458458
CheckAllCheckBoxes();
459459
}
460460
}
461-
461+
462462
private void CheckAllCheckBoxes()
463463
{
464464
for (int x = 0; x <= _localCheckedListBox.Items.Count - 1; x++)

‎Virtual_EDW/Form_Main.Designer.cs

Lines changed: 35 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Virtual_EDW/Form_Main.cs

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public FormMain()
4343
InitializeComponent();
4444

4545
// Set the version of the build for everything
46-
const string versionNumberForApplication = "v2.0.0";
46+
const string versionNumberForApplication = "v1.6.14";
4747

4848
Text = $"Virtual Data Warehouse - {versionNumberForApplication}";
4949
labelWelcome.Text = $"{labelWelcome.Text} - {versionNumberForApplication}";
@@ -602,6 +602,9 @@ internal void InformUser(string text, EventTypes eventType)
602602
/// <returns></returns>
603603
internal List<LocalTemplate> GetMetadata()
604604
{
605+
606+
var hideDisabled = checkBoxHideDisabled.Checked;
607+
605608
#region Deserialisation
606609

607610
// Deserialise the Json files into a local List of Data Object Mappings (mappingList) for further use.
@@ -659,6 +662,21 @@ internal List<LocalTemplate> GetMetadata()
659662
var jsonInput = File.ReadAllText(fileName);
660663
VdwDataObjectMappingList deserialisedMapping = System.Text.Json.JsonSerializer.Deserialize<VdwDataObjectMappingList>(jsonInput);
661664

665+
// Remove any disabled mappings, if checkbox for this is active.
666+
var tempDOM = new List<DataObjectMapping>();
667+
foreach (var mapping in deserialisedMapping.DataObjectMappings)
668+
{
669+
if (hideDisabled && mapping.Enabled == false)
670+
{
671+
// Skip
672+
}
673+
else
674+
{
675+
tempDOM.Add(mapping);
676+
}
677+
}
678+
deserialisedMapping.DataObjectMappings = tempDOM;
679+
662680
if (deserialisedMapping != null)
663681
{
664682
deserialisedMapping.metadataFileName = fileName;

‎Virtual_EDW/Form_Main.resx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<root>
33
<!--
4-
Microsoft ResX Schema
4+
Microsoft ResX Schema
55
66
Version 2.0
77
@@ -48,7 +48,7 @@
4848
value : The object must be serialized with
4949
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
5050
: and then encoded with base64 encoding.
51-
51+
5252
mimetype: application/x-microsoft.net.object.soap.base64
5353
value : The object must be serialized with
5454
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
@@ -120,12 +120,12 @@
120120
<metadata name="menuStripMainMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
121121
<value>21, 13</value>
122122
</metadata>
123-
<metadata name="backgroundWorkerActivateMetadata.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
124-
<value>302, 13</value>
125-
</metadata>
126123
<metadata name="toolTipVdw.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
127124
<value>188, 13</value>
128125
</metadata>
126+
<metadata name="backgroundWorkerActivateMetadata.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
127+
<value>302, 13</value>
128+
</metadata>
129129
<data name="textBoxTeamConfigurationPath.ToolTip" xml:space="preserve">
130130
<value>This is the path pointing to the selection of configuration files created / managed by TEAM. There are typically more than one configuration file, because each environment will have its own configuration.</value>
131131
</data>

‎Virtual_EDW/GlobalSuppressions.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
// This file is used by Code Analysis to maintain SuppressMessage
2+
// attributes that are applied to this project.
3+
// Project-level suppressions either have no target or are given
4+
// a specific target and scoped to a namespace, type, member, etc.
5+
6+
using System.Diagnostics.CodeAnalysis;
7+
8+
[assembly: SuppressMessage("Interoperability", "CA1416:Validate platform compatibility", Justification = "<Pending>", Scope = "member", Target = "~M:Virtual_Data_Warehouse.FormMain.#ctor")]

‎Virtual_EDW/Virtual_Data_Warehouse.csproj

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -590,16 +590,21 @@
590590
</ItemGroup>
591591
<ItemGroup>
592592
<PackageReference Include="DataWarehouseAutomation">
593-
<Version>2.0.3</Version>
593+
<Version>1.3.4</Version>
594+
</PackageReference>
595+
<PackageReference Include="Fody" Version="6.8.1">
596+
<PrivateAssets>all</PrivateAssets>
597+
<IncludeAssets>runtime; compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
594598
</PackageReference>
595599
<PackageReference Include="Handlebars.Net">
596600
<Version>2.1.6</Version>
597601
</PackageReference>
602+
<PackageReference Include="log4net" Version="2.0.17" />
598603
<PackageReference Include="Microsoft.Data.SqlClient">
599-
<Version>5.2.0</Version>
604+
<Version>5.2.2</Version>
600605
</PackageReference>
601606
<PackageReference Include="Microsoft.Identity.Client">
602-
<Version>4.60.3</Version>
607+
<Version>4.64.0</Version>
603608
</PackageReference>
604609
<PackageReference Include="Microsoft.SqlServer.SqlManagementObjects">
605610
<Version>171.30.0</Version>
@@ -610,7 +615,6 @@
610615
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.421302">
611616
<PrivateAssets>all</PrivateAssets>
612617
</PackageReference>
613-
<PackageReference Include="Microsoft.Windows.Compatibility" Version="8.0.4" />
614-
<PackageReference Include="Snowflake.Data" Version="3.1.0" />
618+
<PackageReference Include="Microsoft.Windows.Compatibility" Version="8.0.8" />
615619
</ItemGroup>
616620
</Project>

‎Virtual_EDW_Installer/Virtual_EDW_Installer.vdproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@
133133
{
134134
"Name" = "8:.NET Framework"
135135
"Message" = "8:[VSDNETMSG]"
136-
"FrameworkVersion" = "8:v4.6.1 "
136+
"FrameworkVersion" = "8:v4.6.1 "
137137
"AllowLaterVersions" = "11:FALSE"
138138
"InstallUrl" = "8:http://go.microsoft.com/fwlink/?LinkId=671728"
139139
}
@@ -281,15 +281,15 @@
281281
{
282282
"Name" = "8:Microsoft Visual Studio"
283283
"ProductName" = "8:Virtual Data Warehouse"
284-
"ProductCode" = "8:{391F8171-F17F-418E-9CAD-0DE42A6BC8E4}"
285-
"PackageCode" = "8:{D4951D77-3345-4B4C-BBEE-1734FA6ED277}"
284+
"ProductCode" = "8:{7D902A64-DD45-4D4B-AC48-7D338A49B9E6}"
285+
"PackageCode" = "8:{4DB58755-F102-4D13-8D49-F48DC517D680}"
286286
"UpgradeCode" = "8:{CAA37576-CF3A-4799-AF70-44CB58934E54}"
287287
"AspNetVersion" = "8:4.0.30319.0"
288288
"RestartWWWService" = "11:FALSE"
289289
"RemovePreviousVersions" = "11:FALSE"
290290
"DetectNewerInstalledVersion" = "11:TRUE"
291291
"InstallAllUsers" = "11:TRUE"
292-
"ProductVersion" = "8:1.6.13"
292+
"ProductVersion" = "8:1.6.14"
293293
"Manufacturer" = "8:RoelantVos"
294294
"ARPHELPTELEPHONE" = "8:"
295295
"ARPHELPLINK" = "8:http://www.roelantvos.com/blog"
@@ -859,7 +859,7 @@
859859
}
860860
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_ABC11E1304B84CA296DCF82E96C692AE"
861861
{
862-
"SourcePath" = "8:..\\Virtual_EDW\\obj\\Debug\\net7.0-windows\\apphost.exe"
862+
"SourcePath" = "8:..\\Virtual_EDW\\obj\\Debug\\net8.0-windows7.0\\apphost.exe"
863863
"TargetName" = "8:"
864864
"Tag" = "8:"
865865
"Folder" = "8:_6F24B026334B448F96107EBD85D46D7A"

0 commit comments

Comments
 (0)