From 8979f782aaee366bfa945ed872bfb4d78e8257f4 Mon Sep 17 00:00:00 2001 From: Ian Tangney Date: Wed, 16 Nov 2016 18:19:35 -0500 Subject: [PATCH 1/5] Include nuget packages needed to build QueryMaster --- QueryMaster/QueryMaster.csproj | 11 ++++++++--- QueryMaster/packages.config | 5 +++++ 2 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 QueryMaster/packages.config diff --git a/QueryMaster/QueryMaster.csproj b/QueryMaster/QueryMaster.csproj index fa6f23d..9b8871a 100644 --- a/QueryMaster/QueryMaster.csproj +++ b/QueryMaster/QueryMaster.csproj @@ -38,13 +38,17 @@ bin\Release\QueryMaster.xml + + ..\Solution\packages\DotNetZip.1.10.1\lib\net20\DotNetZip.dll + True + False ExternalBin\Ionic.BZip2.dll - - False - ExternalBin\Newtonsoft.Json.dll + + ..\Solution\packages\Newtonsoft.Json.9.0.1\lib\net40\Newtonsoft.Json.dll + True @@ -184,6 +188,7 @@ + Always diff --git a/QueryMaster/packages.config b/QueryMaster/packages.config new file mode 100644 index 0000000..f4c767b --- /dev/null +++ b/QueryMaster/packages.config @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file From bdbd8b5e0006ab1d70fbd1a00e998af5b59e5397 Mon Sep 17 00:00:00 2001 From: Ian Tangney Date: Wed, 16 Nov 2016 18:22:03 -0500 Subject: [PATCH 2/5] Disable SignManifests property that was preventing build in Squad.Admin.Console --- Squad.Admin.Console/Squad.Admin.Console.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Squad.Admin.Console/Squad.Admin.Console.csproj b/Squad.Admin.Console/Squad.Admin.Console.csproj index 20af2de..bba6c54 100644 --- a/Squad.Admin.Console/Squad.Admin.Console.csproj +++ b/Squad.Admin.Console/Squad.Admin.Console.csproj @@ -65,7 +65,7 @@ true - true + false From 6f8cc67173d4cf5e7330c9bac5cf3ab5a6dbe272 Mon Sep 17 00:00:00 2001 From: Ian Tangney Date: Wed, 16 Nov 2016 19:06:39 -0500 Subject: [PATCH 3/5] Handle case where command file is not found --- Squad.Admin.Console/Forms/frmMainConsole.cs | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/Squad.Admin.Console/Forms/frmMainConsole.cs b/Squad.Admin.Console/Forms/frmMainConsole.cs index b4785c8..5cdfb1f 100644 --- a/Squad.Admin.Console/Forms/frmMainConsole.cs +++ b/Squad.Admin.Console/Forms/frmMainConsole.cs @@ -298,11 +298,21 @@ private void EnableLoginControls(bool enable) /// private void LoadAutocompleteCommands() { + string commandFilePath = AppDomain.CurrentDomain.BaseDirectory + "Commands.dat"; + List commands; AutoCompleteStringCollection commandList = new AutoCompleteStringCollection(); - string[] commands = File.ReadAllLines(AppDomain.CurrentDomain.BaseDirectory + "Commands.dat"); + try + { + commands = new List(File.ReadAllLines(commandFilePath)); + } + catch (Exception ex) + { + MessageBox.Show("Error occurred trying to open the Commands file!\r\nError: " + ex.Message, "Exception", MessageBoxButtons.OK, MessageBoxIcon.Asterisk); + return; + } - for (int i = 0; i < commands.Length; i++) + for (int i = 0; i < commands.Count; i++) { commandList.Add(commands[i].Trim()); } @@ -315,10 +325,11 @@ private void LoadAutocompleteCommands() /// private void LoadContextMenuItems() { + string reasonsFilePath = AppDomain.CurrentDomain.BaseDirectory + "MenuReasons.xml"; // Load the xml file with the menu reasons try { - menuReasons = XDocument.Load(@"MenuReasons.xml"); + menuReasons = XDocument.Load(reasonsFilePath); } catch(Exception ex) { From efb280d6a344b003a2146b5a63fe9bc4a5f2e1f5 Mon Sep 17 00:00:00 2001 From: Ian Tangney Date: Wed, 16 Nov 2016 19:15:08 -0500 Subject: [PATCH 4/5] Update build actions on Commands.dat and MenuReasons.xml to copy if newer. Updated paths respectively. --- Squad.Admin.Console/Forms/frmMainConsole.cs | 4 ++-- Squad.Admin.Console/Squad.Admin.Console.csproj | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Squad.Admin.Console/Forms/frmMainConsole.cs b/Squad.Admin.Console/Forms/frmMainConsole.cs index 5cdfb1f..fc511ad 100644 --- a/Squad.Admin.Console/Forms/frmMainConsole.cs +++ b/Squad.Admin.Console/Forms/frmMainConsole.cs @@ -298,7 +298,7 @@ private void EnableLoginControls(bool enable) /// private void LoadAutocompleteCommands() { - string commandFilePath = AppDomain.CurrentDomain.BaseDirectory + "Commands.dat"; + string commandFilePath = AppDomain.CurrentDomain.BaseDirectory + "Assets\\Commands.dat"; List commands; AutoCompleteStringCollection commandList = new AutoCompleteStringCollection(); @@ -325,7 +325,7 @@ private void LoadAutocompleteCommands() /// private void LoadContextMenuItems() { - string reasonsFilePath = AppDomain.CurrentDomain.BaseDirectory + "MenuReasons.xml"; + string reasonsFilePath = AppDomain.CurrentDomain.BaseDirectory + "Assets\\MenuReasons.xml"; // Load the xml file with the menu reasons try { diff --git a/Squad.Admin.Console/Squad.Admin.Console.csproj b/Squad.Admin.Console/Squad.Admin.Console.csproj index bba6c54..8b76caa 100644 --- a/Squad.Admin.Console/Squad.Admin.Console.csproj +++ b/Squad.Admin.Console/Squad.Admin.Console.csproj @@ -140,7 +140,9 @@ Resources.resx True - + + PreserveNewest + SettingsSingleFileGenerator @@ -170,7 +172,9 @@ - + + PreserveNewest + From 822ac8d304bc71f8a768853ae5f8f5f6e2a14de7 Mon Sep 17 00:00:00 2001 From: Ian Tangney Date: Wed, 16 Nov 2016 19:37:49 -0500 Subject: [PATCH 5/5] Disabled clickonce appmanifests --- Squad.Admin.Console/Squad.Admin.Console.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Squad.Admin.Console/Squad.Admin.Console.csproj b/Squad.Admin.Console/Squad.Admin.Console.csproj index 8b76caa..f127cd2 100644 --- a/Squad.Admin.Console/Squad.Admin.Console.csproj +++ b/Squad.Admin.Console/Squad.Admin.Console.csproj @@ -62,7 +62,7 @@ Squad.Admin.Console_TemporaryKey.pfx - true + false false