diff --git a/data/templates/project/CSharp/ConsoleProject.xpt b/data/templates/project/CSharp/ConsoleProject.xpt index 2820e0e410..08d1539d5e 100644 --- a/data/templates/project/CSharp/ConsoleProject.xpt +++ b/data/templates/project/CSharp/ConsoleProject.xpt @@ -8,7 +8,7 @@ ${res:Templates.File.Categories.WindowsApplications} C#.Project.DOSProject ${res:Templates.Project.ConsoleProject.Description} - v2.0;Mono v2.0 + v2.0 diff --git a/data/templates/project/CSharp/EmptyProject.xpt b/data/templates/project/CSharp/EmptyProject.xpt index 63f299307a..505cffe594 100644 --- a/data/templates/project/CSharp/EmptyProject.xpt +++ b/data/templates/project/CSharp/EmptyProject.xpt @@ -9,7 +9,7 @@ C# C#.Project.EmptyProject ${res:Templates.Project.EmptyProject.Description} - v2.0;Mono;CF + v2.0;CF diff --git a/data/templates/project/CSharp/Library.xpt b/data/templates/project/CSharp/Library.xpt index 4d4da8c2be..5b8e6cff18 100644 --- a/data/templates/project/CSharp/Library.xpt +++ b/data/templates/project/CSharp/Library.xpt @@ -7,7 +7,7 @@ C# C#.Project.Library ${res:Templates.Project.ClassLibrary.Description} - v2.0;Mono v2.0;CF 2.0 + v2.0;CF 2.0 diff --git a/data/templates/project/VBNet/GtkProject.xpt b/data/templates/project/VBNet/GtkProject.xpt deleted file mode 100644 index 23b0eef0fb..0000000000 --- a/data/templates/project/VBNet/GtkProject.xpt +++ /dev/null @@ -1,99 +0,0 @@ - - diff --git a/src/AddIns/Misc/MonoAddIn/MonoAddIn.sln b/samples/Mono/Mono.AddIn.sln similarity index 65% rename from src/AddIns/Misc/MonoAddIn/MonoAddIn.sln rename to samples/Mono/Mono.AddIn.sln index d2e1b75e8f..803b80f471 100644 --- a/src/AddIns/Misc/MonoAddIn/MonoAddIn.sln +++ b/samples/Mono/Mono.AddIn.sln @@ -1,20 +1,12 @@ -Microsoft Visual Studio Solution File, Format Version 9.00 -# SharpDevelop 2.0.0.960 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoAddIn", "Project\MonoAddIn.csproj", "{082DCD64-EE32-4151-A50F-E139CF754CC0}" + +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual Studio 2008 +# SharpDevelop 3.0.0.2745 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.AddIn", "Mono.AddIn\Mono.AddIn.csproj", "{082DCD64-EE32-4151-A50F-E139CF754CC0}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoReflectionLoader", "..\MonoReflectionLoader\Project\MonoReflectionLoader.csproj", "{8C52FFA5-35AF-4E28-8498-2DC2F168A241}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Build.Tasks", "Mono.Build.Tasks\Mono.Build.Tasks.csproj", "{BF6F814C-B89F-475E-ADC4-AEE81D10CB94}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Build.Tasks", "..\..\..\Libraries\ICSharpCode.Build.Tasks\Project\ICSharpCode.Build.Tasks.csproj", "{4139CCF6-FB49-4A9D-B2CF-331E9EA3198D}" -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}") = "ICSharpCode.SharpDevelop", "..\..\..\Main\Base\Project\ICSharpCode.SharpDevelop.csproj", "{2748AD25-9C63-4E12-877B-4DCE96FBED54}" -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}") = "ICSharpCode.TextEditor", "..\..\..\Libraries\ICSharpCode.TextEditor\Project\ICSharpCode.TextEditor.csproj", "{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinFormsUI", "..\..\..\Libraries\DockPanel_Src\WinFormsUI\WinFormsUI.csproj", "{D3C782BA-178E-4235-A3BA-8C11DEBB6BEE}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Build.Tasks.Tests", "Mono.Build.Tasks.Tests\Mono.Build.Tasks.Tests.csproj", "{B7C2A664-B454-4920-AC6E-318F5274B2EF}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -54,5 +46,13 @@ Global {D3C782BA-178E-4235-A3BA-8C11DEBB6BEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D3C782BA-178E-4235-A3BA-8C11DEBB6BEE}.Release|Any CPU.Build.0 = Release|Any CPU {D3C782BA-178E-4235-A3BA-8C11DEBB6BEE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BF6F814C-B89F-475E-ADC4-AEE81D10CB94}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BF6F814C-B89F-475E-ADC4-AEE81D10CB94}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BF6F814C-B89F-475E-ADC4-AEE81D10CB94}.Release|Any CPU.Build.0 = Release|Any CPU + {BF6F814C-B89F-475E-ADC4-AEE81D10CB94}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B7C2A664-B454-4920-AC6E-318F5274B2EF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B7C2A664-B454-4920-AC6E-318F5274B2EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B7C2A664-B454-4920-AC6E-318F5274B2EF}.Release|Any CPU.Build.0 = Release|Any CPU + {B7C2A664-B454-4920-AC6E-318F5274B2EF}.Release|Any CPU.ActiveCfg = Release|Any CPU EndGlobalSection EndGlobal diff --git a/src/AddIns/Misc/MonoAddIn/Project/Configuration/AssemblyInfo.cs b/samples/Mono/Mono.AddIn/Configuration/AssemblyInfo.cs similarity index 53% rename from src/AddIns/Misc/MonoAddIn/Project/Configuration/AssemblyInfo.cs rename to samples/Mono/Mono.AddIn/Configuration/AssemblyInfo.cs index 02960481ae..e1bbc45d8e 100644 --- a/src/AddIns/Misc/MonoAddIn/Project/Configuration/AssemblyInfo.cs +++ b/samples/Mono/Mono.AddIn/Configuration/AssemblyInfo.cs @@ -13,8 +13,20 @@ using System.Reflection; // change them to the information which is associated with the assembly // you compile. -[assembly: AssemblyTitle("MonoAddIn")] -[assembly: AssemblyDescription("Mono-AddIn for SharpDevelop")] +[assembly: AssemblyTitle("Mono.AddIn")] +[assembly: AssemblyDescription("Mono AddIn for SharpDevelop")] [assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("SharpDevelop")] +[assembly: AssemblyCopyright("")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] + +// The assembly version has following format : +// +// Major.Minor.Build.Revision +// +// You can specify all values by your own or you can build default build and revision +// numbers with the '*' character (the default): + +[assembly: AssemblyVersion("1.0.*")] diff --git a/samples/Mono/Mono.AddIn/Mono.AddIn.csproj b/samples/Mono/Mono.AddIn/Mono.AddIn.csproj new file mode 100644 index 0000000000..87e143c7de --- /dev/null +++ b/samples/Mono/Mono.AddIn/Mono.AddIn.csproj @@ -0,0 +1,105 @@ + + + Library + Mono.AddIn + Mono.AddIn + Debug + AnyCPU + {082DCD64-EE32-4151-A50F-E139CF754CC0} + False + False + False + Auto + 121110528 + AnyCPU + 4096 + 4 + false + v3.5 + + + ..\..\..\AddIns\Samples\Mono.AddIn + False + DEBUG;TRACE + true + Full + True + + + ..\..\..\AddIns\Samples\Mono.AddIn + True + TRACE + false + None + False + + + + ..\..\..\bin\ICSharpCode.Core.dll + False + + + ..\..\..\bin\ICSharpCode.SharpDevelop.dll + False + + + ..\..\..\bin\ICSharpCode.SharpDevelop.Dom.dll + False + + + + + + + + + + + + + + + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + + + {BF6F814C-B89F-475E-ADC4-AEE81D10CB94} + Mono.Build.Tasks + + + + + \ No newline at end of file diff --git a/src/AddIns/Misc/MonoAddIn/Project/MonoAddIn.addin b/samples/Mono/Mono.AddIn/Mono.addin similarity index 54% rename from src/AddIns/Misc/MonoAddIn/Project/MonoAddIn.addin rename to samples/Mono/Mono.AddIn/Mono.addin index 5dfde60cb4..7b7da1a235 100644 --- a/src/AddIns/Misc/MonoAddIn/Project/MonoAddIn.addin +++ b/samples/Mono/Mono.AddIn/Mono.addin @@ -1,16 +1,16 @@ - + - - - + + + @@ -20,7 +20,7 @@ label="Add Mono Reference" insertafter="AddReference" insertbefore="AddWebReference" - class="ICSharpCode.MonoAddIn.AddMonoReferenceCommand"/> + class="Mono.AddIn.AddMonoReferenceCommand"/> @@ -30,7 +30,7 @@ label="Add Mono Reference" insertafter="AddReference" insertbefore="AddWebReference" - class="ICSharpCode.MonoAddIn.AddMonoReferenceCommand"/> + class="Mono.AddIn.AddMonoReferenceCommand"/> @@ -50,15 +50,27 @@ - - + + - - + + - + + + + + + + + + + diff --git a/samples/Mono/Mono.AddIn/Src/AddMonoReferenceCommand.cs b/samples/Mono/Mono.AddIn/Src/AddMonoReferenceCommand.cs new file mode 100644 index 0000000000..12b751b19e --- /dev/null +++ b/samples/Mono/Mono.AddIn/Src/AddMonoReferenceCommand.cs @@ -0,0 +1,58 @@ +// SharpDevelop samples +// Copyright (c) 2006, AlphaSierraPapa +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without modification, are +// permitted provided that the following conditions are met: +// +// - Redistributions of source code must retain the above copyright notice, this list +// of conditions and the following disclaimer. +// +// - Redistributions in binary form must reproduce the above copyright notice, this list +// of conditions and the following disclaimer in the documentation and/or other materials +// provided with the distribution. +// +// - Neither the name of the SharpDevelop team nor the names of its contributors may be used to +// endorse or promote products derived from this software without specific prior written +// permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &AS IS& AND ANY EXPRESS +// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY +// AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT +// OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +using System; +using System.Windows.Forms; +using ICSharpCode.Core; +using ICSharpCode.SharpDevelop.Project; + +namespace Mono.AddIn +{ + /// + /// Displays the AddMonoReference dialog allowing the user to add + /// a Mono GAC reference to the project + /// + public class AddMonoReferenceCommand : AbstractMenuCommand + { + public override void Run() + { + AbstractProjectBrowserTreeNode node = Owner as AbstractProjectBrowserTreeNode; + IProject project = (node != null) ? node.Project : ProjectService.CurrentProject; + if (project == null) { + return; + } + using (SelectMonoReferenceDialog selDialog = new SelectMonoReferenceDialog(project)) { + if (selDialog.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainForm) == DialogResult.OK) { + foreach (ReferenceProjectItem reference in selDialog.ReferenceInformations) { + ProjectService.AddProjectItem(project, reference); + } + project.Save(); + } + } + } + } +} diff --git a/samples/Mono/Mono.AddIn/Src/IsMonoInstalledCondition.cs b/samples/Mono/Mono.AddIn/Src/IsMonoInstalledCondition.cs new file mode 100644 index 0000000000..a79707c064 --- /dev/null +++ b/samples/Mono/Mono.AddIn/Src/IsMonoInstalledCondition.cs @@ -0,0 +1,44 @@ +// SharpDevelop samples +// Copyright (c) 2006, AlphaSierraPapa +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without modification, are +// permitted provided that the following conditions are met: +// +// - Redistributions of source code must retain the above copyright notice, this list +// of conditions and the following disclaimer. +// +// - Redistributions in binary form must reproduce the above copyright notice, this list +// of conditions and the following disclaimer in the documentation and/or other materials +// provided with the distribution. +// +// - Neither the name of the SharpDevelop team nor the names of its contributors may be used to +// endorse or promote products derived from this software without specific prior written +// permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &AS IS& AND ANY EXPRESS +// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY +// AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT +// OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +using System; +using Mono.Build.Tasks; +using ICSharpCode.Core; + +namespace Mono.AddIn +{ + /// + /// Determines whether Mono is installed. + /// + public class IsMonoInstalledCondition : IConditionEvaluator + { + public bool IsValid(object caller, Condition condition) + { + return MonoToolLocationHelper.IsMonoInstalled; + } + } +} diff --git a/samples/Mono/Mono.AddIn/Src/MonoGacReferencePanel.cs b/samples/Mono/Mono.AddIn/Src/MonoGacReferencePanel.cs new file mode 100644 index 0000000000..c4e737e3e6 --- /dev/null +++ b/samples/Mono/Mono.AddIn/Src/MonoGacReferencePanel.cs @@ -0,0 +1,52 @@ +// SharpDevelop samples +// Copyright (c) 2006, AlphaSierraPapa +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without modification, are +// permitted provided that the following conditions are met: +// +// - Redistributions of source code must retain the above copyright notice, this list +// of conditions and the following disclaimer. +// +// - Redistributions in binary form must reproduce the above copyright notice, this list +// of conditions and the following disclaimer in the documentation and/or other materials +// provided with the distribution. +// +// - Neither the name of the SharpDevelop team nor the names of its contributors may be used to +// endorse or promote products derived from this software without specific prior written +// permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &AS IS& AND ANY EXPRESS +// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY +// AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT +// OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +using ICSharpCode.SharpDevelop.Dom; +using System; +using System.Collections.Generic; +using System.Windows.Forms; +using Mono.Build.Tasks; +using ICSharpCode.SharpDevelop.Gui; + +namespace Mono.AddIn +{ + public class MonoGacReferencePanel : GacReferencePanel + { + public MonoGacReferencePanel(ISelectReferenceDialog selectDialog) : base(selectDialog) + { + } + + protected override IList GetCacheContent() + { + List list = new List(); + foreach (MonoAssemblyName assemblyName in MonoGlobalAssemblyCache.GetAssemblyNames()) { + list.Add(new DomAssemblyName(assemblyName.FullName)); + } + return list; + } + } +} diff --git a/samples/Mono/Mono.AddIn/Src/MonoProjectContentRegistry.cs b/samples/Mono/Mono.AddIn/Src/MonoProjectContentRegistry.cs new file mode 100644 index 0000000000..83fe107bf3 --- /dev/null +++ b/samples/Mono/Mono.AddIn/Src/MonoProjectContentRegistry.cs @@ -0,0 +1,56 @@ +// SharpDevelop samples +// Copyright (c) 2006, AlphaSierraPapa +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without modification, are +// permitted provided that the following conditions are met: +// +// - Redistributions of source code must retain the above copyright notice, this list +// of conditions and the following disclaimer. +// +// - Redistributions in binary form must reproduce the above copyright notice, this list +// of conditions and the following disclaimer in the documentation and/or other materials +// provided with the distribution. +// +// - Neither the name of the SharpDevelop team nor the names of its contributors may be used to +// endorse or promote products derived from this software without specific prior written +// permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &AS IS& AND ANY EXPRESS +// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY +// AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT +// OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +using System; +using System.IO; +using ICSharpCode.SharpDevelop; +using ICSharpCode.SharpDevelop.Dom; +using Mono.Build.Tasks; + +namespace Mono.AddIn +{ + public class MonoProjectContentRegistry : ProjectContentRegistry + { + protected override IProjectContent LoadProjectContent(string itemInclude, string itemFileName) + { + if (File.Exists(itemFileName)) { + return ParserService.DefaultProjectContentRegistry.GetProjectContentForReference(itemInclude, itemFileName); + } + MonoAssemblyName assemblyName = MonoGlobalAssemblyCache.FindAssemblyName(itemInclude); + if (assemblyName != null && assemblyName.FileName != null) { + return CecilReader.LoadAssembly(assemblyName.FileName, this); + } else { + if (MonoToolLocationHelper.IsMonoInstalled) { + HostCallback.ShowAssemblyLoadError(itemFileName, itemInclude, "Could not find assembly in Mono's GAC."); + } else { + HostCallback.ShowAssemblyLoadError(itemFileName, itemInclude, "Could not find assembly in Mono's GAC - Mono is not installed."); + } + return null; + } + } + } +} diff --git a/samples/Mono/Mono.AddIn/Src/SelectMonoReferenceDialog.cs b/samples/Mono/Mono.AddIn/Src/SelectMonoReferenceDialog.cs new file mode 100644 index 0000000000..0510233301 --- /dev/null +++ b/samples/Mono/Mono.AddIn/Src/SelectMonoReferenceDialog.cs @@ -0,0 +1,320 @@ +// SharpDevelop samples +// Copyright (c) 2006, AlphaSierraPapa +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without modification, are +// permitted provided that the following conditions are met: +// +// - Redistributions of source code must retain the above copyright notice, this list +// of conditions and the following disclaimer. +// +// - Redistributions in binary form must reproduce the above copyright notice, this list +// of conditions and the following disclaimer in the documentation and/or other materials +// provided with the distribution. +// +// - Neither the name of the SharpDevelop team nor the names of its contributors may be used to +// endorse or promote products derived from this software without specific prior written +// permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &AS IS& AND ANY EXPRESS +// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY +// AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT +// OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +using System; +using System.Collections; +using System.Collections.Generic; +using System.IO; +using System.Windows.Forms; + +using Mono.Build.Tasks; +using ICSharpCode.Core; +using ICSharpCode.SharpDevelop.Gui; +using ICSharpCode.SharpDevelop.Project; + +namespace Mono.AddIn +{ + public class SelectMonoReferenceDialog : System.Windows.Forms.Form, ISelectReferenceDialog + { + private System.Windows.Forms.ListView referencesListView; + private System.Windows.Forms.Button selectButton; + private System.Windows.Forms.Button removeButton; + private System.Windows.Forms.TabPage gacTabPage; + private System.Windows.Forms.TabPage projectTabPage; + private System.Windows.Forms.TabPage browserTabPage; + private System.Windows.Forms.Label referencesLabel; + private System.Windows.Forms.ColumnHeader referenceHeader; + private System.Windows.Forms.ColumnHeader typeHeader; + private System.Windows.Forms.ColumnHeader locationHeader; + private System.Windows.Forms.TabControl referenceTabControl; + private System.Windows.Forms.Button okButton; + private System.Windows.Forms.Button cancelButton; + private System.Windows.Forms.Button helpButton; + private System.ComponentModel.Container components = null; + + List gacReferences = new List(); + IProject configureProject; + + public ArrayList ReferenceInformations { + get { + ArrayList referenceInformations = new ArrayList(); + foreach (ListViewItem item in referencesListView.Items) { + System.Diagnostics.Debug.Assert(item.Tag != null); + referenceInformations.Add(item.Tag); + } + return referenceInformations; + } + } + + public IProject ConfigureProject { + get { return configureProject; } + } + + public List GacReferences { + get { return gacReferences; } + } + + public SelectMonoReferenceDialog(IProject configureProject) + { + this.configureProject = configureProject; + + InitializeComponent(); + + gacTabPage.Controls.Add(new MonoGacReferencePanel(this)); + projectTabPage.Controls.Add(new ProjectReferencePanel(this)); + browserTabPage.Controls.Add(new AssemblyReferencePanel(this)); + } + + public void AddReference(string referenceName, string referenceType, string referenceLocation, ReferenceProjectItem projectItem) + { + if (projectItem == null) + throw new ArgumentNullException("projectItem"); + + foreach (ListViewItem item in referencesListView.Items) { + if (referenceLocation == item.SubItems[2].Text && referenceName == item.Text) { + return; + } + } + + ListViewItem newItem = new ListViewItem(new string[] {referenceName, referenceType, referenceLocation}); + newItem.Tag = projectItem; + referencesListView.Items.Add(newItem); + + if (referenceType == "Gac") { + // Add hint path so we can build against Microsoft's Csc too. + projectItem.HintPath = FileUtility.GetRelativePath(configureProject.Directory, GetAssemblyLocation(referenceLocation)); + } + } + + void SelectReference(object sender, EventArgs e) + { + IReferencePanel refPanel = (IReferencePanel)referenceTabControl.SelectedTab.Controls[0]; + refPanel.AddReference(); + } + + void RemoveReference(object sender, EventArgs e) + { + ArrayList itemsToDelete = new ArrayList(); + + foreach (ListViewItem item in referencesListView.SelectedItems) { + itemsToDelete.Add(item); + } + + foreach (ListViewItem item in itemsToDelete) { + referencesListView.Items.Remove(item); + ReferenceProjectItem referenceItem = item.Tag as ReferenceProjectItem; + if (referenceItem != null) { + gacReferences.Remove(referenceItem); + } + } + } + + string GetAssemblyLocation(string name) + { + MonoAssemblyName assemblyName = MonoGlobalAssemblyCache.FindAssemblyName(name); + if (assemblyName != null) { + return assemblyName.FileName; + } + return String.Empty; + } + + /// + /// Clean up any resources being used. + /// + protected override void Dispose(bool disposing) + { + if (disposing) { + if (components != null) { + components.Dispose(); + } + } + base.Dispose( disposing ); + } + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.referenceTabControl = new System.Windows.Forms.TabControl(); + this.referencesListView = new System.Windows.Forms.ListView(); + this.selectButton = new System.Windows.Forms.Button(); + this.removeButton = new System.Windows.Forms.Button(); + this.gacTabPage = new System.Windows.Forms.TabPage(); + this.projectTabPage = new System.Windows.Forms.TabPage(); + this.browserTabPage = new System.Windows.Forms.TabPage(); + this.referencesLabel = new System.Windows.Forms.Label(); + this.referenceHeader = new System.Windows.Forms.ColumnHeader(); + this.typeHeader = new System.Windows.Forms.ColumnHeader(); + this.locationHeader = new System.Windows.Forms.ColumnHeader(); + this.okButton = new System.Windows.Forms.Button(); + this.cancelButton = new System.Windows.Forms.Button(); + this.helpButton = new System.Windows.Forms.Button(); + this.referenceTabControl.SuspendLayout(); + this.SuspendLayout(); + // + // referenceTabControl + // + this.referenceTabControl.Controls.AddRange(new System.Windows.Forms.Control[] { + this.gacTabPage, + this.projectTabPage, + this.browserTabPage, + }); + this.referenceTabControl.Location = new System.Drawing.Point(8, 8); + this.referenceTabControl.SelectedIndex = 0; + this.referenceTabControl.Size = new System.Drawing.Size(472, 224); + this.referenceTabControl.TabIndex = 0; + // + // referencesListView + // + this.referencesListView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { + this.referenceHeader, + this.typeHeader, + this.locationHeader}); + this.referencesListView.Location = new System.Drawing.Point(8, 256); + this.referencesListView.Size = new System.Drawing.Size(472, 97); + this.referencesListView.TabIndex = 3; + this.referencesListView.View = System.Windows.Forms.View.Details; + this.referencesListView.FullRowSelect = true; + + + // + // selectButton + // + this.selectButton.Location = new System.Drawing.Point(488, 32); + this.selectButton.TabIndex = 1; + this.selectButton.Text = ResourceService.GetString("Dialog.SelectReferenceDialog.SelectButton"); + this.selectButton.Click += new EventHandler(SelectReference); + this.selectButton.FlatStyle = FlatStyle.System; + + // + // removeButton + // + this.removeButton.Location = new System.Drawing.Point(488, 256); + this.removeButton.TabIndex = 4; + this.removeButton.Text = ResourceService.GetString("Global.RemoveButtonText"); + this.removeButton.Click += new EventHandler(RemoveReference); + this.removeButton.FlatStyle = FlatStyle.System; + + // + // gacTabPage + // + this.gacTabPage.Location = new System.Drawing.Point(4, 22); + this.gacTabPage.Size = new System.Drawing.Size(464, 198); + this.gacTabPage.TabIndex = 0; + this.gacTabPage.Text = ResourceService.GetString("Dialog.SelectReferenceDialog.GacTabPage"); + this.gacTabPage.UseVisualStyleBackColor = true; + // + // projectTabPage + // + this.projectTabPage.Location = new System.Drawing.Point(4, 22); + this.projectTabPage.Size = new System.Drawing.Size(464, 198); + this.projectTabPage.TabIndex = 1; + this.projectTabPage.Text = ResourceService.GetString("Dialog.SelectReferenceDialog.ProjectTabPage"); + this.projectTabPage.UseVisualStyleBackColor = true; + // + // browserTabPage + // + this.browserTabPage.Location = new System.Drawing.Point(4, 22); + this.browserTabPage.Size = new System.Drawing.Size(464, 198); + this.browserTabPage.TabIndex = 2; + this.browserTabPage.Text = ResourceService.GetString("Dialog.SelectReferenceDialog.BrowserTabPage"); + this.browserTabPage.UseVisualStyleBackColor = true; + // + // referencesLabel + // + this.referencesLabel.Location = new System.Drawing.Point(8, 240); + this.referencesLabel.Size = new System.Drawing.Size(472, 16); + this.referencesLabel.TabIndex = 2; + this.referencesLabel.Text = ResourceService.GetString("Dialog.SelectReferenceDialog.ReferencesLabel"); + // + // referenceHeader + // + this.referenceHeader.Text = ResourceService.GetString("Dialog.SelectReferenceDialog.ReferenceHeader"); + this.referenceHeader.Width = 183; + // + // typeHeader + // + this.typeHeader.Text = ResourceService.GetString("Dialog.SelectReferenceDialog.TypeHeader"); + this.typeHeader.Width = 57; + // + // locationHeader + // + this.locationHeader.Text = ResourceService.GetString("Dialog.SelectReferenceDialog.LocationHeader"); + this.locationHeader.Width = 228; + // + // okButton + // + this.okButton.DialogResult = System.Windows.Forms.DialogResult.OK; + this.okButton.Location = new System.Drawing.Point(312, 368); + this.okButton.TabIndex = 5; + this.okButton.Text = ResourceService.GetString("Global.OKButtonText"); + this.okButton.FlatStyle = FlatStyle.System; + + // + // cancelButton + // + this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.cancelButton.Location = new System.Drawing.Point(400, 368); + this.cancelButton.TabIndex = 6; + this.cancelButton.Text = ResourceService.GetString("Global.CancelButtonText"); + this.cancelButton.FlatStyle = FlatStyle.System; + + // + // helpButton + // + this.helpButton.Location = new System.Drawing.Point(488, 368); + this.helpButton.TabIndex = 7; + this.helpButton.Text = ResourceService.GetString("Global.HelpButtonText"); + this.helpButton.FlatStyle = FlatStyle.System; + + // + // SelectReferenceDialog + // + this.AcceptButton = this.okButton; + this.CancelButton = this.cancelButton; + this.ClientSize = new System.Drawing.Size(570, 399); + this.Controls.AddRange(new System.Windows.Forms.Control[] { + this.helpButton, + this.cancelButton, + this.okButton, + this.referencesLabel, + this.removeButton, + this.selectButton, + this.referencesListView, + this.referenceTabControl}); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.MaximizeBox = false; + this.MinimizeBox = false; + this.ShowInTaskbar = false; + this.Text = ResourceService.GetString("Dialog.SelectReferenceDialog.DialogName"); + this.referenceTabControl.ResumeLayout(false); + this.ResumeLayout(false); + } + } +} diff --git a/samples/Mono/Mono.AddIn/Templates/CSharp.Console.Project.xpt b/samples/Mono/Mono.AddIn/Templates/CSharp.Console.Project.xpt new file mode 100644 index 0000000000..e3c7bbadb6 --- /dev/null +++ b/samples/Mono/Mono.AddIn/Templates/CSharp.Console.Project.xpt @@ -0,0 +1,53 @@ + + diff --git a/data/templates/file/CSharp/CSharp.Gtk.Window.xft b/samples/Mono/Mono.AddIn/Templates/CSharp.Gtk.Window.xft similarity index 89% rename from data/templates/file/CSharp/CSharp.Gtk.Window.xft rename to samples/Mono/Mono.AddIn/Templates/CSharp.Gtk.Window.xft index 0489fbe941..110f0dcbef 100644 --- a/data/templates/file/CSharp/CSharp.Gtk.Window.xft +++ b/samples/Mono/Mono.AddIn/Templates/CSharp.Gtk.Window.xft @@ -2,14 +2,14 @@ diff --git a/data/templates/project/CSharp/GtkProject.xpt b/samples/Mono/Mono.AddIn/Templates/CSharpGtkProject.xpt similarity index 77% rename from data/templates/project/CSharp/GtkProject.xpt rename to samples/Mono/Mono.AddIn/Templates/CSharpGtkProject.xpt index 9e8b4dce9d..f46c986954 100644 --- a/data/templates/project/CSharp/GtkProject.xpt +++ b/samples/Mono/Mono.AddIn/Templates/CSharpGtkProject.xpt @@ -5,12 +5,11 @@ - ${res:Templates.Project.GtkSharpProject.Name} + Gtk# Application C# Mono C#.Project.Form - ${res:Templates.Project.GtkSharpProject.Description} - Mono + A project that creates a Gtk# application. @@ -21,8 +20,13 @@ WinExe + v2.0 + + + + @@ -34,6 +38,7 @@ - + + diff --git a/samples/Mono/Mono.AddIn/Templates/DefaultApp.config b/samples/Mono/Mono.AddIn/Templates/DefaultApp.config new file mode 100644 index 0000000000..a2380b9c7c --- /dev/null +++ b/samples/Mono/Mono.AddIn/Templates/DefaultApp.config @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/samples/Mono/Mono.AddIn/Templates/DefaultAssemblyInfo.cs b/samples/Mono/Mono.AddIn/Templates/DefaultAssemblyInfo.cs new file mode 100644 index 0000000000..5da5851146 --- /dev/null +++ b/samples/Mono/Mono.AddIn/Templates/DefaultAssemblyInfo.cs @@ -0,0 +1,31 @@ +#region Using directives + +using System; +using System.Reflection; +using System.Runtime.InteropServices; + +#endregion + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("${ProjectName}")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("${ProjectName}")] +[assembly: AssemblyCopyright("")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// This sets the default COM visibility of types in the assembly to invisible. +// If you need to expose a type to COM, use [ComVisible(true)] on that type. +[assembly: ComVisible(false)] + +// The assembly version has following format : +// +// Major.Minor.Build.Revision +// +// You can specify all the values or you can use the default the Revision and +// Build Numbers by using the '*' as shown below: +[assembly: AssemblyVersion("1.0.*")] diff --git a/samples/Mono/Mono.AddIn/Templates/DefaultAssemblyInfo.vb b/samples/Mono/Mono.AddIn/Templates/DefaultAssemblyInfo.vb new file mode 100644 index 0000000000..719627fbe9 --- /dev/null +++ b/samples/Mono/Mono.AddIn/Templates/DefaultAssemblyInfo.vb @@ -0,0 +1,31 @@ +Imports System.Reflection +Imports System.Runtime.CompilerServices +Imports System.Runtime.InteropServices + +' Information about this assembly is defined by the following +' attributes. +' +' change them to the information which is associated with the assembly +' you compile. + + + + + + + + + + +' This sets the default COM visibility of types in the assembly to invisible. +' If you need to expose a type to COM, use on that type. + + +' The assembly version has following format : +' +' Major.Minor.Build.Revision +' +' You can specify all values by your own or you can build default build and revision +' numbers with the '*' character (the default): + + diff --git a/samples/Mono/Mono.AddIn/Templates/VBNet.Console.Project.xpt b/samples/Mono/Mono.AddIn/Templates/VBNet.Console.Project.xpt new file mode 100644 index 0000000000..83ff12eda5 --- /dev/null +++ b/samples/Mono/Mono.AddIn/Templates/VBNet.Console.Project.xpt @@ -0,0 +1,59 @@ + + diff --git a/data/templates/file/VBNet/VBNet.Gtk.Window.xft b/samples/Mono/Mono.AddIn/Templates/VBNet.Gtk.Window.xft similarity index 100% rename from data/templates/file/VBNet/VBNet.Gtk.Window.xft rename to samples/Mono/Mono.AddIn/Templates/VBNet.Gtk.Window.xft diff --git a/samples/Mono/Mono.AddIn/Templates/VBNetGtkProject.xpt b/samples/Mono/Mono.AddIn/Templates/VBNetGtkProject.xpt new file mode 100644 index 0000000000..621ae5a95e --- /dev/null +++ b/samples/Mono/Mono.AddIn/Templates/VBNetGtkProject.xpt @@ -0,0 +1,73 @@ + + diff --git a/src/Libraries/ICSharpCode.Build.Tasks/Test/AssemblyInfo.cs b/samples/Mono/Mono.Build.Tasks.Tests/AssemblyInfo.cs similarity index 100% rename from src/Libraries/ICSharpCode.Build.Tasks/Test/AssemblyInfo.cs rename to samples/Mono/Mono.Build.Tasks.Tests/AssemblyInfo.cs diff --git a/samples/Mono/Mono.Build.Tasks.Tests/GeneralErrorParseTestFixture.cs b/samples/Mono/Mono.Build.Tasks.Tests/GeneralErrorParseTestFixture.cs new file mode 100644 index 0000000000..f77038f9e7 --- /dev/null +++ b/samples/Mono/Mono.Build.Tasks.Tests/GeneralErrorParseTestFixture.cs @@ -0,0 +1,67 @@ +// SharpDevelop samples +// Copyright (c) 2006, AlphaSierraPapa +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without modification, are +// permitted provided that the following conditions are met: +// +// - Redistributions of source code must retain the above copyright notice, this list +// of conditions and the following disclaimer. +// +// - Redistributions in binary form must reproduce the above copyright notice, this list +// of conditions and the following disclaimer in the documentation and/or other materials +// provided with the distribution. +// +// - Neither the name of the SharpDevelop team nor the names of its contributors may be used to +// endorse or promote products derived from this software without specific prior written +// permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &AS IS& AND ANY EXPRESS +// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY +// AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT +// OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +using Mono.Build.Tasks; +using NUnit.Framework; +using System; +using System.Text.RegularExpressions; + +namespace Mono.Build.Tasks.Tests +{ + [TestFixture] + public class GeneralMonoErrorParseTestFixture + { + Match match; + + [TestFixtureSetUp] + public void FixtureSetUp() + { + string error = "error CS1904: `CS0169' is not a valid warning number"; + + Regex regex = new Regex(MonoCSharpCompilerResultsParser.GeneralErrorPattern, RegexOptions.Compiled); + match = regex.Match(error); + } + + [Test] + public void Error() + { + Assert.AreEqual("error", match.Result("${error}")); + } + + [Test] + public void ErrorNumber() + { + Assert.AreEqual("CS1904", match.Result("${number}")); + } + + [Test] + public void ErrorText() + { + Assert.AreEqual("`CS0169' is not a valid warning number", match.Result("${message}")); + } + } +} diff --git a/samples/Mono/Mono.Build.Tasks.Tests/MockMbas.cs b/samples/Mono/Mono.Build.Tasks.Tests/MockMbas.cs new file mode 100644 index 0000000000..53e133450f --- /dev/null +++ b/samples/Mono/Mono.Build.Tasks.Tests/MockMbas.cs @@ -0,0 +1,48 @@ +// SharpDevelop samples +// Copyright (c) 2006, AlphaSierraPapa +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without modification, are +// permitted provided that the following conditions are met: +// +// - Redistributions of source code must retain the above copyright notice, this list +// of conditions and the following disclaimer. +// +// - Redistributions in binary form must reproduce the above copyright notice, this list +// of conditions and the following disclaimer in the documentation and/or other materials +// provided with the distribution. +// +// - Neither the name of the SharpDevelop team nor the names of its contributors may be used to +// endorse or promote products derived from this software without specific prior written +// permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &AS IS& AND ANY EXPRESS +// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY +// AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT +// OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +using Mono.Build.Tasks; +using System; + +namespace Mono.Build.Tasks.Tests +{ + /// + /// Helper class that allows us to test protected methods of the + /// Mbas class. + /// + public class MockMbas : Vbnc + { + /// + /// Generates the Mbas command line arguments via the protected + /// GenerateCommandLineArguments method. + /// + public string GetCommandLine() + { + return base.GenerateResponseFileCommands(); + } + } +} diff --git a/samples/Mono/Mono.Build.Tasks.Tests/MockMonoCSharpCompilerTask.cs b/samples/Mono/Mono.Build.Tasks.Tests/MockMonoCSharpCompilerTask.cs new file mode 100644 index 0000000000..49e2d9d542 --- /dev/null +++ b/samples/Mono/Mono.Build.Tasks.Tests/MockMonoCSharpCompilerTask.cs @@ -0,0 +1,57 @@ +// SharpDevelop samples +// Copyright (c) 2006, AlphaSierraPapa +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without modification, are +// permitted provided that the following conditions are met: +// +// - Redistributions of source code must retain the above copyright notice, this list +// of conditions and the following disclaimer. +// +// - Redistributions in binary form must reproduce the above copyright notice, this list +// of conditions and the following disclaimer in the documentation and/or other materials +// provided with the distribution. +// +// - Neither the name of the SharpDevelop team nor the names of its contributors may be used to +// endorse or promote products derived from this software without specific prior written +// permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &AS IS& AND ANY EXPRESS +// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY +// AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT +// OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +using Mono.Build.Tasks; +using System; + +namespace Mono.Build.Tasks.Tests +{ + /// + /// Helper class that allows us to test protected methods of the + /// MonoCSharpCompilerTask class. + /// + public class MockMonoCSharpCompilerTask : MonoCSharpCompilerTask + { + /// + /// Generates the MonoCSharpCompilerTask command line arguments via the + /// protected GenerateCommandLineArguments method. + /// + public string GetCommandLine() + { + return base.GenerateResponseFileCommands(); + } + + protected override string ToolName { + get { return "MonoCSharp.exe"; } + } + + protected override string GenerateFullPathToTool() + { + return MonoToolLocationHelper.GetPathToTool(ToolName); + } + } +} diff --git a/src/Libraries/ICSharpCode.Build.Tasks/Test/ICSharpCode.Build.Tasks.Tests.csproj b/samples/Mono/Mono.Build.Tasks.Tests/Mono.Build.Tasks.Tests.csproj similarity index 64% rename from src/Libraries/ICSharpCode.Build.Tasks/Test/ICSharpCode.Build.Tasks.Tests.csproj rename to samples/Mono/Mono.Build.Tasks.Tests/Mono.Build.Tasks.Tests.csproj index 225768913c..89eaac1e42 100644 --- a/src/Libraries/ICSharpCode.Build.Tasks/Test/ICSharpCode.Build.Tasks.Tests.csproj +++ b/samples/Mono/Mono.Build.Tasks.Tests/Mono.Build.Tasks.Tests.csproj @@ -1,4 +1,4 @@ - + Library ICSharpCode.Build.Tasks.Tests @@ -15,7 +15,8 @@ 4096 4 false - ..\..\..\..\bin\UnitTests + bin\UnitTests + v3.5 False @@ -32,14 +33,29 @@ False + + ..\..\..\bin\ICSharpCode.Core.dll + + + ..\..\..\bin\ICSharpCode.SharpDevelop.dll + + + + 3.5 + + + 3.5 + + + ..\..\..\bin\Tools\NUnit\nunit.framework.dll + + + 3.5 + - - - - - ..\..\..\Tools\NUnit\nunit.framework.dll - False + + 3.5 @@ -53,9 +69,9 @@ - - {4139CCF6-FB49-4A9D-B2CF-331E9EA3198D} - ICSharpCode.Build.Tasks + + {BF6F814C-B89F-475E-ADC4-AEE81D10CB94} + Mono.Build.Tasks diff --git a/src/Libraries/ICSharpCode.Build.Tasks/Test/MonoBasicCommandLineTestFixture.cs b/samples/Mono/Mono.Build.Tasks.Tests/MonoBasicCommandLineTestFixture.cs similarity index 74% rename from src/Libraries/ICSharpCode.Build.Tasks/Test/MonoBasicCommandLineTestFixture.cs rename to samples/Mono/Mono.Build.Tasks.Tests/MonoBasicCommandLineTestFixture.cs index 452cbc17d7..178cc7e9a4 100644 --- a/src/Libraries/ICSharpCode.Build.Tasks/Test/MonoBasicCommandLineTestFixture.cs +++ b/samples/Mono/Mono.Build.Tasks.Tests/MonoBasicCommandLineTestFixture.cs @@ -1,17 +1,37 @@ -// -// -// -// -// $Revision$ -// +// SharpDevelop samples +// Copyright (c) 2006, AlphaSierraPapa +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without modification, are +// permitted provided that the following conditions are met: +// +// - Redistributions of source code must retain the above copyright notice, this list +// of conditions and the following disclaimer. +// +// - Redistributions in binary form must reproduce the above copyright notice, this list +// of conditions and the following disclaimer in the documentation and/or other materials +// provided with the distribution. +// +// - Neither the name of the SharpDevelop team nor the names of its contributors may be used to +// endorse or promote products derived from this software without specific prior written +// permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &AS IS& AND ANY EXPRESS +// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY +// AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT +// OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -using ICSharpCode.Build.Tasks; +using Mono.Build.Tasks; using NUnit.Framework; using Microsoft.Build.Utilities; using System; using System.Collections.Generic; -namespace ICSharpCode.Build.Tasks.Tests +namespace Mono.Build.Tasks.Tests { [TestFixture] public class MonoBasicCommandLineTestFixture diff --git a/src/Libraries/ICSharpCode.Build.Tasks/Test/MonoCSharpCompilerCommandLineTestFixture.cs b/samples/Mono/Mono.Build.Tasks.Tests/MonoCSharpCompilerCommandLineTestFixture.cs similarity index 80% rename from src/Libraries/ICSharpCode.Build.Tasks/Test/MonoCSharpCompilerCommandLineTestFixture.cs rename to samples/Mono/Mono.Build.Tasks.Tests/MonoCSharpCompilerCommandLineTestFixture.cs index 36078f9304..97187e9ce1 100644 --- a/src/Libraries/ICSharpCode.Build.Tasks/Test/MonoCSharpCompilerCommandLineTestFixture.cs +++ b/samples/Mono/Mono.Build.Tasks.Tests/MonoCSharpCompilerCommandLineTestFixture.cs @@ -1,17 +1,37 @@ -// -// -// -// -// $Revision$ -// +// SharpDevelop samples +// Copyright (c) 2006, AlphaSierraPapa +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without modification, are +// permitted provided that the following conditions are met: +// +// - Redistributions of source code must retain the above copyright notice, this list +// of conditions and the following disclaimer. +// +// - Redistributions in binary form must reproduce the above copyright notice, this list +// of conditions and the following disclaimer in the documentation and/or other materials +// provided with the distribution. +// +// - Neither the name of the SharpDevelop team nor the names of its contributors may be used to +// endorse or promote products derived from this software without specific prior written +// permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &AS IS& AND ANY EXPRESS +// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY +// AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT +// OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -using ICSharpCode.Build.Tasks; +using Mono.Build.Tasks; using NUnit.Framework; using Microsoft.Build.Utilities; using System; using System.Collections.Generic; -namespace ICSharpCode.Build.Tasks.Tests +namespace Mono.Build.Tasks.Tests { [TestFixture] public class MonoCSharpCompilerCommandLineTestFixture diff --git a/samples/Mono/Mono.Build.Tasks.Tests/NormalMbasErrorParseTestFixture.cs b/samples/Mono/Mono.Build.Tasks.Tests/NormalMbasErrorParseTestFixture.cs new file mode 100644 index 0000000000..934e4ecc6e --- /dev/null +++ b/samples/Mono/Mono.Build.Tasks.Tests/NormalMbasErrorParseTestFixture.cs @@ -0,0 +1,85 @@ +// SharpDevelop samples +// Copyright (c) 2006, AlphaSierraPapa +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without modification, are +// permitted provided that the following conditions are met: +// +// - Redistributions of source code must retain the above copyright notice, this list +// of conditions and the following disclaimer. +// +// - Redistributions in binary form must reproduce the above copyright notice, this list +// of conditions and the following disclaimer in the documentation and/or other materials +// provided with the distribution. +// +// - Neither the name of the SharpDevelop team nor the names of its contributors may be used to +// endorse or promote products derived from this software without specific prior written +// permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &AS IS& AND ANY EXPRESS +// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY +// AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT +// OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +using Mono.Build.Tasks; +using NUnit.Framework; +using System; +using System.Text.RegularExpressions; + +namespace Mono.Build.Tasks.Tests +{ + [TestFixture] + public class NormalMbasErrorParseTestFixture + { + Match match; + + [TestFixtureSetUp] + public void FixtureSetUp() + { + string error = "Form1.vb(38,3) error BC30201: Expression expected"; + + Regex regex = new Regex(MonoBasicCompilerResultsParser.NormalErrorPattern, RegexOptions.Compiled); + match = regex.Match(error); + } + + [Test] + public void Column() + { + Assert.AreEqual("3", match.Result("${column}")); + } + + [Test] + public void Line() + { + Assert.AreEqual("38", match.Result("${line}")); + } + + [Test] + public void FileName() + { + Assert.AreEqual("Form1.vb", match.Result("${file}")); + } + + [Test] + public void Warning() + { + Assert.AreEqual("error", match.Result("${error}")); + } + + [Test] + public void ErrorNumber() + { + Assert.AreEqual("BC30201", match.Result("${number}")); + } + + [Test] + public void ErrorText() + { + Assert.AreEqual("Expression expected", match.Result("${message}")); + } + } +} diff --git a/samples/Mono/Mono.Build.Tasks.Tests/NormalMonoErrorParseTestFixture.cs b/samples/Mono/Mono.Build.Tasks.Tests/NormalMonoErrorParseTestFixture.cs new file mode 100644 index 0000000000..acded01706 --- /dev/null +++ b/samples/Mono/Mono.Build.Tasks.Tests/NormalMonoErrorParseTestFixture.cs @@ -0,0 +1,85 @@ +// SharpDevelop samples +// Copyright (c) 2006, AlphaSierraPapa +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without modification, are +// permitted provided that the following conditions are met: +// +// - Redistributions of source code must retain the above copyright notice, this list +// of conditions and the following disclaimer. +// +// - Redistributions in binary form must reproduce the above copyright notice, this list +// of conditions and the following disclaimer in the documentation and/or other materials +// provided with the distribution. +// +// - Neither the name of the SharpDevelop team nor the names of its contributors may be used to +// endorse or promote products derived from this software without specific prior written +// permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &AS IS& AND ANY EXPRESS +// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY +// AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT +// OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +using Mono.Build.Tasks; +using NUnit.Framework; +using System; +using System.Text.RegularExpressions; + +namespace Mono.Build.Tasks.Tests +{ + [TestFixture] + public class NormalMonoErrorParseTestFixture + { + Match match; + + [TestFixtureSetUp] + public void FixtureSetUp() + { + string error = "MyClass.cs(19,7): warning CS0169: The private field `Foo.MyClass.foo' is never used"; + + Regex regex = new Regex(MonoCSharpCompilerResultsParser.NormalErrorPattern, RegexOptions.Compiled); + match = regex.Match(error); + } + + [Test] + public void Column() + { + Assert.AreEqual("7", match.Result("${column}")); + } + + [Test] + public void Line() + { + Assert.AreEqual("19", match.Result("${line}")); + } + + [Test] + public void FileName() + { + Assert.AreEqual("MyClass.cs", match.Result("${file}")); + } + + [Test] + public void Warning() + { + Assert.AreEqual("warning", match.Result("${error}")); + } + + [Test] + public void ErrorNumber() + { + Assert.AreEqual("CS0169", match.Result("${number}")); + } + + [Test] + public void ErrorText() + { + Assert.AreEqual("The private field `Foo.MyClass.foo' is never used", match.Result("${message}")); + } + } +} diff --git a/src/Libraries/ICSharpCode.Build.Tasks/Project/AddMonoAssemblySearchPaths.cs b/samples/Mono/Mono.Build.Tasks/AddMonoAssemblySearchPaths.cs similarity index 63% rename from src/Libraries/ICSharpCode.Build.Tasks/Project/AddMonoAssemblySearchPaths.cs rename to samples/Mono/Mono.Build.Tasks/AddMonoAssemblySearchPaths.cs index c6616e5321..b7d60f7eba 100644 --- a/src/Libraries/ICSharpCode.Build.Tasks/Project/AddMonoAssemblySearchPaths.cs +++ b/samples/Mono/Mono.Build.Tasks/AddMonoAssemblySearchPaths.cs @@ -1,16 +1,36 @@ -// -// -// -// -// $Revision$ -// +// SharpDevelop samples +// Copyright (c) 2006, AlphaSierraPapa +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without modification, are +// permitted provided that the following conditions are met: +// +// - Redistributions of source code must retain the above copyright notice, this list +// of conditions and the following disclaimer. +// +// - Redistributions in binary form must reproduce the above copyright notice, this list +// of conditions and the following disclaimer in the documentation and/or other materials +// provided with the distribution. +// +// - Neither the name of the SharpDevelop team nor the names of its contributors may be used to +// endorse or promote products derived from this software without specific prior written +// permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &AS IS& AND ANY EXPRESS +// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY +// AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT +// OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. using System; using System.Collections.Generic; using Microsoft.Build.Framework; using Microsoft.Build.Utilities; -namespace ICSharpCode.Build.Tasks +namespace Mono.Build.Tasks { /// /// Adds GAC folders to the assembly search path for any GAC references. @@ -36,12 +56,8 @@ namespace ICSharpCode.Build.Tasks [Required] [Output] public string[] Paths { - get { - return paths; - } - set { - paths = value; - } + get { return paths; } + set { paths = value; } } /// @@ -50,12 +66,8 @@ namespace ICSharpCode.Build.Tasks /// [Required] public ITaskItem[] Assemblies { - get { - return assemblies; - } - set { - assemblies = value; - } + get { return assemblies; } + set { assemblies = value; } } /// diff --git a/samples/Mono/Mono.Build.Tasks/AssemblyInfo.cs b/samples/Mono/Mono.Build.Tasks/AssemblyInfo.cs new file mode 100644 index 0000000000..d220e86eee --- /dev/null +++ b/samples/Mono/Mono.Build.Tasks/AssemblyInfo.cs @@ -0,0 +1,27 @@ +using System; +using System.Reflection; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("Mono.Build.Tasks")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("SharpDevelop")] +[assembly: AssemblyCopyright("")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// This sets the default COM visibility of types in the assembly to invisible. +// If you need to expose a type to COM, use [ComVisible(true)] on that type. +[assembly: ComVisible(false)] + +// The assembly version has following format : +// +// Major.Minor.Build.Revision +// +// You can specify all the values or you can use the default the Revision and +// Build Numbers by using the '*' as shown below: +[assembly: AssemblyVersion("1.0.*")] diff --git a/src/Libraries/ICSharpCode.Build.Tasks/Project/CompilerCommandLineArguments.cs b/samples/Mono/Mono.Build.Tasks/CompilerCommandLineArguments.cs similarity index 57% rename from src/Libraries/ICSharpCode.Build.Tasks/Project/CompilerCommandLineArguments.cs rename to samples/Mono/Mono.Build.Tasks/CompilerCommandLineArguments.cs index b452c4a286..f62dcf6d10 100644 --- a/src/Libraries/ICSharpCode.Build.Tasks/Project/CompilerCommandLineArguments.cs +++ b/samples/Mono/Mono.Build.Tasks/CompilerCommandLineArguments.cs @@ -1,9 +1,29 @@ -// -// -// -// -// $Revision$ -// +// SharpDevelop samples +// Copyright (c) 2006, AlphaSierraPapa +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without modification, are +// permitted provided that the following conditions are met: +// +// - Redistributions of source code must retain the above copyright notice, this list +// of conditions and the following disclaimer. +// +// - Redistributions in binary form must reproduce the above copyright notice, this list +// of conditions and the following disclaimer in the documentation and/or other materials +// provided with the distribution. +// +// - Neither the name of the SharpDevelop team nor the names of its contributors may be used to +// endorse or promote products derived from this software without specific prior written +// permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &AS IS& AND ANY EXPRESS +// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY +// AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT +// OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. using System; using System.Globalization; @@ -12,7 +32,7 @@ using System.IO; using Microsoft.Build.Framework; using Microsoft.Build.Tasks; -namespace ICSharpCode.Build.Tasks +namespace Mono.Build.Tasks { public class CompilerCommandLineArguments : CommandLineBuilderExtension { diff --git a/samples/Mono/Mono.Build.Tasks/GetMonoFrameworkPath.cs b/samples/Mono/Mono.Build.Tasks/GetMonoFrameworkPath.cs new file mode 100644 index 0000000000..f2b8a83163 --- /dev/null +++ b/samples/Mono/Mono.Build.Tasks/GetMonoFrameworkPath.cs @@ -0,0 +1,93 @@ +// SharpDevelop samples +// Copyright (c) 2006, AlphaSierraPapa +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without modification, are +// permitted provided that the following conditions are met: +// +// - Redistributions of source code must retain the above copyright notice, this list +// of conditions and the following disclaimer. +// +// - Redistributions in binary form must reproduce the above copyright notice, this list +// of conditions and the following disclaimer in the documentation and/or other materials +// provided with the distribution. +// +// - Neither the name of the SharpDevelop team nor the names of its contributors may be used to +// endorse or promote products derived from this software without specific prior written +// permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &AS IS& AND ANY EXPRESS +// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY +// AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT +// OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +using System; +using Microsoft.Build.Framework; +using Microsoft.Build.Utilities; + +namespace Mono.Build.Tasks +{ + /// + /// Gets the path to the Mono Framework assemblies. + /// + public class GetMonoFrameworkPath : Task + { + public const string TargetMonoFrameworkVersion11 = "v1.1"; + public const string TargetMonoFrameworkVersion20 = "v2.0"; + + string path = String.Empty; + TargetMonoFrameworkVersion targetFrameworkVersion = TargetMonoFrameworkVersion.VersionLatest; + + public GetMonoFrameworkPath() + { + } + + [Output] + public string Path { + get { return path; } + set { path = value; } + } + + public string TargetFrameworkVersion { + get { return ConvertToString(targetFrameworkVersion); } + set { targetFrameworkVersion = ConvertToEnum(value); } + } + + public override bool Execute() + { + if (MonoToolLocationHelper.IsMonoInstalled) { + System.Diagnostics.Debug.WriteLine("TargetFrameworkVersion: " + targetFrameworkVersion.ToString()); + path = MonoToolLocationHelper.GetPathToMonoFramework(targetFrameworkVersion); + System.Diagnostics.Debug.WriteLine("MonoFrameworkPath: " + path); + return true; + } + Log.LogError("Mono is not installed."); + return false; + } + + static string ConvertToString(TargetMonoFrameworkVersion frameworkVersion) + { + switch (frameworkVersion) { + case TargetMonoFrameworkVersion.Version11: + return TargetMonoFrameworkVersion11; + case TargetMonoFrameworkVersion.Version20: + return TargetMonoFrameworkVersion20; + } + return null; + } + + static TargetMonoFrameworkVersion ConvertToEnum(string frameworkVersion) + { + if (frameworkVersion == TargetMonoFrameworkVersion11) { + return TargetMonoFrameworkVersion.Version11; + } else if (frameworkVersion == TargetMonoFrameworkVersion20) { + return TargetMonoFrameworkVersion.Version20; + } + throw new ArgumentException("Unknown Mono target framework version: " + frameworkVersion); + } + } +} diff --git a/samples/Mono/Mono.Build.Tasks/GetMonoFrameworkSdkPath.cs b/samples/Mono/Mono.Build.Tasks/GetMonoFrameworkSdkPath.cs new file mode 100644 index 0000000000..87fbb463b6 --- /dev/null +++ b/samples/Mono/Mono.Build.Tasks/GetMonoFrameworkSdkPath.cs @@ -0,0 +1,62 @@ +// SharpDevelop samples +// Copyright (c) 2006, AlphaSierraPapa +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without modification, are +// permitted provided that the following conditions are met: +// +// - Redistributions of source code must retain the above copyright notice, this list +// of conditions and the following disclaimer. +// +// - Redistributions in binary form must reproduce the above copyright notice, this list +// of conditions and the following disclaimer in the documentation and/or other materials +// provided with the distribution. +// +// - Neither the name of the SharpDevelop team nor the names of its contributors may be used to +// endorse or promote products derived from this software without specific prior written +// permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &AS IS& AND ANY EXPRESS +// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY +// AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT +// OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +using System; +using Microsoft.Build.Framework; +using Microsoft.Build.Utilities; + +namespace Mono.Build.Tasks +{ + /// + /// Gets the path to the Mono SDK folder. + /// + public class GetMonoFrameworkSdkPath : Task + { + string path = String.Empty; + + public GetMonoFrameworkSdkPath() + { + } + + [Output] + public string Path { + get { return path; } + set { path = value; } + } + + public override bool Execute() + { + if (MonoToolLocationHelper.IsMonoInstalled) { + path = MonoToolLocationHelper.GetPathToMonoSdk(); + Log.LogMessage(MessageImportance.Low, "MonoSdk: " + path); + return true; + } + Log.LogError("Mono is not installed."); + return false; + } + } +} diff --git a/samples/Mono/Mono.Build.Tasks/Gmcs.cs b/samples/Mono/Mono.Build.Tasks/Gmcs.cs new file mode 100644 index 0000000000..a6ed63b42c --- /dev/null +++ b/samples/Mono/Mono.Build.Tasks/Gmcs.cs @@ -0,0 +1,46 @@ +// SharpDevelop samples +// Copyright (c) 2006, AlphaSierraPapa +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without modification, are +// permitted provided that the following conditions are met: +// +// - Redistributions of source code must retain the above copyright notice, this list +// of conditions and the following disclaimer. +// +// - Redistributions in binary form must reproduce the above copyright notice, this list +// of conditions and the following disclaimer in the documentation and/or other materials +// provided with the distribution. +// +// - Neither the name of the SharpDevelop team nor the names of its contributors may be used to +// endorse or promote products derived from this software without specific prior written +// permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &AS IS& AND ANY EXPRESS +// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY +// AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT +// OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +using System; + +namespace Mono.Build.Tasks +{ + /// + /// MSBuild task for Mono's GMCS. + /// + public class Gmcs : MonoCSharpCompilerTask + { + protected override string ToolName { + get { return "Gmcs.exe"; } + } + + protected override string GenerateFullPathToTool() + { + return MonoToolLocationHelper.GetPathToTool(ToolName); + } + } +} diff --git a/samples/Mono/Mono.Build.Tasks/Mcs.cs b/samples/Mono/Mono.Build.Tasks/Mcs.cs new file mode 100644 index 0000000000..1aaa43ab9e --- /dev/null +++ b/samples/Mono/Mono.Build.Tasks/Mcs.cs @@ -0,0 +1,46 @@ +// SharpDevelop samples +// Copyright (c) 2006, AlphaSierraPapa +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without modification, are +// permitted provided that the following conditions are met: +// +// - Redistributions of source code must retain the above copyright notice, this list +// of conditions and the following disclaimer. +// +// - Redistributions in binary form must reproduce the above copyright notice, this list +// of conditions and the following disclaimer in the documentation and/or other materials +// provided with the distribution. +// +// - Neither the name of the SharpDevelop team nor the names of its contributors may be used to +// endorse or promote products derived from this software without specific prior written +// permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &AS IS& AND ANY EXPRESS +// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY +// AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT +// OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +using System; + +namespace Mono.Build.Tasks +{ + /// + /// MSBuild task for Mono's MCS. + /// + public class Mcs : MonoCSharpCompilerTask + { + protected override string ToolName { + get { return "Mcs.exe"; } + } + + protected override string GenerateFullPathToTool() + { + return MonoToolLocationHelper.GetPathToTool(ToolName); + } + } +} diff --git a/samples/Mono/Mono.Build.Tasks/Mono.Build.CSharp.targets b/samples/Mono/Mono.Build.Tasks/Mono.Build.CSharp.targets new file mode 100644 index 0000000000..226c2ca8be --- /dev/null +++ b/samples/Mono/Mono.Build.Tasks/Mono.Build.CSharp.targets @@ -0,0 +1,81 @@ + + + + + + $(MSBuildAllProjects);$(MonoBuildTasksPath)\Mono.Build.CSharp.targets + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + + + + true + + + + + false + + + + + _ComputeNonExistentFileProperty + + + + + + + + + diff --git a/samples/Mono/Mono.Build.Tasks/Mono.Build.Tasks.csproj b/samples/Mono/Mono.Build.Tasks/Mono.Build.Tasks.csproj new file mode 100644 index 0000000000..c1158ee718 --- /dev/null +++ b/samples/Mono/Mono.Build.Tasks/Mono.Build.Tasks.csproj @@ -0,0 +1,85 @@ + + + {BF6F814C-B89F-475E-ADC4-AEE81D10CB94} + Debug + AnyCPU + Library + Mono.Build.Tasks + Mono.Build.Tasks + v3.5 + + + bin\Debug\ + True + Full + False + True + DEBUG;TRACE + + + bin\Release\ + False + None + True + False + TRACE + + + + + ..\..\..\bin\ICSharpCode.Core.dll + False + + + ..\..\..\bin\ICSharpCode.SharpDevelop.dll + False + + + ..\..\..\bin\ICSharpCode.SharpDevelop.Dom.dll + False + + + + 3.5 + + + 3.5 + + + + + + + + + + + + + + + + + + + + + + + + Always + + + Always + + + Always + + + Always + + + Always + + + \ No newline at end of file diff --git a/samples/Mono/Mono.Build.Tasks/Mono.Build.VBNet.targets b/samples/Mono/Mono.Build.Tasks/Mono.Build.VBNet.targets new file mode 100644 index 0000000000..df3c6c4fcc --- /dev/null +++ b/samples/Mono/Mono.Build.Tasks/Mono.Build.VBNet.targets @@ -0,0 +1,11 @@ + + + + + + _ComputeNonExistentFileProperty + + + + + diff --git a/src/Libraries/ICSharpCode.Build.Tasks/Project/MonoAssemblyName.cs b/samples/Mono/Mono.Build.Tasks/MonoAssemblyName.cs similarity index 71% rename from src/Libraries/ICSharpCode.Build.Tasks/Project/MonoAssemblyName.cs rename to samples/Mono/Mono.Build.Tasks/MonoAssemblyName.cs index 8134a58110..9964f33da3 100644 --- a/src/Libraries/ICSharpCode.Build.Tasks/Project/MonoAssemblyName.cs +++ b/samples/Mono/Mono.Build.Tasks/MonoAssemblyName.cs @@ -1,9 +1,29 @@ -// -// -// -// -// $Revision$ -// +// SharpDevelop samples +// Copyright (c) 2006, AlphaSierraPapa +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without modification, are +// permitted provided that the following conditions are met: +// +// - Redistributions of source code must retain the above copyright notice, this list +// of conditions and the following disclaimer. +// +// - Redistributions in binary form must reproduce the above copyright notice, this list +// of conditions and the following disclaimer in the documentation and/or other materials +// provided with the distribution. +// +// - Neither the name of the SharpDevelop team nor the names of its contributors may be used to +// endorse or promote products derived from this software without specific prior written +// permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &AS IS& AND ANY EXPRESS +// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY +// AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT +// OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. using System; using System.Globalization; @@ -11,7 +31,7 @@ using System.IO; using System.Reflection; using System.Text; -namespace ICSharpCode.Build.Tasks +namespace Mono.Build.Tasks { public class MonoAssemblyName { @@ -49,9 +69,7 @@ namespace ICSharpCode.Build.Tasks /// The short name of the assembly. /// public string Name { - get { - return name; - } + get { return name; } } /// @@ -95,15 +113,11 @@ namespace ICSharpCode.Build.Tasks } public Version Version { - get { - return version; - } + get { return version; } } public CultureInfo CultureInfo { - get { - return cultureInfo; - } + get { return cultureInfo; } } public byte[] GetPublicKeyToken() @@ -126,12 +140,8 @@ namespace ICSharpCode.Build.Tasks /// Gets or sets the full path to the assembly excluding the assembly name. /// public string Directory { - get { - return directory; - } - set { - directory = value; - } + get { return directory; } + set { directory = value; } } /// diff --git a/samples/Mono/Mono.Build.Tasks/MonoBasicCompilerResultsParser.cs b/samples/Mono/Mono.Build.Tasks/MonoBasicCompilerResultsParser.cs new file mode 100644 index 0000000000..84a42e129c --- /dev/null +++ b/samples/Mono/Mono.Build.Tasks/MonoBasicCompilerResultsParser.cs @@ -0,0 +1,62 @@ +// SharpDevelop samples +// Copyright (c) 2006, AlphaSierraPapa +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without modification, are +// permitted provided that the following conditions are met: +// +// - Redistributions of source code must retain the above copyright notice, this list +// of conditions and the following disclaimer. +// +// - Redistributions in binary form must reproduce the above copyright notice, this list +// of conditions and the following disclaimer in the documentation and/or other materials +// provided with the distribution. +// +// - Neither the name of the SharpDevelop team nor the names of its contributors may be used to +// endorse or promote products derived from this software without specific prior written +// permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &AS IS& AND ANY EXPRESS +// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY +// AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT +// OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +using System; +using System.CodeDom.Compiler; +using System.IO; +using System.Text.RegularExpressions; + +namespace Mono.Build.Tasks +{ + public class MonoBasicCompilerResultsParser + { + public const string NormalErrorPattern = @"(?.*)\((?\d+),(?\d+)\)\s+(?\w+)\s+(?[\d\w]+):\s+(?.*)"; + + Regex normalError = new Regex(NormalErrorPattern, RegexOptions.Compiled); + + public MonoBasicCompilerResultsParser() + { + } + + public CompilerError ParseLine(string line) + { + // try to match standard mono errors + Match match = normalError.Match(line); + if (match.Success) { + CompilerError error = new CompilerError(); + error.Column = Int32.Parse(match.Result("${column}")); + error.Line = Int32.Parse(match.Result("${line}")); + error.FileName = Path.GetFullPath(match.Result("${file}")); + error.IsWarning = match.Result("${error}") == "warning"; + error.ErrorNumber = match.Result("${number}"); + error.ErrorText = match.Result("${message}"); + return error; + } + return null; + } + } +} diff --git a/samples/Mono/Mono.Build.Tasks/MonoCSharpCompilerResultsParser.cs b/samples/Mono/Mono.Build.Tasks/MonoCSharpCompilerResultsParser.cs new file mode 100644 index 0000000000..dba100f694 --- /dev/null +++ b/samples/Mono/Mono.Build.Tasks/MonoCSharpCompilerResultsParser.cs @@ -0,0 +1,73 @@ +// SharpDevelop samples +// Copyright (c) 2006, AlphaSierraPapa +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without modification, are +// permitted provided that the following conditions are met: +// +// - Redistributions of source code must retain the above copyright notice, this list +// of conditions and the following disclaimer. +// +// - Redistributions in binary form must reproduce the above copyright notice, this list +// of conditions and the following disclaimer in the documentation and/or other materials +// provided with the distribution. +// +// - Neither the name of the SharpDevelop team nor the names of its contributors may be used to +// endorse or promote products derived from this software without specific prior written +// permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &AS IS& AND ANY EXPRESS +// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY +// AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT +// OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +using System; +using System.CodeDom.Compiler; +using System.IO; +using System.Text.RegularExpressions; + +namespace Mono.Build.Tasks +{ + public class MonoCSharpCompilerResultsParser + { + public const string NormalErrorPattern = @"(?.*)\((?\d+),(?\d+)\):\s+(?\w+)\s+(?[\d\w]+):\s+(?.*)"; + public const string GeneralErrorPattern = @"(?.+?)\s+(?[\d\w]+?):\s+(?.*)"; + + Regex normalError = new Regex(NormalErrorPattern, RegexOptions.Compiled); + Regex generalError = new Regex(GeneralErrorPattern, RegexOptions.Compiled); + + public MonoCSharpCompilerResultsParser() + { + } + + public CompilerError ParseLine(string line) + { + // try to match standard mono errors + Match match = normalError.Match(line); + if (match.Success) { + CompilerError error = new CompilerError(); + error.Column = Int32.Parse(match.Result("${column}")); + error.Line = Int32.Parse(match.Result("${line}")); + error.FileName = Path.GetFullPath(match.Result("${file}")); + error.IsWarning = match.Result("${error}") == "warning"; + error.ErrorNumber = match.Result("${number}"); + error.ErrorText = match.Result("${message}"); + return error; + } else { + match = generalError.Match(line); + if (match.Success) { + CompilerError error = new CompilerError(); + error.IsWarning = match.Result("${error}") == "warning"; + error.ErrorNumber = match.Result("${number}"); + error.ErrorText = match.Result("${message}"); + return error; + } + } + return null; + } + } +} diff --git a/src/Libraries/ICSharpCode.Build.Tasks/Project/MonoCSharpCompilerTask.cs b/samples/Mono/Mono.Build.Tasks/MonoCSharpCompilerTask.cs similarity index 53% rename from src/Libraries/ICSharpCode.Build.Tasks/Project/MonoCSharpCompilerTask.cs rename to samples/Mono/Mono.Build.Tasks/MonoCSharpCompilerTask.cs index f8e9f6de40..849044b7d1 100644 --- a/src/Libraries/ICSharpCode.Build.Tasks/Project/MonoCSharpCompilerTask.cs +++ b/samples/Mono/Mono.Build.Tasks/MonoCSharpCompilerTask.cs @@ -1,14 +1,34 @@ -// -// -// -// -// $Revision$ -// +// SharpDevelop samples +// Copyright (c) 2006, AlphaSierraPapa +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without modification, are +// permitted provided that the following conditions are met: +// +// - Redistributions of source code must retain the above copyright notice, this list +// of conditions and the following disclaimer. +// +// - Redistributions in binary form must reproduce the above copyright notice, this list +// of conditions and the following disclaimer in the documentation and/or other materials +// provided with the distribution. +// +// - Neither the name of the SharpDevelop team nor the names of its contributors may be used to +// endorse or promote products derived from this software without specific prior written +// permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &AS IS& AND ANY EXPRESS +// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY +// AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT +// OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. using System; using System.CodeDom.Compiler; -namespace ICSharpCode.Build.Tasks +namespace Mono.Build.Tasks { /// /// Base class for the Mcs and Gmcs tasks. @@ -29,94 +49,53 @@ namespace ICSharpCode.Build.Tasks MonoCSharpCompilerResultsParser parser = new MonoCSharpCompilerResultsParser(); public bool CheckForOverflowUnderflow { - get { - return checkForOverflowUnderflow; - } - set { - checkForOverflowUnderflow = value; - } + get { return checkForOverflowUnderflow; } + set { checkForOverflowUnderflow = value; } } public bool DelaySign { - get { - return delaySign; - } - - set { - delaySign = value; - } + get { return delaySign; } + set { delaySign = value; } } public string DocumentationFile { - get { - return documentationFile; - } - set { - documentationFile = value; - } + get { return documentationFile; } + set { documentationFile = value; } } public string KeyContainer { - get { - return keyContainer; - } - set { - keyContainer = value; - } + get { return keyContainer; } + set { keyContainer = value; } } public string KeyFile { - get { - return keyFile; - } - set { - keyFile = value; - } + get { return keyFile; } + set { keyFile = value; } } public string LangVersion { - get { - return langVersion; - } - set { - langVersion = value; - } + get { return langVersion; } + set { langVersion = value; } } public string ModuleAssemblyName { - get { - return moduleAssemblyName; - } - set { - moduleAssemblyName = value; - } + get { return moduleAssemblyName; } + set { moduleAssemblyName = value; } } public bool NoConfig { - get { - return noConfig; - } - set { - noConfig = value; - } + get { return noConfig; } + set { noConfig = value; } } public string Win32Icon { - get { - return win32Icon; - } - set { - win32Icon = value; - } + get { return win32Icon; } + set { win32Icon = value; } } public string Win32Resource { - get { - return win32Resource; - } - set { - win32Resource = value; - } + get { return win32Resource; } + set { win32Resource = value; } } protected override string GenerateResponseFileCommands() diff --git a/samples/Mono/Mono.Build.Tasks/MonoCompilerTask.cs b/samples/Mono/Mono.Build.Tasks/MonoCompilerTask.cs new file mode 100644 index 0000000000..baa9228ac5 --- /dev/null +++ b/samples/Mono/Mono.Build.Tasks/MonoCompilerTask.cs @@ -0,0 +1,209 @@ +// SharpDevelop samples +// Copyright (c) 2006, AlphaSierraPapa +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without modification, are +// permitted provided that the following conditions are met: +// +// - Redistributions of source code must retain the above copyright notice, this list +// of conditions and the following disclaimer. +// +// - Redistributions in binary form must reproduce the above copyright notice, this list +// of conditions and the following disclaimer in the documentation and/or other materials +// provided with the distribution. +// +// - Neither the name of the SharpDevelop team nor the names of its contributors may be used to +// endorse or promote products derived from this software without specific prior written +// permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &AS IS& AND ANY EXPRESS +// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY +// AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT +// OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +using System; +using System.CodeDom.Compiler; +using Microsoft.Build.Framework; +using Microsoft.Build.Utilities; + +namespace Mono.Build.Tasks +{ + /// + /// Base class task for the mono compilers mcs, gmcs and mbas. + /// + public abstract class MonoCompilerTask : ToolTask + { + public const int DefaultWarningLevel = 2; + + string[] additionalLibPaths; + string[] addModules; + bool allowUnsafeBlocks; + int codePage; + string debugType; + string defineConstants; + string disabledWarnings; + bool emitDebugInformation; + ITaskItem[] linkResources; + string mainEntryPoint; + bool noLogo; + bool noStandardLib; + bool optimize; + ITaskItem outputAssembly; + ITaskItem[] references; + ITaskItem[] resources; + ITaskItem[] responseFiles; + ITaskItem[] sources; + string targetType; + bool treatWarningsAsErrors; + int? warningLevel; + + public bool AllowUnsafeBlocks { + get { return allowUnsafeBlocks; } + set { allowUnsafeBlocks = value; } + } + + public string[] AdditionalLibPaths { + get { return additionalLibPaths; } + set { additionalLibPaths = value; } + } + + public string[] AddModules { + get { return addModules; } + set { addModules = value; } + } + + public int CodePage { + get { return codePage; } + set { codePage = value; } + } + + public string DebugType { + get { return debugType; } + set { debugType = value; } + } + + public string DefineConstants { + get { return defineConstants; } + set { defineConstants = value; } + } + + public string DisabledWarnings { + get { return disabledWarnings; } + set { disabledWarnings = value; } + } + + public bool EmitDebugInformation { + get { return emitDebugInformation; } + set { emitDebugInformation = value; } + } + + public ITaskItem[] LinkResources { + get { return linkResources; } + set { linkResources = value; } + } + + public string MainEntryPoint { + get { return mainEntryPoint; } + set { mainEntryPoint = value; } + } + + public bool NoLogo { + get { return noLogo; } + set { noLogo = value; } + } + + public bool NoStandardLib { + get { return noStandardLib; } + set { noStandardLib = value; } + } + + public bool Optimize { + get { return optimize; } + set { optimize = value; } + } + + public ITaskItem OutputAssembly { + get { return outputAssembly; } + set { outputAssembly = value; } + } + + public ITaskItem[] References { + get { return references; } + set { references = value; } + } + + public ITaskItem[] Resources { + get { return resources; } + set { resources = value; } + } + + public ITaskItem[] ResponseFiles { + get { return responseFiles; } + set { responseFiles = value; } + } + + public ITaskItem[] Sources { + get { return sources; } + set { sources = value; } + } + + public string TargetType { + get { return targetType; } + set { targetType = value; } + } + + public bool TreatWarningsAsErrors { + get { return treatWarningsAsErrors; } + set { treatWarningsAsErrors = value; } + } + + public int WarningLevel { + get { + if (warningLevel.HasValue) { + return warningLevel.Value; + } + return DefaultWarningLevel; + } + set { warningLevel = value; } + } + + /// + /// Determines whether the warning level property has been set. + /// + protected bool IsWarningLevelSet { + get { return warningLevel.HasValue; } + } + + /// + /// Returns a compiler error from the standard output or standard + /// error line. + /// + protected virtual CompilerError ParseLine(string line) + { + return null; + } + + /// + /// Each line of output, from either standard output or standard error + /// is parsed and any compiler errors are logged. If the line cannot + /// be parsed it is logged using the specified message importance. + /// + protected override void LogEventsFromTextOutput(string singleLine, MessageImportance messageImportance) + { + CompilerError error = ParseLine(singleLine); + if (error != null) { + if (error.IsWarning) { + Log.LogWarning("warning", error.ErrorNumber, null, error.FileName, error.Line, error.Column, error.Line, error.Column, error.ErrorText); + } else { + Log.LogError("error", error.ErrorNumber, null, error.FileName, error.Line, error.Column, error.Line, error.Column, error.ErrorText); + } + } else { + Log.LogMessage(messageImportance, singleLine); + } + } + } +} diff --git a/src/Libraries/ICSharpCode.Build.Tasks/Project/MonoGacDirectory.cs b/samples/Mono/Mono.Build.Tasks/MonoGacDirectory.cs similarity index 64% rename from src/Libraries/ICSharpCode.Build.Tasks/Project/MonoGacDirectory.cs rename to samples/Mono/Mono.Build.Tasks/MonoGacDirectory.cs index 5f2e1fc211..f831fabb46 100644 --- a/src/Libraries/ICSharpCode.Build.Tasks/Project/MonoGacDirectory.cs +++ b/samples/Mono/Mono.Build.Tasks/MonoGacDirectory.cs @@ -1,16 +1,36 @@ -// -// -// -// -// $Revision$ -// +// SharpDevelop samples +// Copyright (c) 2006, AlphaSierraPapa +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without modification, are +// permitted provided that the following conditions are met: +// +// - Redistributions of source code must retain the above copyright notice, this list +// of conditions and the following disclaimer. +// +// - Redistributions in binary form must reproduce the above copyright notice, this list +// of conditions and the following disclaimer in the documentation and/or other materials +// provided with the distribution. +// +// - Neither the name of the SharpDevelop team nor the names of its contributors may be used to +// endorse or promote products derived from this software without specific prior written +// permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &AS IS& AND ANY EXPRESS +// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY +// AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT +// OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. using System; using System.Globalization; using System.IO; using System.Text; -namespace ICSharpCode.Build.Tasks +namespace Mono.Build.Tasks { public class MonoGacDirectory { @@ -37,9 +57,7 @@ namespace ICSharpCode.Build.Tasks /// The assembly name associated with this directory. /// public MonoAssemblyName AssemblyName { - get { - return assemblyName; - } + get { return assemblyName; } } /// diff --git a/src/Libraries/ICSharpCode.Build.Tasks/Project/MonoGlobalAssemblyCache.cs b/samples/Mono/Mono.Build.Tasks/MonoGlobalAssemblyCache.cs similarity index 69% rename from src/Libraries/ICSharpCode.Build.Tasks/Project/MonoGlobalAssemblyCache.cs rename to samples/Mono/Mono.Build.Tasks/MonoGlobalAssemblyCache.cs index a8a96d9a1d..02976100ff 100644 --- a/src/Libraries/ICSharpCode.Build.Tasks/Project/MonoGlobalAssemblyCache.cs +++ b/samples/Mono/Mono.Build.Tasks/MonoGlobalAssemblyCache.cs @@ -1,15 +1,35 @@ -// -// -// -// -// $Revision$ -// +// SharpDevelop samples +// Copyright (c) 2006, AlphaSierraPapa +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without modification, are +// permitted provided that the following conditions are met: +// +// - Redistributions of source code must retain the above copyright notice, this list +// of conditions and the following disclaimer. +// +// - Redistributions in binary form must reproduce the above copyright notice, this list +// of conditions and the following disclaimer in the documentation and/or other materials +// provided with the distribution. +// +// - Neither the name of the SharpDevelop team nor the names of its contributors may be used to +// endorse or promote products derived from this software without specific prior written +// permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &AS IS& AND ANY EXPRESS +// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY +// AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT +// OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. using System; using System.Collections.Generic; using System.IO; -namespace ICSharpCode.Build.Tasks +namespace Mono.Build.Tasks { public class MonoGlobalAssemblyCache { diff --git a/src/Libraries/ICSharpCode.Build.Tasks/Project/MonoToolLocationHelper.cs b/samples/Mono/Mono.Build.Tasks/MonoToolLocationHelper.cs similarity index 74% rename from src/Libraries/ICSharpCode.Build.Tasks/Project/MonoToolLocationHelper.cs rename to samples/Mono/Mono.Build.Tasks/MonoToolLocationHelper.cs index cf8c21bf38..cf9a572339 100644 --- a/src/Libraries/ICSharpCode.Build.Tasks/Project/MonoToolLocationHelper.cs +++ b/samples/Mono/Mono.Build.Tasks/MonoToolLocationHelper.cs @@ -1,9 +1,29 @@ -// -// -// -// -// $Revision$ -// +// SharpDevelop samples +// Copyright (c) 2006, AlphaSierraPapa +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without modification, are +// permitted provided that the following conditions are met: +// +// - Redistributions of source code must retain the above copyright notice, this list +// of conditions and the following disclaimer. +// +// - Redistributions in binary form must reproduce the above copyright notice, this list +// of conditions and the following disclaimer in the documentation and/or other materials +// provided with the distribution. +// +// - Neither the name of the SharpDevelop team nor the names of its contributors may be used to +// endorse or promote products derived from this software without specific prior written +// permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &AS IS& AND ANY EXPRESS +// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY +// AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT +// OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. using System; using System.IO; @@ -11,7 +31,7 @@ using System.Security; using Microsoft.Win32; -namespace ICSharpCode.Build.Tasks +namespace Mono.Build.Tasks { /// /// Utility to locate Mono compilers. diff --git a/src/Libraries/ICSharpCode.Build.Tasks/Project/SharpDevelop.Build.Mono.Gmcs.targets b/samples/Mono/Mono.Build.Tasks/SharpDevelop.Build.Mono.Gmcs.targets similarity index 80% rename from src/Libraries/ICSharpCode.Build.Tasks/Project/SharpDevelop.Build.Mono.Gmcs.targets rename to samples/Mono/Mono.Build.Tasks/SharpDevelop.Build.Mono.Gmcs.targets index 7629f8c358..fed4400745 100644 --- a/src/Libraries/ICSharpCode.Build.Tasks/Project/SharpDevelop.Build.Mono.Gmcs.targets +++ b/samples/Mono/Mono.Build.Tasks/SharpDevelop.Build.Mono.Gmcs.targets @@ -1,18 +1,16 @@ - - - - - - + + + + - $(MSBuildAllProjects);$(SharpDevelopBuildBinPath)\SharpDevelop.Build.Mono.Gmcs.targets + $(MSBuildAllProjects);$(MonoBuildTasksPath)\SharpDevelop.Build.Mono.Gmcs.targets .cs C# @@ -32,7 +30,7 @@ - + @@ -49,7 +47,7 @@ GetFrameworkPaths; - GetRedistLists; + GetReferenceAssemblyPaths; PrepareForBuild; AddMonoAssemblySearchPaths diff --git a/src/Libraries/ICSharpCode.Build.Tasks/Project/SharpDevelop.Build.Mono.Mcs.targets b/samples/Mono/Mono.Build.Tasks/SharpDevelop.Build.Mono.Mcs.targets similarity index 80% rename from src/Libraries/ICSharpCode.Build.Tasks/Project/SharpDevelop.Build.Mono.Mcs.targets rename to samples/Mono/Mono.Build.Tasks/SharpDevelop.Build.Mono.Mcs.targets index 00888d0a1e..a20787b219 100644 --- a/src/Libraries/ICSharpCode.Build.Tasks/Project/SharpDevelop.Build.Mono.Mcs.targets +++ b/samples/Mono/Mono.Build.Tasks/SharpDevelop.Build.Mono.Mcs.targets @@ -1,18 +1,16 @@ - - - - - - + + + + - $(MSBuildAllProjects);$(SharpDevelopBuildBinPath)\SharpDevelop.Build.Mono.Mcs.targets + $(MSBuildAllProjects);$(MonoBuildTasksPath)\SharpDevelop.Build.Mono.Mcs.targets .cs C# @@ -32,7 +30,7 @@ - + @@ -49,7 +47,7 @@ GetFrameworkPaths; - GetRedistLists; + GetReferenceAssemblyPaths; PrepareForBuild; AddMonoAssemblySearchPaths diff --git a/src/Libraries/ICSharpCode.Build.Tasks/Project/SharpDevelop.Build.Mono.Mbas.targets b/samples/Mono/Mono.Build.Tasks/SharpDevelop.Build.Mono.Vbnc.targets similarity index 79% rename from src/Libraries/ICSharpCode.Build.Tasks/Project/SharpDevelop.Build.Mono.Mbas.targets rename to samples/Mono/Mono.Build.Tasks/SharpDevelop.Build.Mono.Vbnc.targets index af6994b527..f5716866a5 100644 --- a/src/Libraries/ICSharpCode.Build.Tasks/Project/SharpDevelop.Build.Mono.Mbas.targets +++ b/samples/Mono/Mono.Build.Tasks/SharpDevelop.Build.Mono.Vbnc.targets @@ -1,18 +1,16 @@ - - - - - - + + + + - $(MSBuildAllProjects);$(SharpDevelopBuildBinPath)\SharpDevelop.Build.Mono.Mbas.targets + $(MSBuildAllProjects);$(MonoBuildTasksPath)\SharpDevelop.Build.Mono.Mbas.targets .vb VB @@ -32,7 +30,7 @@ - + @@ -49,7 +47,7 @@ GetFrameworkPaths; - GetRedistLists; + GetReferenceAssemblyPaths; PrepareForBuild; AddMonoAssemblySearchPaths @@ -82,7 +80,7 @@ DependsOnTargets="$(CoreCompileDependsOn)" > - diff --git a/samples/Mono/Mono.Build.Tasks/TargetMonoFrameworkVersion.cs b/samples/Mono/Mono.Build.Tasks/TargetMonoFrameworkVersion.cs new file mode 100644 index 0000000000..baaf841ede --- /dev/null +++ b/samples/Mono/Mono.Build.Tasks/TargetMonoFrameworkVersion.cs @@ -0,0 +1,38 @@ +// SharpDevelop samples +// Copyright (c) 2006, AlphaSierraPapa +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without modification, are +// permitted provided that the following conditions are met: +// +// - Redistributions of source code must retain the above copyright notice, this list +// of conditions and the following disclaimer. +// +// - Redistributions in binary form must reproduce the above copyright notice, this list +// of conditions and the following disclaimer in the documentation and/or other materials +// provided with the distribution. +// +// - Neither the name of the SharpDevelop team nor the names of its contributors may be used to +// endorse or promote products derived from this software without specific prior written +// permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &AS IS& AND ANY EXPRESS +// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY +// AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT +// OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +using System; + +namespace Mono.Build.Tasks +{ + public enum TargetMonoFrameworkVersion + { + Version11 = 0, + Version20 = 1, + VersionLatest = 1 + } +} diff --git a/src/Libraries/ICSharpCode.Build.Tasks/Project/Mbas.cs b/samples/Mono/Mono.Build.Tasks/Vbnc.cs similarity index 51% rename from src/Libraries/ICSharpCode.Build.Tasks/Project/Mbas.cs rename to samples/Mono/Mono.Build.Tasks/Vbnc.cs index 597158f40a..92b3afb783 100644 --- a/src/Libraries/ICSharpCode.Build.Tasks/Project/Mbas.cs +++ b/samples/Mono/Mono.Build.Tasks/Vbnc.cs @@ -1,20 +1,40 @@ -// -// -// -// -// $Revision$ -// +// SharpDevelop samples +// Copyright (c) 2006, AlphaSierraPapa +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without modification, are +// permitted provided that the following conditions are met: +// +// - Redistributions of source code must retain the above copyright notice, this list +// of conditions and the following disclaimer. +// +// - Redistributions in binary form must reproduce the above copyright notice, this list +// of conditions and the following disclaimer in the documentation and/or other materials +// provided with the distribution. +// +// - Neither the name of the SharpDevelop team nor the names of its contributors may be used to +// endorse or promote products derived from this software without specific prior written +// permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &AS IS& AND ANY EXPRESS +// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY +// AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +// IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT +// OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. using System; using System.CodeDom.Compiler; using Microsoft.Build.Framework; -namespace ICSharpCode.Build.Tasks +namespace Mono.Build.Tasks { /// - /// MSBuild task for Mono's Visual Basic compiler Mbas. + /// MSBuild task for Mono's Visual Basic compiler Vbnc. /// - public class Mbas : MonoCompilerTask + public class Vbnc : MonoCompilerTask { ITaskItem[] imports; string optionCompare; @@ -27,66 +47,38 @@ namespace ICSharpCode.Build.Tasks MonoBasicCompilerResultsParser parser = new MonoBasicCompilerResultsParser(); public ITaskItem[] Imports { - get { - return imports; - } - set { - imports = value; - } + get { return imports; } + set { imports = value; } } public string OptionCompare { - get { - return optionCompare; - } - set { - optionCompare = value; - } + get { return optionCompare; } + set { optionCompare = value; } } public bool OptionExplicit { - get { - return optionExplicit; - } - set { - optionExplicit = value; - } + get { return optionExplicit; } + set { optionExplicit = value; } } public bool OptionStrict { - get { - return optionStrict; - } - set { - optionStrict = value; - } + get { return optionStrict; } + set { optionStrict = value; } } public bool NoWarnings { - get { - return noWarnings; - } - set { - noWarnings = value; - } + get { return noWarnings; } + set { noWarnings = value; } } public bool RemoveIntegerChecks { - get { - return removeIntegerChecks; - } - set { - removeIntegerChecks = value; - } + get { return removeIntegerChecks; } + set { removeIntegerChecks = value; } } public string RootNamespace { - get { - return rootNamespace; - } - set { - rootNamespace = value; - } + get { return rootNamespace; } + set { rootNamespace = value; } } protected override string GenerateResponseFileCommands() @@ -122,9 +114,7 @@ namespace ICSharpCode.Build.Tasks } protected override string ToolName { - get { - return "Mbas.exe"; - } + get { return "Vbnc.exe"; } } protected override string GenerateFullPathToTool() diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Project/CSharpProject.cs b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Project/CSharpProject.cs index 8ed74e7671..6fea150893 100644 --- a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Project/CSharpProject.cs +++ b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Project/CSharpProject.cs @@ -108,7 +108,7 @@ namespace CSharpBinding foreach (var p in GetAllProperties("TargetFrameworkVersion")) { if (p.IsImported == false) { - if (p.Value.StartsWith("CF") || p.Value.StartsWith("Mono")) { + if (p.Value.StartsWith("CF")) { needExtensions = true; } } diff --git a/src/AddIns/BackendBindings/VBNetBinding/Project/Src/Project/VBNetProject.cs b/src/AddIns/BackendBindings/VBNetBinding/Project/Src/Project/VBNetProject.cs index 1ecbeb45f2..e5633b0af7 100644 --- a/src/AddIns/BackendBindings/VBNetBinding/Project/Src/Project/VBNetProject.cs +++ b/src/AddIns/BackendBindings/VBNetBinding/Project/Src/Project/VBNetProject.cs @@ -129,7 +129,7 @@ namespace VBNetBinding foreach (var p in GetAllProperties("TargetFrameworkVersion")) { if (p.IsImported == false) { - if (p.Value.StartsWith("CF") || p.Value.StartsWith("Mono")) { + if (p.Value.StartsWith("CF")) { needExtensions = true; } } diff --git a/src/AddIns/Misc/MonoAddIn/Project/MonoAddIn.csproj b/src/AddIns/Misc/MonoAddIn/Project/MonoAddIn.csproj deleted file mode 100644 index ed6ff2a6a3..0000000000 --- a/src/AddIns/Misc/MonoAddIn/Project/MonoAddIn.csproj +++ /dev/null @@ -1,81 +0,0 @@ - - - Library - ICSharpCode.MonoAddIn - MonoAddIn - Debug - AnyCPU - {082DCD64-EE32-4151-A50F-E139CF754CC0} - False - False - False - Auto - 121110528 - AnyCPU - 4096 - 4 - false - - - ..\..\..\..\..\AddIns\AddIns\Misc\MonoAddIn\ - False - DEBUG;TRACE - true - Full - True - - - ..\..\..\..\..\AddIns\AddIns\Misc\MonoAddIn\ - True - TRACE - false - None - False - - - - - - - - - - - - Always - - - - - - Configuration\GlobalAssemblyInfo.cs - - - - - - {2748AD25-9C63-4E12-877B-4DCE96FBED54} - ICSharpCode.SharpDevelop - False - False - - - {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} - ICSharpCode.Core - False - False - - - {4139CCF6-FB49-4A9D-B2CF-331E9EA3198D} - ICSharpCode.Build.Tasks - False - False - - - {924EE450-603D-49C1-A8E5-4AFAA31CE6F3} - ICSharpCode.SharpDevelop.Dom - False - - - - \ No newline at end of file diff --git a/src/AddIns/Misc/MonoAddIn/Project/Src/IsMonoInstalledCondition.cs b/src/AddIns/Misc/MonoAddIn/Project/Src/IsMonoInstalledCondition.cs deleted file mode 100644 index 3794f1fd9c..0000000000 --- a/src/AddIns/Misc/MonoAddIn/Project/Src/IsMonoInstalledCondition.cs +++ /dev/null @@ -1,24 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; -using ICSharpCode.Build.Tasks; -using ICSharpCode.Core; - -namespace ICSharpCode.MonoAddIn -{ - /// - /// Determines whether Mono is installed. - /// - public class IsMonoInstalledCondition : IConditionEvaluator - { - public bool IsValid(object caller, Condition condition) - { - return MonoToolLocationHelper.IsMonoInstalled; - } - } -} diff --git a/src/AddIns/Misc/MonoAddIn/Project/Src/MonoGacReferencePanel.cs b/src/AddIns/Misc/MonoAddIn/Project/Src/MonoGacReferencePanel.cs deleted file mode 100644 index 7afd2e2716..0000000000 --- a/src/AddIns/Misc/MonoAddIn/Project/Src/MonoGacReferencePanel.cs +++ /dev/null @@ -1,32 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using ICSharpCode.SharpDevelop.Dom; -using System; -using System.Collections.Generic; -using System.Windows.Forms; -using ICSharpCode.Build.Tasks; -using ICSharpCode.SharpDevelop.Gui; - -namespace ICSharpCode.MonoAddIn -{ - public class MonoGacReferencePanel : GacReferencePanel - { - public MonoGacReferencePanel(ISelectReferenceDialog selectDialog) : base(selectDialog) - { - } - - protected override IList GetCacheContent() - { - List list = new List(); - foreach (MonoAssemblyName assemblyName in MonoGlobalAssemblyCache.GetAssemblyNames()) { - list.Add(new DomAssemblyName(assemblyName.FullName)); - } - return list; - } - } -} diff --git a/src/AddIns/Misc/MonoAddIn/Project/Src/MonoProjectContentRegistry.cs b/src/AddIns/Misc/MonoAddIn/Project/Src/MonoProjectContentRegistry.cs deleted file mode 100644 index 570ef833f9..0000000000 --- a/src/AddIns/Misc/MonoAddIn/Project/Src/MonoProjectContentRegistry.cs +++ /dev/null @@ -1,36 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; -using System.IO; -using ICSharpCode.Build.Tasks; -using ICSharpCode.SharpDevelop; -using ICSharpCode.SharpDevelop.Dom; - -namespace ICSharpCode.MonoAddIn -{ - public class MonoProjectContentRegistry : ProjectContentRegistry - { - protected override IProjectContent LoadProjectContent(string itemInclude, string itemFileName) - { - if (File.Exists(itemFileName)) { - return ParserService.DefaultProjectContentRegistry.GetProjectContentForReference(itemInclude, itemFileName); - } - MonoAssemblyName assemblyName = MonoGlobalAssemblyCache.FindAssemblyName(itemInclude); - if (assemblyName != null && assemblyName.FileName != null) { - return CecilReader.LoadAssembly(assemblyName.FileName, this); - } else { - if (MonoToolLocationHelper.IsMonoInstalled) { - HostCallback.ShowAssemblyLoadError(itemFileName, itemInclude, "Could not find assembly in Mono's GAC."); - } else { - HostCallback.ShowAssemblyLoadError(itemFileName, itemInclude, "Could not find assembly in Mono's GAC - Mono is not installed."); - } - return null; - } - } - } -} diff --git a/src/Libraries/ICSharpCode.Build.Tasks/Project/GetMonoFrameworkPath.cs b/src/Libraries/ICSharpCode.Build.Tasks/Project/GetMonoFrameworkPath.cs deleted file mode 100644 index 83fb5e103a..0000000000 --- a/src/Libraries/ICSharpCode.Build.Tasks/Project/GetMonoFrameworkPath.cs +++ /dev/null @@ -1,81 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; - -namespace ICSharpCode.Build.Tasks -{ - /// - /// Gets the path to the Mono Framework assemblies. - /// - public class GetMonoFrameworkPath : Task - { - public const string TargetMonoFrameworkVersion11 = "Mono v1.1"; - public const string TargetMonoFrameworkVersion20 = "Mono v2.0"; - - string path = String.Empty; - TargetMonoFrameworkVersion targetFrameworkVersion = TargetMonoFrameworkVersion.VersionLatest; - - public GetMonoFrameworkPath() - { - } - - [Output] - public string Path { - get { - return path; - } - set { - path = value; - } - } - - public string TargetFrameworkVersion { - get { - return ConvertToString(targetFrameworkVersion); - } - set { - targetFrameworkVersion = ConvertToEnum(value); - } - } - - public override bool Execute() - { - if (MonoToolLocationHelper.IsMonoInstalled) { - System.Diagnostics.Debug.WriteLine("TargetFrameworkVersion: " + targetFrameworkVersion.ToString()); - path = MonoToolLocationHelper.GetPathToMonoFramework(targetFrameworkVersion); - System.Diagnostics.Debug.WriteLine("MonoFrameworkPath: " + path); - return true; - } - Log.LogError(Resources.MonoIsNotInstalled); - return false; - } - - static string ConvertToString(TargetMonoFrameworkVersion frameworkVersion) - { - switch (frameworkVersion) { - case TargetMonoFrameworkVersion.Version11: - return TargetMonoFrameworkVersion11; - case TargetMonoFrameworkVersion.Version20: - return TargetMonoFrameworkVersion20; - } - return null; - } - - static TargetMonoFrameworkVersion ConvertToEnum(string frameworkVersion) - { - if (frameworkVersion == TargetMonoFrameworkVersion11) { - return TargetMonoFrameworkVersion.Version11; - } else if (frameworkVersion == TargetMonoFrameworkVersion20) { - return TargetMonoFrameworkVersion.Version20; - } - throw new ArgumentException(Resources.UnknownTargetMonoFrameworkVersion + " " + frameworkVersion); - } - } -} diff --git a/src/Libraries/ICSharpCode.Build.Tasks/Project/GetMonoFrameworkSdkPath.cs b/src/Libraries/ICSharpCode.Build.Tasks/Project/GetMonoFrameworkSdkPath.cs deleted file mode 100644 index 2ccb6035b3..0000000000 --- a/src/Libraries/ICSharpCode.Build.Tasks/Project/GetMonoFrameworkSdkPath.cs +++ /dev/null @@ -1,47 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; - -namespace ICSharpCode.Build.Tasks -{ - /// - /// Gets the path to the Mono SDK folder. - /// - public class GetMonoFrameworkSdkPath : Task - { - string path = String.Empty; - - public GetMonoFrameworkSdkPath() - { - } - - [Output] - public string Path { - get { - return path; - } - set { - path = value; - } - } - - public override bool Execute() - { - if (MonoToolLocationHelper.IsMonoInstalled) { - path = MonoToolLocationHelper.GetPathToMonoSdk(); - System.Diagnostics.Debug.WriteLine("MonoSdk: " + path); - return true; - } - Log.LogError(Resources.MonoIsNotInstalled); - return false; - - } - } -} diff --git a/src/Libraries/ICSharpCode.Build.Tasks/Project/Gmcs.cs b/src/Libraries/ICSharpCode.Build.Tasks/Project/Gmcs.cs deleted file mode 100644 index 1220d7c3df..0000000000 --- a/src/Libraries/ICSharpCode.Build.Tasks/Project/Gmcs.cs +++ /dev/null @@ -1,28 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; - -namespace ICSharpCode.Build.Tasks -{ - /// - /// MSBuild task for Mono's GMCS. - /// - public class Gmcs : MonoCSharpCompilerTask - { - protected override string ToolName { - get { - return "Gmcs.exe"; - } - } - - protected override string GenerateFullPathToTool() - { - return MonoToolLocationHelper.GetPathToTool(ToolName); - } - } -} diff --git a/src/Libraries/ICSharpCode.Build.Tasks/Project/ICSharpCode.Build.Tasks.csproj b/src/Libraries/ICSharpCode.Build.Tasks/Project/ICSharpCode.Build.Tasks.csproj index 213670128a..e65755d244 100644 --- a/src/Libraries/ICSharpCode.Build.Tasks/Project/ICSharpCode.Build.Tasks.csproj +++ b/src/Libraries/ICSharpCode.Build.Tasks/Project/ICSharpCode.Build.Tasks.csproj @@ -54,40 +54,15 @@ - - Always - - - - - - - - Always - - - - - - - - - GlobalAssemblyInfo.cs Always - - - Always - PreserveNewest - - diff --git a/src/Libraries/ICSharpCode.Build.Tasks/Project/Mcs.cs b/src/Libraries/ICSharpCode.Build.Tasks/Project/Mcs.cs deleted file mode 100644 index 40444cbd2f..0000000000 --- a/src/Libraries/ICSharpCode.Build.Tasks/Project/Mcs.cs +++ /dev/null @@ -1,28 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; - -namespace ICSharpCode.Build.Tasks -{ - /// - /// MSBuild task for Mono's MCS. - /// - public class Mcs : MonoCSharpCompilerTask - { - protected override string ToolName { - get { - return "Mcs.exe"; - } - } - - protected override string GenerateFullPathToTool() - { - return MonoToolLocationHelper.GetPathToTool(ToolName); - } - } -} diff --git a/src/Libraries/ICSharpCode.Build.Tasks/Project/MonoBasicCompilerResultsParser.cs b/src/Libraries/ICSharpCode.Build.Tasks/Project/MonoBasicCompilerResultsParser.cs deleted file mode 100644 index 16675712d3..0000000000 --- a/src/Libraries/ICSharpCode.Build.Tasks/Project/MonoBasicCompilerResultsParser.cs +++ /dev/null @@ -1,42 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; -using System.CodeDom.Compiler; -using System.IO; -using System.Text.RegularExpressions; - -namespace ICSharpCode.Build.Tasks -{ - public class MonoBasicCompilerResultsParser - { - public const string NormalErrorPattern = @"(?.*)\((?\d+),(?\d+)\)\s+(?\w+)\s+(?[\d\w]+):\s+(?.*)"; - - Regex normalError = new Regex(NormalErrorPattern, RegexOptions.Compiled); - - public MonoBasicCompilerResultsParser() - { - } - - public CompilerError ParseLine(string line) - { - // try to match standard mono errors - Match match = normalError.Match(line); - if (match.Success) { - CompilerError error = new CompilerError(); - error.Column = Int32.Parse(match.Result("${column}")); - error.Line = Int32.Parse(match.Result("${line}")); - error.FileName = Path.GetFullPath(match.Result("${file}")); - error.IsWarning = match.Result("${error}") == "warning"; - error.ErrorNumber = match.Result("${number}"); - error.ErrorText = match.Result("${message}"); - return error; - } - return null; - } - } -} diff --git a/src/Libraries/ICSharpCode.Build.Tasks/Project/MonoCSharpCompilerResultsParser.cs b/src/Libraries/ICSharpCode.Build.Tasks/Project/MonoCSharpCompilerResultsParser.cs deleted file mode 100644 index 26c93d8a7d..0000000000 --- a/src/Libraries/ICSharpCode.Build.Tasks/Project/MonoCSharpCompilerResultsParser.cs +++ /dev/null @@ -1,53 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; -using System.CodeDom.Compiler; -using System.IO; -using System.Text.RegularExpressions; - -namespace ICSharpCode.Build.Tasks -{ - public class MonoCSharpCompilerResultsParser - { - public const string NormalErrorPattern = @"(?.*)\((?\d+),(?\d+)\):\s+(?\w+)\s+(?[\d\w]+):\s+(?.*)"; - public const string GeneralErrorPattern = @"(?.+?)\s+(?[\d\w]+?):\s+(?.*)"; - - Regex normalError = new Regex(NormalErrorPattern, RegexOptions.Compiled); - Regex generalError = new Regex(GeneralErrorPattern, RegexOptions.Compiled); - - public MonoCSharpCompilerResultsParser() - { - } - - public CompilerError ParseLine(string line) - { - // try to match standard mono errors - Match match = normalError.Match(line); - if (match.Success) { - CompilerError error = new CompilerError(); - error.Column = Int32.Parse(match.Result("${column}")); - error.Line = Int32.Parse(match.Result("${line}")); - error.FileName = Path.GetFullPath(match.Result("${file}")); - error.IsWarning = match.Result("${error}") == "warning"; - error.ErrorNumber = match.Result("${number}"); - error.ErrorText = match.Result("${message}"); - return error; - } else { - match = generalError.Match(line); - if (match.Success) { - CompilerError error = new CompilerError(); - error.IsWarning = match.Result("${error}") == "warning"; - error.ErrorNumber = match.Result("${number}"); - error.ErrorText = match.Result("${message}"); - return error; - } - } - return null; - } - } -} diff --git a/src/Libraries/ICSharpCode.Build.Tasks/Project/MonoCompilerTask.cs b/src/Libraries/ICSharpCode.Build.Tasks/Project/MonoCompilerTask.cs deleted file mode 100644 index b63d14263a..0000000000 --- a/src/Libraries/ICSharpCode.Build.Tasks/Project/MonoCompilerTask.cs +++ /dev/null @@ -1,272 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; -using System.CodeDom.Compiler; -using Microsoft.Build.Framework; - -namespace ICSharpCode.Build.Tasks -{ - /// - /// Base class task for the mono compilers mcs, gmcs and mbas. - /// - public abstract class MonoCompilerTask : MyToolTask - { - public const int DefaultWarningLevel = 2; - - string[] additionalLibPaths; - string[] addModules; - bool allowUnsafeBlocks; - int codePage; - string debugType; - string defineConstants; - string disabledWarnings; - bool emitDebugInformation; - ITaskItem[] linkResources; - string mainEntryPoint; - bool noLogo; - bool noStandardLib; - bool optimize; - ITaskItem outputAssembly; - ITaskItem[] references; - ITaskItem[] resources; - ITaskItem[] responseFiles; - ITaskItem[] sources; - string targetType; - bool treatWarningsAsErrors; - int? warningLevel; - - public bool AllowUnsafeBlocks { - get { - return allowUnsafeBlocks; - } - set { - allowUnsafeBlocks = value; - } - } - - public string[] AdditionalLibPaths { - get { - return additionalLibPaths; - } - set { - additionalLibPaths = value; - } - } - - public string[] AddModules { - get { - return addModules; - } - set { - addModules = value; - } - } - - public int CodePage { - get { - return codePage; - } - set { - codePage = value; - } - } - - public string DebugType { - get { - return debugType; - } - set { - debugType = value; - } - } - - public string DefineConstants { - get { - return defineConstants; - } - set { - defineConstants = value; - } - } - - public string DisabledWarnings { - get { - return disabledWarnings; - } - set { - disabledWarnings = value; - } - } - - public bool EmitDebugInformation { - get { - return emitDebugInformation; - } - set { - emitDebugInformation = value; - } - } - - public ITaskItem[] LinkResources { - get { - return linkResources; - } - set { - linkResources = value; - } - } - - public string MainEntryPoint { - get { - return mainEntryPoint; - } - set { - mainEntryPoint = value; - } - } - - public bool NoLogo { - get { - return noLogo; - } - set { - noLogo = value; - } - } - - public bool NoStandardLib { - get { - return noStandardLib; - } - set { - noStandardLib = value; - } - } - - - public bool Optimize { - get { - return optimize; - } - set { - optimize = value; - } - } - public ITaskItem OutputAssembly { - get { - return outputAssembly; - } - set { - outputAssembly = value; - } - } - - public ITaskItem[] References { - get { - return references; - } - set { - references = value; - } - } - - public ITaskItem[] Resources { - get { - return resources; - } - set { - resources = value; - } - } - - public ITaskItem[] ResponseFiles { - get { - return responseFiles; - } - set { - responseFiles = value; - } - } - - public ITaskItem[] Sources { - get { - return sources; - } - set { - sources = value; - } - } - - public string TargetType { - get { - return targetType; - } - set { - targetType = value; - } - } - - public bool TreatWarningsAsErrors { - get { - return treatWarningsAsErrors; - } - set { - treatWarningsAsErrors = value; - } - } - - public int WarningLevel { - get { - if (warningLevel.HasValue) { - return warningLevel.Value; - } - return DefaultWarningLevel; - } - set { - warningLevel = value; - } - } - - /// - /// Determines whether the warning level property has been set. - /// - protected bool IsWarningLevelSet { - get { - return warningLevel.HasValue; - } - } - - /// - /// Returns a compiler error from the standard output or standard - /// error line. - /// - protected virtual CompilerError ParseLine(string line) - { - return null; - } - - /// - /// Each line of output, from either standard output or standard error - /// is parsed and any compiler errors are logged. If the line cannot - /// be parsed it is logged using the specified message importance. - /// - protected override void LogEventsFromTextOutput(string singleLine, MessageImportance messageImportance) - { - CompilerError error = ParseLine(singleLine); - if (error != null) { - if (error.IsWarning) { - Log.LogWarning("warning", error.ErrorNumber, null, error.FileName, error.Line, error.Column, error.Line, error.Column, error.ErrorText); - } else { - Log.LogError("error", error.ErrorNumber, null, error.FileName, error.Line, error.Column, error.Line, error.Column, error.ErrorText); - } - } else { - Log.LogMessage(messageImportance, singleLine); - } - } - } -} diff --git a/src/Libraries/ICSharpCode.Build.Tasks/Project/Resources.cs b/src/Libraries/ICSharpCode.Build.Tasks/Project/Resources.cs index 248ce2c970..f2c0ea8ea5 100644 --- a/src/Libraries/ICSharpCode.Build.Tasks/Project/Resources.cs +++ b/src/Libraries/ICSharpCode.Build.Tasks/Project/Resources.cs @@ -11,17 +11,7 @@ using System.Reflection; namespace ICSharpCode.Build.Tasks { internal static class Resources - { - public static string MonoIsNotInstalled { - get { return GetTranslation("${res:ICSharpCode.Build.MonoIsNotInstalled}") - ?? "Mono is not installed."; } - } - - public static string UnknownTargetMonoFrameworkVersion { - get { return GetTranslation("${res:ICSharpCode.Build.UnknownTargetMonoFrameworkVersion}") - ?? "Unknown Target Mono Framework Version:"; } - } - + { public static string RunningCodeAnalysis { get { return GetTranslation("${res:ICSharpCode.Build.RunningCodeAnalysis}") ?? "Running Code Analysis..."; } diff --git a/src/Libraries/ICSharpCode.Build.Tasks/Project/SharpDevelop.Build.CSharp.targets b/src/Libraries/ICSharpCode.Build.Tasks/Project/SharpDevelop.Build.CSharp.targets index 2ca45a6ee1..4e036fe5cd 100644 --- a/src/Libraries/ICSharpCode.Build.Tasks/Project/SharpDevelop.Build.CSharp.targets +++ b/src/Libraries/ICSharpCode.Build.Tasks/Project/SharpDevelop.Build.CSharp.targets @@ -22,9 +22,6 @@ v3.5 CF - - Mono - @@ -45,11 +42,7 @@ - - - - - + diff --git a/src/Libraries/ICSharpCode.Build.Tasks/Project/SharpDevelop.Build.VisualBasic.targets b/src/Libraries/ICSharpCode.Build.Tasks/Project/SharpDevelop.Build.VisualBasic.targets index 9f47f054c1..c012abf8bb 100644 --- a/src/Libraries/ICSharpCode.Build.Tasks/Project/SharpDevelop.Build.VisualBasic.targets +++ b/src/Libraries/ICSharpCode.Build.Tasks/Project/SharpDevelop.Build.VisualBasic.targets @@ -18,9 +18,6 @@ v2.0 CF - - Mono - @@ -40,11 +37,7 @@ - - - - - + diff --git a/src/Libraries/ICSharpCode.Build.Tasks/Project/TargetMonoFrameworkVersion.cs b/src/Libraries/ICSharpCode.Build.Tasks/Project/TargetMonoFrameworkVersion.cs deleted file mode 100644 index a85b69fef8..0000000000 --- a/src/Libraries/ICSharpCode.Build.Tasks/Project/TargetMonoFrameworkVersion.cs +++ /dev/null @@ -1,18 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; - -namespace ICSharpCode.Build.Tasks -{ - public enum TargetMonoFrameworkVersion - { - Version11 = 0, - Version20 = 1, - VersionLatest = 1 - } -} diff --git a/src/Libraries/ICSharpCode.Build.Tasks/Test/GeneralErrorParseTestFixture.cs b/src/Libraries/ICSharpCode.Build.Tasks/Test/GeneralErrorParseTestFixture.cs deleted file mode 100644 index dc552df526..0000000000 --- a/src/Libraries/ICSharpCode.Build.Tasks/Test/GeneralErrorParseTestFixture.cs +++ /dev/null @@ -1,47 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using ICSharpCode.Build.Tasks; -using NUnit.Framework; -using System; -using System.Text.RegularExpressions; - -namespace ICSharpCode.Build.Tasks.Tests -{ - [TestFixture] - public class GeneralMonoErrorParseTestFixture - { - Match match; - - [TestFixtureSetUp] - public void FixtureSetUp() - { - string error = "error CS1904: `CS0169' is not a valid warning number"; - - Regex regex = new Regex(MonoCSharpCompilerResultsParser.GeneralErrorPattern, RegexOptions.Compiled); - match = regex.Match(error); - } - - [Test] - public void Error() - { - Assert.AreEqual("error", match.Result("${error}")); - } - - [Test] - public void ErrorNumber() - { - Assert.AreEqual("CS1904", match.Result("${number}")); - } - - [Test] - public void ErrorText() - { - Assert.AreEqual("`CS0169' is not a valid warning number", match.Result("${message}")); - } - } -} diff --git a/src/Libraries/ICSharpCode.Build.Tasks/Test/MockMbas.cs b/src/Libraries/ICSharpCode.Build.Tasks/Test/MockMbas.cs deleted file mode 100644 index b30013fd96..0000000000 --- a/src/Libraries/ICSharpCode.Build.Tasks/Test/MockMbas.cs +++ /dev/null @@ -1,28 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using ICSharpCode.Build.Tasks; -using System; - -namespace ICSharpCode.Build.Tasks.Tests -{ - /// - /// Helper class that allows us to test protected methods of the - /// Mbas class. - /// - public class MockMbas : Mbas - { - /// - /// Generates the Mbas command line arguments via the protected - /// GenerateCommandLineArguments method. - /// - public string GetCommandLine() - { - return base.GenerateResponseFileCommands(); - } - } -} diff --git a/src/Libraries/ICSharpCode.Build.Tasks/Test/MockMonoCSharpCompilerTask.cs b/src/Libraries/ICSharpCode.Build.Tasks/Test/MockMonoCSharpCompilerTask.cs deleted file mode 100644 index 5b965e0802..0000000000 --- a/src/Libraries/ICSharpCode.Build.Tasks/Test/MockMonoCSharpCompilerTask.cs +++ /dev/null @@ -1,34 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using ICSharpCode.Build.Tasks; -using System; - -namespace ICSharpCode.Build.Tasks.Tests -{ - /// - /// Helper class that allows us to test protected methods of the - /// MonoCSharpCompilerTask class. - /// - public class MockMonoCSharpCompilerTask : MonoCSharpCompilerTask - { - /// - /// Generates the MonoCSharpCompilerTask command line arguments via the - /// protected GenerateCommandLineArguments method. - /// - public string GetCommandLine() - { - return base.GenerateResponseFileCommands(); - } - - protected override string ToolName { - get { - return "MonoCSharp.exe"; - } - } - } -} diff --git a/src/Libraries/ICSharpCode.Build.Tasks/Test/NormalMbasErrorParseTestFixture.cs b/src/Libraries/ICSharpCode.Build.Tasks/Test/NormalMbasErrorParseTestFixture.cs deleted file mode 100644 index 870f4cefd6..0000000000 --- a/src/Libraries/ICSharpCode.Build.Tasks/Test/NormalMbasErrorParseTestFixture.cs +++ /dev/null @@ -1,65 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using ICSharpCode.Build.Tasks; -using NUnit.Framework; -using System; -using System.Text.RegularExpressions; - -namespace ICSharpCode.Build.Tasks.Tests -{ - [TestFixture] - public class NormalMbasErrorParseTestFixture - { - Match match; - - [TestFixtureSetUp] - public void FixtureSetUp() - { - string error = "Form1.vb(38,3) error BC30201: Expression expected"; - - Regex regex = new Regex(MonoBasicCompilerResultsParser.NormalErrorPattern, RegexOptions.Compiled); - match = regex.Match(error); - } - - [Test] - public void Column() - { - Assert.AreEqual("3", match.Result("${column}")); - } - - [Test] - public void Line() - { - Assert.AreEqual("38", match.Result("${line}")); - } - - [Test] - public void FileName() - { - Assert.AreEqual("Form1.vb", match.Result("${file}")); - } - - [Test] - public void Warning() - { - Assert.AreEqual("error", match.Result("${error}")); - } - - [Test] - public void ErrorNumber() - { - Assert.AreEqual("BC30201", match.Result("${number}")); - } - - [Test] - public void ErrorText() - { - Assert.AreEqual("Expression expected", match.Result("${message}")); - } - } -} diff --git a/src/Libraries/ICSharpCode.Build.Tasks/Test/NormalMonoErrorParseTestFixture.cs b/src/Libraries/ICSharpCode.Build.Tasks/Test/NormalMonoErrorParseTestFixture.cs deleted file mode 100644 index d427f14ae5..0000000000 --- a/src/Libraries/ICSharpCode.Build.Tasks/Test/NormalMonoErrorParseTestFixture.cs +++ /dev/null @@ -1,65 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using ICSharpCode.Build.Tasks; -using NUnit.Framework; -using System; -using System.Text.RegularExpressions; - -namespace ICSharpCode.Build.Tasks.Tests -{ - [TestFixture] - public class NormalMonoErrorParseTestFixture - { - Match match; - - [TestFixtureSetUp] - public void FixtureSetUp() - { - string error = "MyClass.cs(19,7): warning CS0169: The private field `Foo.MyClass.foo' is never used"; - - Regex regex = new Regex(MonoCSharpCompilerResultsParser.NormalErrorPattern, RegexOptions.Compiled); - match = regex.Match(error); - } - - [Test] - public void Column() - { - Assert.AreEqual("7", match.Result("${column}")); - } - - [Test] - public void Line() - { - Assert.AreEqual("19", match.Result("${line}")); - } - - [Test] - public void FileName() - { - Assert.AreEqual("MyClass.cs", match.Result("${file}")); - } - - [Test] - public void Warning() - { - Assert.AreEqual("warning", match.Result("${error}")); - } - - [Test] - public void ErrorNumber() - { - Assert.AreEqual("CS0169", match.Result("${number}")); - } - - [Test] - public void ErrorText() - { - Assert.AreEqual("The private field `Foo.MyClass.foo' is never used", match.Result("${message}")); - } - } -} diff --git a/src/Main/Base/Project/Src/Internal/Templates/Project/ProjectTemplate.cs b/src/Main/Base/Project/Src/Internal/Templates/Project/ProjectTemplate.cs index 25144855af..4355c0e74c 100644 --- a/src/Main/Base/Project/Src/Internal/Templates/Project/ProjectTemplate.cs +++ b/src/Main/Base/Project/Src/Internal/Templates/Project/ProjectTemplate.cs @@ -30,14 +30,10 @@ namespace ICSharpCode.SharpDevelop.Internal.Templates public readonly static TargetFramework CF = new TargetFramework("CF", null); public readonly static TargetFramework CF20 = new TargetFramework("CF 2.0", "Compact Framework 2.0") { BasedOn = CF }; public readonly static TargetFramework CF35 = new TargetFramework("CF 3.5", "Compact Framework 3.5") { BasedOn = CF20 }; - public readonly static TargetFramework Mono = new TargetFramework("Mono", null); - public readonly static TargetFramework Mono10 = new TargetFramework("Mono v1.1", "Mono 1.1") { BasedOn = Mono }; - public readonly static TargetFramework Mono20 = new TargetFramework("Mono v2.0", "Mono 2.0") { BasedOn = Mono10 }; public readonly static TargetFramework[] TargetFrameworks = { Net35, Net30, Net20, - CF, CF35, CF20, - Mono, Mono20, Mono10 + CF, CF35, CF20 }; public const string DefaultTargetFrameworkName = "v3.5"; diff --git a/src/Setup/Files.wxs b/src/Setup/Files.wxs index 62260a469e..5dad4e65d0 100644 --- a/src/Setup/Files.wxs +++ b/src/Setup/Files.wxs @@ -179,12 +179,9 @@ - + - - - @@ -801,13 +798,12 @@ - + - @@ -860,14 +856,13 @@ - + - @@ -877,7 +872,7 @@ - + @@ -886,8 +881,6 @@ - - @@ -918,7 +911,7 @@ - + @@ -926,7 +919,6 @@ - @@ -1273,12 +1265,6 @@ - - - - - - diff --git a/src/Setup/Setup.wxs b/src/Setup/Setup.wxs index 057a6e855f..9b34b9b8be 100644 --- a/src/Setup/Setup.wxs +++ b/src/Setup/Setup.wxs @@ -314,7 +314,6 @@ - diff --git a/src/SharpDevelop.Tests.sln b/src/SharpDevelop.Tests.sln index 50a218062a..0488f55019 100644 --- a/src/SharpDevelop.Tests.sln +++ b/src/SharpDevelop.Tests.sln @@ -6,119 +6,115 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AddIns", "AddIns", "{14A277 ProjectSection(SolutionItems) = postProject EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SearchAndReplace.Tests", "AddIns\Misc\SearchAndReplace\Test\SearchAndReplace.Tests.csproj", "{A569DCC1-C608-45FD-B770-4F79335EF154}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SearchAndReplace", "AddIns\Misc\SearchAndReplace\Project\SearchAndReplace.csproj", "{9196DD8A-B4D4-4780-8742-C5762E547FC2}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WpfDesign", "WpfDesign", "{C12B6EA7-2EFC-4368-B585-EC69EFCC3F97}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Python", "Python", "{F94FA21D-78E6-410B-895D-E16D3E7240DB}" ProjectSection(SolutionItems) = postProject EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign", "AddIns\DisplayBindings\WpfDesign\WpfDesign\Project\WpfDesign.csproj", "{66A378A1-E9F4-4AD5-8946-D0EC06C2902F}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PythonBinding.Tests", "AddIns\BackendBindings\Python\PythonBinding\Test\PythonBinding.Tests.csproj", "{23B517C9-1ECC-4419-A13F-0B7136D085CB}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.Designer", "AddIns\DisplayBindings\WpfDesign\WpfDesign.Designer\Project\WpfDesign.Designer.csproj", "{78CC29AC-CC79-4355-B1F2-97936DF198AC}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Python.Build.Tasks.Tests", "AddIns\BackendBindings\Python\Python.Build.Tasks\Test\Python.Build.Tasks.Tests.csproj", "{833904AB-3CD4-4071-9B48-5770E44685AA}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.Tests", "AddIns\DisplayBindings\WpfDesign\WpfDesign.Designer\Tests\WpfDesign.Tests.csproj", "{943DBBB3-E84E-4CF4-917C-C05AFA8743C1}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PythonBinding", "AddIns\BackendBindings\Python\PythonBinding\Project\PythonBinding.csproj", "{8D732610-8FC6-43BA-94C9-7126FD7FE361}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.XamlDom", "AddIns\DisplayBindings\WpfDesign\WpfDesign.XamlDom\Project\WpfDesign.XamlDom.csproj", "{88DA149F-21B2-48AB-82C4-28FB6BDFD783}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Python.Build.Tasks", "AddIns\BackendBindings\Python\Python.Build.Tasks\Project\Python.Build.Tasks.csproj", "{D332F2D1-2CF1-43B7-903C-844BD5211A7E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTesting.Tests", "AddIns\Misc\UnitTesting\Test\UnitTesting.Tests.csproj", "{44A8DE09-CAB9-49D8-9CFC-5EB0A552F181}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpBinding", "AddIns\BackendBindings\CSharpBinding\Project\CSharpBinding.csproj", "{1F1AC7CD-D154-45BB-8EAF-804CA8055F5A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixBinding.Tests", "AddIns\BackendBindings\WixBinding\Test\WixBinding.Tests.csproj", "{388E7B64-0393-4EB4-A3E3-5C474F141853}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactoryToBooConverter", "AddIns\BackendBindings\Boo\NRefactoryToBooConverter\Project\NRefactoryToBooConverter.csproj", "{DBCF20A1-BA13-4582-BFA9-74DE4D987B73}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixBinding", "AddIns\BackendBindings\WixBinding\Project\WixBinding.csproj", "{e1b288a2-08ee-4318-8bbb-8ab72c69e33e}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactoryToBooConverter.Tests", "AddIns\BackendBindings\Boo\NRefactoryToBooConverter\Test\NRefactoryToBooConverter.Tests.csproj", "{C9DE556D-325C-4544-B29F-16A9EB7C9830}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeAnalysis", "AddIns\Misc\CodeAnalysis\CodeAnalysis.csproj", "{3EAA45A9-735C-4AC7-A799-947B93EA449D}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Debugger", "Debugger", "{6604365C-C702-4C10-9BA8-637F1E3D4D0D}" + ProjectSection(SolutionItems) = postProject + EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FormsDesigner", "AddIns\DisplayBindings\FormsDesigner\Project\FormsDesigner.csproj", "{7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TreeListView", "AddIns\Misc\Debugger\TreeListView\Project\TreeListView.csproj", "{B08385CD-F0CC-488C-B4F4-EEB34B6D2688}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BooBinding.Tests", "AddIns\BackendBindings\Boo\BooBinding\Test\BooBinding.Tests.csproj", "{6FA16499-896F-4C02-BB43-1AF5C6C7C713}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.Core", "AddIns\Misc\Debugger\Debugger.Core\Project\Debugger.Core.csproj", "{1D18D788-F7EE-4585-A23B-34DC8EC63CB8}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BooBinding", "AddIns\BackendBindings\Boo\BooBinding\Project\BooBinding.csproj", "{4AC2D5F1-F671-480C-A075-6BF62B3721B2}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.AddIn", "AddIns\Misc\Debugger\Debugger.AddIn\Project\Debugger.AddIn.csproj", "{EC06F96A-AEEC-49D6-B03D-AB87C6EB674C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTesting", "AddIns\Misc\UnitTesting\UnitTesting.csproj", "{1F261725-6318-4434-A1B1-6C70CE4CD324}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.Tests", "AddIns\Misc\Debugger\Debugger.Tests\Project\Debugger.Tests.csproj", "{A4C858C8-51B6-4265-A695-A20FCEBA1D19}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeCoverage", "AddIns\Misc\CodeCoverage\Project\CodeCoverage.csproj", "{08ce9972-283b-44f4-82fa-966f7dfa6b7a}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XmlEditor", "AddIns\DisplayBindings\XmlEditor\Project\XmlEditor.csproj", "{6B717BD1-CD5E-498C-A42E-9E6A4584DC48}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeCoverage.Tests", "AddIns\Misc\CodeCoverage\Test\CodeCoverage.Tests.csproj", "{A5C0E8F8-9D04-46ED-91D6-1DEF1575313B}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XmlEditor.Tests", "AddIns\DisplayBindings\XmlEditor\Test\XmlEditor.Tests.csproj", "{FC0FE702-A87D-4D70-A9B6-1ECCD611125F}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VBNetBinding", "AddIns\BackendBindings\VBNetBinding\Project\VBNetBinding.csproj", "{BF38FB72-B380-4196-AF8C-95749D726C61}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XmlEditor.Tests", "AddIns\DisplayBindings\XmlEditor\Test\XmlEditor.Tests.csproj", "{FC0FE702-A87D-4D70-A9B6-1ECCD611125F}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeCoverage.Tests", "AddIns\Misc\CodeCoverage\Test\CodeCoverage.Tests.csproj", "{A5C0E8F8-9D04-46ED-91D6-1DEF1575313B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XmlEditor", "AddIns\DisplayBindings\XmlEditor\Project\XmlEditor.csproj", "{6B717BD1-CD5E-498C-A42E-9E6A4584DC48}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeCoverage", "AddIns\Misc\CodeCoverage\Project\CodeCoverage.csproj", "{08ce9972-283b-44f4-82fa-966f7dfa6b7a}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Debugger", "Debugger", "{6604365C-C702-4C10-9BA8-637F1E3D4D0D}" - ProjectSection(SolutionItems) = postProject - EndProjectSection +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTesting", "AddIns\Misc\UnitTesting\UnitTesting.csproj", "{1F261725-6318-4434-A1B1-6C70CE4CD324}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.Tests", "AddIns\Misc\Debugger\Debugger.Tests\Project\Debugger.Tests.csproj", "{A4C858C8-51B6-4265-A695-A20FCEBA1D19}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BooBinding", "AddIns\BackendBindings\Boo\BooBinding\Project\BooBinding.csproj", "{4AC2D5F1-F671-480C-A075-6BF62B3721B2}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.AddIn", "AddIns\Misc\Debugger\Debugger.AddIn\Project\Debugger.AddIn.csproj", "{EC06F96A-AEEC-49D6-B03D-AB87C6EB674C}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BooBinding.Tests", "AddIns\BackendBindings\Boo\BooBinding\Test\BooBinding.Tests.csproj", "{6FA16499-896F-4C02-BB43-1AF5C6C7C713}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.Core", "AddIns\Misc\Debugger\Debugger.Core\Project\Debugger.Core.csproj", "{1D18D788-F7EE-4585-A23B-34DC8EC63CB8}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FormsDesigner", "AddIns\DisplayBindings\FormsDesigner\Project\FormsDesigner.csproj", "{7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TreeListView", "AddIns\Misc\Debugger\TreeListView\Project\TreeListView.csproj", "{B08385CD-F0CC-488C-B4F4-EEB34B6D2688}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeAnalysis", "AddIns\Misc\CodeAnalysis\CodeAnalysis.csproj", "{3EAA45A9-735C-4AC7-A799-947B93EA449D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactoryToBooConverter.Tests", "AddIns\BackendBindings\Boo\NRefactoryToBooConverter\Test\NRefactoryToBooConverter.Tests.csproj", "{C9DE556D-325C-4544-B29F-16A9EB7C9830}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixBinding", "AddIns\BackendBindings\WixBinding\Project\WixBinding.csproj", "{e1b288a2-08ee-4318-8bbb-8ab72c69e33e}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactoryToBooConverter", "AddIns\BackendBindings\Boo\NRefactoryToBooConverter\Project\NRefactoryToBooConverter.csproj", "{DBCF20A1-BA13-4582-BFA9-74DE4D987B73}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixBinding.Tests", "AddIns\BackendBindings\WixBinding\Test\WixBinding.Tests.csproj", "{388E7B64-0393-4EB4-A3E3-5C474F141853}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpBinding", "AddIns\BackendBindings\CSharpBinding\Project\CSharpBinding.csproj", "{1F1AC7CD-D154-45BB-8EAF-804CA8055F5A}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTesting.Tests", "AddIns\Misc\UnitTesting\Test\UnitTesting.Tests.csproj", "{44A8DE09-CAB9-49D8-9CFC-5EB0A552F181}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Python", "Python", "{F94FA21D-78E6-410B-895D-E16D3E7240DB}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WpfDesign", "WpfDesign", "{C12B6EA7-2EFC-4368-B585-EC69EFCC3F97}" ProjectSection(SolutionItems) = postProject EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Python.Build.Tasks", "AddIns\BackendBindings\Python\Python.Build.Tasks\Project\Python.Build.Tasks.csproj", "{D332F2D1-2CF1-43B7-903C-844BD5211A7E}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.XamlDom", "AddIns\DisplayBindings\WpfDesign\WpfDesign.XamlDom\Project\WpfDesign.XamlDom.csproj", "{88DA149F-21B2-48AB-82C4-28FB6BDFD783}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PythonBinding", "AddIns\BackendBindings\Python\PythonBinding\Project\PythonBinding.csproj", "{8D732610-8FC6-43BA-94C9-7126FD7FE361}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.Tests", "AddIns\DisplayBindings\WpfDesign\WpfDesign.Designer\Tests\WpfDesign.Tests.csproj", "{943DBBB3-E84E-4CF4-917C-C05AFA8743C1}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Python.Build.Tasks.Tests", "AddIns\BackendBindings\Python\Python.Build.Tasks\Test\Python.Build.Tasks.Tests.csproj", "{833904AB-3CD4-4071-9B48-5770E44685AA}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.Designer", "AddIns\DisplayBindings\WpfDesign\WpfDesign.Designer\Project\WpfDesign.Designer.csproj", "{78CC29AC-CC79-4355-B1F2-97936DF198AC}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PythonBinding.Tests", "AddIns\BackendBindings\Python\PythonBinding\Test\PythonBinding.Tests.csproj", "{23B517C9-1ECC-4419-A13F-0B7136D085CB}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign", "AddIns\DisplayBindings\WpfDesign\WpfDesign\Project\WpfDesign.csproj", "{66A378A1-E9F4-4AD5-8946-D0EC06C2902F}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SearchAndReplace", "AddIns\Misc\SearchAndReplace\Project\SearchAndReplace.csproj", "{9196DD8A-B4D4-4780-8742-C5762E547FC2}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SearchAndReplace.Tests", "AddIns\Misc\SearchAndReplace\Test\SearchAndReplace.Tests.csproj", "{A569DCC1-C608-45FD-B770-4F79335EF154}" 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}") = "Aga.Controls", "Libraries\TreeViewAdv\Aga.Controls\Aga.Controls.csproj", "{E73BB233-D88B-44A7-A98F-D71EE158381D}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Build.Tasks.Tests", "Libraries\ICSharpCode.Build.Tasks\Test\ICSharpCode.Build.Tasks.Tests.csproj", "{B7C2A664-B454-4920-AC6E-318F5274B2EF}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.TextEditor.Tests", "Libraries\ICSharpCode.TextEditor\Test\ICSharpCode.TextEditor.Tests.csproj", "{6259D767-BA7C-484D-9472-68F350A20086}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactory", "Libraries\NRefactory\Project\NRefactory.csproj", "{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.TextEditor", "Libraries\ICSharpCode.TextEditor\Project\ICSharpCode.TextEditor.csproj", "{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}" +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}") = "NRefactoryTests", "Libraries\NRefactory\Test\NRefactoryTests.csproj", "{870115DD-960A-4406-A6B9-600BCDC36A03}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Build.Tasks", "Libraries\ICSharpCode.Build.Tasks\Project\ICSharpCode.Build.Tasks.csproj", "{4139CCF6-FB49-4A9D-B2CF-331E9EA3198D}" +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}") = "WinFormsUI", "Libraries\DockPanel_Src\WinFormsUI\WinFormsUI.csproj", "{D3C782BA-178E-4235-A3BA-8C11DEBB6BEE}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.TextEditor.Tests", "Libraries\ICSharpCode.TextEditor\Test\ICSharpCode.TextEditor.Tests.csproj", "{6259D767-BA7C-484D-9472-68F350A20086}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactory", "Libraries\NRefactory\Project\NRefactory.csproj", "{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aga.Controls", "Libraries\TreeViewAdv\Aga.Controls\Aga.Controls.csproj", "{E73BB233-D88B-44A7-A98F-D71EE158381D}" 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.BuildWorker", "Main\ICSharpCode.SharpDevelop.BuildWorker\ICSharpCode.SharpDevelop.BuildWorker.csproj", "{C3CBC8E3-81D8-4C5B-9941-DCCD12D50B1F}" +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.SharpDevelop.Widgets", "Main\ICSharpCode.SharpDevelop.Widgets\Project\ICSharpCode.SharpDevelop.Widgets.csproj", "{8035765F-D51F-4A0C-A746-2FD100E19419}" +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}") = "ICSharpCode.SharpDevelop.Dom", "Main\ICSharpCode.SharpDevelop.Dom\Project\ICSharpCode.SharpDevelop.Dom.csproj", "{924EE450-603D-49C1-A8E5-4AFAA31CE6F3}" +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.SharpDevelop.Sda", "Main\ICSharpCode.SharpDevelop.Sda\ICSharpCode.SharpDevelop.Sda.csproj", "{80318B5F-A25D-45AB-8A95-EF31D2370A4C}" +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.Core.Tests", "Main\Core\Test\ICSharpCode.Core.Tests.csproj", "{AD6FAA08-D6F5-4DBA-AF85-F4DA9F40C3B5}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Tests", "Main\Base\Test\ICSharpCode.SharpDevelop.Tests.csproj", "{4980B743-B32F-4aba-AABD-45E2CAD3568D}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Sda", "Main\ICSharpCode.SharpDevelop.Sda\ICSharpCode.SharpDevelop.Sda.csproj", "{80318B5F-A25D-45AB-8A95-EF31D2370A4C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop", "Main\Base\Project\ICSharpCode.SharpDevelop.csproj", "{2748AD25-9C63-4E12-877B-4DCE96FBED54}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Dom", "Main\ICSharpCode.SharpDevelop.Dom\Project\ICSharpCode.SharpDevelop.Dom.csproj", "{924EE450-603D-49C1-A8E5-4AFAA31CE6F3}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core", "Main\Core\Project\ICSharpCode.Core.csproj", "{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Widgets", "Main\ICSharpCode.SharpDevelop.Widgets\Project\ICSharpCode.SharpDevelop.Widgets.csproj", "{8035765F-D51F-4A0C-A746-2FD100E19419}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartUp", "Main\StartUp\Project\StartUp.csproj", "{1152B71B-3C05-4598-B20D-823B5D40559E}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.BuildWorker", "Main\ICSharpCode.SharpDevelop.BuildWorker\ICSharpCode.SharpDevelop.BuildWorker.csproj", "{C3CBC8E3-81D8-4C5B-9941-DCCD12D50B1F}" EndProject Project("{00000000-0000-0000-0000-000000000000}") = "Tools", "Tools\Tools.build", "{970116b0-f96b-4257-8579-986b9cf086f5}" EndProject @@ -361,55 +357,53 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {F94FA21D-78E6-410B-895D-E16D3E7240DB} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5} - {1F1AC7CD-D154-45BB-8EAF-804CA8055F5A} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5} - {DBCF20A1-BA13-4582-BFA9-74DE4D987B73} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5} - {C9DE556D-325C-4544-B29F-16A9EB7C9830} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5} - {6604365C-C702-4C10-9BA8-637F1E3D4D0D} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5} - {6B717BD1-CD5E-498C-A42E-9E6A4584DC48} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5} - {FC0FE702-A87D-4D70-A9B6-1ECCD611125F} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5} - {BF38FB72-B380-4196-AF8C-95749D726C61} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5} - {A5C0E8F8-9D04-46ED-91D6-1DEF1575313B} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5} - {08ce9972-283b-44f4-82fa-966f7dfa6b7a} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5} - {1F261725-6318-4434-A1B1-6C70CE4CD324} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5} - {4AC2D5F1-F671-480C-A075-6BF62B3721B2} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5} - {6FA16499-896F-4C02-BB43-1AF5C6C7C713} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5} - {7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5} - {3EAA45A9-735C-4AC7-A799-947B93EA449D} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5} - {e1b288a2-08ee-4318-8bbb-8ab72c69e33e} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5} - {388E7B64-0393-4EB4-A3E3-5C474F141853} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5} - {44A8DE09-CAB9-49D8-9CFC-5EB0A552F181} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5} - {C12B6EA7-2EFC-4368-B585-EC69EFCC3F97} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5} - {9196DD8A-B4D4-4780-8742-C5762E547FC2} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5} {A569DCC1-C608-45FD-B770-4F79335EF154} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5} - {88DA149F-21B2-48AB-82C4-28FB6BDFD783} = {C12B6EA7-2EFC-4368-B585-EC69EFCC3F97} - {943DBBB3-E84E-4CF4-917C-C05AFA8743C1} = {C12B6EA7-2EFC-4368-B585-EC69EFCC3F97} - {78CC29AC-CC79-4355-B1F2-97936DF198AC} = {C12B6EA7-2EFC-4368-B585-EC69EFCC3F97} - {66A378A1-E9F4-4AD5-8946-D0EC06C2902F} = {C12B6EA7-2EFC-4368-B585-EC69EFCC3F97} - {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} - {A4C858C8-51B6-4265-A695-A20FCEBA1D19} = {6604365C-C702-4C10-9BA8-637F1E3D4D0D} - {23B517C9-1ECC-4419-A13F-0B7136D085CB} = {F94FA21D-78E6-410B-895D-E16D3E7240DB} - {833904AB-3CD4-4071-9B48-5770E44685AA} = {F94FA21D-78E6-410B-895D-E16D3E7240DB} - {8D732610-8FC6-43BA-94C9-7126FD7FE361} = {F94FA21D-78E6-410B-895D-E16D3E7240DB} + {9196DD8A-B4D4-4780-8742-C5762E547FC2} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5} + {C12B6EA7-2EFC-4368-B585-EC69EFCC3F97} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5} + {44A8DE09-CAB9-49D8-9CFC-5EB0A552F181} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5} + {388E7B64-0393-4EB4-A3E3-5C474F141853} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5} + {e1b288a2-08ee-4318-8bbb-8ab72c69e33e} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5} + {3EAA45A9-735C-4AC7-A799-947B93EA449D} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5} + {7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5} + {6FA16499-896F-4C02-BB43-1AF5C6C7C713} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5} + {4AC2D5F1-F671-480C-A075-6BF62B3721B2} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5} + {1F261725-6318-4434-A1B1-6C70CE4CD324} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5} + {08ce9972-283b-44f4-82fa-966f7dfa6b7a} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5} + {A5C0E8F8-9D04-46ED-91D6-1DEF1575313B} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5} + {BF38FB72-B380-4196-AF8C-95749D726C61} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5} + {FC0FE702-A87D-4D70-A9B6-1ECCD611125F} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5} + {6B717BD1-CD5E-498C-A42E-9E6A4584DC48} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5} + {6604365C-C702-4C10-9BA8-637F1E3D4D0D} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5} + {C9DE556D-325C-4544-B29F-16A9EB7C9830} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5} + {DBCF20A1-BA13-4582-BFA9-74DE4D987B73} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5} + {1F1AC7CD-D154-45BB-8EAF-804CA8055F5A} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5} + {F94FA21D-78E6-410B-895D-E16D3E7240DB} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5} {D332F2D1-2CF1-43B7-903C-844BD5211A7E} = {F94FA21D-78E6-410B-895D-E16D3E7240DB} - {3A9AE6AA-BC07-4A2F-972C-581E3AE2F195} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C} - {D3C782BA-178E-4235-A3BA-8C11DEBB6BEE} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C} - {4139CCF6-FB49-4A9D-B2CF-331E9EA3198D} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C} - {870115DD-960A-4406-A6B9-600BCDC36A03} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C} - {2D18BE89-D210-49EB-A9DD-2246FBB3DF6D} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C} - {6259D767-BA7C-484D-9472-68F350A20086} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C} - {B7C2A664-B454-4920-AC6E-318F5274B2EF} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C} + {8D732610-8FC6-43BA-94C9-7126FD7FE361} = {F94FA21D-78E6-410B-895D-E16D3E7240DB} + {833904AB-3CD4-4071-9B48-5770E44685AA} = {F94FA21D-78E6-410B-895D-E16D3E7240DB} + {23B517C9-1ECC-4419-A13F-0B7136D085CB} = {F94FA21D-78E6-410B-895D-E16D3E7240DB} + {A4C858C8-51B6-4265-A695-A20FCEBA1D19} = {6604365C-C702-4C10-9BA8-637F1E3D4D0D} + {EC06F96A-AEEC-49D6-B03D-AB87C6EB674C} = {6604365C-C702-4C10-9BA8-637F1E3D4D0D} + {1D18D788-F7EE-4585-A23B-34DC8EC63CB8} = {6604365C-C702-4C10-9BA8-637F1E3D4D0D} + {B08385CD-F0CC-488C-B4F4-EEB34B6D2688} = {6604365C-C702-4C10-9BA8-637F1E3D4D0D} + {66A378A1-E9F4-4AD5-8946-D0EC06C2902F} = {C12B6EA7-2EFC-4368-B585-EC69EFCC3F97} + {78CC29AC-CC79-4355-B1F2-97936DF198AC} = {C12B6EA7-2EFC-4368-B585-EC69EFCC3F97} + {943DBBB3-E84E-4CF4-917C-C05AFA8743C1} = {C12B6EA7-2EFC-4368-B585-EC69EFCC3F97} + {88DA149F-21B2-48AB-82C4-28FB6BDFD783} = {C12B6EA7-2EFC-4368-B585-EC69EFCC3F97} {E73BB233-D88B-44A7-A98F-D71EE158381D} = {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} - {4980B743-B32F-4aba-AABD-45E2CAD3568D} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486} - {AD6FAA08-D6F5-4DBA-AF85-F4DA9F40C3B5} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486} - {80318B5F-A25D-45AB-8A95-EF31D2370A4C} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486} - {924EE450-603D-49C1-A8E5-4AFAA31CE6F3} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486} - {8035765F-D51F-4A0C-A746-2FD100E19419} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486} + {6259D767-BA7C-484D-9472-68F350A20086} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C} + {2D18BE89-D210-49EB-A9DD-2246FBB3DF6D} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C} + {870115DD-960A-4406-A6B9-600BCDC36A03} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C} + {D3C782BA-178E-4235-A3BA-8C11DEBB6BEE} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C} + {3A9AE6AA-BC07-4A2F-972C-581E3AE2F195} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C} {C3CBC8E3-81D8-4C5B-9941-DCCD12D50B1F} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486} + {8035765F-D51F-4A0C-A746-2FD100E19419} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486} + {924EE450-603D-49C1-A8E5-4AFAA31CE6F3} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486} + {80318B5F-A25D-45AB-8A95-EF31D2370A4C} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486} + {AD6FAA08-D6F5-4DBA-AF85-F4DA9F40C3B5} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486} + {4980B743-B32F-4aba-AABD-45E2CAD3568D} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486} + {2748AD25-9C63-4E12-877B-4DCE96FBED54} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486} + {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486} + {1152B71B-3C05-4598-B20D-823B5D40559E} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486} EndGlobalSection EndGlobal diff --git a/src/SharpDevelop.sln b/src/SharpDevelop.sln index 3cc4c24461..97f6510dac 100644 --- a/src/SharpDevelop.sln +++ b/src/SharpDevelop.sln @@ -6,185 +6,183 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AddIns", "AddIns", "{14A277 ProjectSection(SolutionItems) = postProject EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Display Bindings", "Display Bindings", "{4EA396ED-64AD-4AD0-A67A-AB363F3E0C79}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Misc", "Misc", "{CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}" ProjectSection(SolutionItems) = postProject EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WpfDesign", "WpfDesign", "{388C3979-2621-4839-A955-7E5C03BA0B63}" - ProjectSection(SolutionItems) = postProject - EndProjectSection +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SearchAndReplace", "AddIns\Misc\SearchAndReplace\Project\SearchAndReplace.csproj", "{9196DD8A-B4D4-4780-8742-C5762E547FC2}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.AddIn", "AddIns\DisplayBindings\WpfDesign\WpfDesign.AddIn\WpfDesign.AddIn.csproj", "{9A9D6FD4-6A2E-455D-ACC3-DDA775FE9865}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AddinScout", "AddIns\Misc\AddinScout\Project\AddinScout.csproj", "{4B8F0F98-8BE1-402B-AA8B-C8D548577B38}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.XamlDom", "AddIns\DisplayBindings\WpfDesign\WpfDesign.XamlDom\Project\WpfDesign.XamlDom.csproj", "{88DA149F-21B2-48AB-82C4-28FB6BDFD783}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartPage", "AddIns\Misc\StartPage\Project\StartPage.csproj", "{7D5C266F-D6FF-4D14-B315-0C0FC6C4EF51}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.Designer", "AddIns\DisplayBindings\WpfDesign\WpfDesign.Designer\Project\WpfDesign.Designer.csproj", "{78CC29AC-CC79-4355-B1F2-97936DF198AC}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RegExpTk", "AddIns\Misc\RegExpTk\Project\RegExpTk.csproj", "{64A3E5E6-90BF-47F6-94DF-68C94B62C817}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign", "AddIns\DisplayBindings\WpfDesign\WpfDesign\Project\WpfDesign.csproj", "{66A378A1-E9F4-4AD5-8946-D0EC06C2902F}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HighlightingEditor", "AddIns\Misc\HighlightingEditor\Project\HighlightingEditor.csproj", "{8A462940-E5E9-4E85-982D-D4C006EE31D4}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WorkflowDesigner", "AddIns\DisplayBindings\WorkflowDesigner\Project\WorkflowDesigner.csproj", "{533F4684-DBA6-4518-B005-C84F22A2DD57}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FiletypeRegisterer", "AddIns\Misc\FiletypeRegisterer\Project\FiletypeRegisterer.csproj", "{D022A6CE-7438-41E8-AC64-F2DE18EC54C6}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ClassDiagram", "ClassDiagram", "{DB137F0B-9B62-4232-AE92-F7BE0280B8D3}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Debugger", "Debugger", "{6604365C-C702-4C10-9BA8-637F1E3D4D0D}" ProjectSection(SolutionItems) = postProject EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassWizard", "AddIns\DisplayBindings\ClassDiagram\ClassWizard\ClassWizard.csproj", "{8C59E80D-C4E4-4F36-9AD8-47C40F6E58B4}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Diagrams", "AddIns\DisplayBindings\ClassDiagram\DiagramRouter\Diagrams.csproj", "{0991423A-DBF6-4C89-B365-A1DF1EB32E42}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TreeListView", "AddIns\Misc\Debugger\TreeListView\Project\TreeListView.csproj", "{B08385CD-F0CC-488C-B4F4-EEB34B6D2688}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassDiagramAddin", "AddIns\DisplayBindings\ClassDiagram\ClassDiagramAddin\ClassDiagramAddin.csproj", "{5A1354DF-4989-4BB4-BC6B-D627C2E9FA13}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.Core", "AddIns\Misc\Debugger\Debugger.Core\Project\Debugger.Core.csproj", "{1D18D788-F7EE-4585-A23B-34DC8EC63CB8}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassEditor", "AddIns\DisplayBindings\ClassDiagram\ClassEditor\ClassEditor.csproj", "{F5E059BB-96C2-4398-BED0-8598CD434173}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.AddIn", "AddIns\Misc\Debugger\Debugger.AddIn\Project\Debugger.AddIn.csproj", "{EC06F96A-AEEC-49D6-B03D-AB87C6EB674C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassCanvas", "AddIns\DisplayBindings\ClassDiagram\ClassCanvas\ClassCanvas.csproj", "{08F772A1-F0BE-433E-8B37-F6522953DB05}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HtmlHelp2", "AddIns\Misc\HtmlHelp2\Project\HtmlHelp2.csproj", "{918487B7-2153-4618-BBB3-344DBDDF2A2A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SettingsEditor", "AddIns\DisplayBindings\SettingsEditor\Project\SettingsEditor.csproj", "{85226AFB-CE71-4851-9A75-7EEC663A8E8A}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AddInManager", "AddIns\Misc\AddInManager\Project\AddInManager.csproj", "{F93E52FD-DA66-4CE5-A0CB-BCD902811122}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IconEditor", "IconEditor", "{0D37CE59-B0EF-4F3C-B9EB-8557E53A448B}" - ProjectSection(SolutionItems) = postProject - EndProjectSection +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PInvokeAddIn", "AddIns\Misc\PInvokeAddIn\Project\PInvokeAddIn.csproj", "{5EEB99CF-EA2B-4733-80A6-CE9192D68170}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IconEditorAddIn", "AddIns\DisplayBindings\IconEditor\IconEditorAddIn\IconEditorAddIn.csproj", "{DFB936AD-90EE-4B4F-941E-4F4A636F0D92}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeCoverage", "AddIns\Misc\CodeCoverage\Project\CodeCoverage.csproj", "{08ce9972-283b-44f4-82fa-966f7dfa6b7a}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IconEditor", "AddIns\DisplayBindings\IconEditor\IconEditor\IconEditor.csproj", "{DC1CCE11-CB91-40FA-9C47-4D9EB5D67BFD}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTesting", "AddIns\Misc\UnitTesting\UnitTesting.csproj", "{1F261725-6318-4434-A1B1-6C70CE4CD324}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XmlEditor", "AddIns\DisplayBindings\XmlEditor\Project\XmlEditor.csproj", "{6B717BD1-CD5E-498C-A42E-9E6A4584DC48}" +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "HtmlHelp2JScriptGlobals", "AddIns\Misc\HtmlHelp2\JScriptGlobals\HtmlHelp2JScriptGlobals.vbproj", "{E54A5AD2-418D-4A85-BA5E-CD803DE38715}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FormsDesigner", "AddIns\DisplayBindings\FormsDesigner\Project\FormsDesigner.csproj", "{7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SubversionAddIn", "AddIns\Misc\SubversionAddIn\Project\SubversionAddIn.csproj", "{17F4D7E0-6933-4C2E-8714-FD7E98D625D5}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceEditor", "AddIns\DisplayBindings\ResourceEditor\Project\ResourceEditor.csproj", "{CBC6C247-747B-4908-B09A-4D2E0F640B6B}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeAnalysis", "AddIns\Misc\CodeAnalysis\CodeAnalysis.csproj", "{3EAA45A9-735C-4AC7-A799-947B93EA449D}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Backends", "Backends", "{FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ComponentInspector", "ComponentInspector", "{BDDDCD01-D2FE-4EAD-9425-4B6B91922C7C}" ProjectSection(SolutionItems) = postProject EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamlBinding", "AddIns\BackendBindings\XamlBinding\Project\XamlBinding.csproj", "{7C96B65D-28A5-4F28-A35B-8D83CE831EE8}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixBinding", "AddIns\BackendBindings\WixBinding\Project\WixBinding.csproj", "{e1b288a2-08ee-4318-8bbb-8ab72c69e33e}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactoryToBooConverter", "AddIns\BackendBindings\Boo\NRefactoryToBooConverter\Project\NRefactoryToBooConverter.csproj", "{DBCF20A1-BA13-4582-BFA9-74DE4D987B73}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BooBinding", "AddIns\BackendBindings\Boo\BooBinding\Project\BooBinding.csproj", "{4AC2D5F1-F671-480C-A075-6BF62B3721B2}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComponentInspector", "AddIns\Misc\ComponentInspector\ComponentInspector\ComponentInspector.csproj", "{000E4F64-5D0D-4EB1-B0BF-1A62ADBC6EAD}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ILAsmBinding", "AddIns\BackendBindings\ILAsmBinding\Project\ILAsmBinding.csproj", "{6e59af58-f635-459a-9a35-c9ac41c00339}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComponentInspector.AddIn", "AddIns\Misc\ComponentInspector\ComponentInspector.AddIn\ComponentInspector.AddIn.csproj", "{869951D5-A0D6-4DC6-9F1D-E6B9A12AC446}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VBNetBinding", "AddIns\BackendBindings\VBNetBinding\Project\VBNetBinding.csproj", "{BF38FB72-B380-4196-AF8C-95749D726C61}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComponentInspector.Core", "AddIns\Misc\ComponentInspector\ComponentInspector.Core\ComponentInspector.Core.csproj", "{E6F4983F-DE41-4AEC-88E7-1FA9AFB4E6FF}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpBinding", "AddIns\BackendBindings\CSharpBinding\Project\CSharpBinding.csproj", "{1F1AC7CD-D154-45BB-8EAF-804CA8055F5A}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceToolkit", "AddIns\Misc\ResourceToolkit\Project\ResourceToolkit.csproj", "{461606BD-E824-4D0A-8CBA-01810B1F5E02}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Python", "Python", "{8CF9DB5A-A2F6-4A88-BABA-100912EAF6E8}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SharpServerTools", "SharpServerTools", "{6CEEC0D9-FA00-4EE3-9A1C-39B7ACC882FD}" ProjectSection(SolutionItems) = postProject EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Python.Build.Tasks", "AddIns\BackendBindings\Python\Python.Build.Tasks\Project\Python.Build.Tasks.csproj", "{D332F2D1-2CF1-43B7-903C-844BD5211A7E}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServerBrowserTool", "AddIns\Misc\SharpServerTools\ServerBrowserTool\ServerBrowserTool.csproj", "{D721EAA4-8A40-4EF0-A011-5862159BE621}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PythonBinding", "AddIns\BackendBindings\Python\PythonBinding\Project\PythonBinding.csproj", "{8D732610-8FC6-43BA-94C9-7126FD7FE361}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataTools.AddIn", "AddIns\Misc\SharpServerTools\SharpDbTools\DataTools.AddIn.csproj", "{93B2D6DF-7588-40C0-8A35-CA0DD7328FC3}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Misc", "Misc", "{CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataTools.Model", "AddIns\Misc\SharpServerTools\DataTools.Model\DataTools.Model.csproj", "{51783FC4-D8D2-4BFB-A1F1-AC8857CF3ED0}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataTools.UI", "AddIns\Misc\SharpServerTools\DataTools.UI\DataTools.UI.csproj", "{87C0E3D9-0DFD-4F6D-8E38-408AAF73F4EE}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Backends", "Backends", "{FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C}" ProjectSection(SolutionItems) = postProject EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SharpServerTools", "SharpServerTools", "{6CEEC0D9-FA00-4EE3-9A1C-39B7ACC882FD}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Python", "Python", "{8CF9DB5A-A2F6-4A88-BABA-100912EAF6E8}" ProjectSection(SolutionItems) = postProject EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataTools.UI", "AddIns\Misc\SharpServerTools\DataTools.UI\DataTools.UI.csproj", "{87C0E3D9-0DFD-4F6D-8E38-408AAF73F4EE}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataTools.Model", "AddIns\Misc\SharpServerTools\DataTools.Model\DataTools.Model.csproj", "{51783FC4-D8D2-4BFB-A1F1-AC8857CF3ED0}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PythonBinding", "AddIns\BackendBindings\Python\PythonBinding\Project\PythonBinding.csproj", "{8D732610-8FC6-43BA-94C9-7126FD7FE361}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataTools.AddIn", "AddIns\Misc\SharpServerTools\SharpDbTools\DataTools.AddIn.csproj", "{93B2D6DF-7588-40C0-8A35-CA0DD7328FC3}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Python.Build.Tasks", "AddIns\BackendBindings\Python\Python.Build.Tasks\Project\Python.Build.Tasks.csproj", "{D332F2D1-2CF1-43B7-903C-844BD5211A7E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServerBrowserTool", "AddIns\Misc\SharpServerTools\ServerBrowserTool\ServerBrowserTool.csproj", "{D721EAA4-8A40-4EF0-A011-5862159BE621}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpBinding", "AddIns\BackendBindings\CSharpBinding\Project\CSharpBinding.csproj", "{1F1AC7CD-D154-45BB-8EAF-804CA8055F5A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceToolkit", "AddIns\Misc\ResourceToolkit\Project\ResourceToolkit.csproj", "{461606BD-E824-4D0A-8CBA-01810B1F5E02}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VBNetBinding", "AddIns\BackendBindings\VBNetBinding\Project\VBNetBinding.csproj", "{BF38FB72-B380-4196-AF8C-95749D726C61}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ComponentInspector", "ComponentInspector", "{BDDDCD01-D2FE-4EAD-9425-4B6B91922C7C}" - ProjectSection(SolutionItems) = postProject - EndProjectSection +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ILAsmBinding", "AddIns\BackendBindings\ILAsmBinding\Project\ILAsmBinding.csproj", "{6e59af58-f635-459a-9a35-c9ac41c00339}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComponentInspector.Core", "AddIns\Misc\ComponentInspector\ComponentInspector.Core\ComponentInspector.Core.csproj", "{E6F4983F-DE41-4AEC-88E7-1FA9AFB4E6FF}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BooBinding", "AddIns\BackendBindings\Boo\BooBinding\Project\BooBinding.csproj", "{4AC2D5F1-F671-480C-A075-6BF62B3721B2}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComponentInspector.AddIn", "AddIns\Misc\ComponentInspector\ComponentInspector.AddIn\ComponentInspector.AddIn.csproj", "{869951D5-A0D6-4DC6-9F1D-E6B9A12AC446}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactoryToBooConverter", "AddIns\BackendBindings\Boo\NRefactoryToBooConverter\Project\NRefactoryToBooConverter.csproj", "{DBCF20A1-BA13-4582-BFA9-74DE4D987B73}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComponentInspector", "AddIns\Misc\ComponentInspector\ComponentInspector\ComponentInspector.csproj", "{000E4F64-5D0D-4EB1-B0BF-1A62ADBC6EAD}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixBinding", "AddIns\BackendBindings\WixBinding\Project\WixBinding.csproj", "{e1b288a2-08ee-4318-8bbb-8ab72c69e33e}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeAnalysis", "AddIns\Misc\CodeAnalysis\CodeAnalysis.csproj", "{3EAA45A9-735C-4AC7-A799-947B93EA449D}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamlBinding", "AddIns\BackendBindings\XamlBinding\Project\XamlBinding.csproj", "{7C96B65D-28A5-4F28-A35B-8D83CE831EE8}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SubversionAddIn", "AddIns\Misc\SubversionAddIn\Project\SubversionAddIn.csproj", "{17F4D7E0-6933-4C2E-8714-FD7E98D625D5}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Display Bindings", "Display Bindings", "{4EA396ED-64AD-4AD0-A67A-AB363F3E0C79}" + ProjectSection(SolutionItems) = postProject + EndProjectSection EndProject -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "HtmlHelp2JScriptGlobals", "AddIns\Misc\HtmlHelp2\JScriptGlobals\HtmlHelp2JScriptGlobals.vbproj", "{E54A5AD2-418D-4A85-BA5E-CD803DE38715}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceEditor", "AddIns\DisplayBindings\ResourceEditor\Project\ResourceEditor.csproj", "{CBC6C247-747B-4908-B09A-4D2E0F640B6B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTesting", "AddIns\Misc\UnitTesting\UnitTesting.csproj", "{1F261725-6318-4434-A1B1-6C70CE4CD324}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FormsDesigner", "AddIns\DisplayBindings\FormsDesigner\Project\FormsDesigner.csproj", "{7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeCoverage", "AddIns\Misc\CodeCoverage\Project\CodeCoverage.csproj", "{08ce9972-283b-44f4-82fa-966f7dfa6b7a}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XmlEditor", "AddIns\DisplayBindings\XmlEditor\Project\XmlEditor.csproj", "{6B717BD1-CD5E-498C-A42E-9E6A4584DC48}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoAddIn", "AddIns\Misc\MonoAddIn\Project\MonoAddIn.csproj", "{082DCD64-EE32-4151-A50F-E139CF754CC0}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IconEditor", "IconEditor", "{0D37CE59-B0EF-4F3C-B9EB-8557E53A448B}" + ProjectSection(SolutionItems) = postProject + EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PInvokeAddIn", "AddIns\Misc\PInvokeAddIn\Project\PInvokeAddIn.csproj", "{5EEB99CF-EA2B-4733-80A6-CE9192D68170}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IconEditor", "AddIns\DisplayBindings\IconEditor\IconEditor\IconEditor.csproj", "{DC1CCE11-CB91-40FA-9C47-4D9EB5D67BFD}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AddInManager", "AddIns\Misc\AddInManager\Project\AddInManager.csproj", "{F93E52FD-DA66-4CE5-A0CB-BCD902811122}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IconEditorAddIn", "AddIns\DisplayBindings\IconEditor\IconEditorAddIn\IconEditorAddIn.csproj", "{DFB936AD-90EE-4B4F-941E-4F4A636F0D92}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HtmlHelp2", "AddIns\Misc\HtmlHelp2\Project\HtmlHelp2.csproj", "{918487B7-2153-4618-BBB3-344DBDDF2A2A}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SettingsEditor", "AddIns\DisplayBindings\SettingsEditor\Project\SettingsEditor.csproj", "{85226AFB-CE71-4851-9A75-7EEC663A8E8A}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Debugger", "Debugger", "{6604365C-C702-4C10-9BA8-637F1E3D4D0D}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ClassDiagram", "ClassDiagram", "{DB137F0B-9B62-4232-AE92-F7BE0280B8D3}" ProjectSection(SolutionItems) = postProject EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.AddIn", "AddIns\Misc\Debugger\Debugger.AddIn\Project\Debugger.AddIn.csproj", "{EC06F96A-AEEC-49D6-B03D-AB87C6EB674C}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassCanvas", "AddIns\DisplayBindings\ClassDiagram\ClassCanvas\ClassCanvas.csproj", "{08F772A1-F0BE-433E-8B37-F6522953DB05}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.Core", "AddIns\Misc\Debugger\Debugger.Core\Project\Debugger.Core.csproj", "{1D18D788-F7EE-4585-A23B-34DC8EC63CB8}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassEditor", "AddIns\DisplayBindings\ClassDiagram\ClassEditor\ClassEditor.csproj", "{F5E059BB-96C2-4398-BED0-8598CD434173}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TreeListView", "AddIns\Misc\Debugger\TreeListView\Project\TreeListView.csproj", "{B08385CD-F0CC-488C-B4F4-EEB34B6D2688}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassDiagramAddin", "AddIns\DisplayBindings\ClassDiagram\ClassDiagramAddin\ClassDiagramAddin.csproj", "{5A1354DF-4989-4BB4-BC6B-D627C2E9FA13}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FiletypeRegisterer", "AddIns\Misc\FiletypeRegisterer\Project\FiletypeRegisterer.csproj", "{D022A6CE-7438-41E8-AC64-F2DE18EC54C6}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Diagrams", "AddIns\DisplayBindings\ClassDiagram\DiagramRouter\Diagrams.csproj", "{0991423A-DBF6-4C89-B365-A1DF1EB32E42}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HighlightingEditor", "AddIns\Misc\HighlightingEditor\Project\HighlightingEditor.csproj", "{8A462940-E5E9-4E85-982D-D4C006EE31D4}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassWizard", "AddIns\DisplayBindings\ClassDiagram\ClassWizard\ClassWizard.csproj", "{8C59E80D-C4E4-4F36-9AD8-47C40F6E58B4}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RegExpTk", "AddIns\Misc\RegExpTk\Project\RegExpTk.csproj", "{64A3E5E6-90BF-47F6-94DF-68C94B62C817}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WorkflowDesigner", "AddIns\DisplayBindings\WorkflowDesigner\Project\WorkflowDesigner.csproj", "{533F4684-DBA6-4518-B005-C84F22A2DD57}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartPage", "AddIns\Misc\StartPage\Project\StartPage.csproj", "{7D5C266F-D6FF-4D14-B315-0C0FC6C4EF51}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WpfDesign", "WpfDesign", "{388C3979-2621-4839-A955-7E5C03BA0B63}" + ProjectSection(SolutionItems) = postProject + EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AddinScout", "AddIns\Misc\AddinScout\Project\AddinScout.csproj", "{4B8F0F98-8BE1-402B-AA8B-C8D548577B38}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign", "AddIns\DisplayBindings\WpfDesign\WpfDesign\Project\WpfDesign.csproj", "{66A378A1-E9F4-4AD5-8946-D0EC06C2902F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SearchAndReplace", "AddIns\Misc\SearchAndReplace\Project\SearchAndReplace.csproj", "{9196DD8A-B4D4-4780-8742-C5762E547FC2}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.Designer", "AddIns\DisplayBindings\WpfDesign\WpfDesign.Designer\Project\WpfDesign.Designer.csproj", "{78CC29AC-CC79-4355-B1F2-97936DF198AC}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.XamlDom", "AddIns\DisplayBindings\WpfDesign\WpfDesign.XamlDom\Project\WpfDesign.XamlDom.csproj", "{88DA149F-21B2-48AB-82C4-28FB6BDFD783}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.AddIn", "AddIns\DisplayBindings\WpfDesign\WpfDesign.AddIn\WpfDesign.AddIn.csproj", "{9A9D6FD4-6A2E-455D-ACC3-DDA775FE9865}" 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}") = "ICSharpCode.DataTools", "Libraries\ICSharpCode.DataTools\ICSharpCode.DataTools.csproj", "{6CC3DF82-E815-483F-B4B5-85191064D981}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactory", "Libraries\NRefactory\Project\NRefactory.csproj", "{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyMeta", "Libraries\MyMeta\MyMeta.csproj", "{9B771930-6F16-4EC7-8CBB-C7B337EF5651}" +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}") = "Aga.Controls", "Libraries\TreeViewAdv\Aga.Controls\Aga.Controls.csproj", "{E73BB233-D88B-44A7-A98F-D71EE158381D}" +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.Build.Tasks", "Libraries\ICSharpCode.Build.Tasks\Project\ICSharpCode.Build.Tasks.csproj", "{4139CCF6-FB49-4A9D-B2CF-331E9EA3198D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinFormsUI", "Libraries\DockPanel_Src\WinFormsUI\WinFormsUI.csproj", "{D3C782BA-178E-4235-A3BA-8C11DEBB6BEE}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aga.Controls", "Libraries\TreeViewAdv\Aga.Controls\Aga.Controls.csproj", "{E73BB233-D88B-44A7-A98F-D71EE158381D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.TextEditor", "Libraries\ICSharpCode.TextEditor\Project\ICSharpCode.TextEditor.csproj", "{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyMeta", "Libraries\MyMeta\MyMeta.csproj", "{9B771930-6F16-4EC7-8CBB-C7B337EF5651}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactory", "Libraries\NRefactory\Project\NRefactory.csproj", "{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.DataTools", "Libraries\ICSharpCode.DataTools\ICSharpCode.DataTools.csproj", "{6CC3DF82-E815-483F-B4B5-85191064D981}" 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.Dom", "Main\ICSharpCode.SharpDevelop.Dom\Project\ICSharpCode.SharpDevelop.Dom.csproj", "{924EE450-603D-49C1-A8E5-4AFAA31CE6F3}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Widgets", "Main\ICSharpCode.SharpDevelop.Widgets\Project\ICSharpCode.SharpDevelop.Widgets.csproj", "{8035765F-D51F-4A0C-A746-2FD100E19419}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.BuildWorker", "Main\ICSharpCode.SharpDevelop.BuildWorker\ICSharpCode.SharpDevelop.BuildWorker.csproj", "{C3CBC8E3-81D8-4C5B-9941-DCCD12D50B1F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Sda", "Main\ICSharpCode.SharpDevelop.Sda\ICSharpCode.SharpDevelop.Sda.csproj", "{80318B5F-A25D-45AB-8A95-EF31D2370A4C}" +Project("{00000000-0000-0000-0000-000000000000}") = "Tools", "Tools\Tools.build", "B13EFF7F-7EA4-4B68-A375-D112105E9182" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop", "Main\Base\Project\ICSharpCode.SharpDevelop.csproj", "{2748AD25-9C63-4E12-877B-4DCE96FBED54}" +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", "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}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop", "Main\Base\Project\ICSharpCode.SharpDevelop.csproj", "{2748AD25-9C63-4E12-877B-4DCE96FBED54}" EndProject -Project("{00000000-0000-0000-0000-000000000000}") = "Tools", "Tools\Tools.build", "B13EFF7F-7EA4-4B68-A375-D112105E9182" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Sda", "Main\ICSharpCode.SharpDevelop.Sda\ICSharpCode.SharpDevelop.Sda.csproj", "{80318B5F-A25D-45AB-8A95-EF31D2370A4C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.BuildWorker", "Main\ICSharpCode.SharpDevelop.BuildWorker\ICSharpCode.SharpDevelop.BuildWorker.csproj", "{C3CBC8E3-81D8-4C5B-9941-DCCD12D50B1F}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Widgets", "Main\ICSharpCode.SharpDevelop.Widgets\Project\ICSharpCode.SharpDevelop.Widgets.csproj", "{8035765F-D51F-4A0C-A746-2FD100E19419}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Dom", "Main\ICSharpCode.SharpDevelop.Dom\Project\ICSharpCode.SharpDevelop.Dom.csproj", "{924EE450-603D-49C1-A8E5-4AFAA31CE6F3}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -538,81 +536,80 @@ Global {8D732610-8FC6-43BA-94C9-7126FD7FE361}.Release|Any CPU.ActiveCfg = Release|Any CPU EndGlobalSection GlobalSection(NestedProjects) = preSolution - {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} - {CBC6C247-747B-4908-B09A-4D2E0F640B6B} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79} - {7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79} - {6B717BD1-CD5E-498C-A42E-9E6A4584DC48} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79} - {0D37CE59-B0EF-4F3C-B9EB-8557E53A448B} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79} - {85226AFB-CE71-4851-9A75-7EEC663A8E8A} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79} - {DB137F0B-9B62-4232-AE92-F7BE0280B8D3} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79} - {533F4684-DBA6-4518-B005-C84F22A2DD57} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79} - {388C3979-2621-4839-A955-7E5C03BA0B63} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79} - {66A378A1-E9F4-4AD5-8946-D0EC06C2902F} = {388C3979-2621-4839-A955-7E5C03BA0B63} - {78CC29AC-CC79-4355-B1F2-97936DF198AC} = {388C3979-2621-4839-A955-7E5C03BA0B63} - {88DA149F-21B2-48AB-82C4-28FB6BDFD783} = {388C3979-2621-4839-A955-7E5C03BA0B63} - {9A9D6FD4-6A2E-455D-ACC3-DDA775FE9865} = {388C3979-2621-4839-A955-7E5C03BA0B63} - {08F772A1-F0BE-433E-8B37-F6522953DB05} = {DB137F0B-9B62-4232-AE92-F7BE0280B8D3} - {F5E059BB-96C2-4398-BED0-8598CD434173} = {DB137F0B-9B62-4232-AE92-F7BE0280B8D3} - {5A1354DF-4989-4BB4-BC6B-D627C2E9FA13} = {DB137F0B-9B62-4232-AE92-F7BE0280B8D3} - {0991423A-DBF6-4C89-B365-A1DF1EB32E42} = {DB137F0B-9B62-4232-AE92-F7BE0280B8D3} - {8C59E80D-C4E4-4F36-9AD8-47C40F6E58B4} = {DB137F0B-9B62-4232-AE92-F7BE0280B8D3} - {DC1CCE11-CB91-40FA-9C47-4D9EB5D67BFD} = {0D37CE59-B0EF-4F3C-B9EB-8557E53A448B} - {DFB936AD-90EE-4B4F-941E-4F4A636F0D92} = {0D37CE59-B0EF-4F3C-B9EB-8557E53A448B} - {8CF9DB5A-A2F6-4A88-BABA-100912EAF6E8} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C} - {1F1AC7CD-D154-45BB-8EAF-804CA8055F5A} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C} - {BF38FB72-B380-4196-AF8C-95749D726C61} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C} - {6e59af58-f635-459a-9a35-c9ac41c00339} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C} - {4AC2D5F1-F671-480C-A075-6BF62B3721B2} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C} - {DBCF20A1-BA13-4582-BFA9-74DE4D987B73} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C} - {e1b288a2-08ee-4318-8bbb-8ab72c69e33e} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C} - {7C96B65D-28A5-4F28-A35B-8D83CE831EE8} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C} - {8D732610-8FC6-43BA-94C9-7126FD7FE361} = {8CF9DB5A-A2F6-4A88-BABA-100912EAF6E8} - {D332F2D1-2CF1-43B7-903C-844BD5211A7E} = {8CF9DB5A-A2F6-4A88-BABA-100912EAF6E8} - {9196DD8A-B4D4-4780-8742-C5762E547FC2} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} - {4B8F0F98-8BE1-402B-AA8B-C8D548577B38} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} - {7D5C266F-D6FF-4D14-B315-0C0FC6C4EF51} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} - {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} - {6604365C-C702-4C10-9BA8-637F1E3D4D0D} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} - {918487B7-2153-4618-BBB3-344DBDDF2A2A} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} - {F93E52FD-DA66-4CE5-A0CB-BCD902811122} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} - {5EEB99CF-EA2B-4733-80A6-CE9192D68170} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} - {082DCD64-EE32-4151-A50F-E139CF754CC0} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} - {08ce9972-283b-44f4-82fa-966f7dfa6b7a} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} - {1F261725-6318-4434-A1B1-6C70CE4CD324} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} - {E54A5AD2-418D-4A85-BA5E-CD803DE38715} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} - {17F4D7E0-6933-4C2E-8714-FD7E98D625D5} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} - {3EAA45A9-735C-4AC7-A799-947B93EA449D} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} - {BDDDCD01-D2FE-4EAD-9425-4B6B91922C7C} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} - {461606BD-E824-4D0A-8CBA-01810B1F5E02} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} + {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5} + {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5} {6CEEC0D9-FA00-4EE3-9A1C-39B7ACC882FD} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} - {D721EAA4-8A40-4EF0-A011-5862159BE621} = {6CEEC0D9-FA00-4EE3-9A1C-39B7ACC882FD} - {93B2D6DF-7588-40C0-8A35-CA0DD7328FC3} = {6CEEC0D9-FA00-4EE3-9A1C-39B7ACC882FD} - {51783FC4-D8D2-4BFB-A1F1-AC8857CF3ED0} = {6CEEC0D9-FA00-4EE3-9A1C-39B7ACC882FD} - {87C0E3D9-0DFD-4F6D-8E38-408AAF73F4EE} = {6CEEC0D9-FA00-4EE3-9A1C-39B7ACC882FD} - {000E4F64-5D0D-4EB1-B0BF-1A62ADBC6EAD} = {BDDDCD01-D2FE-4EAD-9425-4B6B91922C7C} - {869951D5-A0D6-4DC6-9F1D-E6B9A12AC446} = {BDDDCD01-D2FE-4EAD-9425-4B6B91922C7C} - {E6F4983F-DE41-4AEC-88E7-1FA9AFB4E6FF} = {BDDDCD01-D2FE-4EAD-9425-4B6B91922C7C} - {B08385CD-F0CC-488C-B4F4-EEB34B6D2688} = {6604365C-C702-4C10-9BA8-637F1E3D4D0D} - {1D18D788-F7EE-4585-A23B-34DC8EC63CB8} = {6604365C-C702-4C10-9BA8-637F1E3D4D0D} + {461606BD-E824-4D0A-8CBA-01810B1F5E02} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} + {BDDDCD01-D2FE-4EAD-9425-4B6B91922C7C} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} + {3EAA45A9-735C-4AC7-A799-947B93EA449D} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} + {17F4D7E0-6933-4C2E-8714-FD7E98D625D5} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} + {E54A5AD2-418D-4A85-BA5E-CD803DE38715} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} + {1F261725-6318-4434-A1B1-6C70CE4CD324} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} + {08ce9972-283b-44f4-82fa-966f7dfa6b7a} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} + {5EEB99CF-EA2B-4733-80A6-CE9192D68170} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} + {F93E52FD-DA66-4CE5-A0CB-BCD902811122} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} + {918487B7-2153-4618-BBB3-344DBDDF2A2A} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} + {6604365C-C702-4C10-9BA8-637F1E3D4D0D} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} + {D022A6CE-7438-41E8-AC64-F2DE18EC54C6} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} + {8A462940-E5E9-4E85-982D-D4C006EE31D4} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} + {64A3E5E6-90BF-47F6-94DF-68C94B62C817} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} + {7D5C266F-D6FF-4D14-B315-0C0FC6C4EF51} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} + {4B8F0F98-8BE1-402B-AA8B-C8D548577B38} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} + {9196DD8A-B4D4-4780-8742-C5762E547FC2} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} {EC06F96A-AEEC-49D6-B03D-AB87C6EB674C} = {6604365C-C702-4C10-9BA8-637F1E3D4D0D} - {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} - {4139CCF6-FB49-4A9D-B2CF-331E9EA3198D} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C} - {E73BB233-D88B-44A7-A98F-D71EE158381D} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C} - {9B771930-6F16-4EC7-8CBB-C7B337EF5651} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C} + {1D18D788-F7EE-4585-A23B-34DC8EC63CB8} = {6604365C-C702-4C10-9BA8-637F1E3D4D0D} + {B08385CD-F0CC-488C-B4F4-EEB34B6D2688} = {6604365C-C702-4C10-9BA8-637F1E3D4D0D} + {E6F4983F-DE41-4AEC-88E7-1FA9AFB4E6FF} = {BDDDCD01-D2FE-4EAD-9425-4B6B91922C7C} + {869951D5-A0D6-4DC6-9F1D-E6B9A12AC446} = {BDDDCD01-D2FE-4EAD-9425-4B6B91922C7C} + {000E4F64-5D0D-4EB1-B0BF-1A62ADBC6EAD} = {BDDDCD01-D2FE-4EAD-9425-4B6B91922C7C} + {87C0E3D9-0DFD-4F6D-8E38-408AAF73F4EE} = {6CEEC0D9-FA00-4EE3-9A1C-39B7ACC882FD} + {51783FC4-D8D2-4BFB-A1F1-AC8857CF3ED0} = {6CEEC0D9-FA00-4EE3-9A1C-39B7ACC882FD} + {93B2D6DF-7588-40C0-8A35-CA0DD7328FC3} = {6CEEC0D9-FA00-4EE3-9A1C-39B7ACC882FD} + {D721EAA4-8A40-4EF0-A011-5862159BE621} = {6CEEC0D9-FA00-4EE3-9A1C-39B7ACC882FD} + {7C96B65D-28A5-4F28-A35B-8D83CE831EE8} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C} + {e1b288a2-08ee-4318-8bbb-8ab72c69e33e} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C} + {DBCF20A1-BA13-4582-BFA9-74DE4D987B73} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C} + {4AC2D5F1-F671-480C-A075-6BF62B3721B2} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C} + {6e59af58-f635-459a-9a35-c9ac41c00339} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C} + {BF38FB72-B380-4196-AF8C-95749D726C61} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C} + {1F1AC7CD-D154-45BB-8EAF-804CA8055F5A} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C} + {8CF9DB5A-A2F6-4A88-BABA-100912EAF6E8} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C} + {D332F2D1-2CF1-43B7-903C-844BD5211A7E} = {8CF9DB5A-A2F6-4A88-BABA-100912EAF6E8} + {8D732610-8FC6-43BA-94C9-7126FD7FE361} = {8CF9DB5A-A2F6-4A88-BABA-100912EAF6E8} + {388C3979-2621-4839-A955-7E5C03BA0B63} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79} + {533F4684-DBA6-4518-B005-C84F22A2DD57} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79} + {DB137F0B-9B62-4232-AE92-F7BE0280B8D3} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79} + {85226AFB-CE71-4851-9A75-7EEC663A8E8A} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79} + {0D37CE59-B0EF-4F3C-B9EB-8557E53A448B} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79} + {6B717BD1-CD5E-498C-A42E-9E6A4584DC48} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79} + {7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79} + {CBC6C247-747B-4908-B09A-4D2E0F640B6B} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79} + {DFB936AD-90EE-4B4F-941E-4F4A636F0D92} = {0D37CE59-B0EF-4F3C-B9EB-8557E53A448B} + {DC1CCE11-CB91-40FA-9C47-4D9EB5D67BFD} = {0D37CE59-B0EF-4F3C-B9EB-8557E53A448B} + {8C59E80D-C4E4-4F36-9AD8-47C40F6E58B4} = {DB137F0B-9B62-4232-AE92-F7BE0280B8D3} + {0991423A-DBF6-4C89-B365-A1DF1EB32E42} = {DB137F0B-9B62-4232-AE92-F7BE0280B8D3} + {5A1354DF-4989-4BB4-BC6B-D627C2E9FA13} = {DB137F0B-9B62-4232-AE92-F7BE0280B8D3} + {F5E059BB-96C2-4398-BED0-8598CD434173} = {DB137F0B-9B62-4232-AE92-F7BE0280B8D3} + {08F772A1-F0BE-433E-8B37-F6522953DB05} = {DB137F0B-9B62-4232-AE92-F7BE0280B8D3} + {9A9D6FD4-6A2E-455D-ACC3-DDA775FE9865} = {388C3979-2621-4839-A955-7E5C03BA0B63} + {88DA149F-21B2-48AB-82C4-28FB6BDFD783} = {388C3979-2621-4839-A955-7E5C03BA0B63} + {78CC29AC-CC79-4355-B1F2-97936DF198AC} = {388C3979-2621-4839-A955-7E5C03BA0B63} + {66A378A1-E9F4-4AD5-8946-D0EC06C2902F} = {388C3979-2621-4839-A955-7E5C03BA0B63} {6CC3DF82-E815-483F-B4B5-85191064D981} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C} - {C3CBC8E3-81D8-4C5B-9941-DCCD12D50B1F} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486} - B13EFF7F-7EA4-4B68-A375-D112105E9182 = {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} - {80318B5F-A25D-45AB-8A95-EF31D2370A4C} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486} - {8035765F-D51F-4A0C-A746-2FD100E19419} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486} + {9B771930-6F16-4EC7-8CBB-C7B337EF5651} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C} + {E73BB233-D88B-44A7-A98F-D71EE158381D} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C} + {4139CCF6-FB49-4A9D-B2CF-331E9EA3198D} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C} + {D3C782BA-178E-4235-A3BA-8C11DEBB6BEE} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C} + {2D18BE89-D210-49EB-A9DD-2246FBB3DF6D} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C} + {3A9AE6AA-BC07-4A2F-972C-581E3AE2F195} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C} {924EE450-603D-49C1-A8E5-4AFAA31CE6F3} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486} + {8035765F-D51F-4A0C-A746-2FD100E19419} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486} + {80318B5F-A25D-45AB-8A95-EF31D2370A4C} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486} + {2748AD25-9C63-4E12-877B-4DCE96FBED54} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486} + {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486} + {1152B71B-3C05-4598-B20D-823B5D40559E} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486} + B13EFF7F-7EA4-4B68-A375-D112105E9182 = {5A3EBEBA-0560-41C1-966B-23F7D03A5486} + {C3CBC8E3-81D8-4C5B-9941-DCCD12D50B1F} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486} EndGlobalSection EndGlobal