Skip to content

Commit f52cb1b

Browse files
BornToBeRootBornToBeRoot
authored
1.8.1.0 (#153)
1 parent d59cf1c commit f52cb1b

18 files changed

+145
-174
lines changed

‎Source/NETworkManager.Setup/NETworkManager.Setup.vdproj‎

Lines changed: 21 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@
2222
"Entry"
2323
{
2424
"MsmKey" = "8:_287F82846E33E6F26968C7B256EF09F8"
25-
"OwnerKey" = "8:_330E8E6DA8ED4B773D59A1586EC8F437"
25+
"OwnerKey" = "8:_48ACD967FDBF43AEAF73122414146A86"
2626
"MsmSig" = "8:_UNDEFINED"
2727
}
2828
"Entry"
2929
{
3030
"MsmKey" = "8:_287F82846E33E6F26968C7B256EF09F8"
31-
"OwnerKey" = "8:_48ACD967FDBF43AEAF73122414146A86"
31+
"OwnerKey" = "8:_330E8E6DA8ED4B773D59A1586EC8F437"
3232
"MsmSig" = "8:_UNDEFINED"
3333
}
3434
"Entry"
@@ -88,13 +88,13 @@
8888
"Entry"
8989
{
9090
"MsmKey" = "8:_9A8619402B1C850D44680EEA483C9C4A"
91-
"OwnerKey" = "8:_AD7C559AAEBD0DFD0B0A135B65E2A071"
91+
"OwnerKey" = "8:_330E8E6DA8ED4B773D59A1586EC8F437"
9292
"MsmSig" = "8:_UNDEFINED"
9393
}
9494
"Entry"
9595
{
9696
"MsmKey" = "8:_9A8619402B1C850D44680EEA483C9C4A"
97-
"OwnerKey" = "8:_330E8E6DA8ED4B773D59A1586EC8F437"
97+
"OwnerKey" = "8:_AD7C559AAEBD0DFD0B0A135B65E2A071"
9898
"MsmSig" = "8:_UNDEFINED"
9999
}
100100
"Entry"
@@ -154,85 +154,85 @@
154154
"Entry"
155155
{
156156
"MsmKey" = "8:_UNDEFINED"
157-
"OwnerKey" = "8:_F9CAC28BFA2FE24D3D55237357C2D7B6"
157+
"OwnerKey" = "8:_CAE55A6A5A10C449B04915201740D438"
158158
"MsmSig" = "8:_UNDEFINED"
159159
}
160160
"Entry"
161161
{
162162
"MsmKey" = "8:_UNDEFINED"
163-
"OwnerKey" = "8:_AD7C559AAEBD0DFD0B0A135B65E2A071"
163+
"OwnerKey" = "8:_EE6BFCCFD10E229CA82C9B6854A3FE17"
164164
"MsmSig" = "8:_UNDEFINED"
165165
}
166166
"Entry"
167167
{
168168
"MsmKey" = "8:_UNDEFINED"
169-
"OwnerKey" = "8:_330E8E6DA8ED4B773D59A1586EC8F437"
169+
"OwnerKey" = "8:_31205BBAB900BF6933FE71AE79EC0061"
170170
"MsmSig" = "8:_UNDEFINED"
171171
}
172172
"Entry"
173173
{
174174
"MsmKey" = "8:_UNDEFINED"
175-
"OwnerKey" = "8:_47CE91384CFA30189E66E0927B51A477"
175+
"OwnerKey" = "8:_6A57510865BA59B777DFC86A45E2DDDB"
176176
"MsmSig" = "8:_UNDEFINED"
177177
}
178178
"Entry"
179179
{
180180
"MsmKey" = "8:_UNDEFINED"
181-
"OwnerKey" = "8:_39FE71C6A9E783ED61B525EA2D4C772D"
181+
"OwnerKey" = "8:_DF7090C238243AA0348DC046E88FDD49"
182182
"MsmSig" = "8:_UNDEFINED"
183183
}
184184
"Entry"
185185
{
186186
"MsmKey" = "8:_UNDEFINED"
187-
"OwnerKey" = "8:_4D64F059BE1802EEF044CE73194E762B"
187+
"OwnerKey" = "8:_B2D12C55ED7E4372B6238A6AE059FF72"
188188
"MsmSig" = "8:_UNDEFINED"
189189
}
190190
"Entry"
191191
{
192192
"MsmKey" = "8:_UNDEFINED"
193-
"OwnerKey" = "8:_9A8619402B1C850D44680EEA483C9C4A"
193+
"OwnerKey" = "8:_287F82846E33E6F26968C7B256EF09F8"
194194
"MsmSig" = "8:_UNDEFINED"
195195
}
196196
"Entry"
197197
{
198198
"MsmKey" = "8:_UNDEFINED"
199-
"OwnerKey" = "8:_287F82846E33E6F26968C7B256EF09F8"
199+
"OwnerKey" = "8:_9A8619402B1C850D44680EEA483C9C4A"
200200
"MsmSig" = "8:_UNDEFINED"
201201
}
202202
"Entry"
203203
{
204204
"MsmKey" = "8:_UNDEFINED"
205-
"OwnerKey" = "8:_B2D12C55ED7E4372B6238A6AE059FF72"
205+
"OwnerKey" = "8:_4D64F059BE1802EEF044CE73194E762B"
206206
"MsmSig" = "8:_UNDEFINED"
207207
}
208208
"Entry"
209209
{
210210
"MsmKey" = "8:_UNDEFINED"
211-
"OwnerKey" = "8:_DF7090C238243AA0348DC046E88FDD49"
211+
"OwnerKey" = "8:_39FE71C6A9E783ED61B525EA2D4C772D"
212212
"MsmSig" = "8:_UNDEFINED"
213213
}
214214
"Entry"
215215
{
216216
"MsmKey" = "8:_UNDEFINED"
217-
"OwnerKey" = "8:_6A57510865BA59B777DFC86A45E2DDDB"
217+
"OwnerKey" = "8:_47CE91384CFA30189E66E0927B51A477"
218218
"MsmSig" = "8:_UNDEFINED"
219219
}
220220
"Entry"
221221
{
222222
"MsmKey" = "8:_UNDEFINED"
223-
"OwnerKey" = "8:_31205BBAB900BF6933FE71AE79EC0061"
223+
"OwnerKey" = "8:_330E8E6DA8ED4B773D59A1586EC8F437"
224224
"MsmSig" = "8:_UNDEFINED"
225225
}
226226
"Entry"
227227
{
228228
"MsmKey" = "8:_UNDEFINED"
229-
"OwnerKey" = "8:_EE6BFCCFD10E229CA82C9B6854A3FE17"
229+
"OwnerKey" = "8:_AD7C559AAEBD0DFD0B0A135B65E2A071"
230230
"MsmSig" = "8:_UNDEFINED"
231231
}
232232
"Entry"
233233
{
234234
"MsmKey" = "8:_UNDEFINED"
235-
"OwnerKey" = "8:_CAE55A6A5A10C449B04915201740D438"
235+
"OwnerKey" = "8:_F9CAC28BFA2FE24D3D55237357C2D7B6"
236236
"MsmSig" = "8:_UNDEFINED"
237237
}
238238
}
@@ -337,11 +337,6 @@
337337
"AssemblyAsmDisplayName" = "8:System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"
338338
"ScatterAssemblies"
339339
{
340-
"_287F82846E33E6F26968C7B256EF09F8"
341-
{
342-
"Name" = "8:System.Windows.Interactivity.dll"
343-
"Attributes" = "3:512"
344-
}
345340
}
346341
"SourcePath" = "8:System.Windows.Interactivity.dll"
347342
"TargetName" = "8:"
@@ -368,11 +363,6 @@
368363
"AssemblyAsmDisplayName" = "8:System.Net.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
369364
"ScatterAssemblies"
370365
{
371-
"_31205BBAB900BF6933FE71AE79EC0061"
372-
{
373-
"Name" = "8:System.Net.Http.dll"
374-
"Attributes" = "3:512"
375-
}
376366
}
377367
"SourcePath" = "8:System.Net.Http.dll"
378368
"TargetName" = "8:"
@@ -399,11 +389,6 @@
399389
"AssemblyAsmDisplayName" = "8:MahApps.Metro, Version=1.6.5.1, Culture=neutral, processorArchitecture=MSIL"
400390
"ScatterAssemblies"
401391
{
402-
"_330E8E6DA8ED4B773D59A1586EC8F437"
403-
{
404-
"Name" = "8:MahApps.Metro.dll"
405-
"Attributes" = "3:512"
406-
}
407392
}
408393
"SourcePath" = "8:MahApps.Metro.dll"
409394
"TargetName" = "8:"
@@ -430,11 +415,6 @@
430415
"AssemblyAsmDisplayName" = "8:System.Net.IPNetwork, Version=2.1.2.0, Culture=neutral, PublicKeyToken=717343cc2c25edcf, processorArchitecture=MSIL"
431416
"ScatterAssemblies"
432417
{
433-
"_39FE71C6A9E783ED61B525EA2D4C772D"
434-
{
435-
"Name" = "8:System.Net.IPNetwork.dll"
436-
"Attributes" = "3:512"
437-
}
438418
}
439419
"SourcePath" = "8:System.Net.IPNetwork.dll"
440420
"TargetName" = "8:"
@@ -461,11 +441,6 @@
461441
"AssemblyAsmDisplayName" = "8:SharpSnmpLib, Version=10.0.0.0, Culture=neutral, PublicKeyToken=4c00852d3788e005, processorArchitecture=MSIL"
462442
"ScatterAssemblies"
463443
{
464-
"_47CE91384CFA30189E66E0927B51A477"
465-
{
466-
"Name" = "8:SharpSnmpLib.dll"
467-
"Attributes" = "3:512"
468-
}
469444
}
470445
"SourcePath" = "8:SharpSnmpLib.dll"
471446
"TargetName" = "8:"
@@ -492,11 +467,6 @@
492467
"AssemblyAsmDisplayName" = "8:Dragablz, Version=0.0.3.203, Culture=neutral, processorArchitecture=MSIL"
493468
"ScatterAssemblies"
494469
{
495-
"_4D64F059BE1802EEF044CE73194E762B"
496-
{
497-
"Name" = "8:Dragablz.dll"
498-
"Attributes" = "3:512"
499-
}
500470
}
501471
"SourcePath" = "8:Dragablz.dll"
502472
"TargetName" = "8:"
@@ -523,11 +493,6 @@
523493
"AssemblyAsmDisplayName" = "8:MSTSCLib, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"
524494
"ScatterAssemblies"
525495
{
526-
"_6A57510865BA59B777DFC86A45E2DDDB"
527-
{
528-
"Name" = "8:MSTSCLib.DLL"
529-
"Attributes" = "3:512"
530-
}
531496
}
532497
"SourcePath" = "8:MSTSCLib.DLL"
533498
"TargetName" = "8:"
@@ -554,11 +519,6 @@
554519
"AssemblyAsmDisplayName" = "8:ControlzEx, Version=3.0.2.4, Culture=neutral, processorArchitecture=MSIL"
555520
"ScatterAssemblies"
556521
{
557-
"_9A8619402B1C850D44680EEA483C9C4A"
558-
{
559-
"Name" = "8:ControlzEx.dll"
560-
"Attributes" = "3:512"
561-
}
562522
}
563523
"SourcePath" = "8:ControlzEx.dll"
564524
"TargetName" = "8:"
@@ -585,11 +545,6 @@
585545
"AssemblyAsmDisplayName" = "8:MahApps.Metro.IconPacks, Version=2.3.0.4, Culture=neutral, processorArchitecture=MSIL"
586546
"ScatterAssemblies"
587547
{
588-
"_AD7C559AAEBD0DFD0B0A135B65E2A071"
589-
{
590-
"Name" = "8:MahApps.Metro.IconPacks.dll"
591-
"Attributes" = "3:512"
592-
}
593548
}
594549
"SourcePath" = "8:MahApps.Metro.IconPacks.dll"
595550
"TargetName" = "8:"
@@ -616,11 +571,6 @@
616571
"AssemblyAsmDisplayName" = "8:AirspaceFixer, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"
617572
"ScatterAssemblies"
618573
{
619-
"_B2D12C55ED7E4372B6238A6AE059FF72"
620-
{
621-
"Name" = "8:AirspaceFixer.dll"
622-
"Attributes" = "3:512"
623-
}
624574
}
625575
"SourcePath" = "8:AirspaceFixer.dll"
626576
"TargetName" = "8:"
@@ -647,11 +597,6 @@
647597
"AssemblyAsmDisplayName" = "8:System.IO.Compression, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"
648598
"ScatterAssemblies"
649599
{
650-
"_CAE55A6A5A10C449B04915201740D438"
651-
{
652-
"Name" = "8:System.IO.Compression.dll"
653-
"Attributes" = "3:512"
654-
}
655600
}
656601
"SourcePath" = "8:System.IO.Compression.dll"
657602
"TargetName" = "8:"
@@ -678,11 +623,6 @@
678623
"AssemblyAsmDisplayName" = "8:AxMSTSCLib, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"
679624
"ScatterAssemblies"
680625
{
681-
"_DF7090C238243AA0348DC046E88FDD49"
682-
{
683-
"Name" = "8:AxMSTSCLib.dll"
684-
"Attributes" = "3:512"
685-
}
686626
}
687627
"SourcePath" = "8:AxMSTSCLib.dll"
688628
"TargetName" = "8:"
@@ -729,11 +669,6 @@
729669
"AssemblyAsmDisplayName" = "8:System.IO.Compression.FileSystem, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"
730670
"ScatterAssemblies"
731671
{
732-
"_EE6BFCCFD10E229CA82C9B6854A3FE17"
733-
{
734-
"Name" = "8:System.IO.Compression.FileSystem.dll"
735-
"Attributes" = "3:512"
736-
}
737672
}
738673
"SourcePath" = "8:System.IO.Compression.FileSystem.dll"
739674
"TargetName" = "8:"
@@ -760,11 +695,6 @@
760695
"AssemblyAsmDisplayName" = "8:Octokit, Version=0.32.0.0, Culture=neutral, processorArchitecture=MSIL"
761696
"ScatterAssemblies"
762697
{
763-
"_F9CAC28BFA2FE24D3D55237357C2D7B6"
764-
{
765-
"Name" = "8:Octokit.dll"
766-
"Attributes" = "3:512"
767-
}
768698
}
769699
"SourcePath" = "8:Octokit.dll"
770700
"TargetName" = "8:"
@@ -851,15 +781,15 @@
851781
{
852782
"Name" = "8:Microsoft Visual Studio"
853783
"ProductName" = "8:NETworkManager"
854-
"ProductCode" = "8:{12150144-C241-4770-8FAA-77C730575DD8}"
855-
"PackageCode" = "8:{D17BE824-DE98-473B-A4D3-77F506519E8A}"
784+
"ProductCode" = "8:{37E4F852-32A5-42D7-8126-68E86F9E3096}"
785+
"PackageCode" = "8:{EEC09144-289D-466A-B734-0AC49F5203FE}"
856786
"UpgradeCode" = "8:{FBE04B49-929D-4FB1-9A85-4F83A13E2E10}"
857787
"AspNetVersion" = "8:4.0.30319.0"
858788
"RestartWWWService" = "11:FALSE"
859789
"RemovePreviousVersions" = "11:TRUE"
860790
"DetectNewerInstalledVersion" = "11:TRUE"
861791
"InstallAllUsers" = "11:TRUE"
862-
"ProductVersion" = "8:1.8.0"
792+
"ProductVersion" = "8:1.8.1"
863793
"Manufacturer" = "8:BornToBeRoot"
864794
"ARPHELPTELEPHONE" = "8:"
865795
"ARPHELPLINK" = "8:"

‎Source/NETworkManager/App.xaml.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ private void Application_Startup(object sender, StartupEventArgs e)
5252
// Update integrated settings %LocalAppData%\NETworkManager\NETworkManager_GUID (custom settings path)
5353
if (Settings.Default.UpgradeRequired)
5454
{
55-
Debug.Write("Upgrade settings...");
5655
Settings.Default.Upgrade();
5756
Settings.Default.UpgradeRequired = false;
5857
}

‎Source/NETworkManager/Controls/PuTTYControl.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<TextBlock Grid.Row="1" Foreground="{DynamicResource AccentColorBrush}" Text="{x:Static localization:Strings.PuTTYProcessHasEnded}" Style="{DynamicResource DefaultTextBlock}" Visibility="{Binding IsConnecting, Converter={StaticResource BooleanReverseToVisibilityHiddenConverter}}" />
3232
<mah:ProgressRing Grid.Row="0" Grid.RowSpan="2" Height="50" Width="50" IsActive="{Binding IsConnecting}" Visibility="{Binding IsConnecting, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}"/>
3333
<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}"/>
34-
<TextBlock Grid.Row="3" Text="{x:Static localization:Strings.ConnectingDots}" Style="{StaticResource HeaderTextBlock}" Visibility="{Binding IsConnecting, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" />
34+
<TextBlock Grid.Row="3" Text="{x:Static localization:Strings.ConnectingDots}" Style="{StaticResource MessageTextBlock}" Visibility="{Binding IsConnecting, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" />
3535
</Grid>
3636
</Grid>
3737
</UserControl>

