diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4a96bb51f..37c6ca4e6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,10 @@
-# v1.2.247
+# Upcoming
+### Client
+* Feature: Windows 7 Support
+* Fix: Windows: Display white screen
+* Fix: Windows: Display Main window location depending on TaskBar position
+
+# v1.2.247
* Feature: Add UDP Protocol
* Update: Improve datagram performance
* Update: Improve overall performance
diff --git a/Samples/VpnHood.Samples.SimpleClient.Droid/VpnHood.Samples.SimpleClient.Droid.csproj b/Samples/VpnHood.Samples.SimpleClient.Droid/VpnHood.Samples.SimpleClient.Droid.csproj
index 4909b8da8..e4773a3b9 100644
--- a/Samples/VpnHood.Samples.SimpleClient.Droid/VpnHood.Samples.SimpleClient.Droid.csproj
+++ b/Samples/VpnHood.Samples.SimpleClient.Droid/VpnHood.Samples.SimpleClient.Droid.csproj
@@ -108,10 +108,10 @@
- 1.1.241
+ 1.2.247
- 1.1.241
+ 1.2.247
diff --git a/Samples/VpnHood.Samples.SimpleClient.Win/VpnHood.Samples.SimpleClient.Win.csproj b/Samples/VpnHood.Samples.SimpleClient.Win/VpnHood.Samples.SimpleClient.Win.csproj
index dbe59e69a..0d5b8f9c0 100644
--- a/Samples/VpnHood.Samples.SimpleClient.Win/VpnHood.Samples.SimpleClient.Win.csproj
+++ b/Samples/VpnHood.Samples.SimpleClient.Win/VpnHood.Samples.SimpleClient.Win.csproj
@@ -11,8 +11,8 @@
-
-
+
+
diff --git a/VpnHood.Client.App.Win.Setup/VpnHood.Client.App.Win.Setup.aip b/VpnHood.Client.App.Win.Setup/VpnHood.Client.App.Win.Setup.aip
index 859b56ebf..789a7d3a8 100644
--- a/VpnHood.Client.App.Win.Setup/VpnHood.Client.App.Win.Setup.aip
+++ b/VpnHood.Client.App.Win.Setup/VpnHood.Client.App.Win.Setup.aip
@@ -485,8 +485,8 @@
|
- |
- |
+ |
+ |
|
|
diff --git a/VpnHood.Client.App.Win/VpnHood.Client.App.Win.csproj b/VpnHood.Client.App.Win/VpnHood.Client.App.Win.csproj
index 981d970a9..c09382985 100644
--- a/VpnHood.Client.App.Win/VpnHood.Client.App.Win.csproj
+++ b/VpnHood.Client.App.Win/VpnHood.Client.App.Win.csproj
@@ -56,7 +56,7 @@
-
+
diff --git a/VpnHood.Client.App.Win/WebViewWindow.cs b/VpnHood.Client.App.Win/WebViewWindow.cs
index 679f8c85d..3cf018044 100644
--- a/VpnHood.Client.App.Win/WebViewWindow.cs
+++ b/VpnHood.Client.App.Win/WebViewWindow.cs
@@ -75,10 +75,10 @@ public void Show()
var rect = Screen.PrimaryScreen.WorkingArea;
var size = DefWindowSize;
- Form.Location = new Point(rect.Right - size.Width, rect.Bottom - size.Height);
Form.Size = size;
- //if (rect.Left > 0) Form.Location = new Point(rect.Left, rect.Bottom - size.Height);
- //if (rect.Top > 0) Form.Location = new Point(rect.Right - size.Width, rect.Top);
+ Form.Location = new Point(rect.Right - size.Width, rect.Bottom - size.Height);
+ if (rect.Top> 10 ) Form.Location = new Point(rect.Right - size.Width, rect.Top);
+ if (rect.Left > 10 ) Form.Location = new Point(rect.Left, rect.Bottom - size.Height);
Form.Show();
Form.BringToFront();
diff --git a/VpnHood.Client/VpnHoodClient.cs b/VpnHood.Client/VpnHoodClient.cs
index 48abe89be..1eb6e31d3 100644
--- a/VpnHood.Client/VpnHoodClient.cs
+++ b/VpnHood.Client/VpnHoodClient.cs
@@ -387,7 +387,13 @@ internal async Task GetSslConnectionToServer(EventId eventId, C
// Establish a TLS connection
_logger.LogTrace(eventId, $"TLS Authenticating. HostName: {VhLogger.FormatDns(Token.DnsName)}...");
- await stream.AuthenticateAsClientAsync(new SslClientAuthenticationOptions { TargetHost = Token.DnsName }, cancellationToken);
+ var sslProtocol = Environment.OSVersion.Platform == PlatformID.Win32NT && Environment.OSVersion.Version.Major < 10
+ ? System.Security.Authentication.SslProtocols.Tls12 // windows 7
+ : System.Security.Authentication.SslProtocols.None; //auto
+
+ await stream.AuthenticateAsClientAsync(new SslClientAuthenticationOptions {
+ TargetHost = Token.DnsName, EnabledSslProtocols = sslProtocol},
+ cancellationToken);
_lastConnectionErrorTime = null;
return new TcpClientStream(tcpClient, stream);
diff --git a/VpnHood.Server.App.Net/VpnHood.Server.App.Net.csproj b/VpnHood.Server.App.Net/VpnHood.Server.App.Net.csproj
index 9600323be..023a191f3 100644
--- a/VpnHood.Server.App.Net/VpnHood.Server.App.Net.csproj
+++ b/VpnHood.Server.App.Net/VpnHood.Server.App.Net.csproj
@@ -45,7 +45,7 @@
-
+