Merge branch 'release/1.9.1'

RemoteTerminal/ChangelogManager.cs

@@ -26,20 +26,20 @@ public static class ChangelogManager
         /// <summary>
         /// The version of the most current changelog.
         /// </summary>
-        private const string CurrentVersion = "1.9.0";
+        private const string CurrentVersion = "1.9.1";
 
         /// <summary>
         /// The name of the setting containing the last read changelog version.
         /// </summary>
         private const string LastReadChangelogSettingName = "LastReadChangelog";
 
         /// <summary>
-        /// This array contains, in reverse order, all versions of the app for which a changelog is available.
+        /// This array contains, in reverse order, all previous versions of the app for which a changelog is available.
         /// </summary>
-        /// <remarks>The first entry should always be <see cref="CurrentVersion"/>.</remarks>
-        private static readonly string[] Versions = new[]
+        /// <remarks><see cref="CurrentVersion"/> must not be included in this list.</remarks>
+        private static readonly string[] PreviousVersions = new[]
         {
-            CurrentVersion,
+            "1.9.0",
             "1.8.2",
         };
 
@@ -70,14 +70,18 @@ public static string ProduceChangelog()
             changelog.Append(ReadHtmlFile("head")
                 .Replace("{CurrentVersion}", CurrentVersion));
 
-            foreach (string version in Versions)
+            changelog.Append(ReadHtmlFile(CurrentVersion));
+            if (CurrentVersion != lastReadChangelog)
             {
-                if (version == lastReadChangelog)
+                foreach (string version in PreviousVersions)
                 {
-                    break;
-                }
+                    if (version == lastReadChangelog)
+                    {
+                        break;
+                    }
 
-                changelog.Append(ReadHtmlFile(version));
+                    changelog.Append(ReadHtmlFile(version));
+                }
             }
 
             changelog.Append(ReadHtmlFile("tail"));

RemoteTerminal/Changelogs/1.9.1.htm

@@ -0,0 +1,9 @@
+<h2>1.9.1 (2017-05-29)</h2>
+<p>
+    <b>Fixed a regression with private key authentication</b>
+</p>
+<p>
+    Since 1.9.0 private key authentication did not work because of a threading issue.<br/>
+    The terminal just got stuck at a blank screen with a red border.<br />
+    Password and Private Key Agent authentication was not affected by this bug.
+</p>

RemoteTerminal/Package.appxmanifest

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/2010/manifest" xmlns:m2="http://schemas.microsoft.com/appx/2013/manifest">
-  <Identity Name="46436StefanPodskubka.RemoteTerminal" Publisher="CN=46536A2F-5D79-4B8A-8099-26E3FCC16743" Version="1.9.0.22" />
+  <Identity Name="46436StefanPodskubka.RemoteTerminal" Publisher="CN=46536A2F-5D79-4B8A-8099-26E3FCC16743" Version="1.9.1.23" />
   <Properties>
     <DisplayName>Remote Terminal</DisplayName>
     <PublisherDisplayName>Stefan Podskubka</PublisherDisplayName>

RemoteTerminal/Properties/AssemblyInfo.cs

@@ -23,6 +23,6 @@
 // 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("1.9.0.22")]
-[assembly: AssemblyFileVersion("1.9.0.22")]
+[assembly: AssemblyVersion("1.9.1.23")]
+[assembly: AssemblyFileVersion("1.9.1.23")]
 [assembly: ComVisible(false)]

RemoteTerminal/RemoteTerminal.csproj

@@ -199,6 +199,7 @@
     <EmbeddedResource Include="Changelogs\1.8.2.htm" />
     <EmbeddedResource Include="Changelogs\tail.htm" />
     <EmbeddedResource Include="Changelogs\1.9.0.htm" />
+    <EmbeddedResource Include="Changelogs\1.9.1.htm" />
     <Content Include="LICENSE.txt" />
     <Page Include="ChangelogPage.xaml">
       <SubType>Designer</SubType>

RemoteTerminal/TerminalPage.xaml.cs

@@ -252,6 +252,7 @@ private void PreviewGrid_ItemClick(object sender, ItemClickEventArgs e)
         private void PreviewGrid_ItemCloseButtonClick(object sender, RoutedEventArgs e)
         {
             ITerminal terminal = ((Button)sender).Tag as ITerminal;
+            TerminalManager.Remove(terminal);
             if (this.Terminal == terminal)
             {
                 var switchToTerminal = TerminalManager.Terminals.Where(t => t != terminal).FirstOrDefault();
@@ -264,8 +265,6 @@ private void PreviewGrid_ItemCloseButtonClick(object sender, RoutedEventArgs e)
                     this.Terminal = switchToTerminal;
                 }
             }
-
-            TerminalManager.Remove(terminal);
         }
 
         /// <summary>

RemoteTerminal/Terminals/AbstractTerminal.cs

@@ -316,30 +316,30 @@ public bool ScreenHasFocus
         /// </summary>
         public void PowerOn()
         {
-            Task.Factory.StartNew(async () =>
+            switch (connectionData.Type)
             {
-                switch (connectionData.Type)
-                {
-                    case ConnectionType.Telnet:
-                        this.connection = new TelnetConnection();
-                        break;
-                    case ConnectionType.Ssh:
-                        this.connection = new SshConnection();
-                        break;
-                    default:
-                        break;
-                }
+                case ConnectionType.Telnet:
+                    this.connection = new TelnetConnection();
+                    break;
+                case ConnectionType.Ssh:
+                    this.connection = new SshConnection();
+                    break;
+                default:
+                    break;
+            }
 
-                this.connection.Initialize(connectionData);
-                this.IsConnected = true;
-                this.ScreenHasFocus = true;
+            this.connection.Initialize(connectionData);
+            this.IsConnected = true;
+            this.ScreenHasFocus = true;
 
-                var connected = this.Connected;
-                if (connected != null)
-                {
-                    connected.Invoke(this, new EventArgs());
-                }
+            var connected = this.Connected;
+            if (connected != null)
+            {
+                connected.Invoke(this, new EventArgs());
+            }
 
+            Task.Factory.StartNew(async () =>
+            {
                 this.screenInitWaiter.Wait();
                 bool successful = await this.connection.ConnectAsync(this);
                 if (successful)