PowerShell · kvprasoon · Sep 24, 2020 · Sep 25, 2020 · Oct 3, 2020 · Nov 18, 2020
diff --git a/.spelling b/.spelling
@@ -443,6 +443,7 @@ launch.json
 ldspits
 lee303
 Leonhardt
+libicu
 libpsl
 libpsl-native
 libunwind8
@@ -953,6 +954,7 @@ v6.2.3
 v6.2.4
 v7.0.0
 v7.0.3
+v7.0.4
 v7.1.0
 validatenotnullorempty
 versioned
@@ -1263,5 +1265,18 @@ GetListOfFilesFromData
 RPMs
 NullableAttribute
 PSDesiredStateConfiguration
+brianary
+Fs00
+MartinGC94
+jakekerr
+strikethrough
+string.Contains
+imba-tjd
+url
+ArrayList
+SDKs
+XunitXml.TestLogger
+Backport
+v7.1.1
 about_PSDesiredStateConfiguration
 
@@ -8,14 +8,17 @@ trigger:
     - release*
     - feature*
   paths:
-    include:
-    - /.vsts-ci/templates/windows-packaging.yml
-    - /.vsts-ci/windows-packaging.yml
-    - /global.json
-    - /src/*
-    - /tools/ci.psm1
-    - /tools/packaging/*
-    - /assets/*
+    exclude:
+      - tests/*
+      - docs/*
+      - demos/*
+      - CHANGELOG/*
+      - .devcontainer/*
+      - .github/*
+      - .poshchan/*
+      - .vscode/*
+      - code-server/*
+      - docker/*
 
 pr:
   branches:
@@ -27,29 +30,29 @@ pr:
     # file extension filters are not supported when this was written.
     # This really should be /src/**/*.csproj
     include:
