Unverified Commit 95a8877a authored by Jehonathan Thomas's avatar Jehonathan Thomas Committed by GitHub

Merge pull request #338 from justcoding121/develop

3.0.194+
parents c7ff73ad 21e820ac
......@@ -14,7 +14,7 @@ Install-Psake
$psakeDirectory = (Resolve-Path $env:ChocolateyInstall\lib\Psake*)
Import-Module (Join-Path $psakeDirectory "tools\Psake.psm1")
Import-Module (Join-Path $psakeDirectory "tools\Psake\Psake.psm1")
if($Help)
{
......
......@@ -24,7 +24,7 @@ function Install-Chocolatey()
function Install-Psake()
{
if(!(Test-Path $env:ChocolateyInstall\lib\Psake*))
if(!(Test-Path $env:ChocolateyInstall\lib\Psake\tools\Psake*))
{
choco install psake -y
}
......
......@@ -54,7 +54,7 @@ Task Restore-Packages {
}
Task Install-MSBuild {
if(!(Test-Path $MSBuild14))
if(!(Test-Path $MSBuild))
{
cinst microsoft-build-tools -y
}
......
......@@ -53,7 +53,7 @@ namespace Titanium.Web.Proxy.Network
if (certEngine == null)
{
certEngine = engine == CertificateEngine.BouncyCastle ? (ICertificateMaker)new BCCertificateMaker() : new WinCertificateMaker();
certEngine = engine == CertificateEngine.BouncyCastle ? (ICertificateMaker)new BCCertificateMaker(exceptionFunc) : new WinCertificateMaker(exceptionFunc);
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment