From 880fd215046e29315da01bb7f6b55d133059c03b Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Tue, 30 Jun 2020 17:40:51 +0000
Subject: [PATCH 1/2] Merged PR 11880: Change log for v7.1.0-preview.5

Change log for v7.1.0-preview.5
---
 .spelling            |  1 +
 CHANGELOG/preview.md | 46 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+)

diff --git a/.spelling b/.spelling
index a9f5fb3fda..51b4d8435f 100644
--- a/.spelling
+++ b/.spelling
@@ -970,6 +970,7 @@ x86
 xpath
 xtqqczze
 xunit
+xunit.runner.visualstudio
 Xunit.SkippableFact
 yaml
 yashrajbharti
diff --git a/CHANGELOG/preview.md b/CHANGELOG/preview.md
index ef6fab79cb..aaf3610ebf 100644
--- a/CHANGELOG/preview.md
+++ b/CHANGELOG/preview.md
@@ -1,5 +1,50 @@
 # Current preview release
 
+## [7.1.0-preview.5] - 2020-06-30
+
+### Code Cleanup
+
+<details>
+
+<summary>
+
+<p>We thank the following contributors!</p>
+<p>@xtqqczze</p>
+
+</summary>
+
+<ul>
+<li>Code performance fixes (#12956) (Thanks @xtqqczze!)</li>
+</ul>
+
+</details>
+
+### Build and Packaging Improvements
+
+<details>
+<summary>
+
+<p>Fixed upgrade code in MSI package.</p>
+
+</summary>
+<ul>
+<li>Correct stable and preview upgrade codes for <code>MSI</code> (#13036)</li>
+<li>Changelog for `v7.1.0-preview.4` (Internal 11841)</li>
+<li>Fix NuGet package compliance issues (#13045)</li>
+<li>Bump <code>xunit.runner.visualstudio</code> from <code>2.4.1</code> to<code> 2.4.2</code> (#12874)</li>
+<li>Bump NJsonSchema from `10.1.21` to `10.1.23` (#13032) (#13022)</li>
+</ul>
+
+</details>
+
+### Documentation and Help Content
+
+- Fix links for MSI packages to point to `7.1.0-preview.3` (#13056)
+- Add update `packages.microsoft.com` step to distribution request template. (#13008)
+- Update `windows-core.md` (#13053) (Thanks @xtqqczze!)
+- Add `@rjmholt` to maintainers list (#13033)
+- Update docs for `v7.1.0-preview.4` release (#13028)
+
 ## [7.1.0-preview.4] - 2020-06-25
 
 ### Breaking Changes
@@ -515,6 +560,7 @@
 - Update `SUPPORT.md` (#11101) (Thanks @mklement0!)
 - Update `README.md` (#11100) (Thanks @mklement0!)
 
+[7.1.0-preview.5]: https://github.com/PowerShell/PowerShell/compare/v7.1.0-preview.4...v7.1.0-preview.5
 [7.1.0-preview.4]: https://github.com/PowerShell/PowerShell/compare/v7.1.0-preview.3...v7.1.0-preview.4
 [7.1.0-preview.3]: https://github.com/PowerShell/PowerShell/compare/v7.1.0-preview.2...v7.1.0-preview.3
 [7.1.0-preview.2]: https://github.com/PowerShell/PowerShell/compare/v7.1.0-preview.1...v7.1.0-preview.2

From dd73c303a86ee04afca54a2be949c18299f2d8ed Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Thu, 2 Jul 2020 21:53:02 +0000
Subject: [PATCH 2/2] Merged PR 11909: Update Changelog for 7.1.0-preview.5

Update Changelog for 7.1.0-preview.5
---
 CHANGELOG/preview.md | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG/preview.md b/CHANGELOG/preview.md
index aaf3610ebf..7d94052494 100644
--- a/CHANGELOG/preview.md
+++ b/CHANGELOG/preview.md
@@ -1,6 +1,10 @@
 # Current preview release
 
-## [7.1.0-preview.5] - 2020-06-30
+## [7.1.0-preview.5] - 2020-07-06
+
+### Engine Updates and Fixes
+
+- Ensure assemblies listed in the module manifest `FileList` field are not loaded (#12968)
 
 ### Code Cleanup
 
@@ -19,6 +23,14 @@
 
 </details>
 
+### Tools
+
+- Add missing `.editorconfig` settings present in `dotnet/runtime` (#12871) (Thanks @xtqqczze!)
+
+### Tests
+
+- Add new test for `Format-Custom` to avoid data loss (#11393) (Thanks @iSazonov!)
+
 ### Build and Packaging Improvements
 
 <details>
@@ -28,6 +40,8 @@
 
 </summary>
 <ul>
+<li>Change log for v7.1.0-preview.5 (Internal 11880)</li>
+<li>Fix Path for the Preview MSI (#13070)</li>
 <li>Correct stable and preview upgrade codes for <code>MSI</code> (#13036)</li>
 <li>Changelog for `v7.1.0-preview.4` (Internal 11841)</li>
 <li>Fix NuGet package compliance issues (#13045)</li>