Merge branch 'beta' into stable

Serg2DFX · Sep 24, 2017 · 00eaed6 · 00eaed6
2 parents 11632fe + b64e703
commit 00eaed6
Show file tree

Hide file tree

Showing 30 changed files with 965 additions and 1,190 deletions.
diff --git a/.build/default.ps1 b/.build/default.ps1
@@ -6,8 +6,7 @@ $SolutionRoot = (Split-Path -parent $Here)
 
 $ProjectName = "Titanium.Web.Proxy"
 
-$SolutionFile14 = "$SolutionRoot\$ProjectName.sln"
-$SolutionFile = "$SolutionRoot\$ProjectName.Standard.sln"
+$SolutionFile = "$SolutionRoot\$ProjectName.sln"
 
 ## This comes from the build server iteration
 if(!$BuildNumber) { $BuildNumber = $env:APPVEYOR_BUILD_NUMBER }
@@ -29,8 +28,6 @@ Import-Module "$Here\Common" -DisableNameChecking
 
 $NuGet = Join-Path $SolutionRoot ".nuget\nuget.exe"
 
-$MSBuild14 = "${env:ProgramFiles(x86)}\MSBuild\14.0\Bin\msbuild.exe"
-
 $MSBuild = "${env:ProgramFiles(x86)}\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\msbuild.exe"
 $MSBuild -replace ' ', '` '
 
@@ -40,32 +37,27 @@ FormatTaskName (("-"*25) + "[{0}]" + ("-"*25))
 Task default -depends Clean, Build, Package
 
 Task Build -depends Restore-Packages{
-	exec { . $MSBuild14 $SolutionFile14 /t:Build /v:normal /p:Configuration=$Configuration  }
     exec { . $MSBuild $SolutionFile /t:Build /v:normal /p:Configuration=$Configuration /t:restore }
 }
 
 Task Package -depends Build {
-	exec { . $NuGet pack "$SolutionRoot\Titanium.Web.Proxy\Titanium.Web.Proxy.nuspec" -Properties Configuration=$Configuration -OutputDirectory "$SolutionRoot" -Version "$Version" }
+    exec { . $NuGet pack "$SolutionRoot\Titanium.Web.Proxy\Titanium.Web.Proxy.nuspec" -Properties Configuration=$Configuration -OutputDirectory "$SolutionRoot" -Version "$Version" }
 }
 
 Task Clean -depends Install-BuildTools {
-	Get-ChildItem .\ -include bin,obj -Recurse | foreach ($_) { Remove-Item $_.fullname -Force -Recurse }
-    exec { . $MSBuild14 $SolutionFile14 /t:Clean /v:quiet }
-	exec { . $MSBuild $SolutionFile /t:Clean /v:quiet }
-
+    Get-ChildItem .\ -include bin,obj -Recurse | foreach ($_) { Remove-Item $_.fullname -Force -Recurse }
+    exec { . $MSBuild $SolutionFile /t:Clean /v:quiet }
 }
 
 Task Restore-Packages  {
-	exec { . dotnet restore "$SolutionRoot\Titanium.Web.Proxy.sln" }
-    exec { . dotnet restore "$SolutionRoot\Titanium.Web.Proxy.Standard.sln" }
-
+    exec { . dotnet restore "$SolutionRoot\Titanium.Web.Proxy.sln" }
 }
 
 Task Install-MSBuild {
     if(!(Test-Path $MSBuild14)) 
-	{ 
-		cinst microsoft-build-tools -y
-	}
+    { 
+        cinst microsoft-build-tools -y
+    }
 }
 
 Task Install-BuildTools -depends Install-MSBuild