-    - /.vsts-ci/templates/windows-packaging.yml
-    - /.vsts-ci/windows-packaging.yml
-    - /global.json
-    - /src/Microsoft.Management.Infrastructure.CimCmdlets/Microsoft.Management.Infrastructure.CimCmdlets.csproj
-    - /src/Microsoft.Management.UI.Internal/Microsoft.PowerShell.GraphicalHost.csproj
-    - /src/Microsoft.PowerShell.Commands.Diagnostics/Microsoft.PowerShell.Commands.Diagnostics.csproj
-    - /src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
-    - /src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
-    - /src/Microsoft.PowerShell.ConsoleHost/Microsoft.PowerShell.ConsoleHost.csproj
-    - /src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
-    - /src/Microsoft.PowerShell.GlobalTool.Shim/Microsoft.PowerShell.GlobalTool.Shim.csproj
-    - /src/Microsoft.PowerShell.LocalAccounts/Microsoft.PowerShell.LocalAccounts.csproj
-    - /src/Microsoft.PowerShell.MarkdownRender/Microsoft.PowerShell.MarkdownRender.csproj
-    - /src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
-    - /src/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.csproj
-    - /src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
-    - /src/Microsoft.WSMan.Runtime/Microsoft.WSMan.Runtime.csproj
-    - /src/Modules/PSGalleryModules.csproj
-    - /src/powershell-win-core/powershell-win-core.csproj
-    - /tools/ci.psm1
-    - /tools/packaging/*
-    - /assets/files.wxs
-    - /assets/Product.wxs
+    - .vsts-ci/windows/*
+    - assets/wix/*
+    - build.psm1
+    - global.json
+    - nuget.config
+    - PowerShell.Common.props
+    - src/Microsoft.Management.Infrastructure.CimCmdlets/Microsoft.Management.Infrastructure.CimCmdlets.csproj
+    - src/Microsoft.Management.UI.Internal/Microsoft.PowerShell.GraphicalHost.csproj
+    - src/Microsoft.PowerShell.Commands.Diagnostics/Microsoft.PowerShell.Commands.Diagnostics.csproj
+    - src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
+    - src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+    - src/Microsoft.PowerShell.ConsoleHost/Microsoft.PowerShell.ConsoleHost.csproj
+    - src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
+    - src/Microsoft.PowerShell.GlobalTool.Shim/Microsoft.PowerShell.GlobalTool.Shim.csproj
+    - src/Microsoft.PowerShell.MarkdownRender/Microsoft.PowerShell.MarkdownRender.csproj
+    - src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
+    - src/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.csproj
+    - src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
+    - src/Microsoft.WSMan.Runtime/Microsoft.WSMan.Runtime.csproj
+    - src/Modules/PSGalleryModules.csproj
+    - src/powershell-win-core/powershell-win-core.csproj
+    - tools/ci.psm1
+    - tools/packaging/*
 
 variables:
   - name: GIT_CONFIG_PARAMETERS

diff --git a/CHANGELOG/7.0.md b/CHANGELOG/7.0.md
@@ -1,5 +1,24 @@
 # 7.0 Changelog
 
+## [7.0.5] - 2021-02-11
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+Bump .NET SDK to version <code>3.1.406</code>
+</summary>
+
+<ul>
+<li>Fix third party signing for files in sub-folders (#14751)</li>
+<li>Bump .NET SDK to 3.1.12 (Internal 14462)</li>
+</ul>
+
+</details>
+
+[7.0.5]: https://github.com/PowerShell/PowerShell/compare/v7.0.4...v7.0.5
+
 ## [7.0.4] - 2021-01-19
 
 ### Build and Packaging Improvements

diff --git a/CHANGELOG/7.1.md b/CHANGELOG/7.1.md
@@ -1,5 +1,25 @@
 # 7.1 Changelog
 
+## [7.1.2] - 2021-02-11
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+Bump .NET SDK to version <code>5.0.103</code>
+</summary>
+
+<ul>
+<li>Fix third party signing for files in sub-folders (#14751)</li>
+<li>Bump .NET SDK to version 5.0.103 (Internal 14459)</li>
+<li>Publish the global tool package for stable release</li>
+</ul>
+
+</details>
+
+[7.1.2]: https://github.com/PowerShell/PowerShell/compare/v7.1.1...v7.1.2
+
 ## [7.1.1] - 2021-01-14
 
 ### General Cmdlet Updates and Fixes

diff --git a/CHANGELOG/preview.md b/CHANGELOG/preview.md
@@ -1,5 +1,111 @@
 # Current preview release
 
+## [7.2.0-preview.3] - 2021-02-11
+
+### Breaking Changes
+
+- Fix `Get-Date -UFormat %u` behavior to comply with ISO 8601 (#14549) (Thanks @brianary!)
+
+### Engine Updates and Fixes
+
+- Together with `PSDesiredStateConfiguration` `v3` module allows `Get-DscResource`, `Invoke-DscResource` and DSC configuration compilation on all platforms, supported by PowerShell (using class-based DSC resources).
+
+### Performance
+
+- Avoid array allocations from `Directory.GetDirectories` and `Directory.GetFiles`. (#14326) (Thanks @xtqqczze!)
+- Avoid `string.ToLowerInvariant()` from `GetEnvironmentVariableAsBool()` to avoid loading libicu at startup (#14323) (Thanks @iSazonov!)
+- Get PowerShell version in `PSVersionInfo` using assembly attribute instead of `FileVersionInfo` (#14332) (Thanks @Fs00!)
+
+### General Cmdlet Updates and Fixes
+
+- Suppress `Write-Progress` in `ConsoleHost` if output is redirected and fix tests (#14716)
+- Experimental feature `PSAnsiProgress`: Add minimal progress bar using ANSI rendering (#14414)
+- Fix web cmdlets to properly construct URI from body when using `-NoProxy` (#14673)
+- Update the `ICommandPredictor` to provide more feedback and also make feedback easier to be correlated (#14649)
+- Reset color after writing `Verbose`, `Debug`, and `Warning` messages (#14698)
+- Fix using variable for nested `ForEach-Object -Parallel` calls (#14548)
+- When formatting, if collection is modified, don't fail the entire pipeline (#14438)
+- Improve completion of parameters for attributes (#14525) (Thanks @MartinGC94!)
+- Write proper error messages for `Get-Command ' '` (#13564) (Thanks @jakekerr!)
+- Fix typo in the resource string `ProxyURINotSupplied` (#14526) (Thanks @romero126!)
+- Add support to `$PSStyle` for strikethrough and hyperlinks (#14461)
+- Fix `$PSStyle` blink codes (#14447) (Thanks @iSazonov!)
+
+### Code Cleanup
+
+<details>
+
+<summary>
+
+<p>We thank the following contributors!</p>
+<p>@xtqqczze, @powercode</p>
+
+</summary>
+
+<ul>
+<li>Fix coding style issues: RCS1215, IDE0090, SA1504, SA1119, RCS1139, IDE0032 (#14356, #14341, #14241, #14204, #14442, #14443) (Thanks @xtqqczze!)</li>
+<li>Enable coding style checks: CA2249, CA1052, IDE0076, IDE0077, SA1205, SA1003, SA1314, SA1216, SA1217, SA1213 (#14395, #14483, #14494, #14495, #14441, #14476, #14470, #14471, #14472) (Thanks @xtqqczze!)</li>
+<li>Enable nullable in PowerShell codebase (#14160, #14172, #14088, #14154, #14166, #14184, #14178) (Thanks @powercode!)</li>
+<li>Use <code>string.Split(char)</code> instead of <code>string.Split(string)</code> (#14465) (Thanks @xtqqczze!)</li>
+<li>Use <code>string.Contains(char)</code> overload (#14368) (Thanks @xtqqczze!)</li>
+<li>Refactor complex <code>if</code> statements (#14398) (Thanks @xtqqczze!)</li>
+</ul>
+
+</details>
+
+### Tools
+
+- Update script to use .NET 6 build resources (#14705)
+- Fix the daily GitHub action (#14711) (Thanks @imba-tjd!)
+- GitHub Actions: fix deprecated `::set-env` (#14629) (Thanks @imba-tjd!)
+- Update markdown test tools (#14325) (Thanks @RDIL!)
+- Upgrade `StyleCopAnalyzers` to `v1.2.0-beta.312` (#14354) (Thanks @xtqqczze!)
+
+### Tests
+
+- Remove packaging from daily Windows build (#14749)
+- Update link to the Manning book (#14750)
+- A separate Windows packaging CI (#14670)
+- Update `ini` component version in test `package.json` (#14454)
+- Disable `libmi` dependent tests for macOS. (#14446)
+
+### Build and Packaging Improvements
+
+<details>
+
+<ul>
+<li>Fix the NuGet feed name and URL for .NET 6</li>
+<li>Fix third party signing for files in sub-folders (#14751)</li>
+<li>Make build script variable an <code>ArrayList</code> to enable <code>Add()</code> method (#14748)</li>
+<li>Remove old .NET SDKs to make <code>dotnet restore</code> work with the latest SDK in CI pipeline (#14746)</li>
+<li>Remove outdated Linux dependencies (#14688)</li>
+<li>Bump .NET SDK version to 6.0.0-preview.1 (#14719)</li>
+<li>Bump <code>NJsonSchema</code> to 10.3.4 (#14714)</li>
+<li>Update daily GitHub action to allow manual trigger (#14718)</li>
+<li>Bump <code>XunitXml.TestLogger</code> to 3.0.62 (#14702)</li>
+<li>Make universal deb package based on the deb package specification (#14681)</li>
+<li>Add manual release automation steps and improve changelog script (#14445)</li>
+<li>Fix release build to upload global tool packages to artifacts (#14620)</li>
+<li>Port changes from the PowerShell v7.0.4 release (#14637)</li>
+<li>Port changes from the PowerShell v7.1.1 release (#14621)</li>
+<li>Updated README and <code>metadata.json</code> (#14401, #14606, #14612)</li>
+<li>Do not push nupkg artifacts to MyGet (#14613)</li>
+<li>Use one feed in each <code>nuget.config</code> in official builds (#14363)</li>
+<li>Fix path signed RPMs are uploaded from in release build (#14424)</li>
+</ul>
+
+</details>
+
+### Documentation and Help Content
+
+- Update distribution support request template to point to .NET 5.0 support document (#14578)
+- Remove security GitHub issue template (#14453)
+- Add intent for using the Discussions feature in repo (#14399)
+- Fix Universal Dashboard to refer to PowerShell Universal (#14437)
+- Update document link because of HTTP 301 redirect (#14431) (Thanks @xtqqczze!)
+
+[7.2.0-preview.3]: https://github.com/PowerShell/PowerShell/compare/v7.2.0-preview.2...v7.2.0-preview.3
+
 ## [7.2.0-preview.2] - 2020-12-15
 
 ### Breaking Changes

diff --git a/assets/Product.wxs → assets/wix/Product.wxs b/assets/Product.wxs → assets/wix/Product.wxs
@@ -53,9 +53,9 @@
     <!-- Set properties for add/remove programs -->
     <Property Id="ARPHELPLINK" Value="$(var.InfoURL)" />
     <!-- custom images -->
-    <WixVariable Id="WixUIBannerBmp" Value="assets\WixUIBannerBmp.png" />
-    <WixVariable Id="WixUIDialogBmp" Value="assets\WixUIDialogBmp.png" />
-    <WixVariable Id="WixUIExclamationIco" Value="assets\WixUIInfoIco.png" />
+    <WixVariable Id="WixUIBannerBmp" Value="assets\wix\WixUIBannerBmp.png" />
+    <WixVariable Id="WixUIDialogBmp" Value="assets\wix\WixUIDialogBmp.png" />
+    <WixVariable Id="WixUIExclamationIco" Value="assets\wix\WixUIInfoIco.png" />
     <WixVariable Id="WixUIInfoIco" Value="assets\ps_black_32x32.ico" />
     <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value="Open $(var.ProductName)" />
     <!-- Default value of Checkbox of starting PowerShell after installation -->

diff --git a/assets/WixUIBannerBmp.png → assets/wix/WixUIBannerBmp.png b/assets/WixUIBannerBmp.png → assets/wix/WixUIBannerBmp.png
diff --git a/assets/WixUIDialogBmp.png → assets/wix/WixUIDialogBmp.png b/assets/WixUIDialogBmp.png → assets/wix/WixUIDialogBmp.png
diff --git a/assets/WixUIInfoIco.png → assets/wix/WixUIInfoIco.png b/assets/WixUIInfoIco.png → assets/wix/WixUIInfoIco.png
diff --git a/assets/files.wxs → assets/wix/files.wxs b/assets/files.wxs → assets/wix/files.wxs
diff --git a/assets/patch-template.wxs → assets/wix/patch-template.wxs b/assets/patch-template.wxs → assets/wix/patch-template.wxs
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/ConvertToJsonCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/ConvertToJsonCommand.cs
@@ -35,7 +35,7 @@ public class ConvertToJsonCommand : PSCmdlet
         /// Gets or sets the Depth property.
         /// </summary>
         [Parameter]
-        [ValidateRange(1, int.MaxValue)]
+        [ValidateRange(0, int.MaxValue)]
         public int Depth
         {
             get { return _depth; }

diff --git a/test/powershell/Installer/WindowsInstaller.Tests.ps1 b/test/powershell/Installer/WindowsInstaller.Tests.ps1
@@ -14,7 +14,7 @@ Describe "Windows Installer" -Tags "Scenario" {
     }
 
     It "WiX (Windows Installer XML) file contains pre-requisites link $preRequisitesLink" -Skip:$skipTest {
-        $wixProductFile = Join-Path -Path $PSScriptRoot -ChildPath "..\..\..\assets\Product.wxs"
+        $wixProductFile = Join-Path -Path $PSScriptRoot -ChildPath "..\..\..\assets\wix\Product.wxs"
         (Get-Content $wixProductFile -Raw).Contains($preRequisitesLink) | Should -BeTrue
     }
 

diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/ConvertTo-Json.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/ConvertTo-Json.Tests.ps1
@@ -40,6 +40,28 @@ Describe 'ConvertTo-Json' -tags "CI" {
         $ps.Dispose()
     }
 
+    It "Should accept minimum depth as 0." {
+        $ComplexObject = [PSCustomObject] @{
+            FirstLevel1  = @{
+                Child1_1 = 0
+            }
+            FirstLevel2 = @{
+                Child2_1 = 'Child_2_1_Value'
+                Child2_2 = @{
+                     ChildOfChild2_2= @(1,2,3)
+                    }
+                }
+            }
+
+        $ExpectedOutput = '{
+  "FirstLevel1": "System.Collections.Hashtable",
+  "FirstLevel2": "System.Collections.Hashtable"
+}'
+
+        $output = $ComplexObject | ConvertTo-Json -Depth 0
+        $output | Should -Be $ExpectedOutput
+    }
+
     It "The result string is packed in an array symbols when AsArray parameter is used." {
         $output = 1 | ConvertTo-Json -AsArray
         $output | Should -BeLike "``[*1*]"

@@ -2844,7 +2844,7 @@ function New-MSIPatch
         [Parameter(HelpMessage='Path to the patch template WXS.  Usually you do not need to specify this')]
         [ValidateNotNullOrEmpty()]
         [ValidateScript( {Test-Path $_})]
-        [string] $PatchWxsPath = "$RepoRoot\assets\patch-template.wxs",
+        [string] $PatchWxsPath = "$RepoRoot\assets\wix\patch-template.wxs",
 
         [Parameter(HelpMessage='Produce a delta patch instead of a full patch.  Usually not worth it.')]
         [switch] $Delta
@@ -2884,7 +2884,7 @@ function New-MSIPatch
     Copy-Item -Path $BaselineWixPdbPath -Destination $wixBaselineOriginalPdbPath -Force
     Copy-Item -Path $PatchWixPdbPath -Destination $wixPatchOriginalPdbPath -Force
 
-    [xml] $filesAssetXml = Get-Content -Raw -Path "$RepoRoot\assets\files.wxs"
+    [xml] $filesAssetXml = Get-Content -Raw -Path "$RepoRoot\assets\wix\files.wxs"
     [xml] $patchTemplateXml = Get-Content -Raw -Path $PatchWxsPath
 
     # Update the patch version
@@ -2975,12 +2975,12 @@ function New-MSIPackage
         # File describing the MSI Package creation semantics
         [ValidateNotNullOrEmpty()]
         [ValidateScript( {Test-Path $_})]
-        [string] $ProductWxsPath = "$RepoRoot\assets\Product.wxs",
+        [string] $ProductWxsPath = "$RepoRoot\assets\wix\Product.wxs",
 
         # File describing the MSI file components
         [ValidateNotNullOrEmpty()]
         [ValidateScript( {Test-Path $_})]
-        [string] $FilesWxsPath = "$RepoRoot\assets\Files.wxs",
+        [string] $FilesWxsPath = "$RepoRoot\assets\wix\Files.wxs",
 
         # Path to Assets folder containing artifacts such as icons, images
         [ValidateNotNullOrEmpty()]
@@ -3331,7 +3331,7 @@ function Test-FileWxs
         # File describing the MSI file components from the asset folder
         [ValidateNotNullOrEmpty()]
         [ValidateScript( {Test-Path $_})]
-        [string] $FilesWxsPath = "$RepoRoot\assets\Files.wxs",
+        [string] $FilesWxsPath = "$RepoRoot\assets\wix\Files.wxs",
 
         # File describing the MSI file components generated by heat
         [ValidateNotNullOrEmpty()]

@@ -39,11 +39,11 @@ jobs:
 
         Find-Dotnet
 
-        if(-not (Get-PackageSource -Name 'dotnet5' -ErrorAction SilentlyContinue))
+        if(-not (Get-PackageSource -Name 'dotnet' -ErrorAction SilentlyContinue))
         {
-            $nugetFeed = ([xml](Get-Content $(Build.SourcesDirectory)/nuget.config -Raw)).Configuration.packagesources.add | Where-Object { $_.Key -eq 'dotnet5' } | Select-Object -ExpandProperty Value
-            Register-PackageSource -Name 'dotnet5' -Location $nugetFeed -ProviderName NuGet
-            Write-Verbose -Message "Register new package source 'dotnet5'" -verbose
+            $nugetFeed = ([xml](Get-Content $(Build.SourcesDirectory)/nuget.config -Raw)).Configuration.packagesources.add | Where-Object { $_.Key -eq 'dotnet' } | Select-Object -ExpandProperty Value
+            Register-PackageSource -Name 'dotnet' -Location $nugetFeed -ProviderName NuGet
+            Write-Verbose -Message "Register new package source 'dotnet'" -verbose
         }
 
         ## Install latest version from the channel