Removing "this." instances

shweaver-MSFT · shweaver-MSFT · commit 678748743614 · 2021-08-19T13:17:06.000-07:00
diff --git a/Microsoft.Toolkit.Uwp/Helpers/ObjectStorage/ApplicationDataStorageHelper.CacheFolder.cs b/Microsoft.Toolkit.Uwp/Helpers/ObjectStorage/ApplicationDataStorageHelper.CacheFolder.cs
@@ -29,7 +29,7 @@ public partial class ApplicationDataStorageHelper
         /// <returns>Waiting task until completion with the object in the file.</returns>
         public Task<T> ReadCacheFileAsync<T>(string filePath, T @default = default)
         {
-            return ReadFileAsync<T>(this.CacheFolder, filePath, @default);
+            return ReadFileAsync<T>(CacheFolder, filePath, @default);
         }
 
         /// <summary>
@@ -39,7 +39,7 @@ public Task<T> ReadCacheFileAsync<T>(string filePath, T @default = default)
         /// <returns>A list of file types and names in the target folder.</returns>
         public Task<IEnumerable<(DirectoryItemType ItemType, string Name)>> ReadCacheFolderAsync(string folderPath)
         {
-            return ReadFolderAsync(this.CacheFolder, folderPath);
+            return ReadFolderAsync(CacheFolder, folderPath);
         }
 
         /// <summary>
@@ -51,7 +51,7 @@ public Task<T> ReadCacheFileAsync<T>(string filePath, T @default = default)
         /// <returns>Waiting task until completion.</returns>
         public Task CreateCacheFileAsync<T>(string filePath, T value)
         {
-            return CreateFileAsync<T>(this.CacheFolder, filePath, value);
+            return CreateFileAsync<T>(CacheFolder, filePath, value);
         }
 
         /// <summary>
@@ -61,7 +61,7 @@ public Task CreateCacheFileAsync<T>(string filePath, T value)
         /// <returns>Waiting task until completion.</returns>
         public Task CreateCacheFolderAsync(string folderPath)
         {
-            return CreateFolderAsync(this.CacheFolder, folderPath);
+            return CreateFolderAsync(CacheFolder, folderPath);
         }
 
         /// <summary>
@@ -82,7 +82,7 @@ public Task<bool> TryDeleteCacheItemAsync(string itemPath)
         /// <returns>Waiting task until completion.</returns>
         public Task<bool> TryRenameCacheItemAsync(string itemPath, string newName)
         {
-            return TryRenameItemAsync(this.CacheFolder, itemPath, newName);
+            return TryRenameItemAsync(CacheFolder, itemPath, newName);
         }
     }
 }
diff --git a/Microsoft.Toolkit.Uwp/Helpers/ObjectStorage/ApplicationDataStorageHelper.cs b/Microsoft.Toolkit.Uwp/Helpers/ObjectStorage/ApplicationDataStorageHelper.cs
@@ -27,19 +27,19 @@ public partial class ApplicationDataStorageHelper : IFileStorageHelper, ISetting
         /// <param name="objectSerializer">Serializer for converting stored values. Defaults to <see cref="Toolkit.Helpers.SystemSerializer"/>.</param>
         public ApplicationDataStorageHelper(ApplicationData appData, Toolkit.Helpers.IObjectSerializer? objectSerializer = null)
         {
-            this.AppData = appData ?? throw new ArgumentNullException(nameof(appData));
-            this.Serializer = objectSerializer ?? new Toolkit.Helpers.SystemSerializer();
+            AppData = appData ?? throw new ArgumentNullException(nameof(appData));
+            Serializer = objectSerializer ?? new Toolkit.Helpers.SystemSerializer();
         }
 
         /// <summary>
         /// Gets the settings container.
         /// </summary>
-        public ApplicationDataContainer Settings => this.AppData.LocalSettings;
+        public ApplicationDataContainer Settings => AppData.LocalSettings;
 
         /// <summary>
         ///  Gets the storage folder.
         /// </summary>
-        public StorageFolder Folder => this.AppData.LocalFolder;
+        public StorageFolder Folder => AppData.LocalFolder;
 
         /// <summary>
         /// Gets the storage host.
