Skip to content

Commit b4736c9

Browse files
yfakariyayfakariya
authored
Merge pull request #294 from msgpack/fix/build-and-test-stability
Fix build and test stability
2 parents b61f597 + 1a3cf72 commit b4736c9

File tree

546 files changed

+11796
-40812
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

546 files changed

+11796
-40812
lines changed

‎.editorconfig‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,9 @@ csharp_space_around_binary_operators = true
6666
csharp_indent_braces = false
6767
csharp_indent_block_contents = true
6868
csharp_indent_switch_labels = true
69-
csharp_indent_case_contents = false
69+
csharp_indent_case_contents = true
70+
# See https://github.com/dotnet/roslyn/blob/d4dab355b96955aca5b4b0ebf6282575fad78ba8/src/Workspaces/CSharp/Portable/Formatting/CSharpFormattingOptions.cs
71+
csharp_indent_case_contents_when_block = false
7072
csharp_indent_labels = false
7173
csharp_preserve_single_line_blocks = true
7274
csharp_preserve_single_line_statements = true

‎CHANGES.txt‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -745,3 +745,10 @@ Release 1.0.0-rc1 2017-12-17
745745
* Fix MessagePackObject.UnderlyingType reports wrong type for ext types. Part of #269.
746746
This bug also caused misleading error message for incompatible type conversion.
747747
* Fix exceptions thrown by MessagePackObject.AsBinary()/AsString() reports internal type name. Part of #269.
748+
749+
Release 1.0.0
750+
751+
BUG FIXES
752+
* [NonSerialized] attribute does not effect in Mono based platform including Unity.
753+
* Fix map keys order emitted by asymmetric (serialization only) serializer are inconsistent across platform.
754+
* Fix Unity build does not honor serialization related attributes correctly.

‎MsgPack.Common.props‎

