Migrate from project.json to MSBuild #3398

daxian-dbw · 2017-03-22T21:17:38Z

FullCLR build is disabled in this change.
FullCLR build related functionalities in build.psm1 and AppVeyor.psm1 are disabled. They are not cleaned up from build.psm1 and AppVeyor.psm1 yet. We need to adopt .NET Core 2.0 to verify the portable module concept, and if that works well, we will remove the Windows PowerShell source code and clean up our scripts.
dnxcore50 and portable-net5+win8 target framework monikers are removed.
Dependency on Microsoft.NETCore.Portable.Compatibility is removed. It's not necessary, but it may come back when we work on supporting the portable module. Its necessity can be reviewed at that time.
I didn't spend the time to try building powershell in Visual Studio 2017. We should have a separate issue for that. It's tracked by Build powershell core in Visual Studio 2017 #3400

The TypeCatalogParser project is replaced by a MSBuild target to gather the dependency information.
Due to .NET Core SDK issue #1021, our meta-package project Microsoft.PowerShell.SDK starts to generate an empty assembly during the build and that results in an empty assembly Microsoft.PowerShell.SDK.dll appear in publish folder and in .deps.json file. We cannot simply remove the assembly because it's now part of the TPA, and removing it will cause powershell to crash at startup. We have to live with this empty assembly until that .NET Core SDK issue is fixed. It's tracked by #3401

/cc: @PowerShell/area-build

iSazonov · 2017-03-23T12:27:59Z

src/TypeCatalogParser/project.json

        "Microsoft.NETCore.App": "1.1.0",
-        "Microsoft.DotNet.ProjectModel": "1.0.0-rc3-1-003177",
-        "Microsoft.DotNet.Cli.Utils": "1.0.0-preview3-004056"
+        "Microsoft.DotNet.ProjectModel": "1.0.0-rc3-1-003177"


It seems the file src/TypeCatalogParser/project.json should be removed.

iSazonov · 2017-03-23T12:30:55Z

