Codestin Search App

SteveL-MSFT · 2017-11-22T01:02:55Z

Requires VS2017 latest preview to build for arm64. Validated win-arm build on Win10 IOT with remoting, but current install script doesn't work correctly on Win10 IOT, need to update.

Also fixed issue with pwrshplugin.dll not validating path before using them.

Fix #5286

SteveL-MSFT · 2017-11-22T03:40:45Z

Waiting on mmi.dll to be published for win-arm and win-arm64

SteveL-MSFT · 2017-11-27T23:41:19Z

Confirmed that basic PSCore6 works on win-arm, I think we can merge this.

SteveL-MSFT · 2017-11-28T16:53:28Z

@adityapatwardhan hold off on merging this, looks like I need to build pwshplugin.dll for arm

daxian-dbw · 2017-11-28T22:40:14Z

build.psm1

!$env:PROCESSOR_ARCHITECTURE -match "arm"

!$env:PROCESSOR_ARCHITECTURE will be evaluated first in this case.

daxian-dbw · 2017-11-28T23:43:29Z

Once the changes to building pwshplugin.dll is done, the psrp.windows package needs to be updated, and make sure the arm version plugin dll is signed before creating a new nuget package.

adityapatwardhan · 2017-12-04T17:51:27Z

@SteveL-MSFT please update here when psrp.windows package is updated.

daxian-dbw · 2017-12-05T00:49:26Z

Note that PR #5617 would also require psrp.windows nuget package to be refreshed, so it's better to coordinate them to avoid duplicate work.

SteveL-MSFT · 2017-12-06T00:06:39Z

Have some paths hardcoded to validate build. Will update, but requires user to have VS2017 latest installed to build for win-arm.

fix finding vs2017 dynamically

SteveL-MSFT · 2017-12-06T20:24:57Z

Verified pwrshplugin.dll works on both arm and arm64. @adityapatwardhan can you re-review this PR as I've made substantial changes for the native compilation?

…er than reg.exe so that error doesn't show on success fix formatting issue in cmake.defs

adityapatwardhan

LGTM with minor comment.

adityapatwardhan · 2017-12-06T22:26:39Z

src/powershell-native/Install-PowerShellRemoting.ps1


-    # Clean up
-    Remove-Item .\$fileName
+    New-Item $regKey -Force


New-Item $regKey -Force > $null

Will change

adityapatwardhan · 2017-12-06T23:53:08Z

@daxian-dbw Can you have a look too?

daxian-dbw · 2017-12-07T02:13:33Z

@adityapatwardhan Yes, will look tonight or first thing tomorrow morning.

daxian-dbw · 2017-12-07T18:02:24Z

build.psm1

Question: @SteveL-MSFT Is it going to be required to use VS2017 to build the plugin dll?

@daxian-dbw The build worker image we use in AppVeyor is Visual Studio 2015. Do we need to update that?

Actually we are using Visual Studio 2017 through the AppVeyor.yml

We don't build the native binaries in CI, so it shouldn't matter. Maybe we should switch to an image that doesn't have VS pre-installed.

@daxian-dbw VS2017 is required to build arm64

daxian-dbw

LGTM. Left a question comment.

TravisEz13 · 2017-12-07T18:45:31Z

build.psm1

x64_arm and x64_arm64 seems weird to me. Why are we combining two architectures?

I'll add a comment. This is the form that the Visual Studio build environment expects for cross compilation. The first is the host and the second the target. VS supports x86_arm64, for example which I'm not supporting here.

@SteveL-MSFT Can you comment?

address PR feedback

SteveL-MSFT · 2017-12-07T22:16:12Z

@TravisEz13 @daxian-dbw @adityapatwardhan please review the change to the pwrshplugin config reader to address #5286

Decided to do that as part of this PR since I'm publishing a new drop to myget might as well do it once rather than twice.

SteveL-MSFT · 2017-12-07T23:32:54Z

Published https://powershell.myget.org/feed/powershell-core/package/nuget/psrp.windows/6.0.0-rc

daxian-dbw

A few non-blocking comments.

daxian-dbw · 2017-12-07T23:51:45Z

src/powershell-native/nativemsh/pwrshcommon/ConfigFileReader.cpp

-                        if (*slashIter != L'\\')
+                        CloseHandle(dirHandle);
+                        this->pathToPowerShellAssemblies = psHomeDir;
+                        if (this->pathToPowerShellAssemblies.size() > 0) // Found a match


It seems the size() > 0 check should be moved to before the CreateFileW call.
Or maybe the size() > 0 is not needed, because if getValueFromLine returns an empty string, I think CreateFileW will fail.

Wrote a small program to test this and an empty string does return an invalid handle. I can remove the size check.

daxian-dbw · 2017-12-07T23:53:48Z

src/powershell-native/nativemsh/pwrshcommon/ConfigFileReader.cpp

-                        slashIter--;
-                        if (*slashIter != L'\\')
+                        CloseHandle(dirHandle);
+                        this->coreClrDirectory = this->getValueFromLine(line, coreClrDirTag);


Why calling this->getValueFromLine(line, coreClrDirTag); again instead of use coreClrDir?

Mistake, should have been coreClrDir. Will fix.

daxian-dbw · 2017-12-07T23:54:29Z

src/powershell-native/nativemsh/pwrshcommon/ConfigFileReader.cpp

-                        if (*slashIter != L'\\')
+                        CloseHandle(dirHandle);
+                        this->coreClrDirectory = this->getValueFromLine(line, coreClrDirTag);
+                        if (this->coreClrDirectory.size() > 0) // Found a match


Same comment about the size() check here.

same as above

daxian-dbw · 2017-12-08T00:48:51Z

