From 9ac61ed869cd8d354c7a4cefa79b9efb99a42f9e Mon Sep 17 00:00:00 2001 From: Ben Vanik Date: Tue, 26 May 2015 17:50:41 -0700 Subject: [PATCH] Fixing form designer. --- .../Properties/Settings.Designer.cs | 26 +++++++++---------- src/Xenia.Debug.UI/Xenia.Debug.UI.csproj | 11 +++++--- src/Xenia.Debug/Xenia.Debug.csproj | 4 +-- third_party/dockpanelsuite | 2 +- xenia.sln | 24 ++++++++--------- 5 files changed, 35 insertions(+), 32 deletions(-) diff --git a/src/Xenia.Debug.UI/Properties/Settings.Designer.cs b/src/Xenia.Debug.UI/Properties/Settings.Designer.cs index 3d57573ac..17cc0fe4f 100644 --- a/src/Xenia.Debug.UI/Properties/Settings.Designer.cs +++ b/src/Xenia.Debug.UI/Properties/Settings.Designer.cs @@ -9,18 +9,18 @@ //------------------------------------------------------------------------------ namespace Xenia.Debug.UI.Properties { - - - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { - - private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default { - get { - return defaultInstance; - } + + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")] + internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { + + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); + + public static Settings Default { + get { + return defaultInstance; + } + } } - } } diff --git a/src/Xenia.Debug.UI/Xenia.Debug.UI.csproj b/src/Xenia.Debug.UI/Xenia.Debug.UI.csproj index 6682d6a19..3b87864b9 100644 --- a/src/Xenia.Debug.UI/Xenia.Debug.UI.csproj +++ b/src/Xenia.Debug.UI/Xenia.Debug.UI.csproj @@ -11,6 +11,7 @@ Xenia.Debug.UI v4.5 512 + true @@ -18,10 +19,11 @@ ..\..\build\obj\Debug\ DEBUG;TRACE full - x64 + AnyCPU prompt MinimumRecommendedRules.ruleset - true + false + true ..\..\build\bin\Release\ @@ -29,10 +31,11 @@ TRACE true pdbonly - x64 + AnyCPU prompt MinimumRecommendedRules.ruleset - true + false + true Xenia.Debug.UI.Program diff --git a/src/Xenia.Debug/Xenia.Debug.csproj b/src/Xenia.Debug/Xenia.Debug.csproj index 2b474d792..45fb6e891 100644 --- a/src/Xenia.Debug/Xenia.Debug.csproj +++ b/src/Xenia.Debug/Xenia.Debug.csproj @@ -18,7 +18,7 @@ ..\..\build\obj\Debug\ DEBUG;TRACE full - x64 + AnyCPU prompt MinimumRecommendedRules.ruleset true @@ -29,7 +29,7 @@ TRACE true pdbonly - x64 + AnyCPU prompt MinimumRecommendedRules.ruleset true diff --git a/third_party/dockpanelsuite b/third_party/dockpanelsuite index 16dc07897..efca435c2 160000 --- a/third_party/dockpanelsuite +++ b/third_party/dockpanelsuite @@ -1 +1 @@ -Subproject commit 16dc0789727d8725166d1dbb1a066cdb05c49f7a +Subproject commit efca435c2c638ccbd47cde19f5a981082e19e37c diff --git a/xenia.sln b/xenia.sln index 60caf40c9..8636225d2 100644 --- a/xenia.sln +++ b/xenia.sln @@ -66,18 +66,18 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {0CE149F6-41C3-4224-9E57-C02E8C7CD312}.Checked|x64.ActiveCfg = Checked|x64 - {0CE149F6-41C3-4224-9E57-C02E8C7CD312}.Checked|x64.Build.0 = Checked|x64 - {0CE149F6-41C3-4224-9E57-C02E8C7CD312}.Debug|x64.ActiveCfg = Debug|x64 - {0CE149F6-41C3-4224-9E57-C02E8C7CD312}.Debug|x64.Build.0 = Debug|x64 - {0CE149F6-41C3-4224-9E57-C02E8C7CD312}.Release|x64.ActiveCfg = Release|x64 - {0CE149F6-41C3-4224-9E57-C02E8C7CD312}.Release|x64.Build.0 = Release|x64 {88F908AF-79A3-4ED4-87C7-A76368205264}.Checked|x64.ActiveCfg = Checked|x64 {88F908AF-79A3-4ED4-87C7-A76368205264}.Checked|x64.Build.0 = Checked|x64 {88F908AF-79A3-4ED4-87C7-A76368205264}.Debug|x64.ActiveCfg = Debug|x64 {88F908AF-79A3-4ED4-87C7-A76368205264}.Debug|x64.Build.0 = Debug|x64 {88F908AF-79A3-4ED4-87C7-A76368205264}.Release|x64.ActiveCfg = Release|x64 {88F908AF-79A3-4ED4-87C7-A76368205264}.Release|x64.Build.0 = Release|x64 + {0CE149F6-41C3-4224-9E57-C02E8C7CD312}.Checked|x64.ActiveCfg = Checked|x64 + {0CE149F6-41C3-4224-9E57-C02E8C7CD312}.Checked|x64.Build.0 = Checked|x64 + {0CE149F6-41C3-4224-9E57-C02E8C7CD312}.Debug|x64.ActiveCfg = Debug|x64 + {0CE149F6-41C3-4224-9E57-C02E8C7CD312}.Debug|x64.Build.0 = Debug|x64 + {0CE149F6-41C3-4224-9E57-C02E8C7CD312}.Release|x64.ActiveCfg = Release|x64 + {0CE149F6-41C3-4224-9E57-C02E8C7CD312}.Release|x64.Build.0 = Release|x64 {AE4AF147-715A-4C24-8BFA-136332DED28F}.Checked|x64.ActiveCfg = Checked|x64 {AE4AF147-715A-4C24-8BFA-136332DED28F}.Checked|x64.Build.0 = Checked|x64 {AE4AF147-715A-4C24-8BFA-136332DED28F}.Debug|x64.ActiveCfg = Debug|x64 @@ -126,12 +126,12 @@ Global {75A94CEB-442C-45B6-AEEC-A5F16D4543F3}.Debug|x64.Build.0 = Debug|x64 {75A94CEB-442C-45B6-AEEC-A5F16D4543F3}.Release|x64.ActiveCfg = Release|x64 {75A94CEB-442C-45B6-AEEC-A5F16D4543F3}.Release|x64.Build.0 = Release|x64 - {C75532C4-765B-418E-B09B-46D36B2ABDB1}.Checked|x64.ActiveCfg = Release|Any CPU - {C75532C4-765B-418E-B09B-46D36B2ABDB1}.Checked|x64.Build.0 = Release|Any CPU - {C75532C4-765B-418E-B09B-46D36B2ABDB1}.Debug|x64.ActiveCfg = Debug|Any CPU - {C75532C4-765B-418E-B09B-46D36B2ABDB1}.Debug|x64.Build.0 = Debug|Any CPU - {C75532C4-765B-418E-B09B-46D36B2ABDB1}.Release|x64.ActiveCfg = Release|Any CPU - {C75532C4-765B-418E-B09B-46D36B2ABDB1}.Release|x64.Build.0 = Release|Any CPU + {C75532C4-765B-418E-B09B-46D36B2ABDB1}.Checked|x64.ActiveCfg = Debug|x64 + {C75532C4-765B-418E-B09B-46D36B2ABDB1}.Checked|x64.Build.0 = Debug|x64 + {C75532C4-765B-418E-B09B-46D36B2ABDB1}.Debug|x64.ActiveCfg = Debug|x64 + {C75532C4-765B-418E-B09B-46D36B2ABDB1}.Debug|x64.Build.0 = Debug|x64 + {C75532C4-765B-418E-B09B-46D36B2ABDB1}.Release|x64.ActiveCfg = Release|x64 + {C75532C4-765B-418E-B09B-46D36B2ABDB1}.Release|x64.Build.0 = Release|x64 {21DDCB81-68A3-4AB2-8CB0-C2B051B9FDDC}.Checked|x64.ActiveCfg = Debug|x64 {21DDCB81-68A3-4AB2-8CB0-C2B051B9FDDC}.Checked|x64.Build.0 = Debug|x64 {21DDCB81-68A3-4AB2-8CB0-C2B051B9FDDC}.Debug|x64.ActiveCfg = Debug|x64