Skip to content

Commit f25f57c

Browse files
peteroupcpeteroupc
committed
Update NuDoc; prepare for version 2.3
1 parent 5fbf253 commit f25f57c

11 files changed

Lines changed: 33 additions & 36 deletions

File tree

‎CBOR.nuspec‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
<package>
33
<metadata>
44
<id>PeterO.Cbor</id>
5-
<version>$version$</version>
5+
<version>2.3.0</version>
66
<title>CBOR</title>
7-
<authors>$author$</authors>
8-
<owners>$author$</owners>
7+
<authors>Peter Occil</authors>
8+
<owners>Peter Occil</owners>
99
<licenseUrl>http://creativecommons.org/publicdomain/zero/1.0/</licenseUrl>
1010
<projectUrl>https://github.com/peteroupc/CBOR</projectUrl>
1111
<requireLicenseAcceptance>false</requireLicenseAcceptance>
@@ -16,9 +16,14 @@
1616
</description>
1717
<summary>A C# implementation of Concise Binary Object Representation (CBOR), a data serialization format. This implementation can also convert between CBOR and JSON.</summary>
1818
<releaseNotes>
19-
In version 2.2:
20-
- Portable Class Library compatibility expanded
21-
- Add option to always use definite length string encoding when generating CBOR objects
19+
In version 2.3:
20+
- The C# version of the library now also targets "dotnet", which should make it compatible with platform .NET runtime
21+
environments such as the upcoming cross-platform "coreclr" runtime.
22+
- Added GetUtf8Bytes overload to DataUtilities
23+
- Fixed line break bug when setting lenientLineBreaks to true in the PeterO.Cbor.DataUtilities.WriteUtf8 method
24+
- In BigInteger, fixed divideAndRemainder method, added certain methods and made other methods obsolete
25+
- Many additions to the documentation
26+
- Other bug fixes
2227
See the project page for release notes on previous versions: https://github.com/peteroupc/CBOR
2328
</releaseNotes>
2429
<copyright>Written by Peter O. in 2013-2015. Any copyright is released to the Public Domain.</copyright>

‎CBORDocs/CBORDocs.csproj‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,9 @@
4242
<StartupObject />
4343
</PropertyGroup>
4444
<ItemGroup>
45-
<Reference Include="ClariusLabs.NuDoc">
46-
<HintPath>..\packages\NuDoc.0.4.1308.1316\lib\net35\ClariusLabs.NuDoc.dll</HintPath>
45+
<Reference Include="NuDoq, Version=1.2.0.0, Culture=neutral, PublicKeyToken=197ef17e56afcdb9, processorArchitecture=MSIL">
46+
<HintPath>..\packages\NuDoq.1.2.5\lib\net35\NuDoq.dll</HintPath>
47+
<Private>True</Private>
4748
</Reference>
4849
<Reference Include="System" />
4950
<Reference Include="System.Core" />
@@ -71,11 +72,4 @@
7172
</ItemGroup>
7273
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
7374
<Import Project="$(MSBuildExtensionsPath)\StyleCop\v4.7\StyleCop.targets" />
74-
<Import Project="..\packages\NuSpec.ReferenceGenerator.1.4.0\build\dotnet\NuSpec.ReferenceGenerator.targets" Condition="Exists('..\packages\NuSpec.ReferenceGenerator.1.4.0\build\dotnet\NuSpec.ReferenceGenerator.targets')" />
75-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
76-
<PropertyGroup>
77-
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
78-
</PropertyGroup>
79-
<Error Condition="!Exists('..\packages\NuSpec.ReferenceGenerator.1.4.0\build\dotnet\NuSpec.ReferenceGenerator.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NuSpec.ReferenceGenerator.1.4.0\build\dotnet\NuSpec.ReferenceGenerator.targets'))" />
80-
</Target>
8175
</Project>

‎CBORDocs/DocGenerator.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using System.Linq;
44
using System.Reflection;
55
using System.Text;
6-
using ClariusLabs.NuDoc;
6+
using NuDoq;
77

