# HG changeset patch
# User cin
# Date 2017-09-20 22:14:27
# Node ID 133ba4444accbdff9ad910c2052121a2f8e31968
# Parent 3eaa9372c75403ba69b0a023f114fc53176ff8ee
# Parent 3e26338eb97732f552aaf60ac01bc23116429d02
Слияние
diff --git a/Implab.mono.sln b/Implab.mono.sln
deleted file mode 100644
--- a/Implab.mono.sln
+++ /dev/null
@@ -1,301 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Implab", "Implab\Implab.csproj", "{F550F1F8-8746-4AD0-9614-855F4C4B7F05}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{CE8D8D18-437A-445C-B662-4C2CE79A76F6}"
- ProjectSection(SolutionItems) = preProject
- Implab.vsmdi = Implab.vsmdi
- Local.testsettings = Local.testsettings
- TraceAndTestImpact.testsettings = TraceAndTestImpact.testsettings
- EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Implab.Fx", "Implab.Fx\Implab.Fx.csproj", "{06E706F8-6881-43EB-927E-FFC503AF6ABC}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{BCA337C3-BFDC-4825-BBDB-E6D467E4E452}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Implab.Test.mono", "Implab.Test\Implab.Test.mono.csproj", "{2BD05F84-E067-4B87-9477-FDC2676A21C6}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Implab.Format.Test", "Implab.Test\Implab.Format.Test\Implab.Format.Test.csproj", "{4D364996-7ECD-4193-8F90-F223FFEA49DA}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoPlay", "MonoPlay\MonoPlay.csproj", "{15DD7123-D504-4627-8B4F-D00C7F04D033}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Any CPU = Debug|Any CPU
- Release|Any CPU = Release|Any CPU
- Debug 4.5|Any CPU = Debug 4.5|Any CPU
- Release 4.5|Any CPU = Release 4.5|Any CPU
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {06E706F8-6881-43EB-927E-FFC503AF6ABC}.Debug 4.5|Any CPU.ActiveCfg = Debug 4.5|Any CPU
- {06E706F8-6881-43EB-927E-FFC503AF6ABC}.Debug 4.5|Any CPU.Build.0 = Debug 4.5|Any CPU
- {06E706F8-6881-43EB-927E-FFC503AF6ABC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {06E706F8-6881-43EB-927E-FFC503AF6ABC}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {06E706F8-6881-43EB-927E-FFC503AF6ABC}.Release 4.5|Any CPU.ActiveCfg = Release 4.5|Any CPU
- {06E706F8-6881-43EB-927E-FFC503AF6ABC}.Release 4.5|Any CPU.Build.0 = Release 4.5|Any CPU
- {06E706F8-6881-43EB-927E-FFC503AF6ABC}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {06E706F8-6881-43EB-927E-FFC503AF6ABC}.Release|Any CPU.Build.0 = Release|Any CPU
- {15DD7123-D504-4627-8B4F-D00C7F04D033}.Debug 4.5|Any CPU.ActiveCfg = Debug|Any CPU
- {15DD7123-D504-4627-8B4F-D00C7F04D033}.Debug 4.5|Any CPU.Build.0 = Debug|Any CPU
- {15DD7123-D504-4627-8B4F-D00C7F04D033}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {15DD7123-D504-4627-8B4F-D00C7F04D033}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {15DD7123-D504-4627-8B4F-D00C7F04D033}.Release 4.5|Any CPU.ActiveCfg = Release|Any CPU
- {15DD7123-D504-4627-8B4F-D00C7F04D033}.Release 4.5|Any CPU.Build.0 = Release|Any CPU
- {15DD7123-D504-4627-8B4F-D00C7F04D033}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {15DD7123-D504-4627-8B4F-D00C7F04D033}.Release|Any CPU.Build.0 = Release|Any CPU
- {2BD05F84-E067-4B87-9477-FDC2676A21C6}.Debug 4.5|Any CPU.ActiveCfg = Debug 4.5|Any CPU
- {2BD05F84-E067-4B87-9477-FDC2676A21C6}.Debug 4.5|Any CPU.Build.0 = Debug 4.5|Any CPU
- {2BD05F84-E067-4B87-9477-FDC2676A21C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {2BD05F84-E067-4B87-9477-FDC2676A21C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {2BD05F84-E067-4B87-9477-FDC2676A21C6}.Release 4.5|Any CPU.ActiveCfg = Release 4.5|Any CPU
- {2BD05F84-E067-4B87-9477-FDC2676A21C6}.Release 4.5|Any CPU.Build.0 = Release 4.5|Any CPU
- {2BD05F84-E067-4B87-9477-FDC2676A21C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {2BD05F84-E067-4B87-9477-FDC2676A21C6}.Release|Any CPU.Build.0 = Release|Any CPU
- {4D364996-7ECD-4193-8F90-F223FFEA49DA}.Debug 4.5|Any CPU.ActiveCfg = Debug|Any CPU
- {4D364996-7ECD-4193-8F90-F223FFEA49DA}.Debug 4.5|Any CPU.Build.0 = Debug|Any CPU
- {4D364996-7ECD-4193-8F90-F223FFEA49DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {4D364996-7ECD-4193-8F90-F223FFEA49DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {4D364996-7ECD-4193-8F90-F223FFEA49DA}.Release 4.5|Any CPU.ActiveCfg = Release|Any CPU
- {4D364996-7ECD-4193-8F90-F223FFEA49DA}.Release 4.5|Any CPU.Build.0 = Release|Any CPU
- {4D364996-7ECD-4193-8F90-F223FFEA49DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {4D364996-7ECD-4193-8F90-F223FFEA49DA}.Release|Any CPU.Build.0 = Release|Any CPU
- {F550F1F8-8746-4AD0-9614-855F4C4B7F05}.Debug 4.5|Any CPU.ActiveCfg = Debug 4.5|Any CPU
- {F550F1F8-8746-4AD0-9614-855F4C4B7F05}.Debug 4.5|Any CPU.Build.0 = Debug 4.5|Any CPU
- {F550F1F8-8746-4AD0-9614-855F4C4B7F05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {F550F1F8-8746-4AD0-9614-855F4C4B7F05}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {F550F1F8-8746-4AD0-9614-855F4C4B7F05}.Release 4.5|Any CPU.ActiveCfg = Release 4.5|Any CPU
- {F550F1F8-8746-4AD0-9614-855F4C4B7F05}.Release 4.5|Any CPU.Build.0 = Release 4.5|Any CPU
- {F550F1F8-8746-4AD0-9614-855F4C4B7F05}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {F550F1F8-8746-4AD0-9614-855F4C4B7F05}.Release|Any CPU.Build.0 = Release|Any CPU
- {2F31E405-E267-4195-A05D-574093C21209}.Debug 4.5|Any CPU.ActiveCfg = Debug 4.5|Any CPU
- {2F31E405-E267-4195-A05D-574093C21209}.Debug 4.5|Any CPU.Build.0 = Debug 4.5|Any CPU
- {2F31E405-E267-4195-A05D-574093C21209}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {2F31E405-E267-4195-A05D-574093C21209}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {2F31E405-E267-4195-A05D-574093C21209}.Release 4.5|Any CPU.ActiveCfg = Release 4.5|Any CPU
- {2F31E405-E267-4195-A05D-574093C21209}.Release 4.5|Any CPU.Build.0 = Release 4.5|Any CPU
- {2F31E405-E267-4195-A05D-574093C21209}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {2F31E405-E267-4195-A05D-574093C21209}.Release|Any CPU.Build.0 = Release|Any CPU
- {63F92C0C-61BF-48C0-A377-8D67C3C661D0}.Debug 4.5|Any CPU.ActiveCfg = Debug 4.5|Any CPU
- {63F92C0C-61BF-48C0-A377-8D67C3C661D0}.Debug 4.5|Any CPU.Build.0 = Debug 4.5|Any CPU
- {63F92C0C-61BF-48C0-A377-8D67C3C661D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {63F92C0C-61BF-48C0-A377-8D67C3C661D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {63F92C0C-61BF-48C0-A377-8D67C3C661D0}.Release 4.5|Any CPU.ActiveCfg = Release 4.5|Any CPU
- {63F92C0C-61BF-48C0-A377-8D67C3C661D0}.Release 4.5|Any CPU.Build.0 = Release 4.5|Any CPU
- {63F92C0C-61BF-48C0-A377-8D67C3C661D0}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {63F92C0C-61BF-48C0-A377-8D67C3C661D0}.Release|Any CPU.Build.0 = Release|Any CPU
- EndGlobalSection
- GlobalSection(NestedProjects) = preSolution
- {2BD05F84-E067-4B87-9477-FDC2676A21C6} = {BCA337C3-BFDC-4825-BBDB-E6D467E4E452}
- {4D364996-7ECD-4193-8F90-F223FFEA49DA} = {BCA337C3-BFDC-4825-BBDB-E6D467E4E452}
- EndGlobalSection
- GlobalSection(MonoDevelopProperties) = preSolution
- Policies = $0
- $0.CSharpFormattingPolicy = $1
- $1.IndentSwitchBody = True
- $1.NamespaceBraceStyle = EndOfLine
- $1.ClassBraceStyle = EndOfLine
- $1.InterfaceBraceStyle = EndOfLine
- $1.StructBraceStyle = EndOfLine
- $1.EnumBraceStyle = EndOfLine
- $1.MethodBraceStyle = EndOfLine
- $1.ConstructorBraceStyle = EndOfLine
- $1.DestructorBraceStyle = EndOfLine
- $1.BeforeMethodDeclarationParentheses = False
- $1.BeforeMethodCallParentheses = False
- $1.BeforeConstructorDeclarationParentheses = False
- $1.NewLineBeforeConstructorInitializerColon = NewLine
- $1.NewLineAfterConstructorInitializerColon = SameLine
- $1.BeforeIndexerDeclarationBracket = False
- $1.BeforeDelegateDeclarationParentheses = False
- $1.NewParentheses = False
- $1.SpacesBeforeBrackets = False
- $1.inheritsSet = Mono
- $1.inheritsScope = text/x-csharp
- $1.scope = text/x-csharp
- $0.TextStylePolicy = $2
- $2.FileWidth = 120
- $2.EolMarker = Unix
- $2.inheritsSet = VisualStudio
- $2.inheritsScope = text/plain
- $2.scope = text/x-csharp
- $0.DotNetNamingPolicy = $3
- $3.DirectoryNamespaceAssociation = PrefixedHierarchical
- $3.ResourceNamePolicy = MSBuild
- $0.TextStylePolicy = $4
- $4.FileWidth = 120
- $4.TabsToSpaces = False
- $4.inheritsSet = VisualStudio
- $4.inheritsScope = text/plain
- $4.scope = application/xml
- $0.XmlFormattingPolicy = $5
- $5.inheritsSet = Mono
- $5.inheritsScope = application/xml
- $5.scope = application/xml
- $0.TextStylePolicy = $6
- $6.FileWidth = 120
- $6.TabsToSpaces = False
- $6.inheritsSet = VisualStudio
- $6.inheritsScope = text/plain
- $6.scope = text/plain
- $0.NameConventionPolicy = $7
- $7.Rules = $8
- $8.NamingRule = $9
- $9.Name = Namespaces
- $9.AffectedEntity = Namespace
- $9.VisibilityMask = VisibilityMask
- $9.NamingStyle = PascalCase
- $9.IncludeInstanceMembers = True
- $9.IncludeStaticEntities = True
- $8.NamingRule = $10
- $10.Name = Types
- $10.AffectedEntity = Class, Struct, Enum, Delegate
- $10.VisibilityMask = VisibilityMask
- $10.NamingStyle = PascalCase
- $10.IncludeInstanceMembers = True
- $10.IncludeStaticEntities = True
- $8.NamingRule = $11
- $11.Name = Interfaces
- $11.RequiredPrefixes = $12
- $12.String = I
- $11.AffectedEntity = Interface
- $11.VisibilityMask = VisibilityMask
- $11.NamingStyle = PascalCase
- $11.IncludeInstanceMembers = True
- $11.IncludeStaticEntities = True
- $8.NamingRule = $13
- $13.Name = Attributes
- $13.RequiredSuffixes = $14
- $14.String = Attribute
- $13.AffectedEntity = CustomAttributes
- $13.VisibilityMask = VisibilityMask
- $13.NamingStyle = PascalCase
- $13.IncludeInstanceMembers = True
- $13.IncludeStaticEntities = True
- $8.NamingRule = $15
- $15.Name = Event Arguments
- $15.RequiredSuffixes = $16
- $16.String = EventArgs
- $15.AffectedEntity = CustomEventArgs
- $15.VisibilityMask = VisibilityMask
- $15.NamingStyle = PascalCase
- $15.IncludeInstanceMembers = True
- $15.IncludeStaticEntities = True
- $8.NamingRule = $17
- $17.Name = Exceptions
- $17.RequiredSuffixes = $18
- $18.String = Exception
- $17.AffectedEntity = CustomExceptions
- $17.VisibilityMask = VisibilityMask
- $17.NamingStyle = PascalCase
- $17.IncludeInstanceMembers = True
- $17.IncludeStaticEntities = True
- $8.NamingRule = $19
- $19.Name = Methods
- $19.AffectedEntity = Methods
- $19.VisibilityMask = VisibilityMask
- $19.NamingStyle = PascalCase
- $19.IncludeInstanceMembers = True
- $19.IncludeStaticEntities = True
- $8.NamingRule = $20
- $20.Name = Static Readonly Fields
- $20.AffectedEntity = ReadonlyField
- $20.VisibilityMask = Internal, Protected, Public
- $20.NamingStyle = PascalCase
- $20.IncludeInstanceMembers = False
- $20.IncludeStaticEntities = True
- $8.NamingRule = $21
- $21.Name = Fields (Non Private)
- $21.AffectedEntity = Field
- $21.VisibilityMask = Internal, Public
- $21.NamingStyle = CamelCase
- $21.IncludeInstanceMembers = True
- $21.IncludeStaticEntities = True
- $8.NamingRule = $22
- $22.Name = ReadOnly Fields (Non Private)
- $22.AffectedEntity = ReadonlyField
- $22.VisibilityMask = Internal, Public
- $22.NamingStyle = CamelCase
- $22.IncludeInstanceMembers = True
- $22.IncludeStaticEntities = False
- $8.NamingRule = $23
- $23.Name = Fields (Private)
- $23.RequiredPrefixes = $24
- $24.String = m_
- $23.AffectedEntity = Field, ReadonlyField
- $23.VisibilityMask = Private, Protected
- $23.NamingStyle = CamelCase
- $23.IncludeInstanceMembers = True
- $23.IncludeStaticEntities = False
- $8.NamingRule = $25
- $25.Name = Static Fields (Private)
- $25.RequiredPrefixes = $26
- $26.String = _
- $25.AffectedEntity = Field
- $25.VisibilityMask = Private
- $25.NamingStyle = CamelCase
- $25.IncludeInstanceMembers = False
- $25.IncludeStaticEntities = True
- $8.NamingRule = $27
- $27.Name = ReadOnly Fields (Private)
- $27.RequiredPrefixes = $28
- $28.String = m_
- $27.AffectedEntity = ReadonlyField
- $27.VisibilityMask = Private, Protected
- $27.NamingStyle = CamelCase
- $27.IncludeInstanceMembers = True
- $27.IncludeStaticEntities = False
- $8.NamingRule = $29
- $29.Name = Constant Fields
- $29.AffectedEntity = ConstantField
- $29.VisibilityMask = VisibilityMask
- $29.NamingStyle = AllUpper
- $29.IncludeInstanceMembers = True
- $29.IncludeStaticEntities = True
- $8.NamingRule = $30
- $30.Name = Properties
- $30.AffectedEntity = Property
- $30.VisibilityMask = VisibilityMask
- $30.NamingStyle = PascalCase
- $30.IncludeInstanceMembers = True
- $30.IncludeStaticEntities = True
- $8.NamingRule = $31
- $31.Name = Events
- $31.AffectedEntity = Event
- $31.VisibilityMask = VisibilityMask
- $31.NamingStyle = PascalCase
- $31.IncludeInstanceMembers = True
- $31.IncludeStaticEntities = True
- $8.NamingRule = $32
- $32.Name = Enum Members
- $32.AffectedEntity = EnumMember
- $32.VisibilityMask = VisibilityMask
- $32.NamingStyle = PascalCase
- $32.IncludeInstanceMembers = True
- $32.IncludeStaticEntities = True
- $8.NamingRule = $33
- $33.Name = Parameters
- $33.AffectedEntity = Parameter, LocalVariable
- $33.VisibilityMask = VisibilityMask
- $33.NamingStyle = CamelCase
- $33.IncludeInstanceMembers = True
- $33.IncludeStaticEntities = True
- $8.NamingRule = $34
- $34.Name = Type Parameters
- $34.RequiredPrefixes = $35
- $35.String = T
- $34.AffectedEntity = TypeParameter
- $34.VisibilityMask = VisibilityMask
- $34.NamingStyle = PascalCase
- $34.IncludeInstanceMembers = True
- $34.IncludeStaticEntities = True
- version = 0.2
- StartupItem = MonoPlay\MonoPlay.csproj
- EndGlobalSection
- GlobalSection(TestCaseManagementSettings) = postSolution
- CategoryFile = Implab.vsmdi
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
diff --git a/Implab.sln b/Implab.sln
--- a/Implab.sln
+++ b/Implab.sln
@@ -75,188 +75,6 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
- GlobalSection(MonoDevelopProperties) = preSolution
- StartupItem = Implab\Implab.csproj
- Policies = $0
- $0.CSharpFormattingPolicy = $1
- $1.IndentSwitchBody = True
- $1.NamespaceBraceStyle = EndOfLine
- $1.ClassBraceStyle = EndOfLine
- $1.InterfaceBraceStyle = EndOfLine
- $1.StructBraceStyle = EndOfLine
- $1.EnumBraceStyle = EndOfLine
- $1.MethodBraceStyle = EndOfLine
- $1.ConstructorBraceStyle = EndOfLine
- $1.DestructorBraceStyle = EndOfLine
- $1.BeforeMethodDeclarationParentheses = False
- $1.BeforeMethodCallParentheses = False
- $1.BeforeConstructorDeclarationParentheses = False
- $1.NewLineBeforeConstructorInitializerColon = NewLine
- $1.NewLineAfterConstructorInitializerColon = SameLine
- $1.BeforeIndexerDeclarationBracket = False
- $1.BeforeDelegateDeclarationParentheses = False
- $1.NewParentheses = False
- $1.SpacesBeforeBrackets = False
- $1.inheritsSet = Mono
- $1.inheritsScope = text/x-csharp
- $1.scope = text/x-csharp
- $0.TextStylePolicy = $6
- $2.FileWidth = 120
- $2.EolMarker = Unix
- $2.inheritsSet = VisualStudio
- $2.inheritsScope = text/plain
- $2.scope = text/x-csharp
- $0.DotNetNamingPolicy = $3
- $3.DirectoryNamespaceAssociation = PrefixedHierarchical
- $3.ResourceNamePolicy = MSBuild
- $4.FileWidth = 120
- $4.TabsToSpaces = False
- $4.inheritsSet = VisualStudio
- $4.inheritsScope = text/plain
- $4.scope = application/xml
- $0.XmlFormattingPolicy = $5
- $5.inheritsSet = Mono
- $5.inheritsScope = application/xml
- $5.scope = application/xml
- $6.FileWidth = 120
- $6.TabsToSpaces = False
- $6.inheritsSet = VisualStudio
- $6.inheritsScope = text/plain
- $6.scope = text/plain
- $0.NameConventionPolicy = $7
- $7.Rules = $8
- $8.NamingRule = $34
- $9.Name = Namespaces
- $9.AffectedEntity = Namespace
- $9.VisibilityMask = VisibilityMask
- $9.NamingStyle = PascalCase
- $9.IncludeInstanceMembers = True
- $9.IncludeStaticEntities = True
- $10.Name = Types
- $10.AffectedEntity = Class, Struct, Enum, Delegate
- $10.VisibilityMask = VisibilityMask
- $10.NamingStyle = PascalCase
- $10.IncludeInstanceMembers = True
- $10.IncludeStaticEntities = True
- $11.Name = Interfaces
- $11.RequiredPrefixes = $12
- $12.String = I
- $11.AffectedEntity = Interface
- $11.VisibilityMask = VisibilityMask
- $11.NamingStyle = PascalCase
- $11.IncludeInstanceMembers = True
- $11.IncludeStaticEntities = True
- $13.Name = Attributes
- $13.RequiredSuffixes = $14
- $14.String = Attribute
- $13.AffectedEntity = CustomAttributes
- $13.VisibilityMask = VisibilityMask
- $13.NamingStyle = PascalCase
- $13.IncludeInstanceMembers = True
- $13.IncludeStaticEntities = True
- $15.Name = Event Arguments
- $15.RequiredSuffixes = $16
- $16.String = EventArgs
- $15.AffectedEntity = CustomEventArgs
- $15.VisibilityMask = VisibilityMask
- $15.NamingStyle = PascalCase
- $15.IncludeInstanceMembers = True
- $15.IncludeStaticEntities = True
- $17.Name = Exceptions
- $17.RequiredSuffixes = $18
- $18.String = Exception
- $17.AffectedEntity = CustomExceptions
- $17.VisibilityMask = VisibilityMask
- $17.NamingStyle = PascalCase
- $17.IncludeInstanceMembers = True
- $17.IncludeStaticEntities = True
- $19.Name = Methods
- $19.AffectedEntity = Methods
- $19.VisibilityMask = VisibilityMask
- $19.NamingStyle = PascalCase
- $19.IncludeInstanceMembers = True
- $19.IncludeStaticEntities = True
- $20.Name = Static Readonly Fields
- $20.AffectedEntity = ReadonlyField
- $20.VisibilityMask = Internal, Protected, Public
- $20.NamingStyle = CamelCase
- $20.IncludeInstanceMembers = False
- $20.IncludeStaticEntities = True
- $21.Name = Fields (Non Private)
- $21.AffectedEntity = Field
- $21.VisibilityMask = Internal, Public
- $21.NamingStyle = CamelCase
- $21.IncludeInstanceMembers = True
- $21.IncludeStaticEntities = True
- $22.Name = ReadOnly Fields (Non Private)
- $22.AffectedEntity = ReadonlyField
- $22.VisibilityMask = Internal, Public
- $22.NamingStyle = CamelCase
- $22.IncludeInstanceMembers = True
- $22.IncludeStaticEntities = False
- $23.Name = Fields (Private)
- $23.RequiredPrefixes = $24
- $24.String = m_
- $23.AffectedEntity = Field, ReadonlyField
- $23.VisibilityMask = Private, Protected
- $23.NamingStyle = CamelCase
- $23.IncludeInstanceMembers = True
- $23.IncludeStaticEntities = False
- $25.Name = Static Fields (Private)
- $25.RequiredPrefixes = $26
- $26.String = _
- $25.AffectedEntity = Field
- $25.VisibilityMask = Private
- $25.NamingStyle = CamelCase
- $25.IncludeInstanceMembers = False
- $25.IncludeStaticEntities = True
- $27.Name = ReadOnly Fields (Private)
- $27.RequiredPrefixes = $28
- $28.String = m_
- $27.AffectedEntity = ReadonlyField
- $27.VisibilityMask = Private, Protected
- $27.NamingStyle = CamelCase
- $27.IncludeInstanceMembers = True
- $27.IncludeStaticEntities = False
- $29.Name = Constant Fields
- $29.AffectedEntity = ConstantField
- $29.VisibilityMask = VisibilityMask
- $29.NamingStyle = AllUpper
- $29.IncludeInstanceMembers = True
- $29.IncludeStaticEntities = True
- $30.Name = Properties
- $30.AffectedEntity = Property
- $30.VisibilityMask = VisibilityMask
- $30.NamingStyle = PascalCase
- $30.IncludeInstanceMembers = True
- $30.IncludeStaticEntities = True
- $31.Name = Events
- $31.AffectedEntity = Event
- $31.VisibilityMask = VisibilityMask
- $31.NamingStyle = PascalCase
- $31.IncludeInstanceMembers = True
- $31.IncludeStaticEntities = True
- $32.Name = Enum Members
- $32.AffectedEntity = EnumMember
- $32.VisibilityMask = VisibilityMask
- $32.NamingStyle = PascalCase
- $32.IncludeInstanceMembers = True
- $32.IncludeStaticEntities = True
- $33.Name = Parameters
- $33.AffectedEntity = Parameter, LocalVariable
- $33.VisibilityMask = VisibilityMask
- $33.NamingStyle = CamelCase
- $33.IncludeInstanceMembers = True
- $33.IncludeStaticEntities = True
- $34.Name = Type Parameters
- $34.RequiredPrefixes = $35
- $35.String = T
- $34.AffectedEntity = TypeParameter
- $34.VisibilityMask = VisibilityMask
- $34.NamingStyle = PascalCase
- $34.IncludeInstanceMembers = True
- $34.IncludeStaticEntities = True
- EndGlobalSection
GlobalSection(TestCaseManagementSettings) = postSolution
CategoryFile = Implab.vsmdi
EndGlobalSection
diff --git a/Implab/Formats/JSON/JsonElementContext.cs b/Implab/Formats/Json/JsonElementContext.cs
rename from Implab/Formats/JSON/JsonElementContext.cs
rename to Implab/Formats/Json/JsonElementContext.cs
diff --git a/Implab/Formats/JSON/JsonElementType.cs b/Implab/Formats/Json/JsonElementType.cs
rename from Implab/Formats/JSON/JsonElementType.cs
rename to Implab/Formats/Json/JsonElementType.cs
diff --git a/Implab/Formats/JSON/JsonGrammar.cs b/Implab/Formats/Json/JsonGrammar.cs
rename from Implab/Formats/JSON/JsonGrammar.cs
rename to Implab/Formats/Json/JsonGrammar.cs
diff --git a/Implab/Formats/JSON/JsonReader.cs b/Implab/Formats/Json/JsonReader.cs
rename from Implab/Formats/JSON/JsonReader.cs
rename to Implab/Formats/Json/JsonReader.cs
diff --git a/Implab/Formats/JSON/JsonScanner.cs b/Implab/Formats/Json/JsonScanner.cs
rename from Implab/Formats/JSON/JsonScanner.cs
rename to Implab/Formats/Json/JsonScanner.cs
diff --git a/Implab/Formats/JSON/JsonStringScanner.cs b/Implab/Formats/Json/JsonStringScanner.cs
rename from Implab/Formats/JSON/JsonStringScanner.cs
rename to Implab/Formats/Json/JsonStringScanner.cs
diff --git a/Implab/Formats/JSON/JsonTextScanner.cs b/Implab/Formats/Json/JsonTextScanner.cs
rename from Implab/Formats/JSON/JsonTextScanner.cs
rename to Implab/Formats/Json/JsonTextScanner.cs
diff --git a/Implab/Formats/JSON/JsonTokenType.cs b/Implab/Formats/Json/JsonTokenType.cs
rename from Implab/Formats/JSON/JsonTokenType.cs
rename to Implab/Formats/Json/JsonTokenType.cs
diff --git a/Implab/Formats/JSON/JsonWriter.cs b/Implab/Formats/Json/JsonWriter.cs
rename from Implab/Formats/JSON/JsonWriter.cs
rename to Implab/Formats/Json/JsonWriter.cs
diff --git a/Implab/Formats/JSON/StringTranslator.cs b/Implab/Formats/Json/StringTranslator.cs
rename from Implab/Formats/JSON/StringTranslator.cs
rename to Implab/Formats/Json/StringTranslator.cs
diff --git a/Implab/Implab.csproj b/Implab/Implab.csproj
--- a/Implab/Implab.csproj
+++ b/Implab/Implab.csproj
@@ -14,7 +14,7 @@
full
false
bin\Debug
- TRACE;DEBUG;
+ TRACE;DEBUG;NET_4_5
prompt
4
false
@@ -24,44 +24,7 @@
full
true
bin\Release
- prompt
- 4
- false
-
-
- true
- full
- false
- bin\Debug
- TRACE;DEBUG;NET_4_5
- prompt
- 4
- true
- false
-
-
- true
- bin\Release
- prompt
- 4
- false
NET_4_5
-
-
- true
- full
- false
- bin\Debug
- TRACE;DEBUG;NET_4_5;MONO
- prompt
- 4
- true
- false
-
-
- true
- bin\Release
- NET_4_5;MONO;
prompt
4
false
@@ -206,77 +169,4 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- I
-
-
-
-
- Attribute
-
-
-
-
- EventArgs
-
-
-
-
- Exception
-
-
-
-
-
-
-
-
- m_
-
-
-
-
- _
-
-
-
-
- m_
-
-
-
-
-
-
-
-
-
- T
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/MonoPlay/MonoPlay.csproj b/MonoPlay/MonoPlay.csproj
deleted file mode 100644
--- a/MonoPlay/MonoPlay.csproj
+++ /dev/null
@@ -1,53 +0,0 @@
-
-
-
- Debug
- AnyCPU
- 8.0.30703
- 2.0
- {15DD7123-D504-4627-8B4F-D00C7F04D033}
- Exe
- MonoPlay
- MonoPlay
- v4.5
- 0.2
-
-
- true
- full
- false
- bin\Debug
- DEBUG;TRACE;
- prompt
- 4
- false
-
-
- full
- true
- bin\Release
- prompt
- 4
- false
-
-
-
-
- ..\packages\System.Text.Json.2.0.0.11\lib\net40\System.Text.Json.dll
-
-
-
-
-
-
-
-
-
- {F550F1F8-8746-4AD0-9614-855F4C4B7F05}
- Implab
-
-
-
-
-
-
\ No newline at end of file
diff --git a/MonoPlay/Program.cs b/MonoPlay/Program.cs
deleted file mode 100644
--- a/MonoPlay/Program.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using Implab;
-using Implab.Parallels;
-using Implab.Diagnostics;
-using System.Threading;
-
-namespace MonoPlay {
- class MainClass {
-
-
- public static void Main(string[] args) {
- var pool = new WorkerPool(10);
-
- var listerner = new ConsoleTraceListener();
- listerner.Subscribe();
-
- TraceLog.StartLogicalOperation("Main");
-
-
- var d = pool.Invoke(() => {
- TraceLog.StartLogicalOperation("Worker");
- Thread.Sleep(100);
- TraceLog.TraceInformation("worker done");
- TraceLog.EndLogicalOperation();
- });
-
- var op = TraceContext.Instance.CurrentOperation;
- ThreadPool.QueueUserWorkItem((o) => {
- TraceContext.Instance.EnterLogicalOperation(op, false);
- TraceLog.StartLogicalOperation("Thread");
- Thread.Sleep(100);
- TraceLog.TraceInformation("thread done");
- TraceLog.EndLogicalOperation();
- });
-
- TraceLog.TraceInformation("main done");
- TraceLog.EndLogicalOperation();
-
- d.Join();
-
-
-
- }
-
- }
-}
diff --git a/MonoPlay/Properties/AssemblyInfo.cs b/MonoPlay/Properties/AssemblyInfo.cs
deleted file mode 100644
--- a/MonoPlay/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
-// Information about this assembly is defined by the following attributes.
-// Change them to the values specific to your project.
-
-[assembly: AssemblyTitle("MonoPlay")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("sergey")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
-// The form "{Major}.{Minor}.*" will automatically update the build and revision,
-// and "{Major}.{Minor}.{Build}.*" will update just the revision.
-
-[assembly: AssemblyVersion("1.0.*")]
-
-// The following attributes are used to specify the signing key for the assembly,
-// if desired. See the Mono documentation for more information about signing.
-
-//[assembly: AssemblyDelaySign(false)]
-//[assembly: AssemblyKeyFile("")]
-
diff --git a/MonoPlay/packages.config b/MonoPlay/packages.config
deleted file mode 100644
--- a/MonoPlay/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
\ No newline at end of file