Skip to content

Commit 74553ec

Browse files
RoelantVosRoelantVos
committed
Bug fixes; SQL could not be generated anymore due to issue with Microsoft.Data.SqlClient library. This was just upgraded to a newer version. Work-around in place.
1 parent 2a0c6ad commit 74553ec

15 files changed

+12176
-1355
lines changed

‎Virtual_EDW/App.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
</dependentAssembly>
6060
<dependentAssembly>
6161
<assemblyIdentity name="Microsoft.Identity.Client" publicKeyToken="0a613f4dd989e8ae" culture="neutral" />
62-
<bindingRedirect oldVersion="0.0.0.0-4.22.0.0" newVersion="4.22.0.0" />
62+
<bindingRedirect oldVersion="0.0.0.0-4.23.0.0" newVersion="4.23.0.0" />
6363
</dependentAssembly>
6464
</assemblyBinding>
6565
</runtime>

‎Virtual_EDW/CustomTabPage.cs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -46,21 +46,21 @@ class CustomTabPage : TabPage
4646
readonly TextBox _localTextBoxFilter;
4747

4848
// Objects on the sub Tab Control (on the main Tab Page)
49-
TabControl localTabControl;
49+
readonly TabControl localTabControl;
5050

5151
readonly TabPage tabPageGenerationOutput;
52-
RichTextBox localRichTextBoxGenerationOutput;
52+
readonly RichTextBox localRichTextBoxGenerationOutput;
5353

5454
readonly TabPage tabPageGenerationPattern;
5555
readonly Label localLabelActivePattern;
5656
readonly Label localLabelFilePath;
57-
Label localLabelFullFilePath;
58-
Label localLabelActiveConnectionKey;
59-
Label localLabelActiveConnectionKeyValue;
57+
readonly Label localLabelFullFilePath;
58+
readonly Label localLabelActiveConnectionKey;
59+
readonly Label localLabelActiveConnectionKeyValue;
6060

61-
ComboBox localComboBoxGenerationPattern;
62-
RichTextBox localRichTextBoxGenerationPattern;
63-
Button localSavePattern;
61+
readonly ComboBox localComboBoxGenerationPattern;
62+
readonly RichTextBox localRichTextBoxGenerationPattern;
63+
readonly Button localSavePattern;
6464

6565
#region Main Form CheckBox value handling
6666
// Values for the checkboxes from main form
@@ -79,17 +79,17 @@ public void ApplySyntaxHighlightingForHandlebars()
7979
TextHandling.SyntaxHighlightHandlebars(localRichTextBoxGenerationPattern, localRichTextBoxGenerationPattern.Text.TrimEnd());
8080
}
8181

82-
public void setDisplayJsonFlag(bool value)
82+
public void SetDisplayJsonFlag(bool value)
8383
{
8484
DisplayJsonFlag = value;
8585
}
8686

87-
public void setGenerateInDatabaseFlag(bool value)
87+
public void SetGenerateInDatabaseFlag(bool value)
8888
{
8989
GenerateInDatabaseFlag = value;
9090
}
9191

92-
public void setSaveOutputFileFlag(bool value)
92+
public void SetSaveOutputFileFlag(bool value)
9393
{
9494
SaveOutputFileFlag = value;
9595
}

‎Virtual_EDW/Form_About.Designer.cs‎

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

‎Virtual_EDW/Form_About.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System;
22
using System.Data;
3-
using System.Data.SqlClient;
3+
using Microsoft.Data.SqlClient;
44
using System.Diagnostics;
55
using System.Text;
66
using System.Windows.Forms;
@@ -19,12 +19,12 @@ public FormAbout(FormMain parent)
1919
FormBorderStyle = FormBorderStyle.FixedSingle;
2020
}
2121

22-
private void buttonClose_Click(object sender, EventArgs e)
22+
private void ButtonClose_Click(object sender, EventArgs e)
2323
{
2424
Close();
2525
}
2626

