Skip to content

Commit

Permalink
Merge branch 'release/0.9.4'
Browse files Browse the repository at this point in the history
  • Loading branch information
AaronKelley committed Mar 28, 2016
2 parents 1efcd47 + b9765bf commit 07cb4ce
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 11 deletions.
4 changes: 2 additions & 2 deletions ssdumpConsole/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.9.3.0")]
[assembly: AssemblyFileVersion("0.9.3.0")]
[assembly: AssemblyVersion("0.9.4.0")]
[assembly: AssemblyFileVersion("0.9.4.0")]
4 changes: 2 additions & 2 deletions ssdumpGUI/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.9.3.0")]
[assembly: AssemblyFileVersion("0.9.3.0")]
[assembly: AssemblyVersion("0.9.4.0")]
[assembly: AssemblyFileVersion("0.9.4.0")]
3 changes: 1 addition & 2 deletions ssdumpGUI/ssdumpGUI.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 14 additions & 1 deletion ssdumpGUI/ssdumpGUI.cs
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,22 @@ private void exitToolStripMenuItem_Click(object sender, EventArgs e)

private void btnExecute_Click(object sender, EventArgs e)
{
string NewHostName = cboHostList.Text;

if (!Properties.Settings.Default.Hosts.Contains(NewHostName))
{
int NewSelectionIndex = Properties.Settings.Default.Hosts.Count;
Properties.Settings.Default.Hosts.Add(NewHostName);
Properties.Settings.Default.Save();
cboHostList.DataSource = null;
cboHostList.DataSource = Properties.Settings.Default.Hosts;
cboHostList.SelectedIndex = NewSelectionIndex;
}

saveFileDialog1.Filter = "sql files (*.sql)|*.sql|All files(*.*)|*.*";
saveFileDialog1.FilterIndex = 1;
saveFileDialog1.RestoreDirectory = true;
saveFileDialog1.FileName = txtDatabase.Text + "_" + DateTime.Now.ToString("yyyyMMdd_HHmmss");

if (saveFileDialog1.ShowDialog() == DialogResult.OK)
{
Expand All @@ -57,7 +70,7 @@ private void btnExecute_Click(object sender, EventArgs e)
{
processor.Execute();
processing.Close();
MessageBox.Show("SQL Server Dump Complete", "Complete", MessageBoxButtons.OK, MessageBoxIcon.Exclamation, MessageBoxDefaultButton.Button1);
MessageBox.Show("SQL Server Dump Complete", "Complete", MessageBoxButtons.OK, MessageBoxIcon.None, MessageBoxDefaultButton.Button1);
}
catch (Exception ex)
{
Expand Down
2 changes: 1 addition & 1 deletion ssdumpGUI/ssdumpGUI.resx
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,6 @@
<value>True</value>
</metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>48</value>
<value>113</value>
</metadata>
</root>
2 changes: 1 addition & 1 deletion ssdumpLibrary/DumpProcessor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public class DumpProcessor
/// <summary>
/// Program version.
/// </summary>
public static readonly string ProgramVersion = "0.9.3";
public static readonly string ProgramVersion = "0.9.4";

public string Host { get; set; }
public string Username { get; set; }
Expand Down
4 changes: 2 additions & 2 deletions ssdumpLibrary/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.9.3.0")]
[assembly: AssemblyFileVersion("0.9.3.0")]
[assembly: AssemblyVersion("0.9.4.0")]
[assembly: AssemblyFileVersion("0.9.4.0")]

0 comments on commit 07cb4ce

Please sign in to comment.