Skip to content
This repository was archived by the owner on Jul 9, 2023. It is now read-only.

3.0.655+ #492

Merged
merged 40 commits into from
Sep 22, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
75a10f9
move source under src\ directory
justcoding121 Aug 30, 2018
879445b
set repo root
Aug 30, 2018
00c3fc6
nuget fix
Aug 30, 2018
2c0e49b
docs fix
Aug 30, 2018
6ae4989
Update README.md
justcoding121 Sep 1, 2018
9334162
Update README.md
justcoding121 Sep 1, 2018
2d898f1
Update README.md
justcoding121 Sep 1, 2018
8eecddb
Update README.md
justcoding121 Sep 1, 2018
f68b24c
Update README.md
justcoding121 Sep 1, 2018
d7cec38
exclude build
justcoding121 Sep 2, 2018
9b2c50c
vscode proj
justcoding121 Sep 3, 2018
774fae6
fix console launch
justcoding121 Sep 3, 2018
21b97f5
ignore vscode
justcoding121 Sep 3, 2018
54ae2ef
fix wpf build
justcoding121 Sep 3, 2018
380de7e
fix names
justcoding121 Sep 3, 2018
43d526b
sln exclude
justcoding121 Sep 3, 2018
14709ac
add core build task
justcoding121 Sep 3, 2018
99dbaee
docfx path fix
justcoding121 Sep 3, 2018
b5b0b4a
ominisharp exlude docs proj from building
justcoding121 Sep 4, 2018
b056980
API documentation update by build server
Sep 3, 2018
17a85d9
macOS fixes
justcoding121 Sep 4, 2018
4728bc4
fix exclusion
justcoding121 Sep 4, 2018
852f257
netcore proj
justcoding121 Sep 4, 2018
f54ae78
rm net45
justcoding121 Sep 4, 2018
897b7b5
fix launch
justcoding121 Sep 4, 2018
c7a1ff7
rm platform
justcoding121 Sep 4, 2018
39d351d
fix operating system checks
justcoding121 Sep 4, 2018
3afe7c2
fix reference
justcoding121 Sep 4, 2018
f1dd35d
API documentation update by build server
Sep 4, 2018
ab46768
mono sln
justcoding121 Sep 4, 2018
c6b908b
update IDE
justcoding121 Sep 4, 2018
51124e8
mono fix
justcoding121 Sep 4, 2018
871985c
Update README.md
justcoding121 Sep 4, 2018
a861f38
release build
justcoding121 Sep 4, 2018
3f9663e
rm default
justcoding121 Sep 4, 2018
33123c8
Update README.md
justcoding121 Sep 4, 2018
f151c99
Update README.md
justcoding121 Sep 4, 2018
b6bdf04
Update README.md
justcoding121 Sep 21, 2018
ebc25f5
optional prefetch
justcoding121 Sep 22, 2018
4d00181
API documentation update by build server
Sep 22, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions .build/build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ $PSake.use_exit_on_error = $true

$Here = "$(Split-Path -parent $MyInvocation.MyCommand.Definition)"

$SolutionRoot = (Split-Path -parent $Here)
$RepoRoot = $(Split-Path -parent $Here)
$SolutionRoot = "$RepoRoot\src"

$ProjectName = "Titanium.Web.Proxy"
$GitHubProjectName = "Titanium-Web-Proxy"
Expand All @@ -26,7 +27,7 @@ if(!$Branch) { $Branch = "local" }

if($Branch -eq "beta" ) { $Version = "$Version-beta" }

$NuGet = Join-Path $SolutionRoot ".nuget\nuget.exe"
$NuGet = Join-Path $RepoRoot ".nuget\nuget.exe"

