Skip to content

Commit b23d82b

Browse files
yfakariyayfakariya
authored
Merge pull request #235 from msgpack/wip/vs2017
Migrate projects to VS2017 format as long as possible.
2 parents 8a9411f + 296144a commit b23d82b

File tree

56 files changed

+963
-17602
lines changed

Some content is hidden

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

56 files changed

+963
-17602
lines changed

‎.editorconfig‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,67 @@ tab_width = 4
2323
[*.{xml,csproj}]
2424
indent_style = space
2525
indent_size = 2
26+
27+
# From https://docs.microsoft.com/en-us/visualstudio/ide/editorconfig-code-style-settings-reference
28+
# and https://github.com/dotnet/roslyn/blob/master/src/Workspaces/CSharp/Portable/Formatting/CSharpFormattingOptions.cs
29+
[*.cs]
30+
dotnet_style_qualification_for_field = true:warning
31+
dotnet_style_qualification_for_property = true:warning
32+
dotnet_style_qualification_for_method = true:warning
33+
dotnet_style_qualification_for_event = true:warning
34+
dotnet_style_predefined_type_for_locals_parameters_members = true:warning
35+
dotnet_style_predefined_type_for_member_access = false:warning
36+
dotnet_style_object_initializer = true:suggestion
37+
dotnet_style_collection_initializer = true:suggestion
38+
dotnet_style_explicit_tuple_names = true:suggestion
39+
dotnet_style_coalesce_expression = true:warning
40+
csharp_style_var_for_built_in_types = true:suggestion
41+
csharp_style_var_when_type_is_apparent = true:suggestion
42+
csharp_style_var_elsewhere = true:suggestion
43+
dotnet_sort_system_directives_first = true
44+
csharp_space_between_method_declaration_name_and_open_parenthesis = false
45+
csharp_space_between_method_declaration_parameter_list_parentheses = true
46+
csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
47+
csharp_space_between_method_call_name_and_opening_parenthesis = false
48+
csharp_space_between_method_call_parameter_list_parentheses = true
49+
csharp_space_between_method_call_empty_parameter_list_parentheses = false
50+
csharp_space_between_parentheses = expressions,type_casts,control_flow_statements
51+
csharp_space_after_keywords_in_control_flow_statements = true
52+
csharp_space_after_cast = false
53+
csharp_space_around_declaration_statements = true
54+
csharp_space_before_open_square_brackets = false
55+
csharp_space_between_empty_square_brackets = false
56+
csharp_space_between_square_brackets = true
57+
csharp_space_after_colon_in_inheritance_clause = true
58+
csharp_space_after_comma = true
59+
csharp_space_after_dot = false
60+
csharp_space_after_semicolon_in_for_statement = true
61+
csharp_space_before_colon_in_inheritance_clause = true
62+
csharp_space_before_comma = false
63+
csharp_space_before_dot = false
64+
csharp_space_before_semicolon_in_for_statement = false
65+
csharp_space_around_binary_operators = true
66+
csharp_indent_braces = false
67+
csharp_indent_block_contents = true
68+
csharp_indent_switch_labels = true
69+
csharp_indent_case_contents = false
70+
csharp_indent_labels = false
71+
csharp_preserve_single_line_blocks = true
72+
csharp_preserve_single_line_statements = true
73+
csharp_new_line_before_open_brace = all
74+
csharp_new_line_between_query_expression_clauses = true
75+
76+
# Disabled for Unity compatibility until 2017.1 RTM
77+
[*.cs]
78+
dotnet_style_null_propagation = false:warning
79+
csharp_style_expression_bodied_methods = false:warning
80+
csharp_style_expression_bodied_constructors = false:warning
81+
csharp_style_expression_bodied_operators = false:warning
82+
csharp_style_expression_bodied_properties = false:warning
83+
csharp_style_expression_bodied_indexers = false:warning
84+
csharp_style_expression_bodied_accessors = false:warning
85+
csharp_style_pattern_matching_over_is_with_cast_check = false:warning
86+
csharp_style_pattern_matching_over_as_with_null_check = false:warning
87+
csharp_style_inlined_variable_declaration = false:warning
88+
csharp_style_throw_expression = false:warning
89+
csharp_style_conditional_delegate_call = false:warning

‎MsgPack.Windows.sln‎