diff --git a/...anium.Web.Proxy.Examples.Basic.Standard/Titanium.Web.Proxy.Examples.Basic.Standard.csproj b/...anium.Web.Proxy.Examples.Basic.Standard/Titanium.Web.Proxy.Examples.Basic.Standard.csproj
@@ -2,11 +2,11 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp1.1</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Titanium.Web.Proxy\Titanium.Web.Proxy.Standard.csproj" />
+    <ProjectReference Include="..\..\Titanium.Web.Proxy\Titanium.Web.Proxy.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/Examples/Titanium.Web.Proxy.Examples.Wpf/Capture.PNG b/Examples/Titanium.Web.Proxy.Examples.Wpf/Capture.PNG
diff --git a/README.md b/README.md
@@ -8,8 +8,14 @@ Kindly report only issues/bugs here . For programming help or questions use [Sta
 
 ([Wiki & Contribution guidelines](https://github.com/justcoding121/Titanium-Web-Proxy/wiki))
 
+**Console example application screenshot**
+
 ![alt tag](https://raw.githubusercontent.com/justcoding121/Titanium-Web-Proxy/develop/Examples/Titanium.Web.Proxy.Examples.Basic/Capture.PNG)
 
+**GUI example application screenshot**
+
+![alt tag](https://raw.githubusercontent.com/justcoding121/Titanium-Web-Proxy/develop/Examples/Titanium.Web.Proxy.Examples.Wpf/Capture.PNG)
+
 Features
 ========
 
@@ -39,7 +45,7 @@ For stable releases on [stable branch](https://github.com/justcoding121/Titanium
 
 Supports
 
- * .Net Standard 1.6 or above
+ * .Net Standard 2.0 or above
  * .Net Framework 4.5 or above
 
 Setup HTTP proxy:

diff --git a/Titanium.Web.Proxy.Standard.sln b/Titanium.Web.Proxy.Standard.sln
diff --git a/Titanium.Web.Proxy.sln b/Titanium.Web.Proxy.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.26730.16
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Examples", "Examples", "{B6DBABDC-C985-4872-9C38-B4E5079CBC4B}"
 EndProject
@@ -37,6 +37,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Titanium.Web.Proxy.Integrat
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Titanium.Web.Proxy.Examples.Wpf", "Examples\Titanium.Web.Proxy.Examples.Wpf\Titanium.Web.Proxy.Examples.Wpf.csproj", "{4406CE17-9A39-4F28-8363-6169A4F799C1}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Titanium.Web.Proxy.Examples.Basic.Standard", "Examples\Titanium.Web.Proxy.Examples.Basic.Standard\Titanium.Web.Proxy.Examples.Basic.Standard.csproj", "{75AEF54F-C3B7-43A8-8ECA-561FB21BC6AD}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -63,6 +65,10 @@ Global
 		{4406CE17-9A39-4F28-8363-6169A4F799C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4406CE17-9A39-4F28-8363-6169A4F799C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4406CE17-9A39-4F28-8363-6169A4F799C1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{75AEF54F-C3B7-43A8-8ECA-561FB21BC6AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{75AEF54F-C3B7-43A8-8ECA-561FB21BC6AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{75AEF54F-C3B7-43A8-8ECA-561FB21BC6AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{75AEF54F-C3B7-43A8-8ECA-561FB21BC6AD}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -72,8 +78,10 @@ Global
 		{B517E3D0-D03B-436F-AB03-34BA0D5321AF} = {BC1E0789-D348-49CF-8B67-5E99D50EDF64}
 		{32231301-B0FB-4F9E-98DF-B3E8A88F4C16} = {BC1E0789-D348-49CF-8B67-5E99D50EDF64}
 		{4406CE17-9A39-4F28-8363-6169A4F799C1} = {B6DBABDC-C985-4872-9C38-B4E5079CBC4B}
+		{75AEF54F-C3B7-43A8-8ECA-561FB21BC6AD} = {B6DBABDC-C985-4872-9C38-B4E5079CBC4B}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		EnterpriseLibraryConfigurationToolBinariesPath = .1.505.2\lib\NET35
+		SolutionGuid = {625C1EB5-44CF-47DE-A85A-B4C8C40ED90A}
 	EndGlobalSection
 EndGlobal
diff --git a/Titanium.Web.Proxy/Helpers/Firefox.cs b/Titanium.Web.Proxy/Helpers/Firefox.cs
@@ -1,4 +1,5 @@
-using System;
+#if NET45
+using System;
 using System.IO;
 
 namespace Titanium.Web.Proxy.Helpers
@@ -50,3 +51,4 @@ internal void UseSystemProxy()
         }
     }
 }
+#endif
diff --git a/Titanium.Web.Proxy/Helpers/NativeMethods.SystemProxy.cs b/Titanium.Web.Proxy/Helpers/NativeMethods.SystemProxy.cs
@@ -1,4 +1,5 @@
-using System;
+#if NET45
+using System;
 using System.Runtime.InteropServices;
 
 namespace Titanium.Web.Proxy.Helpers
@@ -20,4 +21,5 @@ internal partial class NativeMethods
         // Pinvoke
         internal delegate bool ConsoleEventDelegate(int eventType);
     }
-}
+}
+#endif
diff --git a/Titanium.Web.Proxy/Helpers/NativeMethods.Tcp.cs b/Titanium.Web.Proxy/Helpers/NativeMethods.Tcp.cs
@@ -1,3 +1,4 @@
+#if NET45
 using System;
 using System.Net.NetworkInformation;
 using System.Runtime.InteropServices;
@@ -58,4 +59,5 @@ internal struct TcpRow
         [DllImport("iphlpapi.dll", SetLastError = true)]
         internal static extern uint GetExtendedTcpTable(IntPtr tcpTable, ref int size, bool sort, int ipVersion, int tableClass, int reserved);
     }
-}
+}
+#endif
diff --git a/Titanium.Web.Proxy/Helpers/ProxyInfo.cs b/Titanium.Web.Proxy/Helpers/ProxyInfo.cs
@@ -1,4 +1,5 @@
-using System;
+#if NET45
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -198,3 +199,4 @@ private static HttpSystemProxyValue ParseProxyValue(string value)
         }
     }
 }
+#endif
diff --git a/Titanium.Web.Proxy/Helpers/RunTime.cs b/Titanium.Web.Proxy/Helpers/RunTime.cs
@@ -1,4 +1,5 @@
-using System;
+#if NET45
+using System;
 
 namespace Titanium.Web.Proxy.Helpers
 {
@@ -19,3 +20,4 @@ internal class RunTime
         internal static bool IsRunningOnMono => isRunningOnMono.Value;
     }
 }
+#endif
diff --git a/Titanium.Web.Proxy/Helpers/SystemProxy.cs b/Titanium.Web.Proxy/Helpers/SystemProxy.cs
@@ -1,4 +1,5 @@
-using System;
+#if NET45
+using System;
 using System.Linq;
 using Microsoft.Win32;
 
@@ -327,3 +328,4 @@ 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,4 +1,5 @@
-using System;
+#if NET45
+using System;
 using System.Runtime.InteropServices;
 
 // Helper classes for setting system proxy settings
@@ -130,3 +131,4 @@ internal enum ErrorCodes
         }
     }
 }
+#endif
diff --git a/Titanium.Web.Proxy/Helpers/WinHttp/WinHttpHandle.cs b/Titanium.Web.Proxy/Helpers/WinHttp/WinHttpHandle.cs
@@ -1,3 +1,4 @@
+#if NET45
 using System;
 using System.Runtime.InteropServices;
 
@@ -17,3 +18,4 @@ 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,3 +1,4 @@
+#if NET45
 using System;
 using System.Collections.Generic;
 using System.Net;
@@ -330,3 +331,4 @@ private enum AutoWebProxyState
         }
     }
 }
+#endif
diff --git a/Titanium.Web.Proxy/Network/Certificate/WinCertificateMaker.cs b/Titanium.Web.Proxy/Network/Certificate/WinCertificateMaker.cs
@@ -1,4 +1,5 @@
-using System;
+#if NET45
+using System;
 using System.Reflection;
 using System.Security.Cryptography.X509Certificates;
 using System.Threading;
