diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index a28f8fe4f6..600803b115 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,3 +1,6 @@ +#### 2.3.6 - 22.09.2015 +* BUGFIX: Fix unsupported https scheme in web proxy - https://github.com/fsprojects/Paket/pull/1080 + #### 2.3.5 - 22.09.2015 * BUGFIX: Ignore DotNET 5.0 framework when TargetFramework 4 is specified - https://github.com/fsprojects/Paket/issues/1066 diff --git a/tests/Paket.Bootstrapper.Tests/EnvWebProxyShould.cs b/tests/Paket.Bootstrapper.Tests/EnvWebProxyShould.cs index 939f7f9483..92cf0b5fa1 100644 --- a/tests/Paket.Bootstrapper.Tests/EnvWebProxyShould.cs +++ b/tests/Paket.Bootstrapper.Tests/EnvWebProxyShould.cs @@ -114,7 +114,7 @@ [Test] public void GetHttpsProxyWithPortAndCredentials() Assert.IsTrue(envProxy.TryGetProxyFor(new Uri("https://github.com"), out proxy)); var webProxy = proxy as WebProxy; Assert.IsNotNull(webProxy); - Assert.That(webProxy.Address, Is.EqualTo(new Uri("https://proxy.local:8080"))); + Assert.That(webProxy.Address, Is.EqualTo(new Uri("http://proxy.local:8080"))); Assert.IsTrue(webProxy.BypassProxyOnLocal); Assert.That(webProxy.BypassList.Length, Is.EqualTo(0)); var credentials = webProxy.Credentials as NetworkCredential; diff --git a/tests/Paket.Tests/UtilsSpecs.fs b/tests/Paket.Tests/UtilsSpecs.fs index 81e5654d97..a304434630 100644 --- a/tests/Paket.Tests/UtilsSpecs.fs +++ b/tests/Paket.Tests/UtilsSpecs.fs @@ -153,7 +153,7 @@ let ``get https env proxy no port nor credentials``() = let pOpt = envProxies().TryFind "https" Option.isSome pOpt |> shouldEqual true let p = Option.get pOpt - p.Address |> shouldEqual (new Uri("https://proxy.local")) + p.Address |> shouldEqual (new Uri("http://proxy.local:443")) p.BypassProxyOnLocal |> shouldEqual true p.BypassList.Length |> shouldEqual 0 p.Credentials |> shouldEqual null @@ -177,7 +177,7 @@ let ``get https env proxy with port no credentials``() = let pOpt = envProxies().TryFind "https" Option.isSome pOpt |> shouldEqual true let p = Option.get pOpt - p.Address |> shouldEqual (new Uri("https://proxy.local:8080")) + p.Address |> shouldEqual (new Uri("http://proxy.local:8080")) p.BypassProxyOnLocal |> shouldEqual true p.BypassList.Length |> shouldEqual 0 p.Credentials |> shouldEqual null @@ -205,7 +205,7 @@ let ``get https env proxy with port and credentials``() = let pOpt = envProxies().TryFind "https" Option.isSome pOpt |> shouldEqual true let p = Option.get pOpt - p.Address |> shouldEqual (new Uri("https://proxy.local:8080")) + p.Address |> shouldEqual (new Uri("http://proxy.local:8080")) p.BypassProxyOnLocal |> shouldEqual true p.BypassList.Length |> shouldEqual 0 let credentials = p.Credentials :?> NetworkCredential