diff --git a/README.md b/README.md index 9782c8d4b5..47ac384f53 100644 --- a/README.md +++ b/README.md @@ -141,16 +141,6 @@ See [working with the PowerShell repository](docs/git) for more information. ## Developing and Contributing -> Note: To develop with VSCode on OSX and Linux, you need to install the [`v1.11.0-beta4`][beta-csharp] C# extension by following these [instructions][install-beta-csharp]. -> -> PowerShell is building against the .NET Core `2.0.0-preview2` packages using the .NET Core `2.0.0-preview2` SDK. -`v1.13.0` VSCode + `v1.10.0` C# extension works fine with the .NET Core `2.0.0-preview2` SDK on Windows. -However, on OSX and Linux you need to use the `v1.11.0-beta4` C# extension due to [omnisharp-vscode issue #1495][omnisharp-1495]. - -[beta-csharp]: https://github.com/OmniSharp/omnisharp-vscode/releases/tag/v1.11.0-beta4 -[install-beta-csharp]: https://github.com/OmniSharp/omnisharp-vscode/wiki/Installing-Beta-Releases -[omnisharp-1495]: https://github.com/OmniSharp/omnisharp-vscode/issues/1495 - Please see the [Contribution Guide][] for how to develop and contribute. If you have any problems, please consult the [known issues][], developer [FAQ][], and [GitHub issues][]. diff --git a/appveyor.yml b/appveyor.yml index c3fb13dc4a..12fe698e01 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,7 +2,7 @@ version: 6.0.0-beta.2-{build} image: Visual Studio 2015 -# cache version - netcoreapp.2.0.0-preview2-25407-01 +# cache version - netcoreapp.2.0.0-preview1-002106-00 cache: - '%LocalAppData%\Microsoft\dotnet -> appveyor.yml' - '%HOMEDRIVE%%HOMEPATH%\.nuget\packages -> appveyor.yml' diff --git a/build.psm1 b/build.psm1 index a5b437f488..420bcca352 100644 --- a/build.psm1 +++ b/build.psm1 @@ -988,7 +988,7 @@ function Install-Dotnet { [CmdletBinding()] param( [string]$Channel = "preview", - [string]$Version = "2.0.0-preview2-006388", + [string]$Version = "2.0.0-preview1-005952", [switch]$NoSudo ) @@ -1050,7 +1050,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-preview2-006388", + [string]$Version = "2.0.0-preview1-005952", [switch]$Package, [switch]$NoSudo, [switch]$Force diff --git a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj b/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj index f92bdb350e..c38477248e 100644 --- a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj +++ b/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj @@ -78,7 +78,7 @@ - + diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/CoreCLR/WebRequestPSCmdlet.CoreClr.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/CoreCLR/WebRequestPSCmdlet.CoreClr.cs index c1e8ec9bd2..30cc837933 100644 --- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/CoreCLR/WebRequestPSCmdlet.CoreClr.cs +++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/CoreCLR/WebRequestPSCmdlet.CoreClr.cs @@ -165,7 +165,7 @@ namespace Microsoft.PowerShell.Commands if (SkipCertificateCheck) { - handler.ServerCertificateCustomValidationCallback = HttpClientHandler.DangerousAcceptAnyServerCertificateValidator; + handler.ServerCertificateCustomValidationCallback = delegate { return true; }; } // This indicates GetResponse will handle redirects. diff --git a/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj b/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj index 816357023a..d1377e41d8 100644 --- a/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj +++ b/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj @@ -32,7 +32,7 @@ - + diff --git a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj index f2fa045d88..2c9cc44241 100644 --- a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj +++ b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj @@ -17,17 +17,17 @@ - - - - - - - - - - - + + + + + + + + + + + diff --git a/src/System.Management.Automation/System.Management.Automation.csproj b/src/System.Management.Automation/System.Management.Automation.csproj index 277da6d8b0..bd1c08c037 100644 --- a/src/System.Management.Automation/System.Management.Automation.csproj +++ b/src/System.Management.Automation/System.Management.Automation.csproj @@ -19,12 +19,12 @@ - + - - - - + + + + diff --git a/test/powershell/Language/Scripting/NativeExecution/NativeCommandProcessor.Tests.ps1 b/test/powershell/Language/Scripting/NativeExecution/NativeCommandProcessor.Tests.ps1 index 5fe1afab68..08b3c8d887 100644 --- a/test/powershell/Language/Scripting/NativeExecution/NativeCommandProcessor.Tests.ps1 +++ b/test/powershell/Language/Scripting/NativeExecution/NativeCommandProcessor.Tests.ps1 @@ -24,7 +24,9 @@ Describe 'native commands with pipeline' -tags 'Feature' { $rs.ResetRunspaceState() } - It "native | native | native should work fine" { + # Make this test pending because of too many regressions in the latest .NET Core + # and thus we have to get back to an older .NET Core. + It "native | native | native should work fine" -Pending { if ($IsWindows) { $result = @(ping.exe | findstr.exe count | findstr.exe ping) diff --git a/test/powershell/Modules/Microsoft.PowerShell.Management/Get-ChildItem.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/Get-ChildItem.Tests.ps1 index 3b2696af75..d3964dc8dc 100644 --- a/test/powershell/Modules/Microsoft.PowerShell.Management/Get-ChildItem.Tests.ps1 +++ b/test/powershell/Modules/Microsoft.PowerShell.Management/Get-ChildItem.Tests.ps1 @@ -66,9 +66,7 @@ Describe "Get-ChildItem" -Tags "CI" { $file.Count | Should be 1 $file.Name | Should be "pagefile.sys" } - # 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) { + It "Should continue enumerating a directory when a contained item is deleted" { $Error.Clear() [System.Management.Automation.Internal.InternalTestHooks]::SetTestHook("GciEnumerationActionDelete", $true) $result = Get-ChildItem -Path $TestDrive -ErrorAction SilentlyContinue @@ -86,9 +84,7 @@ Describe "Get-ChildItem" -Tags "CI" { $result.Count | Should BeExactly 4 } } - # 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) { + It "Should continue enumerating a directory when a contained item is renamed" { $Error.Clear() [System.Management.Automation.Internal.InternalTestHooks]::SetTestHook("GciEnumerationActionRename", $true) $result = Get-ChildItem -Path $TestDrive -ErrorAction SilentlyContinue diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/WebCmdlets.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/WebCmdlets.Tests.ps1 index d694b76241..2774c9402e 100644 --- a/test/powershell/Modules/Microsoft.PowerShell.Utility/WebCmdlets.Tests.ps1 +++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/WebCmdlets.Tests.ps1 @@ -507,7 +507,9 @@ Describe "Invoke-WebRequest tests" -Tags "Feature" { $jsonContent.headers.'User-Agent' | Should Match "WindowsPowerShell" } - It "Validate Invoke-WebRequest -SkipCertificateCheck" { + ## '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 { # validate that exception is thrown for URI with expired certificate $command = "Invoke-WebRequest -Uri 'https://expired.badssl.com'" @@ -952,7 +954,9 @@ Describe "Invoke-RestMethod tests" -Tags "Feature" { $jsonContent.headers.'User-Agent' | Should Match "WindowsPowerShell" } - It "Validate Invoke-RestMethod -SkipCertificateCheck" { + ## '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 { # HTTP method HEAD must be used to not retrieve an unparsable HTTP body # validate that exception is thrown for URI with expired certificate