Skip to content

Commit

Permalink
style and project edits
Browse files Browse the repository at this point in the history
  • Loading branch information
peteroupc committed Dec 8, 2021
1 parent d67a3ed commit 21453f6
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 21 deletions.
23 changes: 6 additions & 17 deletions CBOR.nuspec
Original file line number Diff line number Diff line change
@@ -1,20 +1,9 @@
<package
><metadata><version>4.5</version><id>PeterO.Cbor</id><requireLicenseAcceptance>false</requireLicenseAcceptance><releaseNotes>Version 4.4.2:
><metadata><version>4.5</version><id>PeterO.Cbor</id><requireLicenseAcceptance>false</requireLicenseAcceptance><releaseNotes>Version 4.5:

- Performance improvements in some cases, especially involving date/time conversions
- Error checks in DateTimeFieldsToCBORObject method in CBORDateConverter
- Bug fixes

Version 4.4.1:

- Fix bugs when parsing JSON with the JSON option &apos;numberconversion=double&apos;

Version 4.4:

- 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.8.2' /></group><group targetFramework='.NETFramework2.0'><dependency id='PeterO.URIUtility' version='1.0.0' /><dependency id='PeterO.Numbers' version='1.8.2' /></group><group targetFramework='.NETFramework4.0'><dependency id='PeterO.URIUtility' version='1.0.0' /><dependency id='PeterO.Numbers' version='1.8.2' /></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
- Add support for JSON Pointers and JSON Patches
- Add option to keep map key order when decoding CBOR and JSON
- Add option to write JSON using only ASCII characters
- CBORObject.ToString renders strings as ASCII
- Add support for deserializing CBOR objects to IReadOnlyList, IReadOnlyCollection, and ReadOnlyDictionary</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.8.2' /></group><group targetFramework='.NETFramework2.0'><dependency id='PeterO.URIUtility' version='1.0.0' /><dependency id='PeterO.Numbers' version='1.8.2' /></group><group targetFramework='.NETFramework4.0'><dependency id='PeterO.URIUtility' version='1.0.0' /><dependency id='PeterO.Numbers' version='1.8.2' /></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
>
3 changes: 2 additions & 1 deletion CBOR20/CBOR20.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
<DocumentationFile>bin\Debug\CBOR.xml</DocumentationFile>
<CodeAnalysisRuleSet>rules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition=' &apos;$(Configuration)&apos;==&apos;Release&apos; '><Optimize>true</Optimize><SignAssembly>true</SignAssembly>
<PropertyGroup Condition=' &apos;$(Configuration)&apos;==&apos;Release&apos; '><Optimize>true</Optimize><SignAssembly>true</SignAssembly> <AssemblyOriginatorKeyFile>..\CBOR\PeterO.snk</AssemblyOriginatorKeyFile>

<OutputPath>bin\Release</OutputPath>
<DefineConstants>NET20</DefineConstants>
<ErrorReport>prompt</ErrorReport>
Expand Down
3 changes: 2 additions & 1 deletion CBOR40/CBOR40.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
</PropertyGroup>
<PropertyGroup Condition='
&apos;$(Configuration)&apos;==&apos;Release&apos;
'><Optimize>true</Optimize><SignAssembly>true</SignAssembly>
'><Optimize>true</Optimize><SignAssembly>true</SignAssembly> <AssemblyOriginatorKeyFile>..\CBOR\PeterO.snk</AssemblyOriginatorKeyFile>

<OutputPath>bin\Release</OutputPath>
<DefineConstants>NET40</DefineConstants>
<ErrorReport>prompt</ErrorReport>
Expand Down
4 changes: 2 additions & 2 deletions CBORTest/JSONWithComments.cs
Original file line number Diff line number Diff line change
Expand Up @@ -541,7 +541,7 @@ private void SetPointer(CBORObject obj) {
private void PushPointer() {
if (this.currPointerStackSize > this.currPointer.Count) {
this.RaiseError("Internal error");
};
}
if (this.currPointerStackSize == this.currPointer.Count) {
this.currPointer.Add(CBORObject.Null);
} else {
Expand All @@ -552,7 +552,7 @@ private void PushPointer() {
private void PopPointer() {
if (this.currPointerStackSize < 0) {
this.RaiseError("Internal error");
};
}
--this.currPointerStackSize;
}

Expand Down

0 comments on commit 21453f6

Please sign in to comment.