88
namespace PeterO.DocGen {
99
/// <summary>A documentation generator.</summary>

‎CBORDocs/DocVisitor.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Any copyright is dedicated to the Public Domain.
1313
using System.Text;
1414
using System.Text.RegularExpressions;
1515

16-
using ClariusLabs.NuDoc;
16+
using NuDoq;
1717

1818
namespace PeterO.DocGen {
1919
/// <summary>A documentation visitor.</summary>
@@ -484,7 +484,7 @@ public override void VisitExample(Example example) {
484484
this.WriteLine("\r\n\r\n");
485485
}
486486

487-
public override void VisitException(ClariusLabs.NuDoc.Exception exception) {
487+
public override void VisitException(NuDoq.Exception exception) {
488488
using (var ch = this.Change(this.exceptionStr)) {
489489
var cref = exception.Cref;
490490
if (cref.StartsWith("T:", StringComparison.Ordinal)) {

‎CBORDocs/SummaryVisitor.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Any copyright is dedicated to the Public Domain.
1313
using System.Text;
1414
using System.Text.RegularExpressions;
1515

16-
using ClariusLabs.NuDoc;
16+
using NuDoq;
1717

1818
namespace PeterO.DocGen {
1919
internal class SummaryVisitor : Visitor, IComparer<Type> {

‎CBORDocs/TypeVisitor.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Any copyright is dedicated to the Public Domain.
1313
using System.Text;
1414
using System.Text.RegularExpressions;
1515

16-
using ClariusLabs.NuDoc;
16+
using NuDoq;
1717

1818
namespace PeterO.DocGen {
1919
internal class TypeVisitor : Visitor, IComparer<Type> {

‎CBORDocs/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="NuDoc" version="0.4.1308.1316" targetFramework="net45" />
4-
<package id="NuSpec.ReferenceGenerator" version="1.4.0" targetFramework="net45" developmentDependency="true" />
3+
<package id="NuDoc" version="0.5" targetFramework="net45" />
4+
<package id="NuDoq" version="1.2.5" targetFramework="net45" />
55
</packages>

‎CBORDocs2/CBORDocs2.csproj‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
</ItemGroup>
4242
<ItemGroup>
4343
<None Include="App.config" />
44-
<None Include="packages.config" />
4544
</ItemGroup>
4645
<ItemGroup>
4746
<ProjectReference Include="..\CBORDocs\CBORDocs.csproj">
@@ -58,11 +57,4 @@
5857
</Target>
5958
-->
6059
<Import Project="$(MSBuildExtensionsPath)\StyleCop\v4.7\StyleCop.targets" />
61-
<Import Project="..\packages\NuSpec.ReferenceGenerator.1.4.0\build\dotnet\NuSpec.ReferenceGenerator.targets" Condition="Exists('..\packages\NuSpec.ReferenceGenerator.1.4.0\build\dotnet\NuSpec.ReferenceGenerator.targets')" />
62-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
63-
<PropertyGroup>
64-
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
65-
</PropertyGroup>
66-
<Error Condition="!Exists('..\packages\NuSpec.ReferenceGenerator.1.4.0\build\dotnet\NuSpec.ReferenceGenerator.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NuSpec.ReferenceGenerator.1.4.0\build\dotnet\NuSpec.ReferenceGenerator.targets'))" />
67-
</Target>
6860
</Project>

‎CBORDocs2/packages.config‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎CBORTest/TestCommon.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -469,8 +469,8 @@ public static string ObjectMessages(
469469
object o1,
470470
object o2,
471471
String s) {
472-
CBORObject co1 = o1 as CBORObject;
473-
CBORObject co2 = o2 as CBORObject;
472+
var co1 = o1 as CBORObject;
473+
var co2 = o2 as CBORObject;
474474
if (co1 != null) {
475475
TestCommon.ObjectMessages(co1, co2, s);
476476
}

0 commit comments

Comments
 (0)