Merge branch 'master' into feature/clip-to-bounds
This commit is contained in:
Коммит
5cd7d9fedc
|
@ -34,7 +34,7 @@ namespace Microsoft.Toolkit.Uwp.UI
|
|||
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 @@ namespace Microsoft.Toolkit.Uwp.UI
|
|||
/// <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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Загрузка…
Ссылка в новой задаче