Skip to content
This repository was archived by the owner on Jan 19, 2021. It is now read-only.

Minor changes #1

Open
IanTangney wants to merge 5 commits into
base: develop
Choose a base branch
from
Open

Minor changes #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8979f78
Include nuget packages needed to build QueryMaster
IanTangney Nov 16, 2016
bdbd8b5
Disable SignManifests property that was preventing build in Squad.Adm…
IanTangney Nov 16, 2016
6f8cc67
Handle case where command file is not found
IanTangney Nov 17, 2016
efb280d
Update build actions on Commands.dat and MenuReasons.xml to copy if n…
IanTangney Nov 17, 2016
822ac8d
Disabled clickonce appmanifests
IanTangney Nov 17, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions QueryMaster/QueryMaster.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,17 @@
<DocumentationFile>bin\Release\QueryMaster.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="DotNetZip, Version=1.10.1.0, Culture=neutral, PublicKeyToken=6583c7c814667745, processorArchitecture=MSIL">
<HintPath>..\Solution\packages\DotNetZip.1.10.1\lib\net20\DotNetZip.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Ionic.BZip2, Version=1.9.1.8, Culture=neutral, PublicKeyToken=edbe51ad942a3f5c, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>ExternalBin\Ionic.BZip2.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>ExternalBin\Newtonsoft.Json.dll</HintPath>
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\Solution\packages\Newtonsoft.Json.9.0.1\lib\net40\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down Expand Up @@ -184,6 +188,7 @@
</ItemGroup>
<ItemGroup>
<None Include="ClassDiagram1.cd" />
<None Include="packages.config" />
<None Include="QueryMaster.license">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
Expand Down
5 changes: 5 additions & 0 deletions QueryMaster/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="DotNetZip" version="1.10.1" targetFramework="net40" />
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net40" />
</packages>
17 changes: 14 additions & 3 deletions Squad.Admin.Console/Forms/frmMainConsole.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,11 +298,21 @@ private void EnableLoginControls(bool enable)
/// </summary>
private void LoadAutocompleteCommands()
{
string commandFilePath = AppDomain.CurrentDomain.BaseDirectory + "Assets\\Commands.dat";
List<string> commands;
AutoCompleteStringCollection commandList = new AutoCompleteStringCollection();

string[] commands = File.ReadAllLines(AppDomain.CurrentDomain.BaseDirectory + "Commands.dat");
try
{
commands = new List<string>(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());
}
Expand All @@ -315,10 +325,11 @@ private void LoadAutocompleteCommands()
/// </summary>
private void LoadContextMenuItems()
{
string reasonsFilePath = AppDomain.CurrentDomain.BaseDirectory + "Assets\\MenuReasons.xml";
// Load the xml file with the menu reasons
try
{
menuReasons = XDocument.Load(@"MenuReasons.xml");
menuReasons = XDocument.Load(reasonsFilePath);
}
catch(Exception ex)
{
Expand Down
12 changes: 8 additions & 4 deletions Squad.Admin.Console/Squad.Admin.Console.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,10 @@
<ManifestKeyFile>Squad.Admin.Console_TemporaryKey.pfx</ManifestKeyFile>
</PropertyGroup>
<PropertyGroup>
<GenerateManifests>true</GenerateManifests>
<GenerateManifests>false</GenerateManifests>
</PropertyGroup>
<PropertyGroup>
<SignManifests>true</SignManifests>
<SignManifests>false</SignManifests>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
Expand Down Expand Up @@ -140,7 +140,9 @@
<DependentUpon>Resources.resx</DependentUpon>
<DesignTime>True</DesignTime>
</Compile>
<None Include="Assets\Commands.dat" />
<None Include="Assets\Commands.dat">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="packages.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
Expand Down Expand Up @@ -170,7 +172,9 @@
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<Content Include="Assets\MenuReasons.xml" />
<None Include="Assets\MenuReasons.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<Content Include="Assets\settings.png" />
<Content Include="Assets\Squad.ico" />
<Content Include="Assets\SquadLoginBanner.png" />
Expand Down