Skip to content

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

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
adityapatwardhan merged 1 commit into from
Nov 2, 2017
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 PowerShell.Common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Copy link

@anmenaga anmenaga Nov 1, 2017

Choose a reason for hiding this comment

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

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

Copy link
Member Author

@daxian-dbw daxian-dbw Nov 1, 2017

Choose a reason for hiding this comment

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

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

Copy link
Collaborator

@iSazonov iSazonov Nov 2, 2017

Choose a reason for hiding this comment

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

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

Copy link
Member Author

@daxian-dbw daxian-dbw Nov 2, 2017 •
edited
Loading

Choose a reason for hiding this comment

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

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


<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
Expand Down
2 changes: 1 addition & 1 deletion build.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
$script:TestModulePathSeparator = [System.IO.Path]::PathSeparator

$dotnetCLIChannel = "release"
$dotnetCLIRequiredVersion = "2.0.0"
$dotnetCLIRequiredVersion = "2.0.2"
Copy link

@anmenaga anmenaga Nov 1, 2017

Choose a reason for hiding this comment

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

@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.

Copy link
Member Author

@daxian-dbw daxian-dbw Nov 1, 2017 •
edited
Loading

Choose a reason for hiding this comment

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

@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.


# Track if tags have been sync'ed
$tagsUpToDate = $false
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "2.0.0"
"version": "2.0.2"
}
}
2 changes: 1 addition & 1 deletion test/Test.Common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,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>

<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
Expand Down
3 changes: 2 additions & 1 deletion test/tools/TestExe/TestExe.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">

<Import Project="..\..\Test.Common.props"/>

<PropertyGroup>
<Description>Very simple little console class that you can use to for testing PowerShell interaction with native commands</Description>
<TargetFramework>netcoreapp2.0</TargetFramework>
<AssemblyName>testexe</AssemblyName>
<OutputType>Exe</OutputType>
<RuntimeIdentifiers>win7-x86;win7-x64;osx.10.12-x64;linux-x64</RuntimeIdentifiers>
Expand Down
3 changes: 2 additions & 1 deletion test/tools/WebListener/WebListener.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<Import Project="..\..\Test.Common.props"/>

<PropertyGroup>
<Description>A simple ASP.NET Core 2.0 MVC app to provide an HTTP and HTTPS server for testing.</Description>
<TargetFramework>netcoreapp2.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down