Merge pull request #338 from justcoding121/develop

justcoding121 · web-flow · commit 95a8877a28eb · 2017-11-26T11:45:18.000-05:00
3.0.194+
diff --git a/.build/Bootstrap.ps1 b/.build/Bootstrap.ps1
@@ -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)
 { 
diff --git a/.build/Common.psm1 b/.build/Common.psm1
@@ -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
 	}
diff --git a/.build/default.ps1 b/.build/default.ps1
@@ -54,7 +54,7 @@ Task Restore-Packages  {
 }
 
 Task Install-MSBuild {
-    if(!(Test-Path $MSBuild14)) 
+    if(!(Test-Path $MSBuild)) 
     { 
         cinst microsoft-build-tools -y
     }
diff --git a/Titanium.Web.Proxy/Network/CertificateManager.cs b/Titanium.Web.Proxy/Network/CertificateManager.cs
@@ -53,7 +53,7 @@ internal CertificateEngine Engine
 
                 if (certEngine == null)
                 {
-                    certEngine = engine == CertificateEngine.BouncyCastle ? (ICertificateMaker)new BCCertificateMaker() : new WinCertificateMaker();
+                    certEngine = engine == CertificateEngine.BouncyCastle ? (ICertificateMaker)new BCCertificateMaker(exceptionFunc) : new WinCertificateMaker(exceptionFunc);
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ Install-Psake`
`14`	`14`
`15`	`15`	`$psakeDirectory = (Resolve-Path $env:ChocolateyInstall\lib\Psake*)`
`16`	`16`
`17`		`-Import-Module (Join-Path $psakeDirectory "tools\Psake.psm1")`
	`17`	`+Import-Module (Join-Path $psakeDirectory "tools\Psake\Psake.psm1")`
`18`	`18`
`19`	`19`	`if($Help)`
`20`	`20`	`{`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ function Install-Chocolatey()`
`24`	`24`
`25`	`25`	`function Install-Psake()`
`26`	`26`	`{`
`27`		`- if(!(Test-Path $env:ChocolateyInstall\lib\Psake*))`
	`27`	`+ if(!(Test-Path $env:ChocolateyInstall\lib\Psake\tools\Psake*))`
`28`	`28`	`{`
`29`	`29`	`choco install psake -y`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ Task Restore-Packages {`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`Task Install-MSBuild {`
`57`		`- if(!(Test-Path $MSBuild14))`
	`57`	`+ if(!(Test-Path $MSBuild))`
`58`	`58`	`{`
`59`	`59`	`cinst microsoft-build-tools -y`
`60`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ internal CertificateEngine Engine`
`53`	`53`
`54`	`54`	`if (certEngine == null)`
`55`	`55`	`{`
`56`		`- certEngine = engine == CertificateEngine.BouncyCastle ? (ICertificateMaker)new BCCertificateMaker() : new WinCertificateMaker();`
	`56`	`+ certEngine = engine == CertificateEngine.BouncyCastle ? (ICertificateMaker)new BCCertificateMaker(exceptionFunc) : new WinCertificateMaker(exceptionFunc);`
`57`	`57`	`}`
`58`	`58`	`}`
`59`	`59`	`}`