@@ -81,7 +81,7 @@ public static async Task<ApplicationDataStorageHelper> GetForUserAsync(User user
         /// <returns>True if a value exists.</returns>
         public bool KeyExists(string key)
         {
-            return this.Settings.Values.ContainsKey(key);
+            return Settings.Values.ContainsKey(key);
         }
 
         /// <summary>
@@ -93,9 +93,9 @@ public bool KeyExists(string key)
         /// <returns>The TValue object.</returns>
         public T? Read<T>(string key, T? @default = default)
         {
-            if (this.Settings.Values.TryGetValue(key, out var valueObj) && valueObj is string valueString)
+            if (Settings.Values.TryGetValue(key, out var valueObj) && valueObj is string valueString)
             {
-                return this.Serializer.Deserialize<T>(valueString);
+                return Serializer.Deserialize<T>(valueString);
             }
 
             return @default;
@@ -104,9 +104,9 @@ public bool KeyExists(string key)
         /// <inheritdoc />
         public bool TryRead<T>(string key, out T? value)
         {
-            if (this.Settings.Values.TryGetValue(key, out var valueObj) && valueObj is string valueString)
+            if (Settings.Values.TryGetValue(key, out var valueObj) && valueObj is string valueString)
             {
-                value = this.Serializer.Deserialize<T>(valueString);
+                value = Serializer.Deserialize<T>(valueString);
                 return true;
             }
 
@@ -117,19 +117,19 @@ public bool TryRead<T>(string key, out T? value)
         /// <inheritdoc />
         public void Save<T>(string key, T value)
         {
-            this.Settings.Values[key] = this.Serializer.Serialize(value);
+            Settings.Values[key] = Serializer.Serialize(value);
         }
 
         /// <inheritdoc />
         public bool TryDelete(string key)
         {
-            return this.Settings.Values.Remove(key);
+            return Settings.Values.Remove(key);
         }
 
         /// <inheritdoc />
         public void Clear()
         {
-            this.Settings.Values.Clear();
+            Settings.Values.Clear();
         }
 
         /// <summary>
@@ -140,7 +140,7 @@ public void Clear()
         /// <returns>True if a value exists.</returns>
         public bool KeyExists(string compositeKey, string key)
         {
-            if (this.TryRead(compositeKey, out ApplicationDataCompositeValue? composite) && composite != null)
+            if (TryRead(compositeKey, out ApplicationDataCompositeValue? composite) && composite != null)
             {
                 return composite.ContainsKey(key);
             }
@@ -158,12 +158,12 @@ public bool KeyExists(string compositeKey, string key)
         /// <returns>The T object.</returns>
         public bool TryRead<T>(string compositeKey, string key, out T? value)
         {
-            if (this.TryRead(compositeKey, out ApplicationDataCompositeValue? composite) && composite != null)
+            if (TryRead(compositeKey, out ApplicationDataCompositeValue? composite) && composite != null)
             {
                 string compositeValue = (string)composite[key];
                 if (compositeValue != null)
                 {
-                    value = this.Serializer.Deserialize<T>(compositeValue);
+                    value = Serializer.Deserialize<T>(compositeValue);
                     return true;
                 }
             }
@@ -182,11 +182,11 @@ public bool TryRead<T>(string compositeKey, string key, out T? value)
         /// <returns>The T object.</returns>
         public T? Read<T>(string compositeKey, string key, T? @default = default)
         {
-            if (this.TryRead(compositeKey, out ApplicationDataCompositeValue? composite) && composite != null)
+            if (TryRead(compositeKey, out ApplicationDataCompositeValue? composite) && composite != null)
             {
                 if (composite.TryGetValue(key, out object valueObj) && valueObj is string value)
                 {
-                    return this.Serializer.Deserialize<T>(value);
+                    return Serializer.Deserialize<T>(value);
                 }
             }
 
@@ -203,17 +203,17 @@ public bool TryRead<T>(string compositeKey, string key, out T? value)
         /// <param name="values">Objects to save.</param>
         public void Save<T>(string compositeKey, IDictionary<string, T> values)
         {
-            if (this.TryRead(compositeKey, out ApplicationDataCompositeValue? composite) && composite != null)
+            if (TryRead(compositeKey, out ApplicationDataCompositeValue? composite) && composite != null)
             {
                 foreach (KeyValuePair<string, T> setting in values)
                 {
                     if (composite.ContainsKey(setting.Key))
                     {
-                        composite[setting.Key] = this.Serializer.Serialize(setting.Value);
+                        composite[setting.Key] = Serializer.Serialize(setting.Value);
                     }
                     else
                     {
-                        composite.Add(setting.Key, this.Serializer.Serialize(setting.Value));
+                        composite.Add(setting.Key, Serializer.Serialize(setting.Value));
                     }
                 }
             }
@@ -222,10 +222,10 @@ public void Save<T>(string compositeKey, IDictionary<string, T> values)
                 composite = new ApplicationDataCompositeValue();
                 foreach (KeyValuePair<string, T> setting in values)
                 {
-                    composite.Add(setting.Key, this.Serializer.Serialize(setting.Value));
+                    composite.Add(setting.Key, Serializer.Serialize(setting.Value));
                 }
 
-                this.Settings.Values[compositeKey] = composite;
+                Settings.Values[compositeKey] = composite;
             }
         }
 
@@ -237,7 +237,7 @@ public void Save<T>(string compositeKey, IDictionary<string, T> values)
         /// <returns>A boolean indicator of success.</returns>
         public bool TryDelete(string compositeKey, string key)
         {
-            if (this.TryRead(compositeKey, out ApplicationDataCompositeValue? composite) && composite != null)
+            if (TryRead(compositeKey, out ApplicationDataCompositeValue? composite) && composite != null)
             {
                 return composite.Remove(key);
             }
@@ -248,43 +248,43 @@ public bool TryDelete(string compositeKey, string key)
         /// <inheritdoc />
         public Task<T?> ReadFileAsync<T>(string filePath, T? @default = default)
         {
-            return this.ReadFileAsync<T>(this.Folder, filePath, @default);
+            return ReadFileAsync<T>(Folder, filePath, @default);
         }
 
         /// <inheritdoc />
         public Task<IEnumerable<(DirectoryItemType ItemType, string Name)>> ReadFolderAsync(string folderPath)
         {
-            return this.ReadFolderAsync(this.Folder, folderPath);
+            return ReadFolderAsync(Folder, folderPath);
         }
 
         /// <inheritdoc />
         public Task CreateFileAsync<T>(string filePath, T value)
         {
-            return this.CreateFileAsync<T>(this.Folder, filePath, value);
+            return CreateFileAsync<T>(Folder, filePath, value);
         }
 
         /// <inheritdoc />
         public Task CreateFolderAsync(string folderPath)
         {
-            return this.CreateFolderAsync(this.Folder, folderPath);
+            return CreateFolderAsync(Folder, folderPath);
         }
 
         /// <inheritdoc />
         public Task<bool> TryDeleteItemAsync(string itemPath)
         {
-            return TryDeleteItemAsync(this.Folder, itemPath);
+            return TryDeleteItemAsync(Folder, itemPath);
         }
 
         /// <inheritdoc />
         public Task<bool> TryRenameItemAsync(string itemPath, string newName)
         {
-            return TryRenameItemAsync(this.Folder, itemPath, newName);
+            return TryRenameItemAsync(Folder, itemPath, newName);
         }
 
         private async Task<T?> ReadFileAsync<T>(StorageFolder folder, string filePath, T? @default = default)
         {
             string value = await StorageFileHelper.ReadTextFromFileAsync(folder, NormalizePath(filePath));
-            return (value != null) ? this.Serializer.Deserialize<T>(value) : @default;
+            return (value != null) ? Serializer.Deserialize<T>(value) : @default;
         }
 
         private async Task<IEnumerable<(DirectoryItemType, string)>> ReadFolderAsync(StorageFolder folder, string folderPath)
@@ -304,7 +304,7 @@ public Task<bool> TryRenameItemAsync(string itemPath, string newName)
 
         private async Task<StorageFile> CreateFileAsync<T>(StorageFolder folder, string filePath, T value)
         {
-            return await StorageFileHelper.WriteTextToFileAsync(folder, this.Serializer.Serialize(value)?.ToString(), NormalizePath(filePath), CreationCollisionOption.ReplaceExisting);
+            return await StorageFileHelper.WriteTextToFileAsync(folder, Serializer.Serialize(value)?.ToString(), NormalizePath(filePath), CreationCollisionOption.ReplaceExisting);
         }
 
         private async Task CreateFolderAsync(StorageFolder folder, string folderPath)

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public partial class ApplicationDataStorageHelper`
`29`	`29`	`/// <returns>Waiting task until completion with the object in the file.</returns>`
`30`	`30`	`public Task<T> ReadCacheFileAsync<T>(string filePath, T @default = default)`
`31`	`31`	`{`
`32`		`- return ReadFileAsync<T>(this.CacheFolder, filePath, @default);`
	`32`	`+ return ReadFileAsync<T>(CacheFolder, filePath, @default);`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`/// <summary>`
`@@ -39,7 +39,7 @@ public Task<T> ReadCacheFileAsync<T>(string filePath, T @default = default)`
`39`	`39`	`/// <returns>A list of file types and names in the target folder.</returns>`
`40`	`40`	`public Task<IEnumerable<(DirectoryItemType ItemType, string Name)>> ReadCacheFolderAsync(string folderPath)`
`41`	`41`	`{`
`42`		`- return ReadFolderAsync(this.CacheFolder, folderPath);`
	`42`	`+ return ReadFolderAsync(CacheFolder, folderPath);`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`/// <summary>`
`@@ -51,7 +51,7 @@ public Task<T> ReadCacheFileAsync<T>(string filePath, T @default = default)`
`51`	`51`	`/// <returns>Waiting task until completion.</returns>`
`52`	`52`	`public Task CreateCacheFileAsync<T>(string filePath, T value)`
`53`	`53`	`{`
`54`		`- return CreateFileAsync<T>(this.CacheFolder, filePath, value);`
	`54`	`+ return CreateFileAsync<T>(CacheFolder, filePath, value);`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`/// <summary>`
`@@ -61,7 +61,7 @@ public Task CreateCacheFileAsync<T>(string filePath, T value)`
`61`	`61`	`/// <returns>Waiting task until completion.</returns>`
`62`	`62`	`public Task CreateCacheFolderAsync(string folderPath)`
`63`	`63`	`{`
`64`		`- return CreateFolderAsync(this.CacheFolder, folderPath);`
	`64`	`+ return CreateFolderAsync(CacheFolder, folderPath);`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`/// <summary>`
`@@ -82,7 +82,7 @@ public Task<bool> TryDeleteCacheItemAsync(string itemPath)`
`82`	`82`	`/// <returns>Waiting task until completion.</returns>`
`83`	`83`	`public Task<bool> TryRenameCacheItemAsync(string itemPath, string newName)`
`84`	`84`	`{`
`85`		`- return TryRenameItemAsync(this.CacheFolder, itemPath, newName);`
	`85`	`+ return TryRenameItemAsync(CacheFolder, itemPath, newName);`
`86`	`86`	`}`
`87`	`87`	`}`
`88`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,19 +27,19 @@ public partial class ApplicationDataStorageHelper : IFileStorageHelper, ISetting`
`27`	`27`	`/// <param name="objectSerializer">Serializer for converting stored values. Defaults to <see cref="Toolkit.Helpers.SystemSerializer"/>.</param>`
`28`	`28`	`public ApplicationDataStorageHelper(ApplicationData appData, Toolkit.Helpers.IObjectSerializer? objectSerializer = null)`
`29`	`29`	`{`
`30`		`- this.AppData = appData ?? throw new ArgumentNullException(nameof(appData));`
`31`		`- this.Serializer = objectSerializer ?? new Toolkit.Helpers.SystemSerializer();`
	`30`	`+ AppData = appData ?? throw new ArgumentNullException(nameof(appData));`
	`31`	`+ Serializer = objectSerializer ?? new Toolkit.Helpers.SystemSerializer();`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`/// <summary>`
`35`	`35`	`/// Gets the settings container.`
`36`	`36`	`/// </summary>`
`37`		`- public ApplicationDataContainer Settings => this.AppData.LocalSettings;`
	`37`	`+ public ApplicationDataContainer Settings => AppData.LocalSettings;`
`38`	`38`
`39`	`39`	`/// <summary>`
`40`	`40`	`/// Gets the storage folder.`
`41`	`41`	`/// </summary>`
`42`		`- public StorageFolder Folder => this.AppData.LocalFolder;`
	`42`	`+ public StorageFolder Folder => AppData.LocalFolder;`
`43`	`43`
`44`	`44`	`/// <summary>`
`45`	`45`	`/// Gets the storage host.`
`@@ -81,7 +81,7 @@ public static async Task<ApplicationDataStorageHelper> GetForUserAsync(User user`
`81`	`81`	`/// <returns>True if a value exists.</returns>`
`82`	`82`	`public bool KeyExists(string key)`
`83`	`83`	`{`
`84`		`- return this.Settings.Values.ContainsKey(key);`
	`84`	`+ return Settings.Values.ContainsKey(key);`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`/// <summary>`
`@@ -93,9 +93,9 @@ public bool KeyExists(string key)`
`93`	`93`	`/// <returns>The TValue object.</returns>`
`94`	`94`	`public T? Read<T>(string key, T? @default = default)`
`95`	`95`	`{`
`96`		`- if (this.Settings.Values.TryGetValue(key, out var valueObj) && valueObj is string valueString)`
	`96`	`+ if (Settings.Values.TryGetValue(key, out var valueObj) && valueObj is string valueString)`
`97`	`97`	`{`
`98`		`- return this.Serializer.Deserialize<T>(valueString);`
	`98`	`+ return Serializer.Deserialize<T>(valueString);`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`return @default;`
`@@ -104,9 +104,9 @@ public bool KeyExists(string key)`
`104`	`104`	`/// <inheritdoc />`
`105`	`105`	`public bool TryRead<T>(string key, out T? value)`
`106`	`106`	`{`
`107`		`- if (this.Settings.Values.TryGetValue(key, out var valueObj) && valueObj is string valueString)`
	`107`	`+ if (Settings.Values.TryGetValue(key, out var valueObj) && valueObj is string valueString)`
`108`	`108`	`{`
`109`		`- value = this.Serializer.Deserialize<T>(valueString);`
	`109`	`+ value = Serializer.Deserialize<T>(valueString);`
`110`	`110`	`return true;`
`111`	`111`	`}`
`112`	`112`
`@@ -117,19 +117,19 @@ public bool TryRead<T>(string key, out T? value)`
`117`	`117`	`/// <inheritdoc />`
`118`	`118`	`public void Save<T>(string key, T value)`
`119`	`119`	`{`
`120`		`- this.Settings.Values[key] = this.Serializer.Serialize(value);`
	`120`	`+ Settings.Values[key] = Serializer.Serialize(value);`
`121`	`121`	`}`
`122`	`122`
`123`	`123`	`/// <inheritdoc />`
`124`	`124`	`public bool TryDelete(string key)`
`125`	`125`	`{`
`126`		`- return this.Settings.Values.Remove(key);`
	`126`	`+ return Settings.Values.Remove(key);`
`127`	`127`	`}`
`128`	`128`
`129`	`129`	`/// <inheritdoc />`
`130`	`130`	`public void Clear()`
`131`	`131`	`{`
`132`		`- this.Settings.Values.Clear();`
	`132`	`+ Settings.Values.Clear();`
`133`	`133`	`}`
`134`	`134`
`135`	`135`	`/// <summary>`
`@@ -140,7 +140,7 @@ public void Clear()`
`140`	`140`	`/// <returns>True if a value exists.</returns>`
`141`	`141`	`public bool KeyExists(string compositeKey, string key)`
`142`	`142`	`{`
`143`		`- if (this.TryRead(compositeKey, out ApplicationDataCompositeValue? composite) && composite != null)`
	`143`	`+ if (TryRead(compositeKey, out ApplicationDataCompositeValue? composite) && composite != null)`
`144`	`144`	`{`
`145`	`145`	`return composite.ContainsKey(key);`
`146`	`146`	`}`
`@@ -158,12 +158,12 @@ public bool KeyExists(string compositeKey, string key)`
`158`	`158`	`/// <returns>The T object.</returns>`
`159`	`159`	`public bool TryRead<T>(string compositeKey, string key, out T? value)`
`160`	`160`	`{`
`161`		`- if (this.TryRead(compositeKey, out ApplicationDataCompositeValue? composite) && composite != null)`
	`161`	`+ if (TryRead(compositeKey, out ApplicationDataCompositeValue? composite) && composite != null)`
`162`	`162`	`{`
`163`	`163`	`string compositeValue = (string)composite[key];`
`164`	`164`	`if (compositeValue != null)`
`165`	`165`	`{`
`166`		`- value = this.Serializer.Deserialize<T>(compositeValue);`
	`166`	`+ value = Serializer.Deserialize<T>(compositeValue);`
`167`	`167`	`return true;`
`168`	`168`	`}`
`169`	`169`	`}`
`@@ -182,11 +182,11 @@ public bool TryRead<T>(string compositeKey, string key, out T? value)`
`182`	`182`	`/// <returns>The T object.</returns>`
`183`	`183`	`public T? Read<T>(string compositeKey, string key, T? @default = default)`
`184`	`184`	`{`
`185`		`- if (this.TryRead(compositeKey, out ApplicationDataCompositeValue? composite) && composite != null)`
	`185`	`+ if (TryRead(compositeKey, out ApplicationDataCompositeValue? composite) && composite != null)`
`186`	`186`	`{`
`187`	`187`	`if (composite.TryGetValue(key, out object valueObj) && valueObj is string value)`
`188`	`188`	`{`
`189`		`- return this.Serializer.Deserialize<T>(value);`
	`189`	`+ return Serializer.Deserialize<T>(value);`
`190`	`190`	`}`
`191`	`191`	`}`
`192`	`192`
`@@ -203,17 +203,17 @@ public bool TryRead<T>(string compositeKey, string key, out T? value)`
`203`	`203`	`/// <param name="values">Objects to save.</param>`
`204`	`204`	`public void Save<T>(string compositeKey, IDictionary<string, T> values)`
`205`	`205`	`{`
`206`		`- if (this.TryRead(compositeKey, out ApplicationDataCompositeValue? composite) && composite != null)`
	`206`	`+ if (TryRead(compositeKey, out ApplicationDataCompositeValue? composite) && composite != null)`
`207`	`207`	`{`
`208`	`208`	`foreach (KeyValuePair<string, T> setting in values)`
`209`	`209`	`{`
`210`	`210`	`if (composite.ContainsKey(setting.Key))`
`211`	`211`	`{`
`212`		`- composite[setting.Key] = this.Serializer.Serialize(setting.Value);`
	`212`	`+ composite[setting.Key] = Serializer.Serialize(setting.Value);`
`213`	`213`	`}`
`214`	`214`	`else`
`215`	`215`	`{`
`216`		`- composite.Add(setting.Key, this.Serializer.Serialize(setting.Value));`
	`216`	`+ composite.Add(setting.Key, Serializer.Serialize(setting.Value));`
`217`	`217`	`}`
`218`	`218`	`}`
`219`	`219`	`}`
`@@ -222,10 +222,10 @@ public void Save<T>(string compositeKey, IDictionary<string, T> values)`
`222`	`222`	`composite = new ApplicationDataCompositeValue();`
`223`	`223`	`foreach (KeyValuePair<string, T> setting in values)`
`224`	`224`	`{`
`225`		`- composite.Add(setting.Key, this.Serializer.Serialize(setting.Value));`
	`225`	`+ composite.Add(setting.Key, Serializer.Serialize(setting.Value));`
`226`	`226`	`}`
`227`	`227`
`228`		`- this.Settings.Values[compositeKey] = composite;`
	`228`	`+ Settings.Values[compositeKey] = composite;`
`229`	`229`	`}`
`230`	`230`	`}`
`231`	`231`
`@@ -237,7 +237,7 @@ public void Save<T>(string compositeKey, IDictionary<string, T> values)`
`237`	`237`	`/// <returns>A boolean indicator of success.</returns>`
`238`	`238`	`public bool TryDelete(string compositeKey, string key)`
`239`	`239`	`{`
`240`		`- if (this.TryRead(compositeKey, out ApplicationDataCompositeValue? composite) && composite != null)`
	`240`	`+ if (TryRead(compositeKey, out ApplicationDataCompositeValue? composite) && composite != null)`
`241`	`241`	`{`
`242`	`242`	`return composite.Remove(key);`
`243`	`243`	`}`
`@@ -248,43 +248,43 @@ public bool TryDelete(string compositeKey, string key)`
`248`	`248`	`/// <inheritdoc />`
`249`	`249`	`public Task<T?> ReadFileAsync<T>(string filePath, T? @default = default)`
`250`	`250`	`{`
`251`		`- return this.ReadFileAsync<T>(this.Folder, filePath, @default);`
	`251`	`+ return ReadFileAsync<T>(Folder, filePath, @default);`
`252`	`252`	`}`
`253`	`253`
`254`	`254`	`/// <inheritdoc />`
`255`	`255`	`public Task<IEnumerable<(DirectoryItemType ItemType, string Name)>> ReadFolderAsync(string folderPath)`
`256`	`256`	`{`
`257`		`- return this.ReadFolderAsync(this.Folder, folderPath);`
	`257`	`+ return ReadFolderAsync(Folder, folderPath);`
`258`	`258`	`}`
`259`	`259`
`260`	`260`	`/// <inheritdoc />`
`261`	`261`	`public Task CreateFileAsync<T>(string filePath, T value)`
`262`	`262`	`{`
`263`		`- return this.CreateFileAsync<T>(this.Folder, filePath, value);`
	`263`	`+ return CreateFileAsync<T>(Folder, filePath, value);`
`264`	`264`	`}`
`265`	`265`
`266`	`266`	`/// <inheritdoc />`
`267`	`267`	`public Task CreateFolderAsync(string folderPath)`
`268`	`268`	`{`
`269`		`- return this.CreateFolderAsync(this.Folder, folderPath);`
	`269`	`+ return CreateFolderAsync(Folder, folderPath);`
`270`	`270`	`}`
`271`	`271`
`272`	`272`	`/// <inheritdoc />`
`273`	`273`	`public Task<bool> TryDeleteItemAsync(string itemPath)`
`274`	`274`	`{`
`275`		`- return TryDeleteItemAsync(this.Folder, itemPath);`
	`275`	`+ return TryDeleteItemAsync(Folder, itemPath);`
`276`	`276`	`}`
`277`	`277`
`278`	`278`	`/// <inheritdoc />`
`279`	`279`	`public Task<bool> TryRenameItemAsync(string itemPath, string newName)`
`280`	`280`	`{`
`281`		`- return TryRenameItemAsync(this.Folder, itemPath, newName);`
	`281`	`+ return TryRenameItemAsync(Folder, itemPath, newName);`
`282`	`282`	`}`
`283`	`283`
`284`	`284`	`private async Task<T?> ReadFileAsync<T>(StorageFolder folder, string filePath, T? @default = default)`
`285`	`285`	`{`
`286`	`286`	`string value = await StorageFileHelper.ReadTextFromFileAsync(folder, NormalizePath(filePath));`
`287`		`- return (value != null) ? this.Serializer.Deserialize<T>(value) : @default;`
	`287`	`+ return (value != null) ? Serializer.Deserialize<T>(value) : @default;`
`288`	`288`	`}`
`289`	`289`
`290`	`290`	`private async Task<IEnumerable<(DirectoryItemType, string)>> ReadFolderAsync(StorageFolder folder, string folderPath)`
`@@ -304,7 +304,7 @@ public Task<bool> TryRenameItemAsync(string itemPath, string newName)`
`304`	`304`
`305`	`305`	`private async Task<StorageFile> CreateFileAsync<T>(StorageFolder folder, string filePath, T value)`
`306`	`306`	`{`
`307`		`- return await StorageFileHelper.WriteTextToFileAsync(folder, this.Serializer.Serialize(value)?.ToString(), NormalizePath(filePath), CreationCollisionOption.ReplaceExisting);`
	`307`	`+ return await StorageFileHelper.WriteTextToFileAsync(folder, Serializer.Serialize(value)?.ToString(), NormalizePath(filePath), CreationCollisionOption.ReplaceExisting);`
`308`	`308`	`}`
`309`	`309`
`310`	`310`	`private async Task CreateFolderAsync(StorageFolder folder, string folderPath)`