From 1acfdf8f92444be0084176beb99c04a2288bf4b8 Mon Sep 17 00:00:00 2001 From: Evan Dixon Date: Sun, 8 Jan 2017 08:28:28 -0600 Subject: [PATCH] Removed "Any CPU" build configuration Since the solution level one didn't build the dependencies and the project level one built as x86 anyway --- PKHeX.WinForms/PKHeX.WinForms.csproj | 49 +++++++++++++--------------- PKHeX.sln | 40 +++++------------------ 2 files changed, 32 insertions(+), 57 deletions(-) diff --git a/PKHeX.WinForms/PKHeX.WinForms.csproj b/PKHeX.WinForms/PKHeX.WinForms.csproj index 004e98869..ce0ae45dd 100644 --- a/PKHeX.WinForms/PKHeX.WinForms.csproj +++ b/PKHeX.WinForms/PKHeX.WinForms.csproj @@ -29,34 +29,31 @@ false true - - x86 - true - full - false - bin\Debug\ - DEBUG;CLICKONCE;WINDOWS - prompt - 4 - false - false - - - x86 - pdbonly - true - bin\Release\ - CLICKONCE;WINDOWS - prompt - 4 - false - icon.ico - + true - bin\Debug-Mono\ + bin\x86\Debug\ + DEBUG;CLICKONCE;WINDOWS + full + x86 + false + prompt + MinimumRecommendedRules.ruleset + + + bin\x86\Release\ + CLICKONCE;WINDOWS + true + pdbonly + x86 + prompt + MinimumRecommendedRules.ruleset + + + true + bin\x86\Mono-Debug\ DEBUG;MONO full x86 @@ -64,8 +61,8 @@ prompt MinimumRecommendedRules.ruleset - - bin\Mono-Release\ + + bin\x86\Mono-Release\ MONO true pdbonly diff --git a/PKHeX.sln b/PKHeX.sln index 874dc266f..37b909c61 100644 --- a/PKHeX.sln +++ b/PKHeX.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 -VisualStudioVersion = 14.0.24720.0 +VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PKHeX.Core", "PKHeX\PKHeX.Core.csproj", "{B4EFF030-C75A-49F9-A4BC-738D1B61C4AF}" EndProject @@ -19,58 +19,36 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PKHeX.WinForms", "PKHeX.Win EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU Debug|x86 = Debug|x86 - Mono-Debug|Any CPU = Mono-Debug|Any CPU Mono-Debug|x86 = Mono-Debug|x86 - Mono-Release|Any CPU = Mono-Release|Any CPU Mono-Release|x86 = Mono-Release|x86 - Release|Any CPU = Release|Any CPU Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B4EFF030-C75A-49F9-A4BC-738D1B61C4AF}.Debug|Any CPU.ActiveCfg = Debug|x86 {B4EFF030-C75A-49F9-A4BC-738D1B61C4AF}.Debug|x86.ActiveCfg = Debug|x86 {B4EFF030-C75A-49F9-A4BC-738D1B61C4AF}.Debug|x86.Build.0 = Debug|x86 - {B4EFF030-C75A-49F9-A4BC-738D1B61C4AF}.Mono-Debug|Any CPU.ActiveCfg = Mono-Debug|x86 {B4EFF030-C75A-49F9-A4BC-738D1B61C4AF}.Mono-Debug|x86.ActiveCfg = Mono-Debug|x86 {B4EFF030-C75A-49F9-A4BC-738D1B61C4AF}.Mono-Debug|x86.Build.0 = Mono-Debug|x86 - {B4EFF030-C75A-49F9-A4BC-738D1B61C4AF}.Mono-Release|Any CPU.ActiveCfg = Mono-Release|x86 {B4EFF030-C75A-49F9-A4BC-738D1B61C4AF}.Mono-Release|x86.ActiveCfg = Mono-Release|x86 {B4EFF030-C75A-49F9-A4BC-738D1B61C4AF}.Mono-Release|x86.Build.0 = Mono-Release|x86 - {B4EFF030-C75A-49F9-A4BC-738D1B61C4AF}.Release|Any CPU.ActiveCfg = Release|x86 {B4EFF030-C75A-49F9-A4BC-738D1B61C4AF}.Release|x86.ActiveCfg = Release|x86 {B4EFF030-C75A-49F9-A4BC-738D1B61C4AF}.Release|x86.Build.0 = Release|x86 - {8E2499BC-C11A-4809-8737-66D35A625425}.Debug|Any CPU.ActiveCfg = Debug|x86 {8E2499BC-C11A-4809-8737-66D35A625425}.Debug|x86.ActiveCfg = Debug|x86 {8E2499BC-C11A-4809-8737-66D35A625425}.Debug|x86.Build.0 = Debug|x86 - {8E2499BC-C11A-4809-8737-66D35A625425}.Mono-Debug|Any CPU.ActiveCfg = Release|x86 - {8E2499BC-C11A-4809-8737-66D35A625425}.Mono-Debug|Any CPU.Build.0 = Release|x86 {8E2499BC-C11A-4809-8737-66D35A625425}.Mono-Debug|x86.ActiveCfg = Debug|x86 {8E2499BC-C11A-4809-8737-66D35A625425}.Mono-Debug|x86.Build.0 = Debug|x86 - {8E2499BC-C11A-4809-8737-66D35A625425}.Mono-Release|Any CPU.ActiveCfg = Release|x86 - {8E2499BC-C11A-4809-8737-66D35A625425}.Mono-Release|Any CPU.Build.0 = Release|x86 {8E2499BC-C11A-4809-8737-66D35A625425}.Mono-Release|x86.ActiveCfg = Release|x86 {8E2499BC-C11A-4809-8737-66D35A625425}.Mono-Release|x86.Build.0 = Release|x86 - {8E2499BC-C11A-4809-8737-66D35A625425}.Release|Any CPU.ActiveCfg = Release|x86 {8E2499BC-C11A-4809-8737-66D35A625425}.Release|x86.ActiveCfg = Release|x86 {8E2499BC-C11A-4809-8737-66D35A625425}.Release|x86.Build.0 = Release|x86 - {D1B91861-A448-4762-A313-C7BC179F4415}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D1B91861-A448-4762-A313-C7BC179F4415}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D1B91861-A448-4762-A313-C7BC179F4415}.Debug|x86.ActiveCfg = Debug|Any CPU - {D1B91861-A448-4762-A313-C7BC179F4415}.Debug|x86.Build.0 = Debug|Any CPU - {D1B91861-A448-4762-A313-C7BC179F4415}.Mono-Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D1B91861-A448-4762-A313-C7BC179F4415}.Mono-Debug|Any CPU.Build.0 = Debug|Any CPU - {D1B91861-A448-4762-A313-C7BC179F4415}.Mono-Debug|x86.ActiveCfg = Mono-Debug|Any CPU - {D1B91861-A448-4762-A313-C7BC179F4415}.Mono-Debug|x86.Build.0 = Mono-Debug|Any CPU - {D1B91861-A448-4762-A313-C7BC179F4415}.Mono-Release|Any CPU.ActiveCfg = Release|Any CPU - {D1B91861-A448-4762-A313-C7BC179F4415}.Mono-Release|Any CPU.Build.0 = Release|Any CPU - {D1B91861-A448-4762-A313-C7BC179F4415}.Mono-Release|x86.ActiveCfg = Mono-Release|Any CPU - {D1B91861-A448-4762-A313-C7BC179F4415}.Mono-Release|x86.Build.0 = Mono-Release|Any CPU - {D1B91861-A448-4762-A313-C7BC179F4415}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D1B91861-A448-4762-A313-C7BC179F4415}.Release|Any CPU.Build.0 = Release|Any CPU - {D1B91861-A448-4762-A313-C7BC179F4415}.Release|x86.ActiveCfg = Release|Any CPU - {D1B91861-A448-4762-A313-C7BC179F4415}.Release|x86.Build.0 = Release|Any CPU + {D1B91861-A448-4762-A313-C7BC179F4415}.Debug|x86.ActiveCfg = Debug|x86 + {D1B91861-A448-4762-A313-C7BC179F4415}.Debug|x86.Build.0 = Debug|x86 + {D1B91861-A448-4762-A313-C7BC179F4415}.Mono-Debug|x86.ActiveCfg = Mono-Debug|x86 + {D1B91861-A448-4762-A313-C7BC179F4415}.Mono-Debug|x86.Build.0 = Mono-Debug|x86 + {D1B91861-A448-4762-A313-C7BC179F4415}.Mono-Release|x86.ActiveCfg = Mono-Release|x86 + {D1B91861-A448-4762-A313-C7BC179F4415}.Mono-Release|x86.Build.0 = Mono-Release|x86 + {D1B91861-A448-4762-A313-C7BC179F4415}.Release|x86.ActiveCfg = Release|x86 + {D1B91861-A448-4762-A313-C7BC179F4415}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE