##// END OF EJS Templates
Слияние
cin -
r235:b49969a7043c merge v2
parent child
Show More
@@ -29,12 +29,12 Global
29 Release|Any CPU = Release|Any CPU
29 Release|Any CPU = Release|Any CPU
30 EndGlobalSection
30 EndGlobalSection
31 GlobalSection(ProjectConfigurationPlatforms) = postSolution
31 GlobalSection(ProjectConfigurationPlatforms) = postSolution
32 {F550F1F8-8746-4AD0-9614-855F4C4B7F05}.Debug 4.5|Any CPU.ActiveCfg = Debug 4.5|Any CPU
32 {F550F1F8-8746-4AD0-9614-855F4C4B7F05}.Debug 4.5|Any CPU.ActiveCfg = Debug|Any CPU
33 {F550F1F8-8746-4AD0-9614-855F4C4B7F05}.Debug 4.5|Any CPU.Build.0 = Debug 4.5|Any CPU
33 {F550F1F8-8746-4AD0-9614-855F4C4B7F05}.Debug 4.5|Any CPU.Build.0 = Debug|Any CPU
34 {F550F1F8-8746-4AD0-9614-855F4C4B7F05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
34 {F550F1F8-8746-4AD0-9614-855F4C4B7F05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
35 {F550F1F8-8746-4AD0-9614-855F4C4B7F05}.Debug|Any CPU.Build.0 = Debug|Any CPU
35 {F550F1F8-8746-4AD0-9614-855F4C4B7F05}.Debug|Any CPU.Build.0 = Debug|Any CPU
36 {F550F1F8-8746-4AD0-9614-855F4C4B7F05}.Release 4.5|Any CPU.ActiveCfg = Release 4.5|Any CPU
36 {F550F1F8-8746-4AD0-9614-855F4C4B7F05}.Release 4.5|Any CPU.ActiveCfg = Release|Any CPU
37 {F550F1F8-8746-4AD0-9614-855F4C4B7F05}.Release 4.5|Any CPU.Build.0 = Release 4.5|Any CPU
37 {F550F1F8-8746-4AD0-9614-855F4C4B7F05}.Release 4.5|Any CPU.Build.0 = Release|Any CPU
38 {F550F1F8-8746-4AD0-9614-855F4C4B7F05}.Release|Any CPU.ActiveCfg = Release|Any CPU
38 {F550F1F8-8746-4AD0-9614-855F4C4B7F05}.Release|Any CPU.ActiveCfg = Release|Any CPU
39 {F550F1F8-8746-4AD0-9614-855F4C4B7F05}.Release|Any CPU.Build.0 = Release|Any CPU
39 {F550F1F8-8746-4AD0-9614-855F4C4B7F05}.Release|Any CPU.Build.0 = Release|Any CPU
40 {63F92C0C-61BF-48C0-A377-8D67C3C661D0}.Debug 4.5|Any CPU.ActiveCfg = Debug 4.5|Any CPU
40 {63F92C0C-61BF-48C0-A377-8D67C3C661D0}.Debug 4.5|Any CPU.ActiveCfg = Debug 4.5|Any CPU
@@ -65,188 +65,6 Global
65 GlobalSection(SolutionProperties) = preSolution
65 GlobalSection(SolutionProperties) = preSolution
66 HideSolutionNode = FALSE
66 HideSolutionNode = FALSE
67 EndGlobalSection
67 EndGlobalSection
68 GlobalSection(MonoDevelopProperties) = preSolution
69 StartupItem = Implab\Implab.csproj
70 Policies = $0
71 $0.CSharpFormattingPolicy = $1
72 $1.IndentSwitchBody = True
73 $1.NamespaceBraceStyle = EndOfLine
74 $1.ClassBraceStyle = EndOfLine
75 $1.InterfaceBraceStyle = EndOfLine
76 $1.StructBraceStyle = EndOfLine
77 $1.EnumBraceStyle = EndOfLine
78 $1.MethodBraceStyle = EndOfLine
79 $1.ConstructorBraceStyle = EndOfLine
80 $1.DestructorBraceStyle = EndOfLine
81 $1.BeforeMethodDeclarationParentheses = False
82 $1.BeforeMethodCallParentheses = False
83 $1.BeforeConstructorDeclarationParentheses = False
84 $1.NewLineBeforeConstructorInitializerColon = NewLine
85 $1.NewLineAfterConstructorInitializerColon = SameLine
86 $1.BeforeIndexerDeclarationBracket = False
87 $1.BeforeDelegateDeclarationParentheses = False
88 $1.NewParentheses = False
89 $1.SpacesBeforeBrackets = False
90 $1.inheritsSet = Mono
91 $1.inheritsScope = text/x-csharp
92 $1.scope = text/x-csharp
93 $0.TextStylePolicy = $6
94 $2.FileWidth = 120
95 $2.EolMarker = Unix
96 $2.inheritsSet = VisualStudio
97 $2.inheritsScope = text/plain
98 $2.scope = text/x-csharp
99 $0.DotNetNamingPolicy = $3
100 $3.DirectoryNamespaceAssociation = PrefixedHierarchical
101 $3.ResourceNamePolicy = MSBuild
102 $4.FileWidth = 120
103 $4.TabsToSpaces = False
104 $4.inheritsSet = VisualStudio
105 $4.inheritsScope = text/plain
106 $4.scope = application/xml
107 $0.XmlFormattingPolicy = $5
108 $5.inheritsSet = Mono
109 $5.inheritsScope = application/xml
110 $5.scope = application/xml
111 $6.FileWidth = 120
112 $6.TabsToSpaces = False
113 $6.inheritsSet = VisualStudio
114 $6.inheritsScope = text/plain
115 $6.scope = text/plain
116 $0.NameConventionPolicy = $7
117 $7.Rules = $8
118 $8.NamingRule = $34
119 $9.Name = Namespaces
120 $9.AffectedEntity = Namespace
121 $9.VisibilityMask = VisibilityMask
122 $9.NamingStyle = PascalCase
123 $9.IncludeInstanceMembers = True
124 $9.IncludeStaticEntities = True
125 $10.Name = Types
126 $10.AffectedEntity = Class, Struct, Enum, Delegate
127 $10.VisibilityMask = VisibilityMask
128 $10.NamingStyle = PascalCase
129 $10.IncludeInstanceMembers = True
130 $10.IncludeStaticEntities = True
131 $11.Name = Interfaces
132 $11.RequiredPrefixes = $12
133 $12.String = I
134 $11.AffectedEntity = Interface
135 $11.VisibilityMask = VisibilityMask
136 $11.NamingStyle = PascalCase
137 $11.IncludeInstanceMembers = True
138 $11.IncludeStaticEntities = True
139 $13.Name = Attributes
140 $13.RequiredSuffixes = $14
141 $14.String = Attribute
142 $13.AffectedEntity = CustomAttributes
143 $13.VisibilityMask = VisibilityMask
144 $13.NamingStyle = PascalCase
145 $13.IncludeInstanceMembers = True
146 $13.IncludeStaticEntities = True
147 $15.Name = Event Arguments
148 $15.RequiredSuffixes = $16
149 $16.String = EventArgs
150 $15.AffectedEntity = CustomEventArgs
151 $15.VisibilityMask = VisibilityMask
152 $15.NamingStyle = PascalCase
153 $15.IncludeInstanceMembers = True
154 $15.IncludeStaticEntities = True
155 $17.Name = Exceptions
156 $17.RequiredSuffixes = $18
157 $18.String = Exception
158 $17.AffectedEntity = CustomExceptions
159 $17.VisibilityMask = VisibilityMask
160 $17.NamingStyle = PascalCase
161 $17.IncludeInstanceMembers = True
162 $17.IncludeStaticEntities = True
163 $19.Name = Methods
164 $19.AffectedEntity = Methods
165 $19.VisibilityMask = VisibilityMask
166 $19.NamingStyle = PascalCase
167 $19.IncludeInstanceMembers = True
168 $19.IncludeStaticEntities = True
169 $20.Name = Static Readonly Fields
170 $20.AffectedEntity = ReadonlyField
171 $20.VisibilityMask = Internal, Protected, Public
172 $20.NamingStyle = CamelCase
173 $20.IncludeInstanceMembers = False
174 $20.IncludeStaticEntities = True
175 $21.Name = Fields (Non Private)
176 $21.AffectedEntity = Field
177 $21.VisibilityMask = Internal, Public
178 $21.NamingStyle = CamelCase
179 $21.IncludeInstanceMembers = True
180 $21.IncludeStaticEntities = True
181 $22.Name = ReadOnly Fields (Non Private)
182 $22.AffectedEntity = ReadonlyField
183 $22.VisibilityMask = Internal, Public
184 $22.NamingStyle = CamelCase
185 $22.IncludeInstanceMembers = True
186 $22.IncludeStaticEntities = False
187 $23.Name = Fields (Private)
188 $23.RequiredPrefixes = $24
189 $24.String = m_
190 $23.AffectedEntity = Field, ReadonlyField
191 $23.VisibilityMask = Private, Protected
192 $23.NamingStyle = CamelCase
193 $23.IncludeInstanceMembers = True
194 $23.IncludeStaticEntities = False
195 $25.Name = Static Fields (Private)
196 $25.RequiredPrefixes = $26
197 $26.String = _
198 $25.AffectedEntity = Field
199 $25.VisibilityMask = Private
200 $25.NamingStyle = CamelCase
201 $25.IncludeInstanceMembers = False
202 $25.IncludeStaticEntities = True
203 $27.Name = ReadOnly Fields (Private)
204 $27.RequiredPrefixes = $28
205 $28.String = m_
206 $27.AffectedEntity = ReadonlyField
207 $27.VisibilityMask = Private, Protected
208 $27.NamingStyle = CamelCase
209 $27.IncludeInstanceMembers = True
210 $27.IncludeStaticEntities = False
211 $29.Name = Constant Fields
212 $29.AffectedEntity = ConstantField
213 $29.VisibilityMask = VisibilityMask
214 $29.NamingStyle = AllUpper
215 $29.IncludeInstanceMembers = True
216 $29.IncludeStaticEntities = True
217 $30.Name = Properties
218 $30.AffectedEntity = Property
219 $30.VisibilityMask = VisibilityMask
220 $30.NamingStyle = PascalCase
221 $30.IncludeInstanceMembers = True
222 $30.IncludeStaticEntities = True
223 $31.Name = Events
224 $31.AffectedEntity = Event
225 $31.VisibilityMask = VisibilityMask
226 $31.NamingStyle = PascalCase
227 $31.IncludeInstanceMembers = True
228 $31.IncludeStaticEntities = True
229 $32.Name = Enum Members
230 $32.AffectedEntity = EnumMember
231 $32.VisibilityMask = VisibilityMask
232 $32.NamingStyle = PascalCase
233 $32.IncludeInstanceMembers = True
234 $32.IncludeStaticEntities = True
235 $33.Name = Parameters
236 $33.AffectedEntity = Parameter, LocalVariable
237 $33.VisibilityMask = VisibilityMask
238 $33.NamingStyle = CamelCase
239 $33.IncludeInstanceMembers = True
240 $33.IncludeStaticEntities = True
241 $34.Name = Type Parameters
242 $34.RequiredPrefixes = $35
243 $35.String = T
244 $34.AffectedEntity = TypeParameter
245 $34.VisibilityMask = VisibilityMask
246 $34.NamingStyle = PascalCase
247 $34.IncludeInstanceMembers = True
248 $34.IncludeStaticEntities = True
249 EndGlobalSection
250 GlobalSection(TestCaseManagementSettings) = postSolution
68 GlobalSection(TestCaseManagementSettings) = postSolution
251 CategoryFile = Implab.vsmdi
69 CategoryFile = Implab.vsmdi
252 EndGlobalSection
70 EndGlobalSection
1 NO CONTENT: file renamed from Implab/Formats/JSON/JsonElementContext.cs to Implab/Formats/Json/JsonElementContext.cs
NO CONTENT: file renamed from Implab/Formats/JSON/JsonElementContext.cs to Implab/Formats/Json/JsonElementContext.cs
1 NO CONTENT: file renamed from Implab/Formats/JSON/JsonElementType.cs to Implab/Formats/Json/JsonElementType.cs
NO CONTENT: file renamed from Implab/Formats/JSON/JsonElementType.cs to Implab/Formats/Json/JsonElementType.cs
1 NO CONTENT: file renamed from Implab/Formats/JSON/JsonGrammar.cs to Implab/Formats/Json/JsonGrammar.cs
NO CONTENT: file renamed from Implab/Formats/JSON/JsonGrammar.cs to Implab/Formats/Json/JsonGrammar.cs
1 NO CONTENT: file renamed from Implab/Formats/JSON/JsonReader.cs to Implab/Formats/Json/JsonReader.cs
NO CONTENT: file renamed from Implab/Formats/JSON/JsonReader.cs to Implab/Formats/Json/JsonReader.cs
1 NO CONTENT: file renamed from Implab/Formats/JSON/JsonScanner.cs to Implab/Formats/Json/JsonScanner.cs
NO CONTENT: file renamed from Implab/Formats/JSON/JsonScanner.cs to Implab/Formats/Json/JsonScanner.cs
1 NO CONTENT: file renamed from Implab/Formats/JSON/JsonStringScanner.cs to Implab/Formats/Json/JsonStringScanner.cs
NO CONTENT: file renamed from Implab/Formats/JSON/JsonStringScanner.cs to Implab/Formats/Json/JsonStringScanner.cs
1 NO CONTENT: file renamed from Implab/Formats/JSON/JsonTextScanner.cs to Implab/Formats/Json/JsonTextScanner.cs
NO CONTENT: file renamed from Implab/Formats/JSON/JsonTextScanner.cs to Implab/Formats/Json/JsonTextScanner.cs
1 NO CONTENT: file renamed from Implab/Formats/JSON/JsonTokenType.cs to Implab/Formats/Json/JsonTokenType.cs
NO CONTENT: file renamed from Implab/Formats/JSON/JsonTokenType.cs to Implab/Formats/Json/JsonTokenType.cs
1 NO CONTENT: file renamed from Implab/Formats/JSON/JsonWriter.cs to Implab/Formats/Json/JsonWriter.cs
NO CONTENT: file renamed from Implab/Formats/JSON/JsonWriter.cs to Implab/Formats/Json/JsonWriter.cs
1 NO CONTENT: file renamed from Implab/Formats/JSON/StringTranslator.cs to Implab/Formats/Json/StringTranslator.cs
NO CONTENT: file renamed from Implab/Formats/JSON/StringTranslator.cs to Implab/Formats/Json/StringTranslator.cs
@@ -15,7 +15,7
15 <DebugType>full</DebugType>
15 <DebugType>full</DebugType>
16 <Optimize>false</Optimize>
16 <Optimize>false</Optimize>
17 <OutputPath>bin\Debug</OutputPath>
17 <OutputPath>bin\Debug</OutputPath>
18 <DefineConstants>TRACE;DEBUG;</DefineConstants>
18 <DefineConstants>TRACE;DEBUG;NET_4_5</DefineConstants>
19 <ErrorReport>prompt</ErrorReport>
19 <ErrorReport>prompt</ErrorReport>
20 <WarningLevel>4</WarningLevel>
20 <WarningLevel>4</WarningLevel>
21 <ConsolePause>false</ConsolePause>
21 <ConsolePause>false</ConsolePause>
@@ -25,44 +25,7
25 <DebugType>full</DebugType>
25 <DebugType>full</DebugType>
26 <Optimize>true</Optimize>
26 <Optimize>true</Optimize>
27 <OutputPath>bin\Release</OutputPath>
27 <OutputPath>bin\Release</OutputPath>
28 <ErrorReport>prompt</ErrorReport>
29 <WarningLevel>4</WarningLevel>
30 <ConsolePause>false</ConsolePause>
31 </PropertyGroup>
32 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug 4.5|AnyCPU' ">
33 <DebugSymbols>true</DebugSymbols>
34 <DebugType>full</DebugType>
35 <Optimize>false</Optimize>
36 <OutputPath>bin\Debug</OutputPath>
37 <DefineConstants>TRACE;DEBUG;NET_4_5</DefineConstants>
38 <ErrorReport>prompt</ErrorReport>
39 <WarningLevel>4</WarningLevel>
40 <RunCodeAnalysis>true</RunCodeAnalysis>
41 <ConsolePause>false</ConsolePause>
42 </PropertyGroup>
43 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release 4.5|AnyCPU' ">
44 <Optimize>true</Optimize>
45 <OutputPath>bin\Release</OutputPath>
46 <ErrorReport>prompt</ErrorReport>
47 <WarningLevel>4</WarningLevel>
48 <ConsolePause>false</ConsolePause>
49 <DefineConstants>NET_4_5</DefineConstants>
28 <DefineConstants>NET_4_5</DefineConstants>
50 </PropertyGroup>
51 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugMono|AnyCPU' ">
52 <DebugSymbols>true</DebugSymbols>
53 <DebugType>full</DebugType>
54 <Optimize>false</Optimize>
55 <OutputPath>bin\Debug</OutputPath>
56 <DefineConstants>TRACE;DEBUG;NET_4_5;MONO</DefineConstants>
57 <ErrorReport>prompt</ErrorReport>
58 <WarningLevel>4</WarningLevel>
59 <RunCodeAnalysis>true</RunCodeAnalysis>
60 <ConsolePause>false</ConsolePause>
61 </PropertyGroup>
62 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseMono|AnyCPU' ">
63 <Optimize>true</Optimize>
64 <OutputPath>bin\Release</OutputPath>
65 <DefineConstants>NET_4_5;MONO;</DefineConstants>
66 <ErrorReport>prompt</ErrorReport>
29 <ErrorReport>prompt</ErrorReport>
67 <WarningLevel>4</WarningLevel>
30 <WarningLevel>4</WarningLevel>
68 <ConsolePause>false</ConsolePause>
31 <ConsolePause>false</ConsolePause>
@@ -219,77 +182,6
219 </None>
182 </None>
220 <None Include="implab.snk" />
183 <None Include="implab.snk" />
221 </ItemGroup>
184 </ItemGroup>
222 <ProjectExtensions>
223 <MonoDevelop>
224 <Properties>
225 <Policies>
226 <CSharpFormattingPolicy IndentBlock="True" IndentBraces="False" IndentSwitchSection="False" IndentSwitchCaseSection="True" LabelPositioning="OneLess" NewLinesForBracesInProperties="False" NewLinesForBracesInAccessors="False" NewLinesForBracesInAnonymousMethods="False" NewLinesForBracesInControlBlocks="False" NewLinesForBracesInAnonymousTypes="False" NewLinesForBracesInObjectCollectionArrayInitializers="False" NewLinesForBracesInLambdaExpressionBody="False" NewLineForElse="False" NewLineForCatch="False" NewLineForFinally="False" NewLineForMembersInObjectInit="False" NewLineForMembersInAnonymousTypes="False" NewLineForClausesInQuery="False" SpaceWithinMethodDeclarationParenthesis="False" SpaceBetweenEmptyMethodDeclarationParentheses="False" SpaceWithinMethodCallParentheses="False" SpaceBetweenEmptyMethodCallParentheses="False" SpaceAfterControlFlowStatementKeyword="True" SpaceWithinExpressionParentheses="False" SpaceWithinCastParentheses="False" SpaceWithinOtherParentheses="False" SpaceAfterCast="False" SpacesIgnoreAroundVariableDeclaration="False" SpaceBetweenEmptySquareBrackets="False" SpaceWithinSquareBrackets="False" SpaceAfterColonInBaseTypeDeclaration="True" SpaceAfterComma="True" SpaceAfterDot="False" SpaceAfterSemicolonsInForStatement="True" SpaceBeforeComma="False" SpaceBeforeDot="False" SpaceBeforeSemicolonsInForStatement="False" SpacingAroundBinaryOperator="Single" WrappingPreserveSingleLine="True" WrappingKeepStatementsOnSingleLine="True" PlaceSystemDirectiveFirst="True" NewLinesForBracesInTypes="True" NewLinesForBracesInMethods="True" SpacingAfterMethodDeclarationName="True" SpaceAfterMethodCallName="True" SpaceBeforeOpenSquareBracket="True" SpaceBeforeColonInBaseTypeDeclaration="True" scope="text/x-csharp" />
227 <TextStylePolicy FileWidth="120" TabWidth="4" IndentWidth="4" RemoveTrailingWhitespace="True" NoTabsAfterNonTabs="False" TabsToSpaces="True" EolMarker="Unix" scope="text/x-csharp" />
228 <DotNetNamingPolicy DirectoryNamespaceAssociation="PrefixedHierarchical" ResourceNamePolicy="MSBuild" />
229 <TextStylePolicy FileWidth="120" TabWidth="4" TabsToSpaces="False" IndentWidth="4" RemoveTrailingWhitespace="True" NoTabsAfterNonTabs="False" EolMarker="Native" scope="application/xml" />
230 <XmlFormattingPolicy scope="application/xml">
231 <DefaultFormat OmitXmlDeclaration="False" NewLineChars="&#xA;" IndentContent="True" ContentIndentString=" " AttributesInNewLine="False" MaxAttributesPerLine="10" AttributesIndentString=" " WrapAttributes="False" AlignAttributes="False" AlignAttributeValues="False" QuoteChar="&quot;" SpacesBeforeAssignment="0" SpacesAfterAssignment="0" EmptyLinesBeforeStart="0" EmptyLinesAfterStart="0" EmptyLinesBeforeEnd="0" EmptyLinesAfterEnd="0" />
232 </XmlFormattingPolicy>
233 <TextStylePolicy FileWidth="120" TabWidth="4" TabsToSpaces="False" IndentWidth="4" RemoveTrailingWhitespace="True" NoTabsAfterNonTabs="False" EolMarker="Native" scope="text/plain" />
234 <NameConventionPolicy>
235 <Rules>
236 <NamingRule Name="Namespaces" AffectedEntity="Namespace" VisibilityMask="VisibilityMask" NamingStyle="PascalCase" IncludeInstanceMembers="True" IncludeStaticEntities="True" />
237 <NamingRule Name="Types" AffectedEntity="Class, Struct, Enum, Delegate" VisibilityMask="VisibilityMask" NamingStyle="PascalCase" IncludeInstanceMembers="True" IncludeStaticEntities="True" />
238 <NamingRule Name="Interfaces" AffectedEntity="Interface" VisibilityMask="VisibilityMask" NamingStyle="PascalCase" IncludeInstanceMembers="True" IncludeStaticEntities="True">
239 <RequiredPrefixes>
240 <String>I</String>
241 </RequiredPrefixes>
242 </NamingRule>
243 <NamingRule Name="Attributes" AffectedEntity="CustomAttributes" VisibilityMask="VisibilityMask" NamingStyle="PascalCase" IncludeInstanceMembers="True" IncludeStaticEntities="True">
244 <RequiredSuffixes>
245 <String>Attribute</String>
246 </RequiredSuffixes>
247 </NamingRule>
248 <NamingRule Name="Event Arguments" AffectedEntity="CustomEventArgs" VisibilityMask="VisibilityMask" NamingStyle="PascalCase" IncludeInstanceMembers="True" IncludeStaticEntities="True">
249 <RequiredSuffixes>
250 <String>EventArgs</String>
251 </RequiredSuffixes>
252 </NamingRule>
253 <NamingRule Name="Exceptions" AffectedEntity="CustomExceptions" VisibilityMask="VisibilityMask" NamingStyle="PascalCase" IncludeInstanceMembers="True" IncludeStaticEntities="True">
254 <RequiredSuffixes>
255 <String>Exception</String>
256 </RequiredSuffixes>
257 </NamingRule>
258 <NamingRule Name="Methods" AffectedEntity="Methods" VisibilityMask="VisibilityMask" NamingStyle="PascalCase" IncludeInstanceMembers="True" IncludeStaticEntities="True" />
259 <NamingRule Name="Static Readonly Fields" AffectedEntity="ReadonlyField" VisibilityMask="Internal, Protected, Public" NamingStyle="CamelCase" IncludeInstanceMembers="False" IncludeStaticEntities="True" />
260 <NamingRule Name="Fields (Non Private)" AffectedEntity="Field" VisibilityMask="Internal, Public" NamingStyle="CamelCase" IncludeInstanceMembers="True" IncludeStaticEntities="True" />
261 <NamingRule Name="ReadOnly Fields (Non Private)" AffectedEntity="ReadonlyField" VisibilityMask="Internal, Public" NamingStyle="CamelCase" IncludeInstanceMembers="True" IncludeStaticEntities="False" />
262 <NamingRule Name="Fields (Private)" AffectedEntity="Field, ReadonlyField" VisibilityMask="Private, Protected" NamingStyle="CamelCase" IncludeInstanceMembers="True" IncludeStaticEntities="False">
263 <RequiredPrefixes>
264 <String>m_</String>
265 </RequiredPrefixes>
266 </NamingRule>
267 <NamingRule Name="Static Fields (Private)" AffectedEntity="Field" VisibilityMask="Private" NamingStyle="CamelCase" IncludeInstanceMembers="False" IncludeStaticEntities="True">
268 <RequiredPrefixes>
269 <String>_</String>
270 </RequiredPrefixes>
271 </NamingRule>
272 <NamingRule Name="ReadOnly Fields (Private)" AffectedEntity="ReadonlyField" VisibilityMask="Private, Protected" NamingStyle="CamelCase" IncludeInstanceMembers="True" IncludeStaticEntities="False">
273 <RequiredPrefixes>
274 <String>m_</String>
275 </RequiredPrefixes>
276 </NamingRule>
277 <NamingRule Name="Constant Fields" AffectedEntity="ConstantField" VisibilityMask="VisibilityMask" NamingStyle="AllUpper" IncludeInstanceMembers="True" IncludeStaticEntities="True" />
278 <NamingRule Name="Properties" AffectedEntity="Property" VisibilityMask="VisibilityMask" NamingStyle="PascalCase" IncludeInstanceMembers="True" IncludeStaticEntities="True" />
279 <NamingRule Name="Events" AffectedEntity="Event" VisibilityMask="VisibilityMask" NamingStyle="PascalCase" IncludeInstanceMembers="True" IncludeStaticEntities="True" />
280 <NamingRule Name="Enum Members" AffectedEntity="EnumMember" VisibilityMask="VisibilityMask" NamingStyle="PascalCase" IncludeInstanceMembers="True" IncludeStaticEntities="True" />
281 <NamingRule Name="Parameters" AffectedEntity="Parameter, LocalVariable" VisibilityMask="VisibilityMask" NamingStyle="CamelCase" IncludeInstanceMembers="True" IncludeStaticEntities="True" />
282 <NamingRule Name="Type Parameters" AffectedEntity="TypeParameter" VisibilityMask="VisibilityMask" NamingStyle="PascalCase" IncludeInstanceMembers="True" IncludeStaticEntities="True">
283 <RequiredPrefixes>
284 <String>T</String>
285 </RequiredPrefixes>
286 </NamingRule>
287 </Rules>
288 </NameConventionPolicy>
289 </Policies>
290 </Properties>
291 </MonoDevelop>
292 </ProjectExtensions>
293 <ItemGroup>
185 <ItemGroup>
294 <Content Include="license.txt" />
186 <Content Include="license.txt" />
295 </ItemGroup>
187 </ItemGroup>
@@ -1,5 +1,6
1 using System;
1 using System;
2 using System.Collections.Generic;
2 using System.Collections.Generic;
3 using System.IO;
3 using System.Linq;
4 using System.Linq;
4 using System.Text;
5 using System.Text;
5 using System.Threading.Tasks;
6 using System.Threading.Tasks;
@@ -32,6 +33,11 namespace Implab.Xml {
32 return doc;
33 return doc;
33 }
34 }
34
35
36 public static void SerializeToFile<T>(string file, T obj) {
37 using (var writer = File.CreateText(file))
38 SerializersPool<T>.Instance.Serialize(writer, obj);
39 }
40
35 public static T DeserializeFromString<T>(string data) {
41 public static T DeserializeFromString<T>(string data) {
36 return SerializersPool<T>.Instance.DeserializeFromString(data);
42 return SerializersPool<T>.Instance.DeserializeFromString(data);
37 }
43 }
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
General Comments 3
Under Review
author

Auto status change to "Under Review"

Approved
author

ok, latest stable version should be in default

You need to be logged in to leave comments. Login now