Skip to content

Commit

Permalink
Version 4.4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
peteroupc committed Apr 19, 2021
1 parent a8d19bc commit 66fd1a2
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 9 deletions.
9 changes: 7 additions & 2 deletions CBOR.nuspec
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
<package
><metadata><version>4.4.0</version><id>PeterO.Cbor</id><requireLicenseAcceptance>false</requireLicenseAcceptance><releaseNotes>Version 4.4:

TODO: Add release notes.</releaseNotes><summary></summary><license type='expression'>CC0-1.0</license><projectUrl>https://github.com/peteroupc/CBOR</projectUrl><authors>Peter Occil</authors><description>A C# implementation of Concise Binary Object Representation (CBOR), a general-purpose binary data format defined in RFC 8949.</description><owners>Peter Occil</owners><title>CBOR (Concise Binary Object Representation)</title><tags>cbor data serialization binary json</tags><dependencies><group targetFramework='.NETStandard1.0'><dependency id='PeterO.URIUtility' version='1.0.0' /><dependency id='PeterO.Numbers' version='1.7.4' /></group><group targetFramework='.NETFramework2.0'><dependency id='PeterO.URIUtility' version='1.0.0' /><dependency id='PeterO.Numbers' version='1.7.4' /></group><group targetFramework='.NETFramework4.0'><dependency id='PeterO.URIUtility' version='1.0.0' /><dependency id='PeterO.Numbers' version='1.7.4' /></group></dependencies></metadata><files><file src='CBOR/bin/Release/netstandard1.0/CBOR.dll' target='/lib/netstandard1.0' /><file src='CBOR/bin/Release/netstandard1.0/CBOR.xml' target='/lib/netstandard1.0' /><file src='CBOR20/bin/Release/CBOR.dll' target='/lib/net20' /><file src='CBOR20/bin/Release/CBOR.xml' target='/lib/net20' /><file src='CBOR40/bin/Release/CBOR.dll' target='/lib/net40' /><file src='CBOR40/bin/Release/CBOR.xml' target='/lib/net40' /></files></package
>
- Boolean constructors of PODOptions and CBOREncodeOptions were obsolete
- Float64 option of CBOREncodeOptions for encoding floating-point values as 64-bit only
- CBORDateConverter made public and expanded to enable conversion between various
date/time formats and CBOR objects
- Added CanFitInUInt64 and CanTruncatedIntFitInUInt64 methods
- Bug fixes</releaseNotes><summary></summary><license type='expression'>CC0-1.0</license><projectUrl>https://github.com/peteroupc/CBOR</projectUrl><authors>Peter Occil</authors><description>A C# implementation of Concise Binary Object Representation (CBOR), a general-purpose binary data format defined in RFC 8949.</description><owners>Peter Occil</owners><title>CBOR (Concise Binary Object Representation)</title><tags>cbor data serialization binary json</tags><dependencies><group targetFramework='.NETStandard1.0'><dependency id='PeterO.URIUtility' version='1.0.0' /><dependency id='PeterO.Numbers' version='1.7.4' /></group><group targetFramework='.NETFramework2.0'><dependency id='PeterO.URIUtility' version='1.0.0' /><dependency id='PeterO.Numbers' version='1.7.4' /></group><group targetFramework='.NETFramework4.0'><dependency id='PeterO.URIUtility' version='1.0.0' /><dependency id='PeterO.Numbers' version='1.7.4' /></group></dependencies></metadata><files><file src='CBOR/bin/Release/netstandard1.0/CBOR.dll' target='/lib/netstandard1.0' /><file src='CBOR/bin/Release/netstandard1.0/CBOR.xml' target='/lib/netstandard1.0' /><file src='CBOR20/bin/Release/CBOR.dll' target='/lib/net20' /><file src='CBOR20/bin/Release/CBOR.xml' target='/lib/net20' /><file src='CBOR40/bin/Release/CBOR.dll' target='/lib/net40' /><file src='CBOR40/bin/Release/CBOR.xml' target='/lib/net40' /></files></package
>
9 changes: 7 additions & 2 deletions CBOR/CBOR.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,20 @@
<Owners>Peter Occil</Owners>
<Description>A C# implementation of Concise Binary Object Representation (CBOR), a general-purpose binary data format defined in RFC 8949.</Description>
<Summary>A C# implementation of Concise Binary Object Representation (CBOR), a general-purpose binary data format defined in RFC 8949. </Summary>
<Copyright>2020. Written by Peter O. Any copyright to this work is released to the Public Domain. In case this is not possible, this work is also released under Creative Commons Zero (CC0).</Copyright>
<Copyright>2021. Written by Peter O. Any copyright to this work is released to the Public Domain. In case this is not possible, this work is also released under Creative Commons Zero (CC0).</Copyright>
<Authors>Peter Occil</Authors>
<PackageId>PeterO.Cbor</PackageId>
<PackageLicenseExpression>CC0-1.0</PackageLicenseExpression>
<PackageProjectUrl>https://github.com/peteroupc/CBOR</PackageProjectUrl>
<PackageReleaseNotes>
Version 4.4:

TODO: Add release notes.
- Boolean constructors of PODOptions and CBOREncodeOptions were obsolete
- Float64 option of CBOREncodeOptions for encoding floating-point values as 64-bit only
- CBORDateConverter made public and expanded to enable conversion between various
date/time formats and CBOR objects
- Added CanFitInUInt64 and CanTruncatedIntFitInUInt64 methods
- Bug fixes

</PackageReleaseNotes>
<PackageTags>cbor data serialization binary json</PackageTags>
Expand Down
9 changes: 4 additions & 5 deletions CBOR/PeterO/Cbor/CBORObject.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2110,7 +2110,6 @@ public long CalcEncodedSize() {
return this.CalcEncodedSize(0);
}

// TODO: Use CBOREncodeOptions in CalcEncodedSize
private long CalcEncodedSize(int depth) {
if (depth > 1000) {
throw new CBORException("Too deeply nested");
Expand Down Expand Up @@ -6374,13 +6373,13 @@ public CBORObject UntagOne() {
/// cborObject.WriteJSONTo(new FilterOutputStream(ba) {
/// private int size = 0;
/// public void write(byte[] b, int off, int len) throws IOException {
/// if (len>(maxSize-size)) {
/// if (len&gt;(maxSize-size)) {
/// throw new UnsupportedOperationException();
/// }
/// size+=len; out.write(b, off, len);
/// }
/// public void write(byte b) throws IOException {
/// if (size >= maxSize) {
/// if (size &gt;= maxSize) {
/// throw new UnsupportedOperationException();
/// }
/// size++; out.write(b);
Expand Down Expand Up @@ -7062,13 +7061,13 @@ public static int WriteValue(
/// cborObject.WriteTo(new FilterOutputStream(ba) {
/// private int size = 0;
/// public void write(byte[] b, int off, int len) throws IOException {
/// if (len>(maxSize-size)) {
/// if (len&gt;(maxSize-size)) {
/// throw new UnsupportedOperationException();
/// }
/// size+=len; out.write(b, off, len);
/// }
/// public void write(byte b) throws IOException {
/// if (size >= maxSize) {
/// if (size &gt;= maxSize) {
/// throw new UnsupportedOperationException();
/// }
/// size++; out.write(b);
Expand Down

0 comments on commit 66fd1a2

Please sign in to comment.