diff --git a/.nuget/NuGet.exe b/.nuget/NuGet.exe index 31fc9885e..83ead7a4d 100644 Binary files a/.nuget/NuGet.exe and b/.nuget/NuGet.exe differ diff --git a/CHANGES.txt b/CHANGES.txt index 4fa25c988..578671459 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -701,3 +701,5 @@ Release 0.9.0 2017-8-26 * Fix enum serialization throws NullReferenceException in Unity. Issue #215. * Fix MessagePackSerializer.Capability does not work correctly in Unity. * Fix polymorphic serializer error in Unity. + +Release 1.0.0-beta1 T.B.D. diff --git a/Directory.Build.props b/Directory.Build.props new file mode 100644 index 000000000..06e5a5521 Binary files /dev/null and b/Directory.Build.props differ diff --git a/MsgPack.Common.props b/MsgPack.Common.props new file mode 100644 index 000000000..52327e45e --- /dev/null +++ b/MsgPack.Common.props @@ -0,0 +1,82 @@ + + + + Properties + MsgPack + TRACE + prompt + 4 + AnyCPU + false + $(SolutionDir)\src\MsgPack.snk + true + false + true + portable + + + true + false + bin\Debug\ + $(DefineConstants);DEBUG;SKIP_LARGE_TEST + + + true + bin\Release\ + + + bin\Instrument\ + true + true + true + + + bin\CodeAnalysis\ + true + false + false + + + false + + + $(OutputPath)\$(TargetFramework)\$(AssemblyName).XML + + + $(DefineConstants);FEATURE_TAP;FEATURE_CONCURRENT + + + $(DefineConstants);FEATURE_POINTER_CONVERSION + + + $(DefineConstants);FEATURE_TAP;FEATURE_CONCURRENT;FEATURE_POINTER_CONVERSION + + + $(DefineConstants);FEATURE_TAP;FEATURE_CONCURRENT;FEATURE_POINTER_CONVERSION;FEATURE_MEMCOPY + + + $(DefineConstants);FEATURE_TAP;FEATURE_CONCURRENT + + + $(DefineConstants);FEATURE_TAP;FEATURE_CONCURRENT;FEATURE_MEMCOPY + + + $(DefineConstants);FEATURE_TAP;FEATURE_CONCURRENT;FEATURE_POINTER_CONVERSION;FEATURE_MEMCOPY + + + $(DefineConstants);__MOBILE__;AOT;XAMARIN;FEATURE_TAP;FEATURE_CONCURRENT;FEATURE_POINTER_CONVERSION;FEATURE_MEMCOPY + + + $(DefineConstants);__ANDROID__ + $(VsInstallRoot)\Common7\IDE\ReferenceAssemblies\Microsoft\Framework\ + true + + + $(DefineConstants);__IOS__ + $(VsInstallRoot)\Common7\IDE\ReferenceAssemblies\Microsoft\Framework\ + true + + + $(DefineConstants);NETFX_CORE;WINDOWS_UWP;NETSTANDARD1_3;AOT + + \ No newline at end of file diff --git a/MsgPack.sln b/MsgPack.sln index afe4b62ab..a606c43e6 100644 --- a/MsgPack.sln +++ b/MsgPack.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.26403.0 +VisualStudioVersion = 15.0.26730.3 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "common", "common", "{60EC42E9-D79B-4ADF-8F80-4DCD580061FD}" ProjectSection(SolutionItems) = preProject @@ -18,35 +18,35 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{DB9CF5 .nuget\NuGet.targets = .nuget\NuGet.targets EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MsgPack.UnitTest", "test\MsgPack.UnitTest\MsgPack.UnitTest.csproj", "{3889C9BE-0473-4B41-80E8-C4C923E837E7}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MsgPack.UnitTest", "test\MsgPack.UnitTest\MsgPack.UnitTest.csproj", "{3889C9BE-0473-4B41-80E8-C4C923E837E7}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MsgPack.NUnitPortable", "test\MsgPack.NUnitPortable\MsgPack.NUnitPortable.csproj", "{FC521316-EBCD-4EF1-8235-C976B2A31EB0}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MsgPack.UnitTest.CodeDom", "test\MsgPack.UnitTest.CodeDom\MsgPack.UnitTest.CodeDom.csproj", "{23F8ABB1-F41A-4150-B5D5-9A7AA60E05D2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MsgPack.UnitTest.CodeDom", "test\MsgPack.UnitTest.CodeDom\MsgPack.UnitTest.CodeDom.csproj", "{23F8ABB1-F41A-4150-B5D5-9A7AA60E05D2}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MsgPack.UnitTest.BclExtensions", "test\MsgPack.UnitTest.BclExtensions\MsgPack.UnitTest.BclExtensions.csproj", "{DB3ED6D2-D27F-4E8F-AFE2-5503113216AC}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MsgPack.UnitTest.BclExtensions", "test\MsgPack.UnitTest.BclExtensions\MsgPack.UnitTest.BclExtensions.csproj", "{DB3ED6D2-D27F-4E8F-AFE2-5503113216AC}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{7D2D3DAB-6EB6-463D-B186-E875DA48DF9F}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples", "samples\Samples\Samples.csproj", "{7F8D9786-383D-4441-8A3A-5E305E26B965}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CLR", "CLR", "{AF25D7E8-2F55-4431-BCE1-7C3E3C0E74E1}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MultiPlatform", "MultiPlatform", "{AF25D7E8-2F55-4431-BCE1-7C3E3C0E74E1}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_common", "_common", "{EACF1BF1-CB21-4D62-942C-3488F60B8D70}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MsgPack", "src\MsgPack\MsgPack.csproj", "{5BCEC32E-990E-4DE5-945F-BD27326A7418}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Net35", "Net35", "{238C6067-E9DC-4270-90BD-39DCCF79C172}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MultiPlatform", "MultiPlatform", "{7D8FA6E5-A27C-4672-90ED-06033F030A66}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MsgPack.UnitTest.Net35", "test\MsgPack.UnitTest.Net35\MsgPack.UnitTest.Net35.csproj", "{B8BDEBCD-343C-42A9-8C17-C1318B42F011}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{2F623C70-7B64-490E-8605-D75D444CF065}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MsgPack.UnitTest.CodeDom.Net35", "test\MsgPack.UnitTest.CodeDom.Net35\MsgPack.UnitTest.CodeDom.Net35.csproj", "{2A8463C8-8E4B-44F6-AA58-D1232DF88438}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "mpu", "src\mpu\mpu.csproj", "{CB7C32CD-A8D8-44A4-A595-DF4303566C81}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CLR", "CLR", "{7D8FA6E5-A27C-4672-90ED-06033F030A66}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Net35", "Net35", "{F041F2B6-6692-4035-96A3-BB36742F5CCC}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{2F623C70-7B64-490E-8605-D75D444CF065}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MsgPack.UnitTest.CodeDom.Net35", "test\MsgPack.UnitTest.CodeDom.Net35\MsgPack.UnitTest.CodeDom.Net35.csproj", "{34FC29EA-8722-49CD-8D2A-CE170797F605}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mpu", "src\mpu\mpu.csproj", "{CB7C32CD-A8D8-44A4-A595-DF4303566C81}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MsgPack.UnitTest.Net35", "test\MsgPack.UnitTest.Net35\MsgPack.UnitTest.Net35.csproj", "{ED57FCBD-9917-4822-B969-EB5D98D7207B}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -77,11 +77,16 @@ Global Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {3889C9BE-0473-4B41-80E8-C4C923E837E7}.CodeAnalysis|Any CPU.ActiveCfg = CodeAnalysis|Any CPU - {3889C9BE-0473-4B41-80E8-C4C923E837E7}.CodeAnalysis|ARM.ActiveCfg = CodeAnalysis|Any CPU - {3889C9BE-0473-4B41-80E8-C4C923E837E7}.CodeAnalysis|Mixed Platforms.ActiveCfg = CodeAnalysis|Any CPU - {3889C9BE-0473-4B41-80E8-C4C923E837E7}.CodeAnalysis|x64.ActiveCfg = CodeAnalysis|Any CPU - {3889C9BE-0473-4B41-80E8-C4C923E837E7}.CodeAnalysis|x86.ActiveCfg = CodeAnalysis|Any CPU + {3889C9BE-0473-4B41-80E8-C4C923E837E7}.CodeAnalysis|Any CPU.ActiveCfg = Release|Any CPU + {3889C9BE-0473-4B41-80E8-C4C923E837E7}.CodeAnalysis|Any CPU.Build.0 = Release|Any CPU + {3889C9BE-0473-4B41-80E8-C4C923E837E7}.CodeAnalysis|ARM.ActiveCfg = Release|Any CPU + {3889C9BE-0473-4B41-80E8-C4C923E837E7}.CodeAnalysis|ARM.Build.0 = Release|Any CPU + {3889C9BE-0473-4B41-80E8-C4C923E837E7}.CodeAnalysis|Mixed Platforms.ActiveCfg = Release|Any CPU + {3889C9BE-0473-4B41-80E8-C4C923E837E7}.CodeAnalysis|Mixed Platforms.Build.0 = Release|Any CPU + {3889C9BE-0473-4B41-80E8-C4C923E837E7}.CodeAnalysis|x64.ActiveCfg = Release|Any CPU + {3889C9BE-0473-4B41-80E8-C4C923E837E7}.CodeAnalysis|x64.Build.0 = Release|Any CPU + {3889C9BE-0473-4B41-80E8-C4C923E837E7}.CodeAnalysis|x86.ActiveCfg = Release|Any CPU + {3889C9BE-0473-4B41-80E8-C4C923E837E7}.CodeAnalysis|x86.Build.0 = Release|Any CPU {3889C9BE-0473-4B41-80E8-C4C923E837E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3889C9BE-0473-4B41-80E8-C4C923E837E7}.Debug|Any CPU.Build.0 = Debug|Any CPU {3889C9BE-0473-4B41-80E8-C4C923E837E7}.Debug|ARM.ActiveCfg = Debug|Any CPU @@ -89,23 +94,26 @@ Global {3889C9BE-0473-4B41-80E8-C4C923E837E7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU {3889C9BE-0473-4B41-80E8-C4C923E837E7}.Debug|x64.ActiveCfg = Debug|Any CPU {3889C9BE-0473-4B41-80E8-C4C923E837E7}.Debug|x86.ActiveCfg = Debug|Any CPU - {3889C9BE-0473-4B41-80E8-C4C923E837E7}.Instrument|Any CPU.ActiveCfg = Instrument|Any CPU - {3889C9BE-0473-4B41-80E8-C4C923E837E7}.Instrument|Any CPU.Build.0 = Instrument|Any CPU - {3889C9BE-0473-4B41-80E8-C4C923E837E7}.Instrument|ARM.ActiveCfg = Instrument|Any CPU - {3889C9BE-0473-4B41-80E8-C4C923E837E7}.Instrument|ARM.Build.0 = Instrument|Any CPU - {3889C9BE-0473-4B41-80E8-C4C923E837E7}.Instrument|Mixed Platforms.ActiveCfg = Instrument|Any CPU - {3889C9BE-0473-4B41-80E8-C4C923E837E7}.Instrument|Mixed Platforms.Build.0 = Instrument|Any CPU - {3889C9BE-0473-4B41-80E8-C4C923E837E7}.Instrument|x64.ActiveCfg = Instrument|Any CPU - {3889C9BE-0473-4B41-80E8-C4C923E837E7}.Instrument|x64.Build.0 = Instrument|Any CPU - {3889C9BE-0473-4B41-80E8-C4C923E837E7}.Instrument|x86.ActiveCfg = Instrument|Any CPU - {3889C9BE-0473-4B41-80E8-C4C923E837E7}.Instrument|x86.Build.0 = Instrument|Any CPU - {3889C9BE-0473-4B41-80E8-C4C923E837E7}.PerformanceTest|Any CPU.ActiveCfg = PerformanceTest|Any CPU - {3889C9BE-0473-4B41-80E8-C4C923E837E7}.PerformanceTest|Any CPU.Build.0 = PerformanceTest|Any CPU - {3889C9BE-0473-4B41-80E8-C4C923E837E7}.PerformanceTest|ARM.ActiveCfg = PerformanceTest|Any CPU - {3889C9BE-0473-4B41-80E8-C4C923E837E7}.PerformanceTest|Mixed Platforms.ActiveCfg = PerformanceTest|Any CPU - {3889C9BE-0473-4B41-80E8-C4C923E837E7}.PerformanceTest|Mixed Platforms.Build.0 = PerformanceTest|Any CPU - {3889C9BE-0473-4B41-80E8-C4C923E837E7}.PerformanceTest|x64.ActiveCfg = PerformanceTest|Any CPU - {3889C9BE-0473-4B41-80E8-C4C923E837E7}.PerformanceTest|x86.ActiveCfg = PerformanceTest|Any CPU + {3889C9BE-0473-4B41-80E8-C4C923E837E7}.Instrument|Any CPU.ActiveCfg = Release|Any CPU + {3889C9BE-0473-4B41-80E8-C4C923E837E7}.Instrument|Any CPU.Build.0 = Release|Any CPU + {3889C9BE-0473-4B41-80E8-C4C923E837E7}.Instrument|ARM.ActiveCfg = Release|Any CPU + {3889C9BE-0473-4B41-80E8-C4C923E837E7}.Instrument|ARM.Build.0 = Release|Any CPU + {3889C9BE-0473-4B41-80E8-C4C923E837E7}.Instrument|Mixed Platforms.ActiveCfg = Release|Any CPU + {3889C9BE-0473-4B41-80E8-C4C923E837E7}.Instrument|Mixed Platforms.Build.0 = Release|Any CPU + {3889C9BE-0473-4B41-80E8-C4C923E837E7}.Instrument|x64.ActiveCfg = Release|Any CPU + {3889C9BE-0473-4B41-80E8-C4C923E837E7}.Instrument|x64.Build.0 = Release|Any CPU + {3889C9BE-0473-4B41-80E8-C4C923E837E7}.Instrument|x86.ActiveCfg = Release|Any CPU + {3889C9BE-0473-4B41-80E8-C4C923E837E7}.Instrument|x86.Build.0 = Release|Any CPU + {3889C9BE-0473-4B41-80E8-C4C923E837E7}.PerformanceTest|Any CPU.ActiveCfg = Release|Any CPU + {3889C9BE-0473-4B41-80E8-C4C923E837E7}.PerformanceTest|Any CPU.Build.0 = Release|Any CPU + {3889C9BE-0473-4B41-80E8-C4C923E837E7}.PerformanceTest|ARM.ActiveCfg = Release|Any CPU + {3889C9BE-0473-4B41-80E8-C4C923E837E7}.PerformanceTest|ARM.Build.0 = Release|Any CPU + {3889C9BE-0473-4B41-80E8-C4C923E837E7}.PerformanceTest|Mixed Platforms.ActiveCfg = Release|Any CPU + {3889C9BE-0473-4B41-80E8-C4C923E837E7}.PerformanceTest|Mixed Platforms.Build.0 = Release|Any CPU + {3889C9BE-0473-4B41-80E8-C4C923E837E7}.PerformanceTest|x64.ActiveCfg = Release|Any CPU + {3889C9BE-0473-4B41-80E8-C4C923E837E7}.PerformanceTest|x64.Build.0 = Release|Any CPU + {3889C9BE-0473-4B41-80E8-C4C923E837E7}.PerformanceTest|x86.ActiveCfg = Release|Any CPU + {3889C9BE-0473-4B41-80E8-C4C923E837E7}.PerformanceTest|x86.Build.0 = Release|Any CPU {3889C9BE-0473-4B41-80E8-C4C923E837E7}.Release|Any CPU.ActiveCfg = Release|Any CPU {3889C9BE-0473-4B41-80E8-C4C923E837E7}.Release|ARM.ActiveCfg = Release|Any CPU {3889C9BE-0473-4B41-80E8-C4C923E837E7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU @@ -239,16 +247,16 @@ Global {7F8D9786-383D-4441-8A3A-5E305E26B965}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {7F8D9786-383D-4441-8A3A-5E305E26B965}.Release|x64.ActiveCfg = Release|Any CPU {7F8D9786-383D-4441-8A3A-5E305E26B965}.Release|x86.ActiveCfg = Release|Any CPU - {5BCEC32E-990E-4DE5-945F-BD27326A7418}.CodeAnalysis|Any CPU.ActiveCfg = CodeAnalysis|Any CPU - {5BCEC32E-990E-4DE5-945F-BD27326A7418}.CodeAnalysis|Any CPU.Build.0 = CodeAnalysis|Any CPU - {5BCEC32E-990E-4DE5-945F-BD27326A7418}.CodeAnalysis|ARM.ActiveCfg = CodeAnalysis|Any CPU - {5BCEC32E-990E-4DE5-945F-BD27326A7418}.CodeAnalysis|ARM.Build.0 = CodeAnalysis|Any CPU - {5BCEC32E-990E-4DE5-945F-BD27326A7418}.CodeAnalysis|Mixed Platforms.ActiveCfg = CodeAnalysis|Any CPU - {5BCEC32E-990E-4DE5-945F-BD27326A7418}.CodeAnalysis|Mixed Platforms.Build.0 = CodeAnalysis|Any CPU - {5BCEC32E-990E-4DE5-945F-BD27326A7418}.CodeAnalysis|x64.ActiveCfg = CodeAnalysis|Any CPU - {5BCEC32E-990E-4DE5-945F-BD27326A7418}.CodeAnalysis|x64.Build.0 = CodeAnalysis|Any CPU - {5BCEC32E-990E-4DE5-945F-BD27326A7418}.CodeAnalysis|x86.ActiveCfg = CodeAnalysis|Any CPU - {5BCEC32E-990E-4DE5-945F-BD27326A7418}.CodeAnalysis|x86.Build.0 = CodeAnalysis|Any CPU + {5BCEC32E-990E-4DE5-945F-BD27326A7418}.CodeAnalysis|Any CPU.ActiveCfg = Release|Any CPU + {5BCEC32E-990E-4DE5-945F-BD27326A7418}.CodeAnalysis|Any CPU.Build.0 = Release|Any CPU + {5BCEC32E-990E-4DE5-945F-BD27326A7418}.CodeAnalysis|ARM.ActiveCfg = Release|Any CPU + {5BCEC32E-990E-4DE5-945F-BD27326A7418}.CodeAnalysis|ARM.Build.0 = Release|Any CPU + {5BCEC32E-990E-4DE5-945F-BD27326A7418}.CodeAnalysis|Mixed Platforms.ActiveCfg = Release|Any CPU + {5BCEC32E-990E-4DE5-945F-BD27326A7418}.CodeAnalysis|Mixed Platforms.Build.0 = Release|Any CPU + {5BCEC32E-990E-4DE5-945F-BD27326A7418}.CodeAnalysis|x64.ActiveCfg = Release|Any CPU + {5BCEC32E-990E-4DE5-945F-BD27326A7418}.CodeAnalysis|x64.Build.0 = Release|Any CPU + {5BCEC32E-990E-4DE5-945F-BD27326A7418}.CodeAnalysis|x86.ActiveCfg = Release|Any CPU + {5BCEC32E-990E-4DE5-945F-BD27326A7418}.CodeAnalysis|x86.Build.0 = Release|Any CPU {5BCEC32E-990E-4DE5-945F-BD27326A7418}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {5BCEC32E-990E-4DE5-945F-BD27326A7418}.Debug|Any CPU.Build.0 = Debug|Any CPU {5BCEC32E-990E-4DE5-945F-BD27326A7418}.Debug|ARM.ActiveCfg = Debug|Any CPU @@ -259,26 +267,26 @@ Global {5BCEC32E-990E-4DE5-945F-BD27326A7418}.Debug|x64.Build.0 = Debug|Any CPU {5BCEC32E-990E-4DE5-945F-BD27326A7418}.Debug|x86.ActiveCfg = Debug|Any CPU {5BCEC32E-990E-4DE5-945F-BD27326A7418}.Debug|x86.Build.0 = Debug|Any CPU - {5BCEC32E-990E-4DE5-945F-BD27326A7418}.Instrument|Any CPU.ActiveCfg = Instrument|Any CPU - {5BCEC32E-990E-4DE5-945F-BD27326A7418}.Instrument|Any CPU.Build.0 = Instrument|Any CPU - {5BCEC32E-990E-4DE5-945F-BD27326A7418}.Instrument|ARM.ActiveCfg = Instrument|Any CPU - {5BCEC32E-990E-4DE5-945F-BD27326A7418}.Instrument|ARM.Build.0 = Instrument|Any CPU - {5BCEC32E-990E-4DE5-945F-BD27326A7418}.Instrument|Mixed Platforms.ActiveCfg = Instrument|Any CPU - {5BCEC32E-990E-4DE5-945F-BD27326A7418}.Instrument|Mixed Platforms.Build.0 = Instrument|Any CPU - {5BCEC32E-990E-4DE5-945F-BD27326A7418}.Instrument|x64.ActiveCfg = Instrument|Any CPU - {5BCEC32E-990E-4DE5-945F-BD27326A7418}.Instrument|x64.Build.0 = Instrument|Any CPU - {5BCEC32E-990E-4DE5-945F-BD27326A7418}.Instrument|x86.ActiveCfg = Instrument|Any CPU - {5BCEC32E-990E-4DE5-945F-BD27326A7418}.Instrument|x86.Build.0 = Instrument|Any CPU - {5BCEC32E-990E-4DE5-945F-BD27326A7418}.PerformanceTest|Any CPU.ActiveCfg = PerformanceTest|Any CPU - {5BCEC32E-990E-4DE5-945F-BD27326A7418}.PerformanceTest|Any CPU.Build.0 = PerformanceTest|Any CPU - {5BCEC32E-990E-4DE5-945F-BD27326A7418}.PerformanceTest|ARM.ActiveCfg = PerformanceTest|Any CPU - {5BCEC32E-990E-4DE5-945F-BD27326A7418}.PerformanceTest|ARM.Build.0 = PerformanceTest|Any CPU - {5BCEC32E-990E-4DE5-945F-BD27326A7418}.PerformanceTest|Mixed Platforms.ActiveCfg = PerformanceTest|Any CPU - {5BCEC32E-990E-4DE5-945F-BD27326A7418}.PerformanceTest|Mixed Platforms.Build.0 = PerformanceTest|Any CPU - {5BCEC32E-990E-4DE5-945F-BD27326A7418}.PerformanceTest|x64.ActiveCfg = PerformanceTest|Any CPU - {5BCEC32E-990E-4DE5-945F-BD27326A7418}.PerformanceTest|x64.Build.0 = PerformanceTest|Any CPU - {5BCEC32E-990E-4DE5-945F-BD27326A7418}.PerformanceTest|x86.ActiveCfg = PerformanceTest|Any CPU - {5BCEC32E-990E-4DE5-945F-BD27326A7418}.PerformanceTest|x86.Build.0 = PerformanceTest|Any CPU + {5BCEC32E-990E-4DE5-945F-BD27326A7418}.Instrument|Any CPU.ActiveCfg = Release|Any CPU + {5BCEC32E-990E-4DE5-945F-BD27326A7418}.Instrument|Any CPU.Build.0 = Release|Any CPU + {5BCEC32E-990E-4DE5-945F-BD27326A7418}.Instrument|ARM.ActiveCfg = Release|Any CPU + {5BCEC32E-990E-4DE5-945F-BD27326A7418}.Instrument|ARM.Build.0 = Release|Any CPU + {5BCEC32E-990E-4DE5-945F-BD27326A7418}.Instrument|Mixed Platforms.ActiveCfg = Release|Any CPU + {5BCEC32E-990E-4DE5-945F-BD27326A7418}.Instrument|Mixed Platforms.Build.0 = Release|Any CPU + {5BCEC32E-990E-4DE5-945F-BD27326A7418}.Instrument|x64.ActiveCfg = Release|Any CPU + {5BCEC32E-990E-4DE5-945F-BD27326A7418}.Instrument|x64.Build.0 = Release|Any CPU + {5BCEC32E-990E-4DE5-945F-BD27326A7418}.Instrument|x86.ActiveCfg = Release|Any CPU + {5BCEC32E-990E-4DE5-945F-BD27326A7418}.Instrument|x86.Build.0 = Release|Any CPU + {5BCEC32E-990E-4DE5-945F-BD27326A7418}.PerformanceTest|Any CPU.ActiveCfg = Release|Any CPU + {5BCEC32E-990E-4DE5-945F-BD27326A7418}.PerformanceTest|Any CPU.Build.0 = Release|Any CPU + {5BCEC32E-990E-4DE5-945F-BD27326A7418}.PerformanceTest|ARM.ActiveCfg = Release|Any CPU + {5BCEC32E-990E-4DE5-945F-BD27326A7418}.PerformanceTest|ARM.Build.0 = Release|Any CPU + {5BCEC32E-990E-4DE5-945F-BD27326A7418}.PerformanceTest|Mixed Platforms.ActiveCfg = Release|Any CPU + {5BCEC32E-990E-4DE5-945F-BD27326A7418}.PerformanceTest|Mixed Platforms.Build.0 = Release|Any CPU + {5BCEC32E-990E-4DE5-945F-BD27326A7418}.PerformanceTest|x64.ActiveCfg = Release|Any CPU + {5BCEC32E-990E-4DE5-945F-BD27326A7418}.PerformanceTest|x64.Build.0 = Release|Any CPU + {5BCEC32E-990E-4DE5-945F-BD27326A7418}.PerformanceTest|x86.ActiveCfg = Release|Any CPU + {5BCEC32E-990E-4DE5-945F-BD27326A7418}.PerformanceTest|x86.Build.0 = Release|Any CPU {5BCEC32E-990E-4DE5-945F-BD27326A7418}.Release|Any CPU.ActiveCfg = Release|Any CPU {5BCEC32E-990E-4DE5-945F-BD27326A7418}.Release|Any CPU.Build.0 = Release|Any CPU {5BCEC32E-990E-4DE5-945F-BD27326A7418}.Release|ARM.ActiveCfg = Release|Any CPU @@ -289,102 +297,6 @@ Global {5BCEC32E-990E-4DE5-945F-BD27326A7418}.Release|x64.Build.0 = Release|Any CPU {5BCEC32E-990E-4DE5-945F-BD27326A7418}.Release|x86.ActiveCfg = Release|Any CPU {5BCEC32E-990E-4DE5-945F-BD27326A7418}.Release|x86.Build.0 = Release|Any CPU - {B8BDEBCD-343C-42A9-8C17-C1318B42F011}.CodeAnalysis|Any CPU.ActiveCfg = Release|Any CPU - {B8BDEBCD-343C-42A9-8C17-C1318B42F011}.CodeAnalysis|Any CPU.Build.0 = Release|Any CPU - {B8BDEBCD-343C-42A9-8C17-C1318B42F011}.CodeAnalysis|ARM.ActiveCfg = Release|Any CPU - {B8BDEBCD-343C-42A9-8C17-C1318B42F011}.CodeAnalysis|ARM.Build.0 = Release|Any CPU - {B8BDEBCD-343C-42A9-8C17-C1318B42F011}.CodeAnalysis|Mixed Platforms.ActiveCfg = Release|Any CPU - {B8BDEBCD-343C-42A9-8C17-C1318B42F011}.CodeAnalysis|x64.ActiveCfg = Release|Any CPU - {B8BDEBCD-343C-42A9-8C17-C1318B42F011}.CodeAnalysis|x64.Build.0 = Release|Any CPU - {B8BDEBCD-343C-42A9-8C17-C1318B42F011}.CodeAnalysis|x86.ActiveCfg = Release|Any CPU - {B8BDEBCD-343C-42A9-8C17-C1318B42F011}.CodeAnalysis|x86.Build.0 = Release|Any CPU - {B8BDEBCD-343C-42A9-8C17-C1318B42F011}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B8BDEBCD-343C-42A9-8C17-C1318B42F011}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B8BDEBCD-343C-42A9-8C17-C1318B42F011}.Debug|ARM.ActiveCfg = Debug|Any CPU - {B8BDEBCD-343C-42A9-8C17-C1318B42F011}.Debug|ARM.Build.0 = Debug|Any CPU - {B8BDEBCD-343C-42A9-8C17-C1318B42F011}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {B8BDEBCD-343C-42A9-8C17-C1318B42F011}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {B8BDEBCD-343C-42A9-8C17-C1318B42F011}.Debug|x64.ActiveCfg = Debug|Any CPU - {B8BDEBCD-343C-42A9-8C17-C1318B42F011}.Debug|x64.Build.0 = Debug|Any CPU - {B8BDEBCD-343C-42A9-8C17-C1318B42F011}.Debug|x86.ActiveCfg = Debug|Any CPU - {B8BDEBCD-343C-42A9-8C17-C1318B42F011}.Debug|x86.Build.0 = Debug|Any CPU - {B8BDEBCD-343C-42A9-8C17-C1318B42F011}.Instrument|Any CPU.ActiveCfg = Release|Any CPU - {B8BDEBCD-343C-42A9-8C17-C1318B42F011}.Instrument|Any CPU.Build.0 = Release|Any CPU - {B8BDEBCD-343C-42A9-8C17-C1318B42F011}.Instrument|ARM.ActiveCfg = Release|Any CPU - {B8BDEBCD-343C-42A9-8C17-C1318B42F011}.Instrument|ARM.Build.0 = Release|Any CPU - {B8BDEBCD-343C-42A9-8C17-C1318B42F011}.Instrument|Mixed Platforms.ActiveCfg = Release|Any CPU - {B8BDEBCD-343C-42A9-8C17-C1318B42F011}.Instrument|Mixed Platforms.Build.0 = Release|Any CPU - {B8BDEBCD-343C-42A9-8C17-C1318B42F011}.Instrument|x64.ActiveCfg = Release|Any CPU - {B8BDEBCD-343C-42A9-8C17-C1318B42F011}.Instrument|x64.Build.0 = Release|Any CPU - {B8BDEBCD-343C-42A9-8C17-C1318B42F011}.Instrument|x86.ActiveCfg = Release|Any CPU - {B8BDEBCD-343C-42A9-8C17-C1318B42F011}.Instrument|x86.Build.0 = Release|Any CPU - {B8BDEBCD-343C-42A9-8C17-C1318B42F011}.PerformanceTest|Any CPU.ActiveCfg = Release|Any CPU - {B8BDEBCD-343C-42A9-8C17-C1318B42F011}.PerformanceTest|Any CPU.Build.0 = Release|Any CPU - {B8BDEBCD-343C-42A9-8C17-C1318B42F011}.PerformanceTest|ARM.ActiveCfg = Release|Any CPU - {B8BDEBCD-343C-42A9-8C17-C1318B42F011}.PerformanceTest|ARM.Build.0 = Release|Any CPU - {B8BDEBCD-343C-42A9-8C17-C1318B42F011}.PerformanceTest|Mixed Platforms.ActiveCfg = Release|Any CPU - {B8BDEBCD-343C-42A9-8C17-C1318B42F011}.PerformanceTest|Mixed Platforms.Build.0 = Release|Any CPU - {B8BDEBCD-343C-42A9-8C17-C1318B42F011}.PerformanceTest|x64.ActiveCfg = Release|Any CPU - {B8BDEBCD-343C-42A9-8C17-C1318B42F011}.PerformanceTest|x64.Build.0 = Release|Any CPU - {B8BDEBCD-343C-42A9-8C17-C1318B42F011}.PerformanceTest|x86.ActiveCfg = Release|Any CPU - {B8BDEBCD-343C-42A9-8C17-C1318B42F011}.PerformanceTest|x86.Build.0 = Release|Any CPU - {B8BDEBCD-343C-42A9-8C17-C1318B42F011}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B8BDEBCD-343C-42A9-8C17-C1318B42F011}.Release|Any CPU.Build.0 = Release|Any CPU - {B8BDEBCD-343C-42A9-8C17-C1318B42F011}.Release|ARM.ActiveCfg = Release|Any CPU - {B8BDEBCD-343C-42A9-8C17-C1318B42F011}.Release|ARM.Build.0 = Release|Any CPU - {B8BDEBCD-343C-42A9-8C17-C1318B42F011}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {B8BDEBCD-343C-42A9-8C17-C1318B42F011}.Release|x64.ActiveCfg = Release|Any CPU - {B8BDEBCD-343C-42A9-8C17-C1318B42F011}.Release|x64.Build.0 = Release|Any CPU - {B8BDEBCD-343C-42A9-8C17-C1318B42F011}.Release|x86.ActiveCfg = Release|Any CPU - {B8BDEBCD-343C-42A9-8C17-C1318B42F011}.Release|x86.Build.0 = Release|Any CPU - {2A8463C8-8E4B-44F6-AA58-D1232DF88438}.CodeAnalysis|Any CPU.ActiveCfg = Release|Any CPU - {2A8463C8-8E4B-44F6-AA58-D1232DF88438}.CodeAnalysis|Any CPU.Build.0 = Release|Any CPU - {2A8463C8-8E4B-44F6-AA58-D1232DF88438}.CodeAnalysis|ARM.ActiveCfg = Release|Any CPU - {2A8463C8-8E4B-44F6-AA58-D1232DF88438}.CodeAnalysis|ARM.Build.0 = Release|Any CPU - {2A8463C8-8E4B-44F6-AA58-D1232DF88438}.CodeAnalysis|Mixed Platforms.ActiveCfg = Release|Any CPU - {2A8463C8-8E4B-44F6-AA58-D1232DF88438}.CodeAnalysis|x64.ActiveCfg = Release|Any CPU - {2A8463C8-8E4B-44F6-AA58-D1232DF88438}.CodeAnalysis|x64.Build.0 = Release|Any CPU - {2A8463C8-8E4B-44F6-AA58-D1232DF88438}.CodeAnalysis|x86.ActiveCfg = Release|Any CPU - {2A8463C8-8E4B-44F6-AA58-D1232DF88438}.CodeAnalysis|x86.Build.0 = Release|Any CPU - {2A8463C8-8E4B-44F6-AA58-D1232DF88438}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2A8463C8-8E4B-44F6-AA58-D1232DF88438}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2A8463C8-8E4B-44F6-AA58-D1232DF88438}.Debug|ARM.ActiveCfg = Debug|Any CPU - {2A8463C8-8E4B-44F6-AA58-D1232DF88438}.Debug|ARM.Build.0 = Debug|Any CPU - {2A8463C8-8E4B-44F6-AA58-D1232DF88438}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {2A8463C8-8E4B-44F6-AA58-D1232DF88438}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {2A8463C8-8E4B-44F6-AA58-D1232DF88438}.Debug|x64.ActiveCfg = Debug|Any CPU - {2A8463C8-8E4B-44F6-AA58-D1232DF88438}.Debug|x64.Build.0 = Debug|Any CPU - {2A8463C8-8E4B-44F6-AA58-D1232DF88438}.Debug|x86.ActiveCfg = Debug|Any CPU - {2A8463C8-8E4B-44F6-AA58-D1232DF88438}.Debug|x86.Build.0 = Debug|Any CPU - {2A8463C8-8E4B-44F6-AA58-D1232DF88438}.Instrument|Any CPU.ActiveCfg = Release|Any CPU - {2A8463C8-8E4B-44F6-AA58-D1232DF88438}.Instrument|Any CPU.Build.0 = Release|Any CPU - {2A8463C8-8E4B-44F6-AA58-D1232DF88438}.Instrument|ARM.ActiveCfg = Release|Any CPU - {2A8463C8-8E4B-44F6-AA58-D1232DF88438}.Instrument|ARM.Build.0 = Release|Any CPU - {2A8463C8-8E4B-44F6-AA58-D1232DF88438}.Instrument|Mixed Platforms.ActiveCfg = Release|Any CPU - {2A8463C8-8E4B-44F6-AA58-D1232DF88438}.Instrument|Mixed Platforms.Build.0 = Release|Any CPU - {2A8463C8-8E4B-44F6-AA58-D1232DF88438}.Instrument|x64.ActiveCfg = Release|Any CPU - {2A8463C8-8E4B-44F6-AA58-D1232DF88438}.Instrument|x64.Build.0 = Release|Any CPU - {2A8463C8-8E4B-44F6-AA58-D1232DF88438}.Instrument|x86.ActiveCfg = Release|Any CPU - {2A8463C8-8E4B-44F6-AA58-D1232DF88438}.Instrument|x86.Build.0 = Release|Any CPU - {2A8463C8-8E4B-44F6-AA58-D1232DF88438}.PerformanceTest|Any CPU.ActiveCfg = Release|Any CPU - {2A8463C8-8E4B-44F6-AA58-D1232DF88438}.PerformanceTest|Any CPU.Build.0 = Release|Any CPU - {2A8463C8-8E4B-44F6-AA58-D1232DF88438}.PerformanceTest|ARM.ActiveCfg = Release|Any CPU - {2A8463C8-8E4B-44F6-AA58-D1232DF88438}.PerformanceTest|ARM.Build.0 = Release|Any CPU - {2A8463C8-8E4B-44F6-AA58-D1232DF88438}.PerformanceTest|Mixed Platforms.ActiveCfg = Release|Any CPU - {2A8463C8-8E4B-44F6-AA58-D1232DF88438}.PerformanceTest|Mixed Platforms.Build.0 = Release|Any CPU - {2A8463C8-8E4B-44F6-AA58-D1232DF88438}.PerformanceTest|x64.ActiveCfg = Release|Any CPU - {2A8463C8-8E4B-44F6-AA58-D1232DF88438}.PerformanceTest|x64.Build.0 = Release|Any CPU - {2A8463C8-8E4B-44F6-AA58-D1232DF88438}.PerformanceTest|x86.ActiveCfg = Release|Any CPU - {2A8463C8-8E4B-44F6-AA58-D1232DF88438}.PerformanceTest|x86.Build.0 = Release|Any CPU - {2A8463C8-8E4B-44F6-AA58-D1232DF88438}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2A8463C8-8E4B-44F6-AA58-D1232DF88438}.Release|Any CPU.Build.0 = Release|Any CPU - {2A8463C8-8E4B-44F6-AA58-D1232DF88438}.Release|ARM.ActiveCfg = Release|Any CPU - {2A8463C8-8E4B-44F6-AA58-D1232DF88438}.Release|ARM.Build.0 = Release|Any CPU - {2A8463C8-8E4B-44F6-AA58-D1232DF88438}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {2A8463C8-8E4B-44F6-AA58-D1232DF88438}.Release|x64.ActiveCfg = Release|Any CPU - {2A8463C8-8E4B-44F6-AA58-D1232DF88438}.Release|x64.Build.0 = Release|Any CPU - {2A8463C8-8E4B-44F6-AA58-D1232DF88438}.Release|x86.ActiveCfg = Release|Any CPU - {2A8463C8-8E4B-44F6-AA58-D1232DF88438}.Release|x86.Build.0 = Release|Any CPU {CB7C32CD-A8D8-44A4-A595-DF4303566C81}.CodeAnalysis|Any CPU.ActiveCfg = Release|Any CPU {CB7C32CD-A8D8-44A4-A595-DF4303566C81}.CodeAnalysis|Any CPU.Build.0 = Release|Any CPU {CB7C32CD-A8D8-44A4-A595-DF4303566C81}.CodeAnalysis|ARM.ActiveCfg = Release|Any CPU @@ -435,6 +347,104 @@ Global {CB7C32CD-A8D8-44A4-A595-DF4303566C81}.Release|x64.Build.0 = Release|Any CPU {CB7C32CD-A8D8-44A4-A595-DF4303566C81}.Release|x86.ActiveCfg = Release|Any CPU {CB7C32CD-A8D8-44A4-A595-DF4303566C81}.Release|x86.Build.0 = Release|Any CPU + {34FC29EA-8722-49CD-8D2A-CE170797F605}.CodeAnalysis|Any CPU.ActiveCfg = Release|Any CPU + {34FC29EA-8722-49CD-8D2A-CE170797F605}.CodeAnalysis|Any CPU.Build.0 = Release|Any CPU + {34FC29EA-8722-49CD-8D2A-CE170797F605}.CodeAnalysis|ARM.ActiveCfg = Release|Any CPU + {34FC29EA-8722-49CD-8D2A-CE170797F605}.CodeAnalysis|ARM.Build.0 = Release|Any CPU + {34FC29EA-8722-49CD-8D2A-CE170797F605}.CodeAnalysis|Mixed Platforms.ActiveCfg = Release|Any CPU + {34FC29EA-8722-49CD-8D2A-CE170797F605}.CodeAnalysis|Mixed Platforms.Build.0 = Release|Any CPU + {34FC29EA-8722-49CD-8D2A-CE170797F605}.CodeAnalysis|x64.ActiveCfg = Release|Any CPU + {34FC29EA-8722-49CD-8D2A-CE170797F605}.CodeAnalysis|x64.Build.0 = Release|Any CPU + {34FC29EA-8722-49CD-8D2A-CE170797F605}.CodeAnalysis|x86.ActiveCfg = Release|Any CPU + {34FC29EA-8722-49CD-8D2A-CE170797F605}.CodeAnalysis|x86.Build.0 = Release|Any CPU + {34FC29EA-8722-49CD-8D2A-CE170797F605}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {34FC29EA-8722-49CD-8D2A-CE170797F605}.Debug|Any CPU.Build.0 = Debug|Any CPU + {34FC29EA-8722-49CD-8D2A-CE170797F605}.Debug|ARM.ActiveCfg = Debug|Any CPU + {34FC29EA-8722-49CD-8D2A-CE170797F605}.Debug|ARM.Build.0 = Debug|Any CPU + {34FC29EA-8722-49CD-8D2A-CE170797F605}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {34FC29EA-8722-49CD-8D2A-CE170797F605}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {34FC29EA-8722-49CD-8D2A-CE170797F605}.Debug|x64.ActiveCfg = Debug|Any CPU + {34FC29EA-8722-49CD-8D2A-CE170797F605}.Debug|x64.Build.0 = Debug|Any CPU + {34FC29EA-8722-49CD-8D2A-CE170797F605}.Debug|x86.ActiveCfg = Debug|Any CPU + {34FC29EA-8722-49CD-8D2A-CE170797F605}.Debug|x86.Build.0 = Debug|Any CPU + {34FC29EA-8722-49CD-8D2A-CE170797F605}.Instrument|Any CPU.ActiveCfg = Release|Any CPU + {34FC29EA-8722-49CD-8D2A-CE170797F605}.Instrument|Any CPU.Build.0 = Release|Any CPU + {34FC29EA-8722-49CD-8D2A-CE170797F605}.Instrument|ARM.ActiveCfg = Release|Any CPU + {34FC29EA-8722-49CD-8D2A-CE170797F605}.Instrument|ARM.Build.0 = Release|Any CPU + {34FC29EA-8722-49CD-8D2A-CE170797F605}.Instrument|Mixed Platforms.ActiveCfg = Release|Any CPU + {34FC29EA-8722-49CD-8D2A-CE170797F605}.Instrument|Mixed Platforms.Build.0 = Release|Any CPU + {34FC29EA-8722-49CD-8D2A-CE170797F605}.Instrument|x64.ActiveCfg = Release|Any CPU + {34FC29EA-8722-49CD-8D2A-CE170797F605}.Instrument|x64.Build.0 = Release|Any CPU + {34FC29EA-8722-49CD-8D2A-CE170797F605}.Instrument|x86.ActiveCfg = Release|Any CPU + {34FC29EA-8722-49CD-8D2A-CE170797F605}.Instrument|x86.Build.0 = Release|Any CPU + {34FC29EA-8722-49CD-8D2A-CE170797F605}.PerformanceTest|Any CPU.ActiveCfg = Release|Any CPU + {34FC29EA-8722-49CD-8D2A-CE170797F605}.PerformanceTest|Any CPU.Build.0 = Release|Any CPU + {34FC29EA-8722-49CD-8D2A-CE170797F605}.PerformanceTest|ARM.ActiveCfg = Release|Any CPU + {34FC29EA-8722-49CD-8D2A-CE170797F605}.PerformanceTest|ARM.Build.0 = Release|Any CPU + {34FC29EA-8722-49CD-8D2A-CE170797F605}.PerformanceTest|Mixed Platforms.ActiveCfg = Release|Any CPU + {34FC29EA-8722-49CD-8D2A-CE170797F605}.PerformanceTest|Mixed Platforms.Build.0 = Release|Any CPU + {34FC29EA-8722-49CD-8D2A-CE170797F605}.PerformanceTest|x64.ActiveCfg = Release|Any CPU + {34FC29EA-8722-49CD-8D2A-CE170797F605}.PerformanceTest|x64.Build.0 = Release|Any CPU + {34FC29EA-8722-49CD-8D2A-CE170797F605}.PerformanceTest|x86.ActiveCfg = Release|Any CPU + {34FC29EA-8722-49CD-8D2A-CE170797F605}.PerformanceTest|x86.Build.0 = Release|Any CPU + {34FC29EA-8722-49CD-8D2A-CE170797F605}.Release|Any CPU.ActiveCfg = Release|Any CPU + {34FC29EA-8722-49CD-8D2A-CE170797F605}.Release|Any CPU.Build.0 = Release|Any CPU + {34FC29EA-8722-49CD-8D2A-CE170797F605}.Release|ARM.ActiveCfg = Release|Any CPU + {34FC29EA-8722-49CD-8D2A-CE170797F605}.Release|ARM.Build.0 = Release|Any CPU + {34FC29EA-8722-49CD-8D2A-CE170797F605}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {34FC29EA-8722-49CD-8D2A-CE170797F605}.Release|x64.ActiveCfg = Release|Any CPU + {34FC29EA-8722-49CD-8D2A-CE170797F605}.Release|x64.Build.0 = Release|Any CPU + {34FC29EA-8722-49CD-8D2A-CE170797F605}.Release|x86.ActiveCfg = Release|Any CPU + {34FC29EA-8722-49CD-8D2A-CE170797F605}.Release|x86.Build.0 = Release|Any CPU + {ED57FCBD-9917-4822-B969-EB5D98D7207B}.CodeAnalysis|Any CPU.ActiveCfg = Release|Any CPU + {ED57FCBD-9917-4822-B969-EB5D98D7207B}.CodeAnalysis|Any CPU.Build.0 = Release|Any CPU + {ED57FCBD-9917-4822-B969-EB5D98D7207B}.CodeAnalysis|ARM.ActiveCfg = Release|Any CPU + {ED57FCBD-9917-4822-B969-EB5D98D7207B}.CodeAnalysis|ARM.Build.0 = Release|Any CPU + {ED57FCBD-9917-4822-B969-EB5D98D7207B}.CodeAnalysis|Mixed Platforms.ActiveCfg = Release|Any CPU + {ED57FCBD-9917-4822-B969-EB5D98D7207B}.CodeAnalysis|Mixed Platforms.Build.0 = Release|Any CPU + {ED57FCBD-9917-4822-B969-EB5D98D7207B}.CodeAnalysis|x64.ActiveCfg = Release|Any CPU + {ED57FCBD-9917-4822-B969-EB5D98D7207B}.CodeAnalysis|x64.Build.0 = Release|Any CPU + {ED57FCBD-9917-4822-B969-EB5D98D7207B}.CodeAnalysis|x86.ActiveCfg = Release|Any CPU + {ED57FCBD-9917-4822-B969-EB5D98D7207B}.CodeAnalysis|x86.Build.0 = Release|Any CPU + {ED57FCBD-9917-4822-B969-EB5D98D7207B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {ED57FCBD-9917-4822-B969-EB5D98D7207B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {ED57FCBD-9917-4822-B969-EB5D98D7207B}.Debug|ARM.ActiveCfg = Debug|Any CPU + {ED57FCBD-9917-4822-B969-EB5D98D7207B}.Debug|ARM.Build.0 = Debug|Any CPU + {ED57FCBD-9917-4822-B969-EB5D98D7207B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {ED57FCBD-9917-4822-B969-EB5D98D7207B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {ED57FCBD-9917-4822-B969-EB5D98D7207B}.Debug|x64.ActiveCfg = Debug|Any CPU + {ED57FCBD-9917-4822-B969-EB5D98D7207B}.Debug|x64.Build.0 = Debug|Any CPU + {ED57FCBD-9917-4822-B969-EB5D98D7207B}.Debug|x86.ActiveCfg = Debug|Any CPU + {ED57FCBD-9917-4822-B969-EB5D98D7207B}.Debug|x86.Build.0 = Debug|Any CPU + {ED57FCBD-9917-4822-B969-EB5D98D7207B}.Instrument|Any CPU.ActiveCfg = Release|Any CPU + {ED57FCBD-9917-4822-B969-EB5D98D7207B}.Instrument|Any CPU.Build.0 = Release|Any CPU + {ED57FCBD-9917-4822-B969-EB5D98D7207B}.Instrument|ARM.ActiveCfg = Release|Any CPU + {ED57FCBD-9917-4822-B969-EB5D98D7207B}.Instrument|ARM.Build.0 = Release|Any CPU + {ED57FCBD-9917-4822-B969-EB5D98D7207B}.Instrument|Mixed Platforms.ActiveCfg = Release|Any CPU + {ED57FCBD-9917-4822-B969-EB5D98D7207B}.Instrument|Mixed Platforms.Build.0 = Release|Any CPU + {ED57FCBD-9917-4822-B969-EB5D98D7207B}.Instrument|x64.ActiveCfg = Release|Any CPU + {ED57FCBD-9917-4822-B969-EB5D98D7207B}.Instrument|x64.Build.0 = Release|Any CPU + {ED57FCBD-9917-4822-B969-EB5D98D7207B}.Instrument|x86.ActiveCfg = Release|Any CPU + {ED57FCBD-9917-4822-B969-EB5D98D7207B}.Instrument|x86.Build.0 = Release|Any CPU + {ED57FCBD-9917-4822-B969-EB5D98D7207B}.PerformanceTest|Any CPU.ActiveCfg = Release|Any CPU + {ED57FCBD-9917-4822-B969-EB5D98D7207B}.PerformanceTest|Any CPU.Build.0 = Release|Any CPU + {ED57FCBD-9917-4822-B969-EB5D98D7207B}.PerformanceTest|ARM.ActiveCfg = Release|Any CPU + {ED57FCBD-9917-4822-B969-EB5D98D7207B}.PerformanceTest|ARM.Build.0 = Release|Any CPU + {ED57FCBD-9917-4822-B969-EB5D98D7207B}.PerformanceTest|Mixed Platforms.ActiveCfg = Release|Any CPU + {ED57FCBD-9917-4822-B969-EB5D98D7207B}.PerformanceTest|Mixed Platforms.Build.0 = Release|Any CPU + {ED57FCBD-9917-4822-B969-EB5D98D7207B}.PerformanceTest|x64.ActiveCfg = Release|Any CPU + {ED57FCBD-9917-4822-B969-EB5D98D7207B}.PerformanceTest|x64.Build.0 = Release|Any CPU + {ED57FCBD-9917-4822-B969-EB5D98D7207B}.PerformanceTest|x86.ActiveCfg = Release|Any CPU + {ED57FCBD-9917-4822-B969-EB5D98D7207B}.PerformanceTest|x86.Build.0 = Release|Any CPU + {ED57FCBD-9917-4822-B969-EB5D98D7207B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {ED57FCBD-9917-4822-B969-EB5D98D7207B}.Release|Any CPU.Build.0 = Release|Any CPU + {ED57FCBD-9917-4822-B969-EB5D98D7207B}.Release|ARM.ActiveCfg = Release|Any CPU + {ED57FCBD-9917-4822-B969-EB5D98D7207B}.Release|ARM.Build.0 = Release|Any CPU + {ED57FCBD-9917-4822-B969-EB5D98D7207B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {ED57FCBD-9917-4822-B969-EB5D98D7207B}.Release|x64.ActiveCfg = Release|Any CPU + {ED57FCBD-9917-4822-B969-EB5D98D7207B}.Release|x64.Build.0 = Release|Any CPU + {ED57FCBD-9917-4822-B969-EB5D98D7207B}.Release|x86.ActiveCfg = Release|Any CPU + {ED57FCBD-9917-4822-B969-EB5D98D7207B}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -448,11 +458,14 @@ Global {AF25D7E8-2F55-4431-BCE1-7C3E3C0E74E1} = {87A17015-9338-431E-B338-57BDA03984C1} {EACF1BF1-CB21-4D62-942C-3488F60B8D70} = {87A17015-9338-431E-B338-57BDA03984C1} {5BCEC32E-990E-4DE5-945F-BD27326A7418} = {7D8FA6E5-A27C-4672-90ED-06033F030A66} - {238C6067-E9DC-4270-90BD-39DCCF79C172} = {87A17015-9338-431E-B338-57BDA03984C1} - {B8BDEBCD-343C-42A9-8C17-C1318B42F011} = {238C6067-E9DC-4270-90BD-39DCCF79C172} - {2A8463C8-8E4B-44F6-AA58-D1232DF88438} = {238C6067-E9DC-4270-90BD-39DCCF79C172} {7D8FA6E5-A27C-4672-90ED-06033F030A66} = {1BD5D488-707E-4030-8AE8-80D93D04963F} {2F623C70-7B64-490E-8605-D75D444CF065} = {1BD5D488-707E-4030-8AE8-80D93D04963F} {CB7C32CD-A8D8-44A4-A595-DF4303566C81} = {2F623C70-7B64-490E-8605-D75D444CF065} + {F041F2B6-6692-4035-96A3-BB36742F5CCC} = {87A17015-9338-431E-B338-57BDA03984C1} + {34FC29EA-8722-49CD-8D2A-CE170797F605} = {F041F2B6-6692-4035-96A3-BB36742F5CCC} + {ED57FCBD-9917-4822-B969-EB5D98D7207B} = {F041F2B6-6692-4035-96A3-BB36742F5CCC} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {614ADBB5-010D-4B4B-8ED9-B2C1BD1F76CA} EndGlobalSection EndGlobal diff --git a/Sync.Test.json b/Sync.Test.json new file mode 100644 index 000000000..0077375e2 --- /dev/null +++ b/Sync.Test.json @@ -0,0 +1,211 @@ +[ + { + "name": "MsgPack.UnitTest.Mono", + "base": "MsgPack.UnitTest", + "globs": [ + {"type": "include", "path": "../MsgPack.UnitTest/**/*.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/Properties/**/*.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/obj/**/*.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/gen35/**/*.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/Dummies/**/*.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/Mono/**/*.cs"}, + {"type": "include", "path": "**/*.cs"}, + {"type": "remove", "path": "obj/**/*.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/Serialization/CodeDomCodeGeneration.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/Augments.cs"} + ] + }, + { + "name": "MsgPack.UnitTest.BclExtensions.Mono", + "base": "MsgPack.UnitTest.BclExtensions", + "globs": [ + {"type": "include", "path": "../MsgPack.UnitTest.BclExtensions/**/*.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest.BclExtensions/Properties/**/*.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest.BclExtensions/obj/**/*.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/Dummies/**/*.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/Mono/**/*.cs"}, + {"type": "include", "path": "**/*.cs"}, + {"type": "remove", "path": "obj/**/*.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/Serialization/CodeDomCodeGeneration.cs"}, + {"type": "include", "path": "../MsgPack.UnitTest/Serialization/RoslynCodeGeneration.cs"}, + {"type": "include", "path": "../MsgPack.UnitTest/Serialization/TempFileDependentAssemblyManager.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/Augments.cs"} + ] + }, + { + "name": "MsgPack.UnitTest.Silverlight.5", + "base": "MsgPack.UnitTest", + "globs": [ + {"type": "include", "path": "../MsgPack.UnitTest/**/*.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/Properties/**/*.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/obj/**/*.cs"}, + {"type": "include", "path": "**/*.cs"}, + {"type": "remove", "path": "obj/**/*.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/gen35/**/*.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/Dummies/**/*.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/Mono/**/*.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/gen/**/*.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/Serialization/PreGenerated*"}, + {"type": "remove", "path": "../MsgPack.UnitTest/Serialization/_SetUpFixture.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/Serialization/AppendableReadOnlyCollections.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/Serialization/ArrayGenerationBasedAutoMessagePackSerializerTest.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/Serialization/ArrayGenerationBasedEnumSerializationTest.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/Serialization/CodeDomCodeGeneration.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/Serialization/CompositeTest.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/Serialization/FromExpressionTest.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/Serialization/GenerationBasedNilImplicationTest.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/Serialization/MapGenerationBasedAutoMessagePackSerializerTest.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/Serialization/MapGenerationBasedEnumSerializationTest.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/Serialization/SerializerGeneratorTest.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/Serialization/RoslynCodeGeneration.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/Serialization/TempFileDependentAssemblyManager.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/Serialization/*FieldBased*.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/_SetUpFixture.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/AssertEx.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/TestSuite.cs"} + ] + }, + { + "name": "MsgPack.UnitTest.Silverlight.5.FullTrust", + "base": "MsgPack.UnitTest.Silverlight.5", + "globs": [ + {"type": "include", "path": "../MsgPack.UnitTest.Silverlight.5/**/*.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest.Silverlight.5/Properties/**/*.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest.Silverlight.5/obj/**/*.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest.Silverlight.5/App.xaml.cs"} + ] + }, + { + "name": "MsgPack.UnitTest.Xamarin.iOS", + "base": "MsgPack.UnitTest", + "globs": [ + {"type": "include", "path": "../MsgPack.UnitTest/**/*.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/Properties/**/*.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/obj/**/*.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/gen35/**/*.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/Dummies/**/*.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/Mono/**/*.cs"}, + {"type": "include", "path": "**/*.cs"}, + {"type": "remove", "path": "obj/**/*.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/Serialization/_SetUpFixture.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/Serialization/CodeDomCodeGeneration.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/Serialization/CompositeTest.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/Serialization/FromExpressionTest.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/Serialization/MessagePackMemberAndDataMemberMixedTarget.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/Serialization/MessagePackMemberAttributeTest.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/Serialization/SerializerGeneratorTest.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/Serialization/PreGeneratedSerializerGenerator.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/Serialization/RoslynCodeGeneration.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/Serialization/TempFileDependentAssemblyManager.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/Serialization/*FieldBased*.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/_SetUpFixture.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/Augments.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/TestSuite.cs"} + ] + }, + { + "name": "MsgPack.UnitTest.Xamarin.Android", + "base": "MsgPack.UnitTest.Xamarin.iOS", + "globs": [ + {"type": "include", "path": "../MsgPack.UnitTest.Xamarin.iOS/**/*.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest.Xamarin.iOS/Properties/**/*.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest.Xamarin.iOS/obj/**/*.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest.Xamarin.iOS/AppDelegate.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest.Xamarin.iOS/Main.cs"} + ] + }, + { + "name": "MsgPack.UnitTest.Uwp", + "base": "MsgPack.UnitTest.Xamarin.Android", + "globs": [ + {"type": "include", "path": "../MsgPack.NUnitPortable/TimeoutAttribute.cs"} + ] + }, + { + "name": "MsgPack.UnitTest.Uwp.Aot", + "base": "MsgPack.UnitTest.Uwp", + "globs": [ + ] + }, + { + "name": "MsgPack.UnitTest.Unity.Il2cpp.Full.Desktop", + "base": "MsgPack.UnitTest.Uwp", + "globs": [ + {"type": "include", "path": "../../src/MsgPack/Tuple`n.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/AssertEx.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/gen/**/*.cs"}, + {"type": "include", "path": "../MsgPack.UnitTest/gen35/**/*.cs"}, + {"type": "include", "path": "../MsgPack.UnitTest/Dummies/**/*.cs"}, + {"type": "include", "path": "../MsgPack.UnitTest/Mono/**/*.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/gen35/MsgPack_Serialization_PolymorphicMemberTypeKnownType*.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/gen35/MsgPack_Serialization_PolymorphicMemberTypeRuntimeType*.cs"}, + {"type": "remove", "path": "../MsgPack.NUnitPortable/TimeoutAttribute.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/Serialization/AppendableReadOnlyCollections.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/Serialization/CodeDomCodeGeneration.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/Serialization/CompositeTest.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/Serialization/FromExpressionTest.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/Serialization/MessagePackMemberAndDataMemberMixedTarget.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/Serialization/MessagePackMemberAttributeTest.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/Serialization/RoslynCodeGeneration.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/Serialization/SerializerGeneratorTest.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/Serialization/TempFileDependentAssemblyManager.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/Serialization/*FieldBased*.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/_SetUpFixture.cs"}, + {"type": "include", "path": "../MsgPack.UnitTest/Augments.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/ExceptionTest.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/MessagePackObjectTest.RuntimeSerialization.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/TestSuite.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/UnpackingTest.Combinations*.cs"} + ] + }, + { + "name": "MsgPack.UnitTest.WinRT", + "base": "MsgPack.UnitTest.Uwp", + "globs": [ + {"type": "remove", "path": "../MsgPack.NUnitPortable/TimeoutAttribute.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest.Xamarin.iOS/Serialization/AotTest.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/gen/**/*.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/Serialization/CodeDomCodeGeneration.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/Serialization/FromExpressionTest.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/Serialization/PreGenerated*.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/Serialization/RoslynCodeGeneration.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/Serialization/SerializerGeneratorTest.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/Serialization/TempFileDependentAssemblyManager.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/Serialization/*FieldBased*.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/Serialization/*GenerationBased*.cs"}, + {"type": "include", "path": "../MsgPack.UnitTest/Serialization/_SetUpFixture.cs"}, + {"type": "include", "path": "../MsgPack.UnitTest/Serialization/MessagePackMemberAndDataMemberMixedTarget.cs"}, + {"type": "include", "path": "../MsgPack.UnitTest/Serialization/MessagePackMemberAttributeTest.cs"}, + {"type": "include", "path": "../MsgPack.UnitTest/_SetUpFixture.cs"}, + {"type": "include", "path": "../MsgPack.UnitTest/TestSuite.cs"} + ] + }, + { + "name": "MsgPack.UnitTest.BclExtensions.WinRT", + "base": "MsgPack.UnitTest.BclExtensions", + "globs": [ + {"type": "include", "path": "../MsgPack.UnitTest.BclExtensions/**/*.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest.BclExtensions/Properties/**/*.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest.BclExtensions/obj/**/*.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest/obj/**/*.cs"}, + {"type": "include", "path": "**/*.cs"}, + {"type": "remove", "path": "obj/**/*.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest.BclExtensions/Serialization/*CodeDomBased*.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest.BclExtensions/Serialization/*FieldBased*.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest.BclExtensions/Serialization/RoslynCodeGeneration.cs"}, + {"type": "remove", "path": "../MsgPack.UnitTest.BclExtensions/Serialization/TempFileDependentAssemblyManager.cs"} + ] + }, + { + "name": "MsgPack.UnitTest.Silverlight.WindowsPhone", + "base": "MsgPack.UnitTest.WinRT", + "globs": [ + ] + }, + { + "name": "MsgPack.UnitTest.WinRT.WindowsPhone", + "base": "MsgPack.UnitTest.WinRT", + "globs": [ + ] + } +] diff --git a/Sync.Test.xml b/Sync.Test.xml deleted file mode 100644 index fd56ff920..000000000 --- a/Sync.Test.xml +++ /dev/null @@ -1,297 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Sync.json b/Sync.json new file mode 100644 index 000000000..ddada6d03 --- /dev/null +++ b/Sync.json @@ -0,0 +1,142 @@ +[ + { + "name": "MsgPack.Uwp", + "globs": [ + {"type": "include", "path": "../CommonAssemblyInfo.cs"}, + {"type": "include", "path": "../MsgPack/**/*.cs"}, + {"type": "remove", "path": "../MsgPack/Properties/**/*.cs"}, + {"type": "remove", "path": "../MsgPack/obj/**/*.cs"}, + {"type": "include", "path": "**/*.cs"}, + {"type": "remove", "path": "obj/**/*.cs"}, + + {"type": "remove", "path": "../MsgPack/Serialization/AbstractSerializers/**/*.cs"}, + {"type": "remove", "path": "../MsgPack/Serialization/CodeDomSerializers/**/*.cs"}, + {"type": "remove", "path": "../MsgPack/Serialization/DefaultSerializers/System_Security_Cryptography_HashAlgorithmNameMessagePackSerializer.cs"}, + {"type": "remove", "path": "../MsgPack/Serialization/EmittingSerializers/**/*.cs"}, + {"type": "remove", "path": "../MsgPack/Serialization/ExpressionSerializers/**/*.cs"}, + {"type": "remove", "path": "../MsgPack/Serialization/Metadata/**/*.cs"}, + {"type": "remove", "path": "../MsgPack/Serialization/Reflection/TracingILGenerator.*"}, + {"type": "remove", "path": "../MsgPack/Serialization/CallbackEnumMessagePackSerializer.cs"}, + {"type": "remove", "path": "../MsgPack/Serialization/CallbackMessagePackSerializer`1.cs"}, + {"type": "remove", "path": "../MsgPack/Serialization/CodeGenerationSink.cs"}, + {"type": "remove", "path": "../MsgPack/Serialization/DependentAssemblyManager.cs"}, + {"type": "remove", "path": "../MsgPack/Serialization/DefaultSerializerNameResolver.cs"}, + {"type": "remove", "path": "../MsgPack/Serialization/FromExpression.*"}, + {"type": "remove", "path": "../MsgPack/Serialization/IndividualFileCodeGenerationSink.cs"}, + {"type": "remove", "path": "../MsgPack/Serialization/ISerializerGeneratorConfiguration.cs"}, + {"type": "remove", "path": "../MsgPack/Serialization/ReflectionExtensions.ConstructorDelegate.cs"}, + {"type": "remove", "path": "../MsgPack/Serialization/SerializerAssemblyGenerationConfiguration.cs"}, + {"type": "remove", "path": "../MsgPack/Serialization/SerializerCodeInformation.cs"}, + {"type": "remove", "path": "../MsgPack/Serialization/SerializerCodeGenerationConfiguration.cs"}, + {"type": "remove", "path": "../MsgPack/Serialization/SerializerCodeGenerationContext.cs"}, + {"type": "remove", "path": "../MsgPack/Serialization/SerializerCodeGenerationResult.cs"}, + {"type": "remove", "path": "../MsgPack/Serialization/SerializerGenerator.cs"}, + {"type": "remove", "path": "../MsgPack/Serialization/TeeTextWriter.cs"}, + {"type": "remove", "path": "../MsgPack/Serialization/SingleTextWriterCodeGenerationSink.cs"}, + {"type": "remove", "path": "../MsgPack/Serialization/Tracer.cs"}, + {"type": "remove", "path": "../MsgPack/Contract.cs"}, + {"type": "remove", "path": "../MsgPack/Delegates.cs"}, + {"type": "remove", "path": "../MsgPack/MPContract.cs"}, + {"type": "remove", "path": "../MsgPack/NetFxCompatibilities.cs"}, + {"type": "remove", "path": "../MsgPack/Tuple`n.cs"}, + {"type": "remove", "path": "../MsgPack/UnsafeNativeMethods.cs"}, + {"type": "remove", "path": "../MsgPack/Volatile.cs"}, + {"type": "remove", "path": "../MsgPack/Validation.cs"} + ] + }, + { + "name": "MsgPack.Unity.Full", + "base": "MsgPack.Uwp", + "globs": [ + {"type": "include", "path": "../MsgPack/Serialization/Tracer.cs"}, + {"type": "include", "path": "../MsgPack/MPContract.cs"}, + {"type": "include", "path": "../MsgPack/Volatile.cs"}, + {"type": "remove", "path": "../MsgPack/Serialization/CollectionSerializers/CollectionSerializerBase`2.cs"}, + {"type": "remove", "path": "../MsgPack/Serialization/CollectionSerializers/DictionarySerializerBase`3.cs"}, + {"type": "remove", "path": "../MsgPack/Serialization/CollectionSerializers/ReadOnlyCollectionMessagePackSerializer`2.cs"}, + {"type": "remove", "path": "../MsgPack/Serialization/CollectionSerializers/ReadOnlyDictionaryMessagePackSerializer`3.cs"}, + {"type": "remove", "path": "../MsgPack/Serialization/DefaultSerializers/AbstractReadOnlyCollectionMessagePackSerializer`2.cs"}, + {"type": "remove", "path": "../MsgPack/Serialization/DefaultSerializers/AbstractReadOnlyDictionaryMessagePackSerializer`3.cs"}, + {"type": "remove", "path": "../MsgPack/Serialization/DefaultSerializers/FileTimeMessagePackSerializerProvider.cs"}, + {"type": "remove", "path": "../MsgPack/Serialization/DefaultSerializers/FSharpCollectionSerializer`2.cs"}, + {"type": "remove", "path": "../MsgPack/Serialization/DefaultSerializers/FSharpMapSerializer`3.cs"}, + {"type": "remove", "path": "../MsgPack/Serialization/DefaultSerializers/ImmutableCollectionSerializer`2.cs"}, + {"type": "remove", "path": "../MsgPack/Serialization/DefaultSerializers/ImmutableDictionarySerializer`3.cs"}, + {"type": "remove", "path": "../MsgPack/Serialization/DefaultSerializers/ImmutableStackSerializer`2.cs"}, + {"type": "remove", "path": "../MsgPack/Serialization/DefaultSerializers/NativeFileTimeMessagePackSerializer.cs"}, + {"type": "remove", "path": "../MsgPack/Serialization/DefaultSerializers/SimdTypeSerializers.cs"}, + {"type": "remove", "path": "../MsgPack/Serialization/DefaultSerializers/System_Numerics_ComplexMessagePackSerializer.cs"}, + {"type": "remove", "path": "../MsgPack/Serialization/DefaultSerializers/System_Security_Cryptography_HashAlgorithmNameMessagePackSerializer.cs"}, + {"type": "remove", "path": "../MsgPack/Serialization/DefaultSerializers/UnixEpocFileTimeMessagePackSerializer.cs"}, + {"type": "remove", "path": "../MsgPack/Serialization/ReflectionSerializers/ReflectionTupleMessagePackSerializer`1.cs"}, + {"type": "remove", "path": "../MsgPack/Serialization/ReflectionExtensions.ConstructorDelegate.cs"}, + {"type": "remove", "path": "../MsgPack/BufferedStream.cs"}, + {"type": "remove", "path": "../MsgPack/NetStandardCompatibility.cs"}, + {"type": "remove", "path": "../MsgPack/TaskAugument.cs"}, + {"type": "remove", "path": "../MsgPack/UnsafeNativeMethods.cs"}, + {"type": "remove", "path": "../MsgPack/Validation.cs"} + ] + }, + { + "name": "MsgPack.Unity", + "base": "MsgPack.Unity.Full", + "globs": [ + {"type": "include", "path": "../MsgPack.Unity.Full/**/*.cs"}, + {"type": "remove", "path": "../MsgPack.Unity.Full/Properties/**/*.cs"}, + {"type": "remove", "path": "../MsgPack.Unity.Full/obj/**/*.cs"}, + {"type": "remove", "path": "../MsgPack/Serialization/DefaultSerializers/System_Collections_Generic_Queue_1MessagePackSerializer`1.cs"}, + {"type": "remove", "path": "../MsgPack/Serialization/DefaultSerializers/System_Collections_Generic_Stack_1MessagePackSerializer`1.cs"}, + {"type": "remove", "path": "../MsgPack/Serialization/DefaultSerializers/System_Collections_Specialized_NameValueCollectionMessagePackSerializer.cs"}, + {"type": "remove", "path": "../MsgPack/Serialization/DefaultSerializers/System_UriMessagePackSerializer.cs"} + ] + }, + { + "name": "MsgPack.Silverlight.5", + "base": "MsgPack.Uwp", + "globs": [ + {"type": "include", "path": "../MsgPack/UnsafeNativeMethods.cs"}, + {"type": "include", "path": "../MsgPack/Volatile.cs"}, + {"type": "include", "path": "../MsgPack/Serialization/Metadata/_MessagePackSerializer.cs"}, + {"type": "include", "path": "../MsgPack/Serialization/Metadata/_SerializationContext.cs"}, + {"type": "include", "path": "../MsgPack/Serialization/Reflection/TracingILGenerator*.cs"}, + {"type": "include", "path": "../MsgPack/Serialization/ReflectionExtensions.ConstructorDelegate.cs"}, + {"type": "include", "path": "../MsgPack/Serialization/FromExpression*.cs"}, + {"type": "remove", "path": "../MsgPack/Serialization/CollectionSerializers/ReadOnlyCollectionMessagePackSerializer`2.cs"}, + {"type": "remove", "path": "../MsgPack/Serialization/CollectionSerializers/ReadOnlyDictionaryMessagePackSerializer`3.cs"}, + {"type": "remove", "path": "../MsgPack/Serialization/DefaultSerializers/AbstractReadOnlyCollectionMessagePackSerializer`2.cs"}, + {"type": "remove", "path": "../MsgPack/Serialization/DefaultSerializers/AbstractReadOnlyDictionaryMessagePackSerializer`3.cs"}, + {"type": "remove", "path": "../MsgPack/Serialization/DefaultSerializers/FileTimeMessagePackSerializerProvider.cs"}, + {"type": "remove", "path": "../MsgPack/Serialization/DefaultSerializers/FSharpCollectionSerializer`2.cs"}, + {"type": "remove", "path": "../MsgPack/Serialization/DefaultSerializers/FSharpMapSerializer`3.cs"}, + {"type": "remove", "path": "../MsgPack/Serialization/DefaultSerializers/ImmutableCollectionSerializer`2.cs"}, + {"type": "remove", "path": "../MsgPack/Serialization/DefaultSerializers/ImmutableDictionarySerializer`3.cs"}, + {"type": "remove", "path": "../MsgPack/Serialization/DefaultSerializers/ImmutableStackSerializer`2.cs"}, + {"type": "remove", "path": "../MsgPack/Serialization/DefaultSerializers/NativeFileTimeMessagePackSerializer.cs"}, + {"type": "remove", "path": "../MsgPack/Serialization/DefaultSerializers/SimdTypeSerializers.cs"}, + {"type": "remove", "path": "../MsgPack/Serialization/DefaultSerializers/System_Collections_QueueMessagePackSerializer.cs"}, + {"type": "remove", "path": "../MsgPack/Serialization/DefaultSerializers/System_Collections_StackMessagePackSerializer.cs"}, + {"type": "remove", "path": "../MsgPack/Serialization/DefaultSerializers/System_Collections_Specialized_NameValueCollectionMessagePackSerializer.cs"}, + {"type": "remove", "path": "../MsgPack/Serialization/DefaultSerializers/System_Security_Cryptography_HashAlgorithmNameMessagePackSerializer.cs"}, + {"type": "remove", "path": "../MsgPack/Serialization/DefaultSerializers/UnixEpocFileTimeMessagePackSerializer.cs"}, + {"type": "remove", "path": "../MsgPack/BufferedStream.cs"}, + {"type": "remove", "path": "../MsgPack/NetStandardCompatibility.cs"}, + {"type": "remove", "path": "../MsgPack/TaskAugument.cs"} + ] + }, + { + "name": "MsgPack.Silverlight.WindowsPhone", + "base": "MsgPack.Uwp", + "globs": [ + {"type": "remove", "path": "../MsgPack/Serialization/DefaultSerializers/SimdTypeSerializers.cs"}, + {"type": "remove", "path": "../MsgPack/Serialization/DefaultSerializers/System_Collections_QueueMessagePackSerializer.cs"}, + {"type": "remove", "path": "../MsgPack/Serialization/DefaultSerializers/System_Collections_StackMessagePackSerializer.cs"}, + {"type": "remove", "path": "../MsgPack/Serialization/DefaultSerializers/System_Collections_Specialized_NameValueCollectionMessagePackSerializer.cs"}, + {"type": "remove", "path": "../MsgPack/Serialization/DefaultSerializers/System_Numerics_ComplexMessagePackSerializer.cs"}, + {"type": "remove", "path": "../MsgPack/Serialization/DefaultSerializers/System_Security_Cryptography_HashAlgorithmNameMessagePackSerializer.cs"}, + {"type": "remove", "path": "../MsgPack/Serialization/Reflection/ReflectionHelpers.cs"}, + {"type": "remove", "path": "../MsgPack/BufferedStream.cs"}, + {"type": "remove", "path": "../MsgPack/NetStandardCompatibility.cs"}, + {"type": "remove", "path": "../MsgPack/TaskAugument.cs"} + ] + } +] \ No newline at end of file diff --git a/Sync.xml b/Sync.xml deleted file mode 100644 index 6e8478fa4..000000000 --- a/Sync.xml +++ /dev/null @@ -1,142 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/SyncProjects.bat b/SyncProjects.bat index e93264fad..d75777c19 100644 --- a/SyncProjects.bat +++ b/SyncProjects.bat @@ -1,4 +1,8 @@ -:: src -@.\tools\SyncProjects\bin\SyncProjects.exe -:: test -@.\tools\SyncProjects\bin\SyncProjects.exe -d Sync.Test.xml -s test \ No newline at end of file +@setlocal +@rem src +@dotnet run -p .\tools\SyncProjects2\SyncProjects2\SyncProjects2.csproj +@if not ERRORLEVEL 0 exit /b %ERRORLEVEL% + +@rem test +@dotnet run -p .\tools\SyncProjects2\SyncProjects2\SyncProjects2.csproj -d Sync.Test.json -s test +@exit /b %ERRORLEVEL% diff --git a/build/Build.ps1 b/build/Build.ps1 index 004ac4190..1f5469987 100644 --- a/build/Build.ps1 +++ b/build/Build.ps1 @@ -147,7 +147,7 @@ if ( $LastExitCode -ne 0 ) if ( $buildConfig -eq 'Release' ) { - & $msbuild ../src/MsgPack/MsgPack.csproj /t:pack /p:Configuration=$buildConfig /p:IncludeSymbols=true /p:IncludeSource=true /p:NuspecProperties=version=$env:PackageVersion + & $msbuild ../src/MsgPack/MsgPack.csproj /t:pack /v:minimal /p:Configuration=$buildConfig /p:IncludeSource=true /p:NuspecProperties=version=$env:PackageVersion Move-Item ../bin/*.nupkg ../dist/ Copy-Item ../bin/* ./MsgPack-CLI/ -Recurse -Exclude @("*.vshost.*") diff --git a/build/RunUnitTests.cmd b/build/RunUnitTests.cmd index f02d7d50b..bf7a15bf6 100644 --- a/build/RunUnitTests.cmd +++ b/build/RunUnitTests.cmd @@ -1,8 +1,8 @@ -nunit3-console %APPVEYOR_BUILD_FOLDER%/test/MsgPack.UnitTest/bin/Debug/MsgPack.UnitTest.dll --framework:net-4.5 --result=test-result-net45.xml;format=AppVeyor -nunit3-console %APPVEYOR_BUILD_FOLDER%/test/MsgPack.UnitTest.BclExtensions/bin/Debug/MsgPack.UnitTest.BclExtensions.dll --framework:net-4.5 --result=test-result-net45-bclext.xml;format=AppVeyor -nunit3-console %APPVEYOR_BUILD_FOLDER%/test/MsgPack.UnitTest.CodeDom/bin/Debug/MsgPack.UnitTest.CodeDom.dll --framework:net-4.5 --result=test-result-net45-codedom.xml;format=AppVeyor -nunit3-console %APPVEYOR_BUILD_FOLDER%/test/MsgPack.UnitTest.Net35/bin/Debug/MsgPack.UnitTest.Net35.dll --framework:net-3.5 --result=test-result-net35.xml;format=AppVeyor -nunit3-console %APPVEYOR_BUILD_FOLDER%/test/MsgPack.UnitTest.CodeDom.Net35/bin/Debug/MsgPack.UnitTest.CodeDom.Net35.dll --framework:net-3.5 --result=test-result-net35-codedom.xml;format=AppVeyor +dotnet test %APPVEYOR_BUILD_FOLDER%/test/MsgPack.UnitTest/MsgPack.UnitTest.csproj +dotnet test %APPVEYOR_BUILD_FOLDER%/test/MsgPack.UnitTest.BclExtensions/MsgPack.UnitTest.BclExtensions.csproj +dotnet test %APPVEYOR_BUILD_FOLDER%/test/MsgPack.UnitTest.CodeDom/MsgPack.UnitTest.CodeDom.csproj +nunit3-console %APPVEYOR_BUILD_FOLDER%/test/MsgPack.UnitTest.Net35/bin/Debug/net35/MsgPack.UnitTest.Net35.dll --framework:net-3.5 --result=test-result-net35.xml;format=AppVeyor +nunit3-console %APPVEYOR_BUILD_FOLDER%/test/MsgPack.UnitTest.CodeDom.Net35/bin/Debug/net35/MsgPack.UnitTest.CodeDom.Net35.dll --framework:net-3.5 --result=test-result-net35-codedom.xml;format=AppVeyor @rem WinRT related tests require developer license... @rem vstest.console /logger:Appveyor /InIsolation %APPVEYOR_BUILD_FOLDER%/test/MsgPack.UnitTest.WinRT/AppPackages/MsgPack.UnitTest.WinRT_1.1.0.0_AnyCPU_Debug_Test/MsgPack.UnitTest.WinRT_1.1.0.0_AnyCPU_Debug.appx @rem vstest.console /logger:Appveyor /InIsolation %APPVEYOR_BUILD_FOLDER%/test/MsgPack.UnitTest.BclExtensions.WinRT/AppPackages/MsgPack.UnitTest.BclExtensions.WinRT_1.1.0.0_AnyCPU_Debug_Test/MsgPack.UnitTest.BclExtensions.WinRT_1.1.0.0_AnyCPU_Debug.appx diff --git a/build/Version.txt b/build/Version.txt index 899f24fc7..547326a2b 100644 --- a/build/Version.txt +++ b/build/Version.txt @@ -1 +1 @@ -0.9.0 \ No newline at end of file +1.0.0-beta1 \ No newline at end of file diff --git a/src/CommonAssemblyInfo.cs b/src/CommonAssemblyInfo.cs index b7917caf1..51ac2d17d 100644 --- a/src/CommonAssemblyInfo.cs +++ b/src/CommonAssemblyInfo.cs @@ -35,7 +35,7 @@ // Major : Represents Major update like re-architecting, remove obsoleted APIs etc. // Minor : Represents Minor update like adding new feature, obsoleting APIs, fix specification issues, etc. // Build/Revision : Always 0 since CLI implementations does not care these number, so these changes cause some binding failures. -[assembly: AssemblyVersion( "0.9.0.0" )] +[assembly: AssemblyVersion( "1.0.0.0" )] // This version represents libarary 'version' for human beings. // Major : Same as AssemblyVersion. @@ -43,5 +43,5 @@ // 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 : Reserced. It might be used to indicate target platform or patch. -[assembly: AssemblyInformationalVersion( "0.9.0-dev" )] +[assembly: AssemblyInformationalVersion( "1.0.0-dev" )] diff --git a/src/MsgPack.Net35/MsgPack.Net35.csproj b/src/MsgPack.Net35/MsgPack.Net35.csproj deleted file mode 100644 index fdabfef02..000000000 --- a/src/MsgPack.Net35/MsgPack.Net35.csproj +++ /dev/null @@ -1,1071 +0,0 @@ - - - - - Debug - AnyCPU - {C5490CDC-3B79-42DC-ACFB-75A62E55862C} - Library - Properties - MsgPack - MsgPack - v3.5 - 512 - Client - - - true - full - false - bin\Debug\ - TRACE;DEBUG;NETFX_35 - prompt - 4 - true - bin\Debug\MsgPack.xml - - - pdbonly - true - ..\..\bin\net35-client\ - TRACE;NETFX_35 - prompt - 4 - true - ..\..\bin\net35-client\MsgPack.XML - - - true - - - ..\MsgPack.snk - - - bin\CodeAnalysis\ - TRACE;NETFX_35;CODE_ANALYSIS - true - - true - pdbonly - AnyCPU - prompt - AllRules.ruleset - true - - - - - - - - Properties\CommonAssemblyInfo.cs - - - AsyncReadResult.cs - - - AsyncReadResult`1.cs - - - BigEndianBinary.cs - - - Binary.cs - - - BufferManager.cs - - - CollectionDebuggerProxy`1.cs - - - CollectionOperation.cs - - - DictionaryDebuggerProxy`2.cs - - - Float32Bits.cs - - - Float64Bits.cs - - - GlobalSuppressions.cs - - - IAsyncPackable.cs - - - IAsyncUnpackable.cs - - - InvalidMessagePackStreamException.cs - - - IPackable.cs - - - ItemsUnpacker.cs - - - ItemsUnpacker.Read.cs - - - ItemsUnpacker.Skipping.cs - - - ItemsUnpacker.Unpacking.cs - - - IUnpackable.cs - - - KnownExtTypeCode.cs - - - KnownExtTypeName.cs - - - MessageNotSupportedException.cs - - - MessagePackCode.cs - - - MessagePackConvert.cs - - - MessagePackExtendedTypeObject.cs - - - MessagePackObject.cs - - - MessagePackObject.Utilities.cs - - - MessagePackObjectDictionary.cs - - - MessagePackObjectDictionary.Enumerator.cs - - - MessagePackObjectDictionary.KeySet.cs - - - MessagePackObjectDictionary.KeySet.Enumerator.cs - - - MessagePackObjectDictionary.ValueCollection.cs - - - MessagePackObjectDictionary.ValueCollection.Enumerator.cs - - - MessagePackObjectEqualityComparer.cs - - - MessagePackString.cs - - - MessageTypeException.cs - - - Packer.cs - - - Packer.Nullable.cs - - - Packer.Packing.cs - - - PackerCompatibilityOptions.cs - - - PackerUnpackerExtensions.cs - - - PackerUnpackerStreamOptions.cs - - - PackingOptions.cs - - - PreserveAttribute.cs - - - ReflectionAbstractions.cs - - - Serialization\AbstractSerializers\ActionType.cs - - - Serialization\AbstractSerializers\CachedDelegateInfo.cs - - - Serialization\AbstractSerializers\ConstructorDefinition.cs - - - Serialization\AbstractSerializers\DynamicUnpackingContext.cs - - - Serialization\AbstractSerializers\EnumSerializerMethod.cs - - - Serialization\AbstractSerializers\FieldDefinition.cs - - - Serialization\AbstractSerializers\FieldName.cs - - - Serialization\AbstractSerializers\ICodeConstruct.cs - - - Serialization\AbstractSerializers\ISerializerBuilder.cs - - - Serialization\AbstractSerializers\ISerializerCodeGenerationContext.cs - - - Serialization\AbstractSerializers\ISerializerCodeGenerator.cs - - - Serialization\AbstractSerializers\MethodDefinition.cs - - - Serialization\AbstractSerializers\MethodName.cs - - - Serialization\AbstractSerializers\MethodNamePrefix.cs - - - Serialization\AbstractSerializers\SerializerBuilderHelper.cs - - - Serialization\AbstractSerializers\SerializerBuilder`2.Collection.cs - - - Serialization\AbstractSerializers\SerializerBuilder`2.CommonConstructs.cs - - - Serialization\AbstractSerializers\SerializerBuilder`2.cs - - - Serialization\AbstractSerializers\SerializerBuilder`2.Enum.cs - - - Serialization\AbstractSerializers\SerializerBuilder`2.Nullable.cs - - - Serialization\AbstractSerializers\SerializerBuilder`2.Object.cs - - - Serialization\AbstractSerializers\SerializerFieldKey.cs - - - Serialization\AbstractSerializers\SerializerGenerationContext.cs - - - Serialization\AbstractSerializers\SerializerSpecification.cs - - - Serialization\AbstractSerializers\TypeDefinition.cs - - - Serialization\CodeDomSerializers\CodeDomConstruct.cs - - - Serialization\CodeDomSerializers\CodeDomContext.cs - - - Serialization\CodeDomSerializers\CodeDomSerializerBuilder.cs - - - Serialization\CodeDomSerializers\ExpressionCodeDomConstruct.cs - - - Serialization\CodeDomSerializers\ParameterCodeDomConstruct.cs - - - Serialization\CodeDomSerializers\StatementCodeDomConstruct.cs - - - Serialization\CodeDomSerializers\VariableCodeDomConstruct.cs - - - Serialization\CodeGenerationSink.cs - - - Serialization\CollectionDetailedKind.cs - - - Serialization\CollectionKind.cs - - - Serialization\CollectionSerializers\CollectionMessagePackSerializerBase`2.cs - - - Serialization\CollectionSerializers\CollectionMessagePackSerializer`2.cs - - - Serialization\CollectionSerializers\CollectionSerializerHelpers.cs - - - Serialization\CollectionSerializers\DictionaryMessagePackSerializerBase`3.cs - - - Serialization\CollectionSerializers\DictionaryMessagePackSerializer`3.cs - - - Serialization\CollectionSerializers\EnumerableMessagePackSerializerBase`2.cs - - - Serialization\CollectionSerializers\EnumerableMessagePackSerializer`2.cs - - - Serialization\CollectionSerializers\ICollectionInstanceFactory.cs - - - Serialization\CollectionSerializers\NonGenericCollectionMessagePackSerializer`1.cs - - - Serialization\CollectionSerializers\NonGenericDictionaryMessagePackSerializer`1.cs - - - Serialization\CollectionSerializers\NonGenericEnumerableMessagePackSerializerBase`1.cs - - - Serialization\CollectionSerializers\NonGenericEnumerableMessagePackSerializer`1.cs - - - Serialization\CollectionSerializers\NonGenericListMessagePackSerializer`1.cs - - - Serialization\CollectionTraitOptions.cs - - - Serialization\CollectionTraits.cs - - - Serialization\DataMemberContract.cs - - - Serialization\DateTimeConversionMethod.cs - - - Serialization\DateTimeMemberConversionMethod.cs - - - Serialization\DateTimeMessagePackSerializerHelpers.cs - - - Serialization\DefaultConcreteTypeRepository.cs - - - Serialization\DefaultSerializerNameResolver.cs - - - Serialization\DefaultSerializers\AbstractCollectionMessagePackSerializer`2.cs - - - Serialization\DefaultSerializers\AbstractCollectionSerializerHelper.cs - - - Serialization\DefaultSerializers\AbstractDictionaryMessagePackSerializer`3.cs - - - Serialization\DefaultSerializers\AbstractEnumerableMessagePackSerializer`2.cs - - - Serialization\DefaultSerializers\AbstractNonGenericCollectionMessagePackSerializer`1.cs - - - Serialization\DefaultSerializers\AbstractNonGenericDictionaryMessagePackSerializer`1.cs - - - Serialization\DefaultSerializers\AbstractNonGenericEnumerableMessagePackSerializer`1.cs - - - Serialization\DefaultSerializers\AbstractNonGenericListMessagePackSerializer`1.cs - - - Serialization\DefaultSerializers\ArraySegmentMessageSerializer.cs - - - Serialization\DefaultSerializers\ArraySerializer.cs - - - Serialization\DefaultSerializers\ArraySerializer.Primitives.cs - - - Serialization\DefaultSerializers\ArraySerializer`1.cs - - - Serialization\DefaultSerializers\DateTimeMessagePackSerializerProvider.cs - - - Serialization\DefaultSerializers\DateTimeOffsetMessagePackSerializer.cs - - - Serialization\DefaultSerializers\DateTimeOffsetMessagePackSerializerProvider.cs - - - Serialization\DefaultSerializers\DefaultSerializers.cs - - - Serialization\DefaultSerializers\FileTimeMessagePackSerializerProvider.cs - - - Serialization\DefaultSerializers\GenericSerializer.cs - - - Serialization\DefaultSerializers\InternalDateTimeExtensions.cs - - - Serialization\DefaultSerializers\MessagePackObjectExtensions.cs - - - Serialization\DefaultSerializers\MsgPack_MessagePackExtendedTypeObjectMessagePackSerializer.cs - - - Serialization\DefaultSerializers\MsgPack_MessagePackObjectDictionaryMessagePackSerializer.cs - - - Serialization\DefaultSerializers\MsgPack_MessagePackObjectMessagePackSerializer.cs - - - Serialization\DefaultSerializers\MultidimensionalArraySerializer`1.cs - - - Serialization\DefaultSerializers\NativeDateTimeMessagePackSerializer.cs - - - Serialization\DefaultSerializers\NativeFileTimeMessagePackSerializer.cs - - - Serialization\DefaultSerializers\NullableMessagePackSerializer`1.cs - - - Serialization\DefaultSerializers\System_ArraySegment_1MessagePackSerializer`1.cs - - - Serialization\DefaultSerializers\System_ByteArrayMessagePackSerializer.cs - - - Serialization\DefaultSerializers\System_CharArrayMessagePackSerializer.cs - - - Serialization\DefaultSerializers\System_Collections_DictionaryEntryMessagePackSerializer.cs - - - Serialization\DefaultSerializers\System_Collections_Generic_Dictionary_2MessagePackSerializer`2.cs - - - Serialization\DefaultSerializers\System_Collections_Generic_KeyValuePair_2MessagePackSerializer`2.cs - - - Serialization\DefaultSerializers\System_Collections_Generic_ListOfMessagePackObjectMessagePackSerializer.cs - - - Serialization\DefaultSerializers\System_Collections_Generic_List_1MessagePackSerializer`1.cs - - - Serialization\DefaultSerializers\System_Collections_Generic_Queue_1MessagePackSerializer`1.cs - - - Serialization\DefaultSerializers\System_Collections_Generic_Stack_1MessagePackSerializer`1.cs - - - Serialization\DefaultSerializers\System_Collections_QueueMessagePackSerializer.cs - - - Serialization\DefaultSerializers\System_Collections_Specialized_NameValueCollectionMessagePackSerializer.cs - - - Serialization\DefaultSerializers\System_Collections_StackMessagePackSerializer.cs - - - Serialization\DefaultSerializers\System_DBNullMessagePackSerializer.cs - - - Serialization\DefaultSerializers\System_Globalization_CultureInfoMessagePackSerializer.cs - - - Serialization\DefaultSerializers\System_ObjectMessagePackSerializer.cs - - - Serialization\DefaultSerializers\System_StringMessagePackSerializer.cs - - - Serialization\DefaultSerializers\System_Text_StringBuilderMessagePackSerializer.cs - - - Serialization\DefaultSerializers\System_UriMessagePackSerializer.cs - - - Serialization\DefaultSerializers\System_VersionMessagePackSerializer.cs - - - Serialization\DefaultSerializers\UnixEpocDateTimeMessagePackSerializer.cs - - - Serialization\DefaultSerializers\UnixEpocFileTimeMessagePackSerializer.cs - - - Serialization\DependentAssemblyManager.cs - - - Serialization\DictionaryKeyTransformers.cs - - - Serialization\DictionarySerlaizationOptions.cs - - - Serialization\EmitterFlavor.cs - - - Serialization\EmittingSerializers\AndConditionILConstruct.cs - - - Serialization\EmittingSerializers\AssemblyBuilderCodeGenerationContext.cs - - - Serialization\EmittingSerializers\AssemblyBuilderEmittingContext.cs - - - Serialization\EmittingSerializers\AssemblyBuilderSerializerBuilder.cs - - - Serialization\EmittingSerializers\BinaryOperatorILConstruct.cs - - - Serialization\EmittingSerializers\ConditionalILConstruct.cs - - - Serialization\EmittingSerializers\ContextfulILConstruct.cs - - - Serialization\EmittingSerializers\ILConstruct.cs - - - Serialization\EmittingSerializers\ILMethodConctext.cs - - - Serialization\EmittingSerializers\InvocationILConsruct.cs - - - Serialization\EmittingSerializers\LoadFieldILConstruct.cs - - - Serialization\EmittingSerializers\SequenceILConstruct.cs - - - Serialization\EmittingSerializers\SerializationMethodGeneratorManager.cs - - - Serialization\EmittingSerializers\SerializerEmitter.cs - - - Serialization\EmittingSerializers\SerializerEmitter.enum.cs - - - Serialization\EmittingSerializers\SerializerEmitter.object.cs - - - Serialization\EmittingSerializers\SinglelStepILConstruct.cs - - - Serialization\EmittingSerializers\StatementExpressionILConstruct.cs - - - Serialization\EmittingSerializers\StoreFieldILConstruct.cs - - - Serialization\EmittingSerializers\StoreVariableILConstruct.cs - - - Serialization\EmittingSerializers\UnaryOperatorILConstruct.cs - - - Serialization\EmittingSerializers\VariableILConstruct.cs - - - Serialization\EnumMemberSerializationMethod.cs - - - Serialization\EnumMessagePackSerializerHelpers.cs - - - Serialization\EnumMessagePackSerializerProvider.cs - - - Serialization\EnumMessagePackSerializer`1.cs - - - Serialization\EnumNameTransformers.cs - - - Serialization\EnumSerializationMethod.cs - - - Serialization\EnumSerializationOptions.cs - - - Serialization\ExtTypeCodeMapping.cs - - - Serialization\FromExpression.cs - - - Serialization\FromExpression.ToMethod.cs - - - Serialization\ICustomizableEnumSerializer.cs - - - Serialization\IdentifierUtility.cs - - - Serialization\IMessagePackSerializer.cs - - - Serialization\IMessagePackSingleObjectSerializer.cs - - - Serialization\IndividualFileCodeGenerationSink.cs - - - Serialization\INilImplicationHandlerOnUnpackedParameter.cs - - - Serialization\INilImplicationHandlerParameter.cs - - - Serialization\ISerializerGeneratorConfiguration.cs - - - Serialization\KeyNameTransformers.cs - - - Serialization\LazyDelegatingMessagePackSerializer`1.cs - - - Serialization\MessagePackDateTimeMemberAttribute.cs - - - Serialization\MessagePackDeserializationConstructorAttribute.cs - - - Serialization\MessagePackEnumAttribute.cs - - - Serialization\MessagePackEnumMemberAttribute.cs - - - Serialization\MessagePackIgnoreAttribute.cs - - - Serialization\MessagePackKnownTypeAttributes.cs - - - Serialization\MessagePackMemberAttribute.cs - - - Serialization\MessagePackRuntimeTypeAttributes.cs - - - Serialization\MessagePackSerializer.cs - - - Serialization\MessagePackSerializer.Factories.cs - - - Serialization\MessagePackSerializerExtensions.cs - - - Serialization\MessagePackSerializerProvider.cs - - - Serialization\MessagePackSerializer`1.cs - - - Serialization\Metadata\_CultureInfo.cs - - - Serialization\Metadata\_DateTimeMessagePackSerializerHelpers.cs - - - Serialization\Metadata\_Decimal.cs - - - Serialization\Metadata\_DictionaryEntry.cs - - - Serialization\Metadata\_DynamicUnpackingContext.cs - - - Serialization\Metadata\_EnumMessagePackSerializerHelpers.cs - - - Serialization\Metadata\_FieldInfo.cs - - - Serialization\Metadata\_IDictionaryEnumerator.cs - - - Serialization\Metadata\_IDisposable.cs - - - Serialization\Metadata\_IEnumreator.cs - - - Serialization\Metadata\_MessagePackObject.cs - - - Serialization\Metadata\_MessagePackSerializer.cs - - - Serialization\Metadata\_MethodBase.cs - - - Serialization\Metadata\_Object.cs - - - Serialization\Metadata\_Packer.cs - - - Serialization\Metadata\_SerializationContext.cs - - - Serialization\Metadata\_String.cs - - - Serialization\Metadata\_Unpacker.cs - - - Serialization\Metadata\_UnpackHelpers.cs - - - Serialization\Metadata\_UnpackHelpers.direct.cs - - - Serialization\NilImplication.cs - - - Serialization\NilImplicationHandler`4.cs - - - Serialization\NullTextWriter.cs - - - Serialization\PackHelperParameters.cs - - - Serialization\PackHelpers.cs - - - Serialization\PolymorphicTypeVerificationContext.cs - - - Serialization\Polymorphic\IPolymorphicDeserializer.cs - - - Serialization\Polymorphic\IPolymorphicHelperAttributes.cs - - - Serialization\Polymorphic\KnownTypePolymorphicMessagePackSerializer`1.cs - - - Serialization\Polymorphic\PolymorphicSerializerProvider`1.cs - - - Serialization\Polymorphic\RuntimeTypeVerifier.cs - - - Serialization\Polymorphic\TypeEmbedingPolymorphicMessagePackSerializer`1.cs - - - Serialization\Polymorphic\TypeInfoEncoder.cs - - - Serialization\Polymorphic\TypeInfoEncoding.cs - - - Serialization\PolymorphismSchema.Constructors.cs - - - Serialization\PolymorphismSchema.cs - - - Serialization\PolymorphismSchema.Internals.cs - - - Serialization\PolymorphismSchemaChildrenType.cs - - - Serialization\PolymorphismTarget.cs - - - Serialization\PolymorphismType.cs - - - Serialization\ReflectionExtensions.CollectionTraits.cs - - - Serialization\ReflectionExtensions.ConstructorDelegate.cs - - - Serialization\ReflectionExtensions.cs - - - Serialization\ReflectionExtensions.InvokePreservingExtension.cs - - - Serialization\ReflectionHelpers.cs - - - Serialization\ReflectionSerializers\ReflectionCollectionMessagePackSerializer`2.cs - - - Serialization\ReflectionSerializers\ReflectionDictionaryMessagePackSerializer`3.cs - - - Serialization\ReflectionSerializers\ReflectionEnumerableMessagePackSerializer`2.cs - - - Serialization\ReflectionSerializers\ReflectionEnumMessagePackSerializer`1.cs - - - Serialization\ReflectionSerializers\ReflectionNilImplicationHandler.cs - - - Serialization\ReflectionSerializers\ReflectionNonGeenricCollectionMessagePackSerializer`1.cs - - - Serialization\ReflectionSerializers\ReflectionNonGeenricEnumerableMessagePackSerializer`1.cs - - - Serialization\ReflectionSerializers\ReflectionNonGenericDictionaryMessagePackSerializer`1.cs - - - Serialization\ReflectionSerializers\ReflectionNonGenericListMessagePackSerializer`1.cs - - - Serialization\ReflectionSerializers\ReflectionObjectMessagePackSerializer`1.cs - - - Serialization\ReflectionSerializers\ReflectionSerializerHelper.cs - - - Serialization\ReflectionSerializers\ReflectionSerializerNilImplicationHandlerOnUnpackedParameter.cs - - - Serialization\ReflectionSerializers\ReflectionSerializerNilImplicationHandlerParameter.cs - - - Serialization\Reflection\GenericTypeExtensions.cs - - - Serialization\Reflection\ReflectionExtensions.cs - - - Serialization\Reflection\TracingILGenerator.conveniences.cs - - - Serialization\Reflection\TracingILGenerator.cs - - - Serialization\Reflection\TracingILGenerator.emits.cs - - - Serialization\ResolveSerializerEventArgs.cs - - - Serialization\SerializationCompatibilityOptions.cs - - - Serialization\SerializationContext.cs - - - Serialization\SerializationContext.ExtTypeCodes.cs - - - Serialization\SerializationExceptions.cs - - - Serialization\SerializationMethod.cs - - - Serialization\SerializationMethodGeneratorOption.cs - - - Serialization\SerializationTarget.cs - - - Serialization\SerializerAssemblyGenerationConfiguration.cs - - - Serialization\SerializerCapabilities.cs - - - Serialization\SerializerCodeGenerationConfiguration.cs - - - Serialization\SerializerCodeGenerationResult.cs - - - Serialization\SerializerCodeInformation.cs - - - Serialization\SerializerDebugging.cs - - - Serialization\SerializerGenerator.cs - - - Serialization\SerializerOptions.cs - - - Serialization\SerializerRegistrationOptions.cs - - - Serialization\SerializerRepository.cs - - - Serialization\SerializerRepository.defaults.cs - - - Serialization\SerializerTypeKeyRepository.cs - - - Serialization\SerializingMember.cs - - - Serialization\SingleTextWriterCodeGenerationSink.cs - - - Serialization\TeeTextWriter.cs - - - Serialization\Tracer.cs - - - Serialization\TypeKeyRepository.cs - - - Serialization\UnpackHelperParameters.cs - - - Serialization\UnpackHelpers.cs - - - Serialization\UnpackHelpers.direct.cs - - - Serialization\UnpackHelpers.facade.cs - - - SetOperation.cs - - - StreamPacker.cs - - - StringEscape.cs - - - SubtreeUnpacker.cs - - - SubtreeUnpacker.Unpacking.cs - - - UnassignedMessageTypeException.cs - - - Unpacker.cs - - - Unpacker.Unpacking.cs - - - UnpackException.cs - - - Unpacking.cs - - - Unpacking.Numerics.cs - - - Unpacking.Others.cs - - - Unpacking.Streaming.cs - - - Unpacking.String.cs - - - UnpackingMode.cs - - - UnpackingResult.cs - - - UnpackingStream.cs - - - UnpackingStreamReader.cs - - - UnsafeNativeMethods.cs - - - Validation.cs - - - - True - True - Delegates.tt - - - - - True - True - Tuple`n.tt - - - - - - MsgPack.snk - - - remarks.xml - - - TextTemplatingFileGenerator - Delegates.cs - - - TextTemplatingFileGenerator - Tuple`n.cs - - - - - - - - \ No newline at end of file diff --git a/src/MsgPack.Net35/Properties/AssemblyInfo.cs b/src/MsgPack.Net35/Properties/AssemblyInfo.cs deleted file mode 100644 index b02142e04..000000000 --- a/src/MsgPack.Net35/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,37 +0,0 @@ -#region -- License Terms -- -// -// MessagePack for CLI -// -// Copyright (C) 2010-2016 FUJIWARA, Yusuke -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// -#endregion -- License Terms -- - -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Security; - -[assembly: AssemblyTitle( "MessagePack for CLI(.NET/Mono)" )] -[assembly: AssemblyDescription( "MessagePack for CLI(.NET/Mono) packing/unpacking library for .NET 3.5." )] - -[assembly: AssemblyFileVersion( "0.7.2259.1047" )] - -[assembly: AllowPartiallyTrustedCallers] - -#if DEBUG || PERFORMANCE_TEST -[assembly: InternalsVisibleTo( "MsgPack.UnitTest.Net35, PublicKey=0024000004800000940000000602000000240000525341310004000001000100a967de8de9d45380b93a6aa56f64fc2cb2d3c9d4b400e00de01f31ba9e15cf5ca95926dbf8760cce413eabd711e23df0c133193a570da8a3bb1bdc00ef170fccb2bc033266fa5346442c9cf0b071133d5b484845eab17095652aeafeeb71193506b8294d9c8c91e3fd01cc50bdbc2d0eb78dd655bb8cd0bd3cdbbcb192549cb4" )] -[assembly: InternalsVisibleTo( "MsgPack.UnitTest.CodeDom.Net35, PublicKey=0024000004800000940000000602000000240000525341310004000001000100a967de8de9d45380b93a6aa56f64fc2cb2d3c9d4b400e00de01f31ba9e15cf5ca95926dbf8760cce413eabd711e23df0c133193a570da8a3bb1bdc00ef170fccb2bc033266fa5346442c9cf0b071133d5b484845eab17095652aeafeeb71193506b8294d9c8c91e3fd01cc50bdbc2d0eb78dd655bb8cd0bd3cdbbcb192549cb4" )] -#endif - - diff --git a/src/MsgPack.Net35/Serialization/.directory b/src/MsgPack.Net35/Serialization/.directory deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/MsgPack.Net35/Serialization/AbstractSerializers/.directory b/src/MsgPack.Net35/Serialization/AbstractSerializers/.directory deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/MsgPack.Net35/Serialization/CodeDomSerializers/.directory b/src/MsgPack.Net35/Serialization/CodeDomSerializers/.directory deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/MsgPack.Net35/Serialization/DefaultSerializers/.directory b/src/MsgPack.Net35/Serialization/DefaultSerializers/.directory deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/MsgPack.Net35/Serialization/EmittingSerializers/.directory b/src/MsgPack.Net35/Serialization/EmittingSerializers/.directory deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/MsgPack.Net35/Serialization/Metadata/.directory b/src/MsgPack.Net35/Serialization/Metadata/.directory deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/MsgPack.Net35/Serialization/Reflection/.directory b/src/MsgPack.Net35/Serialization/Reflection/.directory deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/MsgPack.Net35/Serialization/ReflectionSerializers/.directory b/src/MsgPack.Net35/Serialization/ReflectionSerializers/.directory deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/MsgPack.Net45/MsgPack.Net45.csproj b/src/MsgPack.Net45/MsgPack.Net45.csproj deleted file mode 100644 index bf854895c..000000000 --- a/src/MsgPack.Net45/MsgPack.Net45.csproj +++ /dev/null @@ -1,1084 +0,0 @@ - - - - - Debug - AnyCPU - {9C7B55A6-AF7F-4D26-AB5B-297B7FF25B6D} - Library - Properties - MsgPack - MsgPack - v4.5 - 512 - - - - true - full - false - bin\Debug\ - TRACE;DEBUG;FEATURE_TAP;FEATURE_CONCURRENT;NETFX_45 - prompt - 4 - bin\Debug\MsgPack.XML - - - pdbonly - true - ..\..\bin\net45\ - TRACE;FEATURE_TAP;FEATURE_CONCURRENT;NETFX_45 - prompt - 4 - ..\..\bin\net45\MsgPack.XML - - - true - - - ..\MsgPack.snk - - - bin\CodeAnalysis\ - TRACE;FEATURE_TAP;FEATURE_CONCURRENT;NETFX_45;CODE_ANALYSIS - - true - pdbonly - AnyCPU - prompt - AllRules.ruleset - true - - - - - - - - - Properties\CommonAssemblyInfo.cs - - - AsyncReadResult.cs - - - AsyncReadResult`1.cs - - - BigEndianBinary.cs - - - Binary.cs - - - BufferManager.cs - - - CollectionDebuggerProxy`1.cs - - - CollectionOperation.cs - - - DictionaryDebuggerProxy`2.cs - - - Float32Bits.cs - - - Float64Bits.cs - - - GlobalSuppressions.cs - - - IAsyncPackable.cs - - - IAsyncUnpackable.cs - - - InvalidMessagePackStreamException.cs - - - IPackable.cs - - - ItemsUnpacker.cs - - - ItemsUnpacker.Read.cs - - - ItemsUnpacker.Skipping.cs - - - ItemsUnpacker.Unpacking.cs - - - IUnpackable.cs - - - KnownExtTypeCode.cs - - - KnownExtTypeName.cs - - - MessageNotSupportedException.cs - - - MessagePackCode.cs - - - MessagePackConvert.cs - - - MessagePackExtendedTypeObject.cs - - - MessagePackObject.cs - - - MessagePackObject.Utilities.cs - - - MessagePackObjectDictionary.cs - - - MessagePackObjectDictionary.Enumerator.cs - - - MessagePackObjectDictionary.KeySet.cs - - - MessagePackObjectDictionary.KeySet.Enumerator.cs - - - MessagePackObjectDictionary.ValueCollection.cs - - - MessagePackObjectDictionary.ValueCollection.Enumerator.cs - - - MessagePackObjectEqualityComparer.cs - - - MessagePackString.cs - - - MessageTypeException.cs - - - Packer.cs - - - Packer.Nullable.cs - - - Packer.Packing.cs - - - PackerCompatibilityOptions.cs - - - PackerUnpackerExtensions.cs - - - PackerUnpackerStreamOptions.cs - - - PackingOptions.cs - - - PreserveAttribute.cs - - - ReflectionAbstractions.cs - - - Serialization\AbstractSerializers\ActionType.cs - - - Serialization\AbstractSerializers\CachedDelegateInfo.cs - - - Serialization\AbstractSerializers\ConstructorDefinition.cs - - - Serialization\AbstractSerializers\DynamicUnpackingContext.cs - - - Serialization\AbstractSerializers\EnumSerializerMethod.cs - - - Serialization\AbstractSerializers\FieldDefinition.cs - - - Serialization\AbstractSerializers\FieldName.cs - - - Serialization\AbstractSerializers\ICodeConstruct.cs - - - Serialization\AbstractSerializers\ISerializerBuilder.cs - - - Serialization\AbstractSerializers\ISerializerCodeGenerationContext.cs - - - Serialization\AbstractSerializers\ISerializerCodeGenerator.cs - - - Serialization\AbstractSerializers\MethodDefinition.cs - - - Serialization\AbstractSerializers\MethodName.cs - - - Serialization\AbstractSerializers\MethodNamePrefix.cs - - - Serialization\AbstractSerializers\SerializerBuilderHelper.cs - - - Serialization\AbstractSerializers\SerializerBuilder`2.Collection.cs - - - Serialization\AbstractSerializers\SerializerBuilder`2.CommonConstructs.cs - - - Serialization\AbstractSerializers\SerializerBuilder`2.cs - - - Serialization\AbstractSerializers\SerializerBuilder`2.Enum.cs - - - Serialization\AbstractSerializers\SerializerBuilder`2.Nullable.cs - - - Serialization\AbstractSerializers\SerializerBuilder`2.Object.cs - - - Serialization\AbstractSerializers\SerializerBuilder`2.Tuple.cs - - - Serialization\AbstractSerializers\SerializerFieldKey.cs - - - Serialization\AbstractSerializers\SerializerGenerationContext.cs - - - Serialization\AbstractSerializers\SerializerSpecification.cs - - - Serialization\AbstractSerializers\TypeDefinition.cs - - - Serialization\CodeDomSerializers\CodeDomConstruct.cs - - - Serialization\CodeDomSerializers\CodeDomContext.cs - - - Serialization\CodeDomSerializers\CodeDomSerializerBuilder.cs - - - Serialization\CodeDomSerializers\ExpressionCodeDomConstruct.cs - - - Serialization\CodeDomSerializers\ParameterCodeDomConstruct.cs - - - Serialization\CodeDomSerializers\StatementCodeDomConstruct.cs - - - Serialization\CodeDomSerializers\VariableCodeDomConstruct.cs - - - Serialization\CodeGenerationSink.cs - - - Serialization\CollectionDetailedKind.cs - - - Serialization\CollectionKind.cs - - - Serialization\CollectionSerializers\CollectionMessagePackSerializerBase`2.cs - - - Serialization\CollectionSerializers\CollectionMessagePackSerializer`2.cs - - - Serialization\CollectionSerializers\CollectionSerializerHelpers.cs - - - Serialization\CollectionSerializers\DictionaryMessagePackSerializerBase`3.cs - - - Serialization\CollectionSerializers\DictionaryMessagePackSerializer`3.cs - - - Serialization\CollectionSerializers\EnumerableMessagePackSerializerBase`2.cs - - - Serialization\CollectionSerializers\EnumerableMessagePackSerializer`2.cs - - - Serialization\CollectionSerializers\ICollectionInstanceFactory.cs - - - Serialization\CollectionSerializers\NonGenericCollectionMessagePackSerializer`1.cs - - - Serialization\CollectionSerializers\NonGenericDictionaryMessagePackSerializer`1.cs - - - Serialization\CollectionSerializers\NonGenericEnumerableMessagePackSerializerBase`1.cs - - - Serialization\CollectionSerializers\NonGenericEnumerableMessagePackSerializer`1.cs - - - Serialization\CollectionSerializers\NonGenericListMessagePackSerializer`1.cs - - - Serialization\CollectionSerializers\ReadOnlyCollectionMessagePackSerializer`2.cs - - - Serialization\CollectionSerializers\ReadOnlyDictionaryMessagePackSerializer`3.cs - - - Serialization\CollectionTraitOptions.cs - - - Serialization\CollectionTraits.cs - - - Serialization\DataMemberContract.cs - - - Serialization\DateTimeConversionMethod.cs - - - Serialization\DateTimeMemberConversionMethod.cs - - - Serialization\DateTimeMessagePackSerializerHelpers.cs - - - Serialization\DefaultConcreteTypeRepository.cs - - - Serialization\DefaultSerializerNameResolver.cs - - - Serialization\DefaultSerializers\AbstractCollectionMessagePackSerializer`2.cs - - - Serialization\DefaultSerializers\AbstractCollectionSerializerHelper.cs - - - Serialization\DefaultSerializers\AbstractDictionaryMessagePackSerializer`3.cs - - - Serialization\DefaultSerializers\AbstractEnumerableMessagePackSerializer`2.cs - - - Serialization\DefaultSerializers\AbstractNonGenericCollectionMessagePackSerializer`1.cs - - - Serialization\DefaultSerializers\AbstractNonGenericDictionaryMessagePackSerializer`1.cs - - - Serialization\DefaultSerializers\AbstractNonGenericEnumerableMessagePackSerializer`1.cs - - - Serialization\DefaultSerializers\AbstractNonGenericListMessagePackSerializer`1.cs - - - Serialization\DefaultSerializers\AbstractReadOnlyCollectionMessagePackSerializer`2.cs - - - Serialization\DefaultSerializers\AbstractReadOnlyDictionaryMessagePackSerializer`3.cs - - - Serialization\DefaultSerializers\ArraySegmentMessageSerializer.cs - - - Serialization\DefaultSerializers\ArraySerializer.cs - - - Serialization\DefaultSerializers\ArraySerializer.Primitives.cs - - - Serialization\DefaultSerializers\ArraySerializer`1.cs - - - Serialization\DefaultSerializers\DateTimeMessagePackSerializerProvider.cs - - - Serialization\DefaultSerializers\DateTimeOffsetMessagePackSerializer.cs - - - Serialization\DefaultSerializers\DateTimeOffsetMessagePackSerializerProvider.cs - - - Serialization\DefaultSerializers\DefaultSerializers.cs - - - Serialization\DefaultSerializers\FileTimeMessagePackSerializerProvider.cs - - - Serialization\DefaultSerializers\FSharpCollectionSerializer`2.cs - - - Serialization\DefaultSerializers\FSharpMapSerializer`3.cs - - - Serialization\DefaultSerializers\GenericSerializer.cs - - - Serialization\DefaultSerializers\ImmutableCollectionSerializer`2.cs - - - Serialization\DefaultSerializers\ImmutableDictionarySerializer`3.cs - - - Serialization\DefaultSerializers\ImmutableStackSerializer`2.cs - - - Serialization\DefaultSerializers\InternalDateTimeExtensions.cs - - - Serialization\DefaultSerializers\MessagePackObjectExtensions.cs - - - Serialization\DefaultSerializers\MsgPack_MessagePackExtendedTypeObjectMessagePackSerializer.cs - - - Serialization\DefaultSerializers\MsgPack_MessagePackObjectDictionaryMessagePackSerializer.cs - - - Serialization\DefaultSerializers\MsgPack_MessagePackObjectMessagePackSerializer.cs - - - Serialization\DefaultSerializers\MultidimensionalArraySerializer`1.cs - - - Serialization\DefaultSerializers\NativeDateTimeMessagePackSerializer.cs - - - Serialization\DefaultSerializers\NativeFileTimeMessagePackSerializer.cs - - - Serialization\DefaultSerializers\NullableMessagePackSerializer`1.cs - - - Serialization\DefaultSerializers\System_ArraySegment_1MessagePackSerializer`1.cs - - - Serialization\DefaultSerializers\System_ByteArrayMessagePackSerializer.cs - - - Serialization\DefaultSerializers\System_CharArrayMessagePackSerializer.cs - - - Serialization\DefaultSerializers\System_Collections_DictionaryEntryMessagePackSerializer.cs - - - Serialization\DefaultSerializers\System_Collections_Generic_Dictionary_2MessagePackSerializer`2.cs - - - Serialization\DefaultSerializers\System_Collections_Generic_KeyValuePair_2MessagePackSerializer`2.cs - - - Serialization\DefaultSerializers\System_Collections_Generic_ListOfMessagePackObjectMessagePackSerializer.cs - - - Serialization\DefaultSerializers\System_Collections_Generic_List_1MessagePackSerializer`1.cs - - - Serialization\DefaultSerializers\System_Collections_Generic_Queue_1MessagePackSerializer`1.cs - - - Serialization\DefaultSerializers\System_Collections_Generic_Stack_1MessagePackSerializer`1.cs - - - Serialization\DefaultSerializers\System_Collections_QueueMessagePackSerializer.cs - - - Serialization\DefaultSerializers\System_Collections_Specialized_NameValueCollectionMessagePackSerializer.cs - - - Serialization\DefaultSerializers\System_Collections_StackMessagePackSerializer.cs - - - Serialization\DefaultSerializers\System_DBNullMessagePackSerializer.cs - - - Serialization\DefaultSerializers\System_Globalization_CultureInfoMessagePackSerializer.cs - - - Serialization\DefaultSerializers\System_Numerics_ComplexMessagePackSerializer.cs - - - Serialization\DefaultSerializers\System_ObjectMessagePackSerializer.cs - - - Serialization\DefaultSerializers\System_StringMessagePackSerializer.cs - - - Serialization\DefaultSerializers\System_Text_StringBuilderMessagePackSerializer.cs - - - Serialization\DefaultSerializers\System_UriMessagePackSerializer.cs - - - Serialization\DefaultSerializers\System_VersionMessagePackSerializer.cs - - - Serialization\DefaultSerializers\UnixEpocDateTimeMessagePackSerializer.cs - - - Serialization\DefaultSerializers\UnixEpocFileTimeMessagePackSerializer.cs - - - Serialization\DependentAssemblyManager.cs - - - Serialization\DictionaryKeyTransformers.cs - - - Serialization\DictionarySerlaizationOptions.cs - - - Serialization\EmitterFlavor.cs - - - Serialization\EmittingSerializers\AndConditionILConstruct.cs - - - Serialization\EmittingSerializers\AssemblyBuilderCodeGenerationContext.cs - - - Serialization\EmittingSerializers\AssemblyBuilderEmittingContext.cs - - - Serialization\EmittingSerializers\AssemblyBuilderSerializerBuilder.cs - - - Serialization\EmittingSerializers\BinaryOperatorILConstruct.cs - - - Serialization\EmittingSerializers\ConditionalILConstruct.cs - - - Serialization\EmittingSerializers\ContextfulILConstruct.cs - - - Serialization\EmittingSerializers\ILConstruct.cs - - - Serialization\EmittingSerializers\ILMethodConctext.cs - - - Serialization\EmittingSerializers\InvocationILConsruct.cs - - - Serialization\EmittingSerializers\LoadFieldILConstruct.cs - - - Serialization\EmittingSerializers\SequenceILConstruct.cs - - - Serialization\EmittingSerializers\SerializationMethodGeneratorManager.cs - - - Serialization\EmittingSerializers\SerializerEmitter.cs - - - Serialization\EmittingSerializers\SerializerEmitter.enum.cs - - - Serialization\EmittingSerializers\SerializerEmitter.object.cs - - - Serialization\EmittingSerializers\SinglelStepILConstruct.cs - - - Serialization\EmittingSerializers\StatementExpressionILConstruct.cs - - - Serialization\EmittingSerializers\StoreFieldILConstruct.cs - - - Serialization\EmittingSerializers\StoreVariableILConstruct.cs - - - Serialization\EmittingSerializers\UnaryOperatorILConstruct.cs - - - Serialization\EmittingSerializers\VariableILConstruct.cs - - - Serialization\EnumMemberSerializationMethod.cs - - - Serialization\EnumMessagePackSerializerHelpers.cs - - - Serialization\EnumMessagePackSerializerProvider.cs - - - Serialization\EnumMessagePackSerializer`1.cs - - - Serialization\EnumNameTransformers.cs - - - Serialization\EnumSerializationMethod.cs - - - Serialization\EnumSerializationOptions.cs - - - Serialization\ExtTypeCodeMapping.cs - - - Serialization\FromExpression.cs - - - Serialization\FromExpression.ToMethod.cs - - - Serialization\ICustomizableEnumSerializer.cs - - - Serialization\IdentifierUtility.cs - - - Serialization\IMessagePackSerializer.cs - - - Serialization\IMessagePackSingleObjectSerializer.cs - - - Serialization\IndividualFileCodeGenerationSink.cs - - - Serialization\INilImplicationHandlerOnUnpackedParameter.cs - - - Serialization\INilImplicationHandlerParameter.cs - - - Serialization\ISerializerGeneratorConfiguration.cs - - - Serialization\KeyNameTransformers.cs - - - Serialization\LazyDelegatingMessagePackSerializer`1.cs - - - Serialization\MessagePackDateTimeMemberAttribute.cs - - - Serialization\MessagePackDeserializationConstructorAttribute.cs - - - Serialization\MessagePackEnumAttribute.cs - - - Serialization\MessagePackEnumMemberAttribute.cs - - - Serialization\MessagePackIgnoreAttribute.cs - - - Serialization\MessagePackKnownTypeAttributes.cs - - - Serialization\MessagePackMemberAttribute.cs - - - Serialization\MessagePackRuntimeTypeAttributes.cs - - - Serialization\MessagePackSerializer.cs - - - Serialization\MessagePackSerializer.Factories.cs - - - Serialization\MessagePackSerializerExtensions.cs - - - Serialization\MessagePackSerializerProvider.cs - - - Serialization\MessagePackSerializer`1.cs - - - Serialization\Metadata\_CultureInfo.cs - - - Serialization\Metadata\_DateTimeMessagePackSerializerHelpers.cs - - - Serialization\Metadata\_Decimal.cs - - - Serialization\Metadata\_DictionaryEntry.cs - - - Serialization\Metadata\_DynamicUnpackingContext.cs - - - Serialization\Metadata\_EnumMessagePackSerializerHelpers.cs - - - Serialization\Metadata\_FieldInfo.cs - - - Serialization\Metadata\_IDictionaryEnumerator.cs - - - Serialization\Metadata\_IDisposable.cs - - - Serialization\Metadata\_IEnumreator.cs - - - Serialization\Metadata\_MessagePackObject.cs - - - Serialization\Metadata\_MessagePackSerializer.cs - - - Serialization\Metadata\_MethodBase.cs - - - Serialization\Metadata\_Object.cs - - - Serialization\Metadata\_Packer.cs - - - Serialization\Metadata\_SerializationContext.cs - - - Serialization\Metadata\_String.cs - - - Serialization\Metadata\_Unpacker.cs - - - Serialization\Metadata\_UnpackHelpers.cs - - - Serialization\Metadata\_UnpackHelpers.direct.cs - - - Serialization\NilImplication.cs - - - Serialization\NilImplicationHandler`4.cs - - - Serialization\NullTextWriter.cs - - - Serialization\PackHelperParameters.cs - - - Serialization\PackHelpers.cs - - - Serialization\PolymorphicTypeVerificationContext.cs - - - Serialization\Polymorphic\IPolymorphicDeserializer.cs - - - Serialization\Polymorphic\IPolymorphicHelperAttributes.cs - - - Serialization\Polymorphic\KnownTypePolymorphicMessagePackSerializer`1.cs - - - Serialization\Polymorphic\PolymorphicSerializerProvider`1.cs - - - Serialization\Polymorphic\RuntimeTypeVerifier.cs - - - Serialization\Polymorphic\TypeEmbedingPolymorphicMessagePackSerializer`1.cs - - - Serialization\Polymorphic\TypeInfoEncoder.cs - - - Serialization\Polymorphic\TypeInfoEncoding.cs - - - Serialization\PolymorphismSchema.Constructors.cs - - - Serialization\PolymorphismSchema.cs - - - Serialization\PolymorphismSchema.Internals.cs - - - Serialization\PolymorphismSchemaChildrenType.cs - - - Serialization\PolymorphismTarget.cs - - - Serialization\PolymorphismType.cs - - - Serialization\ReflectionExtensions.CollectionTraits.cs - - - Serialization\ReflectionExtensions.ConstructorDelegate.cs - - - Serialization\ReflectionExtensions.cs - - - Serialization\ReflectionExtensions.InvokePreservingExtension.cs - - - Serialization\ReflectionHelpers.cs - - - Serialization\ReflectionSerializers\ReflectionCollectionMessagePackSerializer`2.cs - - - Serialization\ReflectionSerializers\ReflectionDictionaryMessagePackSerializer`3.cs - - - Serialization\ReflectionSerializers\ReflectionEnumerableMessagePackSerializer`2.cs - - - Serialization\ReflectionSerializers\ReflectionEnumMessagePackSerializer`1.cs - - - Serialization\ReflectionSerializers\ReflectionNilImplicationHandler.cs - - - Serialization\ReflectionSerializers\ReflectionNonGeenricCollectionMessagePackSerializer`1.cs - - - Serialization\ReflectionSerializers\ReflectionNonGeenricEnumerableMessagePackSerializer`1.cs - - - Serialization\ReflectionSerializers\ReflectionNonGenericDictionaryMessagePackSerializer`1.cs - - - Serialization\ReflectionSerializers\ReflectionNonGenericListMessagePackSerializer`1.cs - - - Serialization\ReflectionSerializers\ReflectionObjectMessagePackSerializer`1.cs - - - Serialization\ReflectionSerializers\ReflectionSerializerHelper.cs - - - Serialization\ReflectionSerializers\ReflectionSerializerNilImplicationHandlerOnUnpackedParameter.cs - - - Serialization\ReflectionSerializers\ReflectionSerializerNilImplicationHandlerParameter.cs - - - Serialization\ReflectionSerializers\ReflectionTupleMessagePackSerializer`1.cs - - - Serialization\Reflection\GenericTypeExtensions.cs - - - Serialization\Reflection\ReflectionExtensions.cs - - - Serialization\Reflection\TracingILGenerator.conveniences.cs - - - Serialization\Reflection\TracingILGenerator.cs - - - Serialization\Reflection\TracingILGenerator.emits.cs - - - Serialization\ResolveSerializerEventArgs.cs - - - Serialization\SerializationCompatibilityOptions.cs - - - Serialization\SerializationContext.cs - - - Serialization\SerializationContext.ExtTypeCodes.cs - - - Serialization\SerializationExceptions.cs - - - Serialization\SerializationMethod.cs - - - Serialization\SerializationMethodGeneratorOption.cs - - - Serialization\SerializationTarget.cs - - - Serialization\SerializerAssemblyGenerationConfiguration.cs - - - Serialization\SerializerCapabilities.cs - - - Serialization\SerializerCodeGenerationConfiguration.cs - - - Serialization\SerializerCodeGenerationResult.cs - - - Serialization\SerializerCodeInformation.cs - - - Serialization\SerializerDebugging.cs - - - Serialization\SerializerGenerator.cs - - - Serialization\SerializerOptions.cs - - - Serialization\SerializerRegistrationOptions.cs - - - Serialization\SerializerRepository.cs - - - Serialization\SerializerRepository.defaults.cs - - - Serialization\SerializerTypeKeyRepository.cs - - - Serialization\SerializingMember.cs - - - Serialization\SingleTextWriterCodeGenerationSink.cs - - - Serialization\TeeTextWriter.cs - - - Serialization\Tracer.cs - - - Serialization\TypeKeyRepository.cs - - - Serialization\UnpackHelperParameters.cs - - - Serialization\UnpackHelpers.cs - - - Serialization\UnpackHelpers.direct.cs - - - Serialization\UnpackHelpers.facade.cs - - - SetOperation.cs - - - StreamPacker.cs - - - StringEscape.cs - - - SubtreeUnpacker.cs - - - SubtreeUnpacker.Unpacking.cs - - - TupleItems.cs - - - UnassignedMessageTypeException.cs - - - Unpacker.cs - - - Unpacker.Unpacking.cs - - - UnpackException.cs - - - Unpacking.cs - - - Unpacking.Numerics.cs - - - Unpacking.Others.cs - - - Unpacking.Streaming.cs - - - Unpacking.String.cs - - - UnpackingMode.cs - - - UnpackingResult.cs - - - UnpackingStream.cs - - - UnpackingStreamReader.cs - - - UnsafeNativeMethods.cs - - - Validation.cs - - - - - - MsgPack.snk - - - remarks.xml - - - - - \ No newline at end of file diff --git a/src/MsgPack.Net45/Properties/AssemblyInfo.cs b/src/MsgPack.Net45/Properties/AssemblyInfo.cs deleted file mode 100644 index cecb1474f..000000000 --- a/src/MsgPack.Net45/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,39 +0,0 @@ -#region -- License Terms -- -// -// MessagePack for CLI -// -// Copyright (C) 2015-2016 FUJIWARA, Yusuke -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// -#endregion -- License Terms -- - -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Security; - -[assembly: AssemblyTitle( "MessagePack for CLI(.NET/Mono)" )] -[assembly: AssemblyDescription( "MessagePack for CLI(.NET/Mono) packing/unpacking library." )] - -[assembly: AssemblyFileVersion( "0.7.2259.1047" )] - -[assembly: SecurityRules( SecurityRuleSet.Level2, SkipVerificationInFullTrust = true )] -[assembly: AllowPartiallyTrustedCallers] - -#if DEBUG || PERFORMANCE_TEST -[assembly: InternalsVisibleTo( "MsgPack.UnitTest, PublicKey=0024000004800000940000000602000000240000525341310004000001000100a967de8de9d45380b93a6aa56f64fc2cb2d3c9d4b400e00de01f31ba9e15cf5ca95926dbf8760cce413eabd711e23df0c133193a570da8a3bb1bdc00ef170fccb2bc033266fa5346442c9cf0b071133d5b484845eab17095652aeafeeb71193506b8294d9c8c91e3fd01cc50bdbc2d0eb78dd655bb8cd0bd3cdbbcb192549cb4" )] -[assembly: InternalsVisibleTo( "MsgPack.UnitTest.CodeDom, PublicKey=0024000004800000940000000602000000240000525341310004000001000100a967de8de9d45380b93a6aa56f64fc2cb2d3c9d4b400e00de01f31ba9e15cf5ca95926dbf8760cce413eabd711e23df0c133193a570da8a3bb1bdc00ef170fccb2bc033266fa5346442c9cf0b071133d5b484845eab17095652aeafeeb71193506b8294d9c8c91e3fd01cc50bdbc2d0eb78dd655bb8cd0bd3cdbbcb192549cb4" )] -[assembly: InternalsVisibleTo( "MsgPack.UnitTest.BclExtensions, PublicKey=0024000004800000940000000602000000240000525341310004000001000100a967de8de9d45380b93a6aa56f64fc2cb2d3c9d4b400e00de01f31ba9e15cf5ca95926dbf8760cce413eabd711e23df0c133193a570da8a3bb1bdc00ef170fccb2bc033266fa5346442c9cf0b071133d5b484845eab17095652aeafeeb71193506b8294d9c8c91e3fd01cc50bdbc2d0eb78dd655bb8cd0bd3cdbbcb192549cb4" )] -#endif - - diff --git a/src/MsgPack.Silverlight.5/MsgPack.Silverlight.5.csproj b/src/MsgPack.Silverlight.5/MsgPack.Silverlight.5.csproj index 7eeefd7ec..ce4905f1d 100644 --- a/src/MsgPack.Silverlight.5/MsgPack.Silverlight.5.csproj +++ b/src/MsgPack.Silverlight.5/MsgPack.Silverlight.5.csproj @@ -1,15 +1,11 @@  - Debug - AnyCPU 8.0.50727 2.0 {F9477829-6A6D-4540-9F0D-68F8C6D8E18B} {A1591282-1198-4647-A2B1-27E5FF5F6F3B};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} Library - Properties - MsgPack MsgPack Silverlight v5.0 @@ -24,47 +20,15 @@ v3.5 - - true - full - false - Bin\Debug - DEBUG;TRACE;SILVERLIGHT - true - true - prompt - 4 - Bin\Debug\MsgPack.XML - - - pdbonly - true - ..\..\bin\sl5\ - TRACE;SILVERLIGHT - true - true - prompt - 4 - ..\..\bin\sl5\MsgPack.XML - - - true - + - ..\MsgPack.snk - - - bin\CodeAnalysis\ - TRACE;SILVERLIGHT;CODE_ANALYSIS - - true true - pdbonly - AnyCPU - prompt - AllRules.ruleset true - true + $(DefineConstants);SILVERLIGHT + + + $(SolutionDir)\bin\sl5\ + $(SolutionDir)\bin\sl5\MsgPack.XML @@ -77,9 +41,6 @@ Properties\CommonAssemblyInfo.cs - - Volatile.cs - AsyncReadResult.cs @@ -266,33 +227,57 @@ ReflectionAbstractions.cs + + Serialization\FromExpression.cs + + + Serialization\FromExpression.ToMethod.cs + + + Serialization\Metadata\_MessagePackSerializer.cs + + + Serialization\Metadata\_SerializationContext.cs + + + Serialization\Reflection\TracingILGenerator.conveniences.cs + + + Serialization\Reflection\TracingILGenerator.cs + + + Serialization\Reflection\TracingILGenerator.emits.cs + + + Serialization\ReflectionExtensions.ConstructorDelegate.cs + Serialization\CollectionDetailedKind.cs Serialization\CollectionKind.cs - - Serialization\CollectionSerializers\CollectionMessagePackSerializerBase`2.cs - Serialization\CollectionSerializers\CollectionMessagePackSerializer`2.cs + + Serialization\CollectionSerializers\CollectionMessagePackSerializerBase`2.cs + Serialization\CollectionSerializers\CollectionSerializerHelpers.cs - - Serialization\CollectionSerializers\DictionaryMessagePackSerializerBase`3.cs - Serialization\CollectionSerializers\DictionaryMessagePackSerializer`3.cs - - Serialization\CollectionSerializers\EnumerableMessagePackSerializerBase`2.cs + + Serialization\CollectionSerializers\DictionaryMessagePackSerializerBase`3.cs Serialization\CollectionSerializers\EnumerableMessagePackSerializer`2.cs + + Serialization\CollectionSerializers\EnumerableMessagePackSerializerBase`2.cs + Serialization\CollectionSerializers\ICollectionInstanceFactory.cs @@ -302,12 +287,12 @@ Serialization\CollectionSerializers\NonGenericDictionaryMessagePackSerializer`1.cs - - Serialization\CollectionSerializers\NonGenericEnumerableMessagePackSerializerBase`1.cs - Serialization\CollectionSerializers\NonGenericEnumerableMessagePackSerializer`1.cs + + Serialization\CollectionSerializers\NonGenericEnumerableMessagePackSerializerBase`1.cs + Serialization\CollectionSerializers\NonGenericListMessagePackSerializer`1.cs @@ -425,12 +410,12 @@ Serialization\DefaultSerializers\System_Collections_Generic_KeyValuePair_2MessagePackSerializer`2.cs - - Serialization\DefaultSerializers\System_Collections_Generic_ListOfMessagePackObjectMessagePackSerializer.cs - Serialization\DefaultSerializers\System_Collections_Generic_List_1MessagePackSerializer`1.cs + + Serialization\DefaultSerializers\System_Collections_Generic_ListOfMessagePackObjectMessagePackSerializer.cs + Serialization\DefaultSerializers\System_Collections_Generic_Queue_1MessagePackSerializer`1.cs @@ -476,15 +461,15 @@ Serialization\EnumMemberSerializationMethod.cs + + Serialization\EnumMessagePackSerializer`1.cs + Serialization\EnumMessagePackSerializerHelpers.cs Serialization\EnumMessagePackSerializerProvider.cs - - Serialization\EnumMessagePackSerializer`1.cs - Serialization\EnumNameTransformers.cs @@ -497,12 +482,6 @@ Serialization\ExtTypeCodeMapping.cs - - Serialization\FromExpression.cs - - - Serialization\FromExpression.ToMethod.cs - Serialization\ICustomizableEnumSerializer.cs @@ -557,21 +536,15 @@ Serialization\MessagePackSerializer.Factories.cs + + Serialization\MessagePackSerializer`1.cs + Serialization\MessagePackSerializerExtensions.cs Serialization\MessagePackSerializerProvider.cs - - Serialization\MessagePackSerializer`1.cs - - - Serialization\Metadata\_MessagePackSerializer.cs - - - Serialization\Metadata\_SerializationContext.cs - Serialization\NilImplication.cs @@ -587,9 +560,6 @@ Serialization\PackHelpers.cs - - Serialization\PolymorphicTypeVerificationContext.cs - Serialization\Polymorphic\IPolymorphicDeserializer.cs @@ -614,6 +584,9 @@ Serialization\Polymorphic\TypeInfoEncoding.cs + + Serialization\PolymorphicTypeVerificationContext.cs + Serialization\PolymorphismSchema.Constructors.cs @@ -632,12 +605,15 @@ Serialization\PolymorphismType.cs + + Serialization\Reflection\GenericTypeExtensions.cs + + + Serialization\Reflection\ReflectionExtensions.cs + Serialization\ReflectionExtensions.CollectionTraits.cs - - Serialization\ReflectionExtensions.ConstructorDelegate.cs - Serialization\ReflectionExtensions.cs @@ -689,21 +665,6 @@ Serialization\ReflectionSerializers\ReflectionTupleMessagePackSerializer`1.cs - - Serialization\Reflection\GenericTypeExtensions.cs - - - Serialization\Reflection\ReflectionExtensions.cs - - - Serialization\Reflection\TracingILGenerator.conveniences.cs - - - Serialization\Reflection\TracingILGenerator.cs - - - Serialization\Reflection\TracingILGenerator.emits.cs - Serialization\ResolveSerializerEventArgs.cs @@ -836,6 +797,9 @@ UnsafeNativeMethods.cs + + Volatile.cs + diff --git a/src/MsgPack.Silverlight.5/Serialization/SourceLevels.cs b/src/MsgPack.Silverlight.5/Serialization/SourceLevels.cs deleted file mode 100644 index a16953c12..000000000 --- a/src/MsgPack.Silverlight.5/Serialization/SourceLevels.cs +++ /dev/null @@ -1,37 +0,0 @@ -#region -- License Terms -- -// -// MessagePack for CLI -// -// Copyright (C) 2010-2012 FUJIWARA, Yusuke -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// -#endregion -- License Terms -- - -#if SILVERLIGHT || XAMDROID -using System; - -namespace MsgPack.Serialization -{ - /// - /// System.Diagnostics.SourceLevels alternative. - /// - [Flags] - internal enum SourceLevels - { - Verbose = 0x1, - Information = 0x2, - All = unchecked( ( int )0xffffffff ) - } -} -#endif // if SILVERLIGHT || XAMDROID diff --git a/src/MsgPack.Silverlight.5/Serialization/SourceSwitch.cs b/src/MsgPack.Silverlight.5/Serialization/SourceSwitch.cs deleted file mode 100644 index c75aeacfc..000000000 --- a/src/MsgPack.Silverlight.5/Serialization/SourceSwitch.cs +++ /dev/null @@ -1,41 +0,0 @@ -#region -- License Terms -- -// -// MessagePack for CLI -// -// Copyright (C) 2010-2012 FUJIWARA, Yusuke -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// -#endregion -- License Terms -- - -#if SILVERLIGHT || XAMDROID -using System; - -namespace MsgPack.Serialization -{ - /// - /// System.Diagnostics.SourceSwitch alternative. - /// - internal sealed class SourceSwitch - { - [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "For API compatibility" )] - public SourceLevels Level - { - get; - set; - } - - internal SourceSwitch() { } - } -} -#endif // if SILVERLIGHT || XAMDROID \ No newline at end of file diff --git a/src/MsgPack.Silverlight.5/Serialization/TraceEventType.cs b/src/MsgPack.Silverlight.5/Serialization/TraceEventType.cs deleted file mode 100644 index eca98b1c5..000000000 --- a/src/MsgPack.Silverlight.5/Serialization/TraceEventType.cs +++ /dev/null @@ -1,35 +0,0 @@ -#region -- License Terms -- -// -// MessagePack for CLI -// -// Copyright (C) 2010-2012 FUJIWARA, Yusuke -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// -#endregion -- License Terms -- - -#if SILVERLIGHT || XAMDROID -using System; - -namespace MsgPack.Serialization -{ - /// - /// System.Diagnostics.TraceEventType alternative. - /// - internal enum TraceEventType - { - Verbose, - Information - } -} -#endif // if SILVERLIGHT || XAMDROID \ No newline at end of file diff --git a/src/MsgPack.Silverlight.5/Serialization/TraceSource.cs b/src/MsgPack.Silverlight.5/Serialization/TraceSource.cs deleted file mode 100644 index a6cfbd05a..000000000 --- a/src/MsgPack.Silverlight.5/Serialization/TraceSource.cs +++ /dev/null @@ -1,71 +0,0 @@ -#region -- License Terms -- -// -// MessagePack for CLI -// -// Copyright (C) 2010-2012 FUJIWARA, Yusuke -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// -#endregion -- License Terms -- - -#if SILVERLIGHT || XAMDROID -using System; -using System.Diagnostics; -using System.Globalization; - -namespace MsgPack.Serialization -{ - /// - /// System.Diagnostics.TraceSource alternative. - /// - internal sealed class TraceSource - { - private const string _template = "{0} {1}: {2} :{3}"; - - private readonly SourceSwitch _switch = new SourceSwitch() { Level = SourceLevels.All }; - - [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "For API compatibility" )] - public SourceSwitch Switch - { - get { return this._switch; } - } - - [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields", Justification = "Debugging code only" )] - private readonly string _name; - - public TraceSource( string name ) - { - this._name = name; - } - - [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1822:MarkMembersAsStatic", Justification = "For API compatibility" )] - [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "eventType", Justification = "Debugging code only" )] - [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "eventId", Justification = "Debugging code only" )] - [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "data", Justification = "Debugging code only" )] - public void TraceData( TraceEventType eventType, int eventId, object data ) - { - Debug.WriteLine( _template, this._name, eventType, eventId, data ); - } - - [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1822:MarkMembersAsStatic", Justification = "For API compatibility" )] - [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "eventType", Justification = "Debugging code only" )] - [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "eventId", Justification = "Debugging code only" )] - [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "format", Justification = "Debugging code only" )] - [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "args", Justification = "Debugging code only" )] - public void TraceEvent( TraceEventType eventType, int eventId, string format, params object[] args ) - { - Debug.WriteLine( _template, this._name, eventType, eventId, String.Format( CultureInfo.CurrentCulture, format, args ) ); - } - } -} -#endif // if SILVERLIGHT || XAMDROID \ No newline at end of file diff --git a/src/MsgPack.Silverlight.WindowsPhone/MsgPack.Silverlight.WindowsPhone.csproj b/src/MsgPack.Silverlight.WindowsPhone/MsgPack.Silverlight.WindowsPhone.csproj index a041ef1dd..a1a010c92 100644 --- a/src/MsgPack.Silverlight.WindowsPhone/MsgPack.Silverlight.WindowsPhone.csproj +++ b/src/MsgPack.Silverlight.WindowsPhone/MsgPack.Silverlight.WindowsPhone.csproj @@ -1,15 +1,11 @@  - Debug - AnyCPU 10.0.20506 2.0 {336AC996-060D-4109-B99B-854CCEEEA695} {C089C8C0-30E0-4E22-80C0-CE093F111A43};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} Library - Properties - MsgPack MsgPack WindowsPhone v8.0 @@ -19,101 +15,16 @@ 11.0 true - - true - full - false - Bin\Debug - TRACE;DEBUG;SILVERLIGHT;WINDOWS_PHONE;AOT - true - true - prompt - 4 - - - pdbonly - true - ..\..\bin\windowsphone8\ - TRACE;SILVERLIGHT;WINDOWS_PHONE;AOT - true - true - prompt - 4 - ..\..\bin\windowsphone8\MsgPack.XML - - - true - full - false - Bin\x86\Debug - DEBUG;TRACE;SILVERLIGHT;WINDOWS_PHONE;AOT - true - true - prompt - 4 - - - pdbonly - true - Bin\x86\Release - TRACE;SILVERLIGHT;WINDOWS_PHONE;AOT - true - true - prompt - 4 - - - true - full - false - Bin\ARM\Debug - DEBUG;TRACE;SILVERLIGHT;WINDOWS_PHONE;AOT - true - true - prompt - 4 - - - pdbonly - true - Bin\ARM\Release - TRACE;SILVERLIGHT;WINDOWS_PHONE;AOT + + true true - prompt - 4 - - - bin\CodeAnalysis\ - TRACE;SILVERLIGHT;WINDOWS_PHONE;AOT;CODE_ANALYSIS - - true - true - pdbonly - AnyCPU - prompt - AllRules.ruleset - true - - - bin\x86\CodeAnalysis\ - TRACE;SILVERLIGHT;WINDOWS_PHONE;AOT;CODE_ANALYSIS - true - true - pdbonly - AnyCPU - prompt - MinimumRecommendedRules.ruleset + $(DefineConstants);SILVERLIGHT;WINDOWS_PHONE;AOT + false - - bin\ARM\CodeAnalysis\ - TRACE;SILVERLIGHT;WINDOWS_PHONE;AOT;CODE_ANALYSIS - true - true - pdbonly - AnyCPU - prompt - MinimumRecommendedRules.ruleset + + $(SolutionDir)\bin\windowsphone8\ + $(SolutionDir)\bin\windowsphone8\MsgPack.XML @@ -311,27 +222,27 @@ Serialization\CollectionKind.cs - - Serialization\CollectionSerializers\CollectionMessagePackSerializerBase`2.cs - Serialization\CollectionSerializers\CollectionMessagePackSerializer`2.cs + + Serialization\CollectionSerializers\CollectionMessagePackSerializerBase`2.cs + Serialization\CollectionSerializers\CollectionSerializerHelpers.cs - - Serialization\CollectionSerializers\DictionaryMessagePackSerializerBase`3.cs - Serialization\CollectionSerializers\DictionaryMessagePackSerializer`3.cs - - Serialization\CollectionSerializers\EnumerableMessagePackSerializerBase`2.cs + + Serialization\CollectionSerializers\DictionaryMessagePackSerializerBase`3.cs Serialization\CollectionSerializers\EnumerableMessagePackSerializer`2.cs + + Serialization\CollectionSerializers\EnumerableMessagePackSerializerBase`2.cs + Serialization\CollectionSerializers\ICollectionInstanceFactory.cs @@ -341,12 +252,12 @@ Serialization\CollectionSerializers\NonGenericDictionaryMessagePackSerializer`1.cs - - Serialization\CollectionSerializers\NonGenericEnumerableMessagePackSerializerBase`1.cs - Serialization\CollectionSerializers\NonGenericEnumerableMessagePackSerializer`1.cs + + Serialization\CollectionSerializers\NonGenericEnumerableMessagePackSerializerBase`1.cs + Serialization\CollectionSerializers\NonGenericListMessagePackSerializer`1.cs @@ -497,12 +408,12 @@ Serialization\DefaultSerializers\System_Collections_Generic_KeyValuePair_2MessagePackSerializer`2.cs - - Serialization\DefaultSerializers\System_Collections_Generic_ListOfMessagePackObjectMessagePackSerializer.cs - Serialization\DefaultSerializers\System_Collections_Generic_List_1MessagePackSerializer`1.cs + + Serialization\DefaultSerializers\System_Collections_Generic_ListOfMessagePackObjectMessagePackSerializer.cs + Serialization\DefaultSerializers\System_Collections_Generic_Queue_1MessagePackSerializer`1.cs @@ -548,15 +459,15 @@ Serialization\EnumMemberSerializationMethod.cs + + Serialization\EnumMessagePackSerializer`1.cs + Serialization\EnumMessagePackSerializerHelpers.cs Serialization\EnumMessagePackSerializerProvider.cs - - Serialization\EnumMessagePackSerializer`1.cs - Serialization\EnumNameTransformers.cs @@ -623,15 +534,15 @@ Serialization\MessagePackSerializer.Factories.cs + + Serialization\MessagePackSerializer`1.cs + Serialization\MessagePackSerializerExtensions.cs Serialization\MessagePackSerializerProvider.cs - - Serialization\MessagePackSerializer`1.cs - Serialization\NilImplication.cs @@ -647,9 +558,6 @@ Serialization\PackHelpers.cs - - Serialization\PolymorphicTypeVerificationContext.cs - Serialization\Polymorphic\IPolymorphicDeserializer.cs @@ -674,6 +582,9 @@ Serialization\Polymorphic\TypeInfoEncoding.cs + + Serialization\PolymorphicTypeVerificationContext.cs + Serialization\PolymorphismSchema.Constructors.cs @@ -692,6 +603,12 @@ Serialization\PolymorphismType.cs + + Serialization\Reflection\GenericTypeExtensions.cs + + + Serialization\Reflection\ReflectionExtensions.cs + Serialization\ReflectionExtensions.CollectionTraits.cs @@ -746,12 +663,6 @@ Serialization\ReflectionSerializers\ReflectionTupleMessagePackSerializer`1.cs - - Serialization\Reflection\GenericTypeExtensions.cs - - - Serialization\Reflection\ReflectionExtensions.cs - Serialization\ResolveSerializerEventArgs.cs diff --git a/src/MsgPack.Unity.Full/MsgPack.Unity.Full.csproj b/src/MsgPack.Unity.Full/MsgPack.Unity.Full.csproj index df08dedca..866d3290e 100644 --- a/src/MsgPack.Unity.Full/MsgPack.Unity.Full.csproj +++ b/src/MsgPack.Unity.Full/MsgPack.Unity.Full.csproj @@ -2,8 +2,6 @@ - Debug - AnyCPU {30581B4A-BCA5-4446-B5E7-4F890A3E9514} Library Properties @@ -11,51 +9,22 @@ MsgPack v3.5 512 - - - true - full - false - bin\Debug\ - TRACE;DEBUG;UNITY_IPHONE;MSGPACK_UNITY_FULL;AOT - prompt - 4 - bin\Debug\MsgPack.XML - 3001,3002 true - - - pdbonly - true - ..\..\build\MsgPack-CLI\unity-full\ - TRACE;UNITY_IPHONE;MSGPACK_UNITY_FULL;AOT - prompt - 4 - ..\..\build\MsgPack-CLI\unity-full\MsgPack.XML 3001,3002 - true - - bin\CodeAnalysis\ - TRACE;UNITY_IPHONE;MSGPACK_UNITY_FULL;AOT;CODE_ANALYSIS - - - true - 3001,3002 - pdbonly - AnyCPU - prompt - AllRules.ruleset - true - true + + + $(DefineConstants);UNITY_IPHONE;MSGPACK_UNITY_FULL;AOT + false + + + $(SolutionDir)\build\MsgPack-CLI\unity-full\ + $(SolutionDir)\build\MsgPack-CLI\unity-full\MsgPack.XML Properties\CommonAssemblyInfo.cs - - Volatile.cs - AsyncReadResult.cs @@ -245,33 +214,36 @@ ReflectionAbstractions.cs + + Serialization\Tracer.cs + Serialization\CollectionDetailedKind.cs Serialization\CollectionKind.cs - - Serialization\CollectionSerializers\CollectionMessagePackSerializerBase`2.cs - Serialization\CollectionSerializers\CollectionMessagePackSerializer`2.cs + + Serialization\CollectionSerializers\CollectionMessagePackSerializerBase`2.cs + Serialization\CollectionSerializers\CollectionSerializerHelpers.cs - - Serialization\CollectionSerializers\DictionaryMessagePackSerializerBase`3.cs - Serialization\CollectionSerializers\DictionaryMessagePackSerializer`3.cs - - Serialization\CollectionSerializers\EnumerableMessagePackSerializerBase`2.cs + + Serialization\CollectionSerializers\DictionaryMessagePackSerializerBase`3.cs Serialization\CollectionSerializers\EnumerableMessagePackSerializer`2.cs + + Serialization\CollectionSerializers\EnumerableMessagePackSerializerBase`2.cs + Serialization\CollectionSerializers\ICollectionInstanceFactory.cs @@ -281,12 +253,12 @@ Serialization\CollectionSerializers\NonGenericDictionaryMessagePackSerializer`1.cs - - Serialization\CollectionSerializers\NonGenericEnumerableMessagePackSerializerBase`1.cs - Serialization\CollectionSerializers\NonGenericEnumerableMessagePackSerializer`1.cs + + Serialization\CollectionSerializers\NonGenericEnumerableMessagePackSerializerBase`1.cs + Serialization\CollectionSerializers\NonGenericListMessagePackSerializer`1.cs @@ -404,12 +376,12 @@ Serialization\DefaultSerializers\System_Collections_Generic_KeyValuePair_2MessagePackSerializer`2.cs - - Serialization\DefaultSerializers\System_Collections_Generic_ListOfMessagePackObjectMessagePackSerializer.cs - Serialization\DefaultSerializers\System_Collections_Generic_List_1MessagePackSerializer`1.cs + + Serialization\DefaultSerializers\System_Collections_Generic_ListOfMessagePackObjectMessagePackSerializer.cs + Serialization\DefaultSerializers\System_Collections_Generic_Queue_1MessagePackSerializer`1.cs @@ -461,15 +433,15 @@ Serialization\EnumMemberSerializationMethod.cs + + Serialization\EnumMessagePackSerializer`1.cs + Serialization\EnumMessagePackSerializerHelpers.cs Serialization\EnumMessagePackSerializerProvider.cs - - Serialization\EnumMessagePackSerializer`1.cs - Serialization\EnumNameTransformers.cs @@ -536,15 +508,15 @@ Serialization\MessagePackSerializer.Factories.cs + + Serialization\MessagePackSerializer`1.cs + Serialization\MessagePackSerializerExtensions.cs Serialization\MessagePackSerializerProvider.cs - - Serialization\MessagePackSerializer`1.cs - Serialization\NilImplication.cs @@ -560,9 +532,6 @@ Serialization\PackHelpers.cs - - Serialization\PolymorphicTypeVerificationContext.cs - Serialization\Polymorphic\IPolymorphicDeserializer.cs @@ -587,6 +556,9 @@ Serialization\Polymorphic\TypeInfoEncoding.cs + + Serialization\PolymorphicTypeVerificationContext.cs + Serialization\PolymorphismSchema.Constructors.cs @@ -605,6 +577,12 @@ Serialization\PolymorphismType.cs + + Serialization\Reflection\GenericTypeExtensions.cs + + + Serialization\Reflection\ReflectionExtensions.cs + Serialization\ReflectionExtensions.CollectionTraits.cs @@ -656,12 +634,6 @@ Serialization\ReflectionSerializers\ReflectionSerializerNilImplicationHandlerParameter.cs - - Serialization\Reflection\GenericTypeExtensions.cs - - - Serialization\Reflection\ReflectionExtensions.cs - Serialization\ResolveSerializerEventArgs.cs @@ -710,9 +682,6 @@ Serialization\SerializingMember.cs - - Serialization\Tracer.cs - Serialization\TypeKeyRepository.cs @@ -794,6 +763,9 @@ UnpackingStreamReader.cs + + Volatile.cs + True True diff --git a/src/MsgPack.Unity/MsgPack.Unity.csproj b/src/MsgPack.Unity/MsgPack.Unity.csproj index 21672ea28..9295d30b0 100644 --- a/src/MsgPack.Unity/MsgPack.Unity.csproj +++ b/src/MsgPack.Unity/MsgPack.Unity.csproj @@ -2,63 +2,29 @@ - Debug - AnyCPU {04774100-60EE-4FD5-ACED-593394DFF7B7} Library - Properties - MsgPack MsgPack v3.5 512 ..\..\ true - - - true - full - false - bin\Debug\ - TRACE;DEBUG;UNITY_IPHONE;AOT - prompt - 4 - bin\Debug\MsgPack.XML - 3001,3002 - AllRules.ruleset true - - - pdbonly - true - ..\..\build\MsgPack-CLI\unity\ - TRACE;UNITY_IPHONE;AOT - prompt - 4 - ..\..\build\MsgPack-CLI\unity\MsgPack.XML 3001,3002 - AllRules.ruleset - true - - bin\CodeAnalysis\ - TRACE;UNITY_IPHONE;AOT;CODE_ANALYSIS - ..\..\bin\unity3d\MsgPack.XML - true - 3001,3002 - pdbonly - AnyCPU - prompt - AllRules.ruleset - true - true + + + $(DefineConstants);UNITY_IPHONE;AOT + false + + + $(SolutionDir)\build\MsgPack-CLI\unity\ + $(SolutionDir)\build\MsgPack-CLI\unity\MsgPack.XML Properties\CommonAssemblyInfo.cs - - Volatile.cs - CorLibOnlyHelper.cs @@ -266,33 +232,36 @@ ReflectionAbstractions.cs + + Serialization\Tracer.cs + Serialization\CollectionDetailedKind.cs Serialization\CollectionKind.cs - - Serialization\CollectionSerializers\CollectionMessagePackSerializerBase`2.cs - Serialization\CollectionSerializers\CollectionMessagePackSerializer`2.cs + + Serialization\CollectionSerializers\CollectionMessagePackSerializerBase`2.cs + Serialization\CollectionSerializers\CollectionSerializerHelpers.cs - - Serialization\CollectionSerializers\DictionaryMessagePackSerializerBase`3.cs - Serialization\CollectionSerializers\DictionaryMessagePackSerializer`3.cs - - Serialization\CollectionSerializers\EnumerableMessagePackSerializerBase`2.cs + + Serialization\CollectionSerializers\DictionaryMessagePackSerializerBase`3.cs Serialization\CollectionSerializers\EnumerableMessagePackSerializer`2.cs + + Serialization\CollectionSerializers\EnumerableMessagePackSerializerBase`2.cs + Serialization\CollectionSerializers\ICollectionInstanceFactory.cs @@ -302,12 +271,12 @@ Serialization\CollectionSerializers\NonGenericDictionaryMessagePackSerializer`1.cs - - Serialization\CollectionSerializers\NonGenericEnumerableMessagePackSerializerBase`1.cs - Serialization\CollectionSerializers\NonGenericEnumerableMessagePackSerializer`1.cs + + Serialization\CollectionSerializers\NonGenericEnumerableMessagePackSerializerBase`1.cs + Serialization\CollectionSerializers\NonGenericListMessagePackSerializer`1.cs @@ -425,12 +394,12 @@ Serialization\DefaultSerializers\System_Collections_Generic_KeyValuePair_2MessagePackSerializer`2.cs - - Serialization\DefaultSerializers\System_Collections_Generic_ListOfMessagePackObjectMessagePackSerializer.cs - Serialization\DefaultSerializers\System_Collections_Generic_List_1MessagePackSerializer`1.cs + + Serialization\DefaultSerializers\System_Collections_Generic_ListOfMessagePackObjectMessagePackSerializer.cs + Serialization\DefaultSerializers\System_Collections_QueueMessagePackSerializer.cs @@ -470,15 +439,15 @@ Serialization\EnumMemberSerializationMethod.cs + + Serialization\EnumMessagePackSerializer`1.cs + Serialization\EnumMessagePackSerializerHelpers.cs Serialization\EnumMessagePackSerializerProvider.cs - - Serialization\EnumMessagePackSerializer`1.cs - Serialization\EnumNameTransformers.cs @@ -545,15 +514,15 @@ Serialization\MessagePackSerializer.Factories.cs + + Serialization\MessagePackSerializer`1.cs + Serialization\MessagePackSerializerExtensions.cs Serialization\MessagePackSerializerProvider.cs - - Serialization\MessagePackSerializer`1.cs - Serialization\NilImplication.cs @@ -569,9 +538,6 @@ Serialization\PackHelpers.cs - - Serialization\PolymorphicTypeVerificationContext.cs - Serialization\Polymorphic\IPolymorphicDeserializer.cs @@ -596,6 +562,9 @@ Serialization\Polymorphic\TypeInfoEncoding.cs + + Serialization\PolymorphicTypeVerificationContext.cs + Serialization\PolymorphismSchema.Constructors.cs @@ -614,6 +583,12 @@ Serialization\PolymorphismType.cs + + Serialization\Reflection\GenericTypeExtensions.cs + + + Serialization\Reflection\ReflectionExtensions.cs + Serialization\ReflectionExtensions.CollectionTraits.cs @@ -665,12 +640,6 @@ Serialization\ReflectionSerializers\ReflectionSerializerNilImplicationHandlerParameter.cs - - Serialization\Reflection\GenericTypeExtensions.cs - - - Serialization\Reflection\ReflectionExtensions.cs - Serialization\ResolveSerializerEventArgs.cs @@ -719,9 +688,6 @@ Serialization\SerializingMember.cs - - Serialization\Tracer.cs - Serialization\TypeKeyRepository.cs @@ -803,6 +769,9 @@ UnpackingStreamReader.cs + + Volatile.cs + diff --git a/src/MsgPack.Uwp/MsgPack.Uwp.csproj b/src/MsgPack.Uwp/MsgPack.Uwp.csproj index 92bd11918..61f0a7247 100644 --- a/src/MsgPack.Uwp/MsgPack.Uwp.csproj +++ b/src/MsgPack.Uwp/MsgPack.Uwp.csproj @@ -2,108 +2,41 @@ - Debug - AnyCPU {9D65A105-FB03-40DB-9185-8C695B8EE8D6} Library - Properties - MsgPack MsgPack - ja-JP + en-US UAP 10.0.10586.0 10.0.10240.0 14 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - - - AnyCPU - true - full - false - bin\Debug\ - TRACE;DEBUG;NETFX_CORE;WINDOWS_UWP;AOT;NETSTANDARD1_3;FEATURE_TAP;FEATURE_CONCURRENT;FEATURE_MEMCOPY - prompt - 4 true + 2008,3001,3002 - - AnyCPU - pdbonly - true - ..\..\bin\uap10\ - TRACE;NETFX_CORE;WINDOWS_UWP;AOT;NETSTANDARD1_3;FEATURE_TAP;FEATURE_CONCURRENT;FEATURE_MEMCOPY - prompt - 4 - ..\..\bin\uap10\MsgPack.XML - true + + + $(DefineConstants);NETFX_CORE;WINDOWS_UWP;AOT;NETSTANDARD1_3;FEATURE_TAP;FEATURE_CONCURRENT;FEATURE_MEMCOPY - - x86 - true - bin\x86\Debug\ - TRACE;DEBUG;NETFX_CORE;WINDOWS_UWP;NETSTANDARD1_3;AOT;FEATURE_TAP;FEATURE_CONCURRENT;FEATURE_MEMCOPY - ;2008 - full - x86 - false - prompt + + $(SolutionDir)\bin\uap10\ + $(SolutionDir)\bin\uap10\MsgPack.XML - - x86 - bin\x86\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP;NETSTANDARD1_3;AOT;FEATURE_TAP;FEATURE_CONCURRENT;FEATURE_MEMCOPY - true - ;2008 - pdbonly + + AnyCPU + + x86 false - prompt - - ARM - true - bin\ARM\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;NETSTANDARD1_3;AOT;FEATURE_TAP;FEATURE_CONCURRENT;FEATURE_MEMCOPY - ;2008 - full + ARM false - prompt - - ARM - bin\ARM\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP;NETSTANDARD1_3;AOT;FEATURE_TAP;FEATURE_CONCURRENT;FEATURE_MEMCOPY - true - ;2008 - pdbonly - ARM - false - prompt - - - x64 - true - bin\x64\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;NETSTANDARD1_3;AOT;FEATURE_TAP;FEATURE_CONCURRENT;FEATURE_MEMCOPY - ;2008 - full + x64 false - prompt - - - x64 - bin\x64\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP;NETSTANDARD1_3;AOT;FEATURE_TAP;FEATURE_CONCURRENT;FEATURE_MEMCOPY - true - ;2008 - pdbonly - x64 - false - prompt @@ -317,27 +250,27 @@ Serialization\CollectionKind.cs - - Serialization\CollectionSerializers\CollectionMessagePackSerializerBase`2.cs - Serialization\CollectionSerializers\CollectionMessagePackSerializer`2.cs + + Serialization\CollectionSerializers\CollectionMessagePackSerializerBase`2.cs + Serialization\CollectionSerializers\CollectionSerializerHelpers.cs - - Serialization\CollectionSerializers\DictionaryMessagePackSerializerBase`3.cs - Serialization\CollectionSerializers\DictionaryMessagePackSerializer`3.cs - - Serialization\CollectionSerializers\EnumerableMessagePackSerializerBase`2.cs + + Serialization\CollectionSerializers\DictionaryMessagePackSerializerBase`3.cs Serialization\CollectionSerializers\EnumerableMessagePackSerializer`2.cs + + Serialization\CollectionSerializers\EnumerableMessagePackSerializerBase`2.cs + Serialization\CollectionSerializers\ICollectionInstanceFactory.cs @@ -347,12 +280,12 @@ Serialization\CollectionSerializers\NonGenericDictionaryMessagePackSerializer`1.cs - - Serialization\CollectionSerializers\NonGenericEnumerableMessagePackSerializerBase`1.cs - Serialization\CollectionSerializers\NonGenericEnumerableMessagePackSerializer`1.cs + + Serialization\CollectionSerializers\NonGenericEnumerableMessagePackSerializerBase`1.cs + Serialization\CollectionSerializers\NonGenericListMessagePackSerializer`1.cs @@ -506,12 +439,12 @@ Serialization\DefaultSerializers\System_Collections_Generic_KeyValuePair_2MessagePackSerializer`2.cs - - Serialization\DefaultSerializers\System_Collections_Generic_ListOfMessagePackObjectMessagePackSerializer.cs - Serialization\DefaultSerializers\System_Collections_Generic_List_1MessagePackSerializer`1.cs + + Serialization\DefaultSerializers\System_Collections_Generic_ListOfMessagePackObjectMessagePackSerializer.cs + Serialization\DefaultSerializers\System_Collections_Generic_Queue_1MessagePackSerializer`1.cs @@ -569,15 +502,15 @@ Serialization\EnumMemberSerializationMethod.cs + + Serialization\EnumMessagePackSerializer`1.cs + Serialization\EnumMessagePackSerializerHelpers.cs Serialization\EnumMessagePackSerializerProvider.cs - - Serialization\EnumMessagePackSerializer`1.cs - Serialization\EnumNameTransformers.cs @@ -644,15 +577,15 @@ Serialization\MessagePackSerializer.Factories.cs + + Serialization\MessagePackSerializer`1.cs + Serialization\MessagePackSerializerExtensions.cs Serialization\MessagePackSerializerProvider.cs - - Serialization\MessagePackSerializer`1.cs - Serialization\NilImplication.cs @@ -668,9 +601,6 @@ Serialization\PackHelpers.cs - - Serialization\PolymorphicTypeVerificationContext.cs - Serialization\Polymorphic\IPolymorphicDeserializer.cs @@ -695,6 +625,9 @@ Serialization\Polymorphic\TypeInfoEncoding.cs + + Serialization\PolymorphicTypeVerificationContext.cs + Serialization\PolymorphismSchema.Constructors.cs @@ -713,6 +646,12 @@ Serialization\PolymorphismType.cs + + Serialization\Reflection\GenericTypeExtensions.cs + + + Serialization\Reflection\ReflectionExtensions.cs + Serialization\ReflectionExtensions.CollectionTraits.cs @@ -767,12 +706,6 @@ Serialization\ReflectionSerializers\ReflectionTupleMessagePackSerializer`1.cs - - Serialization\Reflection\GenericTypeExtensions.cs - - - Serialization\Reflection\ReflectionExtensions.cs - Serialization\ResolveSerializerEventArgs.cs diff --git a/src/MsgPack.Net35/Contract.cs b/src/MsgPack/Contract.cs similarity index 100% rename from src/MsgPack.Net35/Contract.cs rename to src/MsgPack/Contract.cs diff --git a/src/MsgPack.Net35/Delegates.cs b/src/MsgPack/Delegates.cs similarity index 100% rename from src/MsgPack.Net35/Delegates.cs rename to src/MsgPack/Delegates.cs diff --git a/src/MsgPack.Net35/Delegates.tt b/src/MsgPack/Delegates.tt similarity index 100% rename from src/MsgPack.Net35/Delegates.tt rename to src/MsgPack/Delegates.tt diff --git a/src/MsgPack/EncodingExtensions.cs b/src/MsgPack/EncodingExtensions.cs index b513ff4e8..9d36df284 100644 --- a/src/MsgPack/EncodingExtensions.cs +++ b/src/MsgPack/EncodingExtensions.cs @@ -38,9 +38,9 @@ namespace MsgPack internal static class EncodingExtensions { #if FEATURE_POINTER_CONVERSION -#if !NETFX_35 && !UNITY +#if !NET35 && !UNITY [System.Security.SecuritySafeCritical] -#endif // !NETFX_35 && !UNITY +#endif // !NET35 && !UNITY public static unsafe bool EncodeString( this Encoder source, char* pChar, int charsLength, byte* pBuffer, int bufferCount, out int charsUsed, out int bytesUsed ) { bool isCompleted; diff --git a/src/MsgPack/MessagePackObjectDictionary.KeySet.cs b/src/MsgPack/MessagePackObjectDictionary.KeySet.cs index d0ed0acea..6243e0afd 100644 --- a/src/MsgPack/MessagePackObjectDictionary.KeySet.cs +++ b/src/MsgPack/MessagePackObjectDictionary.KeySet.cs @@ -48,9 +48,9 @@ partial class MessagePackObjectDictionary [SuppressMessage( "Microsoft.Design", "CA1034:NestedTypesShouldNotBeVisible", Justification = "ICollection implementing dictionary should return ICollection implementing values." )] #if !UNITY public sealed partial class KeySet : -#if !NETFX_35 +#if !NET35 ISet, -#endif // !NETFX_35 +#endif // !NET35 #else public sealed partial class KeyCollection : #endif // !UNITY @@ -219,7 +219,7 @@ bool ICollection.Remove( MessagePackObject item ) } #if !UNITY -#if !NETFX_35 +#if !NET35 bool ISet.Add( MessagePackObject item ) { throw new NotSupportedException(); @@ -234,7 +234,7 @@ void ISet.IntersectWith( IEnumerable other { throw new NotSupportedException(); } -#endif // !NETFX_35 +#endif // !NET35 /// /// Determines whether this set is proper subset of the specified collection. @@ -338,7 +338,7 @@ public bool SetEquals( IEnumerable other ) return SetOperation.SetEquals( this, other ); } -#if !NETFX_35 +#if !NET35 void ISet.SymmetricExceptWith( IEnumerable other ) { throw new NotSupportedException(); @@ -348,7 +348,7 @@ void ISet.UnionWith( IEnumerable other ) { throw new NotSupportedException(); } -#endif // !NETFX_35 +#endif // !NET35 #endif // !UNITY /// diff --git a/src/MsgPack/MessagePackString.cs b/src/MsgPack/MessagePackString.cs index f86a6051c..7e1d038db 100644 --- a/src/MsgPack/MessagePackString.cs +++ b/src/MsgPack/MessagePackString.cs @@ -46,9 +46,9 @@ namespace MsgPack #if !SILVERLIGHT && !NETSTANDARD1_1 && !NETSTANDARD1_3 [Serializable] #endif // !SILVERLIGHT && !NETSTANDARD1_1 && !NETSTANDARD1_3 -#if !NETFX_35 && !UNITY +#if !NET35 && !UNITY [SecuritySafeCritical] -#endif // !NETFX_35 && !UNITY +#endif // !NET35 && !UNITY [DebuggerDisplay( "{DebuggerDisplayString}" )] [DebuggerTypeProxy( typeof( MessagePackStringDebuggerProxy ) )] internal sealed class MessagePackString @@ -316,9 +316,9 @@ internal static bool IsFastEqualsDisabled } #endif -#if !NETFX_35 && !UNITY +#if !NET35 && !UNITY [SecuritySafeCritical] -#endif // !NETFX_35 && !UNITY +#endif // !NET35 && !UNITY private static bool UnsafeFastEquals( byte[] x, byte[] y ) { #if DEBUG diff --git a/src/MsgPack/MsgPack.csproj b/src/MsgPack/MsgPack.csproj index 0201cf8bd..fc6197cb3 100644 --- a/src/MsgPack/MsgPack.csproj +++ b/src/MsgPack/MsgPack.csproj @@ -1,131 +1,42 @@  - Debug - AnyCPU - 8.0.30703 - 2.0 {5BCEC32E-990E-4DE5-945F-BD27326A7418} Library - Properties - MsgPack MsgPack - 512 - net46;net35;net45;netstandard1.1;netstandard1.3;MonoAndroid10;Xamarin.iOS10 - TRACE - prompt - 4 + net46;net35;net45;netstandard1.1;netstandard1.3;netstandard2.0;MonoAndroid10;Xamarin.iOS10 True AllRules.ruleset - AnyCPU - false - ..\MsgPack.snk - ../../msgpack.nuspec - true - false - true + $(SolutionDir)/msgpack.nuspec + ..\..\bin\$(TargetFramework)\ ..\..\bin\ - - bin\$(Configuration)\$(TargetFramework)\ - bin\$(Configuration)\$(TargetFramework)\ bin\$(Configuration)\ - - $(OutputPath)\MsgPack.XML - false - - - $(OutputPath)\$(TargetFramework)\MsgPack.XML - - - $(DefineConstants);FEATURE_TAP;FEATURE_CONCURRENT - - - $(DefineConstants);NETFX_35;FEATURE_POINTER_CONVERSION - - - $(DefineConstants);NETFX_45;FEATURE_TAP;FEATURE_CONCURRENT;FEATURE_POINTER_CONVERSION - - - $(DefineConstants);NETFX_46;FEATURE_TAP;FEATURE_CONCURRENT;FEATURE_POINTER_CONVERSION;FEATURE_MEMCOPY - - - $(DefineConstants);FEATURE_TAP;FEATURE_CONCURRENT - - - $(DefineConstants);FEATURE_TAP;FEATURE_CONCURRENT;FEATURE_MEMCOPY - - - $(DefineConstants);__MOBILE__;AOT;XAMARIN;FEATURE_TAP;FEATURE_CONCURRENT;FEATURE_POINTER_CONVERSION;FEATURE_MEMCOPY - - $(DefineConstants);__ANDROID__ - $(VsInstallRoot)\Common7\IDE\ReferenceAssemblies\Microsoft\Framework\ - true MonoAndroid,Version=1.0 - - $(DefineConstants);__IOS__ - $(VsInstallRoot)\Common7\IDE\ReferenceAssemblies\Microsoft\Framework\ - true - - - $(DefineConstants);NETFX_CORE;WINDOWS_UWP;NETSTANDARD1_3;AOT - - - true - full - false - $(DefineConstants);DEBUG - bin\Debug\MsgPack.XML - - - pdbonly - true - $(DefineConstants) - - - $(DefineConstants);PERFORMANCE_TEST - true - pdbonly - true - true - true - - - $(DefineConstants);PERFORMANCE_TEST - false - pdbonly - true - true - false - false - - - $(DefineConstants);CODE_ANALYSIS - true - pdbonly - false - true - AllRules.ruleset - true - + + + + + + @@ -162,6 +73,13 @@ + + + + + + + Properties\CommonAssemblyInfo.cs @@ -516,11 +434,13 @@ - - - - - + + + + + + + @@ -586,7 +506,7 @@ - + @@ -603,6 +523,6 @@ $(VSMSBuildExtensionsPath) - - + + \ No newline at end of file diff --git a/src/MsgPack.Net35/NetFxCompatibilities.cs b/src/MsgPack/NetFxCompatibilities.cs similarity index 100% rename from src/MsgPack.Net35/NetFxCompatibilities.cs rename to src/MsgPack/NetFxCompatibilities.cs diff --git a/src/MsgPack/Properties/AssemblyInfo.cs b/src/MsgPack/Properties/AssemblyInfo.cs index b264b41d6..d1bc9c36a 100644 --- a/src/MsgPack/Properties/AssemblyInfo.cs +++ b/src/MsgPack/Properties/AssemblyInfo.cs @@ -26,7 +26,7 @@ [assembly: AssemblyDescription( "MessagePack for CLI(.NET/Mono) packing/unpacking library for" + #if NET4_5 ".NET Framework 4.5" -#elif NETFX_35 +#elif NET35 ".NET Framework 3.5" #elif WINDOWS_UWP "UWP" @@ -51,19 +51,19 @@ [assembly: AssemblyFileVersion( "0.9.2259.1047" )] #if !NETSTANDARD1_1 && !NETSTANDARD1_3 -#if !NETFX_35 +#if !NET35 [assembly: SecurityRules( SecurityRuleSet.Level2, SkipVerificationInFullTrust = true )] -#endif // !NETFX_35 +#endif // !NET35 [assembly: AllowPartiallyTrustedCallers] #endif #if DEBUG || PERFORMANCE_TEST [assembly: InternalsVisibleTo( "MsgPack.UnitTest, PublicKey=0024000004800000940000000602000000240000525341310004000001000100a967de8de9d45380b93a6aa56f64fc2cb2d3c9d4b400e00de01f31ba9e15cf5ca95926dbf8760cce413eabd711e23df0c133193a570da8a3bb1bdc00ef170fccb2bc033266fa5346442c9cf0b071133d5b484845eab17095652aeafeeb71193506b8294d9c8c91e3fd01cc50bdbc2d0eb78dd655bb8cd0bd3cdbbcb192549cb4" )] [assembly: InternalsVisibleTo( "MsgPack.UnitTest.CodeDom, PublicKey=0024000004800000940000000602000000240000525341310004000001000100a967de8de9d45380b93a6aa56f64fc2cb2d3c9d4b400e00de01f31ba9e15cf5ca95926dbf8760cce413eabd711e23df0c133193a570da8a3bb1bdc00ef170fccb2bc033266fa5346442c9cf0b071133d5b484845eab17095652aeafeeb71193506b8294d9c8c91e3fd01cc50bdbc2d0eb78dd655bb8cd0bd3cdbbcb192549cb4" )] -#if NETFX_35 +#if NET35 [assembly: InternalsVisibleTo( "MsgPack.UnitTest.Net35, PublicKey=0024000004800000940000000602000000240000525341310004000001000100a967de8de9d45380b93a6aa56f64fc2cb2d3c9d4b400e00de01f31ba9e15cf5ca95926dbf8760cce413eabd711e23df0c133193a570da8a3bb1bdc00ef170fccb2bc033266fa5346442c9cf0b071133d5b484845eab17095652aeafeeb71193506b8294d9c8c91e3fd01cc50bdbc2d0eb78dd655bb8cd0bd3cdbbcb192549cb4" )] [assembly: InternalsVisibleTo( "MsgPack.UnitTest.CodeDom.Net35, PublicKey=0024000004800000940000000602000000240000525341310004000001000100a967de8de9d45380b93a6aa56f64fc2cb2d3c9d4b400e00de01f31ba9e15cf5ca95926dbf8760cce413eabd711e23df0c133193a570da8a3bb1bdc00ef170fccb2bc033266fa5346442c9cf0b071133d5b484845eab17095652aeafeeb71193506b8294d9c8c91e3fd01cc50bdbc2d0eb78dd655bb8cd0bd3cdbbcb192549cb4" )] -#endif // NETFX_35 +#endif // NET35 [assembly: InternalsVisibleTo( "MsgPack.UnitTest.BclExtensions, PublicKey=0024000004800000940000000602000000240000525341310004000001000100a967de8de9d45380b93a6aa56f64fc2cb2d3c9d4b400e00de01f31ba9e15cf5ca95926dbf8760cce413eabd711e23df0c133193a570da8a3bb1bdc00ef170fccb2bc033266fa5346442c9cf0b071133d5b484845eab17095652aeafeeb71193506b8294d9c8c91e3fd01cc50bdbc2d0eb78dd655bb8cd0bd3cdbbcb192549cb4" )] #if XAMARIN #if __ANDROID__ diff --git a/src/MsgPack/ReflectionAbstractions.cs b/src/MsgPack/ReflectionAbstractions.cs index f1e6ede53..1e68d209d 100644 --- a/src/MsgPack/ReflectionAbstractions.cs +++ b/src/MsgPack/ReflectionAbstractions.cs @@ -264,7 +264,7 @@ public static ConstructorInfo GetRuntimeConstructor( this Type source, Type[] pa #endif // NETSTANDARD1_1 || NETSTANDARD1_3 } -#if NETFX_35 || NETFX_40 || SILVERLIGHT || UNITY +#if NET35 || NET40 || SILVERLIGHT || UNITY public static Delegate CreateDelegate( this MethodInfo source, Type delegateType ) { return Delegate.CreateDelegate( delegateType, source ); @@ -275,7 +275,7 @@ public static Delegate CreateDelegate( this MethodInfo source, Type delegateType return Delegate.CreateDelegate( delegateType, target, source ); } -#endif // NETFX_35 || NETFX_40 || SILVERLIGHT || UNITY +#endif // NET35 || NET40 || SILVERLIGHT || UNITY #if NETSTANDARD1_1 || NETSTANDARD1_3 public static MethodInfo GetMethod( this Type source, string name ) @@ -408,12 +408,12 @@ public static T GetCustomAttribute( this MemberInfo source ) return Attribute.GetCustomAttribute( source, typeof( T ) ) as T; } -#if NETFX_35 || NETFX_40 || SILVERLIGHT || UNITY +#if NET35 || NET40 || SILVERLIGHT || UNITY public static bool IsDefined( this MemberInfo source, Type attributeType ) { return Attribute.IsDefined( source, attributeType ); } -#endif // NETFX_35 || NETFX_40 || SILVERLIGHT || UNITY +#endif // NET35 || NET40 || SILVERLIGHT || UNITY #if !SILVERLIGHT public static Type GetAttributeType( this CustomAttributeData source ) @@ -436,14 +436,14 @@ public static Type GetAttributeType( this Attribute source ) public static string GetCultureName( this AssemblyName source ) { -#if NETFX_35 || NETFX_40 || SILVERLIGHT || UNITY +#if NET35 || NET40 || SILVERLIGHT || UNITY return source.CultureInfo == null ? null : source.CultureInfo.Name; #else return source.CultureName; #endif } -#if NETFX_35 || UNITY +#if NET35 || UNITY public static IEnumerable GetCustomAttributesData( this MemberInfo source ) { return CustomAttributeData.GetCustomAttributes( source ); @@ -453,7 +453,7 @@ public static IEnumerable GetCustomAttributesData( this Par { return CustomAttributeData.GetCustomAttributes( source ); } -#endif // NETFX_35 || UNITY +#endif // NET35 || UNITY #if NETSTANDARD1_1 || NETSTANDARD1_3 public static IEnumerable GetCustomAttributesData( this ParameterInfo source ) @@ -532,7 +532,7 @@ public KeyValuePair GetTypedValue() public static bool GetHasDefaultValue( this ParameterInfo source ) { -#if NETFX_35 || NETFX_40 || SILVERLIGHT || UNITY +#if NET35 || NET40 || SILVERLIGHT || UNITY return source.DefaultValue != DBNull.Value; #else return source.HasDefaultValue; diff --git a/src/MsgPack/Serialization/AbstractSerializers/ISerializerCodeGenerationContext.cs b/src/MsgPack/Serialization/AbstractSerializers/ISerializerCodeGenerationContext.cs index 224feaac1..e3e28c698 100644 --- a/src/MsgPack/Serialization/AbstractSerializers/ISerializerCodeGenerationContext.cs +++ b/src/MsgPack/Serialization/AbstractSerializers/ISerializerCodeGenerationContext.cs @@ -33,9 +33,9 @@ internal interface ISerializerCodeGenerationContext /// Generates codes for this context. /// /// A collection which correspond to genereated codes. -#if !NETFX_35 +#if !NET35 [SecuritySafeCritical] -#endif // !NETFX_35 +#endif // !NET35 IEnumerable Generate(); /// @@ -46,9 +46,9 @@ internal interface ISerializerCodeGenerationContext /// SerializationContext SerializationContext { -#if !NETFX_35 +#if !NET35 [SecuritySafeCritical] -#endif // !NETFX_35 +#endif // !NET35 get; } } diff --git a/src/MsgPack/Serialization/AbstractSerializers/SerializerBuilder`2.Collection.cs b/src/MsgPack/Serialization/AbstractSerializers/SerializerBuilder`2.Collection.cs index dca2dd6f1..e8a202683 100644 --- a/src/MsgPack/Serialization/AbstractSerializers/SerializerBuilder`2.Collection.cs +++ b/src/MsgPack/Serialization/AbstractSerializers/SerializerBuilder`2.Collection.cs @@ -172,7 +172,7 @@ out bool isAddItemRequired isAddItemRequired = false; break; } -#if !NETFX_35 && !UNITY && !NETFX_40 && !( SILVERLIGHT && !WINDOWS_PHONE ) +#if !NET35 && !UNITY && !NET40 && !( SILVERLIGHT && !WINDOWS_PHONE ) case CollectionDetailedKind.GenericReadOnlyDictionary: { isUnpackFromRequired = false; @@ -186,7 +186,7 @@ out bool isAddItemRequired isAddItemRequired = true; break; } -#endif // !NETFX_35 && !UNITY && !NETFX_40 && !( SILVERLIGHT && !WINDOWS_PHONE ) +#endif // !NET35 && !UNITY && !NET40 && !( SILVERLIGHT && !WINDOWS_PHONE ) default: { isUnpackFromRequired = false; diff --git a/src/MsgPack/Serialization/AbstractSerializers/SerializerBuilder`2.CommonConstructs.cs b/src/MsgPack/Serialization/AbstractSerializers/SerializerBuilder`2.CommonConstructs.cs index 7c0f35ed5..3e93c4982 100644 --- a/src/MsgPack/Serialization/AbstractSerializers/SerializerBuilder`2.CommonConstructs.cs +++ b/src/MsgPack/Serialization/AbstractSerializers/SerializerBuilder`2.CommonConstructs.cs @@ -1962,21 +1962,21 @@ private TConstruct EmitGetEqualityComparer( TContext context ) case CollectionDetailedKind.GenericCollection: case CollectionDetailedKind.GenericEnumerable: case CollectionDetailedKind.GenericList: -#if !NETFX_35 +#if !NET35 case CollectionDetailedKind.GenericSet: -#if !NETFX_40 && !( SILVERLIGHT && !WINDOWS_PHONE ) +#if !NET40 && !( SILVERLIGHT && !WINDOWS_PHONE ) case CollectionDetailedKind.GenericReadOnlyCollection: case CollectionDetailedKind.GenericReadOnlyList: -#endif // !NETFX_40 && !( SILVERLIGHT && !WINDOWS_PHONE ) -#endif // !NETFX_35 +#endif // !NET40 && !( SILVERLIGHT && !WINDOWS_PHONE ) +#endif // !NET35 { comparisonType = this.CollectionTraits.ElementType; break; } case CollectionDetailedKind.GenericDictionary: -#if !NETFX_35 && !NETFX_40 && !( SILVERLIGHT && !WINDOWS_PHONE ) +#if !NET35 && !NET40 && !( SILVERLIGHT && !WINDOWS_PHONE ) case CollectionDetailedKind.GenericReadOnlyDictionary: -#endif // !NETFX_35 && !NETFX_40 && !( SILVERLIGHT && !WINDOWS_PHONE ) +#endif // !NET35 && !NET40 && !( SILVERLIGHT && !WINDOWS_PHONE ) { comparisonType = this.CollectionTraits.ElementType.GetGenericArguments()[ 0 ]; break; @@ -2255,7 +2255,7 @@ var instruction in } break; } -#if !WINDOWS_PHONE && !NETFX_35 +#if !WINDOWS_PHONE && !NET35 case PolymorphismSchemaChildrenType.TupleItems: { if ( schema.ChildSchemaList.Count == 0 ) @@ -2326,7 +2326,7 @@ var instruction in ); break; } -#endif // !WINDOWS_PHONE && !NETFX_35 +#endif // !WINDOWS_PHONE && !NET35 default: { foreach ( var instruction in diff --git a/src/MsgPack/Serialization/AbstractSerializers/SerializerBuilder`2.cs b/src/MsgPack/Serialization/AbstractSerializers/SerializerBuilder`2.cs index e8244c7f6..3cbea4507 100644 --- a/src/MsgPack/Serialization/AbstractSerializers/SerializerBuilder`2.cs +++ b/src/MsgPack/Serialization/AbstractSerializers/SerializerBuilder`2.cs @@ -84,20 +84,20 @@ private static Type DetermineBaseClass( Type targetType, CollectionTraits traits return typeof( EnumerableMessagePackSerializer<,> ).MakeGenericType( targetType, traits.ElementType ); } case CollectionDetailedKind.GenericCollection: -#if !NETFX_35 +#if !NET35 case CollectionDetailedKind.GenericSet: -#endif // !NETFX_35 +#endif // !NET35 case CollectionDetailedKind.GenericList: { return typeof( CollectionMessagePackSerializer<,> ).MakeGenericType( targetType, traits.ElementType ); } -#if !NETFX_35 && !NETFX_40 && !( SILVERLIGHT && !WINDOWS_PHONE ) +#if !NET35 && !NET40 && !( SILVERLIGHT && !WINDOWS_PHONE ) case CollectionDetailedKind.GenericReadOnlyCollection: case CollectionDetailedKind.GenericReadOnlyList: { return typeof( ReadOnlyCollectionMessagePackSerializer<,> ).MakeGenericType( targetType, traits.ElementType ); } -#endif // !NETFX_35 && !NETFX_40 && !( SILVERLIGHT && !WINDOWS_PHONE ) +#endif // !NET35 && !NET40 && !( SILVERLIGHT && !WINDOWS_PHONE ) case CollectionDetailedKind.GenericDictionary: { var keyValuePairGenericArguments = traits.ElementType.GetGenericArguments(); @@ -108,7 +108,7 @@ private static Type DetermineBaseClass( Type targetType, CollectionTraits traits keyValuePairGenericArguments[ 1 ] ); } -#if !NETFX_35 && !NETFX_40 && !( SILVERLIGHT && !WINDOWS_PHONE ) +#if !NET35 && !NET40 && !( SILVERLIGHT && !WINDOWS_PHONE ) case CollectionDetailedKind.GenericReadOnlyDictionary: { var keyValuePairGenericArguments = traits.ElementType.GetGenericArguments(); @@ -119,7 +119,7 @@ keyValuePairGenericArguments[ 1 ] keyValuePairGenericArguments[ 1 ] ); } -#endif // !NETFX_35 && !NETFX_40 && !( SILVERLIGHT && !WINDOWS_PHONE ) +#endif // !NET35 && !NET40 && !( SILVERLIGHT && !WINDOWS_PHONE ) case CollectionDetailedKind.NonGenericEnumerable: { return typeof( NonGenericEnumerableMessagePackSerializer<> ).MakeGenericType( targetType ); @@ -266,7 +266,7 @@ protected void BuildSerializer( TContext context, Type concreteType, Polymorphis targetInfo = null; this.BuildNullableSerializer( context, nullableUnderlyingType ); } -#if !NETFX_35 +#if !NET35 else if ( TupleItems.IsTuple( this.TargetType ) ) { this.BuildTupleSerializer( context, ( schema ?? PolymorphismSchema.Default ).ChildSchemaList, out targetInfo ); diff --git a/src/MsgPack/Serialization/CodeDomSerializers/CodeDomContext.cs b/src/MsgPack/Serialization/CodeDomSerializers/CodeDomContext.cs index b2cc3f238..46a3a1478 100644 --- a/src/MsgPack/Serialization/CodeDomSerializers/CodeDomContext.cs +++ b/src/MsgPack/Serialization/CodeDomSerializers/CodeDomContext.cs @@ -285,9 +285,9 @@ protected override void ResetCore( Type targetType, Type baseClass ) this.CollectionToBeAdded = CodeDomConstruct.Parameter( targetTypeDefinition, "collection" ); this.ItemToAdd = CodeDomConstruct.Parameter( traits.ElementType, "item" ); if ( traits.DetailedCollectionType == CollectionDetailedKind.GenericDictionary -#if !NETFX_35 && !NETFX_40 +#if !NET35 && !NET40 || traits.DetailedCollectionType == CollectionDetailedKind.GenericReadOnlyDictionary -#endif // !NETFX_35 && !NETFX_40 +#endif // !NET35 && !NET40 ) { this.KeyToAdd = CodeDomConstruct.Parameter( traits.ElementType.GetGenericArguments()[ 0 ], "key" ); @@ -629,9 +629,9 @@ public override CodeDomConstruct DefineUnpackedItemParameterInSetValueMethods( T /// Generates codes for this context. /// /// A collection which correspond to genereated codes. -#if !NETFX_35 +#if !NET35 [SecuritySafeCritical] -#endif // !NETFX_35 +#endif // !NET35 public IEnumerable Generate() { Contract.Assert( this._declaringTypes != null, "_declaringTypes != null" ); diff --git a/src/MsgPack/Serialization/CodeDomSerializers/CodeDomSerializerBuilder.cs b/src/MsgPack/Serialization/CodeDomSerializers/CodeDomSerializerBuilder.cs index 26724208e..3654d3949 100644 --- a/src/MsgPack/Serialization/CodeDomSerializers/CodeDomSerializerBuilder.cs +++ b/src/MsgPack/Serialization/CodeDomSerializers/CodeDomSerializerBuilder.cs @@ -354,7 +354,7 @@ protected override CodeDomConstruct EmitSequentialStatements( CodeDomContext con statements = statements.ToArray(); Contract.Assert( statements.All( c => c.IsStatement ) ); #endif - return CodeDomConstruct.Statement( statements.SelectMany( s => s.AsStatements() ) ); + return CodeDomConstruct.Statement( statements.SelectMany( s => s.AsStatements().ToArray() ) ); } [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Design", "CA1062:ValidateArgumentsOfPublicMethods", MessageId = "0", Justification = "Validated internally" )] @@ -1198,9 +1198,9 @@ protected override Func CreateEnumS } #if DEBUG -#if !NETFX_35 +#if !NET35 [SecuritySafeCritical] -#endif // !NETFX_35 +#endif // !NET35 private static Type PrepareSerializerConstructorCreation( CodeDomContext codeGenerationContext ) { if ( !SerializerDebugging.OnTheFlyCodeGenerationEnabled ) @@ -1715,4 +1715,4 @@ protected override CodeDomContext CreateCodeGenerationContextForSerializerCreati #endif // DEBUG } } -} \ No newline at end of file +} diff --git a/src/MsgPack/Serialization/CollectionDetailedKind.cs b/src/MsgPack/Serialization/CollectionDetailedKind.cs index 7442c1f73..8da36cbeb 100644 --- a/src/MsgPack/Serialization/CollectionDetailedKind.cs +++ b/src/MsgPack/Serialization/CollectionDetailedKind.cs @@ -34,18 +34,18 @@ internal enum CollectionDetailedKind NonGenericList, GenericDictionary, NonGenericDictionary, -#if !NETFX_35 && !UNITY +#if !NET35 && !UNITY GenericSet, -#endif // !NETFX_35 && !UNITY +#endif // !NET35 && !UNITY GenericCollection, NonGenericCollection, GenericEnumerable, NonGenericEnumerable, -#if !NETFX_35 && !UNITY && !NETFX_40 && !( SILVERLIGHT && !WINDOWS_PHONE ) +#if !NET35 && !UNITY && !NET40 && !( SILVERLIGHT && !WINDOWS_PHONE ) GenericReadOnlyList, GenericReadOnlyCollection, GenericReadOnlyDictionary, -#endif // !NETFX_35 && !UNITY && !NETFX_40 && !( SILVERLIGHT && !WINDOWS_PHONE ) +#endif // !NET35 && !UNITY && !NET40 && !( SILVERLIGHT && !WINDOWS_PHONE ) Unserializable } } \ No newline at end of file diff --git a/src/MsgPack/Serialization/CollectionTraits.cs b/src/MsgPack/Serialization/CollectionTraits.cs index d8e9e8237..ea9fe9eb4 100644 --- a/src/MsgPack/Serialization/CollectionTraits.cs +++ b/src/MsgPack/Serialization/CollectionTraits.cs @@ -46,13 +46,13 @@ public CollectionKind CollectionType case CollectionDetailedKind.GenericCollection: case CollectionDetailedKind.GenericEnumerable: case CollectionDetailedKind.GenericList: -#if !NETFX_35 && !UNITY && !NETFX_40 && !( SILVERLIGHT && !WINDOWS_PHONE ) +#if !NET35 && !UNITY && !NET40 && !( SILVERLIGHT && !WINDOWS_PHONE ) case CollectionDetailedKind.GenericReadOnlyCollection: case CollectionDetailedKind.GenericReadOnlyList: -#endif // !NETFX_35 && !UNITY && !NETFX_40 && !( SILVERLIGHT && !WINDOWS_PHONE ) -#if !NETFX_35 && !UNITY +#endif // !NET35 && !UNITY && !NET40 && !( SILVERLIGHT && !WINDOWS_PHONE ) +#if !NET35 && !UNITY case CollectionDetailedKind.GenericSet: -#endif // !NETFX_35 && !UNITY +#endif // !NET35 && !UNITY case CollectionDetailedKind.NonGenericCollection: case CollectionDetailedKind.NonGenericEnumerable: case CollectionDetailedKind.NonGenericList: @@ -60,9 +60,9 @@ public CollectionKind CollectionType return CollectionKind.Array; } case CollectionDetailedKind.GenericDictionary: -#if !NETFX_35 && !UNITY && !NETFX_40 && !( SILVERLIGHT && !WINDOWS_PHONE ) +#if !NET35 && !UNITY && !NET40 && !( SILVERLIGHT && !WINDOWS_PHONE ) case CollectionDetailedKind.GenericReadOnlyDictionary: -#endif // !NETFX_35 && !UNITY && !NETFX_40 && !( SILVERLIGHT && !WINDOWS_PHONE ) +#endif // !NET35 && !UNITY && !NET40 && !( SILVERLIGHT && !WINDOWS_PHONE ) case CollectionDetailedKind.NonGenericDictionary: { return CollectionKind.Map; diff --git a/src/MsgPack/Serialization/DefaultConcreteTypeRepository.cs b/src/MsgPack/Serialization/DefaultConcreteTypeRepository.cs index 80cf83a8b..56b7253fb 100644 --- a/src/MsgPack/Serialization/DefaultConcreteTypeRepository.cs +++ b/src/MsgPack/Serialization/DefaultConcreteTypeRepository.cs @@ -25,7 +25,7 @@ using System; using System.Collections; using System.Collections.Generic; -#if !NETFX_35 && !SILVERLIGHT && !NETFX_40 +#if !NET35 && !SILVERLIGHT && !NET40 using System.Collections.ObjectModel; #endif using System.Globalization; @@ -44,9 +44,9 @@ internal DefaultConcreteTypeRepository() { this._defaultCollectionTypes = new TypeKeyRepository( new Dictionary( -#if NETFX_35 || ( SILVERLIGHT && !WINDOWS_PHONE ) +#if NET35 || ( SILVERLIGHT && !WINDOWS_PHONE ) 8 -#elif NETFX_40 +#elif NET40 9 #else 12 @@ -61,14 +61,14 @@ internal DefaultConcreteTypeRepository() { typeof( ICollection ).TypeHandle, typeof( List ) }, { typeof( IList ).TypeHandle, typeof( List ) }, { typeof( IDictionary ).TypeHandle, typeof( MessagePackObjectDictionary ) }, -#if !NETFX_35 && !UNITY +#if !NET35 && !UNITY { typeof( ISet<> ).TypeHandle, typeof( HashSet<> ) }, -#if !NETFX_40 && !( SILVERLIGHT && !WINDOWS_PHONE ) +#if !NET40 && !( SILVERLIGHT && !WINDOWS_PHONE ) { typeof( IReadOnlyCollection<> ).TypeHandle, typeof( List<> ) }, { typeof( IReadOnlyList<> ).TypeHandle, typeof( List<> ) }, { typeof( IReadOnlyDictionary<,> ).TypeHandle, typeof( Dictionary<,> ) }, -#endif // !NETFX_40 && !( SILVERLIGHT && !WINDOWS_PHONE ) -#endif // !NETFX_35 && !UNITY +#endif // !NET40 && !( SILVERLIGHT && !WINDOWS_PHONE ) +#endif // !NET35 && !UNITY } ); } diff --git a/src/MsgPack/Serialization/DefaultSerializers/DefaultSerializers.cs b/src/MsgPack/Serialization/DefaultSerializers/DefaultSerializers.cs index 10a3894e6..d0d671341 100644 --- a/src/MsgPack/Serialization/DefaultSerializers/DefaultSerializers.cs +++ b/src/MsgPack/Serialization/DefaultSerializers/DefaultSerializers.cs @@ -912,7 +912,7 @@ protected internal override async Task PackToAsyncCore( Packer packer, System.Co #endif // !UNITY || MSGPACK_UNITY_FULL #if !WINDOWS_PHONE -#if !NETFX_35 && !UNITY +#if !NET35 && !UNITY #if !UNITY || MSGPACK_UNITY_FULL internal sealed class System_Numerics_BigIntegerMessagePackSerializer : MessagePackSerializer< System.Numerics.BigInteger > { @@ -970,7 +970,7 @@ protected internal override async Task PackToAsyncCore( Packer packer, System.Nu #endif // FEATURE_TAP } -#endif // !NETFX_35 && !UNITY +#endif // !NET35 && !UNITY #endif // !WINDOWS_PHONE #endif // !UNITY || MSGPACK_UNITY_FULL // ReSharper restore RedundantCast diff --git a/src/MsgPack/Serialization/DefaultSerializers/DefaultSerializers.tt b/src/MsgPack/Serialization/DefaultSerializers/DefaultSerializers.tt index b6801783e..e25072ea3 100644 --- a/src/MsgPack/Serialization/DefaultSerializers/DefaultSerializers.tt +++ b/src/MsgPack/Serialization/DefaultSerializers/DefaultSerializers.tt @@ -276,7 +276,7 @@ foreach( Type type in types ) if ( notInNetFX35.Contains( type ) ) { #> -#if !NETFX_35 && !UNITY +#if !NET35 && !UNITY <# } @@ -522,7 +522,7 @@ foreach( var ctor in ctors ) if ( notInNetFX35.Contains( type ) ) { #> -#endif // !NETFX_35 && !UNITY +#endif // !NET35 && !UNITY <# } diff --git a/src/MsgPack/Serialization/DefaultSerializers/GenericSerializer.cs b/src/MsgPack/Serialization/DefaultSerializers/GenericSerializer.cs index a7955c5f2..5bed514cb 100644 --- a/src/MsgPack/Serialization/DefaultSerializers/GenericSerializer.cs +++ b/src/MsgPack/Serialization/DefaultSerializers/GenericSerializer.cs @@ -175,14 +175,14 @@ private static MessagePackSerializer CreateDictionarySerializer( SerializationCo #endif // !UNITY #if !UNITY -#if SILVERLIGHT || NETFX_35 || NETFX_40 +#if SILVERLIGHT || NET35 || NET40 [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "context", Justification = "Used in other platform" )] [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "targetType", Justification = "Used in other platform" )] #endif // SILVERLIGHT // ReSharper disable UnusedParameter.Local private static MessagePackSerializer TryCreateImmutableCollectionSerializer( SerializationContext context, Type targetType, PolymorphismSchema schema ) { -#if NETFX_35 || NETFX_40 || SILVERLIGHT +#if NET35 || NET40 || SILVERLIGHT // ImmutableCollections does not support above platforms. return null; #else @@ -259,10 +259,10 @@ private static MessagePackSerializer TryCreateImmutableCollectionSerializer( Ser // ReSharper restore HeuristicUnreachableCode } } -#endif // NETFX_35 || NETFX_40 || SILVERLIGHT +#endif // NET35 || NET40 || SILVERLIGHT } -#if !NETFX_35 && !NETFX_40 && !SILVERLIGHT +#if !NET35 && !NET40 && !SILVERLIGHT private static ImmutableCollectionType DetermineImmutableCollectionType( Type targetType ) { if ( targetType.Namespace != "System.Collections.Immutable" @@ -333,7 +333,7 @@ private static ImmutableCollectionType DetermineImmutableCollectionType( Type ta } } } -#endif // !NETFX_35 && !NETFX_40 && !SILVERLIGHT +#endif // !NET35 && !NET40 && !SILVERLIGHT #endif // !UNITY public static MessagePackSerializer TryCreateAbstractCollectionSerializer( SerializationContext context, Type abstractType, Type concreteType, PolymorphismSchema schema ) @@ -358,9 +358,9 @@ internal static MessagePackSerializer TryCreateAbstractCollectionSerializer( Ser switch ( traits.DetailedCollectionType ) { case CollectionDetailedKind.GenericList: -#if !NETFX_35 && !UNITY +#if !NET35 && !UNITY case CollectionDetailedKind.GenericSet: -#endif // !NETFX_35 && !UNITY +#endif // !NET35 && !UNITY case CollectionDetailedKind.GenericCollection: { #if !UNITY @@ -372,7 +372,7 @@ internal static MessagePackSerializer TryCreateAbstractCollectionSerializer( Ser return new AbstractCollectionMessagePackSerializer( context, abstractType, concreteType, traits, schema ); #endif } -#if !NETFX_35 && !UNITY && !NETFX_40 && !( SILVERLIGHT && !WINDOWS_PHONE ) +#if !NET35 && !UNITY && !NET40 && !( SILVERLIGHT && !WINDOWS_PHONE ) case CollectionDetailedKind.GenericReadOnlyList: case CollectionDetailedKind.GenericReadOnlyCollection: { @@ -385,7 +385,7 @@ internal static MessagePackSerializer TryCreateAbstractCollectionSerializer( Ser return new AbstractCollectionMessagePackSerializer( context, abstractType, concreteType, traits, schema ); #endif } -#endif // !NETFX_35 && !UNITY && !NETFX_40 && !( SILVERLIGHT && !WINDOWS_PHONE ) +#endif // !NET35 && !UNITY && !NET40 && !( SILVERLIGHT && !WINDOWS_PHONE ) case CollectionDetailedKind.GenericEnumerable: { #if !UNITY @@ -413,7 +413,7 @@ genericArgumentOfKeyValuePair[ 1 ] return new AbstractDictionaryMessagePackSerializer( context, abstractType, concreteType, genericArgumentOfKeyValuePair[ 0 ], genericArgumentOfKeyValuePair[ 1 ], traits, schema ); #endif } -#if !NETFX_35 && !UNITY && !NETFX_40 && !( SILVERLIGHT && !WINDOWS_PHONE ) +#if !NET35 && !UNITY && !NET40 && !( SILVERLIGHT && !WINDOWS_PHONE ) case CollectionDetailedKind.GenericReadOnlyDictionary: { var genericArgumentOfKeyValuePair = traits.ElementType.GetGenericArguments(); @@ -430,7 +430,7 @@ genericArgumentOfKeyValuePair[ 1 ] return new AbstractDictionaryMessagePackSerializer( context, abstractType, concreteType, genericArgumentOfKeyValuePair[ 0 ], genericArgumentOfKeyValuePair[ 1 ], traits, schema ); #endif } -#endif // !NETFX_35 && !UNITY && !NETFX_40 && !( SILVERLIGHT && !WINDOWS_PHONE ) +#endif // !NET35 && !UNITY && !NET40 && !( SILVERLIGHT && !WINDOWS_PHONE ) case CollectionDetailedKind.NonGenericList: { #if !UNITY @@ -516,13 +516,13 @@ internal static bool IsSupported( Type type, CollectionTraits traits, bool prefe } } -#if !UNITY && !NETFX_35 && !NETFX_40 && !SILVERLIGHT +#if !UNITY && !NET35 && !NET40 && !SILVERLIGHT // ImmutableCollections does not support above platforms. if ( DetermineImmutableCollectionType( type ) != ImmutableCollectionType.Unknown ) { return true; } -#endif // !UNITY && !NETFX_35 && !NETFX_40 && !SILVERLIGHT +#endif // !UNITY && !NET35 && !NET40 && !SILVERLIGHT if ( preferReflectionBasedSerializer ) { @@ -599,7 +599,7 @@ public MessagePackSerializer Create( SerializationContext context, PolymorphismS } } -#if !NETFX_35 && !NETFX_40 && !SILVERLIGHT +#if !NET35 && !NET40 && !SILVERLIGHT [Preserve( AllMembers = true )] private sealed class ImmutableCollectionSerializerFactory : IGenericBuiltInSerializerFactory @@ -789,7 +789,7 @@ public MessagePackSerializer Create( SerializationContext context, Type targetTy } } -#if !NETFX_35 && !UNITY && !NETFX_40 && !( SILVERLIGHT && !WINDOWS_PHONE ) +#if !NET35 && !UNITY && !NET40 && !( SILVERLIGHT && !WINDOWS_PHONE ) [Preserve( AllMembers = true )] private sealed class ReadOnlyCollectionSerializerFactory : IVariantSerializerFactory where TCollection : IReadOnlyCollection @@ -801,7 +801,7 @@ public MessagePackSerializer Create( SerializationContext context, Type targetTy return new AbstractReadOnlyCollectionMessagePackSerializer( context, targetType, schema ); } } -#endif // !NETFX_35 && !UNITY && !NETFX_40 && !( SILVERLIGHT && !WINDOWS_PHONE ) +#endif // !NET35 && !UNITY && !NET40 && !( SILVERLIGHT && !WINDOWS_PHONE ) [Preserve( AllMembers = true )] #if SILVERLIGHT @@ -820,7 +820,7 @@ public MessagePackSerializer Create( SerializationContext context, Type targetTy } } -#if !NETFX_35 && !UNITY && !NETFX_40 && !( SILVERLIGHT && !WINDOWS_PHONE ) +#if !NET35 && !UNITY && !NET40 && !( SILVERLIGHT && !WINDOWS_PHONE ) [Preserve( AllMembers = true )] private sealed class ReadOnlyDictionarySerializerFactory : IVariantSerializerFactory where TDictionary : IReadOnlyDictionary @@ -832,11 +832,11 @@ public MessagePackSerializer Create( SerializationContext context, Type targetTy return new AbstractReadOnlyDictionaryMessagePackSerializer( context, targetType, schema ); } } -#endif // !NETFX_35 && !UNITY && !NETFX_40 && !( SILVERLIGHT && !WINDOWS_PHONE ) +#endif // !NET35 && !UNITY && !NET40 && !( SILVERLIGHT && !WINDOWS_PHONE ) // ReSharper restore MemberHidesStaticFromOuterClass #endif // !UNITY -#if !NETFX_35 && !NETFX_40 && !SILVERLIGHT && !UNITY +#if !NET35 && !NET40 && !SILVERLIGHT && !UNITY private enum ImmutableCollectionType { Unknown = 0, @@ -852,6 +852,6 @@ private enum ImmutableCollectionType FSharpMap, FSharpSet, } -#endif // !NETFX_35 && !NETFX_40 && !SILVERLIGHT && !UNITY +#endif // !NET35 && !NET40 && !SILVERLIGHT && !UNITY } } diff --git a/src/MsgPack/Serialization/EmittingSerializers/AssemblyBuilderCodeGenerationContext.cs b/src/MsgPack/Serialization/EmittingSerializers/AssemblyBuilderCodeGenerationContext.cs index 1ca9edd15..9c22f7275 100644 --- a/src/MsgPack/Serialization/EmittingSerializers/AssemblyBuilderCodeGenerationContext.cs +++ b/src/MsgPack/Serialization/EmittingSerializers/AssemblyBuilderCodeGenerationContext.cs @@ -2,7 +2,7 @@ // // MessagePack for CLI // -// Copyright (C) 2010-2016 FUJIWARA, Yusuke +// Copyright (C) 2010-2017 FUJIWARA, Yusuke // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -101,6 +101,9 @@ out serializerTypeNamespace /// A collection which correspond to genereated codes. public IEnumerable Generate() { +#if NETSTANDARD2_0 + throw new PlatformNotSupportedException( "Assembly generation is not supported in .NET Standard." ); +#else var assemblyFileName = this._assemblyBuilder.GetName().Name + ".dll"; this._assemblyBuilder.Save( assemblyFileName ); var assemblyFilePath = @@ -121,6 +124,7 @@ public IEnumerable Generate() s.SerializerTypeName ) ); +#endif // NETSTANDARD2_0 } } -} \ No newline at end of file +} diff --git a/src/MsgPack/Serialization/EmittingSerializers/AssemblyBuilderEmittingContext.cs b/src/MsgPack/Serialization/EmittingSerializers/AssemblyBuilderEmittingContext.cs index 91bb32605..c85e4e87c 100644 --- a/src/MsgPack/Serialization/EmittingSerializers/AssemblyBuilderEmittingContext.cs +++ b/src/MsgPack/Serialization/EmittingSerializers/AssemblyBuilderEmittingContext.cs @@ -120,9 +120,9 @@ protected sealed override void ResetCore( Type targetType, Type baseClass ) this.CollectionToBeAdded = ILConstruct.Argument( 1, targetTypeDefinition, "collection" ); this.ItemToAdd = ILConstruct.Argument( 2, traits.ElementType, "item" ); if ( traits.DetailedCollectionType == CollectionDetailedKind.GenericDictionary -#if !NETFX_35 && !UNITY && !NETFX_40 && !SILVERLIGHT +#if !NET35 && !UNITY && !NET40 && !SILVERLIGHT || traits.DetailedCollectionType == CollectionDetailedKind.GenericReadOnlyDictionary -#endif // !NETFX_35 && !UNITY && !NETFX_40 && !SILVERLIGHT +#endif // !NET35 && !UNITY && !NET40 && !SILVERLIGHT ) { this.KeyToAdd = ILConstruct.Argument( 2, traits.ElementType.GetGenericArguments()[ 0 ], "key" ); diff --git a/src/MsgPack/Serialization/EmittingSerializers/SerializationMethodGeneratorManager.cs b/src/MsgPack/Serialization/EmittingSerializers/SerializationMethodGeneratorManager.cs index 96cbb9022..307940f65 100644 --- a/src/MsgPack/Serialization/EmittingSerializers/SerializationMethodGeneratorManager.cs +++ b/src/MsgPack/Serialization/EmittingSerializers/SerializationMethodGeneratorManager.cs @@ -2,7 +2,7 @@ // // MessagePack for CLI // -// Copyright (C) 2010-2016 FUJIWARA, Yusuke +// Copyright (C) 2010-2017 FUJIWARA, Yusuke // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -144,12 +144,12 @@ internal static void Refresh() private readonly ModuleBuilder _module; private readonly bool _isDebuggable; -#if NETFX_35 +#if NET35 [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "isCollectable", Justification = "Used in other platforms" )] -#endif // NETFX_35 -#if !NETFX_35 +#endif // NET35 +#if !NET35 [SecuritySafeCritical] -#endif // !NETFX_35 +#endif // !NET35 private SerializationMethodGeneratorManager( bool isDebuggable, bool isCollectable, AssemblyBuilder assemblyBuilder ) { this._isDebuggable = isDebuggable; @@ -169,16 +169,16 @@ private SerializationMethodGeneratorManager( bool isDebuggable, bool isCollectab { assemblyName = typeof( SerializationMethodGeneratorManager ).Namespace + ".GeneratedSerealizers" + Interlocked.Increment( ref _assemblySequence ); var dedicatedAssemblyBuilder = -#if !NETSTANDARD1_1 && !NETSTANDARD1_3 +#if !NETSTANDARD1_1 && !NETSTANDARD1_3 && !NETSTANDARD2_0 AppDomain.CurrentDomain.DefineDynamicAssembly( new AssemblyName( assemblyName ), isDebuggable ? AssemblyBuilderAccess.RunAndSave -#if !NETFX_35 +#if !NET35 : ( isCollectable ? AssemblyBuilderAccess.RunAndCollect : AssemblyBuilderAccess.Run ) #else : AssemblyBuilderAccess.Run -#endif // !NETFX_35 +#endif // !NET35 #if DEBUG , SerializerDebugging.DumpDirectory @@ -189,13 +189,13 @@ private SerializationMethodGeneratorManager( bool isDebuggable, bool isCollectab new AssemblyName( assemblyName ), isCollectable ? AssemblyBuilderAccess.RunAndCollect : AssemblyBuilderAccess.Run ); -#endif // !NETSTANDARD1_1 && !NETSTANDARD1_3 +#endif // !NETSTANDARD1_1 && !NETSTANDARD1_3 && !NETSTANDARD2_0 SetUpAssemblyBuilderAttributes( dedicatedAssemblyBuilder, isDebuggable ); this._assembly = dedicatedAssemblyBuilder; } -#if !NETSTANDARD1_1 && !NETSTANDARD1_3 +#if !NETSTANDARD1_1 && !NETSTANDARD1_3 && !NETSTANDARD2_0 if ( isDebuggable ) { this._module = this._assembly.DefineDynamicModule( assemblyName, assemblyName + ".dll", true ); @@ -206,7 +206,7 @@ private SerializationMethodGeneratorManager( bool isDebuggable, bool isCollectab } #else this._module = this._assembly.DefineDynamicModule( assemblyName ); -#endif // !NETSTANDARD1_1 && !NETSTANDARD1_3 +#endif // !NETSTANDARD1_1 && !NETSTANDARD1_3 && !NETSTANDARD2_0 } internal static void SetUpAssemblyBuilderAttributes( AssemblyBuilder dedicatedAssemblyBuilder, bool isDebuggable ) @@ -233,7 +233,7 @@ internal static void SetUpAssemblyBuilderAttributes( AssemblyBuilder dedicatedAs new object[] { 8 } ) ); -#if !NETFX_35 && !NETSTANDARD1_1 && !NETSTANDARD1_3 +#if !NET35 && !NETSTANDARD1_1 && !NETSTANDARD1_3 dedicatedAssemblyBuilder.SetCustomAttribute( new CustomAttributeBuilder( // ReSharper disable once AssignNullToNotNullAttribute @@ -243,7 +243,7 @@ internal static void SetUpAssemblyBuilderAttributes( AssemblyBuilder dedicatedAs new object[] { true } ) ); -#endif // !NETFX_35 && !NETSTANDARD1_1 && !NETSTANDARD1_3 +#endif // !NET35 && !NETSTANDARD1_1 && !NETSTANDARD1_3 } /// diff --git a/src/MsgPack/Serialization/EmittingSerializers/SerializerEmitter.cs b/src/MsgPack/Serialization/EmittingSerializers/SerializerEmitter.cs index bb61732d7..011a79cc1 100644 --- a/src/MsgPack/Serialization/EmittingSerializers/SerializerEmitter.cs +++ b/src/MsgPack/Serialization/EmittingSerializers/SerializerEmitter.cs @@ -2,7 +2,7 @@ // // MessagePack for CLI // -// Copyright (C) 2010-2016 FUJIWARA, Yusuke +// Copyright (C) 2010-2017 FUJIWARA, Yusuke // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -78,12 +78,12 @@ public SerializerEmitter( ModuleBuilder host, SerializerSpecification specificat #endif // DEBUG this._isDebuggable = isDebuggable; -#if DEBUG && !NETFX_35 && !NETSTANDARD1_1 && !NETSTANDARD1_3 +#if DEBUG && !NET35 && !NETSTANDARD1_1 && !NETSTANDARD1_3 && !NETSTANDARD2_0 if ( isDebuggable && SerializerDebugging.DumpEnabled ) { SerializerDebugging.PrepareDump( host.Assembly as AssemblyBuilder ); } -#endif // DEBUG && !NETFX_35 && !NETSTANDARD1_1 && !NETSTANDARD1_3 +#endif // DEBUG && !NET35 && !NETSTANDARD1_1 && !NETSTANDARD1_3 && !NETSTANDARD2_0 } #region -- Field -- @@ -219,11 +219,11 @@ private TracingILGenerator GetILGenerator( ConstructorBuilder builder, Type[] pa String.Join( ", ", parameterTypes.Select( t => t.GetFullName() ).ToArray() ), builder.Attributes.ToILString(), builder.CallingConvention.ToILString(), -#if !NETFX_35 && !NETFX_40 +#if !NET35 && !NET40 builder.MethodImplementationFlags.ToILString() #else String.Empty -#endif // !NETFX_35 && !NETFX_40 +#endif // !NET35 && !NET40 ); } #endif // DEBUG @@ -246,11 +246,11 @@ private TracingILGenerator GetILGenerator( MethodBuilder builder, Type[] paramet builder.ReturnType.GetFullName(), builder.Attributes.ToILString(), builder.CallingConvention.ToILString(), -#if !NETFX_35 && !NETFX_40 +#if !NET35 && !NET40 builder.MethodImplementationFlags.ToILString() #else String.Empty -#endif // !NETFX_35 && !NETFX_40 +#endif // !NET35 && !NET40 ); } #endif // DEBUG @@ -284,4 +284,4 @@ private ConstructorBuilder CreateConstructor( MethodAttributes attributes, Type[ #endregion -- Constructor -- } -} \ No newline at end of file +} diff --git a/src/MsgPack/Serialization/EmittingSerializers/SerializerEmitter.enum.cs b/src/MsgPack/Serialization/EmittingSerializers/SerializerEmitter.enum.cs index fe24dce73..2b73b4bde 100644 --- a/src/MsgPack/Serialization/EmittingSerializers/SerializerEmitter.enum.cs +++ b/src/MsgPack/Serialization/EmittingSerializers/SerializerEmitter.enum.cs @@ -2,7 +2,7 @@ // // MessagePack for CLI // -// Copyright (C) 2014-2016 FUJIWARA, Yusuke +// Copyright (C) 2014-2017 FUJIWARA, Yusuke // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -88,11 +88,11 @@ public Func Cre ( _, il ) => CreateDefaultObjectConstructor( contextfulConstructor, il ) ); -#if !NETSTANDARD1_1 && !NETSTANDARD1_3 +#if !NETSTANDARD1_1 && !NETSTANDARD1_3 && !NETSTANDARD2_0 var ctor = this._typeBuilder.CreateType().GetConstructor( ConstructorParameterTypesWithoutCapabilities ); #else var ctor = this._typeBuilder.CreateTypeInfo().GetConstructor( ConstructorParameterTypesWithoutCapabilities ); -#endif // !NETSTANDARD1_1 && !NETSTANDARD1_3 +#endif // !NETSTANDARD1_1 && !NETSTANDARD1_3 && !NETSTANDARD2_0 #if DEBUG Contract.Assert( ctor != null, "ctor != null" ); diff --git a/src/MsgPack/Serialization/EnumMessagePackSerializer`1.cs b/src/MsgPack/Serialization/EnumMessagePackSerializer`1.cs index 5cd706428..78069d790 100644 --- a/src/MsgPack/Serialization/EnumMessagePackSerializer`1.cs +++ b/src/MsgPack/Serialization/EnumMessagePackSerializer`1.cs @@ -183,7 +183,7 @@ protected internal sealed override TEnum UnpackFromCore( Unpacker unpacker ) if ( !this._deserializationMapping.TryGetValue( asString, out result ) ) { // May be undefined value which should be numeric, or PacakCasing. -#if NETFX_35 || UNITY +#if NET35 || UNITY try { result = ( TEnum ) Enum.Parse( typeof( TEnum ), asString, false ); @@ -212,7 +212,7 @@ protected internal sealed override TEnum UnpackFromCore( Unpacker unpacker ) ) ); } -#endif // NETFX_35 || UNITY +#endif // NET35 || UNITY } return result; diff --git a/src/MsgPack/Serialization/ExtTypeCodeMapping.cs b/src/MsgPack/Serialization/ExtTypeCodeMapping.cs index 89b45c447..969faafe4 100644 --- a/src/MsgPack/Serialization/ExtTypeCodeMapping.cs +++ b/src/MsgPack/Serialization/ExtTypeCodeMapping.cs @@ -22,9 +22,9 @@ #define UNITY #endif -#if !NETFX_40 && !NETFX_35 && !UNITY && !SILVERLIGHT -#define NETFX_45 -#endif // !NETFX_40 && !NETFX_35 && !UNITY && !SILVERLIGHT +#if !NET40 && !NET35 && !UNITY && !SILVERLIGHT +#define NET45 +#endif // !NET40 && !NET35 && !UNITY && !SILVERLIGHT using System; using System.Collections.Generic; #if CORE_CLR || UNITY || NETSTANDARD1_1 @@ -34,9 +34,9 @@ #endif // CORE_CLR || UNITY || NETSTANDARD1_1 using System.Globalization; using System.Linq; -#if NETFX_45 +#if NET45 using System.Threading; -#endif // NETFX_45 +#endif // NET45 namespace MsgPack.Serialization { @@ -177,9 +177,9 @@ public bool Remove( byte typeCode ) private void RemoveCore( string name, byte typeCode ) { -#if DEBUG && NETFX_45 +#if DEBUG && NET45 Contract.Assert( Monitor.IsEntered( this._syncRoot ) ); -#endif // DEBUG && NETFX_45 +#endif // DEBUG && NET45 var shouldBeTrue = this._types.Remove( typeCode ); Contract.Assert( shouldBeTrue ); shouldBeTrue = this._index.Remove( name ); diff --git a/src/MsgPack/Serialization/FromExpression.ToMethod.cs b/src/MsgPack/Serialization/FromExpression.ToMethod.cs index 7942cc279..47b3ced73 100644 --- a/src/MsgPack/Serialization/FromExpression.ToMethod.cs +++ b/src/MsgPack/Serialization/FromExpression.ToMethod.cs @@ -55,84 +55,84 @@ public static MethodInfo ToMethod( Expression< System.Action( Expression< System.Action > source ) { return ToMethodCore( source ); } #endif -#if !WINDOWS_PHONE && !NETFX_35 +#if !WINDOWS_PHONE && !NET35 [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode" )] public static MethodInfo ToMethod( Expression< System.Action > source ) { return ToMethodCore( source ); } #endif -#if !WINDOWS_PHONE && !NETFX_35 +#if !WINDOWS_PHONE && !NET35 [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode" )] public static MethodInfo ToMethod( Expression< System.Action > source ) { return ToMethodCore( source ); } #endif -#if !WINDOWS_PHONE && !NETFX_35 +#if !WINDOWS_PHONE && !NET35 [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode" )] public static MethodInfo ToMethod( Expression< System.Action > source ) { return ToMethodCore( source ); } #endif -#if !WINDOWS_PHONE && !NETFX_35 +#if !WINDOWS_PHONE && !NET35 [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode" )] public static MethodInfo ToMethod( Expression< System.Action > source ) { return ToMethodCore( source ); } #endif -#if !WINDOWS_PHONE && !NETFX_35 +#if !WINDOWS_PHONE && !NET35 [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode" )] public static MethodInfo ToMethod( Expression< System.Action > source ) { return ToMethodCore( source ); } #endif -#if !WINDOWS_PHONE && !NETFX_35 +#if !WINDOWS_PHONE && !NET35 [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode" )] public static MethodInfo ToMethod( Expression< System.Action > source ) { return ToMethodCore( source ); } #endif -#if !WINDOWS_PHONE && !NETFX_35 +#if !WINDOWS_PHONE && !NET35 [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode" )] public static MethodInfo ToMethod( Expression< System.Action > source ) { return ToMethodCore( source ); } #endif -#if !WINDOWS_PHONE && !NETFX_35 +#if !WINDOWS_PHONE && !NET35 [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode" )] public static MethodInfo ToMethod( Expression< System.Action > source ) { return ToMethodCore( source ); } #endif -#if !WINDOWS_PHONE && !NETFX_35 +#if !WINDOWS_PHONE && !NET35 [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode" )] public static MethodInfo ToMethod( Expression< System.Action > source ) { return ToMethodCore( source ); } #endif -#if !WINDOWS_PHONE && !NETFX_35 +#if !WINDOWS_PHONE && !NET35 [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode" )] public static MethodInfo ToMethod( Expression< System.Action > source ) { return ToMethodCore( source ); } #endif -#if !WINDOWS_PHONE && !NETFX_35 +#if !WINDOWS_PHONE && !NET35 [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode" )] public static MethodInfo ToMethod( Expression< System.Action > source ) { @@ -165,84 +165,84 @@ public static MethodInfo ToMethod( Expression< System.F { return ToMethodCore( source ); } -#if !WINDOWS_PHONE && !NETFX_35 +#if !WINDOWS_PHONE && !NET35 [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode" )] public static MethodInfo ToMethod( Expression< System.Func > source ) { return ToMethodCore( source ); } #endif -#if !WINDOWS_PHONE && !NETFX_35 +#if !WINDOWS_PHONE && !NET35 [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode" )] public static MethodInfo ToMethod( Expression< System.Func > source ) { return ToMethodCore( source ); } #endif -#if !WINDOWS_PHONE && !NETFX_35 +#if !WINDOWS_PHONE && !NET35 [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode" )] public static MethodInfo ToMethod( Expression< System.Func > source ) { return ToMethodCore( source ); } #endif -#if !WINDOWS_PHONE && !NETFX_35 +#if !WINDOWS_PHONE && !NET35 [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode" )] public static MethodInfo ToMethod( Expression< System.Func > source ) { return ToMethodCore( source ); } #endif -#if !WINDOWS_PHONE && !NETFX_35 +#if !WINDOWS_PHONE && !NET35 [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode" )] public static MethodInfo ToMethod( Expression< System.Func > source ) { return ToMethodCore( source ); } #endif -#if !WINDOWS_PHONE && !NETFX_35 +#if !WINDOWS_PHONE && !NET35 [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode" )] public static MethodInfo ToMethod( Expression< System.Func > source ) { return ToMethodCore( source ); } #endif -#if !WINDOWS_PHONE && !NETFX_35 +#if !WINDOWS_PHONE && !NET35 [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode" )] public static MethodInfo ToMethod( Expression< System.Func > source ) { return ToMethodCore( source ); } #endif -#if !WINDOWS_PHONE && !NETFX_35 +#if !WINDOWS_PHONE && !NET35 [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode" )] public static MethodInfo ToMethod( Expression< System.Func > source ) { return ToMethodCore( source ); } #endif -#if !WINDOWS_PHONE && !NETFX_35 +#if !WINDOWS_PHONE && !NET35 [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode" )] public static MethodInfo ToMethod( Expression< System.Func > source ) { return ToMethodCore( source ); } #endif -#if !WINDOWS_PHONE && !NETFX_35 +#if !WINDOWS_PHONE && !NET35 [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode" )] public static MethodInfo ToMethod( Expression< System.Func > source ) { return ToMethodCore( source ); } #endif -#if !WINDOWS_PHONE && !NETFX_35 +#if !WINDOWS_PHONE && !NET35 [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode" )] public static MethodInfo ToMethod( Expression< System.Func > source ) { return ToMethodCore( source ); } #endif -#if !WINDOWS_PHONE && !NETFX_35 +#if !WINDOWS_PHONE && !NET35 [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode" )] public static MethodInfo ToMethod( Expression< System.Func > source ) { diff --git a/src/MsgPack/Serialization/FromExpression.ToMethod.tt b/src/MsgPack/Serialization/FromExpression.ToMethod.tt index d7a351ae3..a06508752 100644 --- a/src/MsgPack/Serialization/FromExpression.ToMethod.tt +++ b/src/MsgPack/Serialization/FromExpression.ToMethod.tt @@ -73,7 +73,7 @@ foreach( Type __action in __actions ) if ( __notAvailableOnWP ) { #> -#if !WINDOWS_PHONE && !NETFX_35 +#if !WINDOWS_PHONE && !NET35 <# } #> @@ -100,7 +100,7 @@ foreach( Type __func in __funcs ) if ( __notAvailableOnWP ) { #> -#if !WINDOWS_PHONE && !NETFX_35 +#if !WINDOWS_PHONE && !NET35 <# } #> diff --git a/src/MsgPack/Serialization/INilImplicationHandlerOnUnpackedParameter.cs b/src/MsgPack/Serialization/INilImplicationHandlerOnUnpackedParameter.cs index d2f686e4b..fc7ab5479 100644 --- a/src/MsgPack/Serialization/INilImplicationHandlerOnUnpackedParameter.cs +++ b/src/MsgPack/Serialization/INilImplicationHandlerOnUnpackedParameter.cs @@ -29,7 +29,7 @@ namespace MsgPack.Serialization /// /// Defines common interface for parameter of method and its template methods. /// -#if NETFX_35 || UNITY +#if NET35 || UNITY internal interface INilImplicationHandlerOnUnpackedParameter : INilImplicationHandlerParameter #else internal interface INilImplicationHandlerOnUnpackedParameter : INilImplicationHandlerParameter diff --git a/src/MsgPack/Serialization/MessagePackSerializer.Factories.cs b/src/MsgPack/Serialization/MessagePackSerializer.Factories.cs index c3632cf44..d48a27df6 100644 --- a/src/MsgPack/Serialization/MessagePackSerializer.Factories.cs +++ b/src/MsgPack/Serialization/MessagePackSerializer.Factories.cs @@ -37,11 +37,11 @@ using MsgPack.Serialization.DefaultSerializers; using MsgPack.Serialization.ReflectionSerializers; -#if !SILVERLIGHT && !NETFX_35 && !UNITY +#if !SILVERLIGHT && !NET35 && !UNITY using System.Collections.Concurrent; -#else // !SILVERLIGHT && !NETFX_35 && !UNITY +#else // !SILVERLIGHT && !NET35 && !UNITY using System.Collections.Generic; -#endif // !SILVERLIGHT && !NETFX_35 && !UNITY +#endif // !SILVERLIGHT && !NET35 && !UNITY #if CORE_CLR || UNITY || NETSTANDARD1_1 using Contract = MsgPack.MPContract; #else @@ -292,12 +292,12 @@ internal static MessagePackSerializer CreateInternal( SerializationContext } #if !UNITY -#if !SILVERLIGHT && !NETFX_35 +#if !SILVERLIGHT && !NET35 private static readonly ConcurrentDictionary> _creatorCache = new ConcurrentDictionary>(); #else private static readonly object _syncRoot = new object(); private static readonly Dictionary> _creatorCache = new Dictionary>(); -#endif // !SILVERLIGHT && !NETFX_35 +#endif // !SILVERLIGHT && !NET35 #endif // !UNITY /// @@ -367,7 +367,7 @@ public static MessagePackSerializer Create( Type targetType, SerializationContex typeof( Func ) ) as Func ); -#elif SILVERLIGHT || NETFX_35 +#elif SILVERLIGHT || NET35 Func factory; lock ( _syncRoot ) @@ -601,7 +601,7 @@ internal static MessagePackSerializer CreateReflectionInternal( Serializat { return ReflectionSerializerHelper.CreateReflectionEnumMessagePackSerializer( context ); } -#if !NETFX_35 && !UNITY +#if !NET35 && !UNITY if ( TupleItems.IsTuple( typeof( T ) ) ) { return @@ -610,7 +610,7 @@ internal static MessagePackSerializer CreateReflectionInternal( Serializat ( schema ?? PolymorphismSchema.Default ).ChildSchemaList ); } -#endif // !NETFX_35 && !UNITY +#endif // !NET35 && !UNITY SerializationTarget.VerifyType( typeof( T ) ); var target = SerializationTarget.Prepare( context, typeof( T ) ); diff --git a/src/MsgPack/Serialization/Metadata/_Unpacker.cs b/src/MsgPack/Serialization/Metadata/_Unpacker.cs index ebceb3c5a..0c0214bc8 100644 --- a/src/MsgPack/Serialization/Metadata/_Unpacker.cs +++ b/src/MsgPack/Serialization/Metadata/_Unpacker.cs @@ -29,9 +29,9 @@ namespace MsgPack.Serialization.Metadata internal static partial class _Unpacker { public static readonly MethodInfo Read = FromExpression.ToMethod( ( Unpacker unpacker ) => unpacker.Read() ); -#if !NETFX_35 +#if !NET35 public static readonly PropertyInfo ItemsCount = FromExpression.ToProperty( ( Unpacker unpacker ) => unpacker.ItemsCount ); -#endif // !NETFX_35 +#endif // !NET35 public static readonly PropertyInfo IsArrayHeader = FromExpression.ToProperty( ( Unpacker unpacker ) => unpacker.IsArrayHeader ); public static readonly PropertyInfo IsMapHeader = FromExpression.ToProperty( ( Unpacker unpacker ) => unpacker.IsMapHeader ); #if FEATURE_TAP diff --git a/src/MsgPack/Serialization/Polymorphic/KnownTypePolymorphicMessagePackSerializer`1.cs b/src/MsgPack/Serialization/Polymorphic/KnownTypePolymorphicMessagePackSerializer`1.cs index dbb1080e2..4eda4c51d 100644 --- a/src/MsgPack/Serialization/Polymorphic/KnownTypePolymorphicMessagePackSerializer`1.cs +++ b/src/MsgPack/Serialization/Polymorphic/KnownTypePolymorphicMessagePackSerializer`1.cs @@ -78,9 +78,9 @@ private static IDictionary BuildTypeHandleTypeCodeMap String.Join( CultureInfo.CurrentCulture.TextInfo.ListSeparator, typeHandleTypeCodeMapping.Select( kv => kv.Key ) -#if NETFX_35 || UNITY +#if NET35 || UNITY .Select( b => b.ToString( CultureInfo.InvariantCulture ) ).ToArray() -#endif // NETFX_35 || UNITY +#endif // NET35 || UNITY ) ) ); diff --git a/src/MsgPack/Serialization/PolymorphismSchema.Constructors.cs b/src/MsgPack/Serialization/PolymorphismSchema.Constructors.cs index deb78aacd..cce22f106 100644 --- a/src/MsgPack/Serialization/PolymorphismSchema.Constructors.cs +++ b/src/MsgPack/Serialization/PolymorphismSchema.Constructors.cs @@ -344,7 +344,7 @@ PolymorphismSchema valueSchema ); } -#if !NETFX_35 && !UNITY +#if !NET35 && !UNITY // Tuple items /// @@ -381,7 +381,7 @@ private static void VerifyArity( Type tupleType, ICollection throw new ArgumentException( "An arity of itemSchemaList does not match for an arity of the tuple.", "itemSchemaList" ); } } -#endif // !NETFX_35 && !UNITY +#endif // !NET35 && !UNITY internal PolymorphismSchema FilterSelf() { diff --git a/src/MsgPack/Serialization/PolymorphismSchema.Internals.cs b/src/MsgPack/Serialization/PolymorphismSchema.Internals.cs index 24165b3f4..6332515be 100644 --- a/src/MsgPack/Serialization/PolymorphismSchema.Internals.cs +++ b/src/MsgPack/Serialization/PolymorphismSchema.Internals.cs @@ -98,13 +98,13 @@ partial class PolymorphismSchema internal static readonly MethodInfo ForPolymorphicDictionaryCodeTypeMappingMethod = typeof( PolymorphismSchema ).GetMethod( "ForPolymorphicDictionary", new[] { typeof( Type ), typeof( IDictionary ), typeof( PolymorphismSchema ), typeof( PolymorphismSchema ) } ); -#if !NETFX_35 && !UNITY +#if !NET35 && !UNITY /// /// ForPolymorphicTuple( Type targetType, PolymorphismSchema[] itemSchemaList ) /// internal static readonly MethodInfo ForPolymorphicTupleMethod = typeof( PolymorphismSchema ).GetMethod( "ForPolymorphicTuple", new[] { typeof( Type ), typeof( PolymorphismSchema[]) } ); -#endif // !NETFX_35 && !UNITY +#endif // !NET35 && !UNITY internal static readonly ConstructorInfo CodeTypeMapConstructor = typeof( Dictionary<,> ).MakeGenericType( typeof( string ), typeof( Type ) ) @@ -168,7 +168,7 @@ private void ToDebugString( StringBuilder buffer ) break; } -#if !NETFX_35 && !UNITY +#if !NET35 && !UNITY case PolymorphismSchemaChildrenType.TupleItems: { buffer.Append( ", TupleItemsSchema:[" ); @@ -196,7 +196,7 @@ private void ToDebugString( StringBuilder buffer ) break; } -#endif // !NETFX_35 && !UNITY +#endif // !NET35 && !UNITY } buffer.Append( '}' ); @@ -341,7 +341,7 @@ private static PolymorphismSchema CreateCore( MemberInfo member, PolymorphismSch } default: { -#if !NETFX_35 && !UNITY +#if !NET35 && !UNITY if ( TupleItems.IsTuple( member.GetMemberValueType() ) ) { if ( table.TupleItems.Count == 0 ) @@ -373,7 +373,7 @@ private static PolymorphismSchema CreateCore( MemberInfo member, PolymorphismSch ); } else -#endif // !NETFX_35 && !UNITY +#endif // !NET35 && !UNITY { if ( !table.Member.Exists ) { @@ -400,25 +400,25 @@ private struct TypeTable public readonly TypeTableEntry Member; public readonly TypeTableEntry CollectionItem; public readonly TypeTableEntry DictionaryKey; -#if !NETFX_35 && !UNITY +#if !NET35 && !UNITY public readonly IList TupleItems; -#endif // !NETFX_35 && !UNITY +#endif // !NET35 && !UNITY private TypeTable( TypeTableEntry member, TypeTableEntry collectionItem, TypeTableEntry dictionaryKey -#if !NETFX_35 && !UNITY +#if !NET35 && !UNITY , IList tupleItems -#endif // !NETFX_35 && !UNITY +#endif // !NET35 && !UNITY ) { this.Member = member; this.CollectionItem = collectionItem; this.DictionaryKey = dictionaryKey; -#if !NETFX_35 && !UNITY +#if !NET35 && !UNITY this.TupleItems = tupleItems; -#endif // !NETFX_35 && !UNITY +#endif // !NET35 && !UNITY } public static TypeTable Create( MemberInfo member, PolymorphismSchema defaultSchema ) @@ -428,18 +428,18 @@ public static TypeTable Create( MemberInfo member, PolymorphismSchema defaultSch TypeTableEntry.Create( member, PolymorphismTarget.Member, defaultSchema ), TypeTableEntry.Create( member, PolymorphismTarget.CollectionItem, defaultSchema.TryGetItemSchema() ), TypeTableEntry.Create( member, PolymorphismTarget.DictionaryKey, defaultSchema.TryGetKeySchema() ) -#if !NETFX_35 && !UNITY +#if !NET35 && !UNITY , TypeTableEntry.CreateTupleItems( member ) -#endif // !NETFX_35 && !UNITY +#endif // !NET35 && !UNITY ); } } private sealed class TypeTableEntry { -#if !NETFX_35 && !UNITY +#if !NET35 && !UNITY private static readonly TypeTableEntry[] EmptyEntries = new TypeTableEntry[ 0 ]; -#endif // !NETFX_35 && !UNITY +#endif // !NET35 && !UNITY private readonly Dictionary _knownTypeMapping = new Dictionary(); @@ -490,7 +490,7 @@ var attribute in return result; } -#if !NETFX_35 && !UNITY +#if !NET35 && !UNITY public static TypeTableEntry[] CreateTupleItems( MemberInfo member ) { if ( !TupleItems.IsTuple( member.GetMemberValueType() ) ) @@ -512,7 +512,7 @@ var attribute in return result; } -#endif // !NETFX_35 && !UNITY +#endif // !NET35 && !UNITY private void Interpret( IPolymorphicHelperAttribute attribute, string memberName, int tupleItemNumber ) { diff --git a/src/MsgPack/Serialization/PolymorphismSchema.cs b/src/MsgPack/Serialization/PolymorphismSchema.cs index 6368c64e4..8fc7648a7 100644 --- a/src/MsgPack/Serialization/PolymorphismSchema.cs +++ b/src/MsgPack/Serialization/PolymorphismSchema.cs @@ -174,7 +174,7 @@ private PolymorphismSchema TryGetKeySchema() } } -#if NETFX_35 || NETFX_40 || SILVERLIGHT || UNITY || CORE_CLR || NETSTANDARD1_1 +#if NET35 || NET40 || SILVERLIGHT || UNITY || CORE_CLR || NETSTANDARD1_1 private sealed class ReadOnlyDictionary : IDictionary { private readonly IDictionary _underlying; @@ -268,6 +268,6 @@ bool ICollection>.Remove( KeyValuePair throw new NotSupportedException(); } } -#endif // NETFX_35 || NETFX_40 || SILVERLIGHT || UNITY +#endif // NET35 || NET40 || SILVERLIGHT || UNITY } } \ No newline at end of file diff --git a/src/MsgPack/Serialization/PolymorphismSchemaChildrenType.cs b/src/MsgPack/Serialization/PolymorphismSchemaChildrenType.cs index 2d1b14516..d74afa34b 100644 --- a/src/MsgPack/Serialization/PolymorphismSchemaChildrenType.cs +++ b/src/MsgPack/Serialization/PolymorphismSchemaChildrenType.cs @@ -40,11 +40,11 @@ internal enum PolymorphismSchemaChildrenType /// DictionaryKeyValues, -#if !NETFX_35 && !UNITY +#if !NET35 && !UNITY /// /// Tuple items, so chidren count is equal to tuple's arity. /// TupleItems -#endif // !NETFX_35 && !UNITY +#endif // !NET35 && !UNITY } } \ No newline at end of file diff --git a/src/MsgPack/Serialization/Reflection/GenericTypeExtensions.cs b/src/MsgPack/Serialization/Reflection/GenericTypeExtensions.cs index ed108316b..0fa1b8257 100644 --- a/src/MsgPack/Serialization/Reflection/GenericTypeExtensions.cs +++ b/src/MsgPack/Serialization/Reflection/GenericTypeExtensions.cs @@ -97,11 +97,11 @@ public static string GetName( this Type source ) String.Concat( source.Name, '[', -#if !NETFX_35 && !UNITY +#if !NET35 && !UNITY String.Join( ", ", source.GetGenericArguments().Select( t => t.GetName() ) ), #else String.Join( ", ", source.GetGenericArguments().Select( t => t.GetName() ).ToArray() ), -#endif // !NETFX_35 && !UNITY +#endif // !NET35 && !UNITY ']' ); } @@ -150,11 +150,11 @@ public static string GetFullName( this Type source ) ReflectionAbstractions.TypeDelimiter, source.Name, '[', -#if !NETFX_35 && !UNITY +#if !NET35 && !UNITY String.Join( ", ", source.GetGenericArguments().Select( t => t.GetFullName() ) ), #else String.Join( ", ", source.GetGenericArguments().Select( t => t.GetFullName() ).ToArray() ), -#endif // !NETFX_35 && !UNITY +#endif // !NET35 && !UNITY ']' ); } diff --git a/src/MsgPack/Serialization/Reflection/ReflectionExtensions.cs b/src/MsgPack/Serialization/Reflection/ReflectionExtensions.cs index d7347d31c..fdf86068d 100644 --- a/src/MsgPack/Serialization/Reflection/ReflectionExtensions.cs +++ b/src/MsgPack/Serialization/Reflection/ReflectionExtensions.cs @@ -242,9 +242,9 @@ public static string ToILString( this MethodImplAttributes source ) AddString( result, source, MethodImplAttributes.NoInlining, "noinlining" ); #if !UNITY AddString( result, source, MethodImplAttributes.NoOptimization, "nooptimization" ); -#if !NETFX_35 && !NETFX_40 +#if !NET35 && !NET40 AddString( result, source, MethodImplAttributes.AggressiveInlining, "aggressiveinlining" ); -#endif // !NETFX_35 && !NETFX_40 +#endif // !NET35 && !NET40 #endif // !UNITY return result.ToString(); diff --git a/src/MsgPack/Serialization/Reflection/TracingILGenerator.conveniences.cs b/src/MsgPack/Serialization/Reflection/TracingILGenerator.conveniences.cs index 879486341..87dac5541 100644 --- a/src/MsgPack/Serialization/Reflection/TracingILGenerator.conveniences.cs +++ b/src/MsgPack/Serialization/Reflection/TracingILGenerator.conveniences.cs @@ -175,7 +175,7 @@ public void EmitStringFormat( int temporaryLocalArrayIndex, Type resource, strin { Contract.Assert( resource != null ); Contract.Assert( resourceKey != null ); -#if !NETFX_35 +#if !NET35 Contract.Assert( !String.IsNullOrWhiteSpace( resourceKey ) ); #else Contract.Assert( !String.IsNullOrEmpty( resourceKey ) ); @@ -237,7 +237,7 @@ public void EmitStringFormatInvariant( int temporaryLocalArrayIndex, Type resour { Contract.Assert( resource != null ); Contract.Assert( resourceKey != null ); -#if !NETFX_35 +#if !NET35 Contract.Assert( !String.IsNullOrWhiteSpace( resourceKey ) ); #else Contract.Assert( !String.IsNullOrEmpty( resourceKey ) ); diff --git a/src/MsgPack/Serialization/Reflection/TracingILGenerator.cs b/src/MsgPack/Serialization/Reflection/TracingILGenerator.cs index 4d5da4114..c03df546f 100644 --- a/src/MsgPack/Serialization/Reflection/TracingILGenerator.cs +++ b/src/MsgPack/Serialization/Reflection/TracingILGenerator.cs @@ -1,8 +1,8 @@ -#region -- License Terms -- +#region -- License Terms -- // // NLiblet // -// Copyright (C) 2011-2016 FUJIWARA, Yusuke and contributors +// Copyright (C) 2011-2017 FUJIWARA, Yusuke and contributors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -352,7 +352,7 @@ private LocalBuilder DeclareLocalCore( Type localType, string name ) var result = this._underlying.DeclareLocal( localType ); this._localDeclarations.Add( result, name ); // TODO: NLiblet -#if !NETSTANDARD1_1 && !NETSTANDARD1_3 +#if !NETSTANDARD1_1 && !NETSTANDARD1_3 && !NETSTANDARD2_0 if ( !this._isInDynamicMethod && this._isDebuggable ) { try @@ -364,7 +364,7 @@ private LocalBuilder DeclareLocalCore( Type localType, string name ) this._isInDynamicMethod = true; } } -#endif // !NETSTANDARD1_1 && !NETSTANDARD1_3 +#endif // !NETSTANDARD1_1 && !NETSTANDARD1_3 && !NETSTANDARD2_0 return result; } @@ -374,7 +374,7 @@ private LocalBuilder DeclareLocalCore( Type localType, string name, bool pinned var result = this._underlying.DeclareLocal( localType, pinned ); this._localDeclarations.Add( result, name ); // TODO: NLiblet -#if !NETSTANDARD1_1 && !NETSTANDARD1_3 +#if !NETSTANDARD1_1 && !NETSTANDARD1_3 && !NETSTANDARD2_0 if ( !this._isInDynamicMethod && this._isDebuggable ) { try @@ -386,7 +386,7 @@ private LocalBuilder DeclareLocalCore( Type localType, string name, bool pinned this._isInDynamicMethod = true; } } -#endif // !NETSTANDARD1_1 && !NETSTANDARD1_3 +#endif // !NETSTANDARD1_1 && !NETSTANDARD1_3 && !NETSTANDARD2_0 return result; } #endif // DEBUG @@ -663,7 +663,7 @@ public void MarkLabel( Label label ) #region -- Calli -- #if DEBUG -#if !NETSTANDARD1_1 && !NETSTANDARD1_3 +#if !NETSTANDARD1_1 && !NETSTANDARD1_3 && !NETSTANDARD2_0 /// /// Emit 'calli' instruction for indirect unmanaged function call. /// @@ -710,7 +710,7 @@ public void EmitCalli( CallingConventions managedCallingConventions, Type return this._underlying.EmitCalli( OpCodes.Calli, managedCallingConventions, returnType, requiredParameterTypes, optionalParameterTypes ); } -#endif // !NETSTANDARD1_1 && !NETSTANDARD1_3 +#endif // !NETSTANDARD1_1 && !NETSTANDARD1_3 && !NETSTANDARD2_0 #endif // DEBUG #endregion #endif // !SILVERLIGHT @@ -809,7 +809,7 @@ public void EmitTailCallVirt( MethodInfo target ) this.EmitRet(); } -#if !SILVERLIGHT +#if !SILVERLIGHT && !NETSTANDARD2_0 /// /// Emit 'calli' instruction for indirect unmanaged function call as tail call. /// @@ -867,7 +867,7 @@ public void EmitTailCalli( CallingConventions managedCallingConventions, Type re this.EmitCalli( managedCallingConventions, returnType, requiredParameterTypes, optionalParameterTypes ); this.EmitRet(); } -#endif // SILVERLIGHT +#endif // SILVERLIGHT && !NETSTANDARD2_0 #endif // !NETSTANDARD1_1 && !NETSTANDARD1_3 #endif // DEBUG diff --git a/src/MsgPack/Serialization/ReflectionExtensions.CollectionTraits.cs b/src/MsgPack/Serialization/ReflectionExtensions.CollectionTraits.cs index 5ff9378f4..3e6b20c37 100644 --- a/src/MsgPack/Serialization/ReflectionExtensions.CollectionTraits.cs +++ b/src/MsgPack/Serialization/ReflectionExtensions.CollectionTraits.cs @@ -156,7 +156,7 @@ ref ienumerable ); } -#if !NETFX_35 && !UNITY && !NETFX_40 && !( SILVERLIGHT && !WINDOWS_PHONE ) +#if !NET35 && !UNITY && !NET40 && !( SILVERLIGHT && !WINDOWS_PHONE ) if ( genericTypes.IReadOnlyDictionaryT != null ) { var elementType = typeof( KeyValuePair<,> ).MakeGenericType( genericTypes.IReadOnlyDictionaryT.GetGenericArguments() ); @@ -169,7 +169,7 @@ ref ienumerable GetCountGetterMethod( source, elementType, options ) ); } -#endif // !NETFX_35 && !UNITY && !NETFX_40 && !( SILVERLIGHT && !WINDOWS_PHONE ) +#endif // !NET35 && !UNITY && !NET40 && !( SILVERLIGHT && !WINDOWS_PHONE ) if ( genericTypes.IEnumerableT != null ) { @@ -238,17 +238,17 @@ out CollectionTraits result { kind = CollectionDetailedKind.GenericList; } -#if !NETFX_35 && !UNITY +#if !NET35 && !UNITY else if ( genericTypes.ISetT != null ) { kind = CollectionDetailedKind.GenericSet; } -#endif // !NETFX_35 && !UNITY +#endif // !NET35 && !UNITY else if ( genericTypes.ICollectionT != null ) { kind = CollectionDetailedKind.GenericCollection; } -#if !NETFX_35 && !UNITY && !NETFX_40 && !( SILVERLIGHT && !WINDOWS_PHONE ) +#if !NET35 && !UNITY && !NET40 && !( SILVERLIGHT && !WINDOWS_PHONE ) else if ( genericTypes.IReadOnlyListT != null ) { kind = CollectionDetailedKind.GenericReadOnlyList; @@ -257,7 +257,7 @@ out CollectionTraits result { kind = CollectionDetailedKind.GenericReadOnlyCollection; } -#endif // !NETFX_35 && !UNITY && !NETFX_40 && !( SILVERLIGHT && !WINDOWS_PHONE ) +#endif // !NET35 && !UNITY && !NET40 && !( SILVERLIGHT && !WINDOWS_PHONE ) result = new CollectionTraits( @@ -278,9 +278,9 @@ out CollectionTraits result ) { if ( source.Implements( typeof( IDictionary<,> ) ) -#if !NETFX_35 && !UNITY && !NETFX_40 && !( SILVERLIGHT && !WINDOWS_PHONE ) +#if !NET35 && !UNITY && !NET40 && !( SILVERLIGHT && !WINDOWS_PHONE ) || source.Implements( typeof( IReadOnlyDictionary<,> ) ) -#endif // !NETFX_35 && !UNITY && !NETFX_40 && !( SILVERLIGHT && !WINDOWS_PHONE ) +#endif // !NET35 && !UNITY && !NET40 && !( SILVERLIGHT && !WINDOWS_PHONE ) ) { var ienumetaorT = @@ -295,13 +295,13 @@ out CollectionTraits result result = new CollectionTraits( -#if !NETFX_35 && !UNITY && !NETFX_40 && !( SILVERLIGHT && !WINDOWS_PHONE ) +#if !NET35 && !UNITY && !NET40 && !( SILVERLIGHT && !WINDOWS_PHONE ) source.Implements( typeof( IDictionary<,> ) ) ? CollectionDetailedKind.GenericDictionary : CollectionDetailedKind.GenericReadOnlyDictionary, #else CollectionDetailedKind.GenericDictionary, -#endif // !NETFX_35 && !UNITY && !NETFX_40 && !( SILVERLIGHT && !WINDOWS_PHONE ) +#endif // !NET35 && !UNITY && !NET40 && !( SILVERLIGHT && !WINDOWS_PHONE ) elementType, getEnumerator, GetAddMethod( source, elementTypeGenericArguments[ 0 ], elementTypeGenericArguments [ 1 ], options ), @@ -347,13 +347,13 @@ out CollectionTraits result genericTypes.ICollectionT = genericInterfaces.FirstOrDefault( i => i == typeof(ICollection<>) ); genericTypes.IListT = genericInterfaces.FirstOrDefault( i => i == typeof(IList<>) ); -#if !NETFX_35 && !UNITY +#if !NET35 && !UNITY genericTypes.ISetT = genericInterfaces.FirstOrDefault( i => i == typeof(ISet<>) ); -#endif // !NETFX_35 && !UNITY -#if !NETFX_35 && !UNITY && !NETFX_40 && !( SILVERLIGHT && !WINDOWS_PHONE ) +#endif // !NET35 && !UNITY +#if !NET35 && !UNITY && !NET40 && !( SILVERLIGHT && !WINDOWS_PHONE ) genericTypes.IReadOnlyCollectionT = genericInterfaces.FirstOrDefault( i => i == typeof(IReadOnlyCollection<>) ); genericTypes.IReadOnlyListT = genericInterfaces.FirstOrDefault( i => i == typeof(IReadOnlyList<>) ); -#endif // !NETFX_35 && !UNITY && !NETFX_40 && !( SILVERLIGHT && !WINDOWS_PHONE ) +#endif // !NET35 && !UNITY && !NET40 && !( SILVERLIGHT && !WINDOWS_PHONE ) return TryCreateCollectionTraitsForIEnumerableT( source, genericTypes, options, getEnumerator, out result ); } @@ -367,20 +367,20 @@ out CollectionTraits result private static bool TryCreateGenericCollectionTraits( Type source, Type type, CollectionTraitOptions options, out CollectionTraits result ) { if ( type == typeof( IDictionary ) -#if !NETFX_35 && !UNITY && !NETFX_40 && !( SILVERLIGHT && !WINDOWS_PHONE ) +#if !NET35 && !UNITY && !NET40 && !( SILVERLIGHT && !WINDOWS_PHONE ) || type == typeof( IReadOnlyDictionary ) -#endif // !NETFX_35 && !UNITY && !NETFX_40 && !( SILVERLIGHT && !WINDOWS_PHONE ) +#endif // !NET35 && !UNITY && !NET40 && !( SILVERLIGHT && !WINDOWS_PHONE ) ) { result = new CollectionTraits( -#if !NETFX_35 && !UNITY && !NETFX_40 && !( SILVERLIGHT && !WINDOWS_PHONE ) +#if !NET35 && !UNITY && !NET40 && !( SILVERLIGHT && !WINDOWS_PHONE ) ( source == typeof( IDictionary ) || source.Implements( typeof( IDictionary ) ) ) ? CollectionDetailedKind.GenericDictionary : CollectionDetailedKind.GenericReadOnlyDictionary, #else CollectionDetailedKind.GenericDictionary, -#endif // !NETFX_35 && !UNITY && !NETFX_40 && !( SILVERLIGHT && !WINDOWS_PHONE ) +#endif // !NET35 && !UNITY && !NET40 && !( SILVERLIGHT && !WINDOWS_PHONE ) typeof( KeyValuePair ), GetGetEnumeratorMethodFromEnumerableType( source, typeof( IEnumerable> ), options ), GetAddMethod( source, typeof( MessagePackObject ), typeof( MessagePackObject ), options ), @@ -400,21 +400,21 @@ private static bool TryCreateGenericCollectionTraits( Type source, Type type, Co new CollectionTraits( ( source == typeof( IList ) || source.Implements( typeof( IList ) ) ) ? CollectionDetailedKind.GenericList -#if !NETFX_35 && !UNITY && !NETFX_40 && !( SILVERLIGHT && !WINDOWS_PHONE ) +#if !NET35 && !UNITY && !NET40 && !( SILVERLIGHT && !WINDOWS_PHONE ) : ( source == typeof( IReadOnlyList ) || source.Implements( typeof( IReadOnlyList ) ) ) ? CollectionDetailedKind.GenericReadOnlyList -#endif // !NETFX_35 && !UNITY && !NETFX_40 && !( SILVERLIGHT && !WINDOWS_PHONE ) -#if !NETFX_35 && !UNITY +#endif // !NET35 && !UNITY && !NET40 && !( SILVERLIGHT && !WINDOWS_PHONE ) +#if !NET35 && !UNITY : ( source == typeof( ISet ) || source.Implements( typeof( ISet ) ) ) ? CollectionDetailedKind.GenericSet -#endif // !NETFX_35 && !UNITY +#endif // !NET35 && !UNITY : ( source == typeof( ICollection ) || source.Implements( typeof( ICollection ) ) ) ? CollectionDetailedKind.GenericCollection -#if !NETFX_35 && !UNITY && !NETFX_40 && !( SILVERLIGHT && !WINDOWS_PHONE ) +#if !NET35 && !UNITY && !NET40 && !( SILVERLIGHT && !WINDOWS_PHONE ) : ( source == typeof( IReadOnlyCollection ) || source.Implements( typeof( IReadOnlyCollection ) ) ) ? CollectionDetailedKind.GenericReadOnlyCollection -#endif // !NETFX_35 && !UNITY && !NETFX_40 && !( SILVERLIGHT && !WINDOWS_PHONE ) +#endif // !NET35 && !UNITY && !NET40 && !( SILVERLIGHT && !WINDOWS_PHONE ) : CollectionDetailedKind.GenericEnumerable, typeof( MessagePackObject ), GetGetEnumeratorMethodFromEnumerableType( source, typeof( IEnumerable ), options ), @@ -452,7 +452,7 @@ ref Type ienumerable genericTypes.IDictionaryT = type; } -#if !NETFX_35 && !UNITY && !NETFX_40 && !( SILVERLIGHT && !WINDOWS_PHONE ) +#if !NET35 && !UNITY && !NET40 && !( SILVERLIGHT && !WINDOWS_PHONE ) else if ( genericTypeDefinition == typeof( IReadOnlyDictionary<,> ) ) { if ( genericTypes.IReadOnlyDictionaryT != null ) @@ -462,7 +462,7 @@ ref Type ienumerable genericTypes.IReadOnlyDictionaryT = type; } -#endif // !NETFX_35 && !UNITY && !NETFX_40 && !( SILVERLIGHT && !WINDOWS_PHONE ) +#endif // !NET35 && !UNITY && !NET40 && !( SILVERLIGHT && !WINDOWS_PHONE ) else if ( genericTypeDefinition == typeof( IList<> ) ) { if ( genericTypes.IListT != null ) @@ -472,7 +472,7 @@ ref Type ienumerable genericTypes.IListT = type; } -#if !NETFX_35 && !UNITY && !NETFX_40 && !( SILVERLIGHT && !WINDOWS_PHONE ) +#if !NET35 && !UNITY && !NET40 && !( SILVERLIGHT && !WINDOWS_PHONE ) else if ( genericTypeDefinition == typeof( IReadOnlyList<> ) ) { if ( genericTypes.IReadOnlyListT != null ) @@ -482,8 +482,8 @@ ref Type ienumerable genericTypes.IReadOnlyListT = type; } -#endif // !NETFX_35 && !UNITY && !NETFX_40 && !( SILVERLIGHT && !WINDOWS_PHONE ) -#if !NETFX_35 && !UNITY +#endif // !NET35 && !UNITY && !NET40 && !( SILVERLIGHT && !WINDOWS_PHONE ) +#if !NET35 && !UNITY else if ( genericTypeDefinition == typeof( ISet<> ) ) { if ( genericTypes.ISetT != null ) @@ -493,7 +493,7 @@ ref Type ienumerable genericTypes.ISetT = type; } -#endif // !NETFX_35 && !UNITY +#endif // !NET35 && !UNITY else if ( genericTypeDefinition == typeof( ICollection<> ) ) { if ( genericTypes.ICollectionT != null ) @@ -503,7 +503,7 @@ ref Type ienumerable genericTypes.ICollectionT = type; } -#if !NETFX_35 && !UNITY && !NETFX_40 && !( SILVERLIGHT && !WINDOWS_PHONE ) +#if !NET35 && !UNITY && !NET40 && !( SILVERLIGHT && !WINDOWS_PHONE ) else if ( genericTypeDefinition == typeof( IReadOnlyCollection<> ) ) { if ( genericTypes.IReadOnlyCollectionT != null ) @@ -513,7 +513,7 @@ ref Type ienumerable genericTypes.IReadOnlyCollectionT = type; } -#endif // !NETFX_35 && !UNITY && !NETFX_40 && !( SILVERLIGHT && !WINDOWS_PHONE ) +#endif // !NET35 && !UNITY && !NET40 && !( SILVERLIGHT && !WINDOWS_PHONE ) else if ( genericTypeDefinition == typeof( IEnumerable<> ) ) { if ( genericTypes.IEnumerableT != null ) @@ -585,11 +585,11 @@ private static MethodInfo FindInterfaceMethod( Type targetType, Type interfaceTy if ( index < 0 ) { #if DEBUG -#if !NETFX_35 && !UNITY +#if !NET35 && !UNITY Contract.Assert( false, interfaceType + "::" + name + "(" + String.Join( ", ", parameterTypes ) + ") is not found in " + targetType ); #else Contract.Assert( false, interfaceType + "::" + name + "(" + String.Join( ", ", parameterTypes.Select( t => t.ToString() ).ToArray() ) + ") is not found in " + targetType ); -#endif // !NETFX_35 +#endif // !NET35 #endif // DEBUG // ReSharper disable once HeuristicUnreachableCode return null; @@ -661,13 +661,13 @@ private static MethodInfo GetCountGetterMethod( Type targetType, Type elementTyp return icollectionT.GetProperty( "Count" ).GetGetMethod(); } -#if !NETFX_35 && !UNITY && !NETFX_40 && !( SILVERLIGHT && !WINDOWS_PHONE ) +#if !NET35 && !UNITY && !NET40 && !( SILVERLIGHT && !WINDOWS_PHONE ) var ireadOnlyCollectionT = typeof( IReadOnlyCollection<> ).MakeGenericType( elementType ); if ( targetType.IsAssignableTo( ireadOnlyCollectionT ) ) { return ireadOnlyCollectionT.GetProperty( "Count" ).GetGetMethod(); } -#endif // !NETFX_35 && !UNITY && !NETFX_40 && !( SILVERLIGHT && !WINDOWS_PHONE ) +#endif // !NET35 && !UNITY && !NET40 && !( SILVERLIGHT && !WINDOWS_PHONE ) if ( targetType.IsAssignableTo( typeof( ICollection ) ) ) { @@ -815,14 +815,14 @@ private struct GenericCollectionTypes internal Type IListT; internal Type IDictionaryT; -#if !NETFX_35 && !UNITY +#if !NET35 && !UNITY internal Type ISetT; -#if !NETFX_40 && !( SILVERLIGHT && !WINDOWS_PHONE ) +#if !NET40 && !( SILVERLIGHT && !WINDOWS_PHONE ) internal Type IReadOnlyCollectionT; internal Type IReadOnlyListT; internal Type IReadOnlyDictionaryT; -#endif // !NETFX_40 && !( SILVERLIGHT && !WINDOWS_PHONE ) -#endif // !NETFX_35 && !UNITY +#endif // !NET40 && !( SILVERLIGHT && !WINDOWS_PHONE ) +#endif // !NET35 && !UNITY // ReSharper restore InconsistentNaming } } diff --git a/src/MsgPack/Serialization/ReflectionSerializers/ReflectionSerializerHelper.cs b/src/MsgPack/Serialization/ReflectionSerializers/ReflectionSerializerHelper.cs index b9502a244..1df60c360 100644 --- a/src/MsgPack/Serialization/ReflectionSerializers/ReflectionSerializerHelper.cs +++ b/src/MsgPack/Serialization/ReflectionSerializers/ReflectionSerializerHelper.cs @@ -84,9 +84,9 @@ PolymorphismSchema schema return ArraySerializer.Create( context, schema ); } case CollectionDetailedKind.GenericList: -#if !NETFX_35 && !UNITY +#if !NET35 && !UNITY case CollectionDetailedKind.GenericSet: -#endif // !NETFX_35 && !UNITY +#endif // !NET35 && !UNITY case CollectionDetailedKind.GenericCollection: { return diff --git a/src/MsgPack/Serialization/SerializationContext.cs b/src/MsgPack/Serialization/SerializationContext.cs index cc7065c85..c06d65893 100644 --- a/src/MsgPack/Serialization/SerializationContext.cs +++ b/src/MsgPack/Serialization/SerializationContext.cs @@ -31,7 +31,7 @@ using System.Collections.Concurrent; #else // !FEATURE_CONCURRENT using System.Collections.Generic; -#endif // !SILVERLIGHT && !NETFX_35 && !UNITY +#endif // !SILVERLIGHT && !NET35 && !UNITY #if CORE_CLR || UNITY || NETSTANDARD1_1 using Contract = MsgPack.MPContract; #else diff --git a/src/MsgPack/Serialization/SerializationTarget.cs b/src/MsgPack/Serialization/SerializationTarget.cs index 889e21e8b..86271cafa 100644 --- a/src/MsgPack/Serialization/SerializationTarget.cs +++ b/src/MsgPack/Serialization/SerializationTarget.cs @@ -804,7 +804,7 @@ public static SerializationTarget CreateForCollection( ConstructorInfo collectio return new SerializationTarget( EmptyMembers, collectionConstructor, EmptyStrings, canDeserialize ); } -#if !NETFX_35 +#if !NET35 public static SerializationTarget CreateForTuple( IList itemTypes ) { return new SerializationTarget( itemTypes.Select( ( _, i ) => new SerializingMember( GetTupleItemNameFromIndex( i ) ) ).ToArray(), null, null, true ); @@ -814,7 +814,7 @@ public static string GetTupleItemNameFromIndex( int i ) { return "Item" + ( i + 1 ).ToString( "D", CultureInfo.InvariantCulture ); } -#endif // !NETFX_35 +#endif // !NET35 #if !SILVERLIGHT && !AOT && !NETSTANDARD1_1 && !NETSTANDARD1_3 public static bool BuiltInSerializerExists( ISerializerGeneratorConfiguration configuration, Type type, CollectionTraits traits ) diff --git a/src/MsgPack/Serialization/SerializerDebugging.cs b/src/MsgPack/Serialization/SerializerDebugging.cs index ead3626a8..f80a2021c 100644 --- a/src/MsgPack/Serialization/SerializerDebugging.cs +++ b/src/MsgPack/Serialization/SerializerDebugging.cs @@ -1,8 +1,8 @@ -#region -- License Terms -- +#region -- License Terms -- // // MessagePack for CLI // -// Copyright (C) 2010-2016 FUJIWARA, Yusuke and contributors +// Copyright (C) 2010-2017 FUJIWARA, Yusuke and contributors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -27,9 +27,9 @@ #endif using System; -#if !NETFX_35 && !UNITY && !WINDOWS_PHONE +#if !NET35 && !UNITY && !WINDOWS_PHONE using System.Collections.Concurrent; -#endif // !NETFX_35 && !UNITY && !WINDOWS_PHONE +#endif // !NET35 && !UNITY && !WINDOWS_PHONE using System.Collections.Generic; using System.Diagnostics; #if CORE_CLR || UNITY || NETSTANDARD1_1 @@ -203,6 +203,7 @@ public static void FlushTraceData() } #if !NETSTANDARD1_3 +#if !NETSTANDARD2_0 [ThreadStatic] private static AssemblyBuilder _assemblyBuilder; @@ -239,6 +240,7 @@ public static void PrepareDump() _moduleBuilder = _assemblyBuilder.DefineDynamicModule( "ExpressionTreeSerializerLogics", "ExpressionTreeSerializerLogics.dll", true ); } +#endif // !NETSTANDARD2_0 #if !FERATURE_CONCURRENT private static volatile DependentAssemblyManager _dependentAssemblyManager = DependentAssemblyManager.Default; @@ -313,6 +315,7 @@ public static bool OnTheFlyCodeGenerationEnabled set { _onTheFlyCodeDomEnabled = value; } } +#if !NETSTANDARD2_0 /// /// Creates the new type builder for the serializer. /// @@ -338,13 +341,14 @@ public static TypeBuilder NewTypeBuilder( Type targetType ) [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "For unit testing" )] public static void Dump() { -#if !NETFX_35 +#if !NET35 if ( _assemblyBuilder != null ) { _assemblyBuilder.Save( _assemblyBuilder.GetName().Name + ".dll" ); } -#endif // !NETFX_35 +#endif // !NET35 } +#endif // !NETSTANDARD2_0 /// /// Resets debugging states. @@ -352,8 +356,10 @@ public static void Dump() [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "For unit testing" )] public static void Reset() { +#if !NETSTANDARD2_0 _assemblyBuilder = null; _moduleBuilder = null; +#endif // !NETSTANDARD2_0 _dumpEnabled = false; if ( _ilTraceWriter != null ) @@ -369,17 +375,17 @@ public static void Reset() #endif // !NETSTANDARD1_3 #endif // !AOT && !SILVERLIGHT && !NETSTANDARD1_1 -#if NETFX_35 || UNITY || SILVERLIGHT +#if NET35 || UNITY || SILVERLIGHT private static int _useLegacyNullMapEntryHandling; #else private static bool _useLegacyNullMapEntryHandling; -#endif // NETFX_35 || UNITY || SILVERLIGHT +#endif // NET35 || UNITY || SILVERLIGHT internal static bool UseLegacyNullMapEntryHandling { get { -#if NETFX_35 || UNITY || SILVERLIGHT +#if NET35 || UNITY || SILVERLIGHT return Volatile.Read( ref _useLegacyNullMapEntryHandling ) == 1; #else return Volatile.Read( ref _useLegacyNullMapEntryHandling ); @@ -387,7 +393,7 @@ internal static bool UseLegacyNullMapEntryHandling } set { -#if NETFX_35 || UNITY || SILVERLIGHT +#if NET35 || UNITY || SILVERLIGHT Volatile.Write( ref _useLegacyNullMapEntryHandling, value ? 1 : 0 ); #else Volatile.Write( ref _useLegacyNullMapEntryHandling, value ); @@ -463,4 +469,4 @@ public static void SetCodeCompiler( CodeCompiler codeCompiler ) #endif // !NETSTANDARD1_1 && !NETSTANDARD1_3 #endif // DEBUG } -} \ No newline at end of file +} diff --git a/src/MsgPack/Serialization/SerializerGenerator.cs b/src/MsgPack/Serialization/SerializerGenerator.cs index a04503c54..753d83474 100644 --- a/src/MsgPack/Serialization/SerializerGenerator.cs +++ b/src/MsgPack/Serialization/SerializerGenerator.cs @@ -1,8 +1,8 @@ -#region -- License Terms -- +#region -- License Terms -- // // MessagePack for CLI // -// Copyright (C) 2010-2016 FUJIWARA, Yusuke and contributors +// Copyright (C) 2010-2017 FUJIWARA, Yusuke and contributors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -22,18 +22,22 @@ #endregion -- License Terms -- using System; -using System.CodeDom; using System.Collections.Generic; -using System.Diagnostics.Contracts; -using System.Globalization; using System.IO; using System.Linq; -using System.Reflection; -using System.Reflection.Emit; using MsgPack.Serialization.AbstractSerializers; using MsgPack.Serialization.CodeDomSerializers; + +#if !NETSTANDARD2_0 +using System.CodeDom; +using System.Diagnostics.Contracts; +using System.Globalization; +using System.Reflection; +using System.Reflection.Emit; + using MsgPack.Serialization.EmittingSerializers; +#endif // !NETSTANDARD2_0 namespace MsgPack.Serialization { @@ -57,8 +61,13 @@ namespace MsgPack.Serialization /// If you want to get such fine grained control for them, you should implement own hand made serializers. /// /// - public class SerializerGenerator + public +#if NETSTANDARD2_0 + static +#endif // NETSTANDARD2_0 + class SerializerGenerator { +#if !NETSTANDARD2_0 /// /// Gets the type of the root object which will be serialized/deserialized. /// @@ -285,6 +294,8 @@ public static IEnumerable GenerateSerializerCode { return new SerializerAssemblyGenerationLogic().Generate( targetTypes, configuration ); } +#endif // !NETSTANDARD2_0 + /// /// Generates source codes which implement auto-generated serializer types for specified types with default configuration. /// @@ -553,6 +564,7 @@ var dependentType in protected abstract Func CreateGeneratorFactory( SerializationContext context ); } +#if !NETSTANDARD2_0 private sealed class SerializerAssemblyGenerationLogic : SerializerGenerationLogic { protected override EmitterFlavor EmitterFlavor @@ -582,6 +594,7 @@ protected override Func CreateGeneratorFactory( return type => new AssemblyBuilderSerializerBuilder( type, type.GetCollectionTraits( CollectionTraitOptions.Full, context.CompatibilityOptions.AllowNonCollectionEnumerableTypes ) ); } } +#endif // !NETSTANDARD2_0 private sealed class SerializerCodesGenerationLogic : SerializerGenerationLogic { diff --git a/src/MsgPack/Serialization/SerializerRepository.defaults.cs b/src/MsgPack/Serialization/SerializerRepository.defaults.cs index e2be71df3..03064679a 100644 --- a/src/MsgPack/Serialization/SerializerRepository.defaults.cs +++ b/src/MsgPack/Serialization/SerializerRepository.defaults.cs @@ -29,9 +29,9 @@ using System.Collections.Specialized; #endif // !UNITY || MSGPACK_UNITY_FULL using System.Globalization; -#if !WINDOWS_PHONE && !NETFX_35 && !UNITY +#if !WINDOWS_PHONE && !NET35 && !UNITY using System.Numerics; -#endif // !WINDOWS_PHONE && !NETFX_35 && !UNITY +#endif // !WINDOWS_PHONE && !NET35 && !UNITY using System.Reflection; using System.Text; @@ -94,11 +94,11 @@ internal static Dictionary InitializeDefaultTable( Se dictionary.Add( typeof( System.UInt32 ).TypeHandle, new MsgPack.Serialization.DefaultSerializers.System_UInt32MessagePackSerializer( ownerContext ) ); dictionary.Add( typeof( System.UInt64 ).TypeHandle, new MsgPack.Serialization.DefaultSerializers.System_UInt64MessagePackSerializer( ownerContext ) ); #if !NETSTANDARD1_1 -#if !NETFX_35 && !UNITY && !NETFX_40 && !NETFX_45 && !SILVERLIGHT +#if !NET35 && !UNITY && !NET40 && !NET45 && !SILVERLIGHT #if !NETSTANDARD1_1 && !NETSTANDARD1_3 && !XAMARIN dictionary.Add( typeof( System.Security.Cryptography.HashAlgorithmName ).TypeHandle, new MsgPack.Serialization.DefaultSerializers.System_Security_Cryptography_HashAlgorithmNameMessagePackSerializer( ownerContext ) ); #endif // !NETSTANDARD1_1 && !NETSTANDARD1_3 && !XAMARIN -#endif // !NETFX_35 && !UNITY && !NETFX_40 && !NETFX_45 && !SILVERLIGHT +#endif // !NET35 && !UNITY && !NET40 && !NET45 && !SILVERLIGHT #endif // !NETSTANDARD1_1 #if !NETSTANDARD1_1 #if !SILVERLIGHT @@ -108,61 +108,61 @@ internal static Dictionary InitializeDefaultTable( Se #endif // !SILVERLIGHT #endif // !NETSTANDARD1_1 #if !WINDOWS_PHONE -#if !NETFX_35 && !UNITY +#if !NET35 && !UNITY #if !UNITY || MSGPACK_UNITY_FULL dictionary.Add( typeof( System.Numerics.BigInteger ).TypeHandle, new MsgPack.Serialization.DefaultSerializers.System_Numerics_BigIntegerMessagePackSerializer( ownerContext ) ); #endif // !UNITY || MSGPACK_UNITY_FULL -#endif // !NETFX_35 && !UNITY +#endif // !NET35 && !UNITY #endif // !WINDOWS_PHONE -#if !NETFX_35 && !UNITY && !NETFX_40 && !NETFX_45 && !SILVERLIGHT +#if !NET35 && !UNITY && !NET40 && !NET45 && !SILVERLIGHT #if !NETSTANDARD1_1 && !NETSTANDARD1_3 && !XAMARIN #if !UNITY || MSGPACK_UNITY_FULL dictionary.Add( typeof( System.Numerics.Matrix3x2 ).TypeHandle, new MsgPack.Serialization.DefaultSerializers.System_Numerics_Matrix3x2MessagePackSerializer( ownerContext ) ); #endif // !UNITY || MSGPACK_UNITY_FULL #endif // !NETSTANDARD1_1 && !NETSTANDARD1_3 && !XAMARIN -#endif // !NETFX_35 && !UNITY && !NETFX_40 && !NETFX_45 && !SILVERLIGHT -#if !NETFX_35 && !UNITY && !NETFX_40 && !NETFX_45 && !SILVERLIGHT +#endif // !NET35 && !UNITY && !NET40 && !NET45 && !SILVERLIGHT +#if !NET35 && !UNITY && !NET40 && !NET45 && !SILVERLIGHT #if !NETSTANDARD1_1 && !NETSTANDARD1_3 && !XAMARIN #if !UNITY || MSGPACK_UNITY_FULL dictionary.Add( typeof( System.Numerics.Matrix4x4 ).TypeHandle, new MsgPack.Serialization.DefaultSerializers.System_Numerics_Matrix4x4MessagePackSerializer( ownerContext ) ); #endif // !UNITY || MSGPACK_UNITY_FULL #endif // !NETSTANDARD1_1 && !NETSTANDARD1_3 && !XAMARIN -#endif // !NETFX_35 && !UNITY && !NETFX_40 && !NETFX_45 && !SILVERLIGHT -#if !NETFX_35 && !UNITY && !NETFX_40 && !NETFX_45 && !SILVERLIGHT +#endif // !NET35 && !UNITY && !NET40 && !NET45 && !SILVERLIGHT +#if !NET35 && !UNITY && !NET40 && !NET45 && !SILVERLIGHT #if !NETSTANDARD1_1 && !NETSTANDARD1_3 && !XAMARIN #if !UNITY || MSGPACK_UNITY_FULL dictionary.Add( typeof( System.Numerics.Plane ).TypeHandle, new MsgPack.Serialization.DefaultSerializers.System_Numerics_PlaneMessagePackSerializer( ownerContext ) ); #endif // !UNITY || MSGPACK_UNITY_FULL #endif // !NETSTANDARD1_1 && !NETSTANDARD1_3 && !XAMARIN -#endif // !NETFX_35 && !UNITY && !NETFX_40 && !NETFX_45 && !SILVERLIGHT -#if !NETFX_35 && !UNITY && !NETFX_40 && !NETFX_45 && !SILVERLIGHT +#endif // !NET35 && !UNITY && !NET40 && !NET45 && !SILVERLIGHT +#if !NET35 && !UNITY && !NET40 && !NET45 && !SILVERLIGHT #if !NETSTANDARD1_1 && !NETSTANDARD1_3 && !XAMARIN #if !UNITY || MSGPACK_UNITY_FULL dictionary.Add( typeof( System.Numerics.Quaternion ).TypeHandle, new MsgPack.Serialization.DefaultSerializers.System_Numerics_QuaternionMessagePackSerializer( ownerContext ) ); #endif // !UNITY || MSGPACK_UNITY_FULL #endif // !NETSTANDARD1_1 && !NETSTANDARD1_3 && !XAMARIN -#endif // !NETFX_35 && !UNITY && !NETFX_40 && !NETFX_45 && !SILVERLIGHT -#if !NETFX_35 && !UNITY && !NETFX_40 && !NETFX_45 && !SILVERLIGHT +#endif // !NET35 && !UNITY && !NET40 && !NET45 && !SILVERLIGHT +#if !NET35 && !UNITY && !NET40 && !NET45 && !SILVERLIGHT #if !NETSTANDARD1_1 && !NETSTANDARD1_3 && !XAMARIN #if !UNITY || MSGPACK_UNITY_FULL dictionary.Add( typeof( System.Numerics.Vector2 ).TypeHandle, new MsgPack.Serialization.DefaultSerializers.System_Numerics_Vector2MessagePackSerializer( ownerContext ) ); #endif // !UNITY || MSGPACK_UNITY_FULL #endif // !NETSTANDARD1_1 && !NETSTANDARD1_3 && !XAMARIN -#endif // !NETFX_35 && !UNITY && !NETFX_40 && !NETFX_45 && !SILVERLIGHT -#if !NETFX_35 && !UNITY && !NETFX_40 && !NETFX_45 && !SILVERLIGHT +#endif // !NET35 && !UNITY && !NET40 && !NET45 && !SILVERLIGHT +#if !NET35 && !UNITY && !NET40 && !NET45 && !SILVERLIGHT #if !NETSTANDARD1_1 && !NETSTANDARD1_3 && !XAMARIN #if !UNITY || MSGPACK_UNITY_FULL dictionary.Add( typeof( System.Numerics.Vector3 ).TypeHandle, new MsgPack.Serialization.DefaultSerializers.System_Numerics_Vector3MessagePackSerializer( ownerContext ) ); #endif // !UNITY || MSGPACK_UNITY_FULL #endif // !NETSTANDARD1_1 && !NETSTANDARD1_3 && !XAMARIN -#endif // !NETFX_35 && !UNITY && !NETFX_40 && !NETFX_45 && !SILVERLIGHT -#if !NETFX_35 && !UNITY && !NETFX_40 && !NETFX_45 && !SILVERLIGHT +#endif // !NET35 && !UNITY && !NET40 && !NET45 && !SILVERLIGHT +#if !NET35 && !UNITY && !NET40 && !NET45 && !SILVERLIGHT #if !NETSTANDARD1_1 && !NETSTANDARD1_3 && !XAMARIN #if !UNITY || MSGPACK_UNITY_FULL dictionary.Add( typeof( System.Numerics.Vector4 ).TypeHandle, new MsgPack.Serialization.DefaultSerializers.System_Numerics_Vector4MessagePackSerializer( ownerContext ) ); #endif // !UNITY || MSGPACK_UNITY_FULL #endif // !NETSTANDARD1_1 && !NETSTANDARD1_3 && !XAMARIN -#endif // !NETFX_35 && !UNITY && !NETFX_40 && !NETFX_45 && !SILVERLIGHT +#endif // !NET35 && !UNITY && !NET40 && !NET45 && !SILVERLIGHT dictionary.Add( typeof( System.ArraySegment<> ).TypeHandle, typeof( System_ArraySegment_1MessagePackSerializer<> ) ); dictionary.Add( typeof( System.Globalization.CultureInfo ).TypeHandle, new MsgPack.Serialization.DefaultSerializers.System_Globalization_CultureInfoMessagePackSerializer( ownerContext ) ); dictionary.Add( typeof( System.Collections.DictionaryEntry ).TypeHandle, new MsgPack.Serialization.DefaultSerializers.System_Collections_DictionaryEntryMessagePackSerializer( ownerContext ) ); @@ -184,11 +184,11 @@ internal static Dictionary InitializeDefaultTable( Se dictionary.Add( typeof( System.Collections.Generic.Queue<> ).TypeHandle, typeof( System_Collections_Generic_Queue_1MessagePackSerializer<> ) ); #endif // !UNITY || MSGPACK_UNITY_FULL #if !WINDOWS_PHONE -#if !NETFX_35 && !UNITY +#if !NET35 && !UNITY #if !UNITY || MSGPACK_UNITY_FULL dictionary.Add( typeof( System.Numerics.Complex ).TypeHandle, new MsgPack.Serialization.DefaultSerializers.System_Numerics_ComplexMessagePackSerializer( ownerContext ) ); #endif // !UNITY || MSGPACK_UNITY_FULL -#endif // !NETFX_35 && !UNITY +#endif // !NET35 && !UNITY #endif // !WINDOWS_PHONE #if !UNITY || MSGPACK_UNITY_FULL dictionary.Add( typeof( System.Uri ).TypeHandle, new MsgPack.Serialization.DefaultSerializers.System_UriMessagePackSerializer( ownerContext ) ); diff --git a/src/MsgPack/Serialization/SerializerRepository.defaults.tt b/src/MsgPack/Serialization/SerializerRepository.defaults.tt index 66868b9b8..adbc6460c 100644 --- a/src/MsgPack/Serialization/SerializerRepository.defaults.tt +++ b/src/MsgPack/Serialization/SerializerRepository.defaults.tt @@ -254,9 +254,9 @@ using System.Collections.Generic; using System.Collections.Specialized; #endif // !UNITY || MSGPACK_UNITY_FULL using System.Globalization; -#if !WINDOWS_PHONE && !NETFX_35 && !UNITY +#if !WINDOWS_PHONE && !NET35 && !UNITY using System.Numerics; -#endif // !WINDOWS_PHONE && !NETFX_35 && !UNITY +#endif // !WINDOWS_PHONE && !NET35 && !UNITY using System.Reflection; using System.Text; @@ -328,7 +328,7 @@ foreach( Type type in structTypes ) if( notInNet45s.Contains( type ) ) { #> -#if !NETFX_35 && !UNITY && !NETFX_40 && !NETFX_45 && !SILVERLIGHT +#if !NET35 && !UNITY && !NET40 && !NET45 && !SILVERLIGHT <# } @@ -349,7 +349,7 @@ foreach( Type type in structTypes ) if( notInNet35s.Contains( type ) ) { #> -#if !NETFX_35 && !UNITY +#if !NET35 && !UNITY <# } @@ -373,7 +373,7 @@ foreach( Type type in structTypes ) if( notInNet35s.Contains( type ) ) { #> -#endif // !NETFX_35 && !UNITY +#endif // !NET35 && !UNITY <# } @@ -394,7 +394,7 @@ foreach( Type type in structTypes ) if( notInNet45s.Contains( type ) ) { #> -#endif // !NETFX_35 && !UNITY && !NETFX_40 && !NETFX_45 && !SILVERLIGHT +#endif // !NET35 && !UNITY && !NET40 && !NET45 && !SILVERLIGHT <# } @@ -431,7 +431,7 @@ foreach( Type type in classTypes ) if( notInNet45s.Contains( type ) ) { #> -#if !NETFX_40 && !NETFX_45 +#if !NET40 && !NET45 <# } @@ -445,7 +445,7 @@ foreach( Type type in classTypes ) if( notInNet35s.Contains( type ) ) { #> -#if !NETFX_35 && !UNITY +#if !NET35 && !UNITY <# } @@ -479,7 +479,7 @@ foreach( Type type in classTypes ) if( notInNet35s.Contains( type ) ) { #> -#endif // !NETFX_35 && !UNITY +#endif // !NET35 && !UNITY <# } @@ -493,7 +493,7 @@ foreach( Type type in classTypes ) if( notInNet45s.Contains( type ) ) { #> -#endif // !NETFX_40 && !NETFX_45 +#endif // !NET40 && !NET45 <# } diff --git a/src/MsgPack/Serialization/SerializerTypeKeyRepository.cs b/src/MsgPack/Serialization/SerializerTypeKeyRepository.cs index 2700efe67..9ef45d24a 100644 --- a/src/MsgPack/Serialization/SerializerTypeKeyRepository.cs +++ b/src/MsgPack/Serialization/SerializerTypeKeyRepository.cs @@ -29,18 +29,18 @@ #else using System.Diagnostics.Contracts; #endif // CORE_CLR || UNITY || NETSTANDARD1_1 -#if !NETFX_35 && !UNITY +#if !NET35 && !UNITY using System.Security; -#endif // !NETFX_35 && !UNITY +#endif // !NET35 && !UNITY namespace MsgPack.Serialization { /// /// Specialized for serializers. /// -#if !NETFX_35 && !UNITY +#if !NET35 && !UNITY [SecuritySafeCritical] -#endif // !NETFX_35 +#endif // !NET35 internal sealed class SerializerTypeKeyRepository : TypeKeyRepository { #if UNITY diff --git a/src/MsgPack/Serialization/SerializingMember.cs b/src/MsgPack/Serialization/SerializingMember.cs index 50a8b955e..75ed0516b 100644 --- a/src/MsgPack/Serialization/SerializingMember.cs +++ b/src/MsgPack/Serialization/SerializingMember.cs @@ -65,7 +65,7 @@ public SerializingMember( MemberInfo member, DataMemberContract contract ) this.MemberName = member == null ? null : contract.Name; } -#if !NETFX_35 +#if !NET35 // For Tuple public SerializingMember( string name ) { @@ -76,7 +76,7 @@ public SerializingMember( string name ) this.Contract = default ( DataMemberContract ); this.MemberName = name; } -#endif // !NETFX_35 +#endif // !NET35 public EnumMemberSerializationMethod GetEnumMemberSerializationMethod() { diff --git a/src/MsgPack/Serialization/TypeKeyRepository.cs b/src/MsgPack/Serialization/TypeKeyRepository.cs index 70d0c6f8a..9665ec159 100644 --- a/src/MsgPack/Serialization/TypeKeyRepository.cs +++ b/src/MsgPack/Serialization/TypeKeyRepository.cs @@ -43,7 +43,7 @@ namespace MsgPack.Serialization /// Repository for key type with RWlock scheme. /// [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Design", "CA1001:TypesThatOwnDisposableFieldsShouldBeDisposable", Justification = "Repository should not be disposable because it may be shared so it is difficult to determine disposition timing" )] -#if !NETFX_35 && !UNITY +#if !NET35 && !UNITY [SecuritySafeCritical] #endif internal class TypeKeyRepository @@ -74,12 +74,12 @@ public TypeKeyRepository( Dictionary table ) this._table = table; } -#if !NETFX_35 && !UNITY +#if !NET35 && !UNITY [SecuritySafeCritical] #endif -#if NETFX_35 || UNITY +#if NET35 || UNITY [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands", Justification = "CER is OK" )] -#endif // NETFX_35 || UNITY +#endif // NET35 || UNITY private Dictionary GetClonedTable() { bool holdsReadLock = false; @@ -113,12 +113,12 @@ public bool Get( Type type, out object matched, out object genericDefinitionMatc return this.GetCore( type, out matched, out genericDefinitionMatched ); } -#if !NETFX_35 && !UNITY +#if !NET35 && !UNITY [SecuritySafeCritical] #endif -#if NETFX_35 || UNITY +#if NET35 || UNITY [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands", Justification = "CER is OK" )] -#endif // NETFX_35 || UNITY +#endif // NET35 || UNITY private bool GetCore( Type type, out object matched, out object genericDefinitionMatched ) { bool holdsReadLock = false; @@ -174,12 +174,12 @@ public bool Register( Type type, object entry, Type nullableType, object nullabl return this.RegisterCore( type, entry, nullableType, nullableValue, options ); } -#if !NETFX_35 && !UNITY +#if !NET35 && !UNITY [SecuritySafeCritical] #endif -#if NETFX_35 || UNITY +#if NET35 || UNITY [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands", Justification = "CER is OK" )] -#endif // NETFX_35 || UNITY +#endif // NET35 || UNITY private bool RegisterCore( Type key, object value, Type nullableType, object nullableValue, SerializerRegistrationOptions options ) { var allowOverwrite = ( options & SerializerRegistrationOptions.AllowOverride ) != 0; @@ -243,12 +243,12 @@ public bool Unregister( Type type ) return this.UnregisterCore( type ); } -#if !NETFX_35 && !UNITY +#if !NET35 && !UNITY [SecuritySafeCritical] #endif -#if NETFX_35 || UNITY +#if NET35 || UNITY [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands", Justification = "CER is OK" )] -#endif // NETFX_35 || UNITY +#endif // NET35 || UNITY private bool UnregisterCore( Type key ) { if ( this._table.ContainsKey( key.TypeHandle ) ) @@ -282,7 +282,7 @@ private bool UnregisterCore( Type key ) return false; } -#if !NETFX_35 && !UNITY +#if !NET35 && !UNITY [SecuritySafeCritical] #endif internal bool Contains( Type type ) @@ -313,7 +313,7 @@ internal bool Contains( Type type ) } } -#if !NETFX_35 && !UNITY +#if !NET35 && !UNITY [SecuritySafeCritical] #endif internal IEnumerable> GetEntries() diff --git a/src/MsgPack/Serialization/UnpackHelpers.cs b/src/MsgPack/Serialization/UnpackHelpers.cs index a130720c5..dc1c63c35 100644 --- a/src/MsgPack/Serialization/UnpackHelpers.cs +++ b/src/MsgPack/Serialization/UnpackHelpers.cs @@ -1062,11 +1062,11 @@ public UnpackerTraceContext( long positionOrOffset, string methodName ) } } #if TRACING -#if ( SILVERLIGHT && !WINDOWS_PHONE ) || NETFX_35 || NETFX_40 || UNITY +#if ( SILVERLIGHT && !WINDOWS_PHONE ) || NET35 || NET40 || UNITY namespace System.Runtime.CompilerServices { [AttributeUsage( AttributeTargets.Parameter, Inherited = false )] internal sealed class CallerMemberNameAttribute : Attribute { } } -#endif // SILVERLIGHT || NETFX_35 || NETFX_40 || UNITY +#endif // SILVERLIGHT || NET35 || NET40 || UNITY #endif // TRACING diff --git a/src/MsgPack/SetOperation.cs b/src/MsgPack/SetOperation.cs index 67d2f0f34..984ddb934 100644 --- a/src/MsgPack/SetOperation.cs +++ b/src/MsgPack/SetOperation.cs @@ -41,7 +41,7 @@ namespace MsgPack internal static class SetOperation { [Pure] -#if NETFX_35 +#if NET35 public static bool IsProperSubsetOf( ICollection set, IEnumerable other ) #else public static bool IsProperSubsetOf( ISet set, IEnumerable other ) @@ -80,7 +80,7 @@ public static bool IsProperSubsetOf( ISet set, IEnumerable other ) } [Pure] -#if NETFX_35 +#if NET35 public static bool IsSubsetOf( ICollection set, IEnumerable other ) #else public static bool IsSubsetOf( ISet set, IEnumerable other ) @@ -111,7 +111,7 @@ public static bool IsSubsetOf( ISet set, IEnumerable other ) } [Pure] -#if NETFX_35 +#if NET35 private static bool IsSubsetOfCore( ICollection set, IEnumerable other, out int otherCount ) #else private static bool IsSubsetOfCore( ISet set, IEnumerable other, out int otherCount ) @@ -121,7 +121,7 @@ private static bool IsSubsetOfCore( ISet set, IEnumerable other, out in // Other must be set to handle duplicated items. // e.x., [1,2,3] is proper subset of [1,2,3,4,1] but not [1,1,1,1,1] -#if NETFX_35 +#if NET35 var asSet = other as HashSet; #else var asSet = other as ISet; @@ -148,7 +148,7 @@ private static bool IsSubsetOfCore( ISet set, IEnumerable other, out in } [Pure] -#if NETFX_35 +#if NET35 public static bool IsProperSupersetOf( ICollection set, IEnumerable other ) #else public static bool IsProperSupersetOf( ISet set, IEnumerable other ) @@ -182,7 +182,7 @@ public static bool IsProperSupersetOf( ISet set, IEnumerable other ) } [Pure] -#if NETFX_35 +#if NET35 public static bool IsSupersetOf( ICollection set, IEnumerable other ) #else public static bool IsSupersetOf( ISet set, IEnumerable other ) @@ -216,7 +216,7 @@ public static bool IsSupersetOf( ISet set, IEnumerable other ) } [Pure] -#if NETFX_35 +#if NET35 private static bool IsSupersetOfCore( ICollection set, IEnumerable other, out int otherCount ) #else private static bool IsSupersetOfCore( ISet set, IEnumerable other, out int otherCount ) @@ -226,7 +226,7 @@ private static bool IsSupersetOfCore( ISet set, IEnumerable other, out // Other must be set to handle duplicated items. // e.x., [1,2,3] is proper superset of [1,2] and [1,2,1] -#if NETFX_35 +#if NET35 var asSet = other as HashSet; #else var asSet = other as ISet; @@ -251,7 +251,7 @@ private static bool IsSupersetOfCore( ISet set, IEnumerable other, out } [Pure] -#if NETFX_35 +#if NET35 public static bool Overlaps( ICollection set, IEnumerable other ) #else public static bool Overlaps( ISet set, IEnumerable other ) @@ -275,7 +275,7 @@ public static bool Overlaps( ISet set, IEnumerable other ) } [Pure] -#if NETFX_35 +#if NET35 public static bool SetEquals( ICollection set, IEnumerable other ) #else public static bool SetEquals( ISet set, IEnumerable other ) @@ -300,7 +300,7 @@ public static bool SetEquals( ISet set, IEnumerable other ) } // Cannot use other.All() here because it always returns true for empty source. -#if NETFX_35 +#if NET35 var asSet = other as HashSet ?? new HashSet( other ); #else var asSet = other as ISet ?? new HashSet( other ); diff --git a/src/MsgPack/TaskAugument.cs b/src/MsgPack/TaskAugument.cs index d908e8cfa..ad90d16e7 100644 --- a/src/MsgPack/TaskAugument.cs +++ b/src/MsgPack/TaskAugument.cs @@ -32,13 +32,13 @@ public static Task CompletedTask { get { -#if NETFX_45 || NETSTANDARD1_1 +#if NET45 || NETSTANDARD1_1 var tcs = new TaskCompletionSource(); tcs.SetResult( null ); return tcs.Task; #else return Task.CompletedTask; -#endif // NETFX_45 || NETSTANDARD1_1 +#endif // NET45 || NETSTANDARD1_1 } } } diff --git a/src/MsgPack.Net35/Tuple`n.cs b/src/MsgPack/Tuple`n.cs similarity index 100% rename from src/MsgPack.Net35/Tuple`n.cs rename to src/MsgPack/Tuple`n.cs diff --git a/src/MsgPack.Net35/Tuple`n.tt b/src/MsgPack/Tuple`n.tt similarity index 100% rename from src/MsgPack.Net35/Tuple`n.tt rename to src/MsgPack/Tuple`n.tt diff --git a/src/MsgPack/UnsafeNativeMethods.cs b/src/MsgPack/UnsafeNativeMethods.cs index 664958deb..7b6140a88 100644 --- a/src/MsgPack/UnsafeNativeMethods.cs +++ b/src/MsgPack/UnsafeNativeMethods.cs @@ -29,9 +29,9 @@ namespace MsgPack #if !SILVERLIGHT && !NETSTANDARD1_1 && !NETSTANDARD1_3 [SuppressUnmanagedCodeSecurity] #endif // !SILVERLIGHT && !NETSTANDARD1_1 && !NETSTANDARD1_3 -#if !NETFX_35 +#if !NET35 [SecurityCritical] -#endif // !NETFX_35 +#endif // !NET35 internal static class UnsafeNativeMethods { private static int _libCAvailability = 0; @@ -40,18 +40,18 @@ internal static class UnsafeNativeMethods private const int _libCAvailability_LibC = 2; private const int _libCAvailability_None = -1; -#if NETFX_35 +#if NET35 [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Security", "CA5122:PInvokesShouldNotBeSafeCriticalFxCopRule", Justification = "OK, this is SecurityCritical" )] -#endif // NETFX_35 +#endif // NET35 [DllImport( "msvcrt", CallingConvention = CallingConvention.Cdecl, EntryPoint = "memcmp", ExactSpelling = true, SetLastError = false )] private static extern int memcmpVC( byte[] s1, byte[] s2, /*SIZE_T*/UIntPtr size ); #if !NETFX_CORE // libc is for non Windows environment. // Note that libc caused compilation error on .NET Native, so the DllImport itself should not be included in the first time. -#if NETFX_35 +#if NET35 [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Security", "CA5122:PInvokesShouldNotBeSafeCriticalFxCopRule", Justification = "OK, this is SecurityCritical" )] -#endif // NETFX_35 +#endif // NET35 [DllImport( "libc", CallingConvention = CallingConvention.Cdecl, EntryPoint = "memcmp", ExactSpelling = true, SetLastError = false )] private static extern int memcmpLibC( byte[] s1, byte[] s2, /*SIZE_T*/UIntPtr size ); #endif // !NETFX_CORE diff --git a/src/MsgPack.Net35/Volatile.cs b/src/MsgPack/Volatile.cs similarity index 100% rename from src/MsgPack.Net35/Volatile.cs rename to src/MsgPack/Volatile.cs diff --git a/src/netstandard/build/NetStandardProjectBuilder.csproj b/src/netstandard/build/NetStandardProjectBuilder.csproj index dae647b65..da72b56e0 100644 --- a/src/netstandard/build/NetStandardProjectBuilder.csproj +++ b/src/netstandard/build/NetStandardProjectBuilder.csproj @@ -36,7 +36,6 @@ - @@ -46,6 +45,9 @@ $(ProjectDir)\build.cmd $(SolutionDir) $(ConfigurationName) echo This project supports only Windows specific builds. + + $(ProjectDir)\build.cmd $(SolutionDir) $(ConfigurationName) + + $(DefineConstants);NETSTANDARD1_3 + + + + $(DefineConstants);NETSTANDARD2_0 - - - ..\..\packages\Microsoft.CodeAnalysis.Common.1.3.2\lib\net45\Microsoft.CodeAnalysis.dll - True - - - ..\..\packages\Microsoft.CodeAnalysis.CSharp.1.3.2\lib\net45\Microsoft.CodeAnalysis.CSharp.dll - True - - - ..\..\packages\NUnit.3.6.1\lib\net45\nunit.framework.dll - - - - ..\..\packages\System.AppContext.4.1.0\lib\net46\System.AppContext.dll - True - - - ..\..\packages\System.Collections.Immutable.1.2.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll - True - - - - ..\..\packages\System.Console.4.0.0\lib\net46\System.Console.dll - True - - - - ..\..\packages\System.Diagnostics.FileVersionInfo.4.0.0\lib\net46\System.Diagnostics.FileVersionInfo.dll - True - - - ..\..\packages\System.Diagnostics.StackTrace.4.0.1\lib\net46\System.Diagnostics.StackTrace.dll - True - - - ..\..\packages\System.IO.FileSystem.4.0.1\lib\net46\System.IO.FileSystem.dll - True - - - ..\..\packages\System.IO.FileSystem.Primitives.4.0.1\lib\net46\System.IO.FileSystem.Primitives.dll - True - - - - ..\..\packages\System.Reflection.Metadata.1.3.0\lib\portable-net45+win8\System.Reflection.Metadata.dll - True - - - ..\..\packages\System.Security.Cryptography.Algorithms.4.2.0\lib\net461\System.Security.Cryptography.Algorithms.dll - True - - - ..\..\packages\System.Security.Cryptography.Encoding.4.0.0\lib\net46\System.Security.Cryptography.Encoding.dll - True - - - ..\..\packages\System.Security.Cryptography.Primitives.4.0.0\lib\net46\System.Security.Cryptography.Primitives.dll - True - - - ..\..\packages\System.Security.Cryptography.X509Certificates.4.1.0\lib\net461\System.Security.Cryptography.X509Certificates.dll - True - - - ..\..\packages\System.Text.Encoding.CodePages.4.0.1\lib\net46\System.Text.Encoding.CodePages.dll - True - - - ..\..\packages\System.Threading.Thread.4.0.0\lib\net46\System.Threading.Thread.dll - True - - - - - - - - ..\..\packages\System.Xml.XmlDocument.4.0.1\lib\net46\System.Xml.XmlDocument.dll - True - - - ..\..\packages\System.Xml.XPath.4.0.1\lib\net46\System.Xml.XPath.dll - True - - - ..\..\packages\System.Xml.XPath.XDocument.4.0.1\lib\net46\System.Xml.XPath.XDocument.dll - True - + + + + + + - + + + + + + + Serialization\RoslynCodeGeneration.cs Serialization\TempFileDependentAssemblyManager.cs - - + + + ArrayCodeDomBasedCustomCollectionSerializersTest.tt True True - + ArrayFieldBasedCustomCollectionSerializersTest.tt True True - + True True ArrayReflectionBaedCustomCollectionSerializersTest.tt - + MapCodeDomBasedCustomCollectionSerializersTest.tt True True - + MapFieldBasedCustomCollectionSerializersTest.tt True True - + True True MapReflectionBasedCustomCollectionSerializersTest.tt + + + - - {5bcec32e-990e-4de5-945f-bd27326a7418} - MsgPack - + MsgPack.snk - - - ImmutableCollectionsTest1.cs - - + + TextTemplatingFileGenerator ArrayCodeDomBasedCustomCollectionSerializersTest.cs - + TextTemplatingFileGenerator ArrayFieldBasedCustomCollectionSerializersTest.cs - + TextTemplatingFileGenerator MapCodeDomBasedCustomCollectionSerializersTest.cs - + TextTemplatingFileGenerator MapFieldBasedCustomCollectionSerializersTest.cs @@ -205,21 +106,18 @@ - + TextTemplatingFileGenerator ArrayReflectionBaedCustomCollectionSerializersTest.cs - - + + TextTemplatingFileGenerator MapReflectionBasedCustomCollectionSerializersTest.cs - + - - - + + - - + $(DefineConstants);NETSTANDARD2_0 - - ..\..\packages\Microsoft.CodeAnalysis.Common.1.3.2\lib\net45\Microsoft.CodeAnalysis.dll - True - - - ..\..\packages\Microsoft.CodeAnalysis.CSharp.1.3.2\lib\net45\Microsoft.CodeAnalysis.CSharp.dll - True - - - ..\..\packages\NUnit.3.6.1\lib\net45\nunit.framework.dll - + + + + + + + + + - - ..\..\packages\System.AppContext.4.1.0\lib\net46\System.AppContext.dll - True - - - ..\..\packages\System.Collections.Immutable.1.2.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll - True - - - - ..\..\packages\System.Console.4.0.0\lib\net46\System.Console.dll - True - - - ..\..\packages\System.Diagnostics.FileVersionInfo.4.0.0\lib\net46\System.Diagnostics.FileVersionInfo.dll - True - - - ..\..\packages\System.Diagnostics.StackTrace.4.0.1\lib\net46\System.Diagnostics.StackTrace.dll - True - - - ..\..\packages\System.IO.FileSystem.4.0.1\lib\net46\System.IO.FileSystem.dll - True - - - ..\..\packages\System.IO.FileSystem.Primitives.4.0.1\lib\net46\System.IO.FileSystem.Primitives.dll - True - - - - ..\..\packages\System.Reflection.Metadata.1.3.0\lib\portable-net45+win8\System.Reflection.Metadata.dll - True - - - ..\..\packages\System.Security.Cryptography.Algorithms.4.2.0\lib\net461\System.Security.Cryptography.Algorithms.dll - True - - - ..\..\packages\System.Security.Cryptography.Encoding.4.0.0\lib\net46\System.Security.Cryptography.Encoding.dll - True - - - ..\..\packages\System.Security.Cryptography.Primitives.4.0.0\lib\net46\System.Security.Cryptography.Primitives.dll - True - - - ..\..\packages\System.Security.Cryptography.X509Certificates.4.1.0\lib\net461\System.Security.Cryptography.X509Certificates.dll - True - - - ..\..\packages\System.Text.Encoding.CodePages.4.0.1\lib\net46\System.Text.Encoding.CodePages.dll - True - - - ..\..\packages\System.Threading.Thread.4.0.0\lib\net46\System.Threading.Thread.dll - True - - - - - - - ..\..\packages\System.Xml.XmlDocument.4.0.1\lib\net46\System.Xml.XmlDocument.dll - True - - - ..\..\packages\System.Xml.XPath.4.0.1\lib\net46\System.Xml.XPath.dll - True - - - ..\..\packages\System.Xml.XPath.XDocument.4.0.1\lib\net46\System.Xml.XPath.XDocument.dll - True - - - + True True ArrayCodeDomBasedEnumSerializationTest.tt - + CodeDomBasedNilImplicationTest.tt True True - + MapCodeDomBasedAutoMessagePackSerializerTest.tt True True - + ArrayCodeDomBasedAutoMessagePackSerializerTest.tt True True - + True True MapCodeDomBasedEnumSerializationTest.tt - - - {5bcec32e-990e-4de5-945f-bd27326a7418} - MsgPack - - - {3889c9be-0473-4b41-80e8-c4c923e837e7} - MsgPack.UnitTest - + + MsgPack.snk - - + TextTemplatingFileGenerator ArrayCodeDomBasedEnumSerializationTest.cs - + TextTemplatingFileGenerator CodeDomBasedNilImplicationTest.cs - + TextTemplatingFileGenerator MapCodeDomBasedAutoMessagePackSerializerTest.cs - + TextTemplatingFileGenerator ArrayCodeDomBasedAutoMessagePackSerializerTest.cs - + TextTemplatingFileGenerator MapCodeDomBasedEnumSerializationTest.cs @@ -200,12 +89,6 @@ - - - - - - false + full - - bin\x86\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP;NETSTANDARD1_3;AOT;FEATURE_TAP - true - ;2008 - pdbonly + x86 false - prompt true - true - - true - bin\ARM\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;NETSTANDARD1_3;AOT;FEATURE_TAP - ;2008 - full + ARM false - prompt true - - bin\ARM\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP;NETSTANDARD1_3;AOT;FEATURE_TAP - true - ;2008 - pdbonly - ARM - false - prompt - true - true - - - true - bin\x64\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;NETSTANDARD1_3;AOT;FEATURE_TAP - ;2008 - full + x64 false - prompt true - - bin\x64\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP;NETSTANDARD1_3;AOT;FEATURE_TAP - true - ;2008 - pdbonly - x64 - false - prompt - true - true - @@ -185,9 +135,6 @@ FastStreamUnpackerTest.cs - - GenericExceptionTester.cs - gen\MsgPack_ImageSerializer.cs @@ -218,30 +165,30 @@ gen\MsgPack_Serialization_AbstractClassMemberRuntimeTypeSerializer.cs - - gen\MsgPack_Serialization_AddOnlyCollection_1_MsgPack_MessagePackObjectArray_Serializer.cs - gen\MsgPack_Serialization_AddOnlyCollection_1_MsgPack_MessagePackObject_Serializer.cs - - gen\MsgPack_Serialization_AddOnlyCollection_1_System_DateTimeArray_Serializer.cs + + gen\MsgPack_Serialization_AddOnlyCollection_1_MsgPack_MessagePackObjectArray_Serializer.cs gen\MsgPack_Serialization_AddOnlyCollection_1_System_DateTime_Serializer.cs - - gen\MsgPack_Serialization_AddOnlyCollection_1_System_Int32Array_Serializer.cs + + gen\MsgPack_Serialization_AddOnlyCollection_1_System_DateTimeArray_Serializer.cs gen\MsgPack_Serialization_AddOnlyCollection_1_System_Int32_Serializer.cs - - gen\MsgPack_Serialization_AddOnlyCollection_1_System_ObjectArray_Serializer.cs + + gen\MsgPack_Serialization_AddOnlyCollection_1_System_Int32Array_Serializer.cs gen\MsgPack_Serialization_AddOnlyCollection_1_System_Object_Serializer.cs + + gen\MsgPack_Serialization_AddOnlyCollection_1_System_ObjectArray_Serializer.cs + gen\MsgPack_Serialization_AnnotatedClassSerializer.cs @@ -1448,54 +1395,54 @@ gen\MsgPack_Serialization_PolymorphicMemberTypeRuntimeType_ValueReadWritePropertyAsObjectSerializer.cs - - gen\MsgPack_Serialization_SimpleCollection_1_MsgPack_MessagePackObjectArray_Serializer.cs - gen\MsgPack_Serialization_SimpleCollection_1_MsgPack_MessagePackObject_Serializer.cs - - gen\MsgPack_Serialization_SimpleCollection_1_System_DateTimeArray_Serializer.cs + + gen\MsgPack_Serialization_SimpleCollection_1_MsgPack_MessagePackObjectArray_Serializer.cs gen\MsgPack_Serialization_SimpleCollection_1_System_DateTime_Serializer.cs - - gen\MsgPack_Serialization_SimpleCollection_1_System_Int32Array_Serializer.cs + + gen\MsgPack_Serialization_SimpleCollection_1_System_DateTimeArray_Serializer.cs gen\MsgPack_Serialization_SimpleCollection_1_System_Int32_Serializer.cs - - gen\MsgPack_Serialization_SimpleCollection_1_System_ObjectArray_Serializer.cs + + gen\MsgPack_Serialization_SimpleCollection_1_System_Int32Array_Serializer.cs gen\MsgPack_Serialization_SimpleCollection_1_System_Object_Serializer.cs - - gen\MsgPack_Serialization_StringKeyedCollection_1_MsgPack_MessagePackObjectArray_Serializer.cs + + gen\MsgPack_Serialization_SimpleCollection_1_System_ObjectArray_Serializer.cs gen\MsgPack_Serialization_StringKeyedCollection_1_MsgPack_MessagePackObject_Serializer.cs - - gen\MsgPack_Serialization_StringKeyedCollection_1_System_DateTimeArray_Serializer.cs + + gen\MsgPack_Serialization_StringKeyedCollection_1_MsgPack_MessagePackObjectArray_Serializer.cs gen\MsgPack_Serialization_StringKeyedCollection_1_System_DateTime_Serializer.cs - - gen\MsgPack_Serialization_StringKeyedCollection_1_System_Int32Array_Serializer.cs + + gen\MsgPack_Serialization_StringKeyedCollection_1_System_DateTimeArray_Serializer.cs gen\MsgPack_Serialization_StringKeyedCollection_1_System_Int32_Serializer.cs - - gen\MsgPack_Serialization_StringKeyedCollection_1_System_ObjectArray_Serializer.cs + + gen\MsgPack_Serialization_StringKeyedCollection_1_System_Int32Array_Serializer.cs gen\MsgPack_Serialization_StringKeyedCollection_1_System_Object_Serializer.cs + + gen\MsgPack_Serialization_StringKeyedCollection_1_System_ObjectArray_Serializer.cs + gen\MsgPack_Serialization_TestValueTypeSerializer.cs @@ -1514,81 +1461,84 @@ gen\MsgPack_Serialization_WithAbstractStringCollectionSerializer.cs - - gen\System_Collections_Generic_HashSet_1_MsgPack_MessagePackObjectArray_Serializer.cs - gen\System_Collections_Generic_HashSet_1_MsgPack_MessagePackObject_Serializer.cs - - gen\System_Collections_Generic_HashSet_1_System_DateTimeArray_Serializer.cs + + gen\System_Collections_Generic_HashSet_1_MsgPack_MessagePackObjectArray_Serializer.cs gen\System_Collections_Generic_HashSet_1_System_DateTime_Serializer.cs - - gen\System_Collections_Generic_HashSet_1_System_Int32Array_Serializer.cs + + gen\System_Collections_Generic_HashSet_1_System_DateTimeArray_Serializer.cs gen\System_Collections_Generic_HashSet_1_System_Int32_Serializer.cs - - gen\System_Collections_Generic_HashSet_1_System_ObjectArray_Serializer.cs + + gen\System_Collections_Generic_HashSet_1_System_Int32Array_Serializer.cs gen\System_Collections_Generic_HashSet_1_System_Object_Serializer.cs - - gen\System_Collections_ObjectModel_Collection_1_MsgPack_MessagePackObjectArray_Serializer.cs + + gen\System_Collections_Generic_HashSet_1_System_ObjectArray_Serializer.cs gen\System_Collections_ObjectModel_Collection_1_MsgPack_MessagePackObject_Serializer.cs - - gen\System_Collections_ObjectModel_Collection_1_System_DateTimeArray_Serializer.cs + + gen\System_Collections_ObjectModel_Collection_1_MsgPack_MessagePackObjectArray_Serializer.cs gen\System_Collections_ObjectModel_Collection_1_System_DateTime_Serializer.cs - - gen\System_Collections_ObjectModel_Collection_1_System_Int32Array_Serializer.cs + + gen\System_Collections_ObjectModel_Collection_1_System_DateTimeArray_Serializer.cs gen\System_Collections_ObjectModel_Collection_1_System_Int32_Serializer.cs - - gen\System_Collections_ObjectModel_Collection_1_System_ObjectArray_Serializer.cs + + gen\System_Collections_ObjectModel_Collection_1_System_Int32Array_Serializer.cs gen\System_Collections_ObjectModel_Collection_1_System_Object_Serializer.cs - - gen\System_Collections_ObjectModel_ObservableCollection_1_MsgPack_MessagePackObjectArray_Serializer.cs + + gen\System_Collections_ObjectModel_Collection_1_System_ObjectArray_Serializer.cs gen\System_Collections_ObjectModel_ObservableCollection_1_MsgPack_MessagePackObject_Serializer.cs - - gen\System_Collections_ObjectModel_ObservableCollection_1_System_DateTimeArray_Serializer.cs + + gen\System_Collections_ObjectModel_ObservableCollection_1_MsgPack_MessagePackObjectArray_Serializer.cs gen\System_Collections_ObjectModel_ObservableCollection_1_System_DateTime_Serializer.cs - - gen\System_Collections_ObjectModel_ObservableCollection_1_System_Int32Array_Serializer.cs + + gen\System_Collections_ObjectModel_ObservableCollection_1_System_DateTimeArray_Serializer.cs gen\System_Collections_ObjectModel_ObservableCollection_1_System_Int32_Serializer.cs - - gen\System_Collections_ObjectModel_ObservableCollection_1_System_ObjectArray_Serializer.cs + + gen\System_Collections_ObjectModel_ObservableCollection_1_System_Int32Array_Serializer.cs gen\System_Collections_ObjectModel_ObservableCollection_1_System_Object_Serializer.cs + + gen\System_Collections_ObjectModel_ObservableCollection_1_System_ObjectArray_Serializer.cs + gen\System_DayOfWeekSerializer.cs + + GenericExceptionTester.cs + Image.cs diff --git a/test/MsgPack.UnitTest.Uwp/MsgPack.UnitTest.Uwp.csproj b/test/MsgPack.UnitTest.Uwp/MsgPack.UnitTest.Uwp.csproj index 5d612f393..96fd1b963 100644 --- a/test/MsgPack.UnitTest.Uwp/MsgPack.UnitTest.Uwp.csproj +++ b/test/MsgPack.UnitTest.Uwp/MsgPack.UnitTest.Uwp.csproj @@ -2,12 +2,8 @@ - Debug - x86 {0F930636-458B-401F-9EAF-F4F05E93BCC9} AppContainerExe - Properties - MsgPack MsgPack.UnitTest en-US UAP @@ -20,75 +16,32 @@ 14.0 0CEFF2E3DC6DD3A7245B2FB641B6DE056C5A79D9 - - true - bin\x86\Debug\ - TRACE;DEBUG;NETFX_CORE;WINDOWS_UWP;NETSTANDARD1_3;FEATURE_TAP + + + + $(DefineConstants);NETFX_CORE;WINDOWS_UWP;NETSTANDARD1_3;FEATURE_TAP ;2008 + false full - x86 - false - prompt - true - - bin\x86\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP;NETSTANDARD1_3;FEATURE_TAP - true - ;2008 - pdbonly - x86 - false - prompt - true + true - - true - bin\ARM\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;NETSTANDARD1_3;FEATURE_TAP - ;2008 - full - ARM + + x86 false - prompt true - - bin\ARM\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP;NETSTANDARD1_3;FEATURE_TAP - true - ;2008 - pdbonly + ARM false - prompt true - true - - true - bin\x64\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;NETSTANDARD1_3;FEATURE_TAP - ;2008 - full + x64 false - prompt true - - bin\x64\Release\ - TRACE;NETFX_CORE;WINDOWS_UWP;NETSTANDARD1_3;FEATURE_TAP - true - ;2008 - pdbonly - x64 - false - prompt - true - true - @@ -164,9 +117,6 @@ FastStreamUnpackerTest.cs - - GenericExceptionTester.cs - gen\MsgPack_ImageSerializer.cs @@ -197,30 +147,30 @@ gen\MsgPack_Serialization_AbstractClassMemberRuntimeTypeSerializer.cs - - gen\MsgPack_Serialization_AddOnlyCollection_1_MsgPack_MessagePackObjectArray_Serializer.cs - gen\MsgPack_Serialization_AddOnlyCollection_1_MsgPack_MessagePackObject_Serializer.cs - - gen\MsgPack_Serialization_AddOnlyCollection_1_System_DateTimeArray_Serializer.cs + + gen\MsgPack_Serialization_AddOnlyCollection_1_MsgPack_MessagePackObjectArray_Serializer.cs gen\MsgPack_Serialization_AddOnlyCollection_1_System_DateTime_Serializer.cs - - gen\MsgPack_Serialization_AddOnlyCollection_1_System_Int32Array_Serializer.cs + + gen\MsgPack_Serialization_AddOnlyCollection_1_System_DateTimeArray_Serializer.cs gen\MsgPack_Serialization_AddOnlyCollection_1_System_Int32_Serializer.cs - - gen\MsgPack_Serialization_AddOnlyCollection_1_System_ObjectArray_Serializer.cs + + gen\MsgPack_Serialization_AddOnlyCollection_1_System_Int32Array_Serializer.cs gen\MsgPack_Serialization_AddOnlyCollection_1_System_Object_Serializer.cs + + gen\MsgPack_Serialization_AddOnlyCollection_1_System_ObjectArray_Serializer.cs + gen\MsgPack_Serialization_AnnotatedClassSerializer.cs @@ -1427,54 +1377,54 @@ gen\MsgPack_Serialization_PolymorphicMemberTypeRuntimeType_ValueReadWritePropertyAsObjectSerializer.cs - - gen\MsgPack_Serialization_SimpleCollection_1_MsgPack_MessagePackObjectArray_Serializer.cs - gen\MsgPack_Serialization_SimpleCollection_1_MsgPack_MessagePackObject_Serializer.cs - - gen\MsgPack_Serialization_SimpleCollection_1_System_DateTimeArray_Serializer.cs + + gen\MsgPack_Serialization_SimpleCollection_1_MsgPack_MessagePackObjectArray_Serializer.cs gen\MsgPack_Serialization_SimpleCollection_1_System_DateTime_Serializer.cs - - gen\MsgPack_Serialization_SimpleCollection_1_System_Int32Array_Serializer.cs + + gen\MsgPack_Serialization_SimpleCollection_1_System_DateTimeArray_Serializer.cs gen\MsgPack_Serialization_SimpleCollection_1_System_Int32_Serializer.cs - - gen\MsgPack_Serialization_SimpleCollection_1_System_ObjectArray_Serializer.cs + + gen\MsgPack_Serialization_SimpleCollection_1_System_Int32Array_Serializer.cs gen\MsgPack_Serialization_SimpleCollection_1_System_Object_Serializer.cs - - gen\MsgPack_Serialization_StringKeyedCollection_1_MsgPack_MessagePackObjectArray_Serializer.cs + + gen\MsgPack_Serialization_SimpleCollection_1_System_ObjectArray_Serializer.cs gen\MsgPack_Serialization_StringKeyedCollection_1_MsgPack_MessagePackObject_Serializer.cs - - gen\MsgPack_Serialization_StringKeyedCollection_1_System_DateTimeArray_Serializer.cs + + gen\MsgPack_Serialization_StringKeyedCollection_1_MsgPack_MessagePackObjectArray_Serializer.cs gen\MsgPack_Serialization_StringKeyedCollection_1_System_DateTime_Serializer.cs - - gen\MsgPack_Serialization_StringKeyedCollection_1_System_Int32Array_Serializer.cs + + gen\MsgPack_Serialization_StringKeyedCollection_1_System_DateTimeArray_Serializer.cs gen\MsgPack_Serialization_StringKeyedCollection_1_System_Int32_Serializer.cs - - gen\MsgPack_Serialization_StringKeyedCollection_1_System_ObjectArray_Serializer.cs + + gen\MsgPack_Serialization_StringKeyedCollection_1_System_Int32Array_Serializer.cs gen\MsgPack_Serialization_StringKeyedCollection_1_System_Object_Serializer.cs + + gen\MsgPack_Serialization_StringKeyedCollection_1_System_ObjectArray_Serializer.cs + gen\MsgPack_Serialization_TestValueTypeSerializer.cs @@ -1493,81 +1443,84 @@ gen\MsgPack_Serialization_WithAbstractStringCollectionSerializer.cs - - gen\System_Collections_Generic_HashSet_1_MsgPack_MessagePackObjectArray_Serializer.cs - gen\System_Collections_Generic_HashSet_1_MsgPack_MessagePackObject_Serializer.cs - - gen\System_Collections_Generic_HashSet_1_System_DateTimeArray_Serializer.cs + + gen\System_Collections_Generic_HashSet_1_MsgPack_MessagePackObjectArray_Serializer.cs gen\System_Collections_Generic_HashSet_1_System_DateTime_Serializer.cs - - gen\System_Collections_Generic_HashSet_1_System_Int32Array_Serializer.cs + + gen\System_Collections_Generic_HashSet_1_System_DateTimeArray_Serializer.cs gen\System_Collections_Generic_HashSet_1_System_Int32_Serializer.cs - - gen\System_Collections_Generic_HashSet_1_System_ObjectArray_Serializer.cs + + gen\System_Collections_Generic_HashSet_1_System_Int32Array_Serializer.cs gen\System_Collections_Generic_HashSet_1_System_Object_Serializer.cs - - gen\System_Collections_ObjectModel_Collection_1_MsgPack_MessagePackObjectArray_Serializer.cs + + gen\System_Collections_Generic_HashSet_1_System_ObjectArray_Serializer.cs gen\System_Collections_ObjectModel_Collection_1_MsgPack_MessagePackObject_Serializer.cs - - gen\System_Collections_ObjectModel_Collection_1_System_DateTimeArray_Serializer.cs + + gen\System_Collections_ObjectModel_Collection_1_MsgPack_MessagePackObjectArray_Serializer.cs gen\System_Collections_ObjectModel_Collection_1_System_DateTime_Serializer.cs - - gen\System_Collections_ObjectModel_Collection_1_System_Int32Array_Serializer.cs + + gen\System_Collections_ObjectModel_Collection_1_System_DateTimeArray_Serializer.cs gen\System_Collections_ObjectModel_Collection_1_System_Int32_Serializer.cs - - gen\System_Collections_ObjectModel_Collection_1_System_ObjectArray_Serializer.cs + + gen\System_Collections_ObjectModel_Collection_1_System_Int32Array_Serializer.cs gen\System_Collections_ObjectModel_Collection_1_System_Object_Serializer.cs - - gen\System_Collections_ObjectModel_ObservableCollection_1_MsgPack_MessagePackObjectArray_Serializer.cs + + gen\System_Collections_ObjectModel_Collection_1_System_ObjectArray_Serializer.cs gen\System_Collections_ObjectModel_ObservableCollection_1_MsgPack_MessagePackObject_Serializer.cs - - gen\System_Collections_ObjectModel_ObservableCollection_1_System_DateTimeArray_Serializer.cs + + gen\System_Collections_ObjectModel_ObservableCollection_1_MsgPack_MessagePackObjectArray_Serializer.cs gen\System_Collections_ObjectModel_ObservableCollection_1_System_DateTime_Serializer.cs - - gen\System_Collections_ObjectModel_ObservableCollection_1_System_Int32Array_Serializer.cs + + gen\System_Collections_ObjectModel_ObservableCollection_1_System_DateTimeArray_Serializer.cs gen\System_Collections_ObjectModel_ObservableCollection_1_System_Int32_Serializer.cs - - gen\System_Collections_ObjectModel_ObservableCollection_1_System_ObjectArray_Serializer.cs + + gen\System_Collections_ObjectModel_ObservableCollection_1_System_Int32Array_Serializer.cs gen\System_Collections_ObjectModel_ObservableCollection_1_System_Object_Serializer.cs + + gen\System_Collections_ObjectModel_ObservableCollection_1_System_ObjectArray_Serializer.cs + gen\System_DayOfWeekSerializer.cs + + GenericExceptionTester.cs + Image.cs @@ -1963,7 +1916,7 @@ - + False ..\..\src\MsgPack\bin\Debug\netstandard1.3\MsgPack.dll diff --git a/test/MsgPack.UnitTest.WinRT.WindowsPhone/MsgPack.UnitTest.WinRT.WindowsPhone.csproj b/test/MsgPack.UnitTest.WinRT.WindowsPhone/MsgPack.UnitTest.WinRT.WindowsPhone.csproj index ee8ebc5a7..a24f1ec98 100644 --- a/test/MsgPack.UnitTest.WinRT.WindowsPhone/MsgPack.UnitTest.WinRT.WindowsPhone.csproj +++ b/test/MsgPack.UnitTest.WinRT.WindowsPhone/MsgPack.UnitTest.WinRT.WindowsPhone.csproj @@ -2,12 +2,9 @@ - Debug x86 {70CB94DD-DA45-47AE-A370-940A094B9F10} Library - Properties - MsgPack MsgPack.UnitTest en-US 8.1 @@ -23,48 +20,26 @@ True true - - true - bin\x86\Debug\ - TRACE;DEBUG;NETFX_CORE;WINDOWS_PHONE_APP;NETSTANDARD1_1;FEATURE_TAP;MSTEST + + + + $(DefineConstants);NETFX_CORE;WINDOWS_PHONE_APP;NETSTANDARD1_1;FEATURE_TAP;MSTEST ;2008 + + full - x86 - false - prompt - true - - bin\x86\Release\ - TRACE;NETFX_CORE;WINDOWS_PHONE_APP;NETSTANDARD1_1;FEATURE_TAP;MSTEST - true - ;2008 + pdbonly - x86 - false - prompt - true - - true - bin\ARM\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_PHONE_APP;NETSTANDARD1_1;FEATURE_TAP;MSTEST - ;2008 - full - ARM + + x86 false - prompt true - - bin\ARM\Release\ - TRACE;NETFX_CORE;WINDOWS_PHONE_APP;NETSTANDARD1_1;FEATURE_TAP;MSTEST - true - ;2008 - pdbonly + ARM false - prompt true @@ -77,6 +52,9 @@ + + _SetUpFixture.cs + AssertEx.cs @@ -224,6 +202,15 @@ PackUnpackTest.Scalar.cs + + Serialization\_SetUpFixture.cs + + + Serialization\MessagePackMemberAndDataMemberMixedTarget.cs + + + Serialization\MessagePackMemberAttributeTest.cs + Serialization\AddOnlyCollection`1.cs @@ -296,12 +283,6 @@ Serialization\MapReflectionBasedEnumSerializationTest.cs - - Serialization\MessagePackMemberAndDataMemberMixedTarget.cs - - - Serialization\MessagePackMemberAttributeTest.cs - Serialization\MessagePackSerializerTest.cs @@ -362,9 +343,6 @@ Serialization\VersioningTest.cs - - Serialization\_SetUpFixture.cs - SplittingStream.cs @@ -473,9 +451,6 @@ UnpackingTest.Scalar.cs - - _SetUpFixture.cs - @@ -510,9 +485,9 @@ - + False - ..\..\src\MsgPack\bin\Debug\netstandard1.1\MsgPack.dll + ..\..\src\netstandard\bin\Debug\netstandard1.1\MsgPack.dll diff --git a/test/MsgPack.UnitTest.WinRT.WindowsPhone/Properties/AssemblyInfo.cs b/test/MsgPack.UnitTest.WinRT.WindowsPhone/Properties/AssemblyInfo.cs index 40c479be5..b795283d8 100644 --- a/test/MsgPack.UnitTest.WinRT.WindowsPhone/Properties/AssemblyInfo.cs +++ b/test/MsgPack.UnitTest.WinRT.WindowsPhone/Properties/AssemblyInfo.cs @@ -2,7 +2,7 @@ // // MessagePack for CLI // -// Copyright (C) 2015 FUJIWARA, Yusuke +// Copyright (C) 2015-2017 FUJIWARA, Yusuke // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -30,6 +30,7 @@ [assembly: AssemblyCopyright( "Copyright © FUJIWARA, Yusuke 2010-2015" )] [assembly: ComVisible( false )] +[assembly: CLSCompliant( true )] [assembly: NeutralResourcesLanguage( "en-US" )] [assembly: AssemblyVersion( "1.0.0.0" )] [assembly: AssemblyFileVersion( "0.1.0.0" )] diff --git a/test/MsgPack.UnitTest.WinRT/MsgPack.UnitTest.WinRT.csproj b/test/MsgPack.UnitTest.WinRT/MsgPack.UnitTest.WinRT.csproj index 3aa39e3f9..dcf3f9e24 100644 --- a/test/MsgPack.UnitTest.WinRT/MsgPack.UnitTest.WinRT.csproj +++ b/test/MsgPack.UnitTest.WinRT/MsgPack.UnitTest.WinRT.csproj @@ -2,14 +2,10 @@ - Debug - AnyCPU 8.0.30703 2.0 {EC65EFFC-1D7B-4805-BCCB-3E8FCA99F8E8} Library - Properties - MsgPack MsgPack.UnitTest en-US 512 @@ -21,87 +17,31 @@ Never - - true - full - false - bin\Debug\ - TRACE;DEBUG;NETFX_CORE;NETSTANDARD1_1;FEATURE_TAP;MSTEST - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE;NETFX_CORE;NETSTANDARD1_1;FEATURE_TAP;MSTEST - prompt - 4 - - - true - bin\ARM\Debug\ - DEBUG;TRACE;NETFX_CORE;NETSTANDARD1_1;FEATURE_TAP;MSTEST + + + + $(DefineConstants);NETFX_CORE;NETSTANDARD1_1;FEATURE_TAP;MSTEST ;2008 + + full - ARM - false - prompt - true - - bin\ARM\Release\ - TRACE;NETFX_CORE;NETSTANDARD1_1;FEATURE_TAP;MSTEST - true - ;2008 + pdbonly - ARM - false - prompt - true - - true - bin\x64\Debug\ - DEBUG;TRACE;NETFX_CORE;NETSTANDARD1_1;FEATURE_TAP;MSTEST - ;2008 - full - x64 + + ARM false - prompt true - - bin\x64\Release\ - TRACE;NETFX_CORE;NETSTANDARD1_1;FEATURE_TAP;MSTEST - true - ;2008 - pdbonly + x64 false - prompt true - - true - bin\x86\Debug\ - TRACE;DEBUG;NETFX_CORE;NETSTANDARD1_1;FEATURE_TAP;MSTEST - ;2008 - full + x86 false - prompt - true - - - bin\x86\Release\ - TRACE;NETFX_CORE;NETSTANDARD1_1;FEATURE_TAP;MSTEST - true - ;2008 - pdbonly - x86 - false - prompt true @@ -118,6 +58,9 @@ + + _SetUpFixture.cs + AssertEx.cs @@ -265,6 +208,15 @@ PackUnpackTest.Scalar.cs + + Serialization\_SetUpFixture.cs + + + Serialization\MessagePackMemberAndDataMemberMixedTarget.cs + + + Serialization\MessagePackMemberAttributeTest.cs + Serialization\AddOnlyCollection`1.cs @@ -337,12 +289,6 @@ Serialization\MapReflectionBasedEnumSerializationTest.cs - - Serialization\MessagePackMemberAndDataMemberMixedTarget.cs - - - Serialization\MessagePackMemberAttributeTest.cs - Serialization\MessagePackSerializerTest.cs @@ -403,9 +349,6 @@ Serialization\VersioningTest.cs - - Serialization\_SetUpFixture.cs - SplittingStream.cs @@ -514,9 +457,6 @@ UnpackingTest.Scalar.cs - - _SetUpFixture.cs - @@ -559,9 +499,9 @@ - + False - ..\..\src\MsgPack\bin\Debug\netstandard1.1\MsgPack.dll + ..\..\src\netstandard\bin\Debug\netstandard1.1\MsgPack.dll ..\..\packages\System.Numerics.Vectors.4.1.1-rc2-24027\lib\portable-net45+win8\System.Numerics.Vectors.dll diff --git a/test/MsgPack.UnitTest.WinRT/Properties/AssemblyInfo.cs b/test/MsgPack.UnitTest.WinRT/Properties/AssemblyInfo.cs index 6bc2c7722..62f44e852 100644 --- a/test/MsgPack.UnitTest.WinRT/Properties/AssemblyInfo.cs +++ b/test/MsgPack.UnitTest.WinRT/Properties/AssemblyInfo.cs @@ -2,7 +2,7 @@ // // MessagePack for CLI // -// Copyright (C) 2010 FUJIWARA, Yusuke +// Copyright (C) 2010-2017 FUJIWARA, Yusuke // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -30,6 +30,7 @@ [assembly: AssemblyCopyright( "Copyright © FUJIWARA, Yusuke 2010" )] [assembly: ComVisible( false )] +[assembly: CLSCompliant( true )] [assembly: NeutralResourcesLanguage( "en-US" )] [assembly: AssemblyVersion( "1.0.0.0" )] [assembly: AssemblyFileVersion( "0.1.0.0" )] diff --git a/test/MsgPack.UnitTest.Xamarin.Android/MsgPack.UnitTest.Xamarin.Android.csproj b/test/MsgPack.UnitTest.Xamarin.Android/MsgPack.UnitTest.Xamarin.Android.csproj index 0922fcd52..2b39cbe4e 100644 --- a/test/MsgPack.UnitTest.Xamarin.Android/MsgPack.UnitTest.Xamarin.Android.csproj +++ b/test/MsgPack.UnitTest.Xamarin.Android/MsgPack.UnitTest.Xamarin.Android.csproj @@ -1,12 +1,9 @@  - Debug - AnyCPU {5EDECDB4-5179-4441-974F-EC26B4F54528} {EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} Library - MsgPack.UnitTest.Xamarin.Android True Resources\Resource.designer.cs Resource @@ -19,25 +16,16 @@ v2.3 Properties\AndroidManifest.xml - - true - full - false - bin\Debug - DEBUG;__MOBILE__;__ANDROID__;AOT;XAMARIN - prompt - 4 + + + + + None false 256M - - full - true - bin\Release - __MOBILE__;__ANDROID__; - prompt - 4 + false false @@ -121,9 +109,6 @@ FastStreamUnpackerTest.cs - - GenericExceptionTester.cs - gen\MsgPack_ImageSerializer.cs @@ -154,30 +139,30 @@ gen\MsgPack_Serialization_AbstractClassMemberRuntimeTypeSerializer.cs - - gen\MsgPack_Serialization_AddOnlyCollection_1_MsgPack_MessagePackObjectArray_Serializer.cs - gen\MsgPack_Serialization_AddOnlyCollection_1_MsgPack_MessagePackObject_Serializer.cs - - gen\MsgPack_Serialization_AddOnlyCollection_1_System_DateTimeArray_Serializer.cs + + gen\MsgPack_Serialization_AddOnlyCollection_1_MsgPack_MessagePackObjectArray_Serializer.cs gen\MsgPack_Serialization_AddOnlyCollection_1_System_DateTime_Serializer.cs - - gen\MsgPack_Serialization_AddOnlyCollection_1_System_Int32Array_Serializer.cs + + gen\MsgPack_Serialization_AddOnlyCollection_1_System_DateTimeArray_Serializer.cs gen\MsgPack_Serialization_AddOnlyCollection_1_System_Int32_Serializer.cs - - gen\MsgPack_Serialization_AddOnlyCollection_1_System_ObjectArray_Serializer.cs + + gen\MsgPack_Serialization_AddOnlyCollection_1_System_Int32Array_Serializer.cs gen\MsgPack_Serialization_AddOnlyCollection_1_System_Object_Serializer.cs + + gen\MsgPack_Serialization_AddOnlyCollection_1_System_ObjectArray_Serializer.cs + gen\MsgPack_Serialization_AnnotatedClassSerializer.cs @@ -1384,54 +1369,54 @@ gen\MsgPack_Serialization_PolymorphicMemberTypeRuntimeType_ValueReadWritePropertyAsObjectSerializer.cs - - gen\MsgPack_Serialization_SimpleCollection_1_MsgPack_MessagePackObjectArray_Serializer.cs - gen\MsgPack_Serialization_SimpleCollection_1_MsgPack_MessagePackObject_Serializer.cs - - gen\MsgPack_Serialization_SimpleCollection_1_System_DateTimeArray_Serializer.cs + + gen\MsgPack_Serialization_SimpleCollection_1_MsgPack_MessagePackObjectArray_Serializer.cs gen\MsgPack_Serialization_SimpleCollection_1_System_DateTime_Serializer.cs - - gen\MsgPack_Serialization_SimpleCollection_1_System_Int32Array_Serializer.cs + + gen\MsgPack_Serialization_SimpleCollection_1_System_DateTimeArray_Serializer.cs gen\MsgPack_Serialization_SimpleCollection_1_System_Int32_Serializer.cs - - gen\MsgPack_Serialization_SimpleCollection_1_System_ObjectArray_Serializer.cs + + gen\MsgPack_Serialization_SimpleCollection_1_System_Int32Array_Serializer.cs gen\MsgPack_Serialization_SimpleCollection_1_System_Object_Serializer.cs - - gen\MsgPack_Serialization_StringKeyedCollection_1_MsgPack_MessagePackObjectArray_Serializer.cs + + gen\MsgPack_Serialization_SimpleCollection_1_System_ObjectArray_Serializer.cs gen\MsgPack_Serialization_StringKeyedCollection_1_MsgPack_MessagePackObject_Serializer.cs - - gen\MsgPack_Serialization_StringKeyedCollection_1_System_DateTimeArray_Serializer.cs + + gen\MsgPack_Serialization_StringKeyedCollection_1_MsgPack_MessagePackObjectArray_Serializer.cs gen\MsgPack_Serialization_StringKeyedCollection_1_System_DateTime_Serializer.cs - - gen\MsgPack_Serialization_StringKeyedCollection_1_System_Int32Array_Serializer.cs + + gen\MsgPack_Serialization_StringKeyedCollection_1_System_DateTimeArray_Serializer.cs gen\MsgPack_Serialization_StringKeyedCollection_1_System_Int32_Serializer.cs - - gen\MsgPack_Serialization_StringKeyedCollection_1_System_ObjectArray_Serializer.cs + + gen\MsgPack_Serialization_StringKeyedCollection_1_System_Int32Array_Serializer.cs gen\MsgPack_Serialization_StringKeyedCollection_1_System_Object_Serializer.cs + + gen\MsgPack_Serialization_StringKeyedCollection_1_System_ObjectArray_Serializer.cs + gen\MsgPack_Serialization_TestValueTypeSerializer.cs @@ -1450,81 +1435,84 @@ gen\MsgPack_Serialization_WithAbstractStringCollectionSerializer.cs - - gen\System_Collections_Generic_HashSet_1_MsgPack_MessagePackObjectArray_Serializer.cs - gen\System_Collections_Generic_HashSet_1_MsgPack_MessagePackObject_Serializer.cs - - gen\System_Collections_Generic_HashSet_1_System_DateTimeArray_Serializer.cs + + gen\System_Collections_Generic_HashSet_1_MsgPack_MessagePackObjectArray_Serializer.cs gen\System_Collections_Generic_HashSet_1_System_DateTime_Serializer.cs - - gen\System_Collections_Generic_HashSet_1_System_Int32Array_Serializer.cs + + gen\System_Collections_Generic_HashSet_1_System_DateTimeArray_Serializer.cs gen\System_Collections_Generic_HashSet_1_System_Int32_Serializer.cs - - gen\System_Collections_Generic_HashSet_1_System_ObjectArray_Serializer.cs + + gen\System_Collections_Generic_HashSet_1_System_Int32Array_Serializer.cs gen\System_Collections_Generic_HashSet_1_System_Object_Serializer.cs - - gen\System_Collections_ObjectModel_Collection_1_MsgPack_MessagePackObjectArray_Serializer.cs + + gen\System_Collections_Generic_HashSet_1_System_ObjectArray_Serializer.cs gen\System_Collections_ObjectModel_Collection_1_MsgPack_MessagePackObject_Serializer.cs - - gen\System_Collections_ObjectModel_Collection_1_System_DateTimeArray_Serializer.cs + + gen\System_Collections_ObjectModel_Collection_1_MsgPack_MessagePackObjectArray_Serializer.cs gen\System_Collections_ObjectModel_Collection_1_System_DateTime_Serializer.cs - - gen\System_Collections_ObjectModel_Collection_1_System_Int32Array_Serializer.cs + + gen\System_Collections_ObjectModel_Collection_1_System_DateTimeArray_Serializer.cs gen\System_Collections_ObjectModel_Collection_1_System_Int32_Serializer.cs - - gen\System_Collections_ObjectModel_Collection_1_System_ObjectArray_Serializer.cs + + gen\System_Collections_ObjectModel_Collection_1_System_Int32Array_Serializer.cs gen\System_Collections_ObjectModel_Collection_1_System_Object_Serializer.cs - - gen\System_Collections_ObjectModel_ObservableCollection_1_MsgPack_MessagePackObjectArray_Serializer.cs + + gen\System_Collections_ObjectModel_Collection_1_System_ObjectArray_Serializer.cs gen\System_Collections_ObjectModel_ObservableCollection_1_MsgPack_MessagePackObject_Serializer.cs - - gen\System_Collections_ObjectModel_ObservableCollection_1_System_DateTimeArray_Serializer.cs + + gen\System_Collections_ObjectModel_ObservableCollection_1_MsgPack_MessagePackObjectArray_Serializer.cs gen\System_Collections_ObjectModel_ObservableCollection_1_System_DateTime_Serializer.cs - - gen\System_Collections_ObjectModel_ObservableCollection_1_System_Int32Array_Serializer.cs + + gen\System_Collections_ObjectModel_ObservableCollection_1_System_DateTimeArray_Serializer.cs gen\System_Collections_ObjectModel_ObservableCollection_1_System_Int32_Serializer.cs - - gen\System_Collections_ObjectModel_ObservableCollection_1_System_ObjectArray_Serializer.cs + + gen\System_Collections_ObjectModel_ObservableCollection_1_System_Int32Array_Serializer.cs gen\System_Collections_ObjectModel_ObservableCollection_1_System_Object_Serializer.cs + + gen\System_Collections_ObjectModel_ObservableCollection_1_System_ObjectArray_Serializer.cs + gen\System_DayOfWeekSerializer.cs + + GenericExceptionTester.cs + Image.cs diff --git a/test/MsgPack.UnitTest.Xamarin.iOS/MsgPack.UnitTest.Xamarin.iOS.csproj b/test/MsgPack.UnitTest.Xamarin.iOS/MsgPack.UnitTest.Xamarin.iOS.csproj index de19f23b6..e3285e612 100644 --- a/test/MsgPack.UnitTest.Xamarin.iOS/MsgPack.UnitTest.Xamarin.iOS.csproj +++ b/test/MsgPack.UnitTest.Xamarin.iOS/MsgPack.UnitTest.Xamarin.iOS.csproj @@ -1,56 +1,36 @@  - Debug iPhoneSimulator {2B75A9C8-F891-4F78-9E27-8B6FE972DE6C} {FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} Exe - MsgPack Resources true ..\..\src\MsgPack.snk MsgPackUnitTestXamariniOS + + + + - true - full - false - bin\iPhoneSimulator\Debug - DEBUG;__UNIFIED__;__MOBILE__;__IOS__;XAMIOS;MONO; - prompt - 4 false None Entitlements.plist true - MsgPackUnitTestXamariniOS ARMv7 - true - bin\iPhoneSimulator\Release - __UNIFIED__;__MOBILE__;__IOS__;XAMIOS;MONO; - prompt - 4 None false Entitlements.plist - MsgPackUnitTestXamariniOS - true - full - false - bin\iPhone\Debug - DEBUG;__UNIFIED__;__MOBILE__;__IOS__;AOT;XAMARIN;MONO; - prompt - 4 false Entitlements.plist iPhone Developer - MsgPackUnitTestXamariniOS ARMv7 9.3 @@ -72,41 +52,22 @@ False - true - bin\iPhone\Release - __UNIFIED__;__MOBILE__;__IOS__;AOT;XAMARIN;MONO; - prompt - 4 Entitlements.plist false iPhone Developer - MsgPackUnitTestXamios - true - bin\iPhone\Ad-Hoc - __UNIFIED__;__MOBILE__;__IOS__;AOT;XAMARIN;MONO; - prompt - 4 false Entitlements.plist true Automatic:AdHoc iPhone Distribution - MsgPackUnitTestXamios - full - true - bin\iPhone\AppStore - __UNIFIED__;__MOBILE__;__IOS__;AOT;XAMARIN;MONO; - prompt - 4 false Entitlements.plist Automatic:AppStore iPhone Distribution - MsgPackUnitTestXamios @@ -179,9 +140,6 @@ FastStreamUnpackerTest.cs - - GenericExceptionTester.cs - gen\MsgPack_ImageSerializer.cs @@ -212,30 +170,30 @@ gen\MsgPack_Serialization_AbstractClassMemberRuntimeTypeSerializer.cs - - gen\MsgPack_Serialization_AddOnlyCollection_1_MsgPack_MessagePackObjectArray_Serializer.cs - gen\MsgPack_Serialization_AddOnlyCollection_1_MsgPack_MessagePackObject_Serializer.cs - - gen\MsgPack_Serialization_AddOnlyCollection_1_System_DateTimeArray_Serializer.cs + + gen\MsgPack_Serialization_AddOnlyCollection_1_MsgPack_MessagePackObjectArray_Serializer.cs gen\MsgPack_Serialization_AddOnlyCollection_1_System_DateTime_Serializer.cs - - gen\MsgPack_Serialization_AddOnlyCollection_1_System_Int32Array_Serializer.cs + + gen\MsgPack_Serialization_AddOnlyCollection_1_System_DateTimeArray_Serializer.cs gen\MsgPack_Serialization_AddOnlyCollection_1_System_Int32_Serializer.cs - - gen\MsgPack_Serialization_AddOnlyCollection_1_System_ObjectArray_Serializer.cs + + gen\MsgPack_Serialization_AddOnlyCollection_1_System_Int32Array_Serializer.cs gen\MsgPack_Serialization_AddOnlyCollection_1_System_Object_Serializer.cs + + gen\MsgPack_Serialization_AddOnlyCollection_1_System_ObjectArray_Serializer.cs + gen\MsgPack_Serialization_AnnotatedClassSerializer.cs @@ -1442,54 +1400,54 @@ gen\MsgPack_Serialization_PolymorphicMemberTypeRuntimeType_ValueReadWritePropertyAsObjectSerializer.cs - - gen\MsgPack_Serialization_SimpleCollection_1_MsgPack_MessagePackObjectArray_Serializer.cs - gen\MsgPack_Serialization_SimpleCollection_1_MsgPack_MessagePackObject_Serializer.cs - - gen\MsgPack_Serialization_SimpleCollection_1_System_DateTimeArray_Serializer.cs + + gen\MsgPack_Serialization_SimpleCollection_1_MsgPack_MessagePackObjectArray_Serializer.cs gen\MsgPack_Serialization_SimpleCollection_1_System_DateTime_Serializer.cs - - gen\MsgPack_Serialization_SimpleCollection_1_System_Int32Array_Serializer.cs + + gen\MsgPack_Serialization_SimpleCollection_1_System_DateTimeArray_Serializer.cs gen\MsgPack_Serialization_SimpleCollection_1_System_Int32_Serializer.cs - - gen\MsgPack_Serialization_SimpleCollection_1_System_ObjectArray_Serializer.cs + + gen\MsgPack_Serialization_SimpleCollection_1_System_Int32Array_Serializer.cs gen\MsgPack_Serialization_SimpleCollection_1_System_Object_Serializer.cs - - gen\MsgPack_Serialization_StringKeyedCollection_1_MsgPack_MessagePackObjectArray_Serializer.cs + + gen\MsgPack_Serialization_SimpleCollection_1_System_ObjectArray_Serializer.cs gen\MsgPack_Serialization_StringKeyedCollection_1_MsgPack_MessagePackObject_Serializer.cs - - gen\MsgPack_Serialization_StringKeyedCollection_1_System_DateTimeArray_Serializer.cs + + gen\MsgPack_Serialization_StringKeyedCollection_1_MsgPack_MessagePackObjectArray_Serializer.cs gen\MsgPack_Serialization_StringKeyedCollection_1_System_DateTime_Serializer.cs - - gen\MsgPack_Serialization_StringKeyedCollection_1_System_Int32Array_Serializer.cs + + gen\MsgPack_Serialization_StringKeyedCollection_1_System_DateTimeArray_Serializer.cs gen\MsgPack_Serialization_StringKeyedCollection_1_System_Int32_Serializer.cs - - gen\MsgPack_Serialization_StringKeyedCollection_1_System_ObjectArray_Serializer.cs + + gen\MsgPack_Serialization_StringKeyedCollection_1_System_Int32Array_Serializer.cs gen\MsgPack_Serialization_StringKeyedCollection_1_System_Object_Serializer.cs + + gen\MsgPack_Serialization_StringKeyedCollection_1_System_ObjectArray_Serializer.cs + gen\MsgPack_Serialization_TestValueTypeSerializer.cs @@ -1508,81 +1466,84 @@ gen\MsgPack_Serialization_WithAbstractStringCollectionSerializer.cs - - gen\System_Collections_Generic_HashSet_1_MsgPack_MessagePackObjectArray_Serializer.cs - gen\System_Collections_Generic_HashSet_1_MsgPack_MessagePackObject_Serializer.cs - - gen\System_Collections_Generic_HashSet_1_System_DateTimeArray_Serializer.cs + + gen\System_Collections_Generic_HashSet_1_MsgPack_MessagePackObjectArray_Serializer.cs gen\System_Collections_Generic_HashSet_1_System_DateTime_Serializer.cs - - gen\System_Collections_Generic_HashSet_1_System_Int32Array_Serializer.cs + + gen\System_Collections_Generic_HashSet_1_System_DateTimeArray_Serializer.cs gen\System_Collections_Generic_HashSet_1_System_Int32_Serializer.cs - - gen\System_Collections_Generic_HashSet_1_System_ObjectArray_Serializer.cs + + gen\System_Collections_Generic_HashSet_1_System_Int32Array_Serializer.cs gen\System_Collections_Generic_HashSet_1_System_Object_Serializer.cs - - gen\System_Collections_ObjectModel_Collection_1_MsgPack_MessagePackObjectArray_Serializer.cs + + gen\System_Collections_Generic_HashSet_1_System_ObjectArray_Serializer.cs gen\System_Collections_ObjectModel_Collection_1_MsgPack_MessagePackObject_Serializer.cs - - gen\System_Collections_ObjectModel_Collection_1_System_DateTimeArray_Serializer.cs + + gen\System_Collections_ObjectModel_Collection_1_MsgPack_MessagePackObjectArray_Serializer.cs gen\System_Collections_ObjectModel_Collection_1_System_DateTime_Serializer.cs - - gen\System_Collections_ObjectModel_Collection_1_System_Int32Array_Serializer.cs + + gen\System_Collections_ObjectModel_Collection_1_System_DateTimeArray_Serializer.cs gen\System_Collections_ObjectModel_Collection_1_System_Int32_Serializer.cs - - gen\System_Collections_ObjectModel_Collection_1_System_ObjectArray_Serializer.cs + + gen\System_Collections_ObjectModel_Collection_1_System_Int32Array_Serializer.cs gen\System_Collections_ObjectModel_Collection_1_System_Object_Serializer.cs - - gen\System_Collections_ObjectModel_ObservableCollection_1_MsgPack_MessagePackObjectArray_Serializer.cs + + gen\System_Collections_ObjectModel_Collection_1_System_ObjectArray_Serializer.cs gen\System_Collections_ObjectModel_ObservableCollection_1_MsgPack_MessagePackObject_Serializer.cs - - gen\System_Collections_ObjectModel_ObservableCollection_1_System_DateTimeArray_Serializer.cs + + gen\System_Collections_ObjectModel_ObservableCollection_1_MsgPack_MessagePackObjectArray_Serializer.cs gen\System_Collections_ObjectModel_ObservableCollection_1_System_DateTime_Serializer.cs - - gen\System_Collections_ObjectModel_ObservableCollection_1_System_Int32Array_Serializer.cs + + gen\System_Collections_ObjectModel_ObservableCollection_1_System_DateTimeArray_Serializer.cs gen\System_Collections_ObjectModel_ObservableCollection_1_System_Int32_Serializer.cs - - gen\System_Collections_ObjectModel_ObservableCollection_1_System_ObjectArray_Serializer.cs + + gen\System_Collections_ObjectModel_ObservableCollection_1_System_Int32Array_Serializer.cs gen\System_Collections_ObjectModel_ObservableCollection_1_System_Object_Serializer.cs + + gen\System_Collections_ObjectModel_ObservableCollection_1_System_ObjectArray_Serializer.cs + gen\System_DayOfWeekSerializer.cs + + GenericExceptionTester.cs + Image.cs diff --git a/test/MsgPack.UnitTest.Net35/Augments.cs b/test/MsgPack.UnitTest/Augments.cs similarity index 100% rename from test/MsgPack.UnitTest.Net35/Augments.cs rename to test/MsgPack.UnitTest/Augments.cs diff --git a/test/MsgPack.UnitTest/DirectConversionTest.Scalar.cs b/test/MsgPack.UnitTest/DirectConversionTest.Scalar.cs index 6e4cc193d..99d0667b3 100644 --- a/test/MsgPack.UnitTest/DirectConversionTest.Scalar.cs +++ b/test/MsgPack.UnitTest/DirectConversionTest.Scalar.cs @@ -21,9 +21,9 @@ using System; using System.Collections.Generic; using System.Diagnostics; -#if NETFX_35 +#if NET35 using Debug = System.Console; // For missing Debug.WriteLine(String, params Object[]) -#endif // NETFX_35 +#endif // NET35 using System.IO; using System.Text; #if !MSTEST diff --git a/test/MsgPack.UnitTest/DirectConversionTest.Scalar.tt b/test/MsgPack.UnitTest/DirectConversionTest.Scalar.tt index 9a1a96fc8..0d538f3df 100644 --- a/test/MsgPack.UnitTest/DirectConversionTest.Scalar.tt +++ b/test/MsgPack.UnitTest/DirectConversionTest.Scalar.tt @@ -71,9 +71,9 @@ Func __isUnsigned = using System; using System.Collections.Generic; using System.Diagnostics; -#if NETFX_35 +#if NET35 using Debug = System.Console; // For missing Debug.WriteLine(String, params Object[]) -#endif // NETFX_35 +#endif // NET35 using System.IO; using System.Text; #if !MSTEST diff --git a/test/MsgPack.UnitTest/DirectConversionTest.cs b/test/MsgPack.UnitTest/DirectConversionTest.cs index 4df9f64b0..ccbb79056 100644 --- a/test/MsgPack.UnitTest/DirectConversionTest.cs +++ b/test/MsgPack.UnitTest/DirectConversionTest.cs @@ -21,9 +21,9 @@ using System; using System.Collections.Generic; using System.Diagnostics; -#if NETFX_35 +#if NET35 using Debug = System.Console; // For missing Debug.WriteLine(String, params Object[]) -#endif // NETFX_35 +#endif // NET35 using System.IO; using System.Text; #if !MSTEST @@ -102,7 +102,7 @@ public void TestString() var sw = Stopwatch.StartNew(); var avg = 0.0; Random random = new Random(); -#if !SKIP_LARGE_TEST && !NETFX_35 +#if !SKIP_LARGE_TEST && !NET35 var sb = new StringBuilder( 1000 * 1000 * 200 ); #else var sb = new StringBuilder( 1000 * 200 ); @@ -140,7 +140,7 @@ public void TestString() sw.Stop(); Debug.WriteLine( "Medium String ({1:#.0}): {0:0.###} msec/object", sw.ElapsedMilliseconds / 100.0, avg ); sw.Reset(); -#if !SKIP_LARGE_TEST && !NETFX_35 +#if !SKIP_LARGE_TEST && !NET35 sw.Start(); avg = 0.0; diff --git a/test/MsgPack.UnitTest.Net35/Dummies/System.Threading.Tasks/Task.cs b/test/MsgPack.UnitTest/Dummies/System.Threading.Tasks/Task.cs similarity index 100% rename from test/MsgPack.UnitTest.Net35/Dummies/System.Threading.Tasks/Task.cs rename to test/MsgPack.UnitTest/Dummies/System.Threading.Tasks/Task.cs diff --git a/test/MsgPack.UnitTest.Net35/Dummies/System.Threading.Tasks/TaskFactory.cs b/test/MsgPack.UnitTest/Dummies/System.Threading.Tasks/TaskFactory.cs similarity index 100% rename from test/MsgPack.UnitTest.Net35/Dummies/System.Threading.Tasks/TaskFactory.cs rename to test/MsgPack.UnitTest/Dummies/System.Threading.Tasks/TaskFactory.cs diff --git a/test/MsgPack.UnitTest/GenericExceptionTester.cs b/test/MsgPack.UnitTest/GenericExceptionTester.cs index 611cc95e1..511859ed2 100644 --- a/test/MsgPack.UnitTest/GenericExceptionTester.cs +++ b/test/MsgPack.UnitTest/GenericExceptionTester.cs @@ -1,8 +1,8 @@ -#region -- License Terms -- +#region -- License Terms -- // // MessagePack for CLI // -// Copyright (C) 2010-2012 FUJIWARA, Yusuke +// Copyright (C) 2010-2017 FUJIWARA, Yusuke // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -146,6 +146,9 @@ public void TestException() this.TestInnerExceptionConstructor_Null_SetToDefaultMessageAndNullInnerException(); #if !SILVERLIGHT && !AOT && !NETSTANDARD1_1 && !NETSTANDARD1_3 this.TestSerialization(); +#if !NETSTANDARD2_0 + this.TestSerializationOnPartialTrust(); +#endif // !NETSTANDARD2_0 #endif // !SILVERLIGHT && !AOT && !NETSTANDARD1_1 && !NETSTANDARD1_3 } @@ -220,7 +223,11 @@ private static void TestToStringCore( T target, string ctor ) #if !SILVERLIGHT && !AOT && !NETSTANDARD1_1 && !NETSTANDARD1_3 private void TestSerialization() { +#if !NETSTANDARD2_0 Assert.That( typeof( T ), Is.BinarySerializable ); +#else // !NETSTANDARD2_0 + Assert.That( typeof( T ).IsSerializable, Is.True ); +#endif // !NETSTANDARD2_0 var innerMessage = Guid.NewGuid().ToString(); var message = Guid.NewGuid().ToString(); var target = this._innerExceptionConstructor( message, new Exception( innerMessage ) ); @@ -237,11 +244,12 @@ private void TestSerialization() } } +#if !NETSTANDARD2_0 private void TestSerializationOnPartialTrust() { var appDomainSetUp = new AppDomainSetup() { ApplicationBase = AppDomain.CurrentDomain.SetupInformation.ApplicationBase }; var evidence = new Evidence(); -#if MONO || NETFX_35 +#if MONO || NET35 #pragma warning disable 0612 // TODO: patching // currently, Mono does not declare AddHostEvidence @@ -274,7 +282,7 @@ private void TestSerializationOnPartialTrust() } } -#if MONO || NETFX_35 +#if MONO || NET35 private static PermissionSet GetDefaultInternetZoneSandbox() { var permissions = new PermissionSet( PermissionState.None ); @@ -304,7 +312,7 @@ private static PermissionSet GetDefaultInternetZoneSandbox() return permissions; } -#endif // if MONO || NETFX_35 +#endif // if MONO || NET35 public static void TestSerializationOnPartialTrustCore() { @@ -324,6 +332,7 @@ private static StrongName GetStrongName( Type type ) var assemblyName = type.Assembly.GetName(); return new StrongName( new StrongNamePublicKeyBlob( assemblyName.GetPublicKey() ), assemblyName.Name, assemblyName.Version ); } +#endif // !NETSTANDARD2_0 #endif // !SILVERLIGHT && !AOT && !NETSTANDARD1_1 && !NETSTANDARD1_3 } } diff --git a/test/MsgPack.UnitTest/MessagePackStringTest.cs b/test/MsgPack.UnitTest/MessagePackStringTest.cs index 102476a6e..86c837465 100644 --- a/test/MsgPack.UnitTest/MessagePackStringTest.cs +++ b/test/MsgPack.UnitTest/MessagePackStringTest.cs @@ -1,4 +1,4 @@ -#region -- License Terms -- +#region -- License Terms -- // // MessagePack for CLI // @@ -20,9 +20,9 @@ using System; using System.Diagnostics; -#if NETFX_35 +#if NET35 using Debug = System.Console; // For missing Debug.WriteLine(String, params Object[]) -#endif // NETFX_35 +#endif // NET35 using System.Security; #if !NETFX_CORE && !WINDOWS_PHONE && !NETSTANDARD1_1 && !NETSTANDARD1_3 using System.Security.Permissions; @@ -139,12 +139,17 @@ public void TestToString_EmptyString() Assert.AreEqual( String.Empty, target.ToString() ); } -#if !UNITY && !SILVERLIGHT && !AOT && !NETFX_CORE [Test] public void TestEqualsFullTrust() { var result = TestEqualsCore(); +#if !UNITY && !WINDOWS_PHONE && !NETFX_CORE +#if SILVERLIGHT && !SILVERLIGHT_PRIVILEGED + Assert.That( MessagePackString.IsFastEqualsDisabled, Is.True ); +#else // SILVERLIGHT && !SILVERLIGHT_PRIVILEGED Assert.That( MessagePackString.IsFastEqualsDisabled, Is.False ); +#endif // SILVERLIGHT && !SILVERLIGHT_PRIVILEGED +#endif // !UNITY && !WINDOWS_PHONE && !NETFX_CORE Debug.WriteLine( "TestEqualsFullTrust" ); ShowResult( result ); } @@ -157,9 +162,7 @@ private void ShowResult( Tuple result ) Debug.WriteLine( "Large(100,000 chars) : {0:#,0.0} usec", result.Item4 ); } -#endif // !UNITY && !SILVERLIGHT && !AOT - -#if !SILVERLIGHT && !AOT && !NETSTANDARD1_1 && !NETSTANDARD1_3 && !NETFX_CORE +#if !SILVERLIGHT && !AOT && !NETSTANDARD1_1 && !NETSTANDARD1_3 && !NETFX_CORE && !NETSTANDARD2_0 private static StrongName GetStrongName( Type type ) { var assemblyName = type.Assembly.GetName(); @@ -171,7 +174,8 @@ public void TestEqualsPartialTrust() { var appDomainSetUp = new AppDomainSetup() { ApplicationBase = AppDomain.CurrentDomain.SetupInformation.ApplicationBase }; var evidence = new Evidence(); -#if MONO || NETFX_35 + +#if MONO || NET35 #pragma warning disable 0612 // TODO: patching // currently, Mono does not declare AddHostEvidence @@ -181,7 +185,7 @@ public void TestEqualsPartialTrust() #else evidence.AddHostEvidence( new Zone( SecurityZone.Internet ) ); var permisions = SecurityManager.GetStandardSandbox( evidence ); -#endif // if MONO || NETFX_35 +#endif // if MONO || NET35 AppDomain workerDomain = AppDomain.CreateDomain( "PartialTrust", evidence, appDomainSetUp, permisions, GetStrongName( this.GetType() ), GetStrongName( typeof( Assert ) ) ); try { @@ -200,7 +204,7 @@ public void TestEqualsPartialTrust() } } -#if MONO || NETFX_35 +#if MONO || NET35 private static PermissionSet GetDefaultInternetZoneSandbox() { var permissions = new PermissionSet( PermissionState.None ); @@ -219,9 +223,9 @@ private static PermissionSet GetDefaultInternetZoneSandbox() permissions.AddPermission( new SecurityPermission( SecurityPermissionFlag.Execution -#if NETFX_35 +#if NET35 | SecurityPermissionFlag.SkipVerification -#endif // if NETFX_35 +#endif // if NET35 ) ); permissions.AddPermission( @@ -233,7 +237,7 @@ private static PermissionSet GetDefaultInternetZoneSandbox() return permissions; } -#endif // if MONO || NETFX_35 +#endif // if MONO || NET35 public static void TestEqualsWorker() { @@ -242,6 +246,8 @@ public static void TestEqualsWorker() AppDomain.CurrentDomain.SetData( "MessagePackString.IsFastEqualsDisabled", MessagePackString.IsFastEqualsDisabled ); } +#endif // !SILVERLIGHT && !AOT && !NETSTANDARD1_1 && !NETSTANDARD1_3 && !NETFX_CORE && !NETSTANDARD2_0 + private static Tuple TestEqualsCore() { Assert.IsTrue( @@ -319,7 +325,8 @@ private static Tuple TestEqualsCore() var sw = new Stopwatch(); for ( int i = 0; i < iteration; i++ ) { - sw.Restart(); + sw.Reset(); + sw.Start(); for ( int x = 0; x < values.Length; x++ ) { Assert.That( values[ x ].Equals( null ), Is.False ); @@ -330,7 +337,11 @@ private static Tuple TestEqualsCore() } } sw.Stop(); - tinyAvg = Math.Min( tinyAvg, sw.Elapsed.Ticks * 10.0 / ( values.Length * values.Length ) ); +#if SILVERLIGHT && !WINDOWS_PHONE + tinyAvg = Math.Min( tinyAvg, sw.ElapsedMilliseconds * 1000.0 / ( values.Length * values.Length ) ); +#else + tinyAvg = Math.Min( tinyAvg, sw.Elapsed.Ticks / 10.0 / ( values.Length * values.Length ) ); +#endif } var smallX = new MessagePackString( new String( 'A', 16 ) ); @@ -338,10 +349,15 @@ private static Tuple TestEqualsCore() for ( int i = 0; i < iteration; i++ ) { - sw.Restart(); + sw.Reset(); + sw.Start(); Assert.That( smallX.Equals( smallY ), Is.True ); sw.Stop(); - smallAvg = Math.Min( smallAvg, sw.Elapsed.Ticks * 10.0 ); +#if SILVERLIGHT && !WINDOWS_PHONE + smallAvg = Math.Min( smallAvg, sw.ElapsedMilliseconds * 1000.0 ); +#else + smallAvg = Math.Min( smallAvg, sw.Elapsed.Ticks / 10.0 ); +#endif } var mediumX = new MessagePackString( new String( 'A', 1000 ) ); @@ -349,10 +365,15 @@ private static Tuple TestEqualsCore() for ( int i = 0; i < iteration; i++ ) { - sw.Restart(); + sw.Reset(); + sw.Start(); Assert.That( mediumX.Equals( mediumY ), Is.True ); sw.Stop(); - mediumAvg = Math.Min( mediumAvg, sw.Elapsed.Ticks * 10.0 ); +#if SILVERLIGHT && !WINDOWS_PHONE + mediumAvg = Math.Min( mediumAvg, sw.ElapsedMilliseconds * 1000.0 ); +#else + mediumAvg = Math.Min( mediumAvg, sw.Elapsed.Ticks / 10.0 ); +#endif } var largeX = new MessagePackString( new String( 'A', 100000 ) ); @@ -360,14 +381,18 @@ private static Tuple TestEqualsCore() for ( int i = 0; i < iteration; i++ ) { - sw.Restart(); + sw.Reset(); + sw.Start(); Assert.That( largeX.Equals( largeY ), Is.True ); sw.Stop(); - largeAvg = Math.Min( largeAvg, sw.Elapsed.Ticks * 10.0 ); +#if SILVERLIGHT && !WINDOWS_PHONE + largeAvg = Math.Min( largeAvg, sw.ElapsedMilliseconds * 1000.0 ); +#else + largeAvg = Math.Min( largeAvg, sw.Elapsed.Ticks / 10.0 ); +#endif } return Tuple.Create( tinyAvg, smallAvg, mediumAvg, largeAvg ); } -#endif // !SILVERLIGHT && !AOT && !NETSTANDARD1_1 && !NETSTANDARD1_3 } } diff --git a/test/MsgPack.UnitTest.Net35/Mono/System/AggregateException.cs b/test/MsgPack.UnitTest/Mono/System/AggregateException.cs similarity index 100% rename from test/MsgPack.UnitTest.Net35/Mono/System/AggregateException.cs rename to test/MsgPack.UnitTest/Mono/System/AggregateException.cs diff --git a/test/MsgPack.UnitTest.Net35/Mono/System/Threading/AtomicBoolean.cs b/test/MsgPack.UnitTest/Mono/System/Threading/AtomicBoolean.cs similarity index 100% rename from test/MsgPack.UnitTest.Net35/Mono/System/Threading/AtomicBoolean.cs rename to test/MsgPack.UnitTest/Mono/System/Threading/AtomicBoolean.cs diff --git a/test/MsgPack.UnitTest.Net35/Mono/System/Threading/Barrier.cs b/test/MsgPack.UnitTest/Mono/System/Threading/Barrier.cs similarity index 100% rename from test/MsgPack.UnitTest.Net35/Mono/System/Threading/Barrier.cs rename to test/MsgPack.UnitTest/Mono/System/Threading/Barrier.cs diff --git a/test/MsgPack.UnitTest.Net35/Mono/System/Threading/BarrierPostPhaseException.cs b/test/MsgPack.UnitTest/Mono/System/Threading/BarrierPostPhaseException.cs similarity index 100% rename from test/MsgPack.UnitTest.Net35/Mono/System/Threading/BarrierPostPhaseException.cs rename to test/MsgPack.UnitTest/Mono/System/Threading/BarrierPostPhaseException.cs diff --git a/test/MsgPack.UnitTest.Net35/Mono/System/Threading/CountdownEvent.cs b/test/MsgPack.UnitTest/Mono/System/Threading/CountdownEvent.cs similarity index 100% rename from test/MsgPack.UnitTest.Net35/Mono/System/Threading/CountdownEvent.cs rename to test/MsgPack.UnitTest/Mono/System/Threading/CountdownEvent.cs diff --git a/test/MsgPack.UnitTest.Net35/Mono/System/Threading/ManualResetEventSlim.cs b/test/MsgPack.UnitTest/Mono/System/Threading/ManualResetEventSlim.cs similarity index 100% rename from test/MsgPack.UnitTest.Net35/Mono/System/Threading/ManualResetEventSlim.cs rename to test/MsgPack.UnitTest/Mono/System/Threading/ManualResetEventSlim.cs diff --git a/test/MsgPack.UnitTest.Net35/Mono/System/Threading/SpinWait.cs b/test/MsgPack.UnitTest/Mono/System/Threading/SpinWait.cs similarity index 100% rename from test/MsgPack.UnitTest.Net35/Mono/System/Threading/SpinWait.cs rename to test/MsgPack.UnitTest/Mono/System/Threading/SpinWait.cs diff --git a/test/MsgPack.UnitTest/MsgPack.UnitTest.csproj b/test/MsgPack.UnitTest/MsgPack.UnitTest.csproj index 216ab9aaf..8ea31ca86 100644 --- a/test/MsgPack.UnitTest/MsgPack.UnitTest.csproj +++ b/test/MsgPack.UnitTest/MsgPack.UnitTest.csproj @@ -1,1064 +1,399 @@  - + - Debug - AnyCPU - 8.0.30703 - 2.0 {3889C9BE-0473-4B41-80E8-C4C923E837E7} Library - Properties - MsgPack MsgPack.UnitTest - v4.6.1 - 512 - ..\..\ - true - - - - true - full - false - bin\Debug\ - TRACE;DEBUG;SKIP_LARGE_TEST;FEATURE_TAP - prompt - 4 - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - false - - - true - bin\PerformanceTest\ - DEBUG;TRACE;PERFORMANCE_TEST - full - AnyCPU - prompt - true - true - false + net46;netcoreapp1.0;netcoreapp2.0 + - true - - - ..\..\src\MsgPack.snk - - - bin\Instrument\ - TRACE - true - pdbonly - AnyCPU - prompt - true - true - false + - - bin\CodeAnalysis\ - TRACE - true - pdbonly - AnyCPU - prompt - false - false - false + + + $(DefineConstants);NETSTANDARD1_3 - - bin\CoreProfile\ - TRACE - true - pdbonly - AnyCPU - prompt - false + + + $(DefineConstants);NETSTANDARD2_0 - - ..\..\packages\Microsoft.CodeAnalysis.Common.1.3.2\lib\net45\Microsoft.CodeAnalysis.dll - True - - - ..\..\packages\Microsoft.CodeAnalysis.CSharp.1.3.2\lib\net45\Microsoft.CodeAnalysis.CSharp.dll - True - - - - ..\..\packages\NUnit.3.6.1\lib\net45\nunit.framework.dll - + + + + + + + + + + + + + + + + + + + + - - ..\..\packages\System.AppContext.4.1.0\lib\net46\System.AppContext.dll - True - - - ..\..\packages\System.Collections.Immutable.1.2.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll - True - - - - ..\..\packages\System.Console.4.0.0\lib\net46\System.Console.dll - True - - - ..\..\packages\System.Diagnostics.FileVersionInfo.4.0.0\lib\net46\System.Diagnostics.FileVersionInfo.dll - True - - - ..\..\packages\System.Diagnostics.StackTrace.4.0.1\lib\net46\System.Diagnostics.StackTrace.dll - True - - - ..\..\packages\System.IO.FileSystem.4.0.1\lib\net46\System.IO.FileSystem.dll - True - - - ..\..\packages\System.IO.FileSystem.Primitives.4.0.1\lib\net46\System.IO.FileSystem.Primitives.dll - True - - - ..\..\packages\System.Reflection.Metadata.1.3.0\lib\portable-net45+win8\System.Reflection.Metadata.dll - True - - - ..\..\packages\System.Security.Cryptography.Algorithms.4.2.0\lib\net461\System.Security.Cryptography.Algorithms.dll - True - - - ..\..\packages\System.Security.Cryptography.Encoding.4.0.0\lib\net46\System.Security.Cryptography.Encoding.dll - True - - - ..\..\packages\System.Security.Cryptography.Primitives.4.0.0\lib\net46\System.Security.Cryptography.Primitives.dll - True - - - ..\..\packages\System.Security.Cryptography.X509Certificates.4.1.0\lib\net461\System.Security.Cryptography.X509Certificates.dll - True - - - ..\..\packages\System.Text.Encoding.CodePages.4.0.1\lib\net46\System.Text.Encoding.CodePages.dll - True - - - ..\..\packages\System.Threading.Thread.4.0.0\lib\net46\System.Threading.Thread.dll - True - - - - - ..\..\packages\System.Xml.XmlDocument.4.0.1\lib\net46\System.Xml.XmlDocument.dll - True - - - ..\..\packages\System.Xml.XPath.4.0.1\lib\net46\System.Xml.XPath.dll - True - - - ..\..\packages\System.Xml.XPath.XDocument.4.0.1\lib\net46\System.Xml.XPath.XDocument.dll - True - + - - - + + + + + + + + + + + + + + + + + + True True ByteArrayPackerTest.Allocation.tt - - - - - - - - - + True True DirectConversionTest.Scalar.tt - - Code - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + True True MessagePackObjectTest.Conversion.tt - - + True True MessagePackObjectTest.Equals.Integer.tt - + True True MessagePackObjectTest.Equals.Real.tt - + True True MessagePackObjectTest.Exceptionals.Conversion.tt - - - + True True MessagePackObjectTest.IsTypeOf.Array.tt - - + True True MessagePackObjectTest.IsTypeOf.Integer.tt - + True True MessagePackObjectTest.IsTypeOf.Map.tt - + True True MessagePackObjectTest.IsTypeOf.Raw.tt - - - - - - - + True True PackerTest.Pack.tt - + True True PackerTest.PackObject.tt - + True True PackerTest.PackT.tt - - + True True PackUnpackTest.Scalar.tt - - - + ArrayReflectionBasedAutoMessagePackSerializerTest.tt True True - + ArrayReflectionBasedEnumSerializationTest.tt True True - + True True ArrayFieldBasedEnumSerializationTest.tt - + True True ArrayGenerationBasedAutoMessagePackSerializerTest.tt - + True True ArrayGenerationBasedEnumSerializationTest.tt - - + AutoMessagePackSerializerTest.Types.tt - Code True True - - - - - - - - - - - + True True EnumSerializationTest.EnumDefinitions.tt - + True True MapReflectionBasedAutoMessagePackSerializerTest.tt - - - + ReflectionBasedNilImplicationTest.tt True True - + True True FieldBasedNilImplicationTest.tt - - + MapReflectionBasedEnumSerializationTest.tt True True - - - - + True True GenerationBasedNilImplicationTest.tt - - - + True True MapFieldBasedEnumSerializationTest.tt - + True True MapGenerationBasedAutoMessagePackSerializerTest.tt - + True True MapGenerationBasedEnumSerializationTest.tt - - - - - - - - - - + True True PreGeneratedSerializerActivator.Types.tt - - - - - - - - - - - - - + True True VersioningTest.Cases.tt - - - - - + ArrayFieldBasedAutoMessagePackSerializerTest.tt True True - + MapFieldBasedAutoMessagePackSerializerTest.tt True True - - - - + ByteArrayUnpackerTest.Ext.tt True True - + ByteArrayUnpackerTest.Raw.tt True True - + ByteArrayUnpackerTest.Scalar.tt True True - - - + True True UnpackerTest.tt - + StreamUnpackerTest.Ext.tt True True - + True True UnpackerTest.Ext.tt - + StreamUnpackerTest.Scalar.tt True True - + StreamUnpackerTest.Raw.tt True True - + True True UnpackerTest.Skip.tt - + True True UnpackerTest.Object.tt - + True True UnpackerTest.Raw.tt - + True True UnpackerTest.Scalar.tt - + True True UnpackerTest.Skip.Variations.tt - + True True UnpackingTest.Combinations.Array.tt - + True True UnpackingTest.Combinations.Boolean.tt - + True True UnpackingTest.Combinations.Byte.tt - + True True UnpackingTest.Combinations.Double.tt - + True True UnpackingTest.Combinations.Int16.tt - + True True UnpackingTest.Combinations.Int32.tt - + True True UnpackingTest.Combinations.Int64.tt - + True True UnpackingTest.Combinations.Map.tt - + True True UnpackingTest.Combinations.Nil.tt - + True True UnpackingTest.Combinations.Raw.tt - + True True UnpackingTest.Combinations.SByte.tt - + True True UnpackingTest.Combinations.Single.tt - + True True UnpackingTest.Combinations.UInt16.tt - + True True UnpackingTest.Combinations.UInt32.tt - + True True UnpackingTest.Combinations.UInt64.tt - - - + True True TestRandom.tt - - + PackerTest.PackBinary.tt True True - + PackerTest.PackExtendedType.tt True True - + UnpackingTest.Scalar.tt True True - + UnpackingTest.Raw.tt True True - + UnpackingTest.Ext.tt True True @@ -1078,241 +413,240 @@ PreserveNewest - + TextTemplatingFileGenerator DirectConversionTest.Scalar.cs - + TextTemplatingFileGenerator MessagePackObjectTest.Conversion.cs - + TextTemplatingFileGenerator MessagePackObjectTest.Equals.Integer.cs - + TextTemplatingFileGenerator MessagePackObjectTest.Equals.Real.cs - + TextTemplatingFileGenerator MessagePackObjectTest.Exceptionals.Conversion.cs - + TextTemplatingFileGenerator MessagePackObjectTest.IsTypeOf.Array.cs - + TextTemplatingFileGenerator MessagePackObjectTest.IsTypeOf.Integer.cs - + TextTemplatingFileGenerator MessagePackObjectTest.IsTypeOf.Map.cs - + TextTemplatingFileGenerator MessagePackObjectTest.IsTypeOf.Raw.cs - - + TextTemplatingFileGenerator PackerTest.Pack.cs - + TextTemplatingFileGenerator PackerTest.PackObject.cs - + TextTemplatingFileGenerator PackerTest.PackT.cs - + TextTemplatingFileGenerator PackUnpackTest.Scalar.cs PreserveNewest - + TextTemplatingFileGenerator ArrayReflectionBasedAutoMessagePackSerializerTest.cs - + TextTemplatingFileGenerator ArrayReflectionBasedEnumSerializationTest.cs - + TextTemplatingFileGenerator ArrayFieldBasedEnumSerializationTest.cs - + TextTemplatingFileGenerator ArrayGenerationBasedAutoMessagePackSerializerTest.cs - + TextTemplatingFileGenerator ArrayGenerationBasedEnumSerializationTest.cs - + TextTemplatingFileGenerator AutoMessagePackSerializerTest.Types.cs - + TextTemplatingFileGenerator EnumSerializationTest.EnumDefinitions.cs - + TextTemplatingFileGenerator ReflectionBasedNilImplicationTest.cs - + TextTemplatingFileGenerator FieldBasedNilImplicationTest.cs - + TextTemplatingFileGenerator GenerationBasedNilImplicationTest.cs - + TextTemplatingFileGenerator MapReflectionBasedAutoMessagePackSerializerTest.cs - + TextTemplatingFileGenerator MapReflectionBasedEnumSerializationTest.cs - + TextTemplatingFileGenerator MapFieldBasedEnumSerializationTest.cs - + TextTemplatingFileGenerator MapGenerationBasedAutoMessagePackSerializerTest.cs - + TextTemplatingFileGenerator MapGenerationBasedEnumSerializationTest.cs - + TextTemplatingFileGenerator PreGeneratedSerializerActivator.Types.cs - + TextTemplatingFileGenerator VersioningTest.Cases.cs - + TextTemplatingFileGenerator ArrayFieldBasedAutoMessagePackSerializerTest.cs - + TextTemplatingFileGenerator MapFieldBasedAutoMessagePackSerializerTest.cs - + TextTemplatingFileGenerator TestRandom.cs - + TextTemplatingFileGenerator UnpackerTest.Ext.cs - + TextTemplatingFileGenerator UnpackerTest.Raw.cs - + TextTemplatingFileGenerator UnpackerTest.Scalar.cs - + TextTemplatingFileGenerator UnpackerTest.Skip.Variations.cs - + TextTemplatingFileGenerator UnpackingTest.Combinations.Array.cs - + TextTemplatingFileGenerator UnpackingTest.Combinations.Boolean.cs - + TextTemplatingFileGenerator UnpackingTest.Combinations.Byte.cs - + TextTemplatingFileGenerator UnpackingTest.Combinations.Double.cs - + TextTemplatingFileGenerator UnpackingTest.Combinations.Int16.cs - + TextTemplatingFileGenerator UnpackingTest.Combinations.Int32.cs - + TextTemplatingFileGenerator UnpackingTest.Combinations.Int64.cs - + TextTemplatingFileGenerator UnpackingTest.Combinations.Map.cs - + TextTemplatingFileGenerator UnpackingTest.Combinations.Nil.cs - + TextTemplatingFileGenerator UnpackingTest.Combinations.Raw.cs - + TextTemplatingFileGenerator UnpackingTest.Combinations.SByte.cs - + TextTemplatingFileGenerator UnpackingTest.Combinations.Single.cs - + TextTemplatingFileGenerator UnpackingTest.Combinations.UInt16.cs - + TextTemplatingFileGenerator UnpackingTest.Combinations.UInt32.cs - + TextTemplatingFileGenerator UnpackingTest.Combinations.UInt64.cs - + TextTemplatingFileGenerator PackerTest.PackBinary.cs - + TextTemplatingFileGenerator PackerTest.PackExtendedType.cs - + TextTemplatingFileGenerator UnpackingTest.Scalar.cs - + TextTemplatingFileGenerator UnpackingTest.Raw.cs - + TextTemplatingFileGenerator UnpackingTest.Ext.cs @@ -1322,60 +656,51 @@ - - {5BCEC32E-990E-4DE5-945F-BD27326A7418} - MsgPack - + - + TextTemplatingFileGenerator ByteArrayPackerTest.Allocation.cs - - - + + + TextTemplatingFileGenerator StreamUnpackerTest.Scalar.cs - + TextTemplatingFileGenerator StreamUnpackerTest.Raw.cs - + TextTemplatingFileGenerator StreamUnpackerTest.Ext.cs - + TextTemplatingFileGenerator ByteArrayUnpackerTest.Ext.cs - + TextTemplatingFileGenerator ByteArrayUnpackerTest.Raw.cs - + TextTemplatingFileGenerator ByteArrayUnpackerTest.Scalar.cs - + TextTemplatingFileGenerator UnpackerTest.Skip.cs - - + + TextTemplatingFileGenerator UnpackerTest.Object.cs - - + + TextTemplatingFileGenerator UnpackerTest.cs - - - - - + - - - \ No newline at end of file diff --git a/tools/SyncProjects/SyncProjects/packages.config b/tools/SyncProjects/SyncProjects/packages.config deleted file mode 100644 index c8ff80e88..000000000 --- a/tools/SyncProjects/SyncProjects/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/tools/SyncProjects/bin/NDesk.Options.dll b/tools/SyncProjects/bin/NDesk.Options.dll deleted file mode 100644 index df4587895..000000000 Binary files a/tools/SyncProjects/bin/NDesk.Options.dll and /dev/null differ diff --git a/tools/SyncProjects/bin/SyncProjects.exe b/tools/SyncProjects/bin/SyncProjects.exe deleted file mode 100644 index a80b9d222..000000000 Binary files a/tools/SyncProjects/bin/SyncProjects.exe and /dev/null differ diff --git a/tools/SyncProjects2/.editorconfig b/tools/SyncProjects2/.editorconfig new file mode 100644 index 000000000..7a39d2421 --- /dev/null +++ b/tools/SyncProjects2/.editorconfig @@ -0,0 +1,89 @@ +# EditorConfig is awesome: http://EditorConfig.org + +# top-most EditorConfig file +root = true + +# Unix-style newlines with a newline ending every file +[*] +# Note: T4 Editor cannot handle non-CRLF, so locally use CRLF and push as LF via git +end_of_line = crlf +insert_final_newline = true + +# Matches multiple files with brace expansion notation +# Set default charset +[*] +charset = utf-8 + +# 4 width tab indentation +[*.{cs,tt,ttinclude}] +indent_style = tab +tab_width = 4 + +# 2 space indentation +[*.{xml,csproj}] +indent_style = space +indent_size = 2 + +# From https://docs.microsoft.com/en-us/visualstudio/ide/editorconfig-code-style-settings-reference +# and https://github.com/dotnet/roslyn/blob/master/src/Workspaces/CSharp/Portable/Formatting/CSharpFormattingOptions.cs +[*.cs] +dotnet_style_qualification_for_field = true:warning +dotnet_style_qualification_for_property = true:warning +dotnet_style_qualification_for_method = true:warning +dotnet_style_qualification_for_event = true:warning +dotnet_style_predefined_type_for_locals_parameters_members = true:warning +dotnet_style_predefined_type_for_member_access = false:warning +dotnet_style_object_initializer = true:suggestion +dotnet_style_collection_initializer = true:suggestion +dotnet_style_explicit_tuple_names = true:suggestion +dotnet_style_coalesce_expression = true:warning +csharp_style_var_for_built_in_types = true:suggestion +csharp_style_var_when_type_is_apparent = true:suggestion +csharp_style_var_elsewhere = true:suggestion +dotnet_sort_system_directives_first = true +csharp_space_between_method_declaration_name_and_open_parenthesis = false +csharp_space_between_method_declaration_parameter_list_parentheses = true +csharp_space_between_method_declaration_empty_parameter_list_parentheses = false +csharp_space_between_method_call_name_and_opening_parenthesis = false +csharp_space_between_method_call_parameter_list_parentheses = true +csharp_space_between_method_call_empty_parameter_list_parentheses = false +csharp_space_between_parentheses = expressions,type_casts,control_flow_statements +csharp_space_after_keywords_in_control_flow_statements = true +csharp_space_after_cast = false +csharp_space_around_declaration_statements = true +csharp_space_before_open_square_brackets = false +csharp_space_between_empty_square_brackets = false +csharp_space_between_square_brackets = true +csharp_space_after_colon_in_inheritance_clause = true +csharp_space_after_comma = true +csharp_space_after_dot = false +csharp_space_after_semicolon_in_for_statement = true +csharp_space_before_colon_in_inheritance_clause = true +csharp_space_before_comma = false +csharp_space_before_dot = false +csharp_space_before_semicolon_in_for_statement = false +csharp_space_around_binary_operators = true +csharp_indent_braces = false +csharp_indent_block_contents = true +csharp_indent_switch_labels = true +csharp_indent_case_contents = false +csharp_indent_labels = false +csharp_preserve_single_line_blocks = true +csharp_preserve_single_line_statements = true +csharp_new_line_before_open_brace = all +csharp_new_line_between_query_expression_clauses = true + +# Disabled for Unity compatibility until 2017.1 RTM +[*.cs] +dotnet_style_null_propagation = false:warning +csharp_style_expression_bodied_methods = true:suggestion +csharp_style_expression_bodied_constructors = true:suggestion +csharp_style_expression_bodied_operators = true:suggestion +csharp_style_expression_bodied_properties = true:suggestion +csharp_style_expression_bodied_indexers = true:suggestion +csharp_style_expression_bodied_accessors = true:suggestion +csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion +csharp_style_pattern_matching_over_as_with_null_check = true:suggestion +csharp_style_inlined_variable_declaration = true:suggestion +csharp_style_throw_expression = true:suggestion +csharp_style_conditional_delegate_call = true:suggestion diff --git a/tools/SyncProjects/SyncProjects/.gitignore b/tools/SyncProjects2/.gitignore similarity index 50% rename from tools/SyncProjects/SyncProjects/.gitignore rename to tools/SyncProjects2/.gitignore index 25b71e44a..cd42ee34e 100644 --- a/tools/SyncProjects/SyncProjects/.gitignore +++ b/tools/SyncProjects2/.gitignore @@ -1,2 +1,2 @@ bin/ -Bin/ \ No newline at end of file +obj/ diff --git a/tools/SyncProjects2/MsgPack.Tools.Build.SyncProject/MsgPack.Tools.Build.SyncProject.csproj b/tools/SyncProjects2/MsgPack.Tools.Build.SyncProject/MsgPack.Tools.Build.SyncProject.csproj new file mode 100644 index 000000000..9162aacbe --- /dev/null +++ b/tools/SyncProjects2/MsgPack.Tools.Build.SyncProject/MsgPack.Tools.Build.SyncProject.csproj @@ -0,0 +1,13 @@ + + + + netstandard1.5 + MsgPack + + + + + + + + \ No newline at end of file diff --git a/tools/SyncProjects2/MsgPack.Tools.Build.SyncProject/Tools/Build/Glob.cs b/tools/SyncProjects2/MsgPack.Tools.Build.SyncProject/Tools/Build/Glob.cs new file mode 100644 index 000000000..e3ea2d7f2 --- /dev/null +++ b/tools/SyncProjects2/MsgPack.Tools.Build.SyncProject/Tools/Build/Glob.cs @@ -0,0 +1,108 @@ +#region -- License Terms -- +// MessagePack for CLI +// +// Copyright (C) 2015 FUJIWARA, Yusuke +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +#endregion + +using System; +using Newtonsoft.Json; + +namespace MsgPack.Tools.Build +{ + /// + /// Represents glob information for project synchronizer. + /// + [JsonConverter( typeof( GlobJsonConverter ) )] + public struct Glob : IEquatable + { + /// + /// Gets the path. + /// + /// + /// The path glob pattern. + /// + public string Path { get; } + + /// + /// Gets the type. + /// + /// + /// The type of this entry. + /// + public GlobType Type { get; } + + /// + /// Initializes a new instance of the struct. + /// + /// The path glob pattern. + /// The type of this entry. + public Glob( string path, GlobType type ) + { + this.Path = path; + this.Type = type; + } + + /// + /// Determines whether the other object which is same type is equal to this instance or not. + /// + /// The object to be compared to this object. + /// + /// true, if the is equal to this instance; otherwise, false. + /// + public bool Equals( Glob other ) + => this.Path == other.Path && this.Type == other.Type; + + /// + /// Determines whether the specified , is equal to this instance. + /// + /// The to compare with this instance. + /// + /// true if the specified is equal to this instance; otherwise, false. + /// + public override bool Equals( object obj ) + => ( obj is Glob other ) ? this.Equals( other ) : false; + + /// + /// Returns a hash code for this instance. + /// + /// + /// A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table. + /// + public override int GetHashCode() + => ( this.Path?.GetHashCode() ).GetValueOrDefault() ^ this.Type.GetHashCode(); + + /// + /// Determines whether objects are equal to each other. + /// + /// A . + /// A . + /// + /// true, if the specified object are equal; otherwise, false. + /// + public static bool operator ==( Glob left, Glob right ) + => left.Equals( right ); + + /// + /// Determines whether objects are not equal to each other. + /// + /// A . + /// A . + /// + /// true, if the specified object are not equal; otherwise, false. + /// + public static bool operator !=( Glob left, Glob right ) + => !left.Equals( right ); + } +} diff --git a/tools/SyncProjects2/MsgPack.Tools.Build.SyncProject/Tools/Build/GlobJsonConverter.cs b/tools/SyncProjects2/MsgPack.Tools.Build.SyncProject/Tools/Build/GlobJsonConverter.cs new file mode 100644 index 000000000..734511cf7 --- /dev/null +++ b/tools/SyncProjects2/MsgPack.Tools.Build.SyncProject/Tools/Build/GlobJsonConverter.cs @@ -0,0 +1,80 @@ +#region -- License Terms -- +// MessagePack for CLI +// +// Copyright (C) 2015 FUJIWARA, Yusuke +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +#endregion + +using System; +using System.Diagnostics; +using Newtonsoft.Json; + +namespace MsgPack.Tools.Build +{ + /// + /// for structure. + /// + internal sealed class GlobJsonConverter : JsonConverter + { + public GlobJsonConverter() { } + + public override void WriteJson( JsonWriter writer, object value, JsonSerializer serializer ) + { + var target = ( Glob )value; + + writer.WriteStartObject(); + writer.WritePropertyName( "type" ); + writer.WriteValue( target.Type ); + writer.WritePropertyName( "path" ); + writer.WriteValue( target.Path ); + writer.WriteEndObject(); + } + + public override object ReadJson( JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer ) + { + Debug.Assert( reader.TokenType == JsonToken.StartObject ); + var path = default( string ); + var type = default( GlobType? ); + var lastDepth = reader.Depth; + + while ( reader.Read() && reader.Depth > lastDepth ) + { + Debug.Assert( reader.TokenType == JsonToken.PropertyName ); + switch ( reader.Value as string ) + { + case "path": + { + path = reader.ReadAsString(); + break; + } + case "type": + { + type = ( GlobType )Enum.Parse( typeof( GlobType ), reader.ReadAsString(), ignoreCase: true ); + break; + } + } + } + + if ( path == null || type == null ) + { + throw new JsonSerializationException( "Both of 'path' and 'type' are required." ); + } + + return new Glob( path, type.Value ); + } + + public override bool CanConvert( Type objectType ) + => objectType == typeof( Glob ); + } +} diff --git a/tools/SyncProjects2/MsgPack.Tools.Build.SyncProject/Tools/Build/GlobType.cs b/tools/SyncProjects2/MsgPack.Tools.Build.SyncProject/Tools/Build/GlobType.cs new file mode 100644 index 000000000..d7dd07387 --- /dev/null +++ b/tools/SyncProjects2/MsgPack.Tools.Build.SyncProject/Tools/Build/GlobType.cs @@ -0,0 +1,37 @@ +#region -- License Terms -- +// MessagePack for CLI +// +// Copyright (C) 2015 FUJIWARA, Yusuke +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +#endregion + + +namespace MsgPack.Tools.Build +{ + /// + /// Represents type of the . + /// + public enum GlobType + { + /// + /// Indicates inclusion of the matched items. + /// + Include = 0, + + /// + /// Indicates exclusion of the matched items from inclusions. + /// + Remove + } +} diff --git a/tools/SyncProjects2/MsgPack.Tools.Build.SyncProject/Tools/Build/ProjectSynchronizationDefinition.cs b/tools/SyncProjects2/MsgPack.Tools.Build.SyncProject/Tools/Build/ProjectSynchronizationDefinition.cs new file mode 100644 index 000000000..3bbe096ec --- /dev/null +++ b/tools/SyncProjects2/MsgPack.Tools.Build.SyncProject/Tools/Build/ProjectSynchronizationDefinition.cs @@ -0,0 +1,135 @@ +#region -- License Terms -- +// MessagePack for CLI +// +// Copyright (C) 2015 FUJIWARA, Yusuke +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +#endregion + +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using Newtonsoft.Json; + +namespace MsgPack.Tools.Build +{ + /// + /// Defines project synchronization inputs. + /// + public sealed class ProjectSynchronizationDefinition + { + /// + /// Gets or sets the name of the target project. + /// + /// + /// The name of the target project. This value will be updated to full path when . + /// + [JsonProperty( "name" )] + public string TargetProjectName { get; set; } + + /// + /// Gets or sets the name of the base definition. + /// + /// + /// The name of the base definition. + /// + [JsonProperty( "base" )] + public string BaseDefinitionName { get; set; } + + private readonly IList> _baseGlobs = new List>(); + + /// + /// Gets the globs. + /// + /// + /// The globs. This value will not be null. + /// + [JsonProperty( "globs" )] + public IList Globs { get; } = new List(); + + /// + /// Initializes a new instance of the class. + /// + public ProjectSynchronizationDefinition() { } + + /// + /// Creates new instances from specified JSON data. + /// + /// The reader for JSON text. + /// A collection of deserialized . + public static IEnumerable FromJson( TextReader reader ) + => new JsonSerializer().Deserialize( new JsonTextReader( reader ) ); + + /// + /// Resolves the project names to full path with specified informations. + /// + /// The base directory of resolution. + /// The project file extension including leading dot. If the leading dot is missing, dot should be prepended. + /// + /// If the original matches mulitiple project files, the result is undefined. + /// This method updates properties. + /// + public void ResolveProjectName( string baseDirectory, string projectExtension ) + { + var realProjectExtension = projectExtension; + if ( realProjectExtension.FirstOrDefault() != '.' ) + { + realProjectExtension = '.' + realProjectExtension; + } + + foreach ( var candidate in Directory.GetFiles( baseDirectory, "*" + realProjectExtension, SearchOption.AllDirectories ) ) + { + var projectName = Path.GetFileNameWithoutExtension( candidate ); + if ( projectName == this.TargetProjectName ) + { + this.TargetProjectName = candidate; + } + } + } + + /// + /// Gets resolved globs for base definition hiearchy. + /// + /// Resolved globs for base definition hiearchy. + public IEnumerable GetResolvedGlobs() + => this._baseGlobs.Reverse().SelectMany( x => x ).Concat( this.Globs ); + + /// + /// Resolves base definition hiearchy. + /// + /// A delegate to get base definition by its name. + /// is null. + public void ResolveBase( Func baseResolver ) + { + if ( baseResolver == null ) + { + throw new ArgumentNullException( nameof( baseResolver ) ); + } + + this._baseGlobs.Clear(); + + var baseName = this.BaseDefinitionName; + while ( !String.IsNullOrEmpty( baseName ) ) + { + var baseDefinition = baseResolver( baseName ); + if ( baseDefinition != null ) + { + this._baseGlobs.Add( baseDefinition.Globs ); + } + + baseName = baseDefinition?.BaseDefinitionName; + } + } + } +} diff --git a/tools/SyncProjects2/MsgPack.Tools.Build.SyncProject/Tools/Build/ProjectSynchronizer.cs b/tools/SyncProjects2/MsgPack.Tools.Build.SyncProject/Tools/Build/ProjectSynchronizer.cs new file mode 100644 index 000000000..afedcd0d9 --- /dev/null +++ b/tools/SyncProjects2/MsgPack.Tools.Build.SyncProject/Tools/Build/ProjectSynchronizer.cs @@ -0,0 +1,250 @@ +#region -- License Terms -- +// MessagePack for CLI +// +// Copyright (C) 2015 FUJIWARA, Yusuke +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +#endregion + +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Text; +using System.Xml.Linq; +using Microsoft.Build.Construction; +using Microsoft.Build.Evaluation; + +namespace MsgPack.Tools.Build +{ + /// + /// Implements project synchronization + /// + public sealed class ProjectSynchronizer + { + private const string Ns = "{http://schemas.microsoft.com/developer/msbuild/2003}"; + private static readonly XName ItemGroup = Ns + "ItemGroup"; + private static readonly XName Compile = Ns + "Compile"; + private static readonly XName Link = Ns + "Link"; + private static readonly XName DependentUpon = Ns + "DependentUpon"; + private static readonly XName AutoGen = Ns + "AutoGen"; + private static readonly XName DesignTime = Ns + "DesignTime"; + private static readonly XName Include = XName.Get( "Include" ); + + private static readonly Encoding Utf8BomEncoding = new UTF8Encoding( encoderShouldEmitUTF8Identifier: true ); + + private readonly Project _inMemory; + private readonly XDocument _projectXml; + private readonly ProjectItemGroupElement _targetItemGroup; + + /// + /// Initializes a new instance of the class. + /// + /// The project XML. + /// The project file path to solve pathes. + /// is null. + public ProjectSynchronizer( XDocument project, string projectPath ) + { + this._projectXml = project ?? throw new ArgumentNullException( nameof( project ) ); + this._inMemory = new Project { FullPath = projectPath }; + + this._targetItemGroup = this._inMemory.Xml.CreateItemGroupElement(); + this._inMemory.Xml.AppendChild( this._targetItemGroup ); + this._inMemory.ReevaluateIfNecessary(); + } + + /// + /// Evaluates the specified globs and updates project states. + /// + /// The globs. + public void Evaluate( IEnumerable globs ) + { + foreach ( var glob in globs ?? Enumerable.Empty() ) + { + switch ( glob.Type ) + { + case GlobType.Include: + { + var include = this._inMemory.Xml.CreateItemElement( Compile.LocalName, glob.Path ); + this._targetItemGroup.AppendChild( include ); + break; + } + case GlobType.Remove: + { + var remove = this._inMemory.Xml.CreateItemElement( Compile.LocalName ); + remove.Remove = glob.Path; + this._targetItemGroup.AppendChild( remove ); + break; + } + } + } + } + + /// + /// Saves this instance to original location. + /// + /// The target . + public void Save( TextWriter writer ) + { + this._inMemory.ReevaluateIfNecessary(); + + var itemGroup = default( XElement ); + var removings = new List(); + var dependentUpons = new Dictionary(); + var autoGens = new HashSet(); + foreach ( var compile in this._projectXml.Root.Elements( ItemGroup ).Elements( Compile ) ) + { + if ( itemGroup == null ) + { + itemGroup = compile.Parent; + } + + removings.Add( compile ); + var dependentUpon = compile.Element( DependentUpon ); + if ( dependentUpon != null ) + { + dependentUpons[ compile.Attribute( Include ).Value ] = dependentUpon.Value; + } + + var autoGen = compile.Element( AutoGen ); + if ( autoGen != null ) + { + autoGens.Add( compile.Attribute( Include ).Value ); + } + } + + foreach ( var removing in removings ) + { + removing.Remove(); + } + + if ( itemGroup == null ) + { + itemGroup = new XElement( ItemGroup ); + this._projectXml.Root.Add( itemGroup ); + } + + var projectDirectory = Path.GetDirectoryName( this._inMemory.FullPath ); + foreach ( var include in this._inMemory.GetItems( Compile.LocalName ).OrderBy( x => x.EvaluatedInclude ) ) + { + // For old msbuild systems, replace '/' with '\'. + var pathToItem = include.EvaluatedInclude.Replace( '/', '\\' ); + if ( include.EvaluatedInclude.StartsWith( ".." ) ) + { + itemGroup.Add( + new XElement( + Compile, + new XAttribute( Include, pathToItem ), + new XElement( + Link, + ToProjectRelativePath( pathToItem ) + ) + ) + ); + } + else + { + var compile = new XElement( Compile, new XAttribute( Include, pathToItem ) ); + if ( autoGens.Contains( pathToItem ) ) + { + compile.Add( + new XElement( AutoGen, "True" ), + new XElement( DesignTime, "True" ) + ); + } + + if ( dependentUpons.TryGetValue( pathToItem, out var dependentUpon ) ) + { + compile.Add( + new XElement( DependentUpon, dependentUpon ) + ); + } + + itemGroup.Add( compile ); + } + } + + this._projectXml.Save( writer ); + } + + private static string ToProjectRelativePath( string maybeRelativePath ) + { + if ( maybeRelativePath.EndsWith( "AssemblyInfo.cs" ) ) + { + return "Properties\\" + Path.GetFileName( maybeRelativePath ); + } + + var firstSeparator = maybeRelativePath.IndexOf( '\\' ); + var secondSeparator = maybeRelativePath.IndexOf( '\\', firstSeparator + 1 ); + if ( secondSeparator < 0 ) + { + return Path.GetFileName( maybeRelativePath ); + } + + return maybeRelativePath.Substring( secondSeparator + 1 ); + } + + /// + /// Loads the base globs from specified project file. + /// + /// The project. + /// Globs. This value will not be null. + /// is null. + public static IEnumerable LoadBaseGlobs( Project project ) + => ( project ?? throw new ArgumentNullException( nameof( project ) ) ) + .GetItems( Compile.LocalName ) + .Where( x => !String.IsNullOrEmpty( x.Xml.Remove ) && !String.IsNullOrEmpty( x.Xml.Include ) ) + .Select( x => + !String.IsNullOrEmpty( x.Xml.Remove ) + ? new Glob( x.Xml.Remove, GlobType.Remove ) + : new Glob( x.Xml.Include, GlobType.Include ) + ); + + /// + /// Do project synchronization with the specified definition. + /// + /// The definition. + /// Global properties. + /// is null. + public static void Synchronize( ProjectSynchronizationDefinition definition, IDictionary globalProperties ) + { + if ( definition == null ) + { + throw new ArgumentNullException( nameof( definition ) ); + } + + var baseProject = new Project(); + foreach ( var property in globalProperties ) + { + baseProject.SetGlobalProperty( property.Key, property.Value ); + } + + var baseGlobs = LoadBaseGlobs( baseProject ); + var synchronizer = + new ProjectSynchronizer( + XDocument.Load( definition.TargetProjectName, LoadOptions.SetBaseUri | LoadOptions.SetLineInfo ), + Path.GetFullPath( definition.TargetProjectName ) + ); + synchronizer.Evaluate( baseGlobs.Concat( definition.GetResolvedGlobs() ) ); + + using ( var stream = new MemoryStream() ) + using ( var writer = new StreamWriter( stream, Utf8BomEncoding ) ) + { + synchronizer.Save( writer ); + writer.Flush(); + + File.WriteAllBytes( definition.TargetProjectName, stream.ToArray() ); + } + } + } +} diff --git a/tools/SyncProjects2/SyncProjects2.sln b/tools/SyncProjects2/SyncProjects2.sln new file mode 100644 index 000000000..97b618d1f --- /dev/null +++ b/tools/SyncProjects2/SyncProjects2.sln @@ -0,0 +1,48 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.26430.16 +MinimumVisualStudioVersion = 15.0.26124.0 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MsgPack.Tools.Build.SyncProject", "MsgPack.Tools.Build.SyncProject\MsgPack.Tools.Build.SyncProject.csproj", "{2CD19747-0108-46C2-A0A3-6F7D3FE46BC2}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SyncProjects2", "SyncProjects2\SyncProjects2.csproj", "{34B439D3-459E-4041-B4A3-FFFF70A613E6}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {2CD19747-0108-46C2-A0A3-6F7D3FE46BC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2CD19747-0108-46C2-A0A3-6F7D3FE46BC2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2CD19747-0108-46C2-A0A3-6F7D3FE46BC2}.Debug|x64.ActiveCfg = Debug|Any CPU + {2CD19747-0108-46C2-A0A3-6F7D3FE46BC2}.Debug|x64.Build.0 = Debug|Any CPU + {2CD19747-0108-46C2-A0A3-6F7D3FE46BC2}.Debug|x86.ActiveCfg = Debug|Any CPU + {2CD19747-0108-46C2-A0A3-6F7D3FE46BC2}.Debug|x86.Build.0 = Debug|Any CPU + {2CD19747-0108-46C2-A0A3-6F7D3FE46BC2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2CD19747-0108-46C2-A0A3-6F7D3FE46BC2}.Release|Any CPU.Build.0 = Release|Any CPU + {2CD19747-0108-46C2-A0A3-6F7D3FE46BC2}.Release|x64.ActiveCfg = Release|Any CPU + {2CD19747-0108-46C2-A0A3-6F7D3FE46BC2}.Release|x64.Build.0 = Release|Any CPU + {2CD19747-0108-46C2-A0A3-6F7D3FE46BC2}.Release|x86.ActiveCfg = Release|Any CPU + {2CD19747-0108-46C2-A0A3-6F7D3FE46BC2}.Release|x86.Build.0 = Release|Any CPU + {34B439D3-459E-4041-B4A3-FFFF70A613E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {34B439D3-459E-4041-B4A3-FFFF70A613E6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {34B439D3-459E-4041-B4A3-FFFF70A613E6}.Debug|x64.ActiveCfg = Debug|Any CPU + {34B439D3-459E-4041-B4A3-FFFF70A613E6}.Debug|x64.Build.0 = Debug|Any CPU + {34B439D3-459E-4041-B4A3-FFFF70A613E6}.Debug|x86.ActiveCfg = Debug|Any CPU + {34B439D3-459E-4041-B4A3-FFFF70A613E6}.Debug|x86.Build.0 = Debug|Any CPU + {34B439D3-459E-4041-B4A3-FFFF70A613E6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {34B439D3-459E-4041-B4A3-FFFF70A613E6}.Release|Any CPU.Build.0 = Release|Any CPU + {34B439D3-459E-4041-B4A3-FFFF70A613E6}.Release|x64.ActiveCfg = Release|Any CPU + {34B439D3-459E-4041-B4A3-FFFF70A613E6}.Release|x64.Build.0 = Release|Any CPU + {34B439D3-459E-4041-B4A3-FFFF70A613E6}.Release|x86.ActiveCfg = Release|Any CPU + {34B439D3-459E-4041-B4A3-FFFF70A613E6}.Release|x86.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/tools/SyncProjects2/SyncProjects2/Program.cs b/tools/SyncProjects2/SyncProjects2/Program.cs new file mode 100644 index 000000000..481c97d3a --- /dev/null +++ b/tools/SyncProjects2/SyncProjects2/Program.cs @@ -0,0 +1,98 @@ +#region -- License Terms -- +// MessagePack for CLI +// +// Copyright (C) 2015 FUJIWARA, Yusuke +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +#endregion + +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using Mono.Options; +using MsgPack.Tools.Build; + +namespace SyncProject2 +{ + internal static class Program + { + private static int Main( string[] args ) + { + try + { + var file = "Sync.json"; + var sourceBasePath = "src" + Path.DirectorySeparatorChar; + var projectExtension = ".csproj"; + var msbuildExtensionsPath = Environment.ExpandEnvironmentVariables( @"%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Enterprise\MSBuild" ); + var help = false; + + var options = + new OptionSet + { + { "d|def=", "File path to synchronization definition. Default: Sync.xml", v => file = v }, + { "s|src=", "File path to base directory of source tree. Default: src" + Path.DirectorySeparatorChar, v => sourceBasePath = v }, + { "e|ext=", "Extension (including leading dot) of the project file. Default: .csproj", v => projectExtension = v }, + { "msbuild-ext-path=", "Specify MSBuild extensions path. Default is \\MSBuild.", v => msbuildExtensionsPath = v }, + { "h|?|help", "Show this help.", _ => help = true }, + }; + + options.Parse( args ); + if ( help ) + { + Console.Error.WriteLine( "SyncProjects" ); + Console.Error.WriteLine(); + Console.Error.WriteLine( "Usage: SyncProjects2 []" ); + Console.Error.WriteLine(); + Console.Error.WriteLine( "Options:" ); + options.WriteOptionDescriptions( Console.Out ); + return 1; + } + + SynchronizeProjects( file, sourceBasePath, projectExtension, msbuildExtensionsPath ); + + return 0; + } + catch ( Exception ex ) + { + Console.Error.WriteLine( ex ); + return ex.HResult; + } + } + + private static void SynchronizeProjects( string file, string sourceBasePath, string projectExtension, string msbuildExtensionsPath ) + { + var globalProperties = + new Dictionary + { + [ "MSBuildExtensionsPath" ] = msbuildExtensionsPath, + [ "EnableDefaultItems" ] = "true" + }; + + Dictionary definitions; + using ( var reader = File.OpenText( file ) ) + { + definitions = ProjectSynchronizationDefinition.FromJson( reader ).ToDictionary( x => x.TargetProjectName ); + } + + foreach ( var definition in definitions ) + { + definition.Value.ResolveProjectName( sourceBasePath, projectExtension ); + definition.Value.ResolveBase( key => definitions.TryGetValue( key, out var found ) ? found : null ); + + Console.Error.WriteLine( $"Process {definition.Value.TargetProjectName}" ); + ProjectSynchronizer.Synchronize( definition.Value, globalProperties ); + } + } + } +} \ No newline at end of file diff --git a/tools/SyncProjects2/SyncProjects2/SyncProjects2.csproj b/tools/SyncProjects2/SyncProjects2/SyncProjects2.csproj new file mode 100644 index 000000000..971586b3a --- /dev/null +++ b/tools/SyncProjects2/SyncProjects2/SyncProjects2.csproj @@ -0,0 +1,25 @@ + + + + Exe + netcoreapp1.0 + + + + bin\Release\netcoreapp1.0\ + + + + bin\Debug\netcoreapp1.0\ + + + + + + + + + + + + \ No newline at end of file