Skip to content

Commit

Permalink
Bug fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
jlechem committed Nov 11, 2020
1 parent 5e22f75 commit 856c09d
Show file tree
Hide file tree
Showing 9 changed files with 43 additions and 37 deletions.
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -293,3 +293,8 @@ IpViewer/bin/Debug/IpViewer.exe
IpViewer/bin/Debug/IpViewer.BusinessObject.dll
IpViewer/bin/Debug/IpViewer.BusinessObject.pdb
IpViewer/bin/Debug/IpViewer.exe
IpViewer/bin/Debug/logs/ip-viewer.log.2020-11-09
IpViewer/bin/Debug/logs/ip-viewer.log.2020-10-21
IpViewer/bin/Debug/IpViewer.exe
IpViewer/bin/Debug/IpViewer.BusinessObject.pdb
IpViewer/bin/Debug/IpViewer.BusinessObject.dll
24 changes: 12 additions & 12 deletions IpViewer/Form1.Designer.cs

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

1 change: 1 addition & 0 deletions IpViewer/Form1.cs
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ private void GetIpInformation()

_adapters = _adapterService.GetAdapters();

this.comboBoxAdapters.Items.Clear();
this.comboBoxAdapters.Items.AddRange(_adapters.Select(adapter => adapter.Name).ToArray());

var index = 0;
Expand Down
26 changes: 13 additions & 13 deletions IpViewer/Form1.resx
Original file line number Diff line number Diff line change
Expand Up @@ -1073,7 +1073,7 @@
<value>586, 386</value>
</data>
<data name="$this.Text" xml:space="preserve">
<value>IP Viewer 5.3</value>
<value>IP Viewer 5.5</value>
</data>
<data name="&gt;&gt;fileToolStripMenuItem.Name" xml:space="preserve">
<value>fileToolStripMenuItem</value>
Expand Down Expand Up @@ -1105,6 +1105,18 @@
<data name="&gt;&gt;toolStripSeparator1.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;viewPacketsToolStripMenuItem.Name" xml:space="preserve">
<value>viewPacketsToolStripMenuItem</value>
</data>
<data name="&gt;&gt;viewPacketsToolStripMenuItem.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;toolStripSeparator5.Name" xml:space="preserve">
<value>toolStripSeparator5</value>
</data>
<data name="&gt;&gt;toolStripSeparator5.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;copyInternalIPAddressToolStripMenuItem.Name" xml:space="preserve">
<value>copyInternalIPAddressToolStripMenuItem</value>
</data>
Expand Down Expand Up @@ -1195,18 +1207,6 @@
<data name="&gt;&gt;timer2.Type" xml:space="preserve">
<value>System.Windows.Forms.Timer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;viewPacketsToolStripMenuItem.Name" xml:space="preserve">
<value>viewPacketsToolStripMenuItem</value>
</data>
<data name="&gt;&gt;viewPacketsToolStripMenuItem.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;toolStripSeparator5.Name" xml:space="preserve">
<value>toolStripSeparator5</value>
</data>
<data name="&gt;&gt;toolStripSeparator5.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>Form1</value>
</data>
Expand Down
4 changes: 2 additions & 2 deletions IpViewer/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
// 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("5.4.0.0")]
[assembly: AssemblyFileVersion("5.4.0.0")]
[assembly: AssemblyVersion("5.5.0.0")]
[assembly: AssemblyFileVersion("5.5.0.0")]

[assembly: log4net.Config.XmlConfigurator(Watch = true)]
Binary file modified IpViewer/bin/Debug/IpViewer.BusinessObject.dll
Binary file not shown.
Binary file modified IpViewer/bin/Debug/IpViewer.BusinessObject.pdb
Binary file not shown.
Binary file modified IpViewer/bin/Debug/IpViewer.exe
Binary file not shown.
20 changes: 10 additions & 10 deletions IpViewerSetup/IpViewerSetup.vdproj
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_A3029CEFBBB9A4E61C9C2368356E70F3"
"OwnerKey" = "8:_5A729E7CA0734ADAB65060F8C6FD3870"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
Expand All @@ -94,19 +94,19 @@
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_5A729E7CA0734ADAB65060F8C6FD3870"
"OwnerKey" = "8:_3C89896575593647357D5E6009237AC8"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_3C89896575593647357D5E6009237AC8"
"OwnerKey" = "8:_F66AB60547179C0F292C9F48D90DC924"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_F66AB60547179C0F292C9F48D90DC924"
"OwnerKey" = "8:_A3029CEFBBB9A4E61C9C2368356E70F3"
"MsmSig" = "8:_UNDEFINED"
}
}
Expand Down Expand Up @@ -404,19 +404,19 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:Ip Viewer"
"ProductCode" = "8:{00240483-1CB4-42DB-8C15-AF7410B98CDF}"
"PackageCode" = "8:{595F9F17-19EC-43D0-8D22-32ABA3F19D95}"
"ProductCode" = "8:{56823122-63BF-4AEA-A50F-497FFEBE8D68}"
"PackageCode" = "8:{5F44C60A-6CA7-4493-8B76-F066F519576A}"
"UpgradeCode" = "8:{FB1872AE-CB72-4FD3-ABFC-9A4DEBC18763}"
"AspNetVersion" = "8:4.0.30319.0"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
"ProductVersion" = "8:5.4.0"
"ProductVersion" = "8:5.5.0"
"Manufacturer" = "8:Sasquatch Software"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:www.sasquatchsoftware.com"
"Title" = "8:Ip Viewer 5.3 Setup"
"Title" = "8:Ip Viewer 5.5 Setup"
"Subject" = "8:"
"ARPCONTACT" = "8:Sasquatch Software"
"Keywords" = "8:"
Expand Down Expand Up @@ -940,7 +940,7 @@
{
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_5A729E7CA0734ADAB65060F8C6FD3870"
{
"SourcePath" = "8:..\\IpViewer\\obj\\Release\\IpViewer.exe"
"SourcePath" = "8:..\\IpViewer\\obj\\Debug\\IpViewer.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_284512E110B248098676FD4E34E26138"
Expand Down Expand Up @@ -968,7 +968,7 @@
}
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_E2CF7C463AEE4B71860BE059B768C72A"
{
"SourcePath" = "8:..\\IpViewer\\obj\\Release\\IpViewer.exe"
"SourcePath" = "8:..\\IpViewer\\obj\\Debug\\IpViewer.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_284512E110B248098676FD4E34E26138"
Expand Down

0 comments on commit 856c09d

Please sign in to comment.