‎Source/NETworkManager/Controls/PuTTYControl.xaml.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -168,10 +168,10 @@ private async void Connect()
168168
style &= ~(NativeMethods.WS_CAPTION | NativeMethods.WS_POPUP | NativeMethods.WS_THICKFRAME);
169169
NativeMethods.SetWindowLongPtr(_appWin, NativeMethods.GWL_STYLE, new IntPtr(style));
170170

171-
// Resize embedded application & refresh
172-
ResizeEmbeddedPutty();
173-
174171
IsConnected = true;
172+
173+
// Resize embedded application & refresh
174+
ResizeEmbeddedPuTTY();
175175
}
176176
}
177177
else
@@ -204,7 +204,7 @@ private void PuTTYProcess_Exited(object sender, EventArgs e)
204204
IsConnected = false;
205205
}
206206

207-
private void ResizeEmbeddedPutty()
207+
private void ResizeEmbeddedPuTTY()
208208
{
209209
if (IsConnected)
210210
NativeMethods.SetWindowPos(_puttyProcess.MainWindowHandle, IntPtr.Zero, 0, 0, PuTTYHost.ClientSize.Width, PuTTYHost.ClientSize.Height, NativeMethods.SWP_NOZORDER | NativeMethods.SWP_NOACTIVATE);
@@ -234,14 +234,14 @@ public void CloseTab()
234234
private void PuTTYGrid_SizeChanged(object sender, SizeChangedEventArgs e)
235235
{
236236
if (_puttyProcess != null)
237-
ResizeEmbeddedPutty();
237+
ResizeEmbeddedPuTTY();
238238
}
239239

240240
private void ResizeTimer_Tick(object sender, EventArgs e)
241241
{
242242
_resizeTimer.Stop();
243243

244-
ResizeEmbeddedPutty();
244+
ResizeEmbeddedPuTTY();
245245
}
246246
#endregion
247247
}

