unnecessary conditinal codes removed (since .netstandard2 supports them). they are platform specifix, not target framework specific.

honfika · honfika · commit 65850f447624 · 2017-11-25T21:55:17.000+01:00
diff --git a/Examples/Titanium.Web.Proxy.Examples.Basic/ProxyTestController.cs b/Examples/Titanium.Web.Proxy.Examples.Basic/ProxyTestController.cs
@@ -108,12 +108,15 @@ public void StartProxy()
             foreach (var endPoint in proxyServer.ProxyEndPoints)
                 Console.WriteLine("Listening on '{0}' endpoint at Ip {1} and port: {2} ", endPoint.GetType().Name, endPoint.IpAddress, endPoint.Port);
 
-#if NET45
-            //Only explicit proxies can be set as system proxy!
-            //proxyServer.SetAsSystemHttpProxy(explicitEndPoint);
-            //proxyServer.SetAsSystemHttpsProxy(explicitEndPoint);
-            proxyServer.SetAsSystemProxy(explicitEndPoint, ProxyProtocolType.AllHttp);
+#if NETSTANDARD2_0
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
 #endif
+            {
+                //Only explicit proxies can be set as system proxy!
+                //proxyServer.SetAsSystemHttpProxy(explicitEndPoint);
+                //proxyServer.SetAsSystemHttpsProxy(explicitEndPoint);
+                proxyServer.SetAsSystemProxy(explicitEndPoint, ProxyProtocolType.AllHttp);
+            }
         }
 
         public void Stop()
diff --git a/Titanium.Web.Proxy/Extensions/DotNet45Extensions.cs b/Titanium.Web.Proxy/Extensions/DotNet45Extensions.cs
diff --git a/Titanium.Web.Proxy/Helpers/Firefox.cs b/Titanium.Web.Proxy/Helpers/Firefox.cs
@@ -1,5 +1,4 @@
-﻿#if NET45
-using System;
+﻿using System;
 using System.IO;
 
 namespace Titanium.Web.Proxy.Helpers
@@ -51,4 +50,3 @@ internal void UseSystemProxy()
         }
     }
 }
-#endif
diff --git a/Titanium.Web.Proxy/Helpers/NativeMethods.SystemProxy.cs b/Titanium.Web.Proxy/Helpers/NativeMethods.SystemProxy.cs
@@ -1,5 +1,4 @@
-﻿#if NET45
-using System;
+﻿using System;
 using System.Runtime.InteropServices;
 
 namespace Titanium.Web.Proxy.Helpers
@@ -22,4 +21,3 @@ internal partial class NativeMethods
         internal delegate bool ConsoleEventDelegate(int eventType);
     }
 }
-#endif
diff --git a/Titanium.Web.Proxy/Helpers/Network.cs b/Titanium.Web.Proxy/Helpers/Network.cs
@@ -25,7 +25,6 @@ internal static int GetProcessIdFromPort(int port, bool ipV6Enabled)
             return FindProcessIdFromLocalPort(port, IpVersion.Ipv6);
         }
 
-#if NET45
         /// <summary>
         /// Adapated from below link
         /// http://stackoverflow.com/questions/11834091/how-to-check-if-localhost
@@ -75,56 +74,5 @@ internal static bool IsLocalIpAddress(string hostName)
 
             return isLocalhost;
         }
-#else
-        /// <summary>
-        /// Adapated from below link
-        /// http://stackoverflow.com/questions/11834091/how-to-check-if-localhost
-        /// </summary>
-        /// <param name="address"></param>
-        /// <returns></returns>
-        internal static bool IsLocalIpAddress(IPAddress address)
-        {
-            // get local IP addresses
-            var localIPs = Dns.GetHostAddressesAsync(Dns.GetHostName()).Result;
-            // test if any host IP equals to any local IP or to localhost
-            return IPAddress.IsLoopback(address) || localIPs.Contains(address);
-        }
-
-        internal static bool IsLocalIpAddress(string hostName)
-        {
-            bool isLocalhost = false;
-
-            var localhost = Dns.GetHostEntryAsync("127.0.0.1").Result;
-            if (hostName == localhost.HostName)
-            {
-                var hostEntry = Dns.GetHostEntryAsync(hostName).Result;
-                isLocalhost = hostEntry.AddressList.Any(IPAddress.IsLoopback);
-            }
-
-            if (!isLocalhost)
-            {
-                localhost = Dns.GetHostEntryAsync(Dns.GetHostName()).Result;
-
-                IPAddress ipAddress;
-
-                if (IPAddress.TryParse(hostName, out ipAddress))
-                    isLocalhost = localhost.AddressList.Any(x => x.Equals(ipAddress));
-
-                if (!isLocalhost)
-                {
-                    try
-                    {
-                        var hostEntry = Dns.GetHostEntryAsync(hostName).Result;
-                        isLocalhost = localhost.AddressList.Any(x => hostEntry.AddressList.Any(x.Equals));
-                    }
-                    catch (SocketException)
-                    {
-                    }
-                }
-            }
-
-            return isLocalhost;
-        }
-#endif
     }
 }
diff --git a/Titanium.Web.Proxy/Helpers/ProxyInfo.cs b/Titanium.Web.Proxy/Helpers/ProxyInfo.cs
@@ -1,5 +1,4 @@
-﻿#if NET45
-using System;
+﻿using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -199,4 +198,3 @@ private static HttpSystemProxyValue ParseProxyValue(string value)
         }
     }
 }
-#endif
diff --git a/Titanium.Web.Proxy/Helpers/SystemProxy.cs b/Titanium.Web.Proxy/Helpers/SystemProxy.cs
@@ -1,5 +1,4 @@
-﻿#if NET45
-using System;
+﻿using System;
 using System.Linq;
 using Microsoft.Win32;
 
@@ -328,4 +327,3 @@ private void Refresh()
         }
     }
 }
-#endif
diff --git a/Titanium.Web.Proxy/Helpers/WinHttp/NativeMethods.WinHttp.cs b/Titanium.Web.Proxy/Helpers/WinHttp/NativeMethods.WinHttp.cs
@@ -1,5 +1,4 @@
-﻿#if NET45
-using System;
+﻿using System;
 using System.Runtime.InteropServices;
 
 // Helper classes for setting system proxy settings
@@ -131,4 +130,3 @@ internal enum ErrorCodes
         }
     }
 }
-#endif
diff --git a/Titanium.Web.Proxy/Helpers/WinHttp/WinHttpHandle.cs b/Titanium.Web.Proxy/Helpers/WinHttp/WinHttpHandle.cs
@@ -1,4 +1,3 @@
-#if NET45
 using System;
 using System.Runtime.InteropServices;
 
@@ -18,4 +17,3 @@ protected override bool ReleaseHandle()
         public override bool IsInvalid => handle == IntPtr.Zero;
     }
 }
-#endif
diff --git a/Titanium.Web.Proxy/Helpers/WinHttp/WinHttpWebProxyFinder.cs b/Titanium.Web.Proxy/Helpers/WinHttp/WinHttpWebProxyFinder.cs
@@ -1,4 +1,3 @@
-#if NET45
 using System;
 using System.Collections.Generic;
 using System.Net;
@@ -331,4 +330,3 @@ private enum AutoWebProxyState
         }
     }
 }
