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

Commit c3fc1d3

Browse files
justcoding121justcoding121
authored
Merge pull request #492 from justcoding121/master
3.0.655+
2 parents a4ea380 + 4d00181 commit c3fc1d3

File tree

198 files changed

+4346
-3565
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

198 files changed

+4346
-3565
lines changed

‎.build/build.ps1

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ $PSake.use_exit_on_error = $true
22

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

5-
$SolutionRoot = (Split-Path -parent $Here)
5+
$RepoRoot = $(Split-Path -parent $Here)
6+
$SolutionRoot = "$RepoRoot\src"
67

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

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

29-
$NuGet = Join-Path $SolutionRoot ".nuget\nuget.exe"
30+
$NuGet = Join-Path $RepoRoot ".nuget\nuget.exe"
3031

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

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

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

6667
if($Branch -eq "master")
6768
{
69+
6870
#use docfx to generate API documentation from source metadata
6971
docfx docfx.json
7072

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

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

8486
If(test-path $TEMP_REPO_DIR)
8587
{
@@ -101,7 +103,7 @@ Task Document -depends Build {
101103
cd "$TEMP_REPO_DIR\docs"
102104

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

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

120122
#package nuget files
121123
Task Package -depends Document {
122-
exec { . $NuGet pack "$SolutionRoot\$ProjectName\$ProjectName.nuspec" -Properties Configuration=$Configuration -OutputDirectory "$SolutionRoot" -Version "$Version" }
124+
exec { . $NuGet pack "$SolutionRoot\$ProjectName\$ProjectName.nuspec" -Properties Configuration=$Configuration -OutputDirectory "$RepoRoot" -Version "$Version" }
123125
}

‎.build/docfx.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"src": [
55
{
66
"files": [ "Titanium.Web.Proxy.Docs.sln"],
7-
"src": "../"
7+
"src": "../src/"
88
}
99
],
1010
"dest": "obj/api"

‎.build/setup.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ param (
66

77
function Install-Chocolatey()
88
{
9-
if(-not $env:ChocolateyInstall -or -not (Test-Path "$env:ChocolateyInstall"))
9+
if(-not $env:ChocolateyInstall -or -not (Test-Path "$env:ChocolateyInstall\*"))
1010
{
1111
Write-Output "Chocolatey Not Found, Installing..."
1212
iex ((new-object net.webclient).DownloadString('http://chocolatey.org/install.ps1'))

‎.vscode/launch.json

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{
2+
"version": "0.2.0",
3+
"configurations": [
4+
{
5+
"name": "NetCore|Debug|Basic Example",
6+
"type": "coreclr",
7+
"request": "launch",
8+
"program": "${workspaceRoot}/examples/Titanium.Web.Proxy.Examples.Basic/bin/Debug/netcoreapp2.0/Titanium.Web.Proxy.Examples.Basic.NetCore.dll",
9+
"args": [],
10+
"cwd": "${workspaceRoot}",
11+
"stopAtEntry": false,
12+
"console": "integratedTerminal",
13+
"preLaunchTask": "build-basic-example-netcore-debug"
14+
},
15+
{
16+
"name": "NetCore|Release|Basic Example",
17+
"type": "coreclr",
18+
"request": "launch",
19+
"program": "${workspaceRoot}/examples/Titanium.Web.Proxy.Examples.Basic/bin/Release/netcoreapp2.0/Titanium.Web.Proxy.Examples.Basic.NetCore.dll",
20+
"args": [],
21+
"cwd": "${workspaceRoot}",
22+
"stopAtEntry": false,
23+
"console": "integratedTerminal",
24+
"preLaunchTask": "build-basic-example-netcore-release"
25+
}
26+
]
27+
}

‎.vscode/settings.json

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
{
2+
// The following will hide the js and map files in the editor
3+
"files.exclude": {
4+
"**/.build": true,
5+
"**/.nuget": true,
6+
"**/.vs": true,
7+
"**/docs": true,
8+
"**/packages": true,
9+
"**/bin": true,
10+
"**/obj": true,
11+
"**/*.DotSettings": true,
12+
"**/*.sln": true,
13+
"**/tests/" : true,
14+
"**/Titanium.Web.Proxy.Examples.Wpf/" : true,
15+
"**/*.Basic.csproj/": true,
16+
"**/*.Docs.csproj/": true,
17+
"**/*.Proxy.csproj/": true,
18+
"**/*.Proxy.csproj" : true
19+
},
20+
"search.exclude": {
21+
"**/.build": true,
22+
"**/.nuget": true,
23+
"**/.vs": true,
24+
"**/docs": true,
25+
"**/packages": true,
26+
"**/bin": true,
27+
"**/obj": true,
28+
"**/*.DotSettings": true,
29+
"**/*.sln": true,
30+
"**/tests/" : true,
31+
"**/Titanium.Web.Proxy.Examples.Wpf/" : true,
32+
"**/*.Basic.csproj/": true,
33+
"**/*.Docs.csproj/": true,
34+
"**/*.Proxy.csproj/": true,
35+
"**/*.Proxy.csproj" : true
36+
}
37+
}

‎.vscode/tasks.json

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"version": "2.0.0",
3+
"tasks": [
4+
{
5+
"label": "build-basic-example-netcore-debug",
6+
"type": "process",
7+
"command": "dotnet",
8+
"args": ["build","${workspaceFolder}/examples/Titanium.Web.Proxy.Examples.Basic/Titanium.Web.Proxy.Examples.Basic.NetCore.csproj"],
9+
"problemMatcher": "$msCompile",
10+
"group": {
11+
"kind": "build",
12+
"isDefault": true
13+
}
14+
},
15+
{
16+
"label": "build-basic-example-netcore-release",
17+
"type": "process",
18+
"command": "dotnet",
19+
"args": ["build","${workspaceFolder}/examples/Titanium.Web.Proxy.Examples.Basic/Titanium.Web.Proxy.Examples.Basic.NetCore.csproj", "-c", "Release"],
20+
"problemMatcher": "$msCompile"
21+
}
22+
]
23+
}

‎README.md

Lines changed: 29 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,31 +9,19 @@ Kindly report only issues/bugs here . For programming help or questions use [Sta
99
* [API Documentation](https://justcoding121.github.io/Titanium-Web-Proxy/docs/api/Titanium.Web.Proxy.ProxyServer.html)
1010
* [Uncyclo & Contribution guidelines](https://github.com/justcoding121/Titanium-Web-Proxy/wiki)
1111

12-
**Console example application screenshot**
13-
14-
![alt tag](https://raw.githubusercontent.com/justcoding121/Titanium-Web-Proxy/master/Examples/Titanium.Web.Proxy.Examples.Basic/Capture.PNG)
15-
16-
**GUI example application screenshot**
17-
18-
![alt tag](https://raw.githubusercontent.com/justcoding121/Titanium-Web-Proxy/master/Examples/Titanium.Web.Proxy.Examples.Wpf/Capture.PNG)
19-
2012
### Features
2113

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

27-
### Usage
28-
29-
30-
Refer the HTTP Proxy Server library in your project, look up Test project to learn usage.
31-
19+
### Installation
3220
Install by [nuget](https://www.nuget.org/packages/Titanium.Web.Proxy)
3321

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

36-
Install-Package Titanium.Web.Proxy
24+
Install-Package Titanium.Web.Proxy -Pre
3725

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

@@ -44,6 +32,24 @@ Supports
4432
* .Net Standard 2.0 or above
4533
* .Net Framework 4.5 or above
4634

35+
### Development environment
36+
37+
#### Windows
38+
* Visual Studio Code as IDE for .NET core
39+
* Visual Studio 2017 as IDE for .NET framework/.NET core
40+
41+
#### Mac OS
42+
* Visual Studio Code as IDE for .NET core
43+
* Visual Studio 2017 as IDE for Mono
44+
45+
#### Linux
46+
* Visual Studio Code as IDE for .NET core
47+
* Mono develop as IDE for Mono
48+
49+
### Usage
50+
51+
Refer the HTTP Proxy Server library in your project, look up Test project to learn usage.
52+
4753
Setup HTTP proxy:
4854

4955
```csharp
@@ -229,3 +235,12 @@ public Task OnCertificateSelection(object sender, CertificateSelectionEventArgs
229235
#### Collaborators
230236

231237
* [honfika](https://github.com/honfika)
238+
239+
240+
**Console example application screenshot**
241+
242+
![alt tag](https://raw.githubusercontent.com/justcoding121/Titanium-Web-Proxy/master/examples/Titanium.Web.Proxy.Examples.Basic/Capture.PNG)
243+
244+
**GUI example application screenshot**
245+
246+
![alt tag](https://raw.githubusercontent.com/justcoding121/Titanium-Web-Proxy/master/examples/Titanium.Web.Proxy.Examples.Wpf/Capture.PNG)

‎Titanium.Web.Proxy.sln

Lines changed: 0 additions & 80 deletions
This file was deleted.

‎Titanium.Web.Proxy/Helpers/RunTime.cs

Lines changed: 0 additions & 48 deletions
This file was deleted.

‎appveyor.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,12 @@ skip_tags: true
4141

4242
skip_commits:
4343
author: buildbot121
44-
44+
files:
45+
- docs/*
46+
- .vscode/*
47+
- README.md
48+
- LICENSE
49+
4550
#---------------------------------#
4651
# artifacts configuration #
4752
#---------------------------------#

0 commit comments

Comments
 (0)