Skip to content

Move to latest .NET Core and enable -SkipCertificateCheck on OSX #3887

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
daxian-dbw merged 5 commits into from
Jun 14, 2017
Merged

Move to latest .NET Core and enable -SkipCertificateCheck on OSX #3887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
259d3b2
Update to use latest .NET Core
daxian-dbw May 30, 2017
0dff937
Enable -SkipCertificateCheck on OSX
daxian-dbw May 30, 2017
f5db924
Mark 2 tests pending due to changes in .NET Core
daxian-dbw May 30, 2017
3e580bf
Update Microsoft.CodeAnalysis.CSharp to use 2.2.0
daxian-dbw May 31, 2017
64ef984
Update to use the latest .NET Core 2.0-preview2 packages
daxian-dbw Jun 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: 6.0.0-beta.2-{build}

image: Visual Studio 2015

# cache version - netcoreapp.2.0.0-preview1-002106-00
# cache version - netcoreapp.2.0.0-preview2-25407-01
cache:
- '%LocalAppData%\Microsoft\dotnet -> appveyor.yml'
- '%HOMEDRIVE%%HOMEPATH%\.nuget\packages -> appveyor.yml'
Expand Down
4 changes: 2 additions & 2 deletions build.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -982,7 +982,7 @@ function Install-Dotnet {
[CmdletBinding()]
param(
[string]$Channel = "preview",
[string]$Version = "2.0.0-preview1-005952",
[string]$Version = "2.0.0-preview2-006388",
[switch]$NoSudo
)

Expand Down Expand Up @@ -1044,7 +1044,7 @@ function Start-PSBootstrap {
[string]$Channel = "preview",
# we currently pin dotnet-cli version, and will
# update it when more stable version comes out.
[string]$Version = "2.0.0-preview1-005952",
[string]$Version = "2.0.0-preview2-006388",
[switch]$Package,
[switch]$NoSudo,
[switch]$Force
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="System.ServiceProcess.ServiceController" Version="4.4.0-preview1-25302-01" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="4.4.0-preview2-25405-01" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="2.0.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="2.2.0" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion ...erShell.Commands.Utility/commands/utility/WebCmdlet/CoreCLR/WebRequestPSCmdlet.CoreClr.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ internal virtual HttpClient GetHttpClient()

if (SkipCertificateCheck)
{
handler.ServerCertificateCustomValidationCallback = delegate { return true; };
handler.ServerCertificateCustomValidationCallback = HttpClientHandler.DangerousAcceptAnyServerCertificateValidator;
}

if (WebSession.MaximumRedirection > -1)
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.PowerShell.ConsoleHost/Microsoft.PowerShell.ConsoleHost.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

<ItemGroup>
<ProjectReference Include="..\System.Management.Automation\System.Management.Automation.csproj" />
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.2.0" />
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.3.0" />
</ItemGroup>

<PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="System.Security.Principal.Windows" Version="4.4.0-preview1-25302-01" />
<PackageReference Include="System.Security.Principal.Windows" Version="4.4.0-preview2-25405-01" />
</ItemGroup>

</Project>
22 changes: 11 additions & 11 deletions src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,17 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="System.Data.SqlClient" Version="4.4.0-preview1-25302-01" />
<PackageReference Include="System.IO.Packaging" Version="4.4.0-preview1-25302-01" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="4.4.0-preview1-25302-01" />
<PackageReference Include="System.ServiceModel.Duplex" Version="4.4.0-preview1-25302-01" />
<PackageReference Include="System.ServiceModel.Http" Version="4.4.0-preview1-25302-01" />
<PackageReference Include="System.ServiceModel.NetTcp" Version="4.4.0-preview1-25302-01" />
<PackageReference Include="System.ServiceModel.Primitives" Version="4.4.0-preview1-25302-01" />
<PackageReference Include="System.ServiceModel.Security" Version="4.4.0-preview1-25302-01" />
<PackageReference Include="System.Text.Encodings.Web" Version="4.4.0-preview1-25302-01" />
<PackageReference Include="System.Threading.AccessControl" Version="4.4.0-preview1-25302-01" />
<PackageReference Include="System.Private.ServiceModel" Version="4.4.0-preview1-25302-01" />
<PackageReference Include="System.Data.SqlClient" Version="4.4.0-preview2-25405-01" />
<PackageReference Include="System.IO.Packaging" Version="4.4.0-preview2-25405-01" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="4.4.0-preview2-25405-01" />
<PackageReference Include="System.ServiceModel.Duplex" Version="4.4.0-preview2-25405-01" />
<PackageReference Include="System.ServiceModel.Http" Version="4.4.0-preview2-25405-01" />
<PackageReference Include="System.ServiceModel.NetTcp" Version="4.4.0-preview2-25405-01" />
<PackageReference Include="System.ServiceModel.Primitives" Version="4.4.0-preview2-25405-01" />
<PackageReference Include="System.ServiceModel.Security" Version="4.4.0-preview2-25405-01" />
<PackageReference Include="System.Text.Encodings.Web" Version="4.4.0-preview2-25405-01" />
<PackageReference Include="System.Threading.AccessControl" Version="4.4.0-preview2-25405-01" />
<PackageReference Include="System.Private.ServiceModel" Version="4.4.0-preview2-25405-01" />
</ItemGroup>

</Project>
10 changes: 5 additions & 5 deletions src/System.Management.Automation/System.Management.Automation.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
<ItemGroup>
<ProjectReference Include="..\Microsoft.PowerShell.CoreCLR.AssemblyLoadContext\Microsoft.PowerShell.CoreCLR.AssemblyLoadContext.csproj" />
<ProjectReference Include="..\Microsoft.PowerShell.CoreCLR.Eventing\Microsoft.PowerShell.CoreCLR.Eventing.csproj" />
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="4.4.0-preview1-25302-01" />
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="4.4.0-preview2-25405-01" />
<PackageReference Include="Newtonsoft.Json" Version="10.0.1" />
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.4.0-preview1-25302-01" />
<PackageReference Include="System.Security.AccessControl" Version="4.4.0-preview1-25302-01" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="4.4.0-preview1-25302-01" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.4.0-preview1-25302-01" />
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.4.0-preview2-25405-01" />
<PackageReference Include="System.Security.AccessControl" Version="4.4.0-preview2-25405-01" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="4.4.0-preview2-25405-01" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.4.0-preview2-25405-01" />
<PackageReference Include="Microsoft.Management.Infrastructure" Version="1.0.0-alpha*" />
</ItemGroup>

Expand Down
8 changes: 6 additions & 2 deletions test/powershell/Modules/Microsoft.PowerShell.Management/Get-ChildItem.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,9 @@ Describe "Get-ChildItem" -Tags "CI" {
$file.Count | Should be 1
$file.Name | Should be "pagefile.sys"
}
It "Should continue enumerating a directory when a contained item is deleted" {
# Test is pending on Unix platforms because of a behavior change in the latest .NET Core.
# Tracked by https://github.com/dotnet/corefx/issues/20456
It "Should continue enumerating a directory when a contained item is deleted" -Pending:(!$IsWindows) {
$Error.Clear()
[System.Management.Automation.Internal.InternalTestHooks]::SetTestHook("GciEnumerationActionDelete", $true)
$result = Get-ChildItem -Path $TestDrive -ErrorAction SilentlyContinue
Expand All @@ -84,7 +86,9 @@ Describe "Get-ChildItem" -Tags "CI" {
$result.Count | Should BeExactly 4
}
}
It "Should continue enumerating a directory when a contained item is renamed" {
# Test is pending on Unix platforms because of a behavior change in the latest .NET Core.
# Tracked by https://github.com/dotnet/corefx/issues/20456
It "Should continue enumerating a directory when a contained item is renamed" -Pending:(!$IsWindows) {
$Error.Clear()
[System.Management.Automation.Internal.InternalTestHooks]::SetTestHook("GciEnumerationActionRename", $true)
$result = Get-ChildItem -Path $TestDrive -ErrorAction SilentlyContinue
Expand Down
8 changes: 2 additions & 6 deletions test/powershell/Modules/Microsoft.PowerShell.Utility/WebCmdlets.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,9 +443,7 @@ Describe "Invoke-WebRequest tests" -Tags "Feature" {
$jsonContent.headers.'User-Agent' | Should Match "WindowsPowerShell"
}

## 'HttpClientHandler.ServerCertificateCustomValidationCallback' currently doesn't work in netcoreapp2.0 on Mac at all.
## This is tracked by powershell issue #3648.
It "Validate Invoke-WebRequest -SkipCertificateCheck" -Pending:$IsOSX {
It "Validate Invoke-WebRequest -SkipCertificateCheck" {

# validate that exception is thrown for URI with expired certificate
$command = "Invoke-WebRequest -Uri 'https://expired.badssl.com'"
Expand Down Expand Up @@ -837,9 +835,7 @@ Describe "Invoke-RestMethod tests" -Tags "Feature" {
$jsonContent.headers.'User-Agent' | Should Match "WindowsPowerShell"
}

## 'HttpClientHandler.ServerCertificateCustomValidationCallback' currently doesn't work in netcoreapp2.0 on Mac at all.
## This is tracked by powershell issue #3648.
It "Validate Invoke-RestMethod -SkipCertificateCheck" -Pending:$IsOSX {
It "Validate Invoke-RestMethod -SkipCertificateCheck" {

# HTTP method HEAD must be used to not retrieve an unparsable HTTP body
# validate that exception is thrown for URI with expired certificate
Expand Down