diff Implab.sln @ 235:b49969a7043c v2

Слияние
author cin
date Thu, 05 Oct 2017 09:24:49 +0300
parents d6fe09f5592c 3e26338eb977
children
line wrap: on
line diff
--- a/Implab.sln	Thu Oct 05 09:21:23 2017 +0300
+++ b/Implab.sln	Thu Oct 05 09:24:49 2017 +0300
@@ -29,12 +29,12 @@
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{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 4.5|Any CPU.ActiveCfg = Debug|Any CPU
+		{F550F1F8-8746-4AD0-9614-855F4C4B7F05}.Debug 4.5|Any CPU.Build.0 = Debug|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 4.5|Any CPU.ActiveCfg = Release|Any CPU
+		{F550F1F8-8746-4AD0-9614-855F4C4B7F05}.Release 4.5|Any CPU.Build.0 = Release|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
 		{63F92C0C-61BF-48C0-A377-8D67C3C661D0}.Debug 4.5|Any CPU.ActiveCfg = Debug 4.5|Any CPU
@@ -65,188 +65,6 @@
 	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