Merge pull request #1093 from PowerShell/andschwa/project-model-update

Rename compilationOptions to buildOptions in project.json files; Remove NOETW

build.psm1

@@ -66,8 +66,8 @@ function Start-PSBuild {
         Write-Verbose "Appending probable .NET CLI tool path"
         if ($IsWindows) {
             $env:Path += ";$env:LocalAppData\Microsoft\dotnet"
-        } elseif ($IsOSX) {
-            $env:PATH += ":/usr/local/share/dotnet"
+        } else {
+            $env:PATH += ":$env:HOME/.dotnet"
         }
     }
 
@@ -371,48 +371,69 @@ function Start-PSBootstrap {
 
     Write-Host "Installing Open PowerShell build dependencies"
 
-    if ($IsLinux) {
-        precheck 'curl' "Bootstrap dependency 'curl' not found in PATH, please install!" > $null
-        precheck 'apt-get' "Bootstrap dependency 'apt-get' not found in PATH, this only supports Ubuntu 14.04!" > $null
+    Push-Location $PSScriptRoot/tools
 
-        # Setup LLVM feed
-        curl -s http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add -
-        echo "deb http://llvm.org/apt/trusty/ llvm-toolchain-trusty-3.6 main" | sudo tee /etc/apt/sources.list.d/llvm.list
-        sudo apt-get update -qq
+    try {
+        # Install dependencies for Linux and OS X
+        if ($IsLinux) {
+            $IsUbuntu = Select-String "Ubuntu 14.04" /etc/os-release -Quiet
+            precheck 'curl' "Bootstrap dependency 'curl' not found in PATH, please install!" > $null
+            if ($IsUbuntu) {
+                # Setup LLVM feed
+                curl -s http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add -
+                echo "deb http://llvm.org/apt/trusty/ llvm-toolchain-trusty-3.6 main" | sudo tee /etc/apt/sources.list.d/llvm.list
+                sudo apt-get update -qq
 
-        # Install ours and .NET's dependencies
-        sudo apt-get install -y make g++ cmake libc6 libgcc1 libstdc++6 libcurl3 libgssapi-krb5-2 libicu52 liblldb-3.6 liblttng-ust0 libssl1.0.0 libunwind8 libuuid1 zlib1g clang-3.5
+                # Install ours and .NET's dependencies
+                sudo apt-get install -y -qq make g++ cmake libc6 libgcc1 libstdc++6 libcurl3 libgssapi-krb5-2 libicu52 liblldb-3.6 liblttng-ust0 libssl1.0.0 libunwind8 libuuid1 zlib1g clang-3.5
+            } else {
+                Write-Warning "This script only supports Ubuntu 14.04, you must install dependencies manually!"
+            }
+        } elseif ($IsOSX) {
+            precheck 'brew' "Bootstrap dependency 'brew' not found, must install Homebrew! See http://brew.sh/"
 
-        # Install .NET CLI packages
-        Remove-Item dotnet*.deb
+            # Install ours and .NET's dependencies
+            brew install cmake wget openssl
+            brew link --force openssl
+        }
 
-        wget https://dotnetcli.blob.core.windows.net/dotnet/beta/Installers/Latest/dotnet-host-ubuntu-x64.latest.deb
-        sudo dpkg -i dotnet-host-ubuntu-x64.latest.deb
+        $obtainUrl = "https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0/scripts/obtain"
 
-        wget https://dotnetcli.blob.core.windows.net/dotnet/beta/Installers/Latest/dotnet-sharedframework-ubuntu-x64.latest.deb
-        sudo dpkg -i dotnet-sharedframework-ubuntu-x64.latest.deb
+        # Install for Linux and OS X
+        if ($IsLinux -or $IsOSX) {
+            # Uninstall all previous dotnet packages
+            $uninstallScript = if ($IsUbuntu) {
+                "dotnet-uninstall-debian-packages.sh"
+            } elseif ($IsOSX) {
+                "dotnet-uninstall-pkgs.sh"
+            }
 
-        wget https://dotnetcli.blob.core.windows.net/dotnet/beta/Installers/Latest/dotnet-sdk-ubuntu-x64.latest.deb
-        sudo dpkg -i dotnet-sdk-ubuntu-x64.latest.deb
+            if ($uninstallScript) {
+                curl -s $obtainUrl/uninstall/$uninstallScript -o $uninstallScript
+                chmod +x $uninstallScript
+                sudo ./$uninstallScript
+            } else {
+                Write-Warning "This script only removes prior versions of dotnet for Ubuntu 14.04 and OS X"
+            }
 
-    } elseif ($IsOSX) {
-        precheck 'brew' "Bootstrap dependency 'brew' not found, must install Homebrew! See http://brew.sh/"
+            # Install new dotnet 1.0.0 preview packages
+            $installScript = "dotnet-install.sh"
+            curl -s $obtainUrl/$installScript -o $installScript
+            chmod +x $installScript
+            bash ./$installScript -c preview
+        }
 
-        # Install ours and .NET's dependencies
-        brew install cmake wget openssl
-
-        # Install .NET CLI packages
-        Remove-Item dotnet*.pkg
-        wget https://dotnetcli.blob.core.windows.net/dotnet/beta/Installers/Latest/dotnet-dev-osx-x64.latest.pkg
-        sudo installer -pkg dotnet-dev-osx-x64.latest.pkg -target /
-
-    } elseif ($IsWindows -And -Not $IsCore) {
-        Remove-Item -ErrorAction SilentlyContinue -Recurse -Force ~\AppData\Local\Microsoft\dotnet
-        Invoke-WebRequest -Uri https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0/scripts/obtain/dotnet-install.ps1 -OutFile dotnet-install.ps1
-        ./dotnet-install.ps1
-
-    } else {
-        Write-Warning "Start-PSBootstrap cannot be run in Core PowerShell on Windows (need Invoke-WebRequest!)"
+        # Install for Windows
+        if ($IsWindows -and -not $IsCore) {
+            Remove-Item -ErrorAction SilentlyContinue -Recurse -Force ~\AppData\Local\Microsoft\dotnet
+            $installScript = "dotnet-install.ps1"
+            Invoke-WebRequest -Uri $obtainUrl/$installScript -OutFile $installScript
+            & ./$installScript
+        } elseif ($IsWindows) {
+            Write-Warning "Start-PSBootstrap cannot be run in Core PowerShell on Windows (need Invoke-WebRequest!)"
+        }
+    } finally {
+        Pop-Location
     }
 }
 

docs/building/linux.md

@@ -7,8 +7,9 @@ start by showing how to set up your environment from scratch.
 Environment
 ===========
 
-These instructions are written assuming the Ubuntu 14.04 LTS, since
-that's the distro the team uses.
+These instructions are written assuming the Ubuntu 14.04 LTS, since that's the
+distro the team uses. The build module works on a best-effort basis for other
+distributions.
 
 Git Setup
 ---------
@@ -74,8 +75,11 @@ The `Start-PSBootstrap` function does the following:
 - Adds the LLVM package feed
 - Installs our dependencies combined with the dependencies of the .NET
   CLI toolchain via `apt-get`
-- Installs the .NET CLI host, shared framework, and SDK by downloading
-  the three `.deb` packages and using `dpkg -i`
+- Uninstalls any prior versions of .NET CLI
+- Downloads and installs the latest .NET CLI 1.0.0-preview2 SDK to `~/.dotnet`
+
+If you want to use `dotnet` outside of `Start-PSBuild`, add `~/.dotnet` to your
+`PATH` environment variable.
 
 [dotnet-cli]: https://github.com/dotnet/cli#new-to-net-cli
 [CMake]: https://cmake.org/cmake/help/v2.8.12/cmake.html

docs/building/osx.md

@@ -20,12 +20,12 @@ install a self-hosted copy of PowerShell on your OS X machine, and use
 The `Start-PSBootstrap` function does the following:
 
 - Uses `brew` to install CMake, OpenSSL, and GNU WGet
-- Downloads and installs the latest .NET CLI package
-- Adds `/usr/local/share/dotnet` to the process path
+- Links OpenSSL
+- Uninstalls any prior versions of .NET CLI
+- Downloads and installs the latest .NET CLI 1.0.0-preview2 SDK to `~/.dotnet`
 
-Please heed that last step. You may want to add the .NET CLI tool
-location to your path more permanently by adding it to your shell's
-profile.
+If you want to use `dotnet` outside of `Start-PSBuild`, add `~/.dotnet` to your
+`PATH` environment variable.
 
 error: Too many open files
 --------------------------

src/Microsoft.PowerShell.Commands.Management/project.json

@@ -3,9 +3,10 @@
     "version": "1.0.0-*",
     "authors": [ "garretts", "andschwa" ],
 
-    "compilationOptions": {
+    "buildOptions": {
         "warningsAsErrors": true,
-        "allowUnsafe": true
+        "allowUnsafe": true,
+        "compile": [ "../windows-build/gen/Microsoft.PowerShell.Commands.Management/*.cs" ]
     },
 
     "dependencies": {
@@ -15,7 +16,7 @@
     "frameworks": {
         "netstandard1.5": {
             "imports": [ "dnxcore50" ],
-            "compilationOptions": {
+            "buildOptions": {
                 "define": [ "CORECLR" ]
             },
             "dependencies": {
@@ -34,7 +35,5 @@
                  "Microsoft.WSMan.Management": "1.0.0"
             }
         }
-    },
-
-    "compile": [ "../windows-build/gen/Microsoft.PowerShell.Commands.Management/*.cs" ]
+    }
 }

src/Microsoft.PowerShell.Commands.Utility/project.json

@@ -3,17 +3,10 @@
     "version": "1.0.0-*",
     "authors": [ "garretts", "andschwa" ],
 
-    "compilationOptions": {
+    "buildOptions": {
         "warningsAsErrors": true,
-        "allowUnsafe": true
-    },
-
-    "configurations": {
-        "Linux": {
-            "compilationOptions": {
-                "define": [ "LINUX" ]
-            }
-        }
+        "allowUnsafe": true,
+        "compile": [ "../windows-build/gen/Microsoft.PowerShell.Commands.Utility/*.cs" ]
     },
 
     "dependencies": {
@@ -22,7 +15,7 @@
 
     "frameworks": {
         "netstandard1.5": {
-            "compilationOptions": {
+            "buildOptions": {
                 "define": [ "CORECLR" ]
             },
             "imports": [ "dnxcore50", "portable-net45+win8" ],
@@ -43,7 +36,5 @@
                 "Microsoft.mshtml": "1.0.0"
             }
         }
-    },
-
-    "compile": [ "../windows-build/gen/Microsoft.PowerShell.Commands.Utility/*.cs" ]
+    }
 }

src/Microsoft.PowerShell.ConsoleHost/project.json

@@ -4,9 +4,27 @@
     "description": "PowerShell Host",
     "authors": [ "sevoroby", "andschwa" ],
 
-    "compilationOptions": {
+    "buildOptions": {
         "warningsAsErrors": true,
-        "allowUnsafe": true
+        "allowUnsafe": true,
+        "compile": [ "../windows-build/gen/Microsoft.PowerShell.ConsoleHost/*.cs" ],
+        "copyToOutput": {
+            "include": [
+                "Modules",
+                "../Modules",
+                "powershell.exe",
+                "../../powershell.version"
+            ]
+        }
+    },
+
+    "publishOptions": {
+        "include": [
+            "Modules",
+            "../Modules",
+            "powershell.exe",
+            "../../powershell.version"
+        ]
     },
 
     "dependencies": {
@@ -15,17 +33,10 @@
         "Microsoft.PowerShell.Commands.Utility": "1.0.0-*"
     },
 
-    "content": [
-        "Modules",
-        "../Modules",
-        "powershell.exe",
-        "../../powershell.version"
-    ],
-
     "frameworks": {
         "netstandard1.5": {
             "imports": [ "dnxcore50", "portable-net45+win8" ],
-            "compilationOptions": {
+            "buildOptions": {
                 "define": [ "CORECLR", "PORTABLE" ]
             },
             "dependencies": {
@@ -36,9 +47,5 @@
         },
         "net451": {
         }
-    },
-
-    "compile": [
-        "../windows-build/gen/Microsoft.PowerShell.ConsoleHost/*.cs"
-    ]
+    }
 }

src/Microsoft.PowerShell.CoreCLR.AssemblyLoadContext/project.json

@@ -3,13 +3,13 @@
     "version": "1.0.0-*",
     "authors": [ "andschwa" ],
 
-    "compilationOptions": {
+    "buildOptions": {
         "warningsAsErrors": true
     },
 
     "configurations": {
         "Linux": {
-            "compilationOptions": {
+            "buildOptions": {
                 "define": [ "LINUX" ]
             }
         }
@@ -18,7 +18,7 @@
     "frameworks": {
         "netstandard1.5": {
             "imports": [ "dnxcore50" ],
-            "compilationOptions": {
+            "buildOptions": {
                 "define": [ "CORECLR" ]
             },
             "dependencies": {

src/Microsoft.PowerShell.CoreCLR.Eventing/project.json

@@ -3,23 +3,16 @@
     "version": "1.0.0-*",
     "authors": [ "sevoroby" ],
 
-    "compilationOptions": {
+    "buildOptions": {
         "warningsAsErrors": true,
-        "allowUnsafe": true
-    },
-
-    "configurations": {
-        "Linux": {
-            "compilationOptions": {
-                "define": [ "NOETW" ]
-            }
-        }
+        "allowUnsafe": true,
+        "compile": [ "../windows-build/gen/Microsoft.PowerShell.CoreCLR.Eventing/*.cs" ]
     },
 
     "frameworks": {
         "netstandard1.5": {
             "imports": [ "dnxcore50" ],
-            "compilationOptions": {
+            "buildOptions": {
                 "define": [ "CORECLR" ]
             },
             "dependencies": {
@@ -29,7 +22,5 @@
                 "System.Security.SecureString": "4.0.0-*"
             }
         }
-    },
-
-    "compile": [ "../windows-build/gen/Microsoft.PowerShell.CoreCLR.Eventing/*.cs" ]
+    }
 }

src/Microsoft.PowerShell.PSReadLine/project.json

@@ -3,7 +3,7 @@
     "version": "1.0.0-*",
     "authors": [ "andschwa" ],
 
-    "compilationOptions": {
+    "buildOptions": {
         "warningsAsErrors": true
     },
 
@@ -13,7 +13,7 @@
 
     "frameworks": {
         "netstandard1.5": {
-            "compilationOptions": {
+            "buildOptions": {
                 "define": [ "CORECLR" ]
             },
             "imports": [ "dnxcore50", "portable-net45+win8" ]

src/Microsoft.PowerShell.Security/project.json

@@ -3,9 +3,10 @@
     "version": "1.0.0-*",
     "authors": [ "garretts", "andschwa" ],
 
-    "compilationOptions": {
+    "buildOptions": {
         "warningsAsErrors": true,
-        "allowUnsafe": true
+        "allowUnsafe": true,
+        "compile": [ "../windows-build/gen/Microsoft.PowerShell.Security/*.cs" ]
     },
 
     "dependencies": {
@@ -15,13 +16,11 @@
     "frameworks": {
         "netstandard1.5": {
             "imports": [ "dnxcore50" ],
-            "compilationOptions": {
+            "buildOptions": {
                 "define": [ "CORECLR" ]
             }
         },
         "net451": {
         }
-    },
-
-    "compile": [ "../windows-build/gen/Microsoft.PowerShell.Security/*.cs" ]
+    }
 }

src/System.Management.Automation/CoreCLR/CorePsStub.cs

@@ -1409,7 +1409,7 @@ namespace System.Management.Automation.Security
 }
 
 
-#if NOETW || LINUX
+#if LINUX
 
 // Porting note: Tracing is absolutely not available on Linux
 namespace System.Management.Automation.Tracing

src/System.Management.Automation/logging/MshLog.cs

@@ -172,7 +172,7 @@ namespace System.Management.Automation
 #endif
             Collection<LogProvider> providers = new Collection<LogProvider>();
             // Porting note: Linux does not support ETW
-#if !NOETW && !LINUX
+#if !LINUX
             try
             {
 #if !CORECLR    //TODO:CORECLR EventLogLogProvider not handled yet

src/System.Management.Automation/project.json

@@ -3,15 +3,16 @@
     "version": "1.0.0-*",
     "authors": [ "garretts", "andschwa" ],
 
-    "compilationOptions": {
+    "buildOptions": {
         "warningsAsErrors": true,
-        "allowUnsafe": true
+        "allowUnsafe": true,
+        "compile": [ "../windows-build/gen/System.Management.Automation/*.cs" ]
     },
 
     "configurations": {
         "Linux": {
-            "compilationOptions": {
-                "define": [ "LINUX", "NOETW" ]
+            "buildOptions": {
+                "define": [ "LINUX" ]
             }
         }
     },
@@ -23,7 +24,7 @@
     "frameworks": {
         "netstandard1.5": {
             "imports": [ "dnxcore50" ],
-            "compilationOptions": {
+            "buildOptions": {
                 "define": [ "CORECLR" ]
             },
             "dependencies": {
@@ -78,9 +79,5 @@
                 "System.Configuration.Install": ""
             }
         }
-    },
-
-    "compile": [
-        "../windows-build/gen/System.Management.Automation/*.cs"
-    ]
+    }
 }

src/System.Management.Automation/utils/PowerShellETWTracer.cs

@@ -1,4 +1,4 @@
-#if !NOETW
+#if !LINUX
 //
 //    Copyright (C) Microsoft.  All rights reserved.
 //

src/System.Management.Automation/utils/tracing/EtwActivity.cs

@@ -1,4 +1,4 @@
-#if !NOETW
+#if !LINUX
 //
 //    Copyright (C) Microsoft.  All rights reserved.
 //

src/System.Management.Automation/utils/tracing/EtwActivityReverter.cs

@@ -1,4 +1,4 @@
-#if !NOETW
+#if !LINUX
 //-----------------------------------------------------------------------
 // <copyright file="EtwActivityReverter.cs" company="Microsoft">
 //     Copyright (c) Microsoft Corporation.  All rights reserved.

src/System.Management.Automation/utils/tracing/EtwActivityReverterMethodInvoker.cs

@@ -1,4 +1,4 @@
-#if !NOETW
+#if !LINUX
 //-----------------------------------------------------------------------
 // <copyright file="EtwActivityReverterMethodInvoker.cs" company="Microsoft">
 //     Copyright (c) Microsoft Corporation.  All rights reserved.

src/System.Management.Automation/utils/tracing/EtwEventCorrelator.cs

@@ -1,4 +1,4 @@
-#if !NOETW
+#if !LINUX
 //-----------------------------------------------------------------------
 // <copyright file="EtwEventCorrelator.cs" company="Microsoft">
 //     Copyright (c) Microsoft Corporation.  All rights reserved.

src/System.Management.Automation/utils/tracing/IMethodInvoker.cs

@@ -1,4 +1,4 @@
-#if !NOETW
+#if !LINUX
 //-----------------------------------------------------------------------
 // <copyright file="IMethodInvoker.cs" company="Microsoft">
 //     Copyright (c) Microsoft Corporation.  All rights reserved.

src/System.Management.Automation/utils/tracing/PSEtwLog.cs

@@ -1,4 +1,4 @@
-#if !NOETW
+#if !LINUX
 //
 //    Copyright (C) Microsoft.  All rights reserved.
 //

src/System.Management.Automation/utils/tracing/PSEtwLogProvider.cs

@@ -1,4 +1,4 @@
-#if !NOETW
+#if !LINUX
 //
 //    Copyright (C) Microsoft.  All rights reserved.
 //

src/System.Management.Automation/utils/tracing/Tracing.cs

@@ -1,4 +1,4 @@
-#if !NOETW
+#if !LINUX
 //
 //    Copyright (C) Microsoft.  All rights reserved.
 //

src/System.Management.Automation/utils/tracing/TracingGen.cs

@@ -1,4 +1,4 @@
-#if !NOETW
+#if !LINUX
 using System;
 using System.Collections;
 using System.Diagnostics.Eventing;

src/System.Security.SecureString/project.json

@@ -4,7 +4,7 @@
     "description": "SecureString Stub borrowed from Mono",
     "authors": [ "garretts" ],
 
-    "compilationOptions": {
+    "buildOptions": {
         "warningsAsErrors": true,
         "allowUnsafe": true
     },

src/TypeCatalogGen/project.json

@@ -4,7 +4,7 @@
     "description": "Generates CorePsTypeCatalog.cs given powershell.inc",
     "authors": [ "andschwa" ],
 
-    "compilationOptions": {
+    "buildOptions": {
         "emitEntryPoint": true
     },
 

src/TypeCatalogParser/project.json

@@ -1,5 +1,5 @@
 {
-    "compilationOptions": {
+    "buildOptions": {
         "warningsAsErrors": true,
         "emitEntryPoint": true
     },

src/powershell/project.json

@@ -4,29 +4,39 @@
     "description": ".NET CLI PowerShell app",
     "authors": [ "andschwa" ],
 
-    "compilationOptions": {
+    "buildOptions": {
         "warningsAsErrors": true,
         "allowUnsafe": true,
-        "emitEntryPoint": true
+        "emitEntryPoint": true,
+        "copyToOutput": {
+            "include": [
+                "Modules",
+                "../Modules",
+                "*.so",
+                "*.dylib",
+                "../../powershell.version"
+            ]
+        }
+    },
+
+    "publishOptions": {
+        "include": [
+            "Modules",
+            "../Modules",
+            "*.so",
+            "*.dylib",
+            "../../powershell.version"
+        ]
     },
 
     "dependencies": {
         "Microsoft.PowerShell.ConsoleHost": "1.0.0-*"
     },
 
-    "content": [
-        "Modules",
-        "../Modules",
-        "*_profile.ps1",
-        "*.so",
-        "*.dylib",
-        "../../powershell.version"
-    ],
-
     "frameworks": {
         "netcoreapp1.0": {
             "imports": [ "dnxcore50", "portable-net45+win8" ],
-            "compilationOptions": {
+            "buildOptions": {
                 "define": [ "CORECLR" ]
             },
             "dependencies": {

test/PSReadLine/project.json

@@ -3,7 +3,7 @@
     "version": "1.0.0-*",
     "description": "PSReadLine basic tests",
 
-    "compilationOptions": {
+    "buildOptions": {
         "warningsAsErrors": true,
         "emitEntryPoint": true
     },

tools/.gitignore

@@ -0,0 +1,2 @@
+dotnet-install.sh
+dotnet-uninstall-debian-packages.sh