Skip to content

Commit 4b1a8c3

Browse files
budgetpreneurbudgetpreneur
authored
Multi instance configuration fix (#139)
* multi-instance fix for PNConfig * Windows Forms example update * Android example update * monotouch example update
1 parent c47c9d0 commit 4b1a8c3

File tree

27 files changed

+2082
-961
lines changed

27 files changed

+2082
-961
lines changed

‎.pubnub.yml‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
name: c-sharp
2-
version: "6.3.0"
2+
version: "6.4.0"
33
schema: 1
44
scm: github.com/pubnub/c-sharp
55
changelog:
6+
- date: 2022-05-23
7+
version: v6.4.0
8+
changes:
9+
- type: bug
10+
text: "Handle PNConfiguration for multi Pubnub instances."
611
- date: 2022-03-22
712
version: v6.3.0
813
changes:
@@ -643,7 +648,7 @@ features:
643648
- QUERY-PARAM
644649
supported-platforms:
645650
-
646-
version: Pubnub 'C#' 6.3.0
651+
version: Pubnub 'C#' 6.4.0
647652
platforms:
648653
- Windows 10 and up
649654
- Windows Server 2008 and up
@@ -653,7 +658,7 @@ supported-platforms:
653658
- .Net Framework 4.5
654659
- .Net Framework 4.6.1+
655660
-
656-
version: PubnubPCL 'C#' 6.3.0
661+
version: PubnubPCL 'C#' 6.4.0
657662
platforms:
658663
- Xamarin.Android
659664
- Xamarin.iOS
@@ -672,7 +677,7 @@ supported-platforms:
672677
- .Net Standard 2.1
673678
- .Net Core
674679
-
675-
version: PubnubUWP 'C#' 6.3.0
680+
version: PubnubUWP 'C#' 6.4.0
676681
platforms:
677682
- Windows Phone 10
678683
- Universal Windows Apps
@@ -696,7 +701,7 @@ sdks:
696701
distribution-type: source
697702
distribution-repository: GitHub
698703
package-name: Pubnub
699-
location: https://github.com/pubnub/c-sharp/releases/tag/v6.3.0.0
704+
location: https://github.com/pubnub/c-sharp/releases/tag/v6.4.0.0
700705
requires:
701706
-
702707
name: ".Net"
@@ -993,7 +998,7 @@ sdks:
993998
distribution-type: source
994999
distribution-repository: GitHub
9951000
package-name: PubNubPCL
996-
location: https://github.com/pubnub/c-sharp/releases/tag/v6.3.0.0
1001+
location: https://github.com/pubnub/c-sharp/releases/tag/v6.4.0.0
9971002
requires:
9981003
-
9991004
name: ".Net Core"
@@ -1366,7 +1371,7 @@ sdks:
13661371
distribution-type: source
13671372
distribution-repository: GitHub
13681373
package-name: PubnubUWP
1369-
location: https://github.com/pubnub/c-sharp/releases/tag/v6.3.0.0
1374+
location: https://github.com/pubnub/c-sharp/releases/tag/v6.4.0.0
13701375
requires:
13711376
-
13721377
name: "Universal Windows Platform Development"

‎CHANGELOG‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
v6.4.0 - May 23 2022
2+
-----------------------------
3+
- Fixed: handle PNConfiguration for multi Pubnub instances.
4+
15
v6.3.0 - March 22 2022
26
-----------------------------
37
- Fixed: refactor Telemetry Task Result to GetAwaiter().GetResult() .

‎src/Api/PubnubApi/Builder/UrlRequestBuilder.cs‎

Lines changed: 118 additions & 110 deletions
Large diffs are not rendered by default.

‎src/Api/PubnubApi/EndPoint/PubSub/SubscribeManager.cs‎

Lines changed: 102 additions & 88 deletions
Large diffs are not rendered by default.

‎src/Api/PubnubApi/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
[assembly: AssemblyProduct("Pubnub C# SDK")]
1212
[assembly: AssemblyCopyright("Copyright © 2021")]
1313
[assembly: AssemblyTrademark("")]
14-
[assembly: AssemblyVersion("6.3.0.0")]
15-
[assembly: AssemblyFileVersion("6.3.0.0")]
14+
[assembly: AssemblyVersion("6.4.0.0")]
15+
[assembly: AssemblyFileVersion("6.4.0.0")]
1616
// Setting ComVisible to false makes the types in this assembly not visible
1717
// to COM components. If you need to access a type in this assembly from
1818
// COM, set the ComVisible attribute to true on that type.

‎src/Api/PubnubApi/Pubnub.cs‎

Lines changed: 173 additions & 133 deletions
Large diffs are not rendered by default.

‎src/Api/PubnubApi/PubnubApi.csproj‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,15 @@
1313

1414
<PropertyGroup>
1515
<PackageId>Pubnub</PackageId>
16-
<PackageVersion>6.3.0.0</PackageVersion>
16+
<PackageVersion>6.4.0.0</PackageVersion>
1717
<Title>PubNub C# .NET - Web Data Push API</Title>
1818
<Authors>Pandu Masabathula</Authors>
1919
<Owners>PubNub</Owners>
2020
<PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
2121
<PackageIconUrl>http://pubnub.s3.amazonaws.com/2011/powered-by-pubnub/pubnub-icon-600x600.png</PackageIconUrl>
2222
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
2323
<RepositoryUrl>https://github.com/pubnub/c-sharp/</RepositoryUrl>
24-
<PackageReleaseNotes>Refactor Telemetry Task Result to GetAwaiter().GetResult() .
25-
Removed SILVERLIGHT, WINDOWS_PHONE preprocessor directive code.</PackageReleaseNotes>
24+
<PackageReleaseNotes>Handle PNConfiguration for multi Pubnub instances.</PackageReleaseNotes>
2625
<PackageTags>Web Data Push Real-time Notifications ESB Message Broadcasting Distributed Computing</PackageTags>
2726
<!--<Summary>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</Summary>-->
2827
<Description>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</Description>

‎src/Api/PubnubApiPCL/PubnubApiPCL.csproj‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,15 @@
1414

1515
<PropertyGroup>
1616
<PackageId>PubnubPCL</PackageId>
17-
<PackageVersion>6.3.0.0</PackageVersion>
17+
<PackageVersion>6.4.0.0</PackageVersion>
1818
<Title>PubNub C# .NET - Web Data Push API</Title>
1919
<Authors>Pandu Masabathula</Authors>
2020
<Owners>PubNub</Owners>
2121
<PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
2222
<PackageIconUrl>http://pubnub.s3.amazonaws.com/2011/powered-by-pubnub/pubnub-icon-600x600.png</PackageIconUrl>
2323
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
2424
<RepositoryUrl>https://github.com/pubnub/c-sharp/</RepositoryUrl>
25-
<PackageReleaseNotes>Refactor Telemetry Task Result to GetAwaiter().GetResult() .
26-
Removed SILVERLIGHT, WINDOWS_PHONE preprocessor directive code.</PackageReleaseNotes>
25+
<PackageReleaseNotes>Handle PNConfiguration for multi Pubnub instances.</PackageReleaseNotes>
2726
<PackageTags>Web Data Push Real-time Notifications ESB Message Broadcasting Distributed Computing</PackageTags>
2827
<!--<Summary>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</Summary>-->
2928
<Description>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</Description>

‎src/Api/PubnubApiUWP/PubnubApiUWP.csproj‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,15 @@
1515

1616
<PropertyGroup>
1717
<PackageId>PubnubUWP</PackageId>
18-
<PackageVersion>6.3.0.0</PackageVersion>
18+
<PackageVersion>6.4.0.0</PackageVersion>
1919
<Title>PubNub C# .NET - Web Data Push API</Title>
2020
<Authors>Pandu Masabathula</Authors>
2121
<Owners>PubNub</Owners>
2222
<PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
2323
<PackageIconUrl>http://pubnub.s3.amazonaws.com/2011/powered-by-pubnub/pubnub-icon-600x600.png</PackageIconUrl>
2424
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
2525
<RepositoryUrl>https://github.com/pubnub/c-sharp/</RepositoryUrl>
26-
<PackageReleaseNotes>Refactor Telemetry Task Result to GetAwaiter().GetResult() .
27-
Removed SILVERLIGHT, WINDOWS_PHONE preprocessor directive code.</PackageReleaseNotes>
26+
<PackageReleaseNotes>Handle PNConfiguration for multi Pubnub instances.</PackageReleaseNotes>
2827
<PackageTags>Web Data Push Real-time Notifications ESB Message Broadcasting Distributed Computing</PackageTags>
2928
<!--<Summary>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</Summary>-->
3029
<Description>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</Description>

‎src/Examples/PubnubApi.WinFormExample/PubnubApi.WinFormExample.csproj‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,6 @@
3333
<WarningLevel>4</WarningLevel>
3434
</PropertyGroup>
3535
<ItemGroup>
36-
<Reference Include="BouncyCastle.Crypto, Version=1.8.1.0, Culture=neutral, PublicKeyToken=0e99375e54769942, processorArchitecture=MSIL">
37-
<HintPath>packages\Portable.BouncyCastle.1.8.1.2\lib\net4\BouncyCastle.Crypto.dll</HintPath>
38-
</Reference>
3936
<Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
4037
<HintPath>..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
4138
<Private>True</Private>
@@ -49,23 +46,27 @@
4946
<Private>True</Private>
5047
</Reference>
5148
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
52-
<HintPath>packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
49+
<HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
50+
</Reference>
51+
<Reference Include="Numbers, Version=1.8.2.0, Culture=neutral, PublicKeyToken=9cd62db60ea5554c, processorArchitecture=MSIL">
52+
<HintPath>..\..\packages\PeterO.Numbers.1.8.2\lib\net40\Numbers.dll</HintPath>
5353
</Reference>
54-
<Reference Include="Pubnub, Version=4.2.0.0, Culture=neutral, PublicKeyToken=dc66f52ce6619f44, processorArchitecture=MSIL">
55-
<HintPath>packages\Pubnub.4.2.0\lib\net45\Pubnub.dll</HintPath>
54+
<Reference Include="Pubnub, Version=6.3.0.0, Culture=neutral, PublicKeyToken=dc66f52ce6619f44, processorArchitecture=MSIL">
55+
<HintPath>..\..\packages\Pubnub.6.3.0\lib\net45\Pubnub.dll</HintPath>
5656
</Reference>
5757
<Reference Include="System" />
5858
<Reference Include="System.ComponentModel.Composition" />
5959
<Reference Include="System.Core" />
60-
<Reference Include="System.IO.FileSystem, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
61-
<HintPath>..\..\packages\System.IO.FileSystem.4.0.1\lib\net46\System.IO.FileSystem.dll</HintPath>
62-
<Private>True</Private>
60+
<Reference Include="System.IO.FileSystem, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
61+
<HintPath>..\..\packages\System.IO.FileSystem.4.3.0\lib\net46\System.IO.FileSystem.dll</HintPath>
6362
</Reference>
64-
<Reference Include="System.IO.FileSystem.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
65-
<HintPath>..\..\packages\System.IO.FileSystem.Primitives.4.0.1\lib\net46\System.IO.FileSystem.Primitives.dll</HintPath>
66-
<Private>True</Private>
63+
<Reference Include="System.IO.FileSystem.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
64+
<HintPath>..\..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll</HintPath>
6765
</Reference>
6866
<Reference Include="System.Net" />
67+
<Reference Include="System.ValueTuple, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
68+
<HintPath>..\..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
69+
</Reference>
6970
<Reference Include="System.Xml.Linq" />
7071
<Reference Include="System.Data.DataSetExtensions" />
7172
<Reference Include="Microsoft.CSharp" />
@@ -75,6 +76,9 @@
7576
<Reference Include="System.Net.Http" />
7677
<Reference Include="System.Windows.Forms" />
7778
<Reference Include="System.Xml" />
79+
<Reference Include="URIUtility, Version=1.0.0.0, Culture=neutral, PublicKeyToken=9cd62db60ea5554c, processorArchitecture=MSIL">
80+
<HintPath>..\..\packages\PeterO.URIUtility.1.0.0\lib\net40\URIUtility.dll</HintPath>
81+
</Reference>
7882
</ItemGroup>
7983
<ItemGroup>
8084
<Compile Include="frmObjects.cs">

0 commit comments

Comments
 (0)