PowerShell · TravisEz13 · Apr 27, 2019 · Mar 29, 2019 · Mar 30, 2019 · Mar 30, 2019
diff --git a/.github/ISSUE_TEMPLATE/Release_Process.md b/.github/ISSUE_TEMPLATE/Release_Process.md
@@ -40,3 +40,4 @@ Please **only** use this template if you are a maintainer.
     - [ ] Delete the release branch.
     - [ ] Trigger the Docker image release.
     - [ ] Retain builds.
+    - [ ] Update https://github.com/dotnet/dotnet-docker/tree/master/3.0/sdk with new version and SHA hashes for global tool.
diff --git a/.vsts-ci/install-ps.yml b/.vsts-ci/install-ps.yml
@@ -6,6 +6,7 @@ trigger:
     include:
     - master
     - release*
+    - feature*
   paths:
     include:
     - /tools/install-powershell.sh
@@ -21,6 +22,7 @@ pr:
     include:
     - master
     - release*
+    - feature*
   paths:
     include:
     - /tools/install-powershell.sh

diff --git a/.vsts-ci/linux.yml b/.vsts-ci/linux.yml
@@ -6,6 +6,7 @@ trigger:
     include:
     - master
     - release*
+    - feature*
   paths:
     include:
     - '*'
@@ -19,6 +20,7 @@ pr:
     include:
     - master
     - release*
+    - feature*
   paths:
     include:
     - '*'

diff --git a/.vsts-ci/mac.yml b/.vsts-ci/mac.yml
@@ -6,6 +6,7 @@ trigger:
     include:
     - master
     - release*
+    - feature*
   paths:
     include:
     - '*'
@@ -19,6 +20,7 @@ pr:
     include:
     - master
     - release*
+    - feature*
   paths:
     include:
     - '*'

diff --git a/.vsts-ci/misc-analysis.yml b/.vsts-ci/misc-analysis.yml
@@ -6,12 +6,14 @@ trigger:
     include:
     - master
     - release*
+    - feature*
 
 pr:
   branches:
     include:
     - master
     - release*
+    - feature*
 
 resources:
 - repo: self

diff --git a/.vsts-ci/windows.yml b/.vsts-ci/windows.yml
@@ -6,6 +6,7 @@ trigger:
     include:
     - master
     - release*
+    - feature*
   paths:
     include:
     - '*'
@@ -19,6 +20,7 @@ pr:
     include:
     - master
     - release*
+    - feature*
   paths:
     include:
     - '*'

diff --git a/assets/Square150x150Logo-Preview.png b/assets/Square150x150Logo-Preview.png
diff --git a/assets/Square44x44Logo-Preview.png b/assets/Square44x44Logo-Preview.png
diff --git a/assets/Square44x44Logo.targetsize-48-Preview.png b/assets/Square44x44Logo.targetsize-48-Preview.png
diff --git a/assets/Square44x44Logo.targetsize-48_altform-unplated-Preview.png b/assets/Square44x44Logo.targetsize-48_altform-unplated-Preview.png
diff --git a/assets/StoreLogo-Preview.png b/assets/StoreLogo-Preview.png
diff --git a/build.psm1 b/build.psm1
@@ -127,7 +127,7 @@ function Get-EnvironmentInformation
         $LinuxInfo = Get-Content /etc/os-release -Raw | ConvertFrom-StringData
 
         $environment += @{'LinuxInfo' = $LinuxInfo}
-        $environment += @{'IsDebian' = $LinuxInfo.ID -match 'debian'}
+        $environment += @{'IsDebian' = $LinuxInfo.ID -match 'debian' -or $LinuxInfo.ID -match 'kali'}
         $environment += @{'IsDebian9' = $Environment.IsDebian -and $LinuxInfo.VERSION_ID -match '9'}
         $environment += @{'IsUbuntu' = $LinuxInfo.ID -match 'ubuntu'}
         $environment += @{'IsUbuntu16' = $Environment.IsUbuntu -and $LinuxInfo.VERSION_ID -match '16.04'}