‎Source/NETworkManager/Controls/RemoteDesktopControl.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<TextBlock Grid.Row="1" Foreground="{DynamicResource AccentColorBrush}" Text="{Binding DisconnectReason}" Style="{DynamicResource DefaultTextBlock}" Visibility="{Binding IsConnecting, Converter={StaticResource BooleanReverseToVisibilityHiddenConverter}}" />
3131
<mah:ProgressRing Grid.Row="0" Grid.RowSpan="2" Height="50" Width="50" IsActive="{Binding IsConnecting}" Visibility="{Binding IsConnecting, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}"/>
3232
<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}"/>
33-
<TextBlock Grid.Row="3" Text="{x:Static localization:Strings.ConnectingDots}" Style="{StaticResource HeaderTextBlock}" Visibility="{Binding IsConnecting, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" />
33+
<TextBlock Grid.Row="3" Text="{x:Static localization:Strings.ConnectingDots}" Style="{StaticResource MessageTextBlock}" Visibility="{Binding IsConnecting, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}" />
3434
</Grid>
3535
</Grid>
3636
</UserControl>

‎Source/NETworkManager/Controls/RemoteDesktopControl.xaml.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ private static string GetDisconnectReason(int reason)
335335
case 8711:
336336
return NETworkManager.Resources.Localization.Strings.RemoteDesktopDisconnectReason_SslErrSmartcardCardBlocked;
337337
default:
338-
return "reason not found!";
338+
return string.Empty;
339339
}
340340
}
341341
#endregion

0 commit comments

Comments
 (0)