Lines changed: 43 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".NET Standard", ".NET Stand
5050
EndProject
5151
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MsgPack.Uwp", "src\MsgPack.Uwp\MsgPack.Uwp.csproj", "{9D65A105-FB03-40DB-9185-8C695B8EE8D6}"
5252
EndProject
53-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetStandardProjectBuilder", "src\netstandard\build\NetStandardProjectBuilder.csproj", "{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}"
54-
EndProject
5553
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MsgPack.UnitTest.Uwp", "test\MsgPack.UnitTest.Uwp\MsgPack.UnitTest.Uwp.csproj", "{0F930636-458B-401F-9EAF-F4F05E93BCC9}"
5654
EndProject
5755
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MsgPack.UnitTest.Uwp.Aot", "test\MsgPack.UnitTest.Uwp.Aot\MsgPack.UnitTest.Uwp.Aot.csproj", "{E4CA9866-6234-49D4-8CDF-1F3A21EFD138}"
@@ -64,6 +62,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunitlite-sl-5.0", "test\NU
6462
EndProject
6563
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MsgPack.UnitTest.Silverlight.5.FullTrust", "test\MsgPack.UnitTest.Silverlight.5.FullTrust\MsgPack.UnitTest.Silverlight.5.FullTrust.csproj", "{26A3F930-FDAF-4886-9111-D326A6F68E82}"
6664
EndProject
65+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetStandardProjectBuilder", "src\netstandard\build\NetStandardProjectBuilder.csproj", "{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}"
66+
EndProject
6767
Global
6868
GlobalSection(SolutionConfigurationPlatforms) = preSolution
6969
CodeAnalysis|Any CPU = CodeAnalysis|Any CPU
@@ -390,44 +390,6 @@ Global
390390
{9D65A105-FB03-40DB-9185-8C695B8EE8D6}.Release|x64.Build.0 = Release|x64
391391
{9D65A105-FB03-40DB-9185-8C695B8EE8D6}.Release|x86.ActiveCfg = Release|x86
392392
{9D65A105-FB03-40DB-9185-8C695B8EE8D6}.Release|x86.Build.0 = Release|x86
393-
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.CodeAnalysis|Any CPU.ActiveCfg = Release|Any CPU
394-
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.CodeAnalysis|Any CPU.Build.0 = Release|Any CPU
395-
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.CodeAnalysis|ARM.ActiveCfg = Release|Any CPU
396-
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.CodeAnalysis|ARM.Build.0 = Release|Any CPU
397-
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.CodeAnalysis|Mixed Platforms.ActiveCfg = Release|Any CPU
398-
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.CodeAnalysis|x64.ActiveCfg = Release|Any CPU
399-
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.CodeAnalysis|x64.Build.0 = Release|Any CPU
400-
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.CodeAnalysis|x86.ActiveCfg = Release|Any CPU
401-
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.CodeAnalysis|x86.Build.0 = Release|Any CPU
402-
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
403-
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.Debug|Any CPU.Build.0 = Debug|Any CPU
404-
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.Debug|ARM.ActiveCfg = Debug|Any CPU
405-
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.Debug|ARM.Build.0 = Debug|Any CPU
406-
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
407-
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
408-
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.Debug|x64.ActiveCfg = Debug|Any CPU
409-
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.Debug|x64.Build.0 = Debug|Any CPU
410-
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.Debug|x86.ActiveCfg = Debug|Any CPU
411-
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.Debug|x86.Build.0 = Debug|Any CPU
412-
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.PerformanceTest|Any CPU.ActiveCfg = Release|Any CPU
413-
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.PerformanceTest|Any CPU.Build.0 = Release|Any CPU
414-
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.PerformanceTest|ARM.ActiveCfg = Release|Any CPU
415-
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.PerformanceTest|ARM.Build.0 = Release|Any CPU
416-
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.PerformanceTest|Mixed Platforms.ActiveCfg = Release|Any CPU
417-
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.PerformanceTest|Mixed Platforms.Build.0 = Release|Any CPU
418-
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.PerformanceTest|x64.ActiveCfg = Release|Any CPU
419-
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.PerformanceTest|x64.Build.0 = Release|Any CPU
420-
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.PerformanceTest|x86.ActiveCfg = Release|Any CPU
421-
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.PerformanceTest|x86.Build.0 = Release|Any CPU
422-
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.Release|Any CPU.ActiveCfg = Release|Any CPU
423-
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.Release|Any CPU.Build.0 = Release|Any CPU
424-
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.Release|ARM.ActiveCfg = Release|Any CPU
425-
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.Release|ARM.Build.0 = Release|Any CPU
426-
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
427-
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.Release|x64.ActiveCfg = Release|Any CPU
428-
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.Release|x64.Build.0 = Release|Any CPU
429-
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.Release|x86.ActiveCfg = Release|Any CPU
430-
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.Release|x86.Build.0 = Release|Any CPU
431393
{0F930636-458B-401F-9EAF-F4F05E93BCC9}.CodeAnalysis|Any CPU.ActiveCfg = Release|x64
432394
{0F930636-458B-401F-9EAF-F4F05E93BCC9}.CodeAnalysis|Any CPU.Build.0 = Release|x64
433395
{0F930636-458B-401F-9EAF-F4F05E93BCC9}.CodeAnalysis|Any CPU.Deploy.0 = Release|x64
@@ -688,6 +650,46 @@ Global
688650
{26A3F930-FDAF-4886-9111-D326A6F68E82}.Release|x64.Build.0 = Release|Any CPU
689651
{26A3F930-FDAF-4886-9111-D326A6F68E82}.Release|x86.ActiveCfg = Release|Any CPU
690652
{26A3F930-FDAF-4886-9111-D326A6F68E82}.Release|x86.Build.0 = Release|Any CPU
653+
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.CodeAnalysis|Any CPU.ActiveCfg = Release|Any CPU
654+
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.CodeAnalysis|Any CPU.Build.0 = Release|Any CPU
655+
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.CodeAnalysis|ARM.ActiveCfg = Release|Any CPU
656+
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.CodeAnalysis|ARM.Build.0 = Release|Any CPU
657+
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.CodeAnalysis|Mixed Platforms.ActiveCfg = Release|Any CPU
658+
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.CodeAnalysis|Mixed Platforms.Build.0 = Release|Any CPU
659+
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.CodeAnalysis|x64.ActiveCfg = Release|Any CPU
660+
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.CodeAnalysis|x64.Build.0 = Release|Any CPU
661+
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.CodeAnalysis|x86.ActiveCfg = Release|Any CPU
662+
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.CodeAnalysis|x86.Build.0 = Release|Any CPU
663+
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
664+
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.Debug|Any CPU.Build.0 = Debug|Any CPU
665+
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.Debug|ARM.ActiveCfg = Debug|Any CPU
666+
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.Debug|ARM.Build.0 = Debug|Any CPU
667+
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
668+
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
669+
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.Debug|x64.ActiveCfg = Debug|Any CPU
670+
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.Debug|x64.Build.0 = Debug|Any CPU
671+
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.Debug|x86.ActiveCfg = Debug|Any CPU
672+
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.Debug|x86.Build.0 = Debug|Any CPU
673+
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.PerformanceTest|Any CPU.ActiveCfg = Release|Any CPU
674+
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.PerformanceTest|Any CPU.Build.0 = Release|Any CPU
675+
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.PerformanceTest|ARM.ActiveCfg = Release|Any CPU
676+
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.PerformanceTest|ARM.Build.0 = Release|Any CPU
677+
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.PerformanceTest|Mixed Platforms.ActiveCfg = Release|Any CPU
678+
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.PerformanceTest|Mixed Platforms.Build.0 = Release|Any CPU
679+
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.PerformanceTest|x64.ActiveCfg = Release|Any CPU
680+
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.PerformanceTest|x64.Build.0 = Release|Any CPU
681+
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.PerformanceTest|x86.ActiveCfg = Release|Any CPU
682+
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.PerformanceTest|x86.Build.0 = Release|Any CPU
683+
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.Release|Any CPU.ActiveCfg = Release|Any CPU
684+
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.Release|Any CPU.Build.0 = Release|Any CPU
685+
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.Release|ARM.ActiveCfg = Release|Any CPU
686+
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.Release|ARM.Build.0 = Release|Any CPU
687+
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
688+
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.Release|Mixed Platforms.Build.0 = Release|Any CPU
689+
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.Release|x64.ActiveCfg = Release|Any CPU
690+
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.Release|x64.Build.0 = Release|Any CPU
691+
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.Release|x86.ActiveCfg = Release|Any CPU
692+
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09}.Release|x86.Build.0 = Release|Any CPU
691693
EndGlobalSection
692694
GlobalSection(SolutionProperties) = preSolution
693695
HideSolutionNode = FALSE
@@ -709,12 +711,12 @@ Global
709711
{09C98E72-44F7-4469-B82A-DFA3053652E6} = {87A17015-9338-431E-B338-57BDA03984C1}
710712
{BFCE0B36-F21B-4EB1-919E-C486E70C8BEA} = {1BD5D488-707E-4030-8AE8-80D93D04963F}
711713
{9D65A105-FB03-40DB-9185-8C695B8EE8D6} = {086116A9-EC42-45C1-B359-7AFB9A488556}
712-
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09} = {BFCE0B36-F21B-4EB1-919E-C486E70C8BEA}
713714
{0F930636-458B-401F-9EAF-F4F05E93BCC9} = {7D06945C-638C-4973-B0B6-D0D667FA318F}
714715
{E4CA9866-6234-49D4-8CDF-1F3A21EFD138} = {09C98E72-44F7-4469-B82A-DFA3053652E6}
715716
{17D0F223-E156-42CF-ACA8-815733FE094F} = {9600C37E-439F-43D7-9D12-3AB0BEF7D906}
716717
{3DEB15F9-E7DA-403F-B6D3-A8499310397F} = {9600C37E-439F-43D7-9D12-3AB0BEF7D906}
717718
{0A5F920A-1BF5-4DAC-B799-0C618B203797} = {9600C37E-439F-43D7-9D12-3AB0BEF7D906}
718719
{26A3F930-FDAF-4886-9111-D326A6F68E82} = {9600C37E-439F-43D7-9D12-3AB0BEF7D906}
720+
{A1B322FC-AA39-4894-AFA8-AB427A3FBA09} = {BFCE0B36-F21B-4EB1-919E-C486E70C8BEA}
719721
EndGlobalSection
720722
EndGlobal

0 commit comments

Comments
 (0)