From 3f1658f5df7aefcc9ac8c0fa9b0cabc5b015919b Mon Sep 17 00:00:00 2001 From: Chebotov Nikolay Date: Mon, 7 Feb 2022 00:31:52 +0300 Subject: [PATCH] fix: Fix #73 --- CHANGELOG.md | 6 +++++- .../Common/UserSettingsPersistenceHelper.cs | 5 ++++- src/Unchase.OData.ConnectedService.VS22/source.extension.cs | 2 +- .../source.extension.vsixmanifest | 2 +- .../Properties/AssemblyInfo.cs | 4 ++-- .../source.extension.vsixmanifest | 2 +- 6 files changed, 14 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7e11b1b..e15c1fc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,11 @@ These are the changes to each version that has been released on the official [Visual Studio extension gallery](https://marketplace.visualstudio.com/items?itemName=unchase.UnchaseODataConnectedService). -## v1.5.0 `(2021-01-23)` +## v1.5.1 `(2022-02-07)` + +- Fix [issue #73](https://github.com/unchase/Unchase.Odata.Connectedservice/issues/73) + +## v1.5.0 `(2022-01-23)` - [x] Update dependencies: add support for NSwag.Commands v13.14.8 - [x] Fix [issue #63](https://github.com/unchase/Unchase.Odata.Connectedservice/issues/63) - Visual Studio 2022 Support diff --git a/src/Unchase.OData.ConnectedService.Shared/Common/UserSettingsPersistenceHelper.cs b/src/Unchase.OData.ConnectedService.Shared/Common/UserSettingsPersistenceHelper.cs index 963f873..87c21b0 100644 --- a/src/Unchase.OData.ConnectedService.Shared/Common/UserSettingsPersistenceHelper.cs +++ b/src/Unchase.OData.ConnectedService.Shared/Common/UserSettingsPersistenceHelper.cs @@ -135,7 +135,10 @@ private static void ExecuteNoncriticalOperation( catch (Exception ex) { var loggerTask = logger.WriteMessageAsync(LoggerMessageCategory.Warning, failureMessage, failureMessageArg, ex); - loggerTask.RunSynchronously(); + if (!loggerTask.IsCompleted) + { + loggerTask.RunSynchronously(); + } } } #endregion diff --git a/src/Unchase.OData.ConnectedService.VS22/source.extension.cs b/src/Unchase.OData.ConnectedService.VS22/source.extension.cs index 57c0d9b..edd8918 100644 --- a/src/Unchase.OData.ConnectedService.VS22/source.extension.cs +++ b/src/Unchase.OData.ConnectedService.VS22/source.extension.cs @@ -11,7 +11,7 @@ internal sealed partial class Vsix public const string Name = "Unchase OData Connected Service VS2022"; public const string Description = @"OData V1-V4 connected service with extension methods for client-side proxy class."; public const string Language = "en-US"; - public const string Version = "1.5.0"; + public const string Version = "1.5.1"; public const string Author = "Unchase"; public const string Tags = "OData, REST API, Code Generation, Scaffolding, Connected Service"; } diff --git a/src/Unchase.OData.ConnectedService.VS22/source.extension.vsixmanifest b/src/Unchase.OData.ConnectedService.VS22/source.extension.vsixmanifest index 85b112d..41a5dae 100644 --- a/src/Unchase.OData.ConnectedService.VS22/source.extension.vsixmanifest +++ b/src/Unchase.OData.ConnectedService.VS22/source.extension.vsixmanifest @@ -1,7 +1,7 @@  - + Unchase OData Connected Service VS2022 OData V1-V4 connected service with extension methods for client-side proxy class. https://github.com/unchase/Unchase.Odata.Connectedservice diff --git a/src/Unchase.OData.ConnectedService/Properties/AssemblyInfo.cs b/src/Unchase.OData.ConnectedService/Properties/AssemblyInfo.cs index 0659881..1188f4b 100644 --- a/src/Unchase.OData.ConnectedService/Properties/AssemblyInfo.cs +++ b/src/Unchase.OData.ConnectedService/Properties/AssemblyInfo.cs @@ -30,7 +30,7 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.5.0.0")] -[assembly: AssemblyFileVersion("1.5.0.0")] +[assembly: AssemblyVersion("1.5.1.0")] +[assembly: AssemblyFileVersion("1.5.1.0")] [assembly: NeutralResourcesLanguage("en")] diff --git a/src/Unchase.OData.ConnectedService/source.extension.vsixmanifest b/src/Unchase.OData.ConnectedService/source.extension.vsixmanifest index 9e0cb98..69d07ee 100644 --- a/src/Unchase.OData.ConnectedService/source.extension.vsixmanifest +++ b/src/Unchase.OData.ConnectedService/source.extension.vsixmanifest @@ -1,7 +1,7 @@  - + Unchase OData Connected Service OData V1-V4 connected service with extension methods for client-side proxy class. https://github.com/unchase/Unchase.Odata.Connectedservice