$MSBuild = "${env:ProgramFiles(x86)}\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\msbuild.exe"
$MSBuild -replace ' ', '` '
Expand Down Expand Up @@ -57,20 +58,21 @@ Task Restore-Packages -depends Install-BuildTools {

#build
Task Build -depends Restore-Packages{
exec { . $MSBuild $SolutionFile /t:Build /v:normal /p:Configuration=$Configuration /t:restore }
exec { . $MSBuild $SolutionFile /t:Build /v:normal /p:Configuration=$Configuration /p:Platform="Any CPU" /t:restore }
}

#publish API documentation changes for GitHub pages under master\docs directory
Task Document -depends Build {

if($Branch -eq "master")
{

#use docfx to generate API documentation from source metadata
docfx docfx.json

#patch index.json so that it is always sorted
#otherwise git will think file was changed
$IndexJsonFile = "$SolutionRoot\docs\index.json"
$IndexJsonFile = "$RepoRoot\docs\index.json"
$unsorted = Get-Content $IndexJsonFile | Out-String
[Reflection.Assembly]::LoadFile("$Here\lib\Newtonsoft.Json.dll")
[System.Reflection.Assembly]::LoadWithPartialName("System")
Expand All @@ -79,7 +81,7 @@ Task Document -depends Build {
Set-Content -Path $IndexJsonFile -Value $obj

#setup clone directory
$TEMP_REPO_DIR =(Split-Path -parent $SolutionRoot) + "\temp-repo-clone"
$TEMP_REPO_DIR =(Split-Path -parent $RepoRoot) + "\temp-repo-clone"

If(test-path $TEMP_REPO_DIR)
{
Expand All @@ -101,7 +103,7 @@ Task Document -depends Build {
cd "$TEMP_REPO_DIR\docs"

#copy docs to clone directory\docs
Copy-Item -Path "$SolutionRoot\docs\*" -Destination "$TEMP_REPO_DIR\docs" -Recurse -Force
Copy-Item -Path "$RepoRoot\docs\*" -Destination "$TEMP_REPO_DIR\docs" -Recurse -Force

#push changes to master
git config --global credential.helper store
Expand All @@ -119,5 +121,5 @@ Task Document -depends Build {

#package nuget files
Task Package -depends Document {
exec { . $NuGet pack "$SolutionRoot\$ProjectName\$ProjectName.nuspec" -Properties Configuration=$Configuration -OutputDirectory "$SolutionRoot" -Version "$Version" }
exec { . $NuGet pack "$SolutionRoot\$ProjectName\$ProjectName.nuspec" -Properties Configuration=$Configuration -OutputDirectory "$RepoRoot" -Version "$Version" }
}
2 changes: 1 addition & 1 deletion .build/docfx.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"src": [
{
"files": [ "Titanium.Web.Proxy.Docs.sln"],
"src": "../"
"src": "../src/"
}
],
"dest": "obj/api"
Expand Down
2 changes: 1 addition & 1 deletion .build/setup.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ param (

function Install-Chocolatey()
{
if(-not $env:ChocolateyInstall -or -not (Test-Path "$env:ChocolateyInstall"))
if(-not $env:ChocolateyInstall -or -not (Test-Path "$env:ChocolateyInstall\*"))
{
Write-Output "Chocolatey Not Found, Installing..."
iex ((new-object net.webclient).DownloadString('http://chocolatey.org/install.ps1'))
Expand Down
27 changes: 27 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"version": "0.2.0",
"configurations": [
{
"name": "NetCore|Debug|Basic Example",
"type": "coreclr",
"request": "launch",
"program": "${workspaceRoot}/examples/Titanium.Web.Proxy.Examples.Basic/bin/Debug/netcoreapp2.0/Titanium.Web.Proxy.Examples.Basic.NetCore.dll",
"args": [],
"cwd": "${workspaceRoot}",
"stopAtEntry": false,
"console": "integratedTerminal",
"preLaunchTask": "build-basic-example-netcore-debug"
},
{
"name": "NetCore|Release|Basic Example",
"type": "coreclr",
"request": "launch",
"program": "${workspaceRoot}/examples/Titanium.Web.Proxy.Examples.Basic/bin/Release/netcoreapp2.0/Titanium.Web.Proxy.Examples.Basic.NetCore.dll",
"args": [],
"cwd": "${workspaceRoot}",
"stopAtEntry": false,
"console": "integratedTerminal",
"preLaunchTask": "build-basic-example-netcore-release"
}
]
}
37 changes: 37 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{
// The following will hide the js and map files in the editor
"files.exclude": {
"**/.build": true,
"**/.nuget": true,
"**/.vs": true,
"**/docs": true,
"**/packages": true,
"**/bin": true,
"**/obj": true,
"**/*.DotSettings": true,
"**/*.sln": true,
"**/tests/" : true,
"**/Titanium.Web.Proxy.Examples.Wpf/" : true,
"**/*.Basic.csproj/": true,
"**/*.Docs.csproj/": true,
"**/*.Proxy.csproj/": true,
"**/*.Proxy.csproj" : true
},
"search.exclude": {
"**/.build": true,
"**/.nuget": true,
"**/.vs": true,
"**/docs": true,
"**/packages": true,
"**/bin": true,
"**/obj": true,
"**/*.DotSettings": true,
"**/*.sln": true,
"**/tests/" : true,
"**/Titanium.Web.Proxy.Examples.Wpf/" : true,
"**/*.Basic.csproj/": true,
"**/*.Docs.csproj/": true,
"**/*.Proxy.csproj/": true,
"**/*.Proxy.csproj" : true
}
}
23 changes: 23 additions & 0 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"version": "2.0.0",
"tasks": [
{
"label": "build-basic-example-netcore-debug",
"type": "process",
"command": "dotnet",
"args": ["build","${workspaceFolder}/examples/Titanium.Web.Proxy.Examples.Basic/Titanium.Web.Proxy.Examples.Basic.NetCore.csproj"],
"problemMatcher": "$msCompile",
"group": {
"kind": "build",
"isDefault": true
}
},
{
"label": "build-basic-example-netcore-release",
"type": "process",
"command": "dotnet",
"args": ["build","${workspaceFolder}/examples/Titanium.Web.Proxy.Examples.Basic/Titanium.Web.Proxy.Examples.Basic.NetCore.csproj", "-c", "Release"],
"problemMatcher": "$msCompile"
}
]
}
43 changes: 29 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,31 +9,19 @@ Kindly report only issues/bugs here . For programming help or questions use [Sta
* [API Documentation](https://justcoding121.github.io/Titanium-Web-Proxy/docs/api/Titanium.Web.Proxy.ProxyServer.html)
* [Uncyclo & Contribution guidelines](https://github.com/justcoding121/Titanium-Web-Proxy/wiki)

**Console example application screenshot**

![alt tag](https://raw.githubusercontent.com/justcoding121/Titanium-Web-Proxy/master/Examples/Titanium.Web.Proxy.Examples.Basic/Capture.PNG)

**GUI example application screenshot**

![alt tag](https://raw.githubusercontent.com/justcoding121/Titanium-Web-Proxy/master/Examples/Titanium.Web.Proxy.Examples.Wpf/Capture.PNG)

### Features

* Multithreaded & fully asynchronous proxy employing server connection pooling, certificate cache & buffer pooling
* View/modify/redirect/block requests & responses
* Supports mutual SSL authentication, proxy authentication & automatic upstream proxy detection
* Kerberos/NTLM authentication over HTTP protocols for windows domain

### Usage


Refer the HTTP Proxy Server library in your project, look up Test project to learn usage.

### Installation
Install by [nuget](https://www.nuget.org/packages/Titanium.Web.Proxy)

For beta releases on [beta branch](https://github.com/justcoding121/Titanium-Web-Proxy/tree/beta)

Install-Package Titanium.Web.Proxy
Install-Package Titanium.Web.Proxy -Pre

For stable releases on [stable branch](https://github.com/justcoding121/Titanium-Web-Proxy/tree/stable)

Expand All @@ -44,6 +32,24 @@ Supports
* .Net Standard 2.0 or above
* .Net Framework 4.5 or above

### Development environment

#### Windows
* Visual Studio Code as IDE for .NET core
* Visual Studio 2017 as IDE for .NET framework/.NET core

#### Mac OS
* Visual Studio Code as IDE for .NET core
* Visual Studio 2017 as IDE for Mono

#### Linux
* Visual Studio Code as IDE for .NET core
* Mono develop as IDE for Mono

### Usage

Refer the HTTP Proxy Server library in your project, look up Test project to learn usage.

Setup HTTP proxy:

```csharp
Expand Down Expand Up @@ -229,3 +235,12 @@ public Task OnCertificateSelection(object sender, CertificateSelectionEventArgs
#### Collaborators

* [honfika](https://github.com/honfika)


**Console example application screenshot**

![alt tag](https://raw.githubusercontent.com/justcoding121/Titanium-Web-Proxy/master/examples/Titanium.Web.Proxy.Examples.Basic/Capture.PNG)

**GUI example application screenshot**

![alt tag](https://raw.githubusercontent.com/justcoding121/Titanium-Web-Proxy/master/examples/Titanium.Web.Proxy.Examples.Wpf/Capture.PNG)
80 changes: 0 additions & 80 deletions Titanium.Web.Proxy.sln

This file was deleted.

48 changes: 0 additions & 48 deletions Titanium.Web.Proxy/Helpers/RunTime.cs

This file was deleted.

7 changes: 6 additions & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,12 @@ skip_tags: true

skip_commits:
author: buildbot121

files:
- docs/*
- .vscode/*
- README.md
- LICENSE

#---------------------------------#
# artifacts configuration #
#---------------------------------#
Expand Down
Loading