src/powershell-unix/project.json

    "frameworks": {
        "netcoreapp1.1": {
-            "imports": [ "dnxcore50", "portable-net45+win8" ],
            "buildOptions": {


It seems the file src/powershell-unix/project.json should be removed.

iSazonov · 2017-03-23T12:40:10Z

test/PSReadLine/project.json

    "frameworks": {
        "netcoreapp1.1": {
-            "imports": [ "dnxcore50", "portable-net45+win8" ],
            "dependencies": {


It seems the file test/PSReadLine/project.json should be removed.

iSazonov · 2017-03-23T12:41:36Z

test/csharp/project.json

-            "imports": [ "dnxcore50", "portable-net45+win8" ],
            "dependencies": {
-                "xunit": "2.2.0-beta4-build3444",
+                "xunit": "2.2.0",


It seems the file test/csharp/project.json should be removed.

Good catch, thank you! These project.json files were revived when I was resolving the conflicts.

lzybkr

We'll want to move many of the commonly set properties into a shared .props and include it, but this is fine for a first cut.

daxian-dbw · 2017-03-23T18:18:35Z

We'll want to move many of the commonly set properties into a shared .props and include it

Track it by #3406

daxian-dbw · 2017-03-23T20:03:46Z

Talked to @TravisEz13 offline and he has verified that the MSBuild change works on OpenSUSE.
I will merge this PR as Travis is in a meeting and cannot get back to this until late this afternoon.

iSazonov · 2017-03-24T09:33:39Z

src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj

+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.PowerShell.Security\Microsoft.PowerShell.Security.csproj" />


Why not "ProjectReference Include="..\System.Management.Automation\System.Management.Automation.csproj" /" ?

Microsoft.PowerShell.Security.csproj has a ProjectReference to System.Management.Automation.csproj, so the dependency is chained together.

I ask because all other csproj files contains direct reference on "System.Management.Automation.csproj" and only the file contains indirect reference.

iSazonov · 2017-03-24T14:03:11Z

It seems CorePsTypeCatalog.cs don't updated by TypeCatalogGen.exe . Is it well?

daxian-dbw · 2017-03-24T16:58:53Z

@iSazonov TypeCatalogGen.exe still generates CorePsTypeCatalog.cs. If you mean the content is not changed, then that's expected, because we are still depending on the same set of .NET Core packages.

iSazonov · 2017-03-24T17:45:35Z

After Start-PSBuild -restore my CorePsTypeCatalog.cs has still old date (17 jan) and contains links on "4.0.0.1" packages. Is it Ok?

daxian-dbw · 2017-03-24T18:25:09Z

You need Start-PSBuild -TypeGen -Publish or Start-PSBuild -Clean -Publish.
-Restore doesn't refresh the CorePsTypeCatalog.cs.

iSazonov · 2017-03-24T18:39:01Z

-Clean is key 👍 Thanks!
It seems it is not documented well. 😕
What problems I can catch if my CorePsTypeCatalog.cs is out of date?

daxian-dbw · 2017-03-24T19:07:07Z

Say we move to .NET Core 2.0 and you are still using CorePsTypeCatalog.cs from .NET Core 1.1, then it may appear that some type resolution would stop working.

iSazonov · 2017-03-24T19:17:31Z

Thanks for clarify! It looks that we should add this (-Clean) in our docs for well moving to MSBuild (and .Net Core 2.0): you mentioned in comments that we need only dotnet restore.

msftclas added the cla-not-required label Mar 22, 2017

daxian-dbw requested review from TravisEz13, andyleejordan and lzybkr March 22, 2017 21:18

daxian-dbw assigned TravisEz13 Mar 22, 2017

daxian-dbw added 13 commits March 22, 2017 14:22

Remove 'dnxcore50' TFM

7d3decf

Remove 'portable-net45+win8'

e5ea8c4

remove the dependency of 'Microsoft.NETCore.Portable.Compatibility'

1107388

Stop building FullCLR

16b79f4

Migrate from project.json to .csproj

eaf49d7

Remove the incorrect portable C# module example

f64327e

Migrate test related project.json files

678ef42

Update powershell-unix.csproj and disable -FullCLR swtiches

dbbc246

Fix build break

32381c1

Update appveyor.psm1 to ignore FullCLR build

e82e165

Fix nuget package creation

05e1462

Update build.sh

fbe3d7f

Add support to opensuse

668b9f5

daxian-dbw force-pushed the msbuild branch from 5afd4d7 to 668b9f5 Compare March 22, 2017 21:37

daxian-dbw mentioned this pull request Mar 23, 2017

Build powershell core in Visual Studio 2017 #3400

Closed

iSazonov reviewed Mar 23, 2017

View reviewed changes

iSazonov added the Review - Needed The PR is being reviewed label Mar 23, 2017

daxian-dbw added 2 commits March 23, 2017 09:34

Remove the project.json files that were left when resolving conflicts

a0d2aad

Exclude *.yml files from Pester module

cdbc891

lzybkr approved these changes Mar 23, 2017

View reviewed changes

daxian-dbw merged commit 54fa658 into PowerShell:master Mar 23, 2017

daxian-dbw deleted the msbuild branch March 23, 2017 20:05

daxian-dbw mentioned this pull request Mar 23, 2017

Remove the old S.M.A.csproj that was revived when resolving conflict #3408

Merged

iSazonov reviewed Mar 24, 2017

View reviewed changes

iSazonov removed the Review - Needed The PR is being reviewed label Mar 27, 2017

Migrate from project.json to MSBuild #3398

Migrate from project.json to MSBuild #3398

Uh oh!

Conversation

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

Uh oh!

Uh oh!

iSazonov Mar 23, 2017

Choose a reason for hiding this comment

Uh oh!

iSazonov Mar 23, 2017

Choose a reason for hiding this comment

Uh oh!

iSazonov Mar 23, 2017

Choose a reason for hiding this comment

Uh oh!

iSazonov Mar 23, 2017

Choose a reason for hiding this comment

Uh oh!

daxian-dbw Mar 23, 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!

lzybkr left a comment

Choose a reason for hiding this comment

Uh oh!

daxian-dbw commented Mar 23, 2017

Uh oh!

daxian-dbw commented Mar 23, 2017

Uh oh!

iSazonov Mar 24, 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!

daxian-dbw Mar 24, 2017

Choose a reason for hiding this comment

Uh oh!

iSazonov Mar 24, 2017

Choose a reason for hiding this comment

Uh oh!

iSazonov commented Mar 24, 2017

Uh oh!

daxian-dbw commented Mar 24, 2017

Uh oh!

iSazonov commented Mar 24, 2017

Uh oh!

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

Uh oh!

Uh oh!

iSazonov commented Mar 24, 2017

Uh oh!

daxian-dbw commented Mar 24, 2017

Uh oh!

iSazonov commented Mar 24, 2017

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

daxian-dbw commented Mar 22, 2017 •

edited

Loading

daxian-dbw Mar 23, 2017 •

edited

Loading

iSazonov Mar 24, 2017 •

edited

Loading

daxian-dbw commented Mar 24, 2017 •

edited

Loading