diff --git a/src/AddIns/BackendBindings/Python/PythonBinding.sln b/src/AddIns/BackendBindings/Python/PythonBinding.sln index d665b8d0ae..6ffbb7c7fc 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding.sln +++ b/src/AddIns/BackendBindings/Python/PythonBinding.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 10.00 # Visual Studio 2008 -# SharpDevelop 3.0.0.2745 +# SharpDevelop 3.0.0.3280 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PythonBinding", "PythonBinding\Project\PythonBinding.csproj", "{8D732610-8FC6-43BA-94C9-7126FD7FE361}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PythonBinding.Tests", "PythonBinding\Test\PythonBinding.Tests.csproj", "{23B517C9-1ECC-4419-A13F-0B7136D085CB}" @@ -88,14 +88,6 @@ Global {7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57}.Release|Any CPU.Build.0 = Release|Any CPU {7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57}.Release|Any CPU.ActiveCfg = Release|Any CPU - 9BC06DDC-39CF-4F97-8B28-30F74AA672D0.Debug|Any CPU.Build.0 = Debug|Any CPU - 9BC06DDC-39CF-4F97-8B28-30F74AA672D0.Debug|Any CPU.ActiveCfg = Debug|Any CPU - 9BC06DDC-39CF-4F97-8B28-30F74AA672D0.Release|Any CPU.Build.0 = Release|Any CPU - 9BC06DDC-39CF-4F97-8B28-30F74AA672D0.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1AC7CD-D154-45BB-8EAF-804CA8055F5A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1AC7CD-D154-45BB-8EAF-804CA8055F5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1AC7CD-D154-45BB-8EAF-804CA8055F5A}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1AC7CD-D154-45BB-8EAF-804CA8055F5A}.Release|Any CPU.ActiveCfg = Release|Any CPU {C3CBC8E3-81D8-4C5B-9941-DCCD12D50B1F}.Debug|Any CPU.Build.0 = Debug|Any CPU {C3CBC8E3-81D8-4C5B-9941-DCCD12D50B1F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C3CBC8E3-81D8-4C5B-9941-DCCD12D50B1F}.Release|Any CPU.Build.0 = Release|Any CPU diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockProject.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockProject.cs index f69d284cf3..7faa3e41e9 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockProject.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockProject.cs @@ -42,11 +42,7 @@ namespace PythonBinding.Tests.Utils } public bool ReadOnly { - get - { - FileAttributes attributes = File.GetAttributes(FileName); - return ((FileAttributes.ReadOnly & attributes) == FileAttributes.ReadOnly); - } + get { return false; } } public ICollection AvailableFileItemTypes { diff --git a/src/AddIns/BackendBindings/WixBinding/Test/Utils/WixBindingTestsHelper.cs b/src/AddIns/BackendBindings/WixBinding/Test/Utils/WixBindingTestsHelper.cs index 53915d450e..28a32abd75 100644 --- a/src/AddIns/BackendBindings/WixBinding/Test/Utils/WixBindingTestsHelper.cs +++ b/src/AddIns/BackendBindings/WixBinding/Test/Utils/WixBindingTestsHelper.cs @@ -19,6 +19,17 @@ namespace WixBinding.Tests.Utils /// public class WixBindingTestsHelper { + class DummyWixProject : WixProject + { + public DummyWixProject(ProjectCreateInformation info) : base (info) + { + } + + public override bool ReadOnly { + get { return false; } + } + } + WixBindingTestsHelper() { } @@ -37,7 +48,7 @@ namespace WixBinding.Tests.Utils info.ProjectName = "Test"; info.OutputProjectFileName = @"C:\Projects\Test\Test.wixproj"; - return new WixProject(info); + return new DummyWixProject(info); } /// diff --git a/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/ProjectNode.cs b/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/ProjectNode.cs index 94f5ee14dc..f68b05b6fe 100644 --- a/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/ProjectNode.cs +++ b/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/ProjectNode.cs @@ -49,10 +49,8 @@ namespace ICSharpCode.SharpDevelop.Project { sortOrder = 1; - - this.ContextmenuAddinTreePath = "/SharpDevelop/Pads/ProjectBrowser/ContextMenu/ProjectNode"; - this.project = project; + this.project = project; Text = project.Name; if (project.ReadOnly) { diff --git a/src/Main/Base/Project/Src/Project/AbstractProject.cs b/src/Main/Base/Project/Src/Project/AbstractProject.cs index 31fc89609a..296548870d 100644 --- a/src/Main/Base/Project/Src/Project/AbstractProject.cs +++ b/src/Main/Base/Project/Src/Project/AbstractProject.cs @@ -127,9 +127,8 @@ namespace ICSharpCode.SharpDevelop.Project /// True if the file that contains the project is readonly. /// [ReadOnly(true)] - public bool ReadOnly { - get - { + public virtual bool ReadOnly { + get { FileAttributes attributes = File.GetAttributes(FileName); return ((FileAttributes.ReadOnly & attributes) == FileAttributes.ReadOnly); } diff --git a/src/Main/Base/Test/WebReferences/DirectoryNodeFactoryTests.cs b/src/Main/Base/Test/WebReferences/DirectoryNodeFactoryTests.cs index f480154717..66a64317bf 100644 --- a/src/Main/Base/Test/WebReferences/DirectoryNodeFactoryTests.cs +++ b/src/Main/Base/Test/WebReferences/DirectoryNodeFactoryTests.cs @@ -14,7 +14,7 @@ namespace ICSharpCode.SharpDevelop.Tests.WebReferences { [TestFixture] public class DirectoryNodeFactoryTests - { + { DirectoryNode appDesignerFolderNode; DirectoryNode ordinaryFolderNode; DirectoryNode webReferencesFolderNode; diff --git a/src/Main/Base/Test/WebReferences/WebReferenceTestHelper.cs b/src/Main/Base/Test/WebReferences/WebReferenceTestHelper.cs index 6865e939a0..68baf5c77a 100644 --- a/src/Main/Base/Test/WebReferences/WebReferenceTestHelper.cs +++ b/src/Main/Base/Test/WebReferences/WebReferenceTestHelper.cs @@ -25,6 +25,7 @@ namespace ICSharpCode.SharpDevelop.Tests.WebReferences class TestProject : CompilableProject { string languageName; + bool readOnly = false; public TestProject(string languageName) : base(new Solution()) @@ -36,6 +37,10 @@ namespace ICSharpCode.SharpDevelop.Tests.WebReferences get { return languageName; } } + public override bool ReadOnly { + get { return readOnly; } + } + public override ICSharpCode.SharpDevelop.Dom.LanguageProperties LanguageProperties { get { return ICSharpCode.SharpDevelop.Dom.LanguageProperties.CSharp; } }