Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Rebase onto .NET Core 1.1#2737

Merged
daxian-dbw merged 5 commits into
PowerShell:masterPowerShell/PowerShell:masterfrom
randomvariable:dotnet11Copy head branch name to clipboard
Dec 8, 2016
Merged

Rebase onto .NET Core 1.1#2737
daxian-dbw merged 5 commits into
PowerShell:masterPowerShell/PowerShell:masterfrom
randomvariable:dotnet11Copy head branch name to clipboard

Conversation

@randomvariable

Copy link
Copy Markdown
Contributor

Build.psm1 and project.json files modified to use .NET Core 1.1.

.NET Core 1.1 ships with an older dotnet/cli than has currently been used,
so we revert to use case-sensitive directory names for dependencies.

.NET Core 1.1 is a pre-requisite for supporting Fedora 24.

@msftclas

Copy link
Copy Markdown

Hi @randomvariable, I'm your friendly neighborhood Microsoft Pull Request Bot (You can call me MSBOT). Thanks for your contribution!
You've already signed the contribution license agreement. Thanks!
We will now validate the agreement and then real humans will evaluate your PR.

TTYL, MSBOT;

@SteveL-MSFT SteveL-MSFT added this to the 6.0.0 milestone Nov 20, 2016
@SteveL-MSFT SteveL-MSFT added the WG-Maintainers-Build specific to affecting the build label Nov 20, 2016
This was referenced Nov 20, 2016
@vors

vors commented Nov 20, 2016

Copy link
Copy Markdown
Collaborator

.NET Core 1.1 ships with an older dotnet/cli than has currently been used

That should not really matter, although, I think it could be acceptable to revert back for consistency.
Since we are not using nightly dotnet cli anymore.
Last pinned version of dotnet cli was completely random and it's probably better to stick with the one that corresponds to some release.

Comment thread docs/building/windows-core.md Outdated

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Please, use separate PRs (or at least separate commits) for such formatting cleanups. Mixing them makes review much harder.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Thanks. Missed when diffing.

@randomvariable

randomvariable commented Nov 20, 2016

Copy link
Copy Markdown
Contributor Author

Appears the build in #2738 that I've ended up with doesn't allocate a tty, so is pretty unusable as an interactive shell. Not sure why.

@randomvariable

Copy link
Copy Markdown
Contributor Author

TTY bug seems unrelated to .NET 1.1, have filed issue at #2745

@randomvariable

randomvariable commented Nov 22, 2016

Copy link
Copy Markdown
Contributor Author

Not sure why the DSC tests are failing. Any ideas?

I realise that the package isn't getting installed, but not sure how it's supposed to get installed either.

Modify `Build.psm1` and `project.json` files to use .NET Core 1.1.

.NET Core 1.1 ships with an older dotnet/cli than has currently been used,
so we revert to use case-sensitive directory names for dependencies.

.NET Core 1.1 is a pre-requisite for supporting Fedora 24.
@randomvariable

Copy link
Copy Markdown
Contributor Author

Think this is ready to merge.

@daxian-dbw daxian-dbw left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This is an awesome PR! Thank you very much!
I left a few comments, can you please take a look?

Comment thread build.psm1 Outdated
Start-NativeExecution {
curl -sO $obtainUrl/$installScript
bash ./$installScript -c $Channel -v $Version
bash ./$installScript -c $Channel

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Why is -v $Version removed?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I think I had removed this whilst trying to get the 1.1 install script working, but the defaults are now set correctly elsewhere in build.psm1, so it can be restored.

"net451": {},
"netstandard1.6": {
"imports": ["dnxcore50", "portable-net45+win8"],
"imports": ["netcoreapp1.1", "portable-net45+win8"],

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Why do you change dnxcore50 to netcoreapp1.1 here?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

That's an error. Will revert.

@daxian-dbw daxian-dbw Dec 8, 2016

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Thanks for the quick response. Please add new commits to address comments, it's easier to review the incremental changes this way 😄 I will squash the commits when merging the PR.

@@ -13,10 +13,10 @@
},

@daxian-dbw daxian-dbw Dec 7, 2016

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

The dependency to Microsoft.PowerShell.PSReadLine should be "6.0.0-*". It's an oversight from the change that bounced the project versions. Would you mind update it in this PR?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Done. Commits upcoming.

"dependencies": {
"Microsoft.CodeAnalysis.CSharp": "1.3.1-beta1-20160616-03",
"System.Diagnostics.TextWriterTraceListener": "4.3.0-preview1-24530-04"
"Microsoft.CodeAnalysis.CSharp": "1.3.2",

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Since we are using the latest version on nuget.org for other packages, shall we use the 2.0.0-rc version for Microsoft.CodeAnalysis.CSharp? The 2.0.0-rc was published on Nov 18.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

The build and tests succeeded against 2.0.0-rc, so this looks fine to go in.

@daxian-dbw daxian-dbw self-assigned this Dec 7, 2016
@randomvariable

Copy link
Copy Markdown
Contributor Author

Commits added for each of the review comments.

@daxian-dbw daxian-dbw left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM.
It's my bad that I didn't make it clear -- you can use one commit to address any number of comments. Sorry to put extra work on your side 😄

@daxian-dbw

Copy link
Copy Markdown
Member

The Travis CI failure is a known issue, not related to your PR. I have restarted it. I will merge this PR once it succeeds.

@daxian-dbw daxian-dbw merged commit 32a8601 into PowerShell:master Dec 8, 2016
@daxian-dbw

Copy link
Copy Markdown
Member

@randomvariable Thanks again for your contribution!

@randomvariable randomvariable deleted the dotnet11 branch December 8, 2016 10:08
@iSazonov iSazonov removed the Review - Needed The PR is being reviewed label Mar 8, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

WG-Maintainers-Build specific to affecting the build

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants

Morty Proxy This is a proxified and sanitized view of the page, visit original site.