-#endif
diff --git a/Titanium.Web.Proxy/Network/Certificate/WinCertificateMaker.cs b/Titanium.Web.Proxy/Network/Certificate/WinCertificateMaker.cs
@@ -265,6 +265,7 @@ private X509Certificate2 MakeCertificateInternal(string sSubjectCN, bool isRoot,
             X509Certificate2 signingCert = null)
         {
             X509Certificate2 rCert = null;
+#if NET45
             if (switchToMTAIfNeeded && Thread.CurrentThread.GetApartmentState() != ApartmentState.MTA)
             {
                 var manualResetEvent = new ManualResetEvent(false);
@@ -277,6 +278,7 @@ private X509Certificate2 MakeCertificateInternal(string sSubjectCN, bool isRoot,
                 manualResetEvent.Close();
                 return rCert;
             }
+#endif
 
             //Subject
             string fullSubject = $"CN={sSubjectCN}";
diff --git a/Titanium.Web.Proxy/Network/CertificateManager.cs b/Titanium.Web.Proxy/Network/CertificateManager.cs
@@ -349,7 +349,7 @@ private X509Certificate2Collection FindCertificates(StoreName storeName, StoreLo
             }
             finally
             {
-                x509Store.Dispose();
+                x509Store.Close();
             }
         }
 
@@ -471,8 +471,8 @@ private void TrustRootCertificate(StoreLocation storeLocation)
             }
             finally
             {
-                x509RootStore.Dispose();
-                x509PersonalStore.Dispose();
+                x509RootStore.Close();
+                x509PersonalStore.Close();
             }
         }
 
@@ -511,8 +511,8 @@ private void RemoveTrustedRootCertificates(StoreLocation storeLocation)
             }
             finally
             {
-                x509RootStore.Dispose();
-                x509PersonalStore.Dispose();
+                x509RootStore.Close();
+                x509PersonalStore.Close();
             }
         }
 
diff --git a/Titanium.Web.Proxy/Network/Tcp/TcpConnection.cs b/Titanium.Web.Proxy/Network/Tcp/TcpConnection.cs
@@ -72,7 +72,7 @@ public void Dispose()
                     //It helps to avoid eventual deterioration of performance due to TCP port exhaustion
                     //due to default TCP CLOSE_WAIT timeout for 4 minutes
                     TcpClient.LingerState = new LingerOption(true, 0);
-                    TcpClient.Dispose();
+                    TcpClient.Close();
                 }
             }
             catch
diff --git a/Titanium.Web.Proxy/Network/Tcp/TcpConnectionFactory.cs b/Titanium.Web.Proxy/Network/Tcp/TcpConnectionFactory.cs
@@ -52,12 +52,7 @@ internal async Task<TcpConnection> CreateClient(ProxyServer server,
 
             try
             {
-#if NET45
                 client = new TcpClient(upStreamEndPoint);
-#else
-                client = new TcpClient();
-                client.Client.Bind(upStreamEndPoint);
-#endif
 
                 //If this proxy uses another external proxy then create a tunnel request for HTTP/HTTPS connections
                 if (useUpstreamProxy)
@@ -119,7 +114,7 @@ await writer.WriteLineAsync("Proxy-Authorization" + ": Basic " +
             catch (Exception)
             {
                 stream?.Dispose();
-                client?.Dispose();
+                client?.Close();
                 throw;
             }
 
diff --git a/Titanium.Web.Proxy/ProxyServer.cs b/Titanium.Web.Proxy/ProxyServer.cs
diff --git a/Titanium.Web.Proxy/Titanium.Web.Proxy.csproj b/Titanium.Web.Proxy/Titanium.Web.Proxy.csproj

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`		`-#if NET45`
`2`		`-using System;`
	`1`	`+using System;`
`3`	`2`	`using System.IO;`
`4`	`3`
`5`	`4`	`namespace Titanium.Web.Proxy.Helpers`
`@@ -51,4 +50,3 @@ internal void UseSystemProxy()`
`51`	`50`	`}`
`52`	`51`	`}`
`53`	`52`	`}`
`54`		`-#endif`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-#if NET45`
`2`	`1`	`using System;`
`3`	`2`	`using System.Runtime.InteropServices;`
`4`	`3`
`@@ -18,4 +17,3 @@ protected override bool ReleaseHandle()`
`18`	`17`	`public override bool IsInvalid => handle == IntPtr.Zero;`
`19`	`18`	`}`
`20`	`19`	`}`
`21`		`-#endif`