From 8e928898648d0842cf7d368a458e85d747201da5 Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Thu, 14 May 2020 16:06:03 -0700
Subject: [PATCH] Merge 7.0.1 change log (#12669)

---
 CHANGELOG/7.0.md | 43 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/CHANGELOG/7.0.md b/CHANGELOG/7.0.md
index 2712bcfd4..380a258be 100644
--- a/CHANGELOG/7.0.md
+++ b/CHANGELOG/7.0.md
@@ -1,5 +1,47 @@
 # 7.0 Changelog
 
+## [7.0.1] - 2020-05-14
+
+### Engine Updates and Fixes
+
+- Discover assemblies loaded by `Assembly.Load(byte[])` and `Assembly.LoadFile` (#12203)
+- Allow case insensitive paths for determining `PSModulePath` (#12192)
+
+### General Cmdlet Updates and Fixes
+
+- Add `null` check for Windows PowerShell install path (#12296)
+- Fix Null Reference error in CSV commands (#12281) (Thanks @iSazonov!)
+- Fix `WinCompat` module loading to treat Core edition modules higher priority (#12269)
+- Fix `<img />` detection regex in web cmdlets (#12099) (Thanks @vexx32!)
+- Miscellaneous minor updates to `WinCompat` (#11980)
+- Fix `ConciseView` where error message is wider than window width and doesn't have whitespace (#11880, #11746)
+- Make `Test-Connection` always use the default synchronization context for sending ping requests (#11517)
+
+### Tests
+
+- Fix CIM tab complete test failure (#12636)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+Move to .NET Core 3.1.202 SDK and update packages.
+</summary>
+
+<ul>
+<li>Use dotnet core 3.1.202 (Internal 11551)</li>
+<li>Bump PowerShellGet from 2.2.3 to 2.2.4 (#12342)</li>
+<li>Move to standard internal pool for building (#12119)</li>
+<li>Bump <code>NJsonSchema</code> from <code>10.1.5</code> to <code>10.1.7</code> (#12050)</li>
+</ul>
+
+</details>
+
+### Documentation and Help Content
+
+- Remove the version number of PowerShell from `LICENSE` (#12019)
+
 ## [7.0.0] - 2020-03-04
 
 ### General Cmdlet Updates and Fixes
@@ -957,6 +999,7 @@
 - Update docs for `6.2.0-rc.1` release (#9022)
 - Update release template (#8996)
 
+[7.0.1]: https://github.com/PowerShell/PowerShell/compare/v7.0.0...v7.0.1
 [7.0.0]: https://github.com/PowerShell/PowerShell/compare/v7.0.0-rc.3...v7.0.0
 [7.0.0-rc.3]: https://github.com/PowerShell/PowerShell/compare/v7.0.0-rc.2...v7.0.0-rc.3
 [7.0.0-rc.2]: https://github.com/PowerShell/PowerShell/compare/v7.0.0-rc.1...v7.0.0-rc.2