Lines changed: 51 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -36,61 +36,73 @@
3636
<CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
3737
<CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
3838
</PropertyGroup>
39-
<PropertyGroup Condition="'$(TargetFramework)' == 'MonoAndroid10' or '$(TargetFramework)' == 'Xamarin.iOS10'">
40-
<SignAssembly>false</SignAssembly>
39+
40+
<!-- Extra base properties for targets -->
41+
<PropertyGroup Condition="'$(TargetFramework)' == 'monoandroid10' or '$(TargetFramework)' == 'xamarin.ios10'">
42+
<DefineConstants>$(DefineConstants);__MOBILE__;AOT;XAMARIN</DefineConstants>
43+
<TargetFrameworkRootPath Condition="'$(VsInstallRoot)' != ''">$(VsInstallRoot)\Common7\IDE\ReferenceAssemblies\Microsoft\Framework\</TargetFrameworkRootPath>
44+
<ImplicitlyExpandDesignTimeFacades>true</ImplicitlyExpandDesignTimeFacades>
45+
<SignAssembly>true</SignAssembly>
46+
<IsXamarin>true</IsXamarin>
4147
</PropertyGroup>
42-
<PropertyGroup Condition="'$(OutputPath)' == '' and '$(TargetFramework)' == ''">
43-
<DocumentationFile>$(AssemblyName).XML</DocumentationFile>
48+
<PropertyGroup Condition="$(TargetFramework.StartsWith('net3')) or $(TargetFramework.StartsWith('net4'))">
49+
<IsNetFramework>true</IsNetFramework>
4450
</PropertyGroup>
45-
<PropertyGroup Condition="'$(OutputPath)' != '' or '$(TargetFramework)' != ''">
46-
<DocumentationFile>$(OutputPath)\$(TargetFramework)\$(AssemblyName).XML</DocumentationFile>
51+
<PropertyGroup Condition="'$(TargetFramework)' == 'monoandroid10'">
52+
<DefineConstants>$(DefineConstants);__ANDROID__</DefineConstants>
53+
<TargetFrameworkIdentifier>MonoAndroid</TargetFrameworkIdentifier>
54+
<TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
4755
</PropertyGroup>
48-
<PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0'">
49-
<DebugType>pdbonly</DebugType>
50-
<DefineConstants>$(DefineConstants);FEATURE_TAP;FEATURE_CONCURRENT</DefineConstants>
56+
<PropertyGroup Condition="'$(TargetFramework)' == 'xamarin.ios10'">
57+
<DefineConstants>$(DefineConstants);__IOS__</DefineConstants>
58+
<TargetFrameworkIdentifier>Xamarin.iOS</TargetFrameworkIdentifier>
59+
<TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
5160
</PropertyGroup>
52-
<PropertyGroup Condition="'$(TargetFramework)' == 'net35'">
53-
<DebugType>pdbonly</DebugType>
54-
<DefineConstants>$(DefineConstants);FEATURE_POINTER_CONVERSION</DefineConstants>
61+
<PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0'">
62+
<DefineConstants>$(DefineConstants);NETFX_CORE;WINDOWS_UWP;NETSTANDARD1_3;AOT</DefineConstants>
5563
</PropertyGroup>
56-
<PropertyGroup Condition="'$(TargetFramework)' == 'net45'">
57-
<DebugType>pdbonly</DebugType>
58-
<DefineConstants>$(DefineConstants);FEATURE_TAP;FEATURE_CONCURRENT;FEATURE_POINTER_CONVERSION</DefineConstants>
64+
65+
<!-- Document XML -->
66+
<PropertyGroup Condition="'$(OutputPath)' == '' and '$(TargetFramework)' == ''">
67+
<DocumentationFile>$(AssemblyName).XML</DocumentationFile>
5968
</PropertyGroup>
60-
<PropertyGroup Condition="'$(TargetFramework)' == 'net46'">
61-
<DebugType>pdbonly</DebugType>
62-
<DefineConstants>$(DefineConstants);FEATURE_TAP;FEATURE_CONCURRENT;FEATURE_POINTER_CONVERSION;FEATURE_MEMCOPY</DefineConstants>
69+
<PropertyGroup Condition="'$(OutputPath)' != '' or '$(TargetFramework)' != ''">
70+
<DocumentationFile>$(OutputPath)\$(TargetFramework)\$(AssemblyName).XML</DocumentationFile>
6371
</PropertyGroup>
64-
<PropertyGroup Condition="'$(TargetFramework)' == 'net47'">
72+
73+
<!-- Debug settings -->
74+
<PropertyGroup Condition="'$(IsNetFramework)' == 'true' or '$(TargetFramework)' == 'uap10.0'">
6575
<DebugType>pdbonly</DebugType>
66-
<DefineConstants>$(DefineConstants);FEATURE_TAP;FEATURE_CONCURRENT;FEATURE_POINTER_CONVERSION;FEATURE_MEMCOPY</DefineConstants>
6776
</PropertyGroup>
68-
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard1.1'">
69-
<DefineConstants>$(DefineConstants);FEATURE_TAP;FEATURE_CONCURRENT</DefineConstants>
77+
78+
<!-- Feature Flags -->
79+
<PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0' or $(TargetFramework.StartsWith('net4')) or $(TargetFramework.StartsWith('netcoreapp')) or $(TargetFramework.StartsWith('netstandard')) or '$(IsXamarin)' == 'true'">
80+
<DefineConstants>$(DefineConstants);FEATURE_TAP</DefineConstants>
81+
<FeatureTap>true</FeatureTap>
7082
</PropertyGroup>
71-
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard1.3' or '$(TargetFramework)' == 'netcoreapp1.0'">
72-
<DefineConstants>$(DefineConstants);FEATURE_TAP;FEATURE_CONCURRENT;FEATURE_MEMCOPY</DefineConstants>
83+
<PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0' or $(TargetFramework.StartsWith('net4')) or $(TargetFramework.StartsWith('netstandard')) or $(TargetFramework.StartsWith('netcoreapp')) or '$(IsXamarin)' == 'true'">
84+
<DefineConstants>$(DefineConstants);FEATURE_CONCURRENT</DefineConstants>
7385
</PropertyGroup>
74-
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netcoreapp2.0'">
75-
<DefineConstants>$(DefineConstants);FEATURE_TAP;FEATURE_CONCURRENT;FEATURE_POINTER_CONVERSION;FEATURE_MEMCOPY</DefineConstants>
86+
<PropertyGroup Condition="'$(IsNetFramework)' == 'true' or '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netcoreapp2.0' or '$(IsXamarin)' == 'true'">
87+
<DefineConstants>$(DefineConstants);FEATURE_POINTER_CONVERSION</DefineConstants>
7688
</PropertyGroup>
77-
<PropertyGroup Condition="'$(TargetFramework)' == 'MonoAndroid10' or '$(TargetFramework)' == 'Xamarin.iOS10'">
78-
<DefineConstants>$(DefineConstants);__MOBILE__;AOT;XAMARIN;FEATURE_TAP;FEATURE_CONCURRENT;FEATURE_POINTER_CONVERSION;FEATURE_MEMCOPY</DefineConstants>
89+
<PropertyGroup Condition="'$(IsNetFramework)' == 'true' or '$(TargetFramework)' == 'netstandard1.3' or '$(TargetFramework)' == 'netstandard2.0' or $(TargetFramework.StartsWith('netcoreapp'))">
90+
<DefineConstants>$(DefineConstants);FEATURE_EMIT</DefineConstants>
91+
<FeatureEmit>true</FeatureEmit>
7992
</PropertyGroup>
80-
<PropertyGroup Condition="'$(TargetFramework)' == 'MonoAndroid10'">
81-
<DefineConstants>$(DefineConstants);__ANDROID__</DefineConstants>
82-
<TargetFrameworkRootPath Condition="'$(VsInstallRoot)' != ''">$(VsInstallRoot)\Common7\IDE\ReferenceAssemblies\Microsoft\Framework\</TargetFrameworkRootPath>
83-
<ImplicitlyExpandDesignTimeFacades>true</ImplicitlyExpandDesignTimeFacades>
93+
<PropertyGroup Condition="'$(IsNetFramework)' == 'true' or '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netcoreapp2.0'">
94+
<DefineConstants>$(DefineConstants);FEATURE_CODEGEN</DefineConstants>
95+
<FeatureCodeGen>true</FeatureCodeGen>
8496
</PropertyGroup>
85-
<PropertyGroup Condition="'$(TargetFramework)' == 'Xamarin.iOS10'">
86-
<DefineConstants>$(DefineConstants);__IOS__</DefineConstants>
87-
<TargetFrameworkRootPath Condition="'$(VsInstallRoot)' != ''">$(VsInstallRoot)\Common7\IDE\ReferenceAssemblies\Microsoft\Framework\</TargetFrameworkRootPath>
88-
<ImplicitlyExpandDesignTimeFacades>true</ImplicitlyExpandDesignTimeFacades>
97+
<PropertyGroup Condition="'$(IsNetFramework)' == 'true'">
98+
<DefineConstants>$(DefineConstants);FEATURE_ASMGEN</DefineConstants>
99+
<FeatureAsmGen>true</FeatureAsmGen>
89100
</PropertyGroup>
90-
<PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0'">
91-
<DefineConstants>$(DefineConstants);NETFX_CORE;WINDOWS_UWP;NETSTANDARD1_3;AOT</DefineConstants>
101+
<PropertyGroup Condition="'$(TargetFramework)' == 'net46' or '$(TargetFramework)' == 'net47' or '$(TargetFramework)' == 'netstandard1.3' or '$(TargetFramework)' == 'netstandard2.0' or $(TargetFramework.StartsWith('netcoreapp')) or '$(IsXamarin)' == 'true'">
102+
<DefineConstants>$(DefineConstants);FEATURE_MEMCOPY</DefineConstants>
92103
</PropertyGroup>
104+
93105
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
94106
<DebugType>full</DebugType>
95107
</PropertyGroup>
96-
</Project>
108+
</Project>

0 commit comments

Comments
 (0)