Merge pull request #66 from rabbitmq/rabbitmq-dotnet-client-65

Added WinRT (Windows 8) compatible library, sharing code where possible
rabbitmq · Apr 21, 2015 · 4bd911e · 4bd911e
2 parents b276fd1 + 4943bbe
commit 4bd911e
Show file tree

Hide file tree

Showing 63 changed files with 6,366 additions and 70 deletions.
diff --git a/.gitignore b/.gitignore
@@ -87,4 +87,4 @@ Backup*/
 UpgradeLog*.XML
 UpgradeLog*.htm
 
-projects/client/Unit/TestResult.xml
+projects/client/Unit*/TestResult.xml
diff --git a/Local.props.example b/Local.props.example
@@ -4,19 +4,21 @@
     <PropTargetFramework>v4.0</PropTargetFramework>
     <PropAssemblyVersion>0.0.0.0</PropAssemblyVersion>
     <PropUsingMono>false</PropUsingMono>
-    
+
     <!-- Assembly strong naming - $(MSBuildProjectDirectory) is the RabbitMQ.Client project directory -->
     <!-- <PropKeyfile>$(MSBuildProjectDirectory)\rabbit.snk</PropKeyfile> -->
-    
+
     <!-- Program to prepend to commands when launching .exe files (note the trailing space) -->
     <!-- (do not worry about this under Windows, just set PropUsingMono to false) -->
     <PropLaunchExe Condition="'$(PropUsingMono)' == 'true'">mono --debug </PropLaunchExe>
 
+    <!-- Windows RT -->
+    <PropBuildWinRT Condition="'$(PropUsingMono)' != 'true'">true</PropBuildWinRT>
+
     <!-- WCF component only for Windows -->
     <PropBuildWcf Condition="'$(PropUsingMono)' != 'true'">true</PropBuildWcf>
 
     <!-- Uncomment to run a single test case with /t:RunSingleUnitTest -->
     <!-- <PropTestToRun>RabbitMQ.Client.Unit.TestConnectionRecovery</PropTestToRun> -->
   </PropertyGroup>
 </Project>
-
diff --git a/RabbitMQ.Client.nuspec b/RabbitMQ.Client.nuspec
@@ -19,7 +19,12 @@
     <file src="projects\client\RabbitMQ.Client\build\bin\RabbitMQ.Client.dll" target="lib\net40" />
     <file src="projects\client\RabbitMQ.Client\build\bin\RabbitMQ.Client.pdb" target="lib\net40" />
     <file src="projects\client\RabbitMQ.Client\build\bin\RabbitMQ.Client.xml" target="lib\net40" />
+    <file src="projects\client\RabbitMQ.Client.WinRT\build\bin\RabbitMQ.Client.dll" target="lib\netcore45" />
+    <file src="projects\client\RabbitMQ.Client.WinRT\build\bin\RabbitMQ.Client.pdb" target="lib\netcore45" />
+    <file src="projects\client\RabbitMQ.Client.WinRT\build\bin\RabbitMQ.Client.xml" target="lib\netcore45" />
     <file src="projects\client\RabbitMQ.Client\**\*.cs" target="src\projects\client\RabbitMQ.Client" />
+    <file src="projects\client\RabbitMQ.Client.WinRT\**\*.cs" target="src\projects\client\RabbitMQ.Client.WinRT" />
     <file src="gensrc\RabbitMQ.Client\**\*.cs" target="src\gensrc\RabbitMQ.Client" />
+    <file src="gensrc\RabbitMQ.Client.WinRT\**\*.cs" target="src\gensrc\RabbitMQ.Client.WinRT" />
   </files>
 </package>
diff --git a/RabbitMQDotNetClient.sln b/RabbitMQDotNetClient.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
+VisualStudioVersion = 12.0.31101.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "projects", "projects", "{068D7DC3-8E6E-4951-B9E3-272C641BF0DE}"
 EndProject
