From 647befcb80984dee5da0e2a8aad88b7cd1fc6b3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20Kr=C3=BCger?= Date: Tue, 4 Jan 2005 11:09:35 +0000 Subject: [PATCH] Corsavy is now self-hosting. Hopefully no more build files are out of sync with project files issues ... git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@3 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61 --- .../Project/CSharpBinding.csproj | 26 ++++------ .../Project/CSharpBinding.csproj.user | 2 +- .../FormDesigner/Project/FormDesigner.csproj | 18 +++---- .../Project/FormDesigner.csproj.user | 2 +- .../Project/ResourceEditor.csproj | 6 +-- .../Project/ResourceEditor.csproj.user | 2 +- .../Project/FiletypeRegisterer.csproj | 22 +++----- .../Project/FiletypeRegisterer.csproj.user | 2 +- .../Project/HighlightingEditor.csproj | 22 ++++---- .../Project/HighlightingEditor.csproj.user | 2 +- .../Misc/RegExpTk/Project/RegExpTk.csproj | 22 ++++---- .../RegExpTk/Project/RegExpTk.csproj.user | 2 +- .../Misc/StartPage/Project/StartPage.csproj | 10 ++-- .../StartPage/Project/StartPage.csproj.user | 2 +- .../WinFormsUI/WinFormsUI.csproj | 49 ++++------------- .../WinFormsUI/WinFormsUI.csproj.user | 2 +- .../Project/ICSharpCode.TextEditor.csproj | 2 +- .../ICSharpCode.TextEditor.csproj.user | 2 +- .../Project/Src/Gui/TextArea.cs | 2 +- .../NRefactory/Project/NRefactory.csproj | 4 +- .../NRefactory/Project/NRefactory.csproj.user | 2 +- .../Project/ICSharpCode.SharpDevelop.csproj | 38 +++++++------- .../ICSharpCode.SharpDevelop.csproj.user | 2 +- .../Gui/Components/ExtTreeView/ExtTreeView.cs | 1 + .../ProjectBrowser/ProjectBrowserControl.cs | 6 +++ .../Util/FileRemoveTreeNodeVisitor.cs | 13 ++++- .../Util/FileRenameTreeNodeVisitor.cs | 22 ++++++-- .../Services/ProjectService/ProjectService.cs | 4 ++ src/Main/Core/Project/ICSharpCode.Core.csproj | 6 +-- .../Core/Project/ICSharpCode.Core.csproj.user | 2 +- src/Main/StartUp/Project/StartUp.csproj | 16 +++--- src/Main/StartUp/Project/StartUp.csproj.user | 2 +- src/SharpDevelop.sln | 52 +++++++++---------- src/releasebuild.bat | 3 ++ 34 files changed, 175 insertions(+), 195 deletions(-) create mode 100644 src/releasebuild.bat diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj b/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj index 2e035f9a31..e7d7fd1889 100644 --- a/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj +++ b/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj @@ -1,4 +1,4 @@ - + Debug AnyCPU @@ -29,6 +29,12 @@ ..\..\..\..\..\AddIns\AddIns\BackendBindings\CSharpBinding\ False + + + + + + @@ -52,7 +58,7 @@ UserControl - UserControl + Form UserControl @@ -69,6 +75,9 @@ + + True + @@ -91,19 +100,6 @@ ICSharpCode.Core False - - - - - - - - - - True - - - diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj.user b/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj.user index 9cfbe798d4..7ed8936b56 100644 --- a/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj.user +++ b/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj.user @@ -1,4 +1,4 @@ - + ..\..\..\..\..\bin\SharpDevelop.exe diff --git a/src/AddIns/DisplayBindings/FormDesigner/Project/FormDesigner.csproj b/src/AddIns/DisplayBindings/FormDesigner/Project/FormDesigner.csproj index f8ee5d5662..191dc02e1d 100644 --- a/src/AddIns/DisplayBindings/FormDesigner/Project/FormDesigner.csproj +++ b/src/AddIns/DisplayBindings/FormDesigner/Project/FormDesigner.csproj @@ -1,4 +1,4 @@ - + Debug AnyCPU @@ -99,6 +99,11 @@ + + + + True + @@ -121,17 +126,6 @@ ICSharpCode.Core False - - - - - - - - True - - - diff --git a/src/AddIns/DisplayBindings/FormDesigner/Project/FormDesigner.csproj.user b/src/AddIns/DisplayBindings/FormDesigner/Project/FormDesigner.csproj.user index 96135953c3..1f424f4743 100644 --- a/src/AddIns/DisplayBindings/FormDesigner/Project/FormDesigner.csproj.user +++ b/src/AddIns/DisplayBindings/FormDesigner/Project/FormDesigner.csproj.user @@ -1,4 +1,4 @@ - + ..\..\..\..\..\bin\SharpDevelop.exe diff --git a/src/AddIns/DisplayBindings/ResourceEditor/Project/ResourceEditor.csproj b/src/AddIns/DisplayBindings/ResourceEditor/Project/ResourceEditor.csproj index 8e50efa532..664d016569 100644 --- a/src/AddIns/DisplayBindings/ResourceEditor/Project/ResourceEditor.csproj +++ b/src/AddIns/DisplayBindings/ResourceEditor/Project/ResourceEditor.csproj @@ -1,4 +1,4 @@ - + Debug AnyCPU @@ -60,6 +60,7 @@ + @@ -73,8 +74,5 @@ False - - - \ No newline at end of file diff --git a/src/AddIns/DisplayBindings/ResourceEditor/Project/ResourceEditor.csproj.user b/src/AddIns/DisplayBindings/ResourceEditor/Project/ResourceEditor.csproj.user index 746ae1f782..a424bd7b03 100644 --- a/src/AddIns/DisplayBindings/ResourceEditor/Project/ResourceEditor.csproj.user +++ b/src/AddIns/DisplayBindings/ResourceEditor/Project/ResourceEditor.csproj.user @@ -1,4 +1,4 @@ - + diff --git a/src/AddIns/Misc/FiletypeRegisterer/Project/FiletypeRegisterer.csproj b/src/AddIns/Misc/FiletypeRegisterer/Project/FiletypeRegisterer.csproj index c88c797cf5..026154384f 100644 --- a/src/AddIns/Misc/FiletypeRegisterer/Project/FiletypeRegisterer.csproj +++ b/src/AddIns/Misc/FiletypeRegisterer/Project/FiletypeRegisterer.csproj @@ -1,4 +1,4 @@ - + Debug AnyCPU @@ -29,12 +29,19 @@ ..\..\..\AddIns\Misc\FiletypeRegisterer\ False + + + + + + UserControl + @@ -47,11 +54,6 @@ ICSharpCode.Core False - - - - - @@ -61,14 +63,6 @@ - - - - - - - - diff --git a/src/AddIns/Misc/FiletypeRegisterer/Project/FiletypeRegisterer.csproj.user b/src/AddIns/Misc/FiletypeRegisterer/Project/FiletypeRegisterer.csproj.user index 746ae1f782..a424bd7b03 100644 --- a/src/AddIns/Misc/FiletypeRegisterer/Project/FiletypeRegisterer.csproj.user +++ b/src/AddIns/Misc/FiletypeRegisterer/Project/FiletypeRegisterer.csproj.user @@ -1,4 +1,4 @@ - + diff --git a/src/AddIns/Misc/HighlightingEditor/Project/HighlightingEditor.csproj b/src/AddIns/Misc/HighlightingEditor/Project/HighlightingEditor.csproj index ddc78e514f..875d903bb0 100644 --- a/src/AddIns/Misc/HighlightingEditor/Project/HighlightingEditor.csproj +++ b/src/AddIns/Misc/HighlightingEditor/Project/HighlightingEditor.csproj @@ -1,4 +1,4 @@ - + Debug AnyCPU @@ -29,6 +29,12 @@ ..\..\..\..\..\AddIns\AddIns\Misc\HighlightingEditor\ False + + + + + + @@ -100,6 +106,9 @@ UserControl + + True + @@ -117,16 +126,5 @@ ICSharpCode.Core - - - True - - - - - - - - \ No newline at end of file diff --git a/src/AddIns/Misc/HighlightingEditor/Project/HighlightingEditor.csproj.user b/src/AddIns/Misc/HighlightingEditor/Project/HighlightingEditor.csproj.user index 96135953c3..1f424f4743 100644 --- a/src/AddIns/Misc/HighlightingEditor/Project/HighlightingEditor.csproj.user +++ b/src/AddIns/Misc/HighlightingEditor/Project/HighlightingEditor.csproj.user @@ -1,4 +1,4 @@ - + ..\..\..\..\..\bin\SharpDevelop.exe diff --git a/src/AddIns/Misc/RegExpTk/Project/RegExpTk.csproj b/src/AddIns/Misc/RegExpTk/Project/RegExpTk.csproj index 74b1bc52f6..3799a68d5d 100644 --- a/src/AddIns/Misc/RegExpTk/Project/RegExpTk.csproj +++ b/src/AddIns/Misc/RegExpTk/Project/RegExpTk.csproj @@ -1,4 +1,4 @@ - + Debug AnyCPU @@ -29,6 +29,12 @@ ..\..\..\AddIns\Misc\RegExpTk\ False + + + + + + @@ -40,6 +46,9 @@ + + True + @@ -53,16 +62,5 @@ False - - - True - - - - - - - - \ No newline at end of file diff --git a/src/AddIns/Misc/RegExpTk/Project/RegExpTk.csproj.user b/src/AddIns/Misc/RegExpTk/Project/RegExpTk.csproj.user index 96135953c3..1f424f4743 100644 --- a/src/AddIns/Misc/RegExpTk/Project/RegExpTk.csproj.user +++ b/src/AddIns/Misc/RegExpTk/Project/RegExpTk.csproj.user @@ -1,4 +1,4 @@ - + ..\..\..\..\..\bin\SharpDevelop.exe diff --git a/src/AddIns/Misc/StartPage/Project/StartPage.csproj b/src/AddIns/Misc/StartPage/Project/StartPage.csproj index 5caac3a2c9..57054f49db 100644 --- a/src/AddIns/Misc/StartPage/Project/StartPage.csproj +++ b/src/AddIns/Misc/StartPage/Project/StartPage.csproj @@ -1,4 +1,4 @@ - + Debug AnyCPU @@ -39,6 +39,9 @@ + + True + @@ -52,10 +55,5 @@ False - - - True - - \ No newline at end of file diff --git a/src/AddIns/Misc/StartPage/Project/StartPage.csproj.user b/src/AddIns/Misc/StartPage/Project/StartPage.csproj.user index 9cfbe798d4..7ed8936b56 100644 --- a/src/AddIns/Misc/StartPage/Project/StartPage.csproj.user +++ b/src/AddIns/Misc/StartPage/Project/StartPage.csproj.user @@ -1,4 +1,4 @@ - + ..\..\..\..\..\bin\SharpDevelop.exe diff --git a/src/Libraries/DockPanel_Src/WinFormsUI/WinFormsUI.csproj b/src/Libraries/DockPanel_Src/WinFormsUI/WinFormsUI.csproj index 4be2951799..89923814c6 100644 --- a/src/Libraries/DockPanel_Src/WinFormsUI/WinFormsUI.csproj +++ b/src/Libraries/DockPanel_Src/WinFormsUI/WinFormsUI.csproj @@ -1,4 +1,4 @@ - + Local 8.0.41115 @@ -48,30 +48,11 @@ 4 - - ..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v2.0.41115\System.Data.dll - False - - - ..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v2.0.41115\System.Design.dll - False - - - ..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v2.0.41115\System.Drawing.dll - False - - - ..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v2.0.41115\System.Windows.Forms.dll - False - - - ..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v2.0.41115\System.XML.dll - False - - - ..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v2.0.41115\System.dll - False - + + + + + @@ -85,9 +66,7 @@ Code - - Form - + Code @@ -97,9 +76,7 @@ Code - - UserControl - + Code @@ -129,15 +106,11 @@ Code - - Form - + Code - - Form - + Code @@ -181,8 +154,6 @@ - - ICSharpCode.Core.snk diff --git a/src/Libraries/DockPanel_Src/WinFormsUI/WinFormsUI.csproj.user b/src/Libraries/DockPanel_Src/WinFormsUI/WinFormsUI.csproj.user index 3510dbafd9..910657fe3b 100644 --- a/src/Libraries/DockPanel_Src/WinFormsUI/WinFormsUI.csproj.user +++ b/src/Libraries/DockPanel_Src/WinFormsUI/WinFormsUI.csproj.user @@ -1,4 +1,4 @@ - + 8.0.41115 Debug diff --git a/src/Libraries/ICSharpCode.TextEditor/Project/ICSharpCode.TextEditor.csproj b/src/Libraries/ICSharpCode.TextEditor/Project/ICSharpCode.TextEditor.csproj index fd6babd6d1..de6e9e5d28 100644 --- a/src/Libraries/ICSharpCode.TextEditor/Project/ICSharpCode.TextEditor.csproj +++ b/src/Libraries/ICSharpCode.TextEditor/Project/ICSharpCode.TextEditor.csproj @@ -1,4 +1,4 @@ - + Debug AnyCPU diff --git a/src/Libraries/ICSharpCode.TextEditor/Project/ICSharpCode.TextEditor.csproj.user b/src/Libraries/ICSharpCode.TextEditor/Project/ICSharpCode.TextEditor.csproj.user index 7f07a92508..5328e1bc4f 100644 --- a/src/Libraries/ICSharpCode.TextEditor/Project/ICSharpCode.TextEditor.csproj.user +++ b/src/Libraries/ICSharpCode.TextEditor/Project/ICSharpCode.TextEditor.csproj.user @@ -1,4 +1,4 @@ - + ..\..\..\..\bin\SharpDevelop.exe diff --git a/src/Libraries/ICSharpCode.TextEditor/Project/Src/Gui/TextArea.cs b/src/Libraries/ICSharpCode.TextEditor/Project/Src/Gui/TextArea.cs index 0adf917b24..752db102ec 100644 --- a/src/Libraries/ICSharpCode.TextEditor/Project/Src/Gui/TextArea.cs +++ b/src/Libraries/ICSharpCode.TextEditor/Project/Src/Gui/TextArea.cs @@ -170,7 +170,7 @@ namespace ICSharpCode.TextEditor ResizeRedraw = true; - SetStyle(ControlStyles.OptimizedDoubleBuffer, false); + SetStyle(ControlStyles.OptimizedDoubleBuffer, true); // SetStyle(ControlStyles.AllPaintingInWmPaint, true); // SetStyle(ControlStyles.UserPaint, true); SetStyle(ControlStyles.Opaque, false); diff --git a/src/Libraries/NRefactory/Project/NRefactory.csproj b/src/Libraries/NRefactory/Project/NRefactory.csproj index 3823cba3ca..fe0d5119f9 100644 --- a/src/Libraries/NRefactory/Project/NRefactory.csproj +++ b/src/Libraries/NRefactory/Project/NRefactory.csproj @@ -1,4 +1,4 @@ - + Debug AnyCPU @@ -193,8 +193,6 @@ - - diff --git a/src/Libraries/NRefactory/Project/NRefactory.csproj.user b/src/Libraries/NRefactory/Project/NRefactory.csproj.user index 54a53d68a8..2397512bef 100644 --- a/src/Libraries/NRefactory/Project/NRefactory.csproj.user +++ b/src/Libraries/NRefactory/Project/NRefactory.csproj.user @@ -1,4 +1,4 @@ - + ..\..\..\..\bin\SharpDevelop.exe diff --git a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj index 37deb2f2b7..03742a6b57 100644 --- a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj +++ b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj @@ -1,4 +1,4 @@ - + Debug AnyCPU @@ -33,6 +33,19 @@ ..\..\..\..\bin\ True + + + ..\RequiredLibraries\ICSharpCode.SharpZipLib.dll + False + + + + + + + + + @@ -171,7 +184,7 @@ UserControl - UserControl + Form @@ -187,9 +200,10 @@ Form - UserControl + Form + Form Form @@ -249,6 +263,7 @@ Form + UserControl @@ -259,9 +274,7 @@ Form - - Form - + @@ -627,18 +640,5 @@ ICSharpCode.Core - - - ..\RequiredLibraries\ICSharpCode.SharpZipLib.dll - False - - - - - - - - - \ No newline at end of file diff --git a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj.user b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj.user index 746ae1f782..a424bd7b03 100644 --- a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj.user +++ b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj.user @@ -1,4 +1,4 @@ - + diff --git a/src/Main/Base/Project/Src/Gui/Components/ExtTreeView/ExtTreeView.cs b/src/Main/Base/Project/Src/Gui/Components/ExtTreeView/ExtTreeView.cs index 5e6fde2adb..86a2c82635 100644 --- a/src/Main/Base/Project/Src/Gui/Components/ExtTreeView/ExtTreeView.cs +++ b/src/Main/Base/Project/Src/Gui/Components/ExtTreeView/ExtTreeView.cs @@ -36,6 +36,7 @@ namespace ICSharpCode.SharpDevelop.Gui HideSelection = false; AllowDrop = true; this.TreeViewNodeSorter = new ExtTreeViewComparer(); + SetStyle(ControlStyles.OptimizedDoubleBuffer, true); } public void SortNodes(TreeNode node) diff --git a/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/ProjectBrowserControl.cs b/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/ProjectBrowserControl.cs index 44e855fe22..c789f5d3e7 100644 --- a/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/ProjectBrowserControl.cs +++ b/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/ProjectBrowserControl.cs @@ -72,7 +72,9 @@ namespace ICSharpCode.SharpDevelop.Project } void ProjectServiceSolutionFolderRemoved(object sender, SolutionFolderEventArgs e) { + Console.WriteLine("projectbrowser: Solution folder remove!!!"); CallVisitor(new SolutionFolderRemoveVisitor(e.SolutionFolder)); + Console.WriteLine("projectbrowser: Solution folder remove done.!!!"); } void ProjectServiceReferenceAdded(object sender, ProjectReferenceEventArgs e) { @@ -81,12 +83,16 @@ namespace ICSharpCode.SharpDevelop.Project void FileServiceFileRemoving(object sender, FileEventArgs e) { + Console.WriteLine("projectbrowser: Solution file removing!!!"); CallVisitor(new FileRemoveTreeNodeVisitor(e.FileName)); + Console.WriteLine("projectbrowser: Solution file removing!!!"); } void FileServiceFileRenaming(object sender, FileRenameEventArgs e) { + Console.WriteLine("projectbrowser: Solution file renaming!!!"); CallVisitor(new FileRenameTreeNodeVisitor(e.SourceFile, e.TargetFile)); + Console.WriteLine("projectbrowser: Solution file renaming!!!"); } void SelectFile(ProjectNode projectNode, string fileName) diff --git a/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/Util/FileRemoveTreeNodeVisitor.cs b/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/Util/FileRemoveTreeNodeVisitor.cs index 4918417d9a..b5d8ceacb0 100644 --- a/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/Util/FileRemoveTreeNodeVisitor.cs +++ b/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/Util/FileRemoveTreeNodeVisitor.cs @@ -24,6 +24,15 @@ namespace ICSharpCode.SharpDevelop.Project return data; } + + public override object Visit(ProjectNode projectNode, object data) + { + if (FileUtility.IsBaseDirectory(projectNode.Directory, fileName)) { + projectNode.AcceptChildren(this, data); + } + return data; + } + public override object Visit(DirectoryNode directoryNode, object data) { if (FileUtility.IsBaseDirectory(fileName, directoryNode.Directory)) { @@ -33,7 +42,9 @@ namespace ICSharpCode.SharpDevelop.Project parent.Refresh(); } } else { - directoryNode.AcceptChildren(this, data); + if (FileUtility.IsBaseDirectory(directoryNode.Directory, fileName)) { + directoryNode.AcceptChildren(this, data); + } } return data; } diff --git a/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/Util/FileRenameTreeNodeVisitor.cs b/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/Util/FileRenameTreeNodeVisitor.cs index 90176474d2..f41003385a 100644 --- a/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/Util/FileRenameTreeNodeVisitor.cs +++ b/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/Util/FileRenameTreeNodeVisitor.cs @@ -24,16 +24,32 @@ namespace ICSharpCode.SharpDevelop.Project return data; } + + public override object Visit(ProjectNode projectNode, object data) + { + if (FileUtility.IsBaseDirectory(oldName, projectNode.Directory) || + FileUtility.IsBaseDirectory(projectNode.Directory, oldName)) { + projectNode.AcceptChildren(this, data); + } + return data; + } + public override object Visit(DirectoryNode directoryNode, object data) { - directoryNode.Directory = FileUtility.RenameBaseDirectory(directoryNode.Directory, oldName, newName); - directoryNode.AcceptChildren(this, data); + if (FileUtility.IsBaseDirectory(oldName, directoryNode.Directory)) { + directoryNode.Directory = FileUtility.RenameBaseDirectory(directoryNode.Directory, oldName, newName); + directoryNode.AcceptChildren(this, data); + } else if (FileUtility.IsBaseDirectory(directoryNode.Directory, oldName)) { + directoryNode.AcceptChildren(this, data); + } return data; } public override object Visit(FileNode fileNode, object data) { - fileNode.FileName = FileUtility.RenameBaseDirectory(fileNode.FileName, oldName, newName); + if (FileUtility.IsEqualFile(oldName, fileNode.FileName)) { + fileNode.FileName = FileUtility.RenameBaseDirectory(fileNode.FileName, oldName, newName); + } fileNode.AcceptChildren(this, data); return data; } diff --git a/src/Main/Base/Project/Src/Services/ProjectService/ProjectService.cs b/src/Main/Base/Project/Src/Services/ProjectService/ProjectService.cs index 56e716fcf5..029c3fcf6c 100644 --- a/src/Main/Base/Project/Src/Services/ProjectService/ProjectService.cs +++ b/src/Main/Base/Project/Src/Services/ProjectService/ProjectService.cs @@ -37,6 +37,7 @@ namespace ICSharpCode.SharpDevelop.Project static void FileServiceFileRenamed(object sender, FileRenameEventArgs e) { + Console.WriteLine("File service file renamed."); if (OpenSolution == null) { return; } @@ -60,10 +61,12 @@ namespace ICSharpCode.SharpDevelop.Project } } } + Console.WriteLine("File service file renamed. DONE."); } static void FileServiceFileRemoved(object sender, FileEventArgs e) { + Console.WriteLine("File service file removed."); if (OpenSolution == null) { return; } @@ -90,6 +93,7 @@ namespace ICSharpCode.SharpDevelop.Project } } } + Console.WriteLine("File service file removed. DONE."); } static void ActiveWindowChanged(object sender, EventArgs e) diff --git a/src/Main/Core/Project/ICSharpCode.Core.csproj b/src/Main/Core/Project/ICSharpCode.Core.csproj index 89e0436dc5..bc1571116f 100644 --- a/src/Main/Core/Project/ICSharpCode.Core.csproj +++ b/src/Main/Core/Project/ICSharpCode.Core.csproj @@ -1,4 +1,4 @@ - + Debug AnyCPU @@ -38,8 +38,6 @@ - - @@ -125,7 +123,5 @@ - - \ No newline at end of file diff --git a/src/Main/Core/Project/ICSharpCode.Core.csproj.user b/src/Main/Core/Project/ICSharpCode.Core.csproj.user index 746ae1f782..a424bd7b03 100644 --- a/src/Main/Core/Project/ICSharpCode.Core.csproj.user +++ b/src/Main/Core/Project/ICSharpCode.Core.csproj.user @@ -1,4 +1,4 @@ - + diff --git a/src/Main/StartUp/Project/StartUp.csproj b/src/Main/StartUp/Project/StartUp.csproj index ef07f85d4b..3d0c27029f 100644 --- a/src/Main/StartUp/Project/StartUp.csproj +++ b/src/Main/StartUp/Project/StartUp.csproj @@ -1,12 +1,10 @@ - + Debug AnyCPU 8.0.41115 2.0 {1152B71B-3C05-4598-B20D-823B5D40559E} - - SharpDevelop Exe 4 @@ -32,6 +30,12 @@ ..\..\..\..\bin\ True + + + + + + Form @@ -61,11 +65,5 @@ ICSharpCode.Core - - - - - - \ No newline at end of file diff --git a/src/Main/StartUp/Project/StartUp.csproj.user b/src/Main/StartUp/Project/StartUp.csproj.user index 87e9a3ad41..80798801bc 100644 --- a/src/Main/StartUp/Project/StartUp.csproj.user +++ b/src/Main/StartUp/Project/StartUp.csproj.user @@ -1,4 +1,4 @@ - + diff --git a/src/SharpDevelop.sln b/src/SharpDevelop.sln index 6c0ba2d3df..e2ccf7a527 100644 --- a/src/SharpDevelop.sln +++ b/src/SharpDevelop.sln @@ -1,5 +1,25 @@ Microsoft Visual Studio Solution File, Format Version 9.00 # SharpDevelop 2.0.0.1 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Main", "Main", "{5A3EBEBA-0560-41C1-966B-23F7D03A5486}" + ProjectSection(SolutionItems) = postProject + EndProjectSection +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop", "Main\Base\Project\ICSharpCode.SharpDevelop.csproj", "{2748AD25-9C63-4E12-877B-4DCE96FBED54}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core", "Main\Core\Project\ICSharpCode.Core.csproj", "{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartUp", "Main\StartUp\Project\StartUp.csproj", "{1152B71B-3C05-4598-B20D-823B5D40559E}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{9421EDF4-9769-4BE9-B5A6-C87DE221D73C}" + ProjectSection(SolutionItems) = postProject + EndProjectSection +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinFormsUI", "Libraries\DockPanel_Src\WinFormsUI\WinFormsUI.csproj", "{D3C782BA-178E-4235-A3BA-8C11DEBB6BEE}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.TextEditor", "Libraries\ICSharpCode.TextEditor\Project\ICSharpCode.TextEditor.csproj", "{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactory", "Libraries\NRefactory\Project\NRefactory.csproj", "{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AddIns", "AddIns", "{14A277EE-7DF1-4529-B639-7D1EF334C1C5}" ProjectSection(SolutionItems) = postProject EndProjectSection @@ -30,26 +50,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RegExpTk", "AddIns\Misc\Reg EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartPage", "AddIns\Misc\StartPage\Project\StartPage.csproj", "{7D5C266F-D6FF-4D14-B315-0C0FC6C4EF51}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{9421EDF4-9769-4BE9-B5A6-C87DE221D73C}" - ProjectSection(SolutionItems) = postProject - EndProjectSection -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinFormsUI", "Libraries\DockPanel_Src\WinFormsUI\WinFormsUI.csproj", "{D3C782BA-178E-4235-A3BA-8C11DEBB6BEE}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.TextEditor", "Libraries\ICSharpCode.TextEditor\Project\ICSharpCode.TextEditor.csproj", "{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactory", "Libraries\NRefactory\Project\NRefactory.csproj", "{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Main", "Main", "{5A3EBEBA-0560-41C1-966B-23F7D03A5486}" - ProjectSection(SolutionItems) = postProject - EndProjectSection -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop", "Main\Base\Project\ICSharpCode.SharpDevelop.csproj", "{2748AD25-9C63-4E12-877B-4DCE96FBED54}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core", "Main\Core\Project\ICSharpCode.Core.csproj", "{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartUp", "Main\StartUp\Project\StartUp.csproj", "{1152B71B-3C05-4598-B20D-823B5D40559E}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -117,6 +117,12 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution + {1152B71B-3C05-4598-B20D-823B5D40559E} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486} + {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486} + {2748AD25-9C63-4E12-877B-4DCE96FBED54} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486} + {3A9AE6AA-BC07-4A2F-972C-581E3AE2F195} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C} + {2D18BE89-D210-49EB-A9DD-2246FBB3DF6D} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C} + {D3C782BA-178E-4235-A3BA-8C11DEBB6BEE} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C} {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5} {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5} {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5} @@ -127,11 +133,5 @@ Global {64A3E5E6-90BF-47F6-94DF-68C94B62C817} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} {8A462940-E5E9-4E85-982D-D4C006EE31D4} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} {D022A6CE-7438-41E8-AC64-F2DE18EC54C6} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} - {3A9AE6AA-BC07-4A2F-972C-581E3AE2F195} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C} - {2D18BE89-D210-49EB-A9DD-2246FBB3DF6D} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C} - {D3C782BA-178E-4235-A3BA-8C11DEBB6BEE} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C} - {1152B71B-3C05-4598-B20D-823B5D40559E} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486} - {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486} - {2748AD25-9C63-4E12-877B-4DCE96FBED54} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486} EndGlobalSection EndGlobal diff --git a/src/releasebuild.bat b/src/releasebuild.bat new file mode 100644 index 0000000000..83ba1881f1 --- /dev/null +++ b/src/releasebuild.bat @@ -0,0 +1,3 @@ +@ECHO OFF +\windows\microsoft.net\framework\v2.0.41115\msbuild /property:Configuration=Release +IF %ERRORLEVEL% NEQ 0 PAUSE