Skip to content

LIB\NET45\MsgPack.XML TYPO #339

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 20 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions CHANGES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -87,3 +87,35 @@ Release 0.4 - 2013/10/6
* Nullable<MessagePack> based unpacker API is deprecated becaue of their poor performance. You should use fast non-nullable APIs instead (properties/methods with 'Data' suffixes).
* This version is tested on .NET 4.5 and Mono 2.10.8.1.

Release 0.4.1 - 2013/12/07

BUG FIXES
* Fix Readme code error (issue #20.)
* Fix MessagePack.Create<T>() might fail due to type lock synchronization does not coordinate multiple threads (issue #19.)
* Fix deserializing as MessagePackObject fails when unpacking data is list or map (issue #13.)

Release 0.4.2 - 2014/3/17

BUG FIXES
* Add API to re-register serializer (issue #24). It allows you to override default(built-in) serializer as you like.

Release 0.4.3 - 2014/3/22

BUG FIXES
* Fix creating serializer for IEnumerable<T> (and not IList<T> nor IDictionary<TKey, TValue>) causes NullReferenceException.
* Fix built-in object serializer cannot deserialize array/map correctly.
* Fix PackerUnpackerExtensions.Pack<T>() ignore Default serialization context and uses brand-new instance every time.

Release 0.4.4 - 2014/4/13

BUG FIXES
* Fix creating serializer for IDictionary<TKey, TValue> causes NullReferenceException.
* Fix serializers' default constructor IL (it is not used in the library, but can be called via reflection).

Release 0.4.5

BUF FIXES
* Fix creating serializer for abstract dictionary types causes exception in WinRT.

NEW FEATURES
* System.Runtime.Serialization assembly is not required now (pull-request #29). Thanks @takeshik!
6 changes: 3 additions & 3 deletions MsgPack.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<metadata>
<id>MsgPack.Cli</id>
<title>MessagePack for CLI</title>
<version>0.4.0</version>
<version>0.4.4</version>
<authors>FUJIWARA, Yusuke</authors>
<owners>FUJIWARA, Yusuke</owners>
<licenseUrl>http://www.apache.org/licenses/LICENSE-2.0</licenseUrl>
Expand All @@ -12,8 +12,8 @@
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>MessagePack is fast, compact, and interoperable binary serialization format.
This library provides MessagePack serialization/deserialization APIs.</description>
<releaseNotes>This release improves performance, adds str8 support, ext type support, improved serializer generator API, new abstract collection support, and some bug fixes.</releaseNotes>
<copyright>Copyright 2010-2013 FUJIWARA, Yusuke, all rights reserved.</copyright>
<releaseNotes>0.4 release improves performance, adds str8 support, ext type support, improved serializer generator API, new abstract collection support, and some bug fixes. This release includes bug fixes related to some collection interface types.</releaseNotes>
<copyright>Copyright 2010-2014 FUJIWARA, Yusuke, all rights reserved.</copyright>
<tags>Serialization MessagePack MsgPack Formatter Binary Serializer</tags>
<dependencies />
</metadata>
Expand Down
16 changes: 14 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,27 @@ This library can be used from ALL CLS compliant languages such as C#, F#, Visual

## Usage

You can serialize/deserialize objects as following:
1. Create serializer via `MessagePackSerializer.Create` generic method. This method creates dependent types serializers as well.
1. Invoke serializer as following:
** `Pack` method with destination `Stream` and target object for serialization.
** `Unpack` method with source `Stream`.

```c#
var serializer = MessagePackSerializer<T>.Create();
// Creates serializer.
var serializer = MessagePackSerializer.Create<T>();
// Pack obj to stream.
serializer.Pack(stream, obj);
// Unpack from stream.
var unpackedObject = serializer.Unpack(stream);
```

```vb
Dim serializer = MessagePackSerializer(Of T).Create()
' Creates serializer.
Dim serializer = MessagePackSerializer.Create(Of T)()
' Pack obj to stream.
serializer.Pack(stream, obj)
' Unpack from stream.
Dim unpackedObject = serializer.Unpack(stream)
```

Expand Down
2 changes: 1 addition & 1 deletion src/CommonAssemblyInfo.Pack.cs
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@
// Build : Bug fixes and improvements, which does not break API contract, but may break some code depends on internal implementation behaviors.
// For example, some programs use reflection to retrieve private fields, analyse human readable exception messages or stack trace, or so.
// Revision : Not used. It might be used to indicate target platform.
[assembly: AssemblyInformationalVersion( "0.4.0" )]
[assembly: AssemblyInformationalVersion( "0.4.1" )]
1 change: 0 additions & 1 deletion src/MsgPack.Mono/MsgPack.Mono.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Numerics" />
<Reference Include="System.Runtime.Serialization" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\CommonAssemblyInfo.cs">
Expand Down
2 changes: 1 addition & 1 deletion src/MsgPack.Mono/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
[assembly: AssemblyCopyright( "Copyright © FUJIWARA, Yusuke 2010-2012" )]


[assembly: AssemblyFileVersion( "0.4.1297.568" )]
[assembly: AssemblyFileVersion( "0.4.1435.1085" )]

[assembly: SecurityRules( SecurityRuleSet.Level2, SkipVerificationInFullTrust = true )]
[assembly: AllowPartiallyTrustedCallers]
Expand Down
1 change: 0 additions & 1 deletion src/MsgPack.Net35/MsgPack.Net35.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Runtime.Serialization" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\CommonAssemblyInfo.cs">
Expand Down
2 changes: 1 addition & 1 deletion src/MsgPack.Net35/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
[assembly: AssemblyCopyright( "Copyright © FUJIWARA, Yusuke 2010-2013" )]


[assembly: AssemblyFileVersion( "0.4.1297.568" )]
[assembly: AssemblyFileVersion( "0.4.1435.1085" )]

[assembly: AllowPartiallyTrustedCallers]

Expand Down
73 changes: 72 additions & 1 deletion src/MsgPack.Net35/Tuple`n.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
//
// MessagePack for CLI
//
// Copyright (C) 2010-2012 FUJIWARA, Yusuke
// Copyright (C) 2010-2013 FUJIWARA, Yusuke
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -38,6 +38,11 @@ public static Tuple<T1, T2, T3, T4> Create<T1, T2, T3, T4>( T1 item1, T2 item2,
{
return new Tuple<T1, T2, T3, T4>( item1, item2, item3, item4 );
}

public static Tuple<T1, T2, T3, T4, T5> Create<T1, T2, T3, T4, T5>( T1 item1, T2 item2, T3 item3, T4 item4, T5 item5 )
{
return new Tuple<T1, T2, T3, T4, T5>( item1, item2, item3, item4, item5 );
}
}
#if !WINDOWS_PHONE
[Serializable]
Expand Down Expand Up @@ -131,4 +136,70 @@ public override string ToString()
return buffer.ToString();
}
}
#if !WINDOWS_PHONE
[Serializable]
#endif
internal class Tuple<T1, T2, T3, T4, T5>
{
private readonly T1 _item1;

public T1 Item1
{
get { return this._item1; }
}
private readonly T2 _item2;

public T2 Item2
{
get { return this._item2; }
}
private readonly T3 _item3;

public T3 Item3
{
get { return this._item3; }
}
private readonly T4 _item4;

public T4 Item4
{
get { return this._item4; }
}
private readonly T5 _item5;

public T5 Item5
{
get { return this._item5; }
}
public Tuple(
T1 item1,
T2 item2,
T3 item3,
T4 item4,
T5 item5
)
{
this._item1 = item1;
this._item2 = item2;
this._item3 = item3;
this._item4 = item4;
this._item5 = item5;
}

public override string ToString()
{
var buffer = new StringBuilder();
buffer.Append( '(' );
buffer.Append( this._item1 );
buffer.Append( ", " );
buffer.Append( this._item2 );
buffer.Append( ", " );
buffer.Append( this._item3 );
buffer.Append( ", " );
buffer.Append( this._item4 );
buffer.Append( ", " );
buffer.Append( this._item5 );
return buffer.ToString();
}
}
}
4 changes: 2 additions & 2 deletions src/MsgPack.Net35/Tuple`n.tt
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@
<#
// This file defines Tuple<...> for compatibility.
var __typeName = "Tuple";
var __arities = new []{ 2, 4 };
var __arities = new []{ 2, 4, 5 };
#>
#region -- License Terms --
//
// MessagePack for CLI
//
// Copyright (C) 2010-2012 FUJIWARA, Yusuke
// Copyright (C) 2010-2013 FUJIWARA, Yusuke
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@
<Reference Include="System.Numerics, Version=2.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private>
</Reference>
<Reference Include="System.Runtime.Serialization" />
<Reference Include="system" />
<Reference Include="System.Core" />
<Reference Include="System.Windows" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
[assembly: AssemblyCopyright( "Copyright © FUJIWARA, Yusuke 2010-2012" )]


[assembly: AssemblyFileVersion( "0.4.1297.568" )]
[assembly: AssemblyFileVersion( "0.4.1435.1085" )]

#if DEBUG || PERFORMANCE_TEST
[assembly: InternalsVisibleTo( "MsgPack.Silverlight.UnitTest, PublicKey=0024000004800000940000000602000000240000525341310004000001000100a967de8de9d45380b93a6aa56f64fc2cb2d3c9d4b400e00de01f31ba9e15cf5ca95926dbf8760cce413eabd711e23df0c133193a570da8a3bb1bdc00ef170fccb2bc033266fa5346442c9cf0b071133d5b484845eab17095652aeafeeb71193506b8294d9c8c91e3fd01cc50bdbc2d0eb78dd655bb8cd0bd3cdbbcb192549cb4" )]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@
<ItemGroup>
<Reference Include="mscorlib" />
<Reference Include="System.Numerics, Version=5.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Windows" />
<Reference Include="system" />
<Reference Include="System.Core" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
[assembly: AssemblyCopyright( "Copyright © FUJIWARA, Yusuke 2010-2012" )]


[assembly: AssemblyFileVersion( "0.4.1297.568" )]
[assembly: AssemblyFileVersion( "0.4.1435.1085" )]

#if DEBUG || PERFORMANCE_TEST
[assembly: InternalsVisibleTo( "MsgPack.Silverlight.UnitTest, PublicKey=0024000004800000940000000602000000240000525341310004000001000100a967de8de9d45380b93a6aa56f64fc2cb2d3c9d4b400e00de01f31ba9e15cf5ca95926dbf8760cce413eabd711e23df0c133193a570da8a3bb1bdc00ef170fccb2bc033266fa5346442c9cf0b071133d5b484845eab17095652aeafeeb71193506b8294d9c8c91e3fd01cc50bdbc2d0eb78dd655bb8cd0bd3cdbbcb192549cb4" )]
Expand Down
2 changes: 1 addition & 1 deletion src/MsgPack.Serialization.WinRT/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
[assembly: AssemblyCopyright( "Copyright © FUJIWARA, Yusuke 2010-2012" )]


[assembly: AssemblyFileVersion( "0.4.1297.568" )]
[assembly: AssemblyFileVersion( "0.4.1435.1085" )]

#if DEBUG || PERFORMANCE_TEST
[assembly: InternalsVisibleTo( "MsgPack.UnitTest, PublicKey=0024000004800000940000000602000000240000525341310004000001000100a967de8de9d45380b93a6aa56f64fc2cb2d3c9d4b400e00de01f31ba9e15cf5ca95926dbf8760cce413eabd711e23df0c133193a570da8a3bb1bdc00ef170fccb2bc033266fa5346442c9cf0b071133d5b484845eab17095652aeafeeb71193506b8294d9c8c91e3fd01cc50bdbc2d0eb78dd655bb8cd0bd3cdbbcb192549cb4" )]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
<DocumentationFile>..\..\bin\sl4-windowsphone71\MsgPack.Serialization.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Windows" />
<Reference Include="system" />
<Reference Include="System.Core" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
[assembly: AssemblyCopyright( "Copyright © FUJIWARA, Yusuke 2010-2012" )]


[assembly: AssemblyFileVersion( "0.4.1297.568" )]
[assembly: AssemblyFileVersion( "0.4.1435.1085" )]

#if DEBUG || PERFORMANCE_TEST
[assembly: InternalsVisibleTo( "MsgPack.WindowsPhone.UnitTest" )]
Expand Down
2 changes: 1 addition & 1 deletion src/MsgPack.Silverlight.4/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
[assembly: AssemblyCopyright( "Copyright © FUJIWARA, Yusuke 2010-2012" )]


[assembly: AssemblyFileVersion( "0.4.1297.568" )]
[assembly: AssemblyFileVersion( "0.4.1435.1085" )]

#if DEBUG || PERFORMANCE_TEST
[assembly: InternalsVisibleTo( "MsgPack.Silverlight.UnitTest, PublicKey=0024000004800000940000000602000000240000525341310004000001000100a967de8de9d45380b93a6aa56f64fc2cb2d3c9d4b400e00de01f31ba9e15cf5ca95926dbf8760cce413eabd711e23df0c133193a570da8a3bb1bdc00ef170fccb2bc033266fa5346442c9cf0b071133d5b484845eab17095652aeafeeb71193506b8294d9c8c91e3fd01cc50bdbc2d0eb78dd655bb8cd0bd3cdbbcb192549cb4" )]
Expand Down
2 changes: 1 addition & 1 deletion src/MsgPack.Silverlight.5/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
[assembly: AssemblyCopyright( "Copyright © FUJIWARA, Yusuke 2010-2012" )]


[assembly: AssemblyFileVersion( "0.4.1297.568" )]
[assembly: AssemblyFileVersion( "0.4.1435.1085" )]

#if DEBUG || PERFORMANCE_TEST
[assembly: InternalsVisibleTo( "MsgPack.Silverlight.UnitTest, PublicKey=0024000004800000940000000602000000240000525341310004000001000100a967de8de9d45380b93a6aa56f64fc2cb2d3c9d4b400e00de01f31ba9e15cf5ca95926dbf8760cce413eabd711e23df0c133193a570da8a3bb1bdc00ef170fccb2bc033266fa5346442c9cf0b071133d5b484845eab17095652aeafeeb71193506b8294d9c8c91e3fd01cc50bdbc2d0eb78dd655bb8cd0bd3cdbbcb192549cb4" )]
Expand Down
2 changes: 1 addition & 1 deletion src/MsgPack.WinRT/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
[assembly: AssemblyCopyright( "Copyright © FUJIWARA, Yusuke 2010-2012" )]


[assembly: AssemblyFileVersion( "0.4.1297.568" )]
[assembly: AssemblyFileVersion( "0.4.1435.1085" )]

#if DEBUG || PERFORMANCE_TEST
[assembly: InternalsVisibleTo( "MsgPack.UnitTest, PublicKey=0024000004800000940000000602000000240000525341310004000001000100a967de8de9d45380b93a6aa56f64fc2cb2d3c9d4b400e00de01f31ba9e15cf5ca95926dbf8760cce413eabd711e23df0c133193a570da8a3bb1bdc00ef170fccb2bc033266fa5346442c9cf0b071133d5b484845eab17095652aeafeeb71193506b8294d9c8c91e3fd01cc50bdbc2d0eb78dd655bb8cd0bd3cdbbcb192549cb4" )]
Expand Down
2 changes: 1 addition & 1 deletion src/MsgPack.WindowsPhone.7.1/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
[assembly: AssemblyCopyright( "Copyright © FUJIWARA, Yusuke 2010-2012" )]


[assembly: AssemblyFileVersion( "0.4.1297.568" )]
[assembly: AssemblyFileVersion( "0.4.1435.1085" )]

#if DEBUG || PERFORMANCE_TEST
[assembly: InternalsVisibleTo( "MsgPack.WindowsPhone.UnitTest" )]
Expand Down
1 change: 0 additions & 1 deletion src/MsgPack/MsgPack.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Numerics" />
<Reference Include="System.Runtime.Serialization" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\CommonAssemblyInfo.cs">
Expand Down
2 changes: 1 addition & 1 deletion src/MsgPack/PackerUnpackerExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ public static void PackObject( this Packer source, object value )

Contract.EndContractBlock();

PackObjectCore( source, value, new SerializationContext() );
PackObjectCore( source, value, SerializationContext.Default );
}

/// <summary>
Expand Down
2 changes: 1 addition & 1 deletion src/MsgPack/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
[assembly: AssemblyCopyright( "Copyright © FUJIWARA, Yusuke 2010-2012" )]


[assembly: AssemblyFileVersion( "0.4.1297.568" )]
[assembly: AssemblyFileVersion( "0.4.1435.1085" )]

[assembly: SecurityRules( SecurityRuleSet.Level2, SkipVerificationInFullTrust = true )]
[assembly: AllowPartiallyTrustedCallers]
Expand Down
Loading