@@ -17,6 +17,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "wcf", "wcf", "{EA42A7EF-7CE
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ConfigDemo", "ConfigDemo", "{20E34D9F-EE72-4B55-B6FE-1D0DBE5B74CD}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WinRT", "WinRT", "{5B87326D-1C2C-45A2-AD9E-4BD005A1629D}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RabbitMQ.Client.ApigenBootstrap", "projects\client\ApigenBootstrap\RabbitMQ.Client.ApigenBootstrap.csproj", "{CC8F4572-6730-4C4D-A0BB-15151E2A26AE}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RabbitMQ.Client.Apigen", "projects\client\Apigen\RabbitMQ.Client.Apigen.csproj", "{9E8B8DC5-3837-46E9-90D7-8391CC62AB45}"
@@ -64,6 +66,15 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RabbitMQ.Client.Examples.Pe
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RabbitMQ.Client.Examples.Subscriber", "projects\examples\client\Subscriber\RabbitMQ.Client.Examples.Subscriber.csproj", "{F6DF1899-A038-4DBF-86D0-0DE64F2422EC}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RabbitMQ.Client.WinRT", "projects\client\RabbitMQ.Client.WinRT\RabbitMQ.Client.WinRT.csproj", "{61D29F90-5B1C-4748-89FC-9FD2937F09C6}"
+	ProjectSection(ProjectDependencies) = postProject
+		{9E8B8DC5-3837-46E9-90D7-8391CC62AB45} = {9E8B8DC5-3837-46E9-90D7-8391CC62AB45}
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RabbitMQ.Client.Examples.WinRT.Subscriber", "projects\examples\WinRT\Subscriber\RabbitMQ.Client.Examples.WinRT.Subscriber.csproj", "{6F01C132-7938-4001-8B70-D84EBAA662CC}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RabbitMQ.Client.Unit.WinRT", "projects\client\Unit.WinRT\RabbitMQ.Client.Unit.WinRT.csproj", "{897505A9-8373-4F41-8DE8-221BF06D877D}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -202,6 +213,26 @@ Global
 		{F6DF1899-A038-4DBF-86D0-0DE64F2422EC}.DebugNoTest|Any CPU.Build.0 = Debug|Any CPU
 		{F6DF1899-A038-4DBF-86D0-0DE64F2422EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F6DF1899-A038-4DBF-86D0-0DE64F2422EC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{61D29F90-5B1C-4748-89FC-9FD2937F09C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{61D29F90-5B1C-4748-89FC-9FD2937F09C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{61D29F90-5B1C-4748-89FC-9FD2937F09C6}.DebugNoTest|Any CPU.ActiveCfg = Debug|Any CPU
+		{61D29F90-5B1C-4748-89FC-9FD2937F09C6}.DebugNoTest|Any CPU.Build.0 = Debug|Any CPU
+		{61D29F90-5B1C-4748-89FC-9FD2937F09C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{61D29F90-5B1C-4748-89FC-9FD2937F09C6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6F01C132-7938-4001-8B70-D84EBAA662CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6F01C132-7938-4001-8B70-D84EBAA662CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6F01C132-7938-4001-8B70-D84EBAA662CC}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+		{6F01C132-7938-4001-8B70-D84EBAA662CC}.DebugNoTest|Any CPU.ActiveCfg = Debug|Any CPU
+		{6F01C132-7938-4001-8B70-D84EBAA662CC}.DebugNoTest|Any CPU.Build.0 = Debug|Any CPU
+		{6F01C132-7938-4001-8B70-D84EBAA662CC}.DebugNoTest|Any CPU.Deploy.0 = Debug|Any CPU
+		{6F01C132-7938-4001-8B70-D84EBAA662CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6F01C132-7938-4001-8B70-D84EBAA662CC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6F01C132-7938-4001-8B70-D84EBAA662CC}.Release|Any CPU.Deploy.0 = Release|Any CPU
+		{897505A9-8373-4F41-8DE8-221BF06D877D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{897505A9-8373-4F41-8DE8-221BF06D877D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{897505A9-8373-4F41-8DE8-221BF06D877D}.DebugNoTest|Any CPU.ActiveCfg = Debug|Any CPU
+		{897505A9-8373-4F41-8DE8-221BF06D877D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{897505A9-8373-4F41-8DE8-221BF06D877D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -210,13 +241,15 @@ Global
 		{ECCBAEE2-24C9-4C95-A88C-03B68E866F0F} = {068D7DC3-8E6E-4951-B9E3-272C641BF0DE}
 		{9093855F-C802-407D-B127-CADD8F92FCD8} = {068D7DC3-8E6E-4951-B9E3-272C641BF0DE}
 		{23B4D18E-E5D3-4BF8-A488-021B96A5DD72} = {068D7DC3-8E6E-4951-B9E3-272C641BF0DE}
+		{78D13AD2-B1AC-442C-95C8-958D643FC40B} = {23B4D18E-E5D3-4BF8-A488-021B96A5DD72}
+		{EA42A7EF-7CE6-4EDA-98EA-6675C7EF7F69} = {23B4D18E-E5D3-4BF8-A488-021B96A5DD72}
+		{20E34D9F-EE72-4B55-B6FE-1D0DBE5B74CD} = {EA42A7EF-7CE6-4EDA-98EA-6675C7EF7F69}
+		{5B87326D-1C2C-45A2-AD9E-4BD005A1629D} = {23B4D18E-E5D3-4BF8-A488-021B96A5DD72}
 		{CC8F4572-6730-4C4D-A0BB-15151E2A26AE} = {ECCBAEE2-24C9-4C95-A88C-03B68E866F0F}
 		{9E8B8DC5-3837-46E9-90D7-8391CC62AB45} = {ECCBAEE2-24C9-4C95-A88C-03B68E866F0F}
 		{71713FDD-D5EC-40B2-A924-76F80AD57E12} = {ECCBAEE2-24C9-4C95-A88C-03B68E866F0F}
 		{DC9022AA-DC30-4871-AD28-3F166E05DBB5} = {ECCBAEE2-24C9-4C95-A88C-03B68E866F0F}
 		{5117232B-EE07-46F8-8AF5-2B636F1DBF56} = {9093855F-C802-407D-B127-CADD8F92FCD8}
-		{78D13AD2-B1AC-442C-95C8-958D643FC40B} = {23B4D18E-E5D3-4BF8-A488-021B96A5DD72}
-		{EA42A7EF-7CE6-4EDA-98EA-6675C7EF7F69} = {23B4D18E-E5D3-4BF8-A488-021B96A5DD72}
 		{F03945AD-08C5-4531-805C-5B0BA110E9CF} = {78D13AD2-B1AC-442C-95C8-958D643FC40B}
 		{95E9B6BE-FCA4-4C59-AFAB-1D974D972981} = {78D13AD2-B1AC-442C-95C8-958D643FC40B}
 		{7B63B8B6-6D7B-4A97-B842-F92106300EF5} = {78D13AD2-B1AC-442C-95C8-958D643FC40B}
@@ -226,14 +259,16 @@ Global
 		{A626CC84-04E9-4614-A389-FCE3122BE6BC} = {78D13AD2-B1AC-442C-95C8-958D643FC40B}
 		{23680866-F877-4E06-B999-FDFD0B6A8CF6} = {78D13AD2-B1AC-442C-95C8-958D643FC40B}
 		{6BF8B993-1722-446E-89B3-7BAC6066BECC} = {78D13AD2-B1AC-442C-95C8-958D643FC40B}
+		{201B37E1-9BFC-4A01-9760-30C5BB19CFE3} = {20E34D9F-EE72-4B55-B6FE-1D0DBE5B74CD}
+		{8D0DEB29-349C-4617-B61E-B22DE144BD22} = {20E34D9F-EE72-4B55-B6FE-1D0DBE5B74CD}
+		{034B2E6C-78F4-4205-A73A-5D74E83B5F26} = {20E34D9F-EE72-4B55-B6FE-1D0DBE5B74CD}
+		{39CA1299-1F9E-452E-AA00-4BF874944B1E} = {EA42A7EF-7CE6-4EDA-98EA-6675C7EF7F69}
 		{44D14FF0-1015-4AAA-ABCA-BF611879816C} = {78D13AD2-B1AC-442C-95C8-958D643FC40B}
 		{8BCE15DB-C92F-4FA4-AE57-9CA73DE91EB2} = {78D13AD2-B1AC-442C-95C8-958D643FC40B}
 		{6ED176D6-B789-4673-8300-CB671962FE00} = {78D13AD2-B1AC-442C-95C8-958D643FC40B}
 		{F6DF1899-A038-4DBF-86D0-0DE64F2422EC} = {78D13AD2-B1AC-442C-95C8-958D643FC40B}
-		{20E34D9F-EE72-4B55-B6FE-1D0DBE5B74CD} = {EA42A7EF-7CE6-4EDA-98EA-6675C7EF7F69}
-		{39CA1299-1F9E-452E-AA00-4BF874944B1E} = {EA42A7EF-7CE6-4EDA-98EA-6675C7EF7F69}
-		{201B37E1-9BFC-4A01-9760-30C5BB19CFE3} = {20E34D9F-EE72-4B55-B6FE-1D0DBE5B74CD}
-		{8D0DEB29-349C-4617-B61E-B22DE144BD22} = {20E34D9F-EE72-4B55-B6FE-1D0DBE5B74CD}
-		{034B2E6C-78F4-4205-A73A-5D74E83B5F26} = {20E34D9F-EE72-4B55-B6FE-1D0DBE5B74CD}
+		{61D29F90-5B1C-4748-89FC-9FD2937F09C6} = {ECCBAEE2-24C9-4C95-A88C-03B68E866F0F}
+		{6F01C132-7938-4001-8B70-D84EBAA662CC} = {5B87326D-1C2C-45A2-AD9E-4BD005A1629D}
+		{897505A9-8373-4F41-8DE8-221BF06D877D} = {ECCBAEE2-24C9-4C95-A88C-03B68E866F0F}
 	EndGlobalSection
 EndGlobal
diff --git a/RabbitMQDotNetClient.sln.DotSettings b/RabbitMQDotNetClient.sln.DotSettings
@@ -100,6 +100,167 @@
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_MULTIPLE_TYPE_PARAMEER_CONSTRAINTS_STYLE/@EntryValue">CHOP_ALWAYS</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/JavaScriptCodeFormatting/ALIGN_MULTIPLE_DECLARATION/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/JavaScriptCodeFormatting/JavaScriptFormatOther/ALIGN_MULTIPLE_DECLARATION/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/CSharpFileLayoutPatterns/Pattern/@EntryValue">&lt;Patterns xmlns="urn:schemas-jetbrains-com:member-reordering-patterns"&gt;&#xD;
+  &lt;TypePattern DisplayName="COM interfaces or structs"&gt;&#xD;
+    &lt;TypePattern.Match&gt;&#xD;
+      &lt;Or&gt;&#xD;
+        &lt;And&gt;&#xD;
+          &lt;Kind Is="Interface" /&gt;&#xD;
+          &lt;Or&gt;&#xD;
+            &lt;HasAttribute Name="System.Runtime.InteropServices.InterfaceTypeAttribute" /&gt;&#xD;
+            &lt;HasAttribute Name="System.Runtime.InteropServices.ComImport" /&gt;&#xD;
+          &lt;/Or&gt;&#xD;
+        &lt;/And&gt;&#xD;
+        &lt;HasAttribute Name="System.Runtime.InteropServices.StructLayoutAttribute" /&gt;&#xD;
+      &lt;/Or&gt;&#xD;
+    &lt;/TypePattern.Match&gt;&#xD;
+  &lt;/TypePattern&gt;&#xD;
+&#xD;
+  &lt;TypePattern DisplayName="NUnit Test Fixtures" RemoveRegions="All"&gt;&#xD;
+    &lt;TypePattern.Match&gt;&#xD;
+      &lt;And&gt;&#xD;
+        &lt;Kind Is="Class" /&gt;&#xD;
+        &lt;HasAttribute Name="NUnit.Framework.TestFixtureAttribute" Inherited="true" /&gt;&#xD;
+        &lt;HasAttribute Name="NUnit.Framework.TestCaseFixtureAttribute" Inherited="true" /&gt;&#xD;
+      &lt;/And&gt;&#xD;
+    &lt;/TypePattern.Match&gt;&#xD;
+&#xD;
+    &lt;Entry DisplayName="Setup/Teardown Methods"&gt;&#xD;
+      &lt;Entry.Match&gt;&#xD;
+        &lt;And&gt;&#xD;
+          &lt;Kind Is="Method" /&gt;&#xD;
+          &lt;Or&gt;&#xD;
+            &lt;HasAttribute Name="NUnit.Framework.SetUpAttribute" Inherited="true" /&gt;&#xD;
+            &lt;HasAttribute Name="NUnit.Framework.TearDownAttribute" Inherited="true" /&gt;&#xD;
+            &lt;HasAttribute Name="NUnit.Framework.FixtureSetUpAttribute" Inherited="true" /&gt;&#xD;
+            &lt;HasAttribute Name="NUnit.Framework.FixtureTearDownAttribute" Inherited="true" /&gt;&#xD;
+          &lt;/Or&gt;&#xD;
+        &lt;/And&gt;&#xD;
+      &lt;/Entry.Match&gt;&#xD;
+    &lt;/Entry&gt;&#xD;
+&#xD;
+    &lt;Entry DisplayName="All other members" /&gt;&#xD;
+&#xD;
+    &lt;Entry DisplayName="Test Methods" Priority="100"&gt;&#xD;
+      &lt;Entry.Match&gt;&#xD;
+        &lt;And&gt;&#xD;
+          &lt;Kind Is="Method" /&gt;&#xD;
+          &lt;HasAttribute Name="NUnit.Framework.TestAttribute" Inherited="false" /&gt;&#xD;
+        &lt;/And&gt;&#xD;
+      &lt;/Entry.Match&gt;&#xD;
+&#xD;
+      &lt;Entry.SortBy&gt;&#xD;
+        &lt;Name /&gt;&#xD;
+      &lt;/Entry.SortBy&gt;&#xD;
+    &lt;/Entry&gt;&#xD;
+  &lt;/TypePattern&gt;&#xD;
+&#xD;
+  &lt;TypePattern DisplayName="Default Pattern"&gt;&#xD;
+    &lt;Entry DisplayName="Public Delegates" Priority="100"&gt;&#xD;
+      &lt;Entry.Match&gt;&#xD;
+        &lt;And&gt;&#xD;
+          &lt;Access Is="Public" /&gt;&#xD;
+          &lt;Kind Is="Delegate" /&gt;&#xD;
+        &lt;/And&gt;&#xD;
+      &lt;/Entry.Match&gt;&#xD;
+&#xD;
+      &lt;Entry.SortBy&gt;&#xD;
+        &lt;Name /&gt;&#xD;
+      &lt;/Entry.SortBy&gt;&#xD;
+    &lt;/Entry&gt;&#xD;
+&#xD;
+    &lt;Entry DisplayName="Public Enums" Priority="100"&gt;&#xD;
+      &lt;Entry.Match&gt;&#xD;
+        &lt;And&gt;&#xD;
+          &lt;Access Is="Public" /&gt;&#xD;
+          &lt;Kind Is="Enum" /&gt;&#xD;
+        &lt;/And&gt;&#xD;
+      &lt;/Entry.Match&gt;&#xD;
+&#xD;
+      &lt;Entry.SortBy&gt;&#xD;
+        &lt;Name /&gt;&#xD;
+      &lt;/Entry.SortBy&gt;&#xD;
+    &lt;/Entry&gt;&#xD;
+&#xD;
+    &lt;Entry DisplayName="Static Fields and Constants"&gt;&#xD;
+      &lt;Entry.Match&gt;&#xD;
+        &lt;Or&gt;&#xD;
+          &lt;Kind Is="Constant" /&gt;&#xD;
+          &lt;And&gt;&#xD;
+            &lt;Kind Is="Field" /&gt;&#xD;
+            &lt;Static /&gt;&#xD;
+          &lt;/And&gt;&#xD;
+        &lt;/Or&gt;&#xD;
+      &lt;/Entry.Match&gt;&#xD;
+&#xD;
+      &lt;Entry.SortBy&gt;&#xD;
+        &lt;Kind&gt;&#xD;
+          &lt;Kind.Order&gt;&#xD;
+            &lt;DeclarationKind&gt;Constant&lt;/DeclarationKind&gt;&#xD;
+            &lt;DeclarationKind&gt;Field&lt;/DeclarationKind&gt;&#xD;
+          &lt;/Kind.Order&gt;&#xD;
+        &lt;/Kind&gt;&#xD;
+      &lt;/Entry.SortBy&gt;&#xD;
+    &lt;/Entry&gt;&#xD;
+&#xD;
+    &lt;Entry DisplayName="Fields"&gt;&#xD;
+      &lt;Entry.Match&gt;&#xD;
+        &lt;And&gt;&#xD;
+          &lt;Kind Is="Field" /&gt;&#xD;
+          &lt;Not&gt;&#xD;
+            &lt;Static /&gt;&#xD;
+          &lt;/Not&gt;&#xD;
+        &lt;/And&gt;&#xD;
+      &lt;/Entry.Match&gt;&#xD;
+&#xD;
+      &lt;Entry.SortBy&gt;&#xD;
+        &lt;Readonly /&gt;&#xD;
+        &lt;Name /&gt;&#xD;
+      &lt;/Entry.SortBy&gt;&#xD;
+    &lt;/Entry&gt;&#xD;
+&#xD;
+    &lt;Entry DisplayName="Constructors"&gt;&#xD;
+      &lt;Entry.Match&gt;&#xD;
+        &lt;Kind Is="Constructor" /&gt;&#xD;
+      &lt;/Entry.Match&gt;&#xD;
+&#xD;
+      &lt;Entry.SortBy&gt;&#xD;
+        &lt;Static/&gt;&#xD;
+      &lt;/Entry.SortBy&gt;&#xD;
+    &lt;/Entry&gt;&#xD;
+&#xD;
+    &lt;Entry DisplayName="Properties, Indexers"&gt;&#xD;
+      &lt;Entry.Match&gt;&#xD;
+        &lt;Or&gt;&#xD;
+          &lt;Kind Is="Property" /&gt;&#xD;
+          &lt;Kind Is="Indexer" /&gt;&#xD;
+        &lt;/Or&gt;&#xD;
+      &lt;/Entry.Match&gt;&#xD;
+    &lt;/Entry&gt;&#xD;
+&#xD;
+    &lt;Entry DisplayName="Interface Implementations" Priority="100"&gt;&#xD;
+      &lt;Entry.Match&gt;&#xD;
+        &lt;And&gt;&#xD;
+          &lt;Kind Is="Member" /&gt;&#xD;
+          &lt;ImplementsInterface /&gt;&#xD;
+        &lt;/And&gt;&#xD;
+      &lt;/Entry.Match&gt;&#xD;
+&#xD;
+      &lt;Entry.SortBy&gt;&#xD;
+        &lt;ImplementsInterface Immediate="true" /&gt;&#xD;
+      &lt;/Entry.SortBy&gt;&#xD;
+    &lt;/Entry&gt;&#xD;
+&#xD;
+    &lt;Entry DisplayName="All other members" /&gt;&#xD;
+&#xD;
+    &lt;Entry DisplayName="Nested Types"&gt;&#xD;
+      &lt;Entry.Match&gt;&#xD;
+        &lt;Kind Is="Type" /&gt;&#xD;
+      &lt;/Entry.Match&gt;&#xD;
+    &lt;/Entry&gt;&#xD;
+  &lt;/TypePattern&gt;&#xD;
+&lt;/Patterns&gt;&#xD;
+</s:String>
 	<s:String x:Key="/Default/CodeStyle/CSharpMemberOrderPattern/CustomPattern/@EntryValue">&lt;?xml version="1.0" encoding="utf-8" ?&gt;&#xD;
 &#xD;
 &lt;!--&#xD;
@@ -396,5 +557,8 @@ II.2.12 &lt;HandlesEvent /&gt;&#xD;
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/VBNaming/EventHandlerPatternLong/@EntryValue">$object$_On$event$</s:String>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpFileLayoutPatternsUpgrade/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002EJavaScript_002ECodeStyle_002ESettingsUpgrade_002EJsCodeFormatterSettingsUpgrader/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>