@@ -842,7 +842,10 @@ function Get-PesterTag {
 
 function Publish-PSTestTools {
     [CmdletBinding()]
-    param()
+    param(
+        [string]
+        $runtime
+    )
 
     Find-Dotnet
 
@@ -859,7 +862,12 @@ function Publish-PSTestTools {
     {
         Push-Location $tool.Path
         try {
-            dotnet publish --output bin --configuration $Options.Configuration --framework $Options.Framework --runtime $Options.Runtime
+            if (-not $runtime) {
+                dotnet publish --output bin --configuration $Options.Configuration --framework $Options.Framework --runtime $Options.Runtime
+            } else {
+                dotnet publish --output bin --configuration $Options.Configuration --framework $Options.Framework --runtime $runtime
+            }
+
             $toolPath = Join-Path -Path $tool.Path -ChildPath "bin"
 
             if ( -not $env:PATH.Contains($toolPath) ) {
@@ -1253,7 +1261,7 @@ function Publish-TestResults
         # If the the "test-case" count is greater than 0, then we have results.
         # Regardless, we want to upload this as an artifact, so this logic doesn't pertain to that.
         if ( @(([xml](Get-Content $Path)).SelectNodes(".//test-case")).Count -gt 0 -or $Type -eq 'XUnit' ) {
-            Write-Host "##vso[results.publish type=$Type;mergeResults=true;runTitle=$Title;publishRunAttachments=true;resultFiles=$tempFilePath;]"
+            Write-Host "##vso[results.publish type=$Type;mergeResults=true;runTitle=$Title;publishRunAttachments=true;resultFiles=$tempFilePath;failTaskOnFailedTests=true]"
         }
 
         $resolvedPath = (Resolve-Path -Path $Path).ProviderPath
@@ -2974,7 +2982,8 @@ function New-TestPackage
     [CmdletBinding()]
     param(
         [Parameter(Mandatory = $true)]
-        [string] $Destination
+        [string] $Destination,
+        [string] $Runtime
     )
 
     if (Test-Path $Destination -PathType Leaf)
@@ -3002,7 +3011,7 @@ function New-TestPackage
     Write-Verbose -Verbose "PackagePath: $packagePath"
 
     # Build test tools so they are placed in appropriate folders under 'test' then copy to package root.
-    $null = Publish-PSTestTools
+    $null = Publish-PSTestTools -runtime $Runtime
     $powerShellTestRoot =  Join-Path $PSScriptRoot 'test'
     Copy-Item $powerShellTestRoot -Recurse -Destination $packageRoot -Force
     Write-Verbose -Message "Copied test directory"

diff --git a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
@@ -57,7 +57,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.0.0" />
     <PackageReference Include="System.Threading.AccessControl" Version="4.5.0" />
-    <PackageReference Include="NJsonSchema" Version="9.13.30" />
+    <PackageReference Include="NJsonSchema" Version="9.13.36" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/CommandLineParameterParser.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/CommandLineParameterParser.cs
@@ -422,7 +422,7 @@ internal string WorkingDirectory
                 {
                     return _workingDirectory.Remove(_workingDirectory.Length - 1);
                 }
- #endif
+#endif
                 return _workingDirectory;
             }
         }
@@ -529,7 +529,7 @@ private static string GetConfigurationNameFromGroupPolicy()
         /// </param>
         private static void EarlyParseHelper(string[] args)
         {
-            if(args == null)
+            if (args == null)
             {
                 Dbg.Assert(args != null, "Argument 'args' to EarlyParseHelper should never be null");
                 return;
@@ -1043,7 +1043,7 @@ private void ParseFormat(string[] args, ref int i, ref Serialization.DataFormat
             foreach (string s in Enum.GetNames(typeof(Serialization.DataFormat)))
             {
                 sb.Append(s);
-                sb.Append(ConsoleHostUserInterface.Crlf);
+                sb.Append(Environment.NewLine);
             }
 
             ++i;