diff --git a/.build/build.ps1 b/.build/build.ps1 index 6e588b1e6..e98be4697 100644 --- a/.build/build.ps1 +++ b/.build/build.ps1 @@ -35,7 +35,7 @@ $MSBuild -replace ' ', '` ' FormatTaskName (("-"*25) + "[{0}]" + ("-"*25)) #default task -Task default -depends Clean, Build, Document, Package +Task default -depends Package #cleans obj, b Task Clean { @@ -43,8 +43,19 @@ Task Clean { exec { . $MSBuild $SolutionFile /t:Clean /v:quiet } } +#install root cetificate needed for integration tests +Task Setup-Integration-Test-Tools -depends Clean { + +$startInfo = new-object System.Diagnostics.ProcessStartInfo "PowerShell"; +$startInfo.Arguments = "$Here\install-certificate.ps1"; +$startInfo.Verb = "runas"; +$process = [System.Diagnostics.Process]::Start($startInfo); +$process.WaitForExit() + +} + #install build tools -Task Install-BuildTools -depends Clean { +Task Install-BuildTools -depends Setup-Integration-Test-Tools { if(!(Test-Path $MSBuild)) { cinst microsoft-build-tools -y diff --git a/.build/cleanup-cache.txt b/.build/cleanup-cache.txt new file mode 100644 index 000000000..1abb10208 --- /dev/null +++ b/.build/cleanup-cache.txt @@ -0,0 +1 @@ +* Modify this text to trigger appveyor build cache \ No newline at end of file diff --git a/.build/install-certificate.ps1 b/.build/install-certificate.ps1 new file mode 100644 index 000000000..78226a48a --- /dev/null +++ b/.build/install-certificate.ps1 @@ -0,0 +1,10 @@ +$Here = "$(Split-Path -parent $MyInvocation.MyCommand.Definition)" + +$pfx = new-object System.Security.Cryptography.X509Certificates.X509Certificate2 +$certPath = "$Here\lib\rootCert.pfx" +$pfxPass = "" +$pfx.import($certPath,$pfxPass,"Exportable,PersistKeySet") +$store = new-object System.Security.Cryptography.X509Certificates.X509Store([System.Security.Cryptography.X509Certificates.StoreName]::Root, "localmachine") +$store.open("MaxAllowed") +$store.add($pfx) +$store.close() \ No newline at end of file diff --git a/.build/lib/rootCert.pfx b/.build/lib/rootCert.pfx new file mode 100644 index 000000000..d21e27705 Binary files /dev/null and b/.build/lib/rootCert.pfx differ diff --git a/.build/setup.ps1 b/.build/setup.ps1 index a0ccb55a1..efbdeb6b9 100644 --- a/.build/setup.ps1 +++ b/.build/setup.ps1 @@ -36,7 +36,7 @@ function Install-DocFx() { if(!(Test-Path $env:ChocolateyInstall\lib\docfx\tools*)) { - choco install docfx + choco install docfx --version 2.40.1 } $env:Path += ";$env:ChocolateyInstall\lib\docfx\tools" } diff --git a/README.md b/README.md index ed17da133..7d096444a 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ A light weight HTTP(S) proxy server written in C# -![Build Status](https://ci.appveyor.com/api/projects/status/rvlxv8xgj0m7lkr4?svg=true) [![Join the chat at https://gitter.im/Titanium-Web-Proxy/Lobby](https://badges.gitter.im/Titanium-Web-Proxy/Lobby.svg)](https://gitter.im/Titanium-Web-Proxy/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) +![Build Status](https://ci.appveyor.com/api/projects/status/p5vvtbpx9yp250ol?svg=true) [![Join the chat at https://gitter.im/Titanium-Web-Proxy/Lobby](https://badges.gitter.im/Titanium-Web-Proxy/Lobby.svg)](https://gitter.im/Titanium-Web-Proxy/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) Kindly report only issues/bugs here . For programming help or questions use [StackOverflow](http://stackoverflow.com/questions/tagged/titanium-web-proxy) with the tag Titanium-Web-Proxy. diff --git a/appveyor.yml b/appveyor.yml index 8cecaa260..37c305e1f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -10,7 +10,7 @@ version: 3.0.{build} image: Visual Studio 2017 -shallow_clone: true +shallow_clone: false #---------------------------------# # build configuration # @@ -22,10 +22,13 @@ platform: Any CPU # build Configuration, i.e. Debug, Release, etc. configuration: Release +#set file change to watch so that cache can be invalidated on demand. +cache: .build\cleanup-cache.txt + # to run your custom scripts instead of automatic MSBuild build_script: - cmd: build.bat Package - + assembly_info: patch: true file: AssemblyInfo.* diff --git a/docs/api/Titanium.Web.Proxy.EventArguments.AsyncEventHandler-1.html b/docs/api/Titanium.Web.Proxy.EventArguments.AsyncEventHandler-1.html index c1dcd81f5..44b42b65a 100644 --- a/docs/api/Titanium.Web.Proxy.EventArguments.AsyncEventHandler-1.html +++ b/docs/api/Titanium.Web.Proxy.EventArguments.AsyncEventHandler-1.html @@ -10,7 +10,7 @@ - + @@ -154,6 +154,12 @@
Type Parameters