@SteveL-MSFT Making those changes means we need to create a new psrp.windows package. But that work doesn't block merging this PR.

…HOME/source address PR feedback

SteveL-MSFT · 2017-12-08T01:54:15Z

@daxian-dbw yeah, I realize that. After this is merged, I'll create one called RC2.

adityapatwardhan · 2017-12-08T21:30:03Z

@daxian-dbw @TravisEz13 Any ideas why WIP might be blocking this?

TravisEz13 · 2017-12-08T22:16:17Z

it hasn't run, edit the title and it will run.

* enable win-arm and win-arm64 builds * fix using arm64 tools for build fix finding vs2017 dynamically * change install-powershellremoting.ps1 script to use reg provider rather than reg.exe so that error doesn't show on success fix formatting issue in cmake.defs * add check that path being read from config file is valid address PR feedback * fix copying of PowerShell.Core.Instrumentation as VS2017 puts it in $HOME/source address PR feedback

SteveL-MSFT added this to the 6.0.0-GA milestone Nov 22, 2017

SteveL-MSFT assigned adityapatwardhan Nov 22, 2017

SteveL-MSFT requested a review from adityapatwardhan November 22, 2017 01:02

SteveL-MSFT requested review from TravisEz13 and daxian-dbw as code owners November 22, 2017 01:02

adityapatwardhan approved these changes Nov 28, 2017

View reviewed changes

daxian-dbw reviewed Nov 28, 2017

View reviewed changes

enable win-arm and win-arm64 builds

2db001b

SteveL-MSFT force-pushed the win-arm branch from 5acc38e to 2db001b Compare December 5, 2017 23:56

address PR feedback

80aa7cd

SteveL-MSFT changed the title ~~enable building for win-arm and win-arm64~~ [Don't Merge] enable building for win-arm and win-arm64 Dec 6, 2017

SteveL-MSFT force-pushed the win-arm branch from 9c0d641 to 730336b Compare December 6, 2017 03:38

fix using arm64 tools for build

384e38b

fix finding vs2017 dynamically

SteveL-MSFT force-pushed the win-arm branch from 730336b to 384e38b Compare December 6, 2017 05:44

SteveL-MSFT changed the title ~~[Don't Merge] enable building for win-arm and win-arm64~~ Enable building for win-arm and win-arm64 Dec 6, 2017

change install-powershellremoting.ps1 script to use reg provider rath…

28a9d8a

…er than reg.exe so that error doesn't show on success fix formatting issue in cmake.defs

SteveL-MSFT force-pushed the win-arm branch from 8f19ae4 to 28a9d8a Compare December 6, 2017 20:26

adityapatwardhan approved these changes Dec 6, 2017

View reviewed changes

SteveL-MSFT requested a review from mirichmo December 7, 2017 01:26

daxian-dbw reviewed Dec 7, 2017

View reviewed changes

daxian-dbw approved these changes Dec 7, 2017

View reviewed changes

TravisEz13 approved these changes Dec 7, 2017

View reviewed changes

SteveL-MSFT force-pushed the win-arm branch from 5540bb7 to e0e5a02 Compare December 7, 2017 21:25

add check that path being read from config file is valid

34aa98b

address PR feedback

SteveL-MSFT force-pushed the win-arm branch from e0e5a02 to 34aa98b Compare December 7, 2017 22:13

SteveL-MSFT modified the milestones: 6.0.0-GA, 6.0.0-RC.2 Dec 7, 2017

daxian-dbw reviewed Dec 7, 2017

View reviewed changes

mirichmo approved these changes Dec 8, 2017

View reviewed changes

fix copying of PowerShell.Core.Instrumentation as VS2017 puts it in $…

542ef66

…HOME/source address PR feedback

daxian-dbw approved these changes Dec 8, 2017

View reviewed changes

TravisEz13 changed the title ~~Enable building for win-arm and win-arm64~~ build: Enable building for win-arm and win-arm64 Dec 8, 2017

adityapatwardhan merged commit eb25428 into PowerShell:master Dec 8, 2017

adityapatwardhan mentioned this pull request Dec 9, 2017

Refresh the release for psrp.windows #5657

Closed

SteveL-MSFT deleted the win-arm branch December 9, 2017 01:43

TravisEz13 mentioned this pull request Dec 9, 2017

Move 6.0.0 rc.2 changes #5663

Merged

Conversation

SteveL-MSFT commented Nov 22, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

SteveL-MSFT commented Nov 22, 2017

Uh oh!

SteveL-MSFT commented Nov 27, 2017

Uh oh!

SteveL-MSFT commented Nov 28, 2017

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

daxian-dbw commented Nov 28, 2017

Uh oh!

adityapatwardhan commented Dec 4, 2017

Uh oh!

daxian-dbw commented Dec 5, 2017

Uh oh!

SteveL-MSFT commented Dec 6, 2017

Uh oh!

SteveL-MSFT commented Dec 6, 2017

Uh oh!

adityapatwardhan left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

adityapatwardhan commented Dec 6, 2017

Uh oh!

daxian-dbw commented Dec 7, 2017

Uh oh!

daxian-dbw Dec 7, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

daxian-dbw left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

SteveL-MSFT commented Dec 7, 2017

Uh oh!

SteveL-MSFT commented Dec 7, 2017

Uh oh!

daxian-dbw left a comment

Choose a reason for hiding this comment

Uh oh!

daxian-dbw Dec 7, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

daxian-dbw commented Dec 8, 2017

Uh oh!

SteveL-MSFT commented Dec 8, 2017

SteveL-MSFT commented Nov 22, 2017 •

edited

Loading

daxian-dbw Dec 7, 2017 •

edited

Loading

daxian-dbw Dec 7, 2017 •

edited

Loading