From 38f87d9709fbf87e2eae3222cf4cbb6f465c81fb Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Sun, 17 Mar 2013 17:29:33 +0100 Subject: [PATCH] Fix build. --- SharpDevelop.Tests.sln | 11 +++++++++++ .../SettingsEditor/Project/SettingsViewContent.cs | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/SharpDevelop.Tests.sln b/SharpDevelop.Tests.sln index c16bcc493c..33a53150de 100644 --- a/SharpDevelop.Tests.sln +++ b/SharpDevelop.Tests.sln @@ -185,6 +185,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.Designer", "src\A EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.XamlDom", "src\AddIns\DisplayBindings\WpfDesign\WpfDesign.XamlDom\Project\WpfDesign.XamlDom.csproj", "{88DA149F-21B2-48AB-82C4-28FB6BDFD783}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SettingsEditor", "src\AddIns\DisplayBindings\SettingsEditor\Project\SettingsEditor.csproj", "{85226AFB-CE71-4851-9A75-7EEC663A8E8A}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Debugger", "Debugger", "{AF5E0DC1-1FA0-4346-A436-0C817C68F7C1}" ProjectSection(SolutionItems) = postProject EndProjectSection @@ -847,6 +849,14 @@ Global {56E98A01-8398-4A08-9578-C7337711A52B}.Release|Any CPU.ActiveCfg = Release|x86 {56E98A01-8398-4A08-9578-C7337711A52B}.Release|x86.Build.0 = Release|x86 {56E98A01-8398-4A08-9578-C7337711A52B}.Release|x86.ActiveCfg = Release|x86 + {85226AFB-CE71-4851-9A75-7EEC663A8E8A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {85226AFB-CE71-4851-9A75-7EEC663A8E8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {85226AFB-CE71-4851-9A75-7EEC663A8E8A}.Debug|x86.Build.0 = Debug|Any CPU + {85226AFB-CE71-4851-9A75-7EEC663A8E8A}.Debug|x86.ActiveCfg = Debug|Any CPU + {85226AFB-CE71-4851-9A75-7EEC663A8E8A}.Release|Any CPU.Build.0 = Release|Any CPU + {85226AFB-CE71-4851-9A75-7EEC663A8E8A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {85226AFB-CE71-4851-9A75-7EEC663A8E8A}.Release|x86.Build.0 = Release|Any CPU + {85226AFB-CE71-4851-9A75-7EEC663A8E8A}.Release|x86.ActiveCfg = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -920,6 +930,7 @@ Global {8AA421C8-D7AF-4957-9F43-5135328ACB24} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F} {0F5192F2-0744-4BA9-A074-6BE82D111B8D} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F} {83BAB756-1010-4A2F-9B9D-7F9EBCB288F5} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F} + {85226AFB-CE71-4851-9A75-7EEC663A8E8A} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F} {A9F12710-24E4-46D4-832C-6ECB395B9EAD} = {0F5192F2-0744-4BA9-A074-6BE82D111B8D} {B7823AE9-4B43-4859-8796-2EBDC116FBB8} = {0F5192F2-0744-4BA9-A074-6BE82D111B8D} {BAD94D6E-4159-4CB6-B991-486F412D9BB6} = {0F5192F2-0744-4BA9-A074-6BE82D111B8D} diff --git a/src/AddIns/DisplayBindings/SettingsEditor/Project/SettingsViewContent.cs b/src/AddIns/DisplayBindings/SettingsEditor/Project/SettingsViewContent.cs index 3b64f09f69..f22d5fa069 100644 --- a/src/AddIns/DisplayBindings/SettingsEditor/Project/SettingsViewContent.cs +++ b/src/AddIns/DisplayBindings/SettingsEditor/Project/SettingsViewContent.cs @@ -54,7 +54,7 @@ namespace ICSharpCode.SettingsEditor return; if (ProjectService.OpenSolution == null) return; - IProject p = ProjectService.OpenSolution.FindProjectContainingFile(this.PrimaryFileName); + IProject p = SD.ProjectService.FindProjectContainingFile(this.PrimaryFileName); if (p == null) return; FileName appConfigFileName = CompilableProject.GetAppConfigFile(p, createIfNotExists);