Skip to content

Commit 5611824

Browse files
author
Roelant Vos
committed
Minor changes for v1.6.14
1 parent 309a365 commit 5611824

7 files changed

Lines changed: 81 additions & 38 deletions

File tree

‎Virtual_EDW/CustomTabPage.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ public void SetItemList(Dictionary<string, VDW_DataObjectMappingList> itemList)
456456
CheckAllCheckBoxes();
457457
}
458458
}
459-
459+
460460
private void CheckAllCheckBoxes()
461461
{
462462
for (int x = 0; x <= _localCheckedListBox.Items.Count - 1; x++)

‎Virtual_EDW/Form_Main.Designer.cs‎

Lines changed: 35 additions & 18 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
@@ -33,7 +33,7 @@ public FormMain()
3333
InitializeComponent();
3434

3535
// Set the version of the build for everything
36-
const string versionNumberForApplication = "v1.6.13";
36+
const string versionNumberForApplication = "v1.6.14";
3737

3838
Text = $"Virtual Data Warehouse - {versionNumberForApplication}";
3939
labelWelcome.Text = $"{labelWelcome.Text} - {versionNumberForApplication}";
@@ -610,6 +610,9 @@ internal void InformUser(string text, EventTypes eventType)
610610
/// <returns></returns>
611611
internal List<LocalTemplate> GetMetadata()
612612
{
613+
614+
var hideDisabled = checkBoxHideDisabled.Checked;
615+
613616
#region Deserialisation
614617

615618
// Deserialise the Json files into a local List of Data Object Mappings (mappingList) for further use.
@@ -669,6 +672,21 @@ internal List<LocalTemplate> GetMetadata()
669672
var jsonInput = File.ReadAllText(fileName);
670673
deserialisedMapping = JsonConvert.DeserializeObject<VDW_DataObjectMappingList>(jsonInput);
671674

675+
// Remove any disabled mappings, if checkbox for this is active.
676+
var tempDOM = new List<DataObjectMapping>();
677+
foreach (var mapping in deserialisedMapping.DataObjectMappings)
678+
{
679+
if (hideDisabled && mapping.Enabled == false)
680+
{
681+
// Skip
682+
}
683+
else
684+
{
685+
tempDOM.Add(mapping);
686+
}
687+
}
688+
deserialisedMapping.DataObjectMappings = tempDOM;
689+
672690
if (deserialisedMapping != null)
673691
{
674692
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: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net7.0-windows</TargetFramework>
3+
<TargetFramework>net8.0-windows7.0</TargetFramework>
44
<OutputType>WinExe</OutputType>
55
<IsWebBootstrapper>false</IsWebBootstrapper>
66
<SccProjectName>SAK</SccProjectName>
@@ -581,29 +581,29 @@
581581
<PackageReference Include="DataWarehouseAutomation">
582582
<Version>1.3.4</Version>
583583
</PackageReference>
584-
<PackageReference Include="Fody" Version="6.8.0">
584+
<PackageReference Include="Fody" Version="6.8.1">
585585
<PrivateAssets>all</PrivateAssets>
586586
<IncludeAssets>runtime; compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
587587
</PackageReference>
588588
<PackageReference Include="Handlebars.Net">
589-
<Version>2.1.4</Version>
589+
<Version>2.1.6</Version>
590590
</PackageReference>
591-
<PackageReference Include="log4net" Version="2.0.15" />
591+
<PackageReference Include="log4net" Version="2.0.17" />
592592
<PackageReference Include="Microsoft.Data.SqlClient">
593-
<Version>5.1.2</Version>
593+
<Version>5.2.2</Version>
594594
</PackageReference>
595595
<PackageReference Include="Microsoft.Identity.Client">
596-
<Version>4.59.1</Version>
596+
<Version>4.64.0</Version>
597597
</PackageReference>
598598
<PackageReference Include="Microsoft.SqlServer.SqlManagementObjects">
599-
<Version>170.18.0</Version>
599+
<Version>171.30.0</Version>
600600
</PackageReference>
601601
<PackageReference Include="Newtonsoft.Json">
602602
<Version>13.0.3</Version>
603603
</PackageReference>
604604
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.421302">
605605
<PrivateAssets>all</PrivateAssets>
606606
</PackageReference>
607-
<PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.5" />
607+
<PackageReference Include="Microsoft.Windows.Compatibility" Version="8.0.8" />
608608
</ItemGroup>
609609
</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)