@@ -296,3 +297,4 @@ private X509Certificate2 MakeCertificateInternal(string sSubjectCN, bool isRoot,
         }
     }
 }
+#endif
diff --git a/Titanium.Web.Proxy/Network/Tcp/TcpRow.cs b/Titanium.Web.Proxy/Network/Tcp/TcpRow.cs
@@ -1,4 +1,5 @@
-using System.Net;
+#if NET45
+using System.Net;
 using Titanium.Web.Proxy.Extensions;
 using Titanium.Web.Proxy.Helpers;
 
@@ -61,3 +62,4 @@ internal TcpRow(NativeMethods.TcpRow tcpRow)
         internal int ProcessId { get; }
     }
 }
+#endif
diff --git a/Titanium.Web.Proxy/Network/Tcp/TcpTable.cs b/Titanium.Web.Proxy/Network/Tcp/TcpTable.cs
@@ -1,4 +1,5 @@
-using System.Collections;
+#if NET45
+using System.Collections;
 using System.Collections.Generic;
 
 namespace Titanium.Web.Proxy.Network.Tcp
@@ -44,3 +45,4 @@ IEnumerator IEnumerable.GetEnumerator()
         }
     }
 }
+#endif
diff --git a/Titanium.Web.Proxy/Network/WinAuth/Security/Common.cs b/Titanium.Web.Proxy/Network/WinAuth/Security/Common.cs
@@ -1,4 +1,5 @@
-using System;
+#if NET45
+using System;
 using System.Runtime.InteropServices;
 
 namespace Titanium.Web.Proxy.Network.WinAuth.Security
@@ -280,3 +281,4 @@ internal byte[] GetBytes()
         #endregion
     }
 }
+#endif
diff --git a/Titanium.Web.Proxy/Network/WinAuth/Security/LittleEndian.cs b/Titanium.Web.Proxy/Network/WinAuth/Security/LittleEndian.cs
@@ -1,3 +1,4 @@
+#if NET45
 //
 // Mono.Security.BitConverterLE.cs
 //  Like System.BitConverter but always little endian
@@ -250,3 +251,4 @@ internal static unsafe double ToDouble(byte[] value, int startIndex)
         }
     }
 }
+#endif
diff --git a/Titanium.Web.Proxy/Network/WinAuth/Security/Message.cs b/Titanium.Web.Proxy/Network/WinAuth/Security/Message.cs
@@ -1,3 +1,4 @@
+#if NET45
 //
 // Nancy.Authentication.Ntlm.Protocol.Type3Message - Authentication
 //
@@ -128,3 +129,4 @@ protected bool CheckHeader(byte[] message)
         }
     }
 }
+#endif
diff --git a/Titanium.Web.Proxy/Network/WinAuth/Security/State.cs b/Titanium.Web.Proxy/Network/WinAuth/Security/State.cs
@@ -1,4 +1,5 @@
-using System;
+#if NET45
+using System;
 
 namespace Titanium.Web.Proxy.Network.WinAuth.Security
 {
@@ -42,3 +43,4 @@ internal void UpdatePresence()
         }
     }
 }
+#endif
diff --git a/Titanium.Web.Proxy/Network/WinAuth/Security/WinAuthEndPoint.cs b/Titanium.Web.Proxy/Network/WinAuth/Security/WinAuthEndPoint.cs
@@ -1,4 +1,5 @@
-// http://pinvoke.net/default.aspx/secur32/InitializeSecurityContext.html
+#if NET45
+// http://pinvoke.net/default.aspx/secur32/InitializeSecurityContext.html
 
 using System;
 using System.Collections.Concurrent;
@@ -211,3 +212,4 @@ private static extern int AcquireCredentialsHandle(
         #endregion
     }
 }
+#endif