diff --git a/data/resources/image/BitmapResources/BitmapResources.res b/data/resources/image/BitmapResources/BitmapResources.res index 95c9cc4d26..09e93f57c0 100644 --- a/data/resources/image/BitmapResources/BitmapResources.res +++ b/data/resources/image/BitmapResources/BitmapResources.res @@ -1,6 +1,14 @@ # this file was automatically generated by ResAsm Icons.Svn.StatusImages = SubversionIcons\StatusImages.bmp +Svn.ApplyPatch = SubversionIcons\Svn.ApplyPatch.png +Svn.Checkout = SubversionIcons\Svn.Checkout.png +Svn.Commit = SubversionIcons\Svn.Commit.png +Svn.CreatPatch = SubversionIcons\Svn.CreatePatch.png +Svn.Export = SubversionIcons\Svn.Export.png +Svn.Import = SubversionIcons\Svn.Import.png +Svn.Update = SubversionIcons\Svn.Update.png + # Nes project browser icons ProjectBrowser.Folder.Closed = ProjectBrowserIcons\Folder.Closed.png diff --git a/data/resources/image/BitmapResources/SD-splash-05-600X300.png b/data/resources/image/BitmapResources/SD-splash-05-600X300.png new file mode 100644 index 0000000000..c52fb2dd2a Binary files /dev/null and b/data/resources/image/BitmapResources/SD-splash-05-600X300.png differ diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj b/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj index 5e3a2a3183..f23a5f241c 100644 --- a/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj +++ b/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj @@ -73,8 +73,6 @@ ICSharpCode.Core False - - diff --git a/src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.csproj b/src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.csproj index de4cf410a5..7ecbbf2524 100644 --- a/src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.csproj +++ b/src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.csproj @@ -76,8 +76,6 @@ ICSharpCode.Core False - - diff --git a/src/AddIns/DisplayBindings/ResourceEditor/Project/ResourceEditor.csproj b/src/AddIns/DisplayBindings/ResourceEditor/Project/ResourceEditor.csproj index 78c05820f4..4eb8acb003 100644 --- a/src/AddIns/DisplayBindings/ResourceEditor/Project/ResourceEditor.csproj +++ b/src/AddIns/DisplayBindings/ResourceEditor/Project/ResourceEditor.csproj @@ -12,9 +12,6 @@ Library File ResourceEditor - - - True diff --git a/src/AddIns/Misc/AddinScout/Project/AddinScout.csproj b/src/AddIns/Misc/AddinScout/Project/AddinScout.csproj index 7281c18428..a98cb20853 100644 --- a/src/AddIns/Misc/AddinScout/Project/AddinScout.csproj +++ b/src/AddIns/Misc/AddinScout/Project/AddinScout.csproj @@ -13,9 +13,6 @@ False OnSuccessfulBuild Library - - - True diff --git a/src/AddIns/Misc/SubversionAddIn/Project/Resources/ICSharpCode.Svn.addin b/src/AddIns/Misc/SubversionAddIn/Project/ICSharpCode.Svn.addin similarity index 100% rename from src/AddIns/Misc/SubversionAddIn/Project/Resources/ICSharpCode.Svn.addin rename to src/AddIns/Misc/SubversionAddIn/Project/ICSharpCode.Svn.addin diff --git a/src/AddIns/Misc/SubversionAddIn/Project/Src/AddInOptions.cs b/src/AddIns/Misc/SubversionAddIn/Project/Src/AddInOptions.cs index 75789786d9..13c89127c1 100644 --- a/src/AddIns/Misc/SubversionAddIn/Project/Src/AddInOptions.cs +++ b/src/AddIns/Misc/SubversionAddIn/Project/Src/AddInOptions.cs @@ -1,7 +1,6 @@ using System; using System.Diagnostics; -using ICSharpCode.Core.Services; -using ICSharpCode.Core.Properties; +using ICSharpCode.Core; namespace ICSharpCode.Svn { diff --git a/src/AddIns/Misc/SubversionAddIn/Project/Src/Commands/AutostartCommands.cs b/src/AddIns/Misc/SubversionAddIn/Project/Src/Commands/AutostartCommands.cs index ad4fd802df..8b61d7ecea 100644 --- a/src/AddIns/Misc/SubversionAddIn/Project/Src/Commands/AutostartCommands.cs +++ b/src/AddIns/Misc/SubversionAddIn/Project/Src/Commands/AutostartCommands.cs @@ -10,18 +10,10 @@ using System.ComponentModel; using System.Windows.Forms; using System.Diagnostics; -using ICSharpCode.Core.AddIns; - -using ICSharpCode.Core.Properties; -using ICSharpCode.Core.AddIns.Codons; -using ICSharpCode.Core.Services; -using ICSharpCode.SharpDevelop.Services; +using ICSharpCode.Core; +using ICSharpCode.SharpDevelop; using ICSharpCode.SharpDevelop.Gui; -using ICSharpCode.SharpDevelop.Gui.Components; -using ICSharpCode.SharpDevelop.Internal.Project; -using ICSharpCode.SharpDevelop.Gui.Dialogs; -using ICSharpCode.SharpDevelop.Gui.Pads.ProjectBrowser; using NSvn.Common; using NSvn.Core; @@ -35,12 +27,12 @@ namespace ICSharpCode.Svn.Commands public override void Run() { - FileService.FileRemoved += new FileEventHandler(FileRemoved); - FileService.FileRenaming += new FileEventHandler(FileRenamed); + FileService.FileRemoved += FileRemoved; + FileService.FileRenaming += FileRenamed; - projectService.FileRemovedFromProject += new FileEventHandler(FileRemoved); - projectService.FileAddedToProject += new FileEventHandler(FileAdded); + //projectService.FileRemovedFromProject += FileRemoved; + //projectService.FileAddedToProject += FileAdded); FileUtility.FileSaved += new FileNameEventHandler(FileSaved); @@ -48,8 +40,9 @@ namespace ICSharpCode.Svn.Commands void FileSaved(object sender, FileNameEventArgs e) { - ICSharpCode.SharpDevelop.Gui.Pads.ProjectBrowser.ProjectBrowserView pbv = (ICSharpCode.SharpDevelop.Gui.Pads.ProjectBrowser.ProjectBrowserView)WorkbenchSingleton.Workbench.GetPad(typeof(ICSharpCode.SharpDevelop.Gui.Pads.ProjectBrowser.ProjectBrowserView)); - pbv.VisitRoot(); + // TODO: Reimplement + //ICSharpCode.SharpDevelop.Gui.Pads.ProjectBrowser.ProjectBrowserView pbv = (ICSharpCode.SharpDevelop.Gui.Pads.ProjectBrowser.ProjectBrowserView)WorkbenchSingleton.Workbench.GetPad(typeof(ICSharpCode.SharpDevelop.Gui.Pads.ProjectBrowser.ProjectBrowserView)); + //pbv.VisitRoot(); } void FileAdded(object sender, FileEventArgs e) @@ -60,7 +53,7 @@ namespace ICSharpCode.Svn.Commands SvnClient.Instance.Client.Add(Path.GetFullPath(e.FileName), false); } } catch (Exception ex) { - Console.WriteLine("File added exception: " + ex); + MessageService.ShowError("File added exception: " + ex); } } @@ -72,11 +65,11 @@ namespace ICSharpCode.Svn.Commands Path.GetFullPath(e.FileName) }, true); } catch (Exception ex) { - Console.WriteLine("File removed exception: " + ex); + MessageService.ShowError("File removed exception: " + ex); } } - void FileRenamed(object sender, FileEventArgs e) + void FileRenamed(object sender, FileRenameEventArgs e) { // Console.WriteLine("RENAME : " + e.FileName); try { @@ -86,7 +79,7 @@ namespace ICSharpCode.Svn.Commands true ); } catch (Exception ex) { - Console.WriteLine("File renamed exception: " + ex); + MessageService.ShowError("File renamed exception: " + ex); } } } diff --git a/src/AddIns/Misc/SubversionAddIn/Project/Src/Commands/Checkout/CheckoutCommand.cs b/src/AddIns/Misc/SubversionAddIn/Project/Src/Commands/Checkout/CheckoutCommand.cs index 61fecca9f4..c90e688175 100644 --- a/src/AddIns/Misc/SubversionAddIn/Project/Src/Commands/Checkout/CheckoutCommand.cs +++ b/src/AddIns/Misc/SubversionAddIn/Project/Src/Commands/Checkout/CheckoutCommand.cs @@ -10,7 +10,8 @@ using System; using System.Threading; using System.Windows.Forms; -using ICSharpCode.Core.AddIns.Codons; +using ICSharpCode.Core; +using ICSharpCode.SharpDevelop; using NSvn.Common; using NSvn.Core; diff --git a/src/AddIns/Misc/SubversionAddIn/Project/Src/Commands/Checkout/CheckoutDialog.cs b/src/AddIns/Misc/SubversionAddIn/Project/Src/Commands/Checkout/CheckoutDialog.cs index 323c3c3067..a68bbdd272 100644 --- a/src/AddIns/Misc/SubversionAddIn/Project/Src/Commands/Checkout/CheckoutDialog.cs +++ b/src/AddIns/Misc/SubversionAddIn/Project/Src/Commands/Checkout/CheckoutDialog.cs @@ -6,7 +6,6 @@ using System.Threading; using System.IO; using System.Windows.Forms; using ICSharpCode.SharpDevelop.Gui; -using ICSharpCode.SharpDevelop.Gui.Dialogs; using NSvn.Common; using NSvn.Core; using ICSharpCode.SharpDevelop.Gui.XmlForms; diff --git a/src/AddIns/Misc/SubversionAddIn/Project/Src/Commands/Commit/CommitCommand.cs b/src/AddIns/Misc/SubversionAddIn/Project/Src/Commands/Commit/CommitCommand.cs index 271d2567e0..a58038f6e4 100644 --- a/src/AddIns/Misc/SubversionAddIn/Project/Src/Commands/Commit/CommitCommand.cs +++ b/src/AddIns/Misc/SubversionAddIn/Project/Src/Commands/Commit/CommitCommand.cs @@ -18,18 +18,10 @@ using System.ComponentModel; using System.Windows.Forms; using System.Diagnostics; -using ICSharpCode.Core.AddIns; - -using ICSharpCode.Core.Properties; -using ICSharpCode.Core.AddIns.Codons; -using ICSharpCode.Core.Services; -using ICSharpCode.SharpDevelop.Services; +using ICSharpCode.Core; +using ICSharpCode.SharpDevelop; using ICSharpCode.SharpDevelop.Gui; -using ICSharpCode.SharpDevelop.Gui.Components; -using ICSharpCode.SharpDevelop.Internal.Project; -using ICSharpCode.SharpDevelop.Gui.Dialogs; -using ICSharpCode.SharpDevelop.Gui.Pads.ProjectBrowser; using NSvn.Common; using NSvn.Core; using ICSharpCode.Svn.Gui; @@ -51,6 +43,7 @@ namespace ICSharpCode.Svn.Commands public override void Run() { + /* ProjectBrowserView browser = (ProjectBrowserView)Owner; AbstractBrowserNode node = browser.SelectedNode as AbstractBrowserNode; @@ -74,6 +67,7 @@ namespace ICSharpCode.Svn.Commands } } } + */ } } } diff --git a/src/AddIns/Misc/SubversionAddIn/Project/Src/Commands/Commit/CommitDialog.cs b/src/AddIns/Misc/SubversionAddIn/Project/Src/Commands/Commit/CommitDialog.cs index a97dbc74e2..3c46b7bf39 100644 --- a/src/AddIns/Misc/SubversionAddIn/Project/Src/Commands/Commit/CommitDialog.cs +++ b/src/AddIns/Misc/SubversionAddIn/Project/Src/Commands/Commit/CommitDialog.cs @@ -28,7 +28,7 @@ namespace ICSharpCode.Svn.Commands public CommitDialog() { - SetupFromXmlStream(Assembly.GetCallingAssembly().GetManifestResourceStream("CommitDialog.xfrm")); + SetupFromXmlStream(Assembly.GetExecutingAssembly().GetManifestResourceStream("ICSharpCode.Svn.Resources.CommitDialog.xfrm")); } } } diff --git a/src/AddIns/Misc/SubversionAddIn/Project/Src/Commands/Export/ExportCommand.cs b/src/AddIns/Misc/SubversionAddIn/Project/Src/Commands/Export/ExportCommand.cs index ea06414bc3..22e5beb66f 100644 --- a/src/AddIns/Misc/SubversionAddIn/Project/Src/Commands/Export/ExportCommand.cs +++ b/src/AddIns/Misc/SubversionAddIn/Project/Src/Commands/Export/ExportCommand.cs @@ -10,7 +10,8 @@ using System; using System.Threading; using System.Windows.Forms; -using ICSharpCode.Core.AddIns.Codons; +using ICSharpCode.Core; +using ICSharpCode.SharpDevelop; using NSvn.Common; using NSvn.Core; diff --git a/src/AddIns/Misc/SubversionAddIn/Project/Src/Commands/Export/ExportDialog.cs b/src/AddIns/Misc/SubversionAddIn/Project/Src/Commands/Export/ExportDialog.cs index 9cc7b325f7..cf4861bf16 100644 --- a/src/AddIns/Misc/SubversionAddIn/Project/Src/Commands/Export/ExportDialog.cs +++ b/src/AddIns/Misc/SubversionAddIn/Project/Src/Commands/Export/ExportDialog.cs @@ -6,7 +6,6 @@ using System.Threading; using System.IO; using System.Windows.Forms; using ICSharpCode.SharpDevelop.Gui; -using ICSharpCode.SharpDevelop.Gui.Dialogs; using NSvn.Common; using NSvn.Core; using ICSharpCode.SharpDevelop.Gui.XmlForms; @@ -54,7 +53,7 @@ namespace ICSharpCode.Svn.Commands public ExportDialog() { - SetupFromXmlStream(Assembly.GetCallingAssembly().GetManifestResourceStream("ExportDialog.xfrm")); + SetupFromXmlStream(Assembly.GetExecutingAssembly().GetManifestResourceStream("ICSharpCode.Svn.Resources.ExportDialog.xfrm")); ((ComboBox)ControlDictionary["revisionComboBox"]).Items.AddRange(new string[] { "Head", "Committed", diff --git a/src/AddIns/Misc/SubversionAddIn/Project/Src/Commands/ProjectBrowserCommands.cs b/src/AddIns/Misc/SubversionAddIn/Project/Src/Commands/ProjectBrowserCommands.cs index 9c821313bd..3f51eafbb5 100644 --- a/src/AddIns/Misc/SubversionAddIn/Project/Src/Commands/ProjectBrowserCommands.cs +++ b/src/AddIns/Misc/SubversionAddIn/Project/Src/Commands/ProjectBrowserCommands.cs @@ -10,18 +10,10 @@ using System.ComponentModel; using System.Windows.Forms; using System.Diagnostics; -using ICSharpCode.Core.AddIns; - -using ICSharpCode.Core.Properties; -using ICSharpCode.Core.AddIns.Codons; -using ICSharpCode.Core.Services; -using ICSharpCode.SharpDevelop.Services; +using ICSharpCode.Core; +using ICSharpCode.SharpDevelop; using ICSharpCode.SharpDevelop.Gui; -using ICSharpCode.SharpDevelop.Gui.Components; -using ICSharpCode.SharpDevelop.Internal.Project; -using ICSharpCode.SharpDevelop.Gui.Dialogs; -using ICSharpCode.SharpDevelop.Gui.Pads.ProjectBrowser; using NSvn.Common; using NSvn.Core; @@ -41,6 +33,8 @@ namespace ICSharpCode.Svn.Commands public override void Run() { + Console.WriteLine(Owner); + /* ProjectBrowserView browser = (ProjectBrowserView)Owner; AbstractBrowserNode node = browser.SelectedNode as AbstractBrowserNode; @@ -57,6 +51,7 @@ namespace ICSharpCode.Svn.Commands projectService.ReloadCombine(); } } + */ } } @@ -74,7 +69,7 @@ namespace ICSharpCode.Svn.Commands public override void Run() { - ProjectBrowserView browser = (ProjectBrowserView)Owner; + /*ProjectBrowserView browser = (ProjectBrowserView)Owner; AbstractBrowserNode node = browser.SelectedNode as AbstractBrowserNode; if (node != null) { @@ -90,7 +85,7 @@ namespace ICSharpCode.Svn.Commands SvnClient.Instance.OperationStart("Revert", new ThreadStart(DoRevertCommand)); SvnClient.Instance.WaitForOperationEnd(); projectService.ReloadCombine(); - } + }*/ } } @@ -130,7 +125,7 @@ namespace ICSharpCode.Svn.Commands public override void Run() { - ProjectBrowserView browser = (ProjectBrowserView)Owner; + /*ProjectBrowserView browser = (ProjectBrowserView)Owner; AbstractBrowserNode node = browser.SelectedNode as AbstractBrowserNode; if (node != null) { @@ -151,7 +146,7 @@ namespace ICSharpCode.Svn.Commands } FileService.NewFile("a.patch", "txt", output); - } + }*/ } } } diff --git a/src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/AuthentificationDialogs/ClientCertDialog.cs b/src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/AuthentificationDialogs/ClientCertDialog.cs index dedecc8677..e40400b0f3 100644 --- a/src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/AuthentificationDialogs/ClientCertDialog.cs +++ b/src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/AuthentificationDialogs/ClientCertDialog.cs @@ -55,7 +55,7 @@ namespace ICSharpCode.Svn.Gui public ClientCertDialog(string realm, bool maySave) { - SetupFromXmlStream(Assembly.GetCallingAssembly().GetManifestResourceStream("ClientCertDialog.xfrm")); + SetupFromXmlStream(Assembly.GetExecutingAssembly().GetManifestResourceStream("ICSharpCode.Svn.Resources.ClientCertDialog.xfrm")); this.Realm = realm; this.MaySave = maySave; } diff --git a/src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/AuthentificationDialogs/ClientCertPassphraseDialog.cs b/src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/AuthentificationDialogs/ClientCertPassphraseDialog.cs index b7486402a7..c7b428eb8e 100644 --- a/src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/AuthentificationDialogs/ClientCertPassphraseDialog.cs +++ b/src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/AuthentificationDialogs/ClientCertPassphraseDialog.cs @@ -55,7 +55,7 @@ namespace ICSharpCode.Svn.Gui public ClientCertPassphraseDialog(string realm, bool maySave) { - SetupFromXmlStream(Assembly.GetCallingAssembly().GetManifestResourceStream("ClientCertPassphraseDialog.xfrm")); + SetupFromXmlStream(Assembly.GetExecutingAssembly().GetManifestResourceStream("ICSharpCode.Svn.Resources.ClientCertPassphraseDialog.xfrm")); this.Realm = realm; this.MaySave = maySave; } diff --git a/src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/AuthentificationDialogs/LoginDialog.cs b/src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/AuthentificationDialogs/LoginDialog.cs index 06430068b5..a812d00a80 100644 --- a/src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/AuthentificationDialogs/LoginDialog.cs +++ b/src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/AuthentificationDialogs/LoginDialog.cs @@ -72,7 +72,7 @@ namespace ICSharpCode.Svn.Gui public LoginDialog(string realm, string userName, bool maySave) { - SetupFromXmlStream(Assembly.GetCallingAssembly().GetManifestResourceStream("LoginDialog.xfrm")); + SetupFromXmlStream(Assembly.GetExecutingAssembly().GetManifestResourceStream("ICSharpCode.Svn.Resources.LoginDialog.xfrm")); this.UserName = userName; this.Realm = realm; this.MaySave = maySave; diff --git a/src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/AuthentificationDialogs/SslServerTrustDialog.cs b/src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/AuthentificationDialogs/SslServerTrustDialog.cs index 858a3672ad..ba00382684 100644 --- a/src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/AuthentificationDialogs/SslServerTrustDialog.cs +++ b/src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/AuthentificationDialogs/SslServerTrustDialog.cs @@ -60,7 +60,7 @@ namespace ICSharpCode.Svn.Gui public SslServerTrustDialog(SslServerCertificateInfo certificateInfo, SslFailures failures, bool maySave) { - SetupFromXmlStream(Assembly.GetCallingAssembly().GetManifestResourceStream("SslServerTrustDialog.xfrm")); + SetupFromXmlStream(Assembly.GetExecutingAssembly().GetManifestResourceStream("ICSharpCode.Svn.Resources.SslServerTrustDialog.xfrm")); this.CertificateInfo = certificateInfo; this.Failures = failures; this.MaySave = maySave; diff --git a/src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/HistoryViewDisplayBinding/ContentPanel.cs b/src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/HistoryViewDisplayBinding/ContentPanel.cs index 82732901cd..10f9ebc022 100644 --- a/src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/HistoryViewDisplayBinding/ContentPanel.cs +++ b/src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/HistoryViewDisplayBinding/ContentPanel.cs @@ -15,11 +15,12 @@ using System.IO; using System.Windows.Forms; using System.Reflection; +using ICSharpCode.Core; +using ICSharpCode.SharpDevelop; using ICSharpCode.SharpDevelop.Gui; +using ICSharpCode.SharpDevelop.Gui.XmlForms; using NSvn.Common; using NSvn.Core; -using ICSharpCode.SharpDevelop.Gui.Dialogs; -using ICSharpCode.SharpDevelop.Gui.XmlForms; namespace ICSharpCode.Svn { diff --git a/src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/HistoryViewDisplayBinding/HistoryView.cs b/src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/HistoryViewDisplayBinding/HistoryView.cs index 39f0bdb7c2..63ce32e900 100644 --- a/src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/HistoryViewDisplayBinding/HistoryView.cs +++ b/src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/HistoryViewDisplayBinding/HistoryView.cs @@ -22,14 +22,10 @@ using System.ComponentModel.Design.Serialization; using System.Xml; using ICSharpCode.SharpDevelop.Gui; -using ICSharpCode.SharpDevelop.Internal.Project; using ICSharpCode.SharpDevelop.Internal.Undo; -using ICSharpCode.SharpDevelop.Gui.Components; -using ICSharpCode.Core.Properties; -using ICSharpCode.Core.AddIns; -using ICSharpCode.Core.Services; -using ICSharpCode.SharpDevelop.Services; +using ICSharpCode.Core; +using ICSharpCode.SharpDevelop; using ICSharpCode.SharpDevelop.Dom; using System.CodeDom; diff --git a/src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/HistoryViewDisplayBinding/HistoryViewDisplayBinding.cs b/src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/HistoryViewDisplayBinding/HistoryViewDisplayBinding.cs index d346db5d43..c9e23b908e 100644 --- a/src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/HistoryViewDisplayBinding/HistoryViewDisplayBinding.cs +++ b/src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/HistoryViewDisplayBinding/HistoryViewDisplayBinding.cs @@ -22,16 +22,11 @@ using System.ComponentModel.Design.Serialization; using System.Xml; using ICSharpCode.SharpDevelop.Gui; -using ICSharpCode.SharpDevelop.Internal.Project; using ICSharpCode.SharpDevelop.Internal.Undo; -using ICSharpCode.SharpDevelop.Gui.Components; -using ICSharpCode.Core.Properties; -using ICSharpCode.Core.AddIns; -using ICSharpCode.Core.Services; -using ICSharpCode.SharpDevelop.Services; +using ICSharpCode.Core; +using ICSharpCode.SharpDevelop; using ICSharpCode.SharpDevelop.Dom; -using ICSharpCode.Core.AddIns.Codons; using System.CodeDom; using System.CodeDom.Compiler; diff --git a/src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/ProjectBrowserVisitor/SvnProjectBrowserVisitor.cs b/src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/ProjectBrowserVisitor/SvnProjectBrowserVisitor.cs index d7d1f2ace0..36c1be1a96 100644 --- a/src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/ProjectBrowserVisitor/SvnProjectBrowserVisitor.cs +++ b/src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/ProjectBrowserVisitor/SvnProjectBrowserVisitor.cs @@ -9,12 +9,14 @@ using System; using System.IO; -using ICSharpCode.SharpDevelop.Gui.Pads.ProjectBrowser; +using ICSharpCode.SharpDevelop; +using ICSharpCode.SharpDevelop.Gui; using NSvn.Common; using NSvn.Core; namespace ICSharpCode.Svn { + /* public class NodeStatusInformer { NodeStatus nodeStatus; @@ -150,4 +152,5 @@ namespace ICSharpCode.Svn return NodeStatus.IndividualStatusesConflicting; } } + */ } diff --git a/src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/SubversionOptionsPanel.cs b/src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/SubversionOptionsPanel.cs index edb665ffdf..580b4797e5 100644 --- a/src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/SubversionOptionsPanel.cs +++ b/src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/SubversionOptionsPanel.cs @@ -5,14 +5,9 @@ using System.Collections; using System.Windows.Forms; using ICSharpCode.SharpDevelop.Internal.ExternalTool; -using ICSharpCode.Core.AddIns.Codons; -using ICSharpCode.Core.Properties; -using ICSharpCode.SharpDevelop.Gui.Components; -using ICSharpCode.Core.Services; -using ICSharpCode.Core.AddIns; +using ICSharpCode.Core; +using ICSharpCode.SharpDevelop; using ICSharpCode.SharpDevelop.Gui; -using ICSharpCode.SharpDevelop.Gui.Dialogs; -using ICSharpCode.SharpDevelop.Gui.Dialogs.OptionPanels; namespace ICSharpCode.Svn.Gui { @@ -27,7 +22,7 @@ namespace ICSharpCode.Svn.Gui public override void LoadPanelContents() { - SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("SubversionOptionsPanel.xfrm")); + SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("ICSharpCode.Svn.Resources.SubversionOptionsPanel.xfrm")); ControlDictionary["logMessageTextBox"].Text = AddInOptions.DefaultLogMessage; ((CheckBox)ControlDictionary["autoAddFilesCheckBox"]).Checked = AddInOptions.AutomaticallyAddFiles; ((CheckBox)ControlDictionary["autoReloadProjectCheckBox"]).Checked = AddInOptions.AutomaticallyReloadProject; diff --git a/src/AddIns/Misc/SubversionAddIn/Project/Src/SvnClient.cs b/src/AddIns/Misc/SubversionAddIn/Project/Src/SvnClient.cs index 90c605726a..40acf163e2 100644 --- a/src/AddIns/Misc/SubversionAddIn/Project/Src/SvnClient.cs +++ b/src/AddIns/Misc/SubversionAddIn/Project/Src/SvnClient.cs @@ -14,9 +14,8 @@ using System.Windows.Forms; using NSvn.Common; using NSvn.Core; using ICSharpCode.SharpDevelop.Gui; -using ICSharpCode.SharpDevelop.Gui.Pads; using ICSharpCode.Svn.Gui; -using ICSharpCode.Core.Services; +using ICSharpCode.Core; namespace ICSharpCode.Svn { @@ -196,7 +195,7 @@ namespace ICSharpCode.Svn { client = new Client(); svnCategory = new MessageViewCategory("Subversion", "Subversion"); - CompilerMessageView compilerMessageView = (CompilerMessageView)WorkbenchSingleton.Workbench.GetPad(typeof(CompilerMessageView)); + CompilerMessageView compilerMessageView = (CompilerMessageView)WorkbenchSingleton.Workbench.GetPad(typeof(CompilerMessageView)).PadContent; compilerMessageView.AddCategory(svnCategory); client.LogMessage += new LogMessageDelegate(SetLogMessage); diff --git a/src/AddIns/Misc/SubversionAddIn/Project/SubversionAddIn.csproj b/src/AddIns/Misc/SubversionAddIn/Project/SubversionAddIn.csproj new file mode 100644 index 0000000000..a57fc0848c --- /dev/null +++ b/src/AddIns/Misc/SubversionAddIn/Project/SubversionAddIn.csproj @@ -0,0 +1,93 @@ + + + Library + ICSharpCode.Svn + SubversionAddIn + Debug + AnyCPU + {17F4D7E0-6933-4C2E-8714-FD7E98D625D5} + + + True + ..\..\..\..\..\AddIns\AddIns\Misc\SubversionAddin\ + false + DEBUG;TRACE + + + False + ..\..\..\..\..\AddIns\AddIns\Misc\SubversionAddin\ + true + TRACE + + + + + + + + + ..\RequiredLibraries\NSvn.Core.dll + False + True + + + ..\RequiredLibraries\NSvn.Common.dll + False + True + + + + + + Always + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {2748AD25-9C63-4E12-877B-4DCE96FBED54} + ICSharpCode.SharpDevelop + False + + + {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} + ICSharpCode.Core + False + + + + \ No newline at end of file diff --git a/src/Libraries/NRefactory/Project/NRefactory.csproj b/src/Libraries/NRefactory/Project/NRefactory.csproj index 5dc0a776f8..6521954291 100644 --- a/src/Libraries/NRefactory/Project/NRefactory.csproj +++ b/src/Libraries/NRefactory/Project/NRefactory.csproj @@ -4,7 +4,7 @@ AnyCPU 8.0.41115 2.0 - {3a9ae6aa-bc07-4a2f-972c-581e3ae2f195} + {3A9AE6AA-BC07-4A2F-972C-581E3AE2F195} ICSharpCode.NRefactory ICSharpCode.NRefactory Library diff --git a/src/Main/Base/Project/Src/Dom/NRefactoryResolver/NRefactoryResolver.cs b/src/Main/Base/Project/Src/Dom/NRefactoryResolver/NRefactoryResolver.cs index ab23d2a8a5..b8b737e73e 100644 --- a/src/Main/Base/Project/Src/Dom/NRefactoryResolver/NRefactoryResolver.cs +++ b/src/Main/Base/Project/Src/Dom/NRefactoryResolver/NRefactoryResolver.cs @@ -176,23 +176,7 @@ namespace ICSharpCode.SharpDevelop.Dom.NRefactoryResolver } type = fieldReferenceExpression.TargetObject.AcceptVisitor(typeVisitor, null) as IReturnType; if (type != null) { - string name = SearchNamespace(type.FullyQualifiedName, this.CompilationUnit); - if (name != null) { - name += "." + fieldReferenceExpression.FieldName; - string n = SearchNamespace(name, null); - if (n != null) { - return new NamespaceResolveResult(callingClass, callingMember, n); - } - IClass c = SearchType(name, this.CallingClass, this.CompilationUnit); - if (c != null) { - return new TypeResolveResult(callingClass, callingMember, c.DefaultReturnType, c); - } - return null; - } - IMember member = GetMember(type, fieldReferenceExpression.FieldName); - if (member != null) - return CreateMemberResolveResult(member); - ResolveResult result = ResolveMethod(type, fieldReferenceExpression.FieldName); + ResolveResult result = ResolveMemberReferenceExpression(type, fieldReferenceExpression); if (result != null) return result; } @@ -203,7 +187,7 @@ namespace ICSharpCode.SharpDevelop.Dom.NRefactoryResolver } else if (expr is TypeReferenceExpression) { type = TypeVisitor.CreateReturnType(((TypeReferenceExpression)expr).TypeReference, this); if (type != null) { - IClass c = projectContent.GetClass(type.FullyQualifiedName); + IClass c = type.GetUnderlyingClass(); if (c != null) return new TypeResolveResult(callingClass, callingMember, type, c); } @@ -232,6 +216,40 @@ namespace ICSharpCode.SharpDevelop.Dom.NRefactoryResolver return new ResolveResult(callingClass, callingMember, type); } + ResolveResult ResolveMemberReferenceExpression(IReturnType type, FieldReferenceExpression fieldReferenceExpression) + { + IClass c; + string name = SearchNamespace(type.FullyQualifiedName, this.CompilationUnit); + // TODO: Test directly for NamespaceReturnType + if (name != null) { + name += "." + fieldReferenceExpression.FieldName; + string n = SearchNamespace(name, null); + if (n != null) { + return new NamespaceResolveResult(callingClass, callingMember, n); + } + c = SearchType(name, this.CallingClass, this.CompilationUnit); + if (c != null) { + return new TypeResolveResult(callingClass, callingMember, c); + } + return null; + } + IMember member = GetMember(type, fieldReferenceExpression.FieldName); + if (member != null) + return CreateMemberResolveResult(member); + c = type.GetUnderlyingClass(); + if (c != null) { + List innerClasses = c.InnerClasses; + if (innerClasses != null) { + foreach (IClass innerClass in innerClasses) { + if (IsSameName(innerClass.Name, fieldReferenceExpression.FieldName)) { + return new TypeResolveResult(callingClass, callingMember, innerClass); + } + } + } + } + return ResolveMethod(type, fieldReferenceExpression.FieldName); + } + /// /// Creates a new class containing only the specified member. /// This is useful because we only want to parse current method for local variables, diff --git a/src/Main/Base/Project/Src/Dom/ReflectionLayer/ReflectionReturnType.cs b/src/Main/Base/Project/Src/Dom/ReflectionLayer/ReflectionReturnType.cs index 5395222088..55ea1b85f0 100644 --- a/src/Main/Base/Project/Src/Dom/ReflectionLayer/ReflectionReturnType.cs +++ b/src/Main/Base/Project/Src/Dom/ReflectionLayer/ReflectionReturnType.cs @@ -14,17 +14,20 @@ namespace ICSharpCode.SharpDevelop.Dom { public static IReturnType Create(IProjectContent content, Type type) { - string name = type.FullName; - if (name == null) - return null; - if (name.Length > 2) { - if (name[name.Length - 2] == '`') { - name = name.Substring(0, name.Length - 2); - } - } if (type.IsArray) { return MakeArray(type, Create(content, type.GetElementType())); } else { + string name = type.FullName; + if (name == null) + return null; + if (name.Length > 2) { + if (name[name.Length - 2] == '`') { + name = name.Substring(0, name.Length - 2); + } + } + if (name.IndexOf('+') > 0) { + name = name.Replace('+', '.'); + } return new GetClassReturnType(content, name); } } diff --git a/src/Main/Base/Project/Src/Dom/ResolveResult.cs b/src/Main/Base/Project/Src/Dom/ResolveResult.cs index 4d640c685d..ece034dce4 100644 --- a/src/Main/Base/Project/Src/Dom/ResolveResult.cs +++ b/src/Main/Base/Project/Src/Dom/ResolveResult.cs @@ -224,6 +224,12 @@ namespace ICSharpCode.SharpDevelop.Dom { IClass resolvedClass; + public TypeResolveResult(IClass callingClass, IMember callingMember, IClass resolvedClass) + : base(callingClass, callingMember, resolvedClass.DefaultReturnType) + { + this.resolvedClass = resolvedClass; + } + public TypeResolveResult(IClass callingClass, IMember callingMember, IReturnType resolvedType, IClass resolvedClass) : base(callingClass, callingMember, resolvedType) { diff --git a/src/Main/Base/Project/Src/Services/ParserService/DefaultProjectContent.cs b/src/Main/Base/Project/Src/Services/ParserService/DefaultProjectContent.cs index 2c548df324..af414e6263 100644 --- a/src/Main/Base/Project/Src/Services/ParserService/DefaultProjectContent.cs +++ b/src/Main/Base/Project/Src/Services/ParserService/DefaultProjectContent.cs @@ -346,9 +346,10 @@ namespace ICSharpCode.Core string outerName = typeName.Substring(0, lastIndex); if (classes.ContainsKey(outerName)) { IClass upperClass = classes[outerName]; - if (upperClass.InnerClasses != null) { + List innerClasses = upperClass.InnerClasses; + if (innerClasses != null) { string innerName = typeName.Substring(lastIndex + 1); - foreach (IClass c in upperClass.InnerClasses) { + foreach (IClass c in innerClasses) { if (language.NameComparer.Equals(c.Name, innerName)) { return c; } @@ -473,6 +474,24 @@ namespace ICSharpCode.Core if (c != null) { return c; } + if (curType != null) { + // Try parent namespaces of the current class + string fullname = curType.FullyQualifiedName; + string[] namespaces = fullname.Split('.'); + StringBuilder curnamespace = new StringBuilder(); + for (int i = 0; i < namespaces.Length; ++i) { + curnamespace.Append(namespaces[i]); + curnamespace.Append('.'); + + curnamespace.Append(name); + c = GetClass(curnamespace.ToString()); + if (c != null) { + return c; + } + // remove class name again to try next namespace + curnamespace.Length -= name.Length; + } + } if (unit != null) { // Combine name with usings foreach (IUsing u in unit.Usings) { @@ -484,25 +503,6 @@ namespace ICSharpCode.Core } } } - if (curType == null) { - return null; - } - // Try parent namespaces of the current class - string fullname = curType.FullyQualifiedName; - string[] namespaces = fullname.Split('.'); - StringBuilder curnamespace = new StringBuilder(); - for (int i = 0; i < namespaces.Length; ++i) { - curnamespace.Append(namespaces[i]); - curnamespace.Append('.'); - - curnamespace.Append(name); - c = GetClass(curnamespace.ToString()); - if (c != null) { - return c; - } - // remove class name again to try next namespace - curnamespace.Length -= name.Length; - } return null; } diff --git a/src/Main/Base/Test/NRefactoryResolverTests.cs b/src/Main/Base/Test/NRefactoryResolverTests.cs index 83e9c06087..41635b2d97 100644 --- a/src/Main/Base/Test/NRefactoryResolverTests.cs +++ b/src/Main/Base/Test/NRefactoryResolverTests.cs @@ -465,6 +465,42 @@ class B { Assert.IsTrue(result is TypeResolveResult); Assert.AreEqual("System.Activator", result.ResolvedType.FullyQualifiedName); } + + [Test] + public void NamespacePreferenceTest() + { + // Classes in the current namespace are preferred over classes from + // imported namespaces + string program = @"using System; +namespace Testnamespace { +class A { + +} + +class Activator { + +} +} +"; + ResolveResult result = Resolve(program, "Activator", 4); + Assert.IsNotNull(result); + Assert.IsTrue(result is TypeResolveResult); + Assert.AreEqual("Testnamespace.Activator", result.ResolvedType.FullyQualifiedName); + } + + [Test] + public void InnerClassTest() + { + string program = @"using System; +class A { + +} +"; + ResolveResult result = Resolve(program, "Environment.SpecialFolder", 3); + Assert.IsNotNull(result); + Assert.IsTrue(result is TypeResolveResult); + Assert.AreEqual("System.Environment.SpecialFolder", result.ResolvedType.FullyQualifiedName); + } #endregion } } diff --git a/src/Main/Base/Test/ReflectionLayerTests.cs b/src/Main/Base/Test/ReflectionLayerTests.cs index 3a69d8df7e..04e2d0114b 100644 --- a/src/Main/Base/Test/ReflectionLayerTests.cs +++ b/src/Main/Base/Test/ReflectionLayerTests.cs @@ -56,7 +56,9 @@ namespace ICSharpCode.SharpDevelop.Tests } IMethod GetMethod(IClass c, string name) { - return c.Methods.Find(delegate(IMethod m) { return m.Name == name; }); + IMethod result = c.Methods.Find(delegate(IMethod m) { return m.Name == name; }); + Assert.IsNotNull(result, "Method " + name + " not found"); + return result; } [Test] @@ -72,5 +74,26 @@ namespace ICSharpCode.SharpDevelop.Tests Assert.AreEqual("M:System.Collections.Generic.List`1.ConvertAll``1(System.Converter{`0,``0})", GetMethod(c, "ConvertAll").DocumentationTag); } + + [Test] + public void InnerClassesTest() + { + IClass c = pc.GetClass("System.Environment.SpecialFolder"); + Assert.IsNotNull(c, "c is null"); + Assert.AreEqual("System.Environment.SpecialFolder", c.FullyQualifiedName); + } + + [Test] + public void InnerClassReferenceTest() + { + IClass c = pc.GetClass("System.Environment"); + Assert.IsNotNull(c, "System.Environment not found"); + IReturnType rt = GetMethod(c, "GetFolderPath").Parameters[0].ReturnType; + Assert.IsNotNull(rt, "ReturnType is null"); + Assert.AreEqual("System.Environment.SpecialFolder", rt.FullyQualifiedName); + IClass inner = rt.GetUnderlyingClass(); + Assert.IsNotNull(inner, "UnderlyingClass"); + Assert.AreEqual("System.Environment.SpecialFolder", inner.FullyQualifiedName); + } } } diff --git a/src/Main/StartUp/Project/Dialogs/SplashScreen.cs b/src/Main/StartUp/Project/Dialogs/SplashScreen.cs index 97d3b8e51e..2de83aadff 100644 --- a/src/Main/StartUp/Project/Dialogs/SplashScreen.cs +++ b/src/Main/StartUp/Project/Dialogs/SplashScreen.cs @@ -39,6 +39,7 @@ namespace ICSharpCode.SharpDevelop #endif using (Font font = new Font("Vrinda", 4)) { using (Graphics g = Graphics.FromImage(bitmap)) { + g.DrawRectangle(Pens.Black, 0, 0, bitmap.Size.Width - 1, bitmap.Size.Height - 1); g.DrawString(versionText, font, Brushes.Black, 116, 142); } } diff --git a/src/Main/StartUp/Project/Resources/BitmapResources.resources b/src/Main/StartUp/Project/Resources/BitmapResources.resources index 677a12ade6..24ef266d31 100644 Binary files a/src/Main/StartUp/Project/Resources/BitmapResources.resources and b/src/Main/StartUp/Project/Resources/BitmapResources.resources differ diff --git a/src/SharpDevelop.sln b/src/SharpDevelop.sln index a4a1ed7e1b..f2d989028c 100644 --- a/src/SharpDevelop.sln +++ b/src/SharpDevelop.sln @@ -1,35 +1,5 @@ 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.Tests", "Main\Base\Test\ICSharpCode.SharpDevelop.Tests.csproj", "{4980B743-B32F-4aba-AABD-45E2CAD3568D}" -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("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core.Tests", "Main\Core\Test\ICSharpCode.Core.Tests.csproj", "{AD6FAA08-D6F5-4DBA-AF85-F4DA9F40C3B5}" -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}") = "nunit.framework.dll", "Tools\NUnit\src\NUnitFramework\framework\nunit.framework.dll.csproj", "{83DD7E12-A705-4DBA-9D71-09C8973D9382}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.core.dll", "Tools\NUnit\src\NUnitFramework\core\nunit.core.dll.csproj", "{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}" -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("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.extensions.dll", "Tools\NUnit\src\NUnitFramework\extensions\nunit.extensions.dll.csproj", "{98B10E98-003C-45A0-9587-119142E39986}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AddIns", "AddIns", "{14A277EE-7DF1-4529-B639-7D1EF334C1C5}" ProjectSection(SolutionItems) = postProject EndProjectSection @@ -54,6 +24,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Misc", "Misc", "{CE5B42B7-6 ProjectSection(SolutionItems) = postProject EndProjectSection EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SubversionAddIn", "AddIns\Misc\SubversionAddIn\Project\SubversionAddIn.csproj", "{17F4D7E0-6933-4C2E-8714-FD7E98D625D5}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Debugger", "Debugger", "{6604365C-C702-4C10-9BA8-637F1E3D4D0D}" ProjectSection(SolutionItems) = postProject EndProjectSection @@ -76,6 +48,36 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartPage", "AddIns\Misc\St EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AddinScout", "AddIns\Misc\AddinScout\Project\AddinScout.csproj", "{4B8F0F98-8BE1-402B-AA8B-C8D548577B38}" 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}") = "nunit.framework.dll", "Tools\NUnit\src\NUnitFramework\framework\nunit.framework.dll.csproj", "{83DD7E12-A705-4DBA-9D71-09C8973D9382}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.core.dll", "Tools\NUnit\src\NUnitFramework\core\nunit.core.dll.csproj", "{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}" +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("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.extensions.dll", "Tools\NUnit\src\NUnitFramework\extensions\nunit.extensions.dll.csproj", "{98B10E98-003C-45A0-9587-119142E39986}" +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.Tests", "Main\Base\Test\ICSharpCode.SharpDevelop.Tests.csproj", "{4980B743-B32F-4aba-AABD-45E2CAD3568D}" +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("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core.Tests", "Main\Core\Test\ICSharpCode.Core.Tests.csproj", "{AD6FAA08-D6F5-4DBA-AF85-F4DA9F40C3B5}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -157,17 +159,6 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {AD6FAA08-D6F5-4DBA-AF85-F4DA9F40C3B5} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486} - {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} - {4980B743-B32F-4aba-AABD-45E2CAD3568D} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486} - {98B10E98-003C-45A0-9587-119142E39986} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C} - {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} - {EBD43A7F-AFCA-4281-BB53-5CDD91F966A3} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C} - {83DD7E12-A705-4DBA-9D71-09C8973D9382} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C} {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5} {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5} {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5} @@ -182,8 +173,20 @@ Global {D022A6CE-7438-41E8-AC64-F2DE18EC54C6} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} {A82F44D7-F336-4AD6-B2EE-D2C082D094EC} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} {6604365C-C702-4C10-9BA8-637F1E3D4D0D} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} + {17F4D7E0-6933-4C2E-8714-FD7E98D625D5} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} {B08385CD-F0CC-488C-B4F4-EEB34B6D2688} = {6604365C-C702-4C10-9BA8-637F1E3D4D0D} {1D18D788-F7EE-4585-A23B-34DC8EC63CB8} = {6604365C-C702-4C10-9BA8-637F1E3D4D0D} {EC06F96A-AEEC-49D6-B03D-AB87C6EB674C} = {6604365C-C702-4C10-9BA8-637F1E3D4D0D} + {98B10E98-003C-45A0-9587-119142E39986} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C} + {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} + {EBD43A7F-AFCA-4281-BB53-5CDD91F966A3} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C} + {83DD7E12-A705-4DBA-9D71-09C8973D9382} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C} + {AD6FAA08-D6F5-4DBA-AF85-F4DA9F40C3B5} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486} + {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} + {4980B743-B32F-4aba-AABD-45E2CAD3568D} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486} EndGlobalSection EndGlobal