From 90e0f214d25d8864cfb9ef03d6f84d711ed3fdd7 Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Fri, 15 Jan 2021 15:31:04 -0800
Subject: [PATCH 1/2] Backport changes from the PowerShell v7.1.1 release

---
 CHANGELOG/7.1.md                              | 32 +++++++++++++++++++
 test/hosting/NuGet.Config                     |  2 --
 .../templates/release-SDKTests.yml            |  8 ++++-
 3 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG/7.1.md b/CHANGELOG/7.1.md
index a51cfcb7a41..6f92dd03b54 100644
--- a/CHANGELOG/7.1.md
+++ b/CHANGELOG/7.1.md
@@ -1,5 +1,37 @@
 # 7.1 Changelog
 
+## [7.1.1] - 2021-01-14
+
+### General Cmdlet Updates and Fixes
+
+- Avoid an exception if file system does not support reparse points (#13634) (Thanks @iSazonov!)
+- Make AppLocker Enforce mode take precedence over UMCI Audit mode (#14353)
+
+### Code Cleanup
+
+- Fix syntax error in Windows packaging script (#14377)
+
+### Build and Packaging Improvements
+
+<details>
+
+<ul>
+<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 issue with unsigned build (#14367)</li>
+<li>Move macOS and NuGet packages to ESRP signing (#14324)</li>
+<li>Move Windows packages signing to use ESRP (#14060)</li>
+<li>Move Linux packages 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>Add checkout step to release build templates (#13840)</li>
+</ul>
+
+</details>
+
+[7.1.1]: https://github.com/PowerShell/PowerShell/compare/v7.1.0...v7.1.1
+
 ## [7.1.0] - 2020-11-11
 
 ### Engine Updates and Fixes
diff --git a/test/hosting/NuGet.Config b/test/hosting/NuGet.Config
index c2c6e1b7c2d..765346e5343 100644
--- a/test/hosting/NuGet.Config
+++ b/test/hosting/NuGet.Config
@@ -2,8 +2,6 @@
 <configuration>
   <packageSources>
     <clear />
-    <add key="powershell-core" value="https://powershell.myget.org/F/powershell-core/api/v3/index.json" />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
-    <add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
   </packageSources>
 </configuration>
diff --git a/tools/releaseBuild/azureDevOps/templates/release-SDKTests.yml b/tools/releaseBuild/azureDevOps/templates/release-SDKTests.yml
index dd7c9618c9e..acb82fbb748 100644
--- a/tools/releaseBuild/azureDevOps/templates/release-SDKTests.yml
+++ b/tools/releaseBuild/azureDevOps/templates/release-SDKTests.yml
@@ -54,9 +54,15 @@ jobs:
             Write-Verbose -Message "Register new package source 'dotnet5'" -verbose
         }
 
-        ## Install latest version from the channel
+        ## Remove old .NET SDKs if any exists
+        if (Test-Path -Type Container $Home/.dotnet)
+        {
+            Remove-Item $Home/.dotnet -Recurse -Force
+        }
 
+        ## Install latest version from the channel
         #Install-Dotnet -Channel "$Channel" -Version $sdkVersion
+
         Start-PSBootstrap
 
         Write-Verbose -Message "Installing .NET SDK completed." -Verbose

From 5f2c6bab19617745a6818804841c0ddd6dd3cb5c Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Fri, 15 Jan 2021 15:32:40 -0800
Subject: [PATCH 2/2] Update the .spelling file

---
 .spelling | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.spelling b/.spelling
index d62964dd286..f9cb61fee14 100644
--- a/.spelling
+++ b/.spelling
@@ -1148,6 +1148,7 @@ PkgES
 Microsoft.PowerShell.Native
 rtm.20526.5
 jcotton42
+RPMs
  - CHANGELOG/preview.md
 Gimly
 jborean93