diff --git a/source/AvalonDock.MVVMTestApp/AvalonDock.MVVMTestApp.csproj b/source/AvalonDock.MVVMTestApp/AvalonDock.MVVMTestApp.csproj
index 331fa94d..4b50ea80 100644
--- a/source/AvalonDock.MVVMTestApp/AvalonDock.MVVMTestApp.csproj
+++ b/source/AvalonDock.MVVMTestApp/AvalonDock.MVVMTestApp.csproj
@@ -53,6 +53,24 @@
prompt
MinimumRecommendedRules.ruleset
+
+ true
+ bin\x64\Debug\
+ DEBUG;TRACE
+ full
+ x64
+ prompt
+ MinimumRecommendedRules.ruleset
+
+
+ bin\x64\Release\
+ TRACE
+ true
+ pdbonly
+ x64
+ prompt
+ MinimumRecommendedRules.ruleset
+
diff --git a/source/AvalonDock.TestApp/AvalonDock.TestApp.csproj b/source/AvalonDock.TestApp/AvalonDock.TestApp.csproj
index 94a4b34f..8760009e 100644
--- a/source/AvalonDock.TestApp/AvalonDock.TestApp.csproj
+++ b/source/AvalonDock.TestApp/AvalonDock.TestApp.csproj
@@ -53,6 +53,24 @@
prompt
MinimumRecommendedRules.ruleset
+
+ true
+ bin\x64\Debug\
+ DEBUG;TRACE
+ full
+ x64
+ prompt
+ MinimumRecommendedRules.ruleset
+
+
+ bin\x64\Release\
+ TRACE
+ true
+ pdbonly
+ x64
+ prompt
+ MinimumRecommendedRules.ruleset
+
diff --git a/source/AvalonDock.WinFormsTestApp/AvalonDock.WinFormsTestApp.csproj b/source/AvalonDock.WinFormsTestApp/AvalonDock.WinFormsTestApp.csproj
index c020474e..f6cb58f6 100644
--- a/source/AvalonDock.WinFormsTestApp/AvalonDock.WinFormsTestApp.csproj
+++ b/source/AvalonDock.WinFormsTestApp/AvalonDock.WinFormsTestApp.csproj
@@ -51,6 +51,24 @@
prompt
MinimumRecommendedRules.ruleset
+
+ true
+ bin\x64\Debug\
+ DEBUG;TRACE
+ full
+ x64
+ prompt
+ MinimumRecommendedRules.ruleset
+
+
+ bin\x64\Release\
+ TRACE
+ true
+ pdbonly
+ x64
+ prompt
+ MinimumRecommendedRules.ruleset
+
diff --git a/source/AvalonDock.sln b/source/AvalonDock.sln
index 184026d3..97fd238c 100644
--- a/source/AvalonDock.sln
+++ b/source/AvalonDock.sln
@@ -23,64 +23,97 @@ EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
+ Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
+ Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{339BC0D5-2A54-40ED-9850-7ED65182E6E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{339BC0D5-2A54-40ED-9850-7ED65182E6E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {339BC0D5-2A54-40ED-9850-7ED65182E6E1}.Debug|x64.ActiveCfg = Debug|x64
+ {339BC0D5-2A54-40ED-9850-7ED65182E6E1}.Debug|x64.Build.0 = Debug|x64
{339BC0D5-2A54-40ED-9850-7ED65182E6E1}.Debug|x86.ActiveCfg = Debug|x86
{339BC0D5-2A54-40ED-9850-7ED65182E6E1}.Debug|x86.Build.0 = Debug|x86
- {339BC0D5-2A54-40ED-9850-7ED65182E6E1}.Release|Any CPU.ActiveCfg = Release|x86
+ {339BC0D5-2A54-40ED-9850-7ED65182E6E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {339BC0D5-2A54-40ED-9850-7ED65182E6E1}.Release|Any CPU.Build.0 = Release|Any CPU
+ {339BC0D5-2A54-40ED-9850-7ED65182E6E1}.Release|x64.ActiveCfg = Release|x64
+ {339BC0D5-2A54-40ED-9850-7ED65182E6E1}.Release|x64.Build.0 = Release|x64
{339BC0D5-2A54-40ED-9850-7ED65182E6E1}.Release|x86.ActiveCfg = Release|x86
{339BC0D5-2A54-40ED-9850-7ED65182E6E1}.Release|x86.Build.0 = Release|x86
{AFD48591-D66C-47F3-86E7-ACE5AD3D4FE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AFD48591-D66C-47F3-86E7-ACE5AD3D4FE4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {AFD48591-D66C-47F3-86E7-ACE5AD3D4FE4}.Debug|x64.ActiveCfg = Debug|x64
+ {AFD48591-D66C-47F3-86E7-ACE5AD3D4FE4}.Debug|x64.Build.0 = Debug|x64
{AFD48591-D66C-47F3-86E7-ACE5AD3D4FE4}.Debug|x86.ActiveCfg = Debug|x86
{AFD48591-D66C-47F3-86E7-ACE5AD3D4FE4}.Debug|x86.Build.0 = Debug|x86
- {AFD48591-D66C-47F3-86E7-ACE5AD3D4FE4}.Release|Any CPU.ActiveCfg = Release|x86
+ {AFD48591-D66C-47F3-86E7-ACE5AD3D4FE4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {AFD48591-D66C-47F3-86E7-ACE5AD3D4FE4}.Release|Any CPU.Build.0 = Release|Any CPU
+ {AFD48591-D66C-47F3-86E7-ACE5AD3D4FE4}.Release|x64.ActiveCfg = Release|x64
+ {AFD48591-D66C-47F3-86E7-ACE5AD3D4FE4}.Release|x64.Build.0 = Release|x64
{AFD48591-D66C-47F3-86E7-ACE5AD3D4FE4}.Release|x86.ActiveCfg = Release|x86
{AFD48591-D66C-47F3-86E7-ACE5AD3D4FE4}.Release|x86.Build.0 = Release|x86
{AB95D11D-7239-4F3D-88FB-278B7C8EB6DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AB95D11D-7239-4F3D-88FB-278B7C8EB6DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {AB95D11D-7239-4F3D-88FB-278B7C8EB6DF}.Debug|x64.ActiveCfg = Debug|x64
+ {AB95D11D-7239-4F3D-88FB-278B7C8EB6DF}.Debug|x64.Build.0 = Debug|x64
{AB95D11D-7239-4F3D-88FB-278B7C8EB6DF}.Debug|x86.ActiveCfg = Debug|x86
{AB95D11D-7239-4F3D-88FB-278B7C8EB6DF}.Debug|x86.Build.0 = Debug|x86
- {AB95D11D-7239-4F3D-88FB-278B7C8EB6DF}.Release|Any CPU.ActiveCfg = Release|x86
+ {AB95D11D-7239-4F3D-88FB-278B7C8EB6DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {AB95D11D-7239-4F3D-88FB-278B7C8EB6DF}.Release|Any CPU.Build.0 = Release|Any CPU
+ {AB95D11D-7239-4F3D-88FB-278B7C8EB6DF}.Release|x64.ActiveCfg = Release|x64
+ {AB95D11D-7239-4F3D-88FB-278B7C8EB6DF}.Release|x64.Build.0 = Release|x64
{AB95D11D-7239-4F3D-88FB-278B7C8EB6DF}.Release|x86.ActiveCfg = Release|x86
{AB95D11D-7239-4F3D-88FB-278B7C8EB6DF}.Release|x86.Build.0 = Release|x86
{DB81988F-E0F2-45A0-A1FD-8C37F3D35244}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DB81988F-E0F2-45A0-A1FD-8C37F3D35244}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {DB81988F-E0F2-45A0-A1FD-8C37F3D35244}.Debug|x64.ActiveCfg = Debug|x64
+ {DB81988F-E0F2-45A0-A1FD-8C37F3D35244}.Debug|x64.Build.0 = Debug|x64
{DB81988F-E0F2-45A0-A1FD-8C37F3D35244}.Debug|x86.ActiveCfg = Debug|Any CPU
{DB81988F-E0F2-45A0-A1FD-8C37F3D35244}.Debug|x86.Build.0 = Debug|Any CPU
{DB81988F-E0F2-45A0-A1FD-8C37F3D35244}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DB81988F-E0F2-45A0-A1FD-8C37F3D35244}.Release|Any CPU.Build.0 = Release|Any CPU
- {DB81988F-E0F2-45A0-A1FD-8C37F3D35244}.Release|x86.ActiveCfg = Release|Any CPU
- {DB81988F-E0F2-45A0-A1FD-8C37F3D35244}.Release|x86.Build.0 = Release|Any CPU
+ {DB81988F-E0F2-45A0-A1FD-8C37F3D35244}.Release|x64.ActiveCfg = Release|x64
+ {DB81988F-E0F2-45A0-A1FD-8C37F3D35244}.Release|x64.Build.0 = Release|x64
+ {DB81988F-E0F2-45A0-A1FD-8C37F3D35244}.Release|x86.ActiveCfg = Release|x86
+ {DB81988F-E0F2-45A0-A1FD-8C37F3D35244}.Release|x86.Build.0 = Release|x86
{488DD8F7-9D3C-4F53-BD1F-84A095D9BC10}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{488DD8F7-9D3C-4F53-BD1F-84A095D9BC10}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {488DD8F7-9D3C-4F53-BD1F-84A095D9BC10}.Debug|x64.ActiveCfg = Debug|x64
+ {488DD8F7-9D3C-4F53-BD1F-84A095D9BC10}.Debug|x64.Build.0 = Debug|x64
{488DD8F7-9D3C-4F53-BD1F-84A095D9BC10}.Debug|x86.ActiveCfg = Debug|x86
{488DD8F7-9D3C-4F53-BD1F-84A095D9BC10}.Debug|x86.Build.0 = Debug|x86
{488DD8F7-9D3C-4F53-BD1F-84A095D9BC10}.Release|Any CPU.ActiveCfg = Release|Any CPU
{488DD8F7-9D3C-4F53-BD1F-84A095D9BC10}.Release|Any CPU.Build.0 = Release|Any CPU
+ {488DD8F7-9D3C-4F53-BD1F-84A095D9BC10}.Release|x64.ActiveCfg = Release|x64
+ {488DD8F7-9D3C-4F53-BD1F-84A095D9BC10}.Release|x64.Build.0 = Release|x64
{488DD8F7-9D3C-4F53-BD1F-84A095D9BC10}.Release|x86.ActiveCfg = Release|x86
{488DD8F7-9D3C-4F53-BD1F-84A095D9BC10}.Release|x86.Build.0 = Release|x86
{89286EB4-B4A1-418C-839A-067B00F442D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{89286EB4-B4A1-418C-839A-067B00F442D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {89286EB4-B4A1-418C-839A-067B00F442D8}.Debug|x64.ActiveCfg = Debug|x64
+ {89286EB4-B4A1-418C-839A-067B00F442D8}.Debug|x64.Build.0 = Debug|x64
{89286EB4-B4A1-418C-839A-067B00F442D8}.Debug|x86.ActiveCfg = Debug|x64
{89286EB4-B4A1-418C-839A-067B00F442D8}.Debug|x86.Build.0 = Debug|x64
{89286EB4-B4A1-418C-839A-067B00F442D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{89286EB4-B4A1-418C-839A-067B00F442D8}.Release|Any CPU.Build.0 = Release|Any CPU
- {89286EB4-B4A1-418C-839A-067B00F442D8}.Release|x86.ActiveCfg = Release|Any CPU
- {89286EB4-B4A1-418C-839A-067B00F442D8}.Release|x86.Build.0 = Release|Any CPU
+ {89286EB4-B4A1-418C-839A-067B00F442D8}.Release|x64.ActiveCfg = Release|x64
+ {89286EB4-B4A1-418C-839A-067B00F442D8}.Release|x64.Build.0 = Release|x64
+ {89286EB4-B4A1-418C-839A-067B00F442D8}.Release|x86.ActiveCfg = Release|x86
+ {89286EB4-B4A1-418C-839A-067B00F442D8}.Release|x86.Build.0 = Release|x86
{BD7EEE0E-9432-4E76-BD82-793358E56BDF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BD7EEE0E-9432-4E76-BD82-793358E56BDF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {BD7EEE0E-9432-4E76-BD82-793358E56BDF}.Debug|x64.ActiveCfg = Debug|x64
+ {BD7EEE0E-9432-4E76-BD82-793358E56BDF}.Debug|x64.Build.0 = Debug|x64
{BD7EEE0E-9432-4E76-BD82-793358E56BDF}.Debug|x86.ActiveCfg = Debug|x64
{BD7EEE0E-9432-4E76-BD82-793358E56BDF}.Debug|x86.Build.0 = Debug|x64
{BD7EEE0E-9432-4E76-BD82-793358E56BDF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BD7EEE0E-9432-4E76-BD82-793358E56BDF}.Release|Any CPU.Build.0 = Release|Any CPU
- {BD7EEE0E-9432-4E76-BD82-793358E56BDF}.Release|x86.ActiveCfg = Release|Any CPU
- {BD7EEE0E-9432-4E76-BD82-793358E56BDF}.Release|x86.Build.0 = Release|Any CPU
+ {BD7EEE0E-9432-4E76-BD82-793358E56BDF}.Release|x64.ActiveCfg = Release|x64
+ {BD7EEE0E-9432-4E76-BD82-793358E56BDF}.Release|x64.Build.0 = Release|x64
+ {BD7EEE0E-9432-4E76-BD82-793358E56BDF}.Release|x86.ActiveCfg = Release|x86
+ {BD7EEE0E-9432-4E76-BD82-793358E56BDF}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Xceed.Wpf.AvalonDock.Themes.Expression.csproj b/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Xceed.Wpf.AvalonDock.Themes.Expression.csproj
index 01040d4e..0c033682 100644
--- a/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Xceed.Wpf.AvalonDock.Themes.Expression.csproj
+++ b/source/Components/Xceed.Wpf.AvalonDock.Themes.Expression/Xceed.Wpf.AvalonDock.Themes.Expression.csproj
@@ -48,6 +48,24 @@
prompt
ManagedMinimumRules.ruleset
+
+ true
+ bin\x64\Debug\
+ DEBUG;TRACE
+ full
+ x64
+ prompt
+ MinimumRecommendedRules.ruleset
+
+
+ bin\x64\Release\
+ TRACE
+ true
+ pdbonly
+ x64
+ prompt
+ MinimumRecommendedRules.ruleset
+
diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Xceed.Wpf.AvalonDock.Themes.Metro.csproj b/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Xceed.Wpf.AvalonDock.Themes.Metro.csproj
index 80ad930d..673f79b8 100644
--- a/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Xceed.Wpf.AvalonDock.Themes.Metro.csproj
+++ b/source/Components/Xceed.Wpf.AvalonDock.Themes.Metro/Xceed.Wpf.AvalonDock.Themes.Metro.csproj
@@ -51,6 +51,24 @@
prompt
MinimumRecommendedRules.ruleset
+
+ true
+ bin\x86\Debug\
+ DEBUG;TRACE
+ full
+ x86
+ prompt
+ MinimumRecommendedRules.ruleset
+
+
+ bin\x86\Release\
+ TRACE
+ true
+ pdbonly
+ x86
+ prompt
+ MinimumRecommendedRules.ruleset
+
diff --git a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Xceed.Wpf.AvalonDock.Themes.VS2013.csproj b/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Xceed.Wpf.AvalonDock.Themes.VS2013.csproj
index bb1b7be1..2d52eabd 100644
--- a/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Xceed.Wpf.AvalonDock.Themes.VS2013.csproj
+++ b/source/Components/Xceed.Wpf.AvalonDock.Themes.VS2013/Xceed.Wpf.AvalonDock.Themes.VS2013.csproj
@@ -51,6 +51,24 @@
prompt
MinimumRecommendedRules.ruleset
+
+ true
+ bin\x86\Debug\
+ DEBUG;TRACE
+ full
+ x86
+ prompt
+ MinimumRecommendedRules.ruleset
+
+
+ bin\x86\Release\
+ TRACE
+ true
+ pdbonly
+ x86
+ prompt
+ MinimumRecommendedRules.ruleset
+
diff --git a/source/Components/Xceed.Wpf.AvalonDock/Xceed.Wpf.AvalonDock.csproj b/source/Components/Xceed.Wpf.AvalonDock/Xceed.Wpf.AvalonDock.csproj
index 4e502507..28bea22e 100644
--- a/source/Components/Xceed.Wpf.AvalonDock/Xceed.Wpf.AvalonDock.csproj
+++ b/source/Components/Xceed.Wpf.AvalonDock/Xceed.Wpf.AvalonDock.csproj
@@ -42,6 +42,42 @@
+
+ true
+ bin\x86\Debug\
+ DEBUG
+ full
+ x86
+ prompt
+ MinimumRecommendedRules.ruleset
+
+
+ bin\x86\Release\
+ TRACE
+ true
+ pdbonly
+ x86
+ prompt
+ MinimumRecommendedRules.ruleset
+
+
+ true
+ bin\x64\Debug\
+ DEBUG
+ full
+ x64
+ prompt
+ MinimumRecommendedRules.ruleset
+
+
+ bin\x64\Release\
+ TRACE
+ true
+ pdbonly
+ x64
+ prompt
+ MinimumRecommendedRules.ruleset
+