Skip to content

1.8.1.0 #153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Oct 25, 2018
Merged

1.8.1.0 #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8377235
Debug info removed, close #143
BornToBeRoot Oct 23, 2018
8d5bffc
Close #152
BornToBeRoot Oct 23, 2018
bba03e0
Update to 1.8.1.0
BornToBeRoot Oct 23, 2018
bb80186
Debug info removed
BornToBeRoot Oct 23, 2018
87cad9c
TextBox style changed
BornToBeRoot Oct 25, 2018
407ff6e
Error not resolved, but app will not crash
BornToBeRoot Oct 25, 2018
954aed1
Update
BornToBeRoot Oct 25, 2018
29d8749
1.8.1.0
BornToBeRoot Oct 25, 2018
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
112 changes: 21 additions & 91 deletions Source/NETworkManager.Setup/NETworkManager.Setup.vdproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@
"Entry"
{
"MsmKey" = "8:_287F82846E33E6F26968C7B256EF09F8"
"OwnerKey" = "8:_330E8E6DA8ED4B773D59A1586EC8F437"
"OwnerKey" = "8:_48ACD967FDBF43AEAF73122414146A86"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_287F82846E33E6F26968C7B256EF09F8"
"OwnerKey" = "8:_48ACD967FDBF43AEAF73122414146A86"
"OwnerKey" = "8:_330E8E6DA8ED4B773D59A1586EC8F437"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
Expand Down Expand Up @@ -88,13 +88,13 @@
"Entry"
{
"MsmKey" = "8:_9A8619402B1C850D44680EEA483C9C4A"
"OwnerKey" = "8:_AD7C559AAEBD0DFD0B0A135B65E2A071"
"OwnerKey" = "8:_330E8E6DA8ED4B773D59A1586EC8F437"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_9A8619402B1C850D44680EEA483C9C4A"
"OwnerKey" = "8:_330E8E6DA8ED4B773D59A1586EC8F437"
"OwnerKey" = "8:_AD7C559AAEBD0DFD0B0A135B65E2A071"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
Expand Down Expand Up @@ -154,85 +154,85 @@
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_F9CAC28BFA2FE24D3D55237357C2D7B6"
"OwnerKey" = "8:_CAE55A6A5A10C449B04915201740D438"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_AD7C559AAEBD0DFD0B0A135B65E2A071"
"OwnerKey" = "8:_EE6BFCCFD10E229CA82C9B6854A3FE17"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_330E8E6DA8ED4B773D59A1586EC8F437"
"OwnerKey" = "8:_31205BBAB900BF6933FE71AE79EC0061"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_47CE91384CFA30189E66E0927B51A477"
"OwnerKey" = "8:_6A57510865BA59B777DFC86A45E2DDDB"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_39FE71C6A9E783ED61B525EA2D4C772D"
"OwnerKey" = "8:_DF7090C238243AA0348DC046E88FDD49"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_4D64F059BE1802EEF044CE73194E762B"
"OwnerKey" = "8:_B2D12C55ED7E4372B6238A6AE059FF72"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_9A8619402B1C850D44680EEA483C9C4A"
"OwnerKey" = "8:_287F82846E33E6F26968C7B256EF09F8"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_287F82846E33E6F26968C7B256EF09F8"
"OwnerKey" = "8:_9A8619402B1C850D44680EEA483C9C4A"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_B2D12C55ED7E4372B6238A6AE059FF72"
"OwnerKey" = "8:_4D64F059BE1802EEF044CE73194E762B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_DF7090C238243AA0348DC046E88FDD49"
"OwnerKey" = "8:_39FE71C6A9E783ED61B525EA2D4C772D"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_6A57510865BA59B777DFC86A45E2DDDB"
"OwnerKey" = "8:_47CE91384CFA30189E66E0927B51A477"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_31205BBAB900BF6933FE71AE79EC0061"
"OwnerKey" = "8:_330E8E6DA8ED4B773D59A1586EC8F437"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_EE6BFCCFD10E229CA82C9B6854A3FE17"
"OwnerKey" = "8:_AD7C559AAEBD0DFD0B0A135B65E2A071"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_CAE55A6A5A10C449B04915201740D438"
"OwnerKey" = "8:_F9CAC28BFA2FE24D3D55237357C2D7B6"
"MsmSig" = "8:_UNDEFINED"
}
}
Expand Down Expand Up @@ -337,11 +337,6 @@
"AssemblyAsmDisplayName" = "8:System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_287F82846E33E6F26968C7B256EF09F8"
{
"Name" = "8:System.Windows.Interactivity.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:System.Windows.Interactivity.dll"
"TargetName" = "8:"
Expand All @@ -368,11 +363,6 @@
"AssemblyAsmDisplayName" = "8:System.Net.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
"ScatterAssemblies"
{
"_31205BBAB900BF6933FE71AE79EC0061"
{
"Name" = "8:System.Net.Http.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:System.Net.Http.dll"
"TargetName" = "8:"
Expand All @@ -399,11 +389,6 @@
"AssemblyAsmDisplayName" = "8:MahApps.Metro, Version=1.6.5.1, Culture=neutral, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_330E8E6DA8ED4B773D59A1586EC8F437"
{
"Name" = "8:MahApps.Metro.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:MahApps.Metro.dll"
"TargetName" = "8:"
Expand All @@ -430,11 +415,6 @@
"AssemblyAsmDisplayName" = "8:System.Net.IPNetwork, Version=2.1.2.0, Culture=neutral, PublicKeyToken=717343cc2c25edcf, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_39FE71C6A9E783ED61B525EA2D4C772D"
{
"Name" = "8:System.Net.IPNetwork.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:System.Net.IPNetwork.dll"
"TargetName" = "8:"
Expand All @@ -461,11 +441,6 @@
"AssemblyAsmDisplayName" = "8:SharpSnmpLib, Version=10.0.0.0, Culture=neutral, PublicKeyToken=4c00852d3788e005, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_47CE91384CFA30189E66E0927B51A477"
{
"Name" = "8:SharpSnmpLib.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:SharpSnmpLib.dll"
"TargetName" = "8:"
Expand All @@ -492,11 +467,6 @@
"AssemblyAsmDisplayName" = "8:Dragablz, Version=0.0.3.203, Culture=neutral, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_4D64F059BE1802EEF044CE73194E762B"
{
"Name" = "8:Dragablz.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:Dragablz.dll"
"TargetName" = "8:"
Expand All @@ -523,11 +493,6 @@
"AssemblyAsmDisplayName" = "8:MSTSCLib, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_6A57510865BA59B777DFC86A45E2DDDB"
{
"Name" = "8:MSTSCLib.DLL"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:MSTSCLib.DLL"
"TargetName" = "8:"
Expand All @@ -554,11 +519,6 @@
"AssemblyAsmDisplayName" = "8:ControlzEx, Version=3.0.2.4, Culture=neutral, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_9A8619402B1C850D44680EEA483C9C4A"
{
"Name" = "8:ControlzEx.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:ControlzEx.dll"
"TargetName" = "8:"
Expand All @@ -585,11 +545,6 @@
"AssemblyAsmDisplayName" = "8:MahApps.Metro.IconPacks, Version=2.3.0.4, Culture=neutral, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_AD7C559AAEBD0DFD0B0A135B65E2A071"
{
"Name" = "8:MahApps.Metro.IconPacks.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:MahApps.Metro.IconPacks.dll"
"TargetName" = "8:"
Expand All @@ -616,11 +571,6 @@
"AssemblyAsmDisplayName" = "8:AirspaceFixer, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_B2D12C55ED7E4372B6238A6AE059FF72"
{
"Name" = "8:AirspaceFixer.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:AirspaceFixer.dll"
"TargetName" = "8:"
Expand All @@ -647,11 +597,6 @@
"AssemblyAsmDisplayName" = "8:System.IO.Compression, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"
"ScatterAssemblies"
{
"_CAE55A6A5A10C449B04915201740D438"
{
"Name" = "8:System.IO.Compression.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:System.IO.Compression.dll"
"TargetName" = "8:"
Expand All @@ -678,11 +623,6 @@
"AssemblyAsmDisplayName" = "8:AxMSTSCLib, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_DF7090C238243AA0348DC046E88FDD49"
{
"Name" = "8:AxMSTSCLib.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:AxMSTSCLib.dll"
"TargetName" = "8:"
Expand Down Expand Up @@ -729,11 +669,6 @@
"AssemblyAsmDisplayName" = "8:System.IO.Compression.FileSystem, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"
"ScatterAssemblies"
{
"_EE6BFCCFD10E229CA82C9B6854A3FE17"
{
"Name" = "8:System.IO.Compression.FileSystem.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:System.IO.Compression.FileSystem.dll"
"TargetName" = "8:"
Expand All @@ -760,11 +695,6 @@
"AssemblyAsmDisplayName" = "8:Octokit, Version=0.32.0.0, Culture=neutral, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_F9CAC28BFA2FE24D3D55237357C2D7B6"
{
"Name" = "8:Octokit.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:Octokit.dll"
"TargetName" = "8:"
Expand Down Expand Up @@ -851,15 +781,15 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:NETworkManager"
"ProductCode" = "8:{12150144-C241-4770-8FAA-77C730575DD8}"
"PackageCode" = "8:{D17BE824-DE98-473B-A4D3-77F506519E8A}"
"ProductCode" = "8:{37E4F852-32A5-42D7-8126-68E86F9E3096}"
"PackageCode" = "8:{EEC09144-289D-466A-B734-0AC49F5203FE}"
"UpgradeCode" = "8:{FBE04B49-929D-4FB1-9A85-4F83A13E2E10}"
"AspNetVersion" = "8:4.0.30319.0"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
"ProductVersion" = "8:1.8.0"
"ProductVersion" = "8:1.8.1"
"Manufacturer" = "8:BornToBeRoot"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:"
Expand Down
1 change: 0 additions & 1 deletion Source/NETworkManager/App.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ private void Application_Startup(object sender, StartupEventArgs e)
// Update integrated settings %LocalAppData%\NETworkManager\NETworkManager_GUID (custom settings path)
if (Settings.Default.UpgradeRequired)
{
Debug.Write("Upgrade settings...");
Settings.Default.Upgrade();
Settings.Default.UpgradeRequired = false;
}
Expand Down
2 changes: 1 addition & 1 deletion Source/NETworkManager/Controls/PuTTYControl.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<TextBlock Grid.Row="1" Foreground="{DynamicResource AccentColorBrush}" Text="{x:Static localization:Strings.PuTTYProcessHasEnded}" Style="{DynamicResource DefaultTextBlock}" Visibility="{Binding IsConnecting, Converter={StaticResource BooleanReverseToVisibilityHiddenConverter}}" />
<mah:ProgressRing Grid.Row="0" Grid.RowSpan="2" Height="50" Width="50" IsActive="{Binding IsConnecting}" Visibility="{Binding IsConnecting, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}"/>
<Button Grid.Row="3" Content="{x:Static localization:Strings.Reconnect}" Command="{Binding ReconnectCommand}" Visibility="{Binding IsConnecting, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}" IsDefault="True" IsEnabled="{Binding IsConnecting, Converter={StaticResource BooleanReverseConverter}}" Style="{StaticResource DefaultButton}"/>
<TextBlock Grid.Row="3" Text="{x:Static localization:Strings.ConnectingDots}" Style="{StaticResource HeaderTextBlock}" Visibility="{Binding IsConnecting, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" />
<TextBlock Grid.Row="3" Text="{x:Static localization:Strings.ConnectingDots}" Style="{StaticResource MessageTextBlock}" Visibility="{Binding IsConnecting, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" />
</Grid>
</Grid>
</UserControl>
12 changes: 6 additions & 6 deletions Source/NETworkManager/Controls/PuTTYControl.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,10 +168,10 @@ private async void Connect()
style &= ~(NativeMethods.WS_CAPTION | NativeMethods.WS_POPUP | NativeMethods.WS_THICKFRAME);
NativeMethods.SetWindowLongPtr(_appWin, NativeMethods.GWL_STYLE, new IntPtr(style));

// Resize embedded application & refresh
ResizeEmbeddedPutty();

IsConnected = true;

// Resize embedded application & refresh
ResizeEmbeddedPuTTY();
}
}
else
Expand Down Expand Up @@ -204,7 +204,7 @@ private void PuTTYProcess_Exited(object sender, EventArgs e)
IsConnected = false;
}

private void ResizeEmbeddedPutty()
private void ResizeEmbeddedPuTTY()
{
if (IsConnected)
NativeMethods.SetWindowPos(_puttyProcess.MainWindowHandle, IntPtr.Zero, 0, 0, PuTTYHost.ClientSize.Width, PuTTYHost.ClientSize.Height, NativeMethods.SWP_NOZORDER | NativeMethods.SWP_NOACTIVATE);
Expand Down Expand Up @@ -234,14 +234,14 @@ public void CloseTab()
private void PuTTYGrid_SizeChanged(object sender, SizeChangedEventArgs e)
{
if (_puttyProcess != null)
ResizeEmbeddedPutty();
ResizeEmbeddedPuTTY();
}

private void ResizeTimer_Tick(object sender, EventArgs e)
{
_resizeTimer.Stop();

ResizeEmbeddedPutty();
ResizeEmbeddedPuTTY();
}
#endregion
}
Expand Down
2 changes: 1 addition & 1 deletion Source/NETworkManager/Controls/RemoteDesktopControl.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<TextBlock Grid.Row="1" Foreground="{DynamicResource AccentColorBrush}" Text="{Binding DisconnectReason}" Style="{DynamicResource DefaultTextBlock}" Visibility="{Binding IsConnecting, Converter={StaticResource BooleanReverseToVisibilityHiddenConverter}}" />
<mah:ProgressRing Grid.Row="0" Grid.RowSpan="2" Height="50" Width="50" IsActive="{Binding IsConnecting}" Visibility="{Binding IsConnecting, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}"/>
<Button Grid.Row="3" Content="{x:Static localization:Strings.Reconnect}" Command="{Binding ReconnectCommand}" Visibility="{Binding IsConnecting, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}" IsDefault="True" IsEnabled="{Binding IsConnecting, Converter={StaticResource BooleanReverseConverter}}" Style="{StaticResource DefaultButton}"/>
<TextBlock Grid.Row="3" Text="{x:Static localization:Strings.ConnectingDots}" Style="{StaticResource HeaderTextBlock}" Visibility="{Binding IsConnecting, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" />
<TextBlock Grid.Row="3" Text="{x:Static localization:Strings.ConnectingDots}" Style="{StaticResource MessageTextBlock}" Visibility="{Binding IsConnecting, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" />
</Grid>
</Grid>
</UserControl>
2 changes: 1 addition & 1 deletion Source/NETworkManager/Controls/RemoteDesktopControl.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ private static string GetDisconnectReason(int reason)
case 8711:
return NETworkManager.Resources.Localization.Strings.RemoteDesktopDisconnectReason_SslErrSmartcardCardBlocked;
default:
return "reason not found!";
return string.Empty;
}
}
#endregion
Expand Down
Loading