Update powershell to use 2.0.4-servicing dotnet core runtime #5295

Merged
merged 1 commit into from Nov 2, 2017

Conversation

Projects
None yet
4 participants
Member

daxian-dbw commented Nov 1, 2017

Use Microsoft.NETCore.App 2.0.4-servicing-25831-01 to build powershell.
Also update to dotnet core SDK 2.0.2.

The CoreCLR issue dotnet/coreclr#9745 is fixed in the 2.0.4-servicing packages.
PowerShell will use .NET Core 2.0.4 servicing for the GA build, so we move to the 2.0.4 preview bits to validate dotnet core packages early.

Fix #5157

@@ -94,7 +94,7 @@
<Copyright>(c) Microsoft Corporation. All rights reserved.</Copyright>
<TargetFramework>netcoreapp2.0</TargetFramework>
- <RuntimeFrameworkVersion>2.0.0</RuntimeFrameworkVersion>
+ <RuntimeFrameworkVersion>2.0.4-servicing-25831-01</RuntimeFrameworkVersion>
@anmenaga

anmenaga Nov 1, 2017

Contributor

The package that was tested was "25824-03".
This one, in this change, is just newer?

@daxian-dbw

daxian-dbw Nov 1, 2017

Member

Yes, it's a week newer. Produced on 10/31

@iSazonov

iSazonov Nov 2, 2017

Collaborator

I see 2.0.4 here and 2.0.2 in Build.psm1 and global.json - could you please clarify the difference?

@daxian-dbw

daxian-dbw Nov 2, 2017

Member

The 2.0.2 in global.json and build.psm1 indicates the version of the .NET Core SDK, see global.json reference. The 2.0.4-servicing here is the version of dotnet core runtime the build will target.

dotnet --info shows 2 versions: .NET Command Line Tools version and the default .NET Core framework version. Currently the 2.0.2 .NET Core SDK still targets .NET Core runtime 2.0.0 by default.

.NET Command Line Tools (2.0.2)

Product Information:
 Version:            2.0.2
 Commit SHA-1 hash:  a04b4bf512
...
Microsoft .NET Core Shared Framework Host

  Version  : 2.0.0
  Build    : e8b8861ac7faf042c87a5c2f9f2d04c98b69f28d
@@ -3,7 +3,7 @@
$script:TestModulePathSeparator = [System.IO.Path]::PathSeparator
$dotnetCLIChannel = "release"
-$dotnetCLIRequiredVersion = "2.0.0"
+$dotnetCLIRequiredVersion = "2.0.2"
@anmenaga

anmenaga Nov 1, 2017

Contributor

@daxian-dbw While you are at it... maybe it is a good idea to change the required version check from "exact match" to "only major+minor version should match" in build.psm1:414 . See #5260 or more details.

@daxian-dbw

daxian-dbw Nov 1, 2017

Member

@anmenaga As far as I know, this issue has been addressed by the PR #5118. Please see the original issue #5015.
global.json defines which version of SDK we want to use, so, for now, it will work even if you have 2.0.2 installed.
I updated the version in global.json to 2.0.2 in this PR.

@adityapatwardhan adityapatwardhan merged commit decdd1a into PowerShell:master Nov 2, 2017

3 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
license/cla All CLA requirements met.
Details

@daxian-dbw daxian-dbw deleted the daxian-dbw:build branch Nov 2, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment