From bc747ed454841676e5efe6f38036dd90c7d0eab4 Mon Sep 17 00:00:00 2001
From: Andrew Nielsen <anielsen@microsoft.com>
Date: Wed, 22 Jan 2020 12:12:49 -0800
Subject: [PATCH 1/3] FileCache.InitializeTypeAsync(Stream...) should not
 return null. It should return `Task.FromResult<StorageFile>(null)`.
 Otherwise, CacheBase attempts to dereference the Task to call
 ConfigureAwait(false) which results in a NullReferenceException.

---
 Microsoft.Toolkit.Uwp.UI/Cache/FileCache.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Microsoft.Toolkit.Uwp.UI/Cache/FileCache.cs b/Microsoft.Toolkit.Uwp.UI/Cache/FileCache.cs
index c87ac8d315e..ca6364e6a96 100644
--- a/Microsoft.Toolkit.Uwp.UI/Cache/FileCache.cs
+++ b/Microsoft.Toolkit.Uwp.UI/Cache/FileCache.cs
@@ -34,7 +34,7 @@ public class FileCache : CacheBase<StorageFile>
         protected override Task<StorageFile> InitializeTypeAsync(Stream stream, List<KeyValuePair<string, object>> initializerKeyValues = null)
         {
             // nothing to do in this instance;
-            return null;
+            return Task.FromResult<StorageFile>(null);
         }
 
         /// <summary>
@@ -45,7 +45,7 @@ protected override Task<StorageFile> InitializeTypeAsync(Stream stream, List<Key
         /// <returns>awaitable task</returns>
         protected override Task<StorageFile> InitializeTypeAsync(StorageFile baseFile, List<KeyValuePair<string, object>> initializerKeyValues = null)
         {
-            return Task.Run(() => baseFile);
+            return Task.FromResult(baseFile);
         }
     }
 }

From c904958071a7689f9b2a21de672da1d205c73cdb Mon Sep 17 00:00:00 2001
From: Kevin Gallahan <kmgallahan@gmail.com>
Date: Fri, 24 Jan 2020 23:27:35 -0500
Subject: [PATCH 2/3] UserVoice is no longer being used.

---
 readme.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/readme.md b/readme.md
index 1090b1ae2a4..7b1c2226d6b 100644
--- a/readme.md
+++ b/readme.md
@@ -171,7 +171,6 @@ Once you do a search, you should see a list similar to the one below (versions m
 
 ## Feedback and Requests
 Please use [GitHub Issues](https://github.com/windows-toolkit/WindowsCommunityToolkit/issues) for bug reports and feature requests.
-For feature requests, please also create an entry in our [UserVoice](https://wpdev.uservoice.com/forums/110705-universal-windows-platform/category/193402-uwp-community-toolkit).
 For general questions and support, please use [Stack Overflow](https://stackoverflow.com/questions/tagged/windows-community-toolkit) where questions should be tagged with the tag `windows-community-toolkit`.
 
 ## Contributing

From ef6527227539362125a0617d9b9821b2c009e11e Mon Sep 17 00:00:00 2001
From: "Michael Hawker MSFT (XAML Llama)" <michael.hawker@outlook.com>
Date: Fri, 31 Jan 2020 14:15:53 -0800
Subject: [PATCH 3/3] Update master to 6.1 version numbers for any preview
 updates

---
 version.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/version.json b/version.json
index ee65fed240d..585f60b778c 100644
--- a/version.json
+++ b/version.json
@@ -1,5 +1,5 @@
 {
-  "version": "6.0.0-build.{height}",
+  "version": "6.1.0-build.{height}",
   "publicReleaseRefSpec": [
     "^refs/heads/master$", // we release out of master
     "^refs/heads/dev$", // we release out of dev