Merge 7.1.3 and 7.0.6 Change log to master (#15009)

Co-authored-by: Dongbo Wang <dongbow@microsoft.com>

2 files changed, 93 insertions, 0 deletions

diff --git a/CHANGELOG/7.0.md b/CHANGELOG/7.0.md
index 7f7c96318b..af21d0bd95 100644
--- a/CHANGELOG/7.0.md
+++ b/CHANGELOG/7.0.md
@@ -1,5 +1,55 @@
 # 7.0 Changelog
 
+## [7.0.6] - 2021-03-11
+
+### General Cmdlet Updates and Fixes
+
+- Fix web cmdlets to properly construct URI from body when using `-NoProxy` (#14673)
+- Fix `PromptForCredential()` to add `targetName` as domain (#14504)
+- Clean up the IPC named pipe on PowerShell exit (#12187)
+
+### Tests
+
+- Update markdown test packages with security fixes (#13730, #14145, #14454)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+Bump .NET SDK to version <code>3.1.407</code>
+</summary>
+
+<ul>
+<li>Bump .NET to version 3.1.407 (Internal 14783)</li>
+<li>Fix the miscellaneous analysis CI build (#14971, #14974, #14975)</li>
+<li>Declare which variable group is used for checking the blob in the release build (#14970)</li>
+<li>Use template that disables component governance for CI (#14938)</li>
+<li>Suppress the warning for having multiple nuget feeds (#14893)</li>
+<li>Disable codesign validation where the file type is not supported (#14885)</li>
+<li>Make universal Deb package based on deb package spec (#14681)</li>
+<li>Add manual release automation steps and improve changelog script (#14445)</li>
+<li>Fix a typo in the <code>Get-ChangeLog</code> function (#14129)</li>
+<li>Add validation and dependencies for <code>Ubuntu 20.04</code> distribution to packaging script (#13993)</li>
+<li>Add comment in release-BuildJson.yml for date formatting</li>
+<li>Install wget on centos-7 docker image</li>
+<li>Fix install-dotnet download (#14856)</li>
+<li>Fix release build to upload global tool packages to artifacts (#14620)</li>
+<li>Fixes to release pipeline for GA release (#14034)</li>
+<li>Add checkout step to release build templates (#13840)</li>
+<li>Add flag to make Linux script publish to production repo (#13714)</li>
+<li>Use new release script for Linux packages (#13705)</li>
+<li>Change stage dependency for docker release stage in release pipeline (#13512)</li>
+<li>Create the folder before copying the global tools (#13476)</li>
+<li>A few fixes to the release pipeline (#13473)</li>
+<li>Change the variable group name (Internal 12339)</li>
+<li>Create release pipeline as a yaml pipeline (#13394)</li>
+</ul>
+
+</details>
+
+[7.0.6]: https://github.com/PowerShell/PowerShell/compare/v7.0.5...v7.0.6
+
 ## [7.0.5] - 2021-02-11
 
 ### Build and Packaging Improvements
diff --git a/CHANGELOG/7.1.md b/CHANGELOG/7.1.md
index 3868d52fdd..86b7a478c3 100644
--- a/CHANGELOG/7.1.md
+++ b/CHANGELOG/7.1.md
@@ -1,5 +1,48 @@
 # 7.1 Changelog
 
+## [7.1.3] - 2021-03-11
+
+### Engine Updates and Fixes
+
+- Remove the 32K character limit on the environment block for `Start-Process` (#14111)
+- Fix webcmdlets to properly construct URI from body when using `-NoProxy` (#14673)
+
+### General Cmdlet Updates and Fixes
+
+- Fix `PromptForCredential()` to add `targetName` as domain (#14504)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+Bump .NET SDK to 5.0.4
+
+</summary>
+
+<ul>
+<li>Bump .NET SDK to 5.0.4 (Internal 14775)</li>
+<li>Disable running markdown link verification in release build CI (#14971, #14974, #14975)</li>
+<li>Use template that disables component governance for CI (#14938)</li>
+<li>Declare which variable group is used for checking the blob in the release build (#14970)</li>
+<li>Add suppress for nuget multi-feed warning (#14893)</li>
+<li>Disable code signing validation where the file type is not supported (#14885)</li>
+<li>Install wget on <code>CentOS</code> 7 docker image (#14857)</li>
+<li>Fix install-dotnet download (#14856)</li>
+<li>Make universal Deb package based on deb package spec (#14681)</li>
+<li>Fix release build to upload global tool packages to artifacts (#14620)</li>
+<li>Update <code>ini</code> component version in test <code>package.json</code> (#14454)</li>
+<li>Add manual release automation steps and improve changelog script (#14445)</li>
+<li>Update markdown test packages with security fixes (#14145)</li>
+<li>Fix a typo in the <code>Get-ChangeLog</code> function (#14129)</li>
+<li>Disable global tool copy to unblock release</li>
+</ul>
+
+</details>
+
+[7.1.3]: https://github.com/PowerShell/PowerShell/compare/v7.1.2...v7.1.3
+
 ## [7.1.2] - 2021-02-11
 
 ### Build and Packaging Improvements