##// END OF EJS Templates
Слияние
cin -
r235:b49969a7043c merge v2
parent child
Show More
@@ -1,253 +1,71
1 1 
2 2 Microsoft Visual Studio Solution File, Format Version 12.00
3 3 # Visual Studio 14
4 4 VisualStudioVersion = 14.0.25420.1
5 5 MinimumVisualStudioVersion = 10.0.40219.1
6 6 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Implab", "Implab\Implab.csproj", "{F550F1F8-8746-4AD0-9614-855F4C4B7F05}"
7 7 EndProject
8 8 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{CE8D8D18-437A-445C-B662-4C2CE79A76F6}"
9 9 ProjectSection(SolutionItems) = preProject
10 10 Implab.vsmdi = Implab.vsmdi
11 11 Local.testsettings = Local.testsettings
12 12 TraceAndTestImpact.testsettings = TraceAndTestImpact.testsettings
13 13 EndProjectSection
14 14 EndProject
15 15 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Implab.Test", "Implab.Test\Implab.Test.csproj", "{63F92C0C-61BF-48C0-A377-8D67C3C661D0}"
16 16 EndProject
17 17 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Implab.Format.Test", "Implab.Format.Test\Implab.Format.Test.csproj", "{4D364996-7ECD-4193-8F90-F223FFEA49DA}"
18 18 EndProject
19 19 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Implab.Playground", "Implab.Playground\Implab.Playground.csproj", "{100DFEB0-75BE-436F-ADDF-1F46EF433F46}"
20 20 EndProject
21 21 Global
22 22 GlobalSection(Performance) = preSolution
23 23 HasPerformanceSessions = true
24 24 EndGlobalSection
25 25 GlobalSection(SolutionConfigurationPlatforms) = preSolution
26 26 Debug 4.5|Any CPU = Debug 4.5|Any CPU
27 27 Debug|Any CPU = Debug|Any CPU
28 28 Release 4.5|Any CPU = Release 4.5|Any CPU
29 29 Release|Any CPU = Release|Any CPU
30 30 EndGlobalSection
31 31 GlobalSection(ProjectConfigurationPlatforms) = postSolution
32 {F550F1F8-8746-4AD0-9614-855F4C4B7F05}.Debug 4.5|Any CPU.ActiveCfg = Debug 4.5|Any CPU
33 {F550F1F8-8746-4AD0-9614-855F4C4B7F05}.Debug 4.5|Any CPU.Build.0 = 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|Any CPU
34 34 {F550F1F8-8746-4AD0-9614-855F4C4B7F05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
35 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
37 {F550F1F8-8746-4AD0-9614-855F4C4B7F05}.Release 4.5|Any CPU.Build.0 = 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|Any CPU
38 38 {F550F1F8-8746-4AD0-9614-855F4C4B7F05}.Release|Any CPU.ActiveCfg = Release|Any CPU
39 39 {F550F1F8-8746-4AD0-9614-855F4C4B7F05}.Release|Any CPU.Build.0 = Release|Any CPU
40 40 {63F92C0C-61BF-48C0-A377-8D67C3C661D0}.Debug 4.5|Any CPU.ActiveCfg = Debug 4.5|Any CPU
41 41 {63F92C0C-61BF-48C0-A377-8D67C3C661D0}.Debug 4.5|Any CPU.Build.0 = Debug 4.5|Any CPU
42 42 {63F92C0C-61BF-48C0-A377-8D67C3C661D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
43 43 {63F92C0C-61BF-48C0-A377-8D67C3C661D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
44 44 {63F92C0C-61BF-48C0-A377-8D67C3C661D0}.Release 4.5|Any CPU.ActiveCfg = Release 4.5|Any CPU
45 45 {63F92C0C-61BF-48C0-A377-8D67C3C661D0}.Release 4.5|Any CPU.Build.0 = Release 4.5|Any CPU
46 46 {63F92C0C-61BF-48C0-A377-8D67C3C661D0}.Release|Any CPU.ActiveCfg = Release|Any CPU
47 47 {63F92C0C-61BF-48C0-A377-8D67C3C661D0}.Release|Any CPU.Build.0 = Release|Any CPU
48 48 {4D364996-7ECD-4193-8F90-F223FFEA49DA}.Debug 4.5|Any CPU.ActiveCfg = Debug|Any CPU
49 49 {4D364996-7ECD-4193-8F90-F223FFEA49DA}.Debug 4.5|Any CPU.Build.0 = Debug|Any CPU
50 50 {4D364996-7ECD-4193-8F90-F223FFEA49DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
51 51 {4D364996-7ECD-4193-8F90-F223FFEA49DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
52 52 {4D364996-7ECD-4193-8F90-F223FFEA49DA}.Release 4.5|Any CPU.ActiveCfg = Release|Any CPU
53 53 {4D364996-7ECD-4193-8F90-F223FFEA49DA}.Release 4.5|Any CPU.Build.0 = Release|Any CPU
54 54 {4D364996-7ECD-4193-8F90-F223FFEA49DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
55 55 {4D364996-7ECD-4193-8F90-F223FFEA49DA}.Release|Any CPU.Build.0 = Release|Any CPU
56 56 {100DFEB0-75BE-436F-ADDF-1F46EF433F46}.Debug 4.5|Any CPU.ActiveCfg = Debug|Any CPU
57 57 {100DFEB0-75BE-436F-ADDF-1F46EF433F46}.Debug 4.5|Any CPU.Build.0 = Debug|Any CPU
58 58 {100DFEB0-75BE-436F-ADDF-1F46EF433F46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
59 59 {100DFEB0-75BE-436F-ADDF-1F46EF433F46}.Debug|Any CPU.Build.0 = Debug|Any CPU
60 60 {100DFEB0-75BE-436F-ADDF-1F46EF433F46}.Release 4.5|Any CPU.ActiveCfg = Release|Any CPU
61 61 {100DFEB0-75BE-436F-ADDF-1F46EF433F46}.Release 4.5|Any CPU.Build.0 = Release|Any CPU
62 62 {100DFEB0-75BE-436F-ADDF-1F46EF433F46}.Release|Any CPU.ActiveCfg = Release|Any CPU
63 63 {100DFEB0-75BE-436F-ADDF-1F46EF433F46}.Release|Any CPU.Build.0 = Release|Any CPU
64 64 EndGlobalSection
65 65 GlobalSection(SolutionProperties) = preSolution
66 66 HideSolutionNode = FALSE
67 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 68 GlobalSection(TestCaseManagementSettings) = postSolution
251 69 CategoryFile = Implab.vsmdi
252 70 EndGlobalSection
253 71 EndGlobal
1 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
1 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
1 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
1 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
1 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
@@ -1,296 +1,188
1 1 <?xml version="1.0" encoding="utf-8"?>
2 2 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3 3 <PropertyGroup>
4 4 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5 5 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6 6 <ProjectGuid>{F550F1F8-8746-4AD0-9614-855F4C4B7F05}</ProjectGuid>
7 7 <OutputType>Library</OutputType>
8 8 <RootNamespace>Implab</RootNamespace>
9 9 <AssemblyName>Implab</AssemblyName>
10 10 <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
11 11 <TargetFrameworkProfile />
12 12 </PropertyGroup>
13 13 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
14 14 <DebugSymbols>true</DebugSymbols>
15 15 <DebugType>full</DebugType>
16 16 <Optimize>false</Optimize>
17 17 <OutputPath>bin\Debug</OutputPath>
18 <DefineConstants>TRACE;DEBUG;</DefineConstants>
18 <DefineConstants>TRACE;DEBUG;NET_4_5</DefineConstants>
19 19 <ErrorReport>prompt</ErrorReport>
20 20 <WarningLevel>4</WarningLevel>
21 21 <ConsolePause>false</ConsolePause>
22 22 <RunCodeAnalysis>true</RunCodeAnalysis>
23 23 </PropertyGroup>
24 24 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
25 25 <DebugType>full</DebugType>
26 26 <Optimize>true</Optimize>
27 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 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 29 <ErrorReport>prompt</ErrorReport>
67 30 <WarningLevel>4</WarningLevel>
68 31 <ConsolePause>false</ConsolePause>
69 32 </PropertyGroup>
70 33 <PropertyGroup>
71 34 <SignAssembly>true</SignAssembly>
72 35 </PropertyGroup>
73 36 <PropertyGroup>
74 37 <AssemblyOriginatorKeyFile>implab.snk</AssemblyOriginatorKeyFile>
75 38 </PropertyGroup>
76 39 <ItemGroup>
77 40 <Reference Include="System" />
78 41 <Reference Include="System.Xml" />
79 42 <Reference Include="mscorlib" />
80 43 <Reference Include="System.Xml.Linq" />
81 44 </ItemGroup>
82 45 <ItemGroup>
83 46 <Compile Include="Components\StateChangeEventArgs.cs" />
84 47 <Compile Include="CustomEqualityComparer.cs" />
85 48 <Compile Include="Diagnostics\ConsoleTraceListener.cs" />
86 49 <Compile Include="Diagnostics\LogChannel.cs" />
87 50 <Compile Include="Diagnostics\LogicalOperation.cs" />
88 51 <Compile Include="Diagnostics\TextFileListener.cs" />
89 52 <Compile Include="Diagnostics\Trace.cs" />
90 53 <Compile Include="Diagnostics\TraceLog.cs" />
91 54 <Compile Include="Diagnostics\TraceEvent.cs" />
92 55 <Compile Include="Diagnostics\TraceEventType.cs" />
93 56 <Compile Include="Diagnostics\TraceSourceAttribute.cs" />
94 57 <Compile Include="Formats\CharMap.cs" />
95 58 <Compile Include="Formats\InputScanner.cs" />
96 59 <Compile Include="Formats\Json\JsonStringScanner.cs" />
97 60 <Compile Include="Formats\Json\JsonTextScanner.cs" />
98 61 <Compile Include="ICancellable.cs" />
99 62 <Compile Include="IProgressHandler.cs" />
100 63 <Compile Include="IProgressNotifier.cs" />
101 64 <Compile Include="IPromiseT.cs" />
102 65 <Compile Include="IPromise.cs" />
103 66 <Compile Include="IServiceLocator.cs" />
104 67 <Compile Include="ITaskController.cs" />
105 68 <Compile Include="Parallels\DispatchPool.cs" />
106 69 <Compile Include="Parallels\ArrayTraits.cs" />
107 70 <Compile Include="Parallels\SimpleAsyncQueue.cs" />
108 71 <Compile Include="Parallels\WorkerPool.cs" />
109 72 <Compile Include="ProgressInitEventArgs.cs" />
110 73 <Compile Include="Properties\AssemblyInfo.cs" />
111 74 <Compile Include="Parallels\AsyncPool.cs" />
112 75 <Compile Include="Safe.cs" />
113 76 <Compile Include="SyncContextPromise.cs" />
114 77 <Compile Include="ValueEventArgs.cs" />
115 78 <Compile Include="PromiseExtensions.cs" />
116 79 <Compile Include="SyncContextPromiseT.cs" />
117 80 <Compile Include="Diagnostics\OperationContext.cs" />
118 81 <Compile Include="Diagnostics\TraceContext.cs" />
119 82 <Compile Include="Diagnostics\LogEventArgs.cs" />
120 83 <Compile Include="Diagnostics\LogEventArgsT.cs" />
121 84 <Compile Include="Diagnostics\Extensions.cs" />
122 85 <Compile Include="PromiseEventType.cs" />
123 86 <Compile Include="Parallels\AsyncQueue.cs" />
124 87 <Compile Include="PromiseT.cs" />
125 88 <Compile Include="IDeferred.cs" />
126 89 <Compile Include="IDeferredT.cs" />
127 90 <Compile Include="Promise.cs" />
128 91 <Compile Include="PromiseTransientException.cs" />
129 92 <Compile Include="Parallels\Signal.cs" />
130 93 <Compile Include="Parallels\SharedLock.cs" />
131 94 <Compile Include="Diagnostics\ILogWriter.cs" />
132 95 <Compile Include="Diagnostics\ListenerBase.cs" />
133 96 <Compile Include="Parallels\BlockingQueue.cs" />
134 97 <Compile Include="AbstractEvent.cs" />
135 98 <Compile Include="AbstractPromise.cs" />
136 99 <Compile Include="AbstractPromiseT.cs" />
137 100 <Compile Include="FuncTask.cs" />
138 101 <Compile Include="FuncTaskBase.cs" />
139 102 <Compile Include="FuncTaskT.cs" />
140 103 <Compile Include="ActionChainTaskBase.cs" />
141 104 <Compile Include="ActionChainTask.cs" />
142 105 <Compile Include="ActionChainTaskT.cs" />
143 106 <Compile Include="FuncChainTaskBase.cs" />
144 107 <Compile Include="FuncChainTask.cs" />
145 108 <Compile Include="FuncChainTaskT.cs" />
146 109 <Compile Include="ActionTaskBase.cs" />
147 110 <Compile Include="ActionTask.cs" />
148 111 <Compile Include="ActionTaskT.cs" />
149 112 <Compile Include="ICancellationToken.cs" />
150 113 <Compile Include="SuccessPromise.cs" />
151 114 <Compile Include="SuccessPromiseT.cs" />
152 115 <Compile Include="PromiseAwaiterT.cs" />
153 116 <Compile Include="PromiseAwaiter.cs" />
154 117 <Compile Include="Components\ComponentContainer.cs" />
155 118 <Compile Include="Components\Disposable.cs" />
156 119 <Compile Include="Components\DisposablePool.cs" />
157 120 <Compile Include="Components\ObjectPool.cs" />
158 121 <Compile Include="Components\ServiceLocator.cs" />
159 122 <Compile Include="Components\IInitializable.cs" />
160 123 <Compile Include="TaskController.cs" />
161 124 <Compile Include="Components\App.cs" />
162 125 <Compile Include="Components\IRunnable.cs" />
163 126 <Compile Include="Components\ExecutionState.cs" />
164 127 <Compile Include="Components\RunnableComponent.cs" />
165 128 <Compile Include="Components\IFactory.cs" />
166 129 <Compile Include="Automaton\IAlphabet.cs" />
167 130 <Compile Include="Automaton\ParserException.cs" />
168 131 <Compile Include="Automaton\IndexedAlphabetBase.cs" />
169 132 <Compile Include="Automaton\IAlphabetBuilder.cs" />
170 133 <Compile Include="Automaton\RegularExpressions\AltToken.cs" />
171 134 <Compile Include="Automaton\RegularExpressions\BinaryToken.cs" />
172 135 <Compile Include="Automaton\RegularExpressions\CatToken.cs" />
173 136 <Compile Include="Automaton\RegularExpressions\StarToken.cs" />
174 137 <Compile Include="Automaton\RegularExpressions\SymbolToken.cs" />
175 138 <Compile Include="Automaton\RegularExpressions\EmptyToken.cs" />
176 139 <Compile Include="Automaton\RegularExpressions\Token.cs" />
177 140 <Compile Include="Automaton\RegularExpressions\IVisitor.cs" />
178 141 <Compile Include="Automaton\AutomatonTransition.cs" />
179 142 <Compile Include="Formats\Json\JsonElementContext.cs" />
180 143 <Compile Include="Formats\Json\JsonElementType.cs" />
181 144 <Compile Include="Formats\Json\JsonGrammar.cs" />
182 145 <Compile Include="Formats\Json\JsonReader.cs" />
183 146 <Compile Include="Formats\Json\JsonScanner.cs" />
184 147 <Compile Include="Formats\Json\JsonTokenType.cs" />
185 148 <Compile Include="Formats\Json\JsonWriter.cs" />
186 149 <Compile Include="Formats\Json\StringTranslator.cs" />
187 150 <Compile Include="Automaton\MapAlphabet.cs" />
188 151 <Compile Include="Formats\CharAlphabet.cs" />
189 152 <Compile Include="Formats\ByteAlphabet.cs" />
190 153 <Compile Include="Automaton\IDFATable.cs" />
191 154 <Compile Include="Automaton\IDFATableBuilder.cs" />
192 155 <Compile Include="Automaton\DFATable.cs" />
193 156 <Compile Include="Automaton\RegularExpressions\RegularExpressionVisitor.cs" />
194 157 <Compile Include="Automaton\RegularExpressions\ITaggedDFABuilder.cs" />
195 158 <Compile Include="Formats\Grammar.cs" />
196 159 <Compile Include="Automaton\RegularExpressions\EndTokenT.cs" />
197 160 <Compile Include="Automaton\RegularExpressions\EndToken.cs" />
198 161 <Compile Include="Automaton\RegularExpressions\RegularExpressionVisitorT.cs" />
199 162 <Compile Include="Automaton\AutomatonConst.cs" />
200 163 <Compile Include="Automaton\RegularExpressions\RegularDFA.cs" />
201 164 <Compile Include="Components\LazyAndWeak.cs" />
202 165 <Compile Include="AbstractTask.cs" />
203 166 <Compile Include="AbstractTaskT.cs" />
204 167 <Compile Include="FailedPromise.cs" />
205 168 <Compile Include="FailedPromiseT.cs" />
206 169 <Compile Include="Components\PollingComponent.cs" />
207 170 <Compile Include="Xml\JsonXmlReader.cs" />
208 171 <Compile Include="Xml\JsonXmlReaderOptions.cs" />
209 172 <Compile Include="Xml\JsonXmlReaderPosition.cs" />
210 173 <Compile Include="Xml\SerializationHelpers.cs" />
211 174 <Compile Include="Xml\SerializersPool.cs" />
212 175 <Compile Include="Xml\XmlSimpleAttribute.cs" />
213 176 <Compile Include="Xml\XmlNameContext.cs" />
214 177 </ItemGroup>
215 178 <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
216 179 <ItemGroup>
217 180 <None Include="Implab.nuspec">
218 181 <SubType>Designer</SubType>
219 182 </None>
220 183 <None Include="implab.snk" />
221 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 185 <ItemGroup>
294 186 <Content Include="license.txt" />
295 187 </ItemGroup>
296 188 </Project> No newline at end of file
@@ -1,45 +1,51
1 1 using System;
2 2 using System.Collections.Generic;
3 using System.IO;
3 4 using System.Linq;
4 5 using System.Text;
5 6 using System.Threading.Tasks;
6 7 using System.Xml;
7 8 using System.Xml.Linq;
8 9
9 10 namespace Implab.Xml {
10 11 public static class SerializationHelpers {
11 12 public static string SerializeAsString<T>(T obj) {
12 13 return SerializersPool<T>.Instance.SerializeAsString(obj);
13 14 }
14 15
15 16 public static void Serialize<T>(XmlWriter writer, T obj) {
16 17 SerializersPool<T>.Instance.Serialize(writer, obj);
17 18 }
18 19
19 20 public static XmlDocument SerializeAsXmlDocument<T>(T obj) {
20 21 var doc = new XmlDocument();
21 22 using (var writer = doc.CreateNavigator().AppendChild()) {
22 23 SerializersPool<T>.Instance.Serialize(writer, obj);
23 24 }
24 25 return doc;
25 26 }
26 27
27 28 public static XDocument SerializeAsXDocument<T>(T obj) {
28 29 var doc = new XDocument();
29 30 using (var writer = doc.CreateWriter()) {
30 31 SerializersPool<T>.Instance.Serialize(writer, obj);
31 32 }
32 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 41 public static T DeserializeFromString<T>(string data) {
36 42 return SerializersPool<T>.Instance.DeserializeFromString(data);
37 43 }
38 44
39 45 public static T DeserializeFromXmlNode<T>(XmlNode node) {
40 46 Safe.ArgumentNotNull(node, nameof(node));
41 47 using (var reader = node.CreateNavigator().ReadSubtree())
42 48 return SerializersPool<T>.Instance.Deserialize(reader);
43 49 }
44 50 }
45 51 }
1 NO CONTENT: file was removed
1 NO CONTENT: file was removed
1 NO CONTENT: file was removed
1 NO CONTENT: file was removed
1 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