Skip to content

Commit 842e940

Browse files
Bump PeterO.Cbor library version to 4.5.2 (#131)
* PeterO.Cbor library min version to 4.5.2 * updated feature file changes * handle escape chars in patterns
1 parent 4b5f576 commit 842e940

File tree

14 files changed

+89
-171
lines changed

14 files changed

+89
-171
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.1.0"
2+
version: "6.2.0"
33
schema: 1
44
scm: github.com/pubnub/c-sharp
55
changelog:
6+
- date: 2022-01-27
7+
version: v6.2.0
8+
changes:
9+
- type: improvement
10+
text: "Bumped PeterO.Cbor library version to 4.5.2."
611
- date: 2022-01-20
712
version: v6.1.0
813
changes:
@@ -631,7 +636,7 @@ features:
631636
- QUERY-PARAM
632637
supported-platforms:
633638
-
634-
version: Pubnub 'C#' 6.1.0
639+
version: Pubnub 'C#' 6.2.0
635640
platforms:
636641
- Windows 10 and up
637642
- Windows Server 2008 and up
@@ -641,7 +646,7 @@ supported-platforms:
641646
- .Net Framework 4.5
642647
- .Net Framework 4.6.1+
643648
-
644-
version: PubnubPCL 'C#' 6.1.0
649+
version: PubnubPCL 'C#' 6.2.0
645650
platforms:
646651
- Xamarin.Android
647652
- Xamarin.iOS
@@ -660,7 +665,7 @@ supported-platforms:
660665
- .Net Standard 2.1
661666
- .Net Core
662667
-
663-
version: PubnubUWP 'C#' 6.1.0
668+
version: PubnubUWP 'C#' 6.2.0
664669
platforms:
665670
- Windows Phone 10
666671
- Universal Windows Apps
@@ -684,7 +689,7 @@ sdks:
684689
distribution-type: source
685690
distribution-repository: GitHub
686691
package-name: Pubnub
687-
location: https://github.com/pubnub/c-sharp/releases/tag/v6.1.0.0
692+
location: https://github.com/pubnub/c-sharp/releases/tag/v6.2.0.0
688693
requires:
689694
-
690695
name: ".Net"
@@ -981,7 +986,7 @@ sdks:
981986
distribution-type: source
982987
distribution-repository: GitHub
983988
package-name: PubNubPCL
984-
location: https://github.com/pubnub/c-sharp/releases/tag/v6.1.0.0
989+
location: https://github.com/pubnub/c-sharp/releases/tag/v6.2.0.0
985990
requires:
986991
-
987992
name: ".Net Core"
@@ -1354,7 +1359,7 @@ sdks:
13541359
distribution-type: source
13551360
distribution-repository: GitHub
13561361
package-name: PubnubUWP
1357-
location: https://github.com/pubnub/c-sharp/releases/tag/v6.1.0.0
1362+
location: https://github.com/pubnub/c-sharp/releases/tag/v6.2.0.0
13581363
requires:
13591364
-
13601365
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.2.0 - January 27 2022
2+
-----------------------------
3+
- Modified: bumped PeterO.Cbor library version to 4.5.2.
4+
15
v6.1.0 - January 20 2022
26
-----------------------------
37
- Fixed: capture region when exception occur during subscribe.

src/Api/PubnubApi/EndPoint/TokenManager.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,7 @@ private string ReplaceBoundaryQuotes(string key)
187187
&& key.Substring(key.Length - 1, 1).CompareTo("\"") == 0)
188188
{
189189
key = key.Remove(key.Length - 1, 1).Remove(0, 1);
190+
key = Regex.Unescape(key);
190191
}
191192
return key;
192193
}

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.1.0.0")]
15-
[assembly: AssemblyFileVersion("6.1.0.0")]
14+
[assembly: AssemblyVersion("6.2.0.0")]
15+
[assembly: AssemblyFileVersion("6.2.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/PubnubApi.csproj

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

1414
<PropertyGroup>
1515
<PackageId>Pubnub</PackageId>
16-
<PackageVersion>6.1.0.0</PackageVersion>
16+
<PackageVersion>6.2.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>Capture region when exception occur during subscribe.</PackageReleaseNotes>
24+
<PackageReleaseNotes>Bumped PeterO.Cbor library version to 4.5.2.</PackageReleaseNotes>
2525
<PackageTags>Web Data Push Real-time Notifications ESB Message Broadcasting Distributed Computing</PackageTags>
2626
<!--<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>-->
2727
<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>
@@ -62,7 +62,7 @@
6262
<PackageReference Include="Newtonsoft.Json" Version="9.0.1">
6363
<PrivateAssets>None</PrivateAssets>
6464
</PackageReference>
65-
<PackageReference Include="PeterO.Cbor" Version="4.4.4" />
65+
<PackageReference Include="PeterO.Cbor" Version="4.5.2" />
6666
</ItemGroup>
6767

6868
<ItemGroup Condition="'$(TargetFramework)' == 'net35'">

src/Api/PubnubApiPCL/PubnubApiPCL.csproj

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

1515
<PropertyGroup>
1616
<PackageId>PubnubPCL</PackageId>
17-
<PackageVersion>6.1.0.0</PackageVersion>
17+
<PackageVersion>6.2.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>Capture region when exception occur during subscribe.</PackageReleaseNotes>
25+
<PackageReleaseNotes>Bumped PeterO.Cbor library version to 4.5.2.</PackageReleaseNotes>
2626
<PackageTags>Web Data Push Real-time Notifications ESB Message Broadcasting Distributed Computing</PackageTags>
2727
<!--<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>-->
2828
<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>
@@ -584,7 +584,7 @@
584584
<PackageReference Include="NETStandard.Library" Version="1.6.1">
585585
<PrivateAssets>None</PrivateAssets>
586586
</PackageReference>
587-
<PackageReference Include="PeterO.Cbor" Version="4.4.4" />
587+
<PackageReference Include="PeterO.Cbor" Version="4.5.2" />
588588
<PackageReference Include="System.Security.Cryptography.Algorithms" Version="4.3.0" />
589589
<Reference Include="System.Runtime" />
590590
</ItemGroup>

src/Api/PubnubApiUWP/PubnubApiUWP.csproj

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

1616
<PropertyGroup>
1717
<PackageId>PubnubUWP</PackageId>
18-
<PackageVersion>6.1.0.0</PackageVersion>
18+
<PackageVersion>6.2.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>Capture region when exception occur during subscribe.</PackageReleaseNotes>
26+
<PackageReleaseNotes>Bumped PeterO.Cbor library version to 4.5.2.</PackageReleaseNotes>
2727
<PackageTags>Web Data Push Real-time Notifications ESB Message Broadcasting Distributed Computing</PackageTags>
2828
<!--<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>-->
2929
<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>
@@ -672,7 +672,7 @@
672672
<PackageReference Include="Newtonsoft.Json">
673673
<Version>9.0.1</Version>
674674
</PackageReference>
675-
<PackageReference Include="PeterO.Cbor" Version="4.4.4" />
675+
<PackageReference Include="PeterO.Cbor" Version="4.5.2" />
676676
<PackageReference Include="System.Security.Cryptography.Algorithms" Version="4.3.0" />
677677
</ItemGroup>
678678
<ItemGroup>

src/Examples/PubnubApi.ConsoleExample/App.config

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99
<assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
1010
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
1111
</dependentAssembly>
12+
<dependentAssembly>
13+
<assemblyIdentity name="CBOR" publicKeyToken="9cd62db60ea5554c" culture="neutral" />
14+
<bindingRedirect oldVersion="0.0.0.0-4.5.2.0" newVersion="4.5.2.0" />
15+
</dependentAssembly>
1216
</assemblyBinding>
1317
</runtime>
1418
</configuration>

src/Examples/PubnubApi.ConsoleExample/PubnubApi.ConsoleExample.csproj

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,20 +39,17 @@
3939
<StartupObject>PubnubApiDemo.PubnubExample</StartupObject>
4040
</PropertyGroup>
4141
<ItemGroup>
42-
<Reference Include="BouncyCastle.Crypto, Version=1.8.1.0, Culture=neutral, PublicKeyToken=0e99375e54769942, processorArchitecture=MSIL">
43-
<HintPath>..\..\packages\Portable.BouncyCastle.1.8.1.2\lib\net4\BouncyCastle.Crypto.dll</HintPath>
44-
</Reference>
45-
<Reference Include="CBOR, Version=4.4.4.0, Culture=neutral, PublicKeyToken=9cd62db60ea5554c, processorArchitecture=MSIL">
46-
<HintPath>..\..\packages\PeterO.Cbor.4.4.4\lib\net40\CBOR.dll</HintPath>
42+
<Reference Include="CBOR, Version=4.5.2.0, Culture=neutral, PublicKeyToken=9cd62db60ea5554c, processorArchitecture=MSIL">
43+
<HintPath>..\..\packages\PeterO.Cbor.4.5.2\lib\net40\CBOR.dll</HintPath>
4744
</Reference>
4845
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
4946
<HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
5047
</Reference>
51-
<Reference Include="Numbers, Version=1.8.1.0, Culture=neutral, PublicKeyToken=9cd62db60ea5554c, processorArchitecture=MSIL">
52-
<HintPath>..\..\packages\PeterO.Numbers.1.8.1\lib\net40\Numbers.dll</HintPath>
48+
<Reference Include="Numbers, Version=1.8.2.0, Culture=neutral, PublicKeyToken=9cd62db60ea5554c, processorArchitecture=MSIL">
49+
<HintPath>..\..\packages\PeterO.Numbers.1.8.2\lib\net40\Numbers.dll</HintPath>
5350
</Reference>
54-
<Reference Include="Pubnub, Version=5.1.0.0, Culture=neutral, PublicKeyToken=dc66f52ce6619f44, processorArchitecture=MSIL">
55-
<HintPath>..\..\packages\Pubnub.5.1.0\lib\net461\Pubnub.dll</HintPath>
51+
<Reference Include="Pubnub, Version=6.1.0.0, Culture=neutral, PublicKeyToken=dc66f52ce6619f44, processorArchitecture=MSIL">
52+
<HintPath>..\..\packages\Pubnub.6.1.0\lib\net461\Pubnub.dll</HintPath>
5653
</Reference>
5754
<Reference Include="System" />
5855
<Reference Include="System.ComponentModel.Composition" />
@@ -67,6 +64,12 @@
6764
</Reference>
6865
<Reference Include="System.Net" />
6966
<Reference Include="System.Numerics" />
67+
<Reference Include="System.Security.Cryptography.Algorithms, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
68+
<HintPath>..\..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net461\System.Security.Cryptography.Algorithms.dll</HintPath>
69+
</Reference>
70+
<Reference Include="System.Security.Cryptography.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
71+
<HintPath>..\..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
72+
</Reference>
7073
<Reference Include="System.ValueTuple, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
7174
<HintPath>..\..\packages\System.ValueTuple.4.4.0\lib\net461\System.ValueTuple.dll</HintPath>
7275
</Reference>
Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net461" />
4-
<package id="PeterO.Cbor" version="4.4.4" targetFramework="net461" />
5-
<package id="PeterO.Numbers" version="1.8.1" targetFramework="net461" />
4+
<package id="PeterO.Cbor" version="4.5.2" targetFramework="net461" />
5+
<package id="PeterO.Numbers" version="1.8.2" targetFramework="net461" />
66
<package id="PeterO.URIUtility" version="1.0.0" targetFramework="net461" />
7-
<package id="Portable.BouncyCastle" version="1.8.1.2" targetFramework="net461" />
8-
<package id="Pubnub" version="5.1.0" targetFramework="net461" />
7+
<package id="Pubnub" version="6.1.0" targetFramework="net461" />
98
<package id="System.Collections" version="4.0.11" targetFramework="net461" />
109
<package id="System.Diagnostics.Debug" version="4.0.11" targetFramework="net461" />
1110
<package id="System.Globalization" version="4.0.11" targetFramework="net461" />
@@ -17,6 +16,8 @@
1716
<package id="System.Reflection.Extensions" version="4.0.1" targetFramework="net461" />
1817
<package id="System.Runtime" version="4.1.0" targetFramework="net461" />
1918
<package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net461" />
19+
<package id="System.Security.Cryptography.Algorithms" version="4.3.0" targetFramework="net461" />
20+
<package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net461" />
2021
<package id="System.Text.Encoding" version="4.0.11" targetFramework="net461" />
2122
<package id="System.ValueTuple" version="4.4.0" targetFramework="net461" />
2223
</packages>

0 commit comments

Comments
 (0)