8000 Move powershell to `2.0.0-preview3-25426-01` using the .NET CLI `2.0.0-preview2-006502` by daxian-dbw · Pull Request #4144 · PowerShell/PowerShell · GitHub
[go: up one dir, main page]
Skip to content

Move powershell to 2.0.0-preview3-25426-01 using the .NET CLI 2.0.0-preview2-006502 #4144

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

Jump to bottom
Merged
merged 4 commits into from
Jun 30, 2017
Merged

Move powershell to 2.0.0-preview3-25426-01 using the .NET CLI 2.0.0-preview2-006502 #4144

merged 4 commits into from
Jun 30, 2017

Conversation

daxian-dbw
Copy link
Member

Fix #3649

Summary

Move PowerShell to .NET Core 2.0.0-preview3-25426-01 by explicitly specify the RuntimeFrameworkVersion in .csproj files. 2.0.0-preview3 CLI doesn't work (see https://github.com/dotnet/cli/issues/7013, it's closed but I don't think it should be), so we use .NET CLI 2.0.0-preview2-006502 for now.

Also add test/Test.Common.props to hold common properties for test projects.

Note

I have verified the CoreFx issues listed in #3649 are fixed in this .NET Core version.
I have verified that PackageManagement and PowerShellGet tests are all passed.
I have verified that Login-AzureRmAccount from AzureRM.Netcore works in powershell with this .NET Core version.

@daxian-dbw daxian-dbw self-assigned this Jun 30, 2017
adityapatwardhan
adityapatwardhan requested changes Jun 30, 2017
View reviewed changes
build.psm1
@@ -20,7 +20,7 @@ try {
}

$dotnetCLIChannel = "preview"
$dotnetCLIRequiredVersion = "2.0.0-preview1-005952"
$dotnetCLIRequiredVersion = "2.0.0-preview2-006502"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

preview3?

8000 Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

preview3 .NET CLI is still broken, please see the description of this PR.
Now we are using .NET CLI preivew2 to build, but target preview3 .NET Core Framework.

src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
<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-preview3-25423-02" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is 02 expected? or should it be 01?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it is expected. Microsoft.NetCore.App 2.0.0-preview3-25426-01 references to packages of the build 25423-02 (built in 6/23). However, for ServiceModel related packages, they only have 25423-01 built on that day, so 25423-01 is used for ServiceModel related packages.

src/System.Management.Automation/System.Management.Automation.csproj
@@ -11,12 +11,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-preview3-25423-02" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here 02 or 01?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

02 is expected. Please see my response above.

test/powershell/Modules/Microsoft.PowerShell.Management/Get-ChildItem.Tests.ps1
@@ -66,7 +66,9 @@ Describe "Get-ChildItem" -Tags "CI" {
$file.Count | Should be 1
$file.Name | Should be $item_F
}
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.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The issue #20456 is closed, do we still need to have the test case pending?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The behavior change was by design, to better align with Full .NET. So yes, this test and the corresponding fix need to be revisited. Here is the tracking issue: #4145

test/powershell/Modules/Microsoft.PowerShell.Management/Get-ChildItem.Tests.ps1
@@ -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.
# See https://github.com/dotnet/corefx/issues/20456 for more information.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as above.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ditto.

@daxian-dbw daxian-dbw mentioned this pull request Jun 30, 2017
Closed
@daxian-dbw
Copy link
Member Author

@adityapatwardhan Your comments are addressed, please take another look when you have time. Thanks!

@daxian-dbw daxian-dbw merged commit 3e35fb9 into PowerShell:master Jun 30, 2017
@daxian-dbw daxian-dbw deleted the new-dotnet branch June 30, 2017 20:07
This was referenced Jun 30, 2017
Closed
Closed
Closed
@daxian-dbw
Copy link
Member Author

@chuanjiao10 new distro supports are tracked by #3961

@daxian-dbw daxian-dbw mentioned this pull request Jul 6, 2017
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@adityapatwardhan adityapatwardhan adityapatwardhan approved these changes

Assignees

@daxian-dbw daxian-dbw

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Avoid using powershell assembly load context with netcoreapp2.0
3 participants
@daxian-dbw @adityapatwardhan @msftclas
0