From 50f62e2036553e76756325f6523b1cd7b5f848b6 Mon Sep 17 00:00:00 2001
From: Robert Holt <roholt@microsoft.com>
Date: Tue, 19 Jan 2021 22:12:16 +0000
Subject: [PATCH 1/3] Add 7.0.4 CHANGELOG

---
 .spelling        | 49 ++++++++++++++++++++++++++++++++++++++++++++++++
 CHANGELOG/7.0.md | 43 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 92 insertions(+)

diff --git a/.spelling b/.spelling
index f9cb61fee14..8ac6070b605 100644
--- a/.spelling
+++ b/.spelling
@@ -1007,8 +1007,53 @@ yml
 youtube
 Youssef1313
 zackjknight
+<<<<<<< HEAD
 ComInterop
 runtime#33060
+=======
+vexx32
+perf
+britishben
+felixfbecker
+vpondala
+dependabot
+jellyfrog
+1redone
+tommymaynard
+vmsilvamolina
+fbehrens
+lockdown
+lukexjeremy
+deserializing
+kiazhi
+v6.1.2
+Menagarishvili
+anmenaga
+fxdependent
+sba923
+replicaJunction
+lupino3
+hvitved
+unvalidated
+Geweldig
+mjanko5
+v7.0.0
+renehernandez
+ece-jacob-scott
+st0le
+MohiTheFish
+CodeFormatter
+StyleCop
+SytzeAndr
+yashrajbharti
+Leonhardt
+tylerleonhardt
+nuget.config
+libmi
+rpms
+authenticode
+env
+>>>>>>> 2f3b740ee (Merged PR 14193: Update CHANGELOG for 7.0.4)
  - CHANGELOG.md
 aavdberg
 asrosent
@@ -1128,6 +1173,7 @@ wpaProfile
  - CHANGELOG/7.1.md
 ThomasNieto
 spongemike2
+<<<<<<< HEAD
 davidseibel
 HumanEquivalentUnit
 hemisphera
@@ -1222,3 +1268,6 @@ RPMs
 NullableAttribute
 PSDesiredStateConfiguration
 about_PSDesiredStateConfiguration
+=======
+
+>>>>>>> 2f3b740ee (Merged PR 14193: Update CHANGELOG for 7.0.4)
diff --git a/CHANGELOG/7.0.md b/CHANGELOG/7.0.md
index e80c0b179fc..6949601fc5d 100644
--- a/CHANGELOG/7.0.md
+++ b/CHANGELOG/7.0.md
@@ -1,5 +1,48 @@
 # 7.0 Changelog
 
+## [7.0.4] - 2021-01-19
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+Bump .NET SDK to version <code>3.1.405</code>
+</summary>
+
+<ul>
+<li>Remove MyGet feeds from test nuget.config (Internal 14147)</li>
+<li>Update WXS file for 7.0.4 (Internal 14122)</li>
+<li>Update .NET dependencies for 7.0.4 (Internal 14104)</li>
+<li>Fix 7.0.4 `Get-Module` test failure (Internal 13946)</li>
+<li>Fix directory creation failure (Internal 13904)</li>
+<li>Disable WMF link invocation test (#13479)</li>
+<li>Use PowerShell Core for build and test of package in CI build (#13223)</li>
+<li>Disable libmi dependent tests for macOS. (#14446)</li>
+<li>Use one feed in each nuget.config in official builds (#14363)</li>
+<li>Fix path signed RPMs are uploaded from in release build (#14424)</li>
+<li>Fix syntax error in Windows packaging script (#14377)</li>
+<li>Make AppLocker Enforce mode take precedence over UMCI Audit mode (#14353)</li>
+<li>Fix issue with unsigned build (#14367)</li>
+<li>Move macOS and NuGet to ESRP signing (#14324)</li>
+<li>Move Windows package signing to use ESRP (#14060)</li>
+<li>Move Linux to ESRP signing (#14210)</li>
+<li>Migrate 3rd party signing to ESRP (#14010)</li>
+<li>Don't do a shallow checkout (#13992)</li>
+<li>Move to ESRP signing for Windows files (#13988)</li>
+<li>Fix breaks in packages daily build due to macOS signing changes (#13421)</li>
+<li>Sign individual files in package (#13392)</li>
+<li>Use Authenticode certificate for MSIX signing (#13330)</li>
+<li>Sign the MSIX files for the store (#12582)</li>
+<li>Use temporary personal path at runspace startup when <code>$env:HOME</code> not defined (#13239)</li>
+<li>Fix MSIX packaging to determine if a preview release by inspecting the semantic version string (#11991)</li>
+<li>Add default help content to the assets folder (#13257)</li>
+</ul>
+
+</details>
+
+[7.0.4]: https://github.com/PowerShell/PowerShell/compare/v7.0.3...v7.0.4
+
 ## [7.0.3] - 2020-07-16
 
 ### Tests

From 89a0ce09ecf3efabf20ae550bf01773b9bfb4316 Mon Sep 17 00:00:00 2001
From: Robert Holt <rjmholt_msft@outlook.com>
Date: Tue, 19 Jan 2021 14:51:21 -0800
Subject: [PATCH 2/3] Update metadata.json LTS tag to 7.0.4

---
 tools/metadata.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/metadata.json b/tools/metadata.json
index e147cbc2a46..9fddef41b11 100644
--- a/tools/metadata.json
+++ b/tools/metadata.json
@@ -1,9 +1,9 @@
 {
   "StableReleaseTag": "v7.1.1",
   "PreviewReleaseTag": "v7.2.0-preview.2",
-  "ServicingReleaseTag": "v7.0.3",
+  "ServicingReleaseTag": "v7.0.4",
   "ReleaseTag": "v7.1.1",
-  "LTSReleaseTag" : ["v7.0.3"],
+  "LTSReleaseTag" : ["v7.0.4"],
   "NextReleaseTag": "v7.2.0-preview.3",
   "LTSRelease": false
 }

From e79cb9d246d84018cddbbf370d6d46f5bc830fca Mon Sep 17 00:00:00 2001
From: Robert Holt <rjmholt_msft@outlook.com>
Date: Tue, 19 Jan 2021 14:55:26 -0800
Subject: [PATCH 3/3] Remove git artefacts

---
 .spelling | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.spelling b/.spelling
index 8ac6070b605..15519dcaaf1 100644
--- a/.spelling
+++ b/.spelling
@@ -1007,10 +1007,8 @@ yml
 youtube
 Youssef1313
 zackjknight
-<<<<<<< HEAD
 ComInterop
 runtime#33060
-=======
 vexx32
 perf
 britishben
@@ -1053,7 +1051,6 @@ libmi
 rpms
 authenticode
 env
->>>>>>> 2f3b740ee (Merged PR 14193: Update CHANGELOG for 7.0.4)
  - CHANGELOG.md
 aavdberg
 asrosent
@@ -1173,7 +1170,6 @@ wpaProfile
  - CHANGELOG/7.1.md
 ThomasNieto
 spongemike2
-<<<<<<< HEAD
 davidseibel
 HumanEquivalentUnit
 hemisphera
@@ -1268,6 +1264,4 @@ RPMs
 NullableAttribute
 PSDesiredStateConfiguration
 about_PSDesiredStateConfiguration
-=======
 
->>>>>>> 2f3b740ee (Merged PR 14193: Update CHANGELOG for 7.0.4)