diff --git a/Tests/Cosmos.Common.Tests/Cosmos.Common.Tests.csproj b/Tests/Cosmos.Common.Tests/Cosmos.Common.Tests.csproj
index 11d965442..33696643c 100644
--- a/Tests/Cosmos.Common.Tests/Cosmos.Common.Tests.csproj
+++ b/Tests/Cosmos.Common.Tests/Cosmos.Common.Tests.csproj
@@ -59,7 +59,7 @@
bin\Debug\
DEBUG;TRACE
full
- AnyCPU
+ x86
prompt
MinimumRecommendedRules.ruleset
diff --git a/Tests/Cosmos.Compiler.Tests/Cosmos.Compiler.Tests.csproj b/Tests/Cosmos.Compiler.Tests/Cosmos.Compiler.Tests.csproj
index 3acf00148..c330e3aab 100644
--- a/Tests/Cosmos.Compiler.Tests/Cosmos.Compiler.Tests.csproj
+++ b/Tests/Cosmos.Compiler.Tests/Cosmos.Compiler.Tests.csproj
@@ -59,7 +59,7 @@
bin\Debug\
DEBUG;TRACE
full
- AnyCPU
+ x86
prompt
MinimumRecommendedRules.ruleset
diff --git a/source/Cosmos.Build.Common.Tests/Cosmos.Build.Common.Tests.csproj b/source/Cosmos.Build.Common.Tests/Cosmos.Build.Common.Tests.csproj
index 4f4f6b272..c79ada5b9 100644
--- a/source/Cosmos.Build.Common.Tests/Cosmos.Build.Common.Tests.csproj
+++ b/source/Cosmos.Build.Common.Tests/Cosmos.Build.Common.Tests.csproj
@@ -56,6 +56,24 @@
prompt
4
+
+ true
+ bin\Debug\
+ DEBUG;TRACE
+ full
+ x86
+ prompt
+ MinimumRecommendedRules.ruleset
+
+
+ bin\Release\
+ TRACE
+ true
+ pdbonly
+ AnyCPU
+ prompt
+ MinimumRecommendedRules.ruleset
+
diff --git a/source/Cosmos.Core.Memory.Test/Cosmos.Core.Memory.Test.csproj b/source/Cosmos.Core.Memory.Test/Cosmos.Core.Memory.Test.csproj
index cc973c351..77d26a1f4 100644
--- a/source/Cosmos.Core.Memory.Test/Cosmos.Core.Memory.Test.csproj
+++ b/source/Cosmos.Core.Memory.Test/Cosmos.Core.Memory.Test.csproj
@@ -26,6 +26,7 @@
prompt
4
true
+ x86
pdbonly
@@ -35,6 +36,25 @@
prompt
4
+
+ true
+ bin\x86\Debug\
+ DEBUG;TRACE
+ true
+ full
+ x86
+ prompt
+ MinimumRecommendedRules.ruleset
+
+
+ bin\x86\Release\
+ TRACE
+ true
+ pdbonly
+ x86
+ prompt
+ MinimumRecommendedRules.ruleset
+
diff --git a/source/Cosmos.Core.Memory/Cosmos.Core.Memory.csproj b/source/Cosmos.Core.Memory/Cosmos.Core.Memory.csproj
index e2d87a136..cb7f0cde8 100644
--- a/source/Cosmos.Core.Memory/Cosmos.Core.Memory.csproj
+++ b/source/Cosmos.Core.Memory/Cosmos.Core.Memory.csproj
@@ -37,6 +37,25 @@
..\Cosmos.snk
+
+ true
+ bin\x86\Debug\
+ DEBUG;TRACE
+ true
+ full
+ x86
+ prompt
+ MinimumRecommendedRules.ruleset
+
+
+ bin\x86\Release\
+ TRACE
+ true
+ pdbonly
+ x86
+ prompt
+ MinimumRecommendedRules.ruleset
+
diff --git a/source/Cosmos.Core.Tests/Cosmos.Core.Tests.csproj b/source/Cosmos.Core.Tests/Cosmos.Core.Tests.csproj
index c68e66519..c71e13417 100644
--- a/source/Cosmos.Core.Tests/Cosmos.Core.Tests.csproj
+++ b/source/Cosmos.Core.Tests/Cosmos.Core.Tests.csproj
@@ -63,7 +63,7 @@
TRACE;DEBUG
true
full
- AnyCPU
+ x86
prompt
MinimumRecommendedRules.ruleset
diff --git a/source/Cosmos.System.Tests/Cosmos.System.Tests.csproj b/source/Cosmos.System.Tests/Cosmos.System.Tests.csproj
index 86a4ab9d6..05d508575 100644
--- a/source/Cosmos.System.Tests/Cosmos.System.Tests.csproj
+++ b/source/Cosmos.System.Tests/Cosmos.System.Tests.csproj
@@ -65,7 +65,7 @@
bin\Debug\
TRACE;DEBUG
full
- AnyCPU
+ x86
prompt
MinimumRecommendedRules.ruleset
diff --git a/source/Cosmos.VS.Windows.Test/Cosmos.VS.Windows.Test.csproj b/source/Cosmos.VS.Windows.Test/Cosmos.VS.Windows.Test.csproj
index 26d8527fe..096863f3f 100644
--- a/source/Cosmos.VS.Windows.Test/Cosmos.VS.Windows.Test.csproj
+++ b/source/Cosmos.VS.Windows.Test/Cosmos.VS.Windows.Test.csproj
@@ -65,7 +65,7 @@
bin\Debug\
DEBUG;TRACE
full
- AnyCPU
+ x86
prompt
MinimumRecommendedRules.ruleset
diff --git a/source/Cosmos.sln b/source/Cosmos.sln
index 5e0834f66..3a2f0ea5f 100644
--- a/source/Cosmos.sln
+++ b/source/Cosmos.sln
@@ -1109,8 +1109,8 @@ Global
{0FEE977D-AE52-4381-B513-71C5C1982ED4}.Release|x64.Build.0 = Debug|x86
{0FEE977D-AE52-4381-B513-71C5C1982ED4}.Release|x86.ActiveCfg = Debug|x86
{0FEE977D-AE52-4381-B513-71C5C1982ED4}.Release|x86.Build.0 = Debug|x86
- {901EA2C4-5E9C-44E8-B6D2-3B23DEE6D61B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {901EA2C4-5E9C-44E8-B6D2-3B23DEE6D61B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {901EA2C4-5E9C-44E8-B6D2-3B23DEE6D61B}.Debug|Any CPU.ActiveCfg = Debug|x86
+ {901EA2C4-5E9C-44E8-B6D2-3B23DEE6D61B}.Debug|Any CPU.Build.0 = Debug|x86
{901EA2C4-5E9C-44E8-B6D2-3B23DEE6D61B}.Debug|x64.ActiveCfg = Debug|Any CPU
{901EA2C4-5E9C-44E8-B6D2-3B23DEE6D61B}.Debug|x64.Build.0 = Debug|Any CPU
{901EA2C4-5E9C-44E8-B6D2-3B23DEE6D61B}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -1121,8 +1121,8 @@ Global
{901EA2C4-5E9C-44E8-B6D2-3B23DEE6D61B}.Release|x64.Build.0 = Release|Any CPU
{901EA2C4-5E9C-44E8-B6D2-3B23DEE6D61B}.Release|x86.ActiveCfg = Release|Any CPU
{901EA2C4-5E9C-44E8-B6D2-3B23DEE6D61B}.Release|x86.Build.0 = Release|Any CPU
- {84BFA6F0-D518-4D22-BDCF-E07DF3C0E678}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {84BFA6F0-D518-4D22-BDCF-E07DF3C0E678}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {84BFA6F0-D518-4D22-BDCF-E07DF3C0E678}.Debug|Any CPU.ActiveCfg = Debug|x86
+ {84BFA6F0-D518-4D22-BDCF-E07DF3C0E678}.Debug|Any CPU.Build.0 = Debug|x86
{84BFA6F0-D518-4D22-BDCF-E07DF3C0E678}.Debug|x64.ActiveCfg = Debug|Any CPU
{84BFA6F0-D518-4D22-BDCF-E07DF3C0E678}.Debug|x64.Build.0 = Debug|Any CPU
{84BFA6F0-D518-4D22-BDCF-E07DF3C0E678}.Debug|x86.ActiveCfg = Debug|Any CPU
diff --git a/source/XSharp.Test/XSharp.Test.csproj b/source/XSharp.Test/XSharp.Test.csproj
index 924cc7e00..8c3a48aad 100644
--- a/source/XSharp.Test/XSharp.Test.csproj
+++ b/source/XSharp.Test/XSharp.Test.csproj
@@ -60,7 +60,7 @@
bin\Debug\
DEBUG;TRACE
full
- AnyCPU
+ x86
prompt
MinimumRecommendedRules.ruleset
true