27-
private void button1_Click(object sender, EventArgs e)
27+
private void Button1_Click(object sender, EventArgs e)
2828
{
2929
var conn = new SqlConnection {ConnectionString = TeamConfigurationSettings.MetadataConnection.CreateSqlServerConnectionString(false)};
3030

@@ -86,7 +86,7 @@ private void button1_Click(object sender, EventArgs e)
8686
}
8787
}
8888

89-
private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
89+
private void LinkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
9090
{
9191
// Specify that the link was visited.
9292
linkLabel1.LinkVisited = true;

‎Virtual_EDW/Form_Main.cs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -128,14 +128,14 @@ public FormMain()
128128

129129
foreach (CustomTabPage localCustomTabPage in localCustomTabPageList)
130130
{
131-
localCustomTabPage.setDisplayJsonFlag(true);
132-
localCustomTabPage.setDisplayJsonFlag(false);
131+
localCustomTabPage.SetDisplayJsonFlag(true);
132+
localCustomTabPage.SetDisplayJsonFlag(false);
133133

134-
localCustomTabPage.setGenerateInDatabaseFlag(true);
135-
localCustomTabPage.setGenerateInDatabaseFlag(false);
134+
localCustomTabPage.SetGenerateInDatabaseFlag(true);
135+
localCustomTabPage.SetGenerateInDatabaseFlag(false);
136136

137-
localCustomTabPage.setSaveOutputFileFlag(false);
138-
localCustomTabPage.setSaveOutputFileFlag(true);
137+
localCustomTabPage.SetSaveOutputFileFlag(false);
138+
localCustomTabPage.SetSaveOutputFileFlag(true);
139139
}
140140

141141
// Start monitoring the configuration directories for file changes
@@ -911,11 +911,11 @@ private void checkBoxGenerateInDatabase_CheckedChanged(object sender, EventArgs
911911
{
912912
if (checkBoxGenerateInDatabase.Checked)
913913
{
914-
localTabPage.setGenerateInDatabaseFlag(true);
914+
localTabPage.SetGenerateInDatabaseFlag(true);
915915
}
916916
else
917917
{
918-
localTabPage.setGenerateInDatabaseFlag(false);
918+
localTabPage.SetGenerateInDatabaseFlag(false);
919919
}
920920
}
921921
}
@@ -926,11 +926,11 @@ private void checkBoxGenerateJsonSchema_CheckedChanged(object sender, EventArgs
926926
{
927927
if (checkBoxGenerateJsonSchema.Checked)
928928
{
929-
localTabPage.setDisplayJsonFlag(true);
929+
localTabPage.SetDisplayJsonFlag(true);
930930
}
931931
else
932932
{
933-
localTabPage.setDisplayJsonFlag(false);
933+
localTabPage.SetDisplayJsonFlag(false);
934934
}
935935
}
936936
}
@@ -941,11 +941,11 @@ private void checkBoxSaveToFile_CheckedChanged(object sender, EventArgs e)
941941
{
942942
if (checkBoxSaveToFile.Checked)
943943
{
944-
localTabPage.setSaveOutputFileFlag(true);
944+
localTabPage.SetSaveOutputFileFlag(true);
945945
}
946946
else
947947
{
948-
localTabPage.setSaveOutputFileFlag(false);
948+
localTabPage.SetSaveOutputFileFlag(false);
949949
}
950950
}
951951
}

‎Virtual_EDW/InterfaceObjectModel.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using System;
22
using DataWarehouseAutomation;
3-
using Microsoft.Identity.Client;
43

54
namespace Virtual_Data_Warehouse
65
{

‎Virtual_EDW/Libraries/Microsoft.Data.SqlClient.SNI.x64.dll‎

499 KB
Binary file not shown.

‎Virtual_EDW/Libraries/Microsoft.Data.SqlClient.SNI.x86.dll‎

430 KB
Binary file not shown.

‎Virtual_EDW/Libraries/Microsoft.Data.SqlClient.dll‎

1.89 MB
Binary file not shown.

‎Virtual_EDW/Libraries/TEAM_Library.dll‎

-3 KB
Binary file not shown.

0 commit comments

Comments
 (0)