Skip to content

Commit f59cdd1

Browse files
committed
Migrate and consolidate project.
1 parent c00d9b8 commit f59cdd1

12 files changed

Lines changed: 417 additions & 560 deletions

MsgPack.sln

Lines changed: 109 additions & 69 deletions
Large diffs are not rendered by default.

Sync.xml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,6 @@
3333
<Exclude Path="TupleItems.cs" />
3434
</Project>
3535

36-
<!-- TOOD: should be project.json -->
37-
<Project Name="MsgPack.Net45" Base="MsgPack">
38-
<Preserve Path="Properties\AssemblyInfo.cs" />
39-
<Exclude Path="Serialization\DefaultSerializers\SimdTypeSerializers.cs" />
40-
<Exclude Path="Serialization\DefaultSerializers\System_Security_Cryptography_HashAlgorithmNameMessagePackSerializer.cs" />
41-
<Exclude File="*.tt" />
42-
<Exclude File="*.ttinclude" />
43-
</Project>
44-
4536
<!-- TOOD: should be project.json -->
4637
<!-- .Uwp is testing purpose only, this is just .NET Native test target for .NET Standard 1.3 configuration -->
4738
<Project Name="MsgPack.Uwp" Base="MsgPack">

src/MsgPack.Unity.Full/MsgPack.Unity.Full.csproj

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@
3636
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'CodeAnalysis|AnyCPU'">
3737
<OutputPath>bin\CodeAnalysis\</OutputPath>
3838
<DefineConstants>TRACE;UNITY_IPHONE;MSGPACK_UNITY_FULL;AOT;CODE_ANALYSIS</DefineConstants>
39-
<DocumentationFile></DocumentationFile>
39+
<DocumentationFile>
40+
</DocumentationFile>
4041
<Optimize>true</Optimize>
4142
<NoWarn>3001,3002</NoWarn>
4243
<DebugType>pdbonly</DebugType>
@@ -163,6 +164,9 @@
163164
<Compile Include="..\MsgPack\MessageTypeException.cs">
164165
<Link>MessageTypeException.cs</Link>
165166
</Compile>
167+
<Compile Include="..\MsgPack\MPContract.cs">
168+
<Link>MPContract.cs</Link>
169+
</Compile>
166170
<Compile Include="..\MsgPack\Packer.cs">
167171
<Link>Packer.cs</Link>
168172
</Compile>
@@ -727,9 +731,6 @@
727731
<Compile Include="..\MsgPack\UnpackingStreamReader.cs">
728732
<Link>UnpackingStreamReader.cs</Link>
729733
</Compile>
730-
<Compile Include="..\netstandard\MPContract.cs">
731-
<Link>MPContract.cs</Link>
732-
</Compile>
733734
<Compile Include="CorLibOnlyHelper.cs">
734735
<AutoGen>True</AutoGen>
735736
<DesignTime>True</DesignTime>

src/MsgPack.Unity/MsgPack.Unity.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,9 @@
185185
<Compile Include="..\MsgPack\MessageTypeException.cs">
186186
<Link>MessageTypeException.cs</Link>
187187
</Compile>
188+
<Compile Include="..\MsgPack\MPContract.cs">
189+
<Link>MPContract.cs</Link>
190+
</Compile>
188191
<Compile Include="..\MsgPack\Packer.cs">
189192
<Link>Packer.cs</Link>
190193
</Compile>
@@ -737,9 +740,6 @@
737740
<Compile Include="..\MsgPack\UnpackingStreamReader.cs">
738741
<Link>UnpackingStreamReader.cs</Link>
739742
</Compile>
740-
<Compile Include="..\netstandard\MPContract.cs">
741-
<Link>MPContract.cs</Link>
742-
</Compile>
743743
<Compile Include="Properties\AssemblyInfo.cs" />
744744
</ItemGroup>
745745
<ItemGroup>

src/MsgPack/MsgPack.csproj

Lines changed: 263 additions & 461 deletions
Large diffs are not rendered by default.
File renamed without changes.

src/MsgPack/Properties/AssemblyInfo.cs

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#region -- License Terms --
1+
#region -- License Terms --
22
//
33
// MessagePack for CLI
44
//
@@ -23,12 +23,35 @@
2323
using System.Security;
2424

2525
[assembly: AssemblyTitle( "MessagePack for CLI(.NET/Mono)" )]
26-
[assembly: AssemblyDescription( "MessagePack for CLI(.NET/Mono) packing/unpacking library." )]
26+
[assembly: AssemblyDescription( "MessagePack for CLI(.NET/Mono) packing/unpacking library for" +
27+
#if NET4_5
28+
".NET Framework 4.5"
29+
#elif WINDOWS_UWP
30+
"UWP"
31+
#elif NETSTANDARD1_1
32+
".NET Standard 1.1"
33+
#elif NETSTANDARD1_3
34+
".NET Standard 1.3"
35+
#elif XAMARIN
36+
"Xamarin for " +
37+
#if __ANDROID__
38+
"Android"
39+
#elif __IOS__
40+
"iOS"
41+
#else
42+
#error Unexpected Xamarin!
43+
#endif // XAMARIN
44+
#else
45+
".NET Framework 4.6"
46+
#endif // NET4_5..
47+
)]
2748

28-
[assembly: AssemblyFileVersion( "0.7.2259.1047" )]
49+
[assembly: AssemblyFileVersion( "0.9.2259.1047" )]
2950

51+
#if !NETSTANDARD1_1 && !NETSTANDARD1_3
3052
[assembly: SecurityRules( SecurityRuleSet.Level2, SkipVerificationInFullTrust = true )]
3153
[assembly: AllowPartiallyTrustedCallers]
54+
#endif
3255

3356
#if DEBUG || PERFORMANCE_TEST
3457
[assembly: InternalsVisibleTo( "MsgPack.UnitTest, PublicKey=0024000004800000940000000602000000240000525341310004000001000100a967de8de9d45380b93a6aa56f64fc2cb2d3c9d4b400e00de01f31ba9e15cf5ca95926dbf8760cce413eabd711e23df0c133193a570da8a3bb1bdc00ef170fccb2bc033266fa5346442c9cf0b071133d5b484845eab17095652aeafeeb71193506b8294d9c8c91e3fd01cc50bdbc2d0eb78dd655bb8cd0bd3cdbbcb192549cb4" )]

src/MsgPack/Serialization/MessagePackSerializer.Factories.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,15 +210,15 @@ internal static MessagePackSerializer<T> CreateInternal<T>( SerializationContext
210210
Contract.Ensures( Contract.Result<MessagePackSerializer<T>>() != null );
211211
#endif // DEBUG
212212

213-
#if DEBUG && !AOT && !SILVERLIGHT
213+
#if DEBUG && !AOT && !SILVERLIGHT && !NETSTANDARD1_1
214214
SerializerDebugging.TraceEmitEvent(
215215
"SerializationContext::CreateInternal<{0}>(@{1}, {2})",
216216
typeof( T ),
217217
context.GetHashCode(),
218218
schema == null ? "null" : schema.DebugString
219219
);
220220

221-
#endif // DEBUG && !AOT && !SILVERLIGHT
221+
#endif // DEBUG && !AOT && !SILVERLIGHT && !NETSTANDARD1_1
222222
Type concreteType = null;
223223
CollectionTraits collectionTraits =
224224
#if AOT

0 commit comments

Comments
 (0)