From f71e959b8a29022d0c7e9ab6419efdd1f34a54ec Mon Sep 17 00:00:00 2001 From: Pandu Masabathula Date: Mon, 22 Aug 2022 17:50:04 +0530 Subject: [PATCH] Fix Timer reference conflict in net6.0 (#154) * Fix Timer reference conflict for net6.0 --- .pubnub.yml | 19 ++++++++++++------- CHANGELOG | 4 ++++ src/Api/PubnubApi/Properties/AssemblyInfo.cs | 4 ++-- src/Api/PubnubApi/PubnubApi.csproj | 4 ++-- src/Api/PubnubApi/Timer.cs | 2 +- src/Api/PubnubApiPCL/PubnubApiPCL.csproj | 7 +++++-- src/Api/PubnubApiUWP/PubnubApiUWP.csproj | 4 ++-- 7 files changed, 28 insertions(+), 16 deletions(-) diff --git a/.pubnub.yml b/.pubnub.yml index 02fdc5510..c069b15c3 100644 --- a/.pubnub.yml +++ b/.pubnub.yml @@ -1,8 +1,13 @@ name: c-sharp -version: "6.8.0" +version: "6.9.0" schema: 1 scm: github.com/pubnub/c-sharp changelog: + - date: 2022-08-22 + version: v6.9.0 + changes: + - type: bug + text: "Fix Timer reference conflict in net6.0." - date: 2022-08-10 version: v6.8.0 changes: @@ -670,7 +675,7 @@ features: - QUERY-PARAM supported-platforms: - - version: Pubnub 'C#' 6.8.0 + version: Pubnub 'C#' 6.9.0 platforms: - Windows 10 and up - Windows Server 2008 and up @@ -680,7 +685,7 @@ supported-platforms: - .Net Framework 4.5 - .Net Framework 4.6.1+ - - version: PubnubPCL 'C#' 6.8.0 + version: PubnubPCL 'C#' 6.9.0 platforms: - Xamarin.Android - Xamarin.iOS @@ -700,7 +705,7 @@ supported-platforms: - .Net Core - .Net 6.0 - - version: PubnubUWP 'C#' 6.8.0 + version: PubnubUWP 'C#' 6.9.0 platforms: - Windows Phone 10 - Universal Windows Apps @@ -724,7 +729,7 @@ sdks: distribution-type: source distribution-repository: GitHub package-name: Pubnub - location: https://github.com/pubnub/c-sharp/releases/tag/v6.8.0.0 + location: https://github.com/pubnub/c-sharp/releases/tag/v6.9.0.0 requires: - name: ".Net" @@ -1007,7 +1012,7 @@ sdks: distribution-type: source distribution-repository: GitHub package-name: PubNubPCL - location: https://github.com/pubnub/c-sharp/releases/tag/v6.8.0.0 + location: https://github.com/pubnub/c-sharp/releases/tag/v6.9.0.0 requires: - name: ".Net Core" @@ -1366,7 +1371,7 @@ sdks: distribution-type: source distribution-repository: GitHub package-name: PubnubUWP - location: https://github.com/pubnub/c-sharp/releases/tag/v6.8.0.0 + location: https://github.com/pubnub/c-sharp/releases/tag/v6.9.0.0 requires: - name: "Universal Windows Platform Development" diff --git a/CHANGELOG b/CHANGELOG index 3747e8fb3..128d5da96 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +v6.9.0 - August 22 2022 +----------------------------- +- Fixed: fix Timer reference conflict in net6.0. + v6.8.0 - August 10 2022 ----------------------------- - Fixed: fixed Destroy() method when multiple Pubnub instances were in use. diff --git a/src/Api/PubnubApi/Properties/AssemblyInfo.cs b/src/Api/PubnubApi/Properties/AssemblyInfo.cs index a35e09a23..4b64b8281 100644 --- a/src/Api/PubnubApi/Properties/AssemblyInfo.cs +++ b/src/Api/PubnubApi/Properties/AssemblyInfo.cs @@ -11,8 +11,8 @@ [assembly: AssemblyProduct("Pubnub C# SDK")] [assembly: AssemblyCopyright("Copyright © 2021")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("6.8.0.0")] -[assembly: AssemblyFileVersion("6.8.0.0")] +[assembly: AssemblyVersion("6.9.0.0")] +[assembly: AssemblyFileVersion("6.9.0.0")] // Setting ComVisible to false makes the types in this assembly not visible // to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. diff --git a/src/Api/PubnubApi/PubnubApi.csproj b/src/Api/PubnubApi/PubnubApi.csproj index 0a5506e93..9c3dc9b9f 100644 --- a/src/Api/PubnubApi/PubnubApi.csproj +++ b/src/Api/PubnubApi/PubnubApi.csproj @@ -13,7 +13,7 @@ Pubnub - 6.8.0.0 + 6.9.0.0 PubNub C# .NET - Web Data Push API Pandu Masabathula PubNub @@ -21,7 +21,7 @@ http://pubnub.s3.amazonaws.com/2011/powered-by-pubnub/pubnub-icon-600x600.png true https://github.com/pubnub/c-sharp/ - Fixed Destroy() method when multiple Pubnub instances were in use. + Fix Timer reference conflict in net6.0. Web Data Push Real-time Notifications ESB Message Broadcasting Distributed Computing PubNub is a Massively Scalable Web Push Service for Web and Mobile Games. This is a cloud-based service for broadcasting messages to thousands of web and mobile clients simultaneously diff --git a/src/Api/PubnubApi/Timer.cs b/src/Api/PubnubApi/Timer.cs index ba764c8f3..7ee86602e 100644 --- a/src/Api/PubnubApi/Timer.cs +++ b/src/Api/PubnubApi/Timer.cs @@ -6,7 +6,7 @@ namespace System.Threading { -#if NETSTANDARD10 || NETSTANDARD11 || NET60 +#if NETSTANDARD10 || NETSTANDARD11 public delegate void TimerCallback(object state); public sealed class Timer : CancellationTokenSource, IDisposable diff --git a/src/Api/PubnubApiPCL/PubnubApiPCL.csproj b/src/Api/PubnubApiPCL/PubnubApiPCL.csproj index 47083a067..4ac27fe64 100644 --- a/src/Api/PubnubApiPCL/PubnubApiPCL.csproj +++ b/src/Api/PubnubApiPCL/PubnubApiPCL.csproj @@ -14,7 +14,7 @@ PubnubPCL - 6.8.0.0 + 6.9.0.0 PubNub C# .NET - Web Data Push API Pandu Masabathula PubNub @@ -22,7 +22,7 @@ http://pubnub.s3.amazonaws.com/2011/powered-by-pubnub/pubnub-icon-600x600.png true https://github.com/pubnub/c-sharp/ - Fixed Destroy() method when multiple Pubnub instances were in use. + Fix Timer reference conflict in net6.0. Web Data Push Real-time Notifications ESB Message Broadcasting Distributed Computing PubNub is a Massively Scalable Web Push Service for Web and Mobile Games. This is a cloud-based service for broadcasting messages to thousands of web and mobile clients simultaneously @@ -813,6 +813,9 @@ None + + None + None diff --git a/src/Api/PubnubApiUWP/PubnubApiUWP.csproj b/src/Api/PubnubApiUWP/PubnubApiUWP.csproj index dfb7075f5..cde13153e 100644 --- a/src/Api/PubnubApiUWP/PubnubApiUWP.csproj +++ b/src/Api/PubnubApiUWP/PubnubApiUWP.csproj @@ -15,7 +15,7 @@ PubnubUWP - 6.8.0.0 + 6.9.0.0 PubNub C# .NET - Web Data Push API Pandu Masabathula PubNub @@ -23,7 +23,7 @@ http://pubnub.s3.amazonaws.com/2011/powered-by-pubnub/pubnub-icon-600x600.png true https://github.com/pubnub/c-sharp/ - Fixed Destroy() method when multiple Pubnub instances were in use. + Fix Timer reference conflict in net6.0. Web Data Push Real-time Notifications ESB Message Broadcasting Distributed Computing PubNub is a Massively Scalable Web Push Service for Web and Mobile Games. This is a cloud-based service for broadcasting messages to thousands of web and mobile clients simultaneously