From 3bdf6a5b92fe62abaf3e6aa4e26420f3c85d07c7 Mon Sep 17 00:00:00 2001 From: John Lewin Date: Thu, 2 Nov 2017 18:01:37 -0700 Subject: [PATCH] Reset projects to AnyCPU --- Community.CsharpSqlite/Community.CsharpSqlite.csproj | 4 ++-- Launcher/Launcher.csproj | 2 +- MatterControl.OpenGL/MatterControl.OpenGL.csproj | 2 +- MatterControl.Printing/MatterControl.Printing.csproj | 2 +- MatterControl.csproj | 4 ++-- PluginSystem/MatterControlPluginSystem.csproj | 2 +- PrinterDriverInstaller/InfInstaller.csproj | 2 +- PrinterEmulator/PrinterEmulator.csproj | 2 +- Submodules/MatterSlice | 2 +- Submodules/agg-sharp | 2 +- .../MatterControl.AutomationTests.csproj | 2 +- Tests/MatterControl.Tests/MatterControl.Tests.csproj | 2 +- TextCreator/TextCreator.csproj | 2 +- 13 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Community.CsharpSqlite/Community.CsharpSqlite.csproj b/Community.CsharpSqlite/Community.CsharpSqlite.csproj index 9ea8ad59f..6f8d1016f 100644 --- a/Community.CsharpSqlite/Community.CsharpSqlite.csproj +++ b/Community.CsharpSqlite/Community.CsharpSqlite.csproj @@ -43,7 +43,7 @@ prompt 4 AllRules.ruleset - x86 + AnyCPU false @@ -53,7 +53,7 @@ prompt 4 AllRules.ruleset - x86 + AnyCPU false diff --git a/Launcher/Launcher.csproj b/Launcher/Launcher.csproj index e8bc40be0..65a0f7197 100644 --- a/Launcher/Launcher.csproj +++ b/Launcher/Launcher.csproj @@ -39,7 +39,7 @@ prompt 4 True - x86 + AnyCPU false diff --git a/MatterControl.OpenGL/MatterControl.OpenGL.csproj b/MatterControl.OpenGL/MatterControl.OpenGL.csproj index dd29ffa91..35cdfd0c3 100644 --- a/MatterControl.OpenGL/MatterControl.OpenGL.csproj +++ b/MatterControl.OpenGL/MatterControl.OpenGL.csproj @@ -31,7 +31,7 @@ prompt 4 true - x86 + AnyCPU diff --git a/MatterControl.Printing/MatterControl.Printing.csproj b/MatterControl.Printing/MatterControl.Printing.csproj index 1a6e69deb..8cb06641e 100644 --- a/MatterControl.Printing/MatterControl.Printing.csproj +++ b/MatterControl.Printing/MatterControl.Printing.csproj @@ -29,7 +29,7 @@ TRACE prompt 4 - x86 + AnyCPU diff --git a/MatterControl.csproj b/MatterControl.csproj index 6ab70ca25..b72b0c765 100644 --- a/MatterControl.csproj +++ b/MatterControl.csproj @@ -62,9 +62,9 @@ TRACE;USE_OPENGL;IS_WINDOWS;IS_WINDOWS_FORMS prompt 4 - x86 + AnyCPU true - false + true application.ico diff --git a/PluginSystem/MatterControlPluginSystem.csproj b/PluginSystem/MatterControlPluginSystem.csproj index 3eb7d8566..3796584db 100644 --- a/PluginSystem/MatterControlPluginSystem.csproj +++ b/PluginSystem/MatterControlPluginSystem.csproj @@ -39,7 +39,7 @@ prompt 4 True - x86 + AnyCPU false diff --git a/PrinterDriverInstaller/InfInstaller.csproj b/PrinterDriverInstaller/InfInstaller.csproj index 3e80d734c..1563e5286 100644 --- a/PrinterDriverInstaller/InfInstaller.csproj +++ b/PrinterDriverInstaller/InfInstaller.csproj @@ -39,7 +39,7 @@ prompt 4 True - x86 + AnyCPU false diff --git a/PrinterEmulator/PrinterEmulator.csproj b/PrinterEmulator/PrinterEmulator.csproj index 8bd2a5dac..7696d1624 100644 --- a/PrinterEmulator/PrinterEmulator.csproj +++ b/PrinterEmulator/PrinterEmulator.csproj @@ -40,7 +40,7 @@ 4 - x86 + AnyCPU pdbonly true bin\Release\ diff --git a/Submodules/MatterSlice b/Submodules/MatterSlice index b0f52370f..009146569 160000 --- a/Submodules/MatterSlice +++ b/Submodules/MatterSlice @@ -1 +1 @@ -Subproject commit b0f52370f39bd48a63ce35029e84b87077decb0c +Subproject commit 009146569532dec83235387e992344a282c28b56 diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index 4a89abcb2..11f396464 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit 4a89abcb25aa979e86aebc02aa8f50219eb97eee +Subproject commit 11f3964642694064aabca0fa7d0c725caffd961d diff --git a/Tests/MatterControl.AutomationTests/MatterControl.AutomationTests.csproj b/Tests/MatterControl.AutomationTests/MatterControl.AutomationTests.csproj index e19b57ba2..fec14c6e5 100644 --- a/Tests/MatterControl.AutomationTests/MatterControl.AutomationTests.csproj +++ b/Tests/MatterControl.AutomationTests/MatterControl.AutomationTests.csproj @@ -30,7 +30,7 @@ TRACE prompt 4 - x86 + AnyCPU diff --git a/Tests/MatterControl.Tests/MatterControl.Tests.csproj b/Tests/MatterControl.Tests/MatterControl.Tests.csproj index 4d0b68577..ab9771c92 100644 --- a/Tests/MatterControl.Tests/MatterControl.Tests.csproj +++ b/Tests/MatterControl.Tests/MatterControl.Tests.csproj @@ -34,7 +34,7 @@ TRACE prompt 4 - x86 + AnyCPU diff --git a/TextCreator/TextCreator.csproj b/TextCreator/TextCreator.csproj index c33583647..e568ded3a 100644 --- a/TextCreator/TextCreator.csproj +++ b/TextCreator/TextCreator.csproj @@ -38,7 +38,7 @@ prompt 4 True - x86 + AnyCPU false