8000 Move PowerShell back to .NET Core 2.0.0-preview1-002106-00 by daxian-dbw · Pull Request #4026 · PowerShell/PowerShell · GitHub
[go: up one dir, main page]
Skip to content

Move PowerShell back to .NET Core 2.0.0-preview1-002106-00 #4026

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
merged 2 commits into from
Jun 15, 2017
Merged

Move PowerShell back to .NET Core 2.0.0-preview1-002106-00 #4026

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c833af4
Move back to .NET Core 2.0.0-preview1-002106-00
daxian-dbw Jun 15, 2017
d0407c8
Remove a trailing space
daxian-dbw Jun 15, 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
Next Next commit
Move back to .NET Core 2.0.0-preview1-002106-00
  • Loading branch information
@daxian-dbw
daxian-dbw committed Jun 15, 2017
commit c833af42afab6185c7031e9733f6e4411a3075d1
10 changes: 0 additions & 10 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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][].
Expand Down
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-preview2-25407-01
# cache version - netcoreapp.2.0.0-preview1-002106-00
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 @@ -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
)

Expand Down Expand Up @@ -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
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-preview2-25405-01" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="4.4.0-preview1-25302-01" />
</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 = HttpClientHandler.DangerousAcceptAnyServerCertificateValidator;
handler.ServerCertificateCustomValidationCallback = delegate { return true; };
}

if (WebSession.MaximumRedirection > -1)
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-preview2-25405-01" />
<PackageReference Include="System.Security.Principal.Windows" Version="4.4.0-preview1-25302-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-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" />
<PackageReferen 786A ce Include="System.Threading.AccessControl" Version="4.4.0-preview2-25405-01" />
<PackageReference Include="System.Private.ServiceModel" Version="4.4.0-preview2-25405-01" />
<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" />
</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-preview2-25405-01" />
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="4.4.0-preview1-25302-01" />
<PackageReference Include="Newtonsoft.Json" Version="10.0.1" />
<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="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="Microsoft.Management.Infrastructure" Version="1.0.0-alpha*" />
</ItemGroup>

Expand Down
4 changes: 3 additions & 1 deletion test/powershell/Language/Scripting/NativeExecution/NativeCommandProcessor.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
8 changes: 2 additions & 6 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,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
Expand All @@ -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
Expand Down
8 changes: 6 additions & 2 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,7 +443,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'"
Expand Down Expand Up @@ -835,7 +837,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
Expand Down
0