diff --git a/SharpDevelop.Tests.sln b/SharpDevelop.Tests.sln index b7d7467ad0..b7bbe788ef 100644 --- a/SharpDevelop.Tests.sln +++ b/SharpDevelop.Tests.sln @@ -1,69 +1,69 @@  Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 -# SharpDevelop 4.1.0.7646-alpha +# SharpDevelop 4.1.0.7854-beta Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Main", "Main", "{256F5C28-532C-44C0-8AB8-D8EC5E492E01}" ProjectSection(SolutionItems) = postProject EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartUp", "src\Main\StartUp\Project\StartUp.csproj", "{1152B71B-3C05-4598-B20D-823B5D40559E}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.BuildWorker35", "src\Main\ICSharpCode.SharpDevelop.BuildWorker35\ICSharpCode.SharpDevelop.BuildWorker35.csproj", "{B5F54272-49F0-40DB-845A-8D837875D3BA}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Widgets", "src\Main\ICSharpCode.SharpDevelop.Widgets\Project\ICSharpCode.SharpDevelop.Widgets.csproj", "{8035765F-D51F-4A0C-A746-2FD100E19419}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.BuildWorker", "src\Main\ICSharpCode.SharpDevelop.BuildWorker\ICSharpCode.SharpDevelop.BuildWorker.csproj", "{C3CBC8E3-81D8-4C5B-9941-DCCD12D50B1F}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop", "src\Main\Base\Project\ICSharpCode.SharpDevelop.csproj", "{2748AD25-9C63-4E12-877B-4DCE96FBED54}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Dom.Tests", "src\Main\ICSharpCode.SharpDevelop.Dom\Tests\ICSharpCode.SharpDevelop.Dom.Tests\ICSharpCode.SharpDevelop.Dom.Tests.csproj", "{7DB80259-24D4-46C3-A024-53FF1987733D}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Sda", "src\Main\ICSharpCode.SharpDevelop.Sda\ICSharpCode.SharpDevelop.Sda.csproj", "{80318B5F-A25D-45AB-8A95-EF31D2370A4C}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Tests", "src\Main\Base\Test\ICSharpCode.SharpDevelop.Tests.csproj", "{4980B743-B32F-4aba-AABD-45E2CAD3568D}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Dom", "src\Main\ICSharpCode.SharpDevelop.Dom\Project\ICSharpCode.SharpDevelop.Dom.csproj", "{924EE450-603D-49C1-A8E5-4AFAA31CE6F3}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core.Tests", "src\Main\Core\Test\ICSharpCode.Core.Tests.csproj", "{AD6FAA08-D6F5-4DBA-AF85-F4DA9F40C3B5}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core.WinForms", "src\Main\ICSharpCode.Core.WinForms\ICSharpCode.Core.WinForms.csproj", "{857CA1A3-FC88-4BE0-AB6A-D1EE772AB288}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core", "src\Main\Core\Project\ICSharpCode.Core.csproj", "{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core.Presentation", "src\Main\ICSharpCode.Core.Presentation\ICSharpCode.Core.Presentation.csproj", "{7E4A7172-7FF5-48D0-B719-7CD959DD1AC9}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core.Presentation", "src\Main\ICSharpCode.Core.Presentation\ICSharpCode.Core.Presentation.csproj", "{7E4A7172-7FF5-48D0-B719-7CD959DD1AC9}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core.WinForms", "src\Main\ICSharpCode.Core.WinForms\ICSharpCode.Core.WinForms.csproj", "{857CA1A3-FC88-4BE0-AB6A-D1EE772AB288}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core", "src\Main\Core\Project\ICSharpCode.Core.csproj", "{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core.Tests", "src\Main\Core\Test\ICSharpCode.Core.Tests.csproj", "{AD6FAA08-D6F5-4DBA-AF85-F4DA9F40C3B5}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Dom", "src\Main\ICSharpCode.SharpDevelop.Dom\Project\ICSharpCode.SharpDevelop.Dom.csproj", "{924EE450-603D-49C1-A8E5-4AFAA31CE6F3}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Tests", "src\Main\Base\Test\ICSharpCode.SharpDevelop.Tests.csproj", "{4980B743-B32F-4aba-AABD-45E2CAD3568D}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Sda", "src\Main\ICSharpCode.SharpDevelop.Sda\ICSharpCode.SharpDevelop.Sda.csproj", "{80318B5F-A25D-45AB-8A95-EF31D2370A4C}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Dom.Tests", "src\Main\ICSharpCode.SharpDevelop.Dom\Tests\ICSharpCode.SharpDevelop.Dom.Tests\ICSharpCode.SharpDevelop.Dom.Tests.csproj", "{7DB80259-24D4-46C3-A024-53FF1987733D}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop", "src\Main\Base\Project\ICSharpCode.SharpDevelop.csproj", "{2748AD25-9C63-4E12-877B-4DCE96FBED54}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.BuildWorker", "src\Main\ICSharpCode.SharpDevelop.BuildWorker\ICSharpCode.SharpDevelop.BuildWorker.csproj", "{C3CBC8E3-81D8-4C5B-9941-DCCD12D50B1F}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Widgets", "src\Main\ICSharpCode.SharpDevelop.Widgets\Project\ICSharpCode.SharpDevelop.Widgets.csproj", "{8035765F-D51F-4A0C-A746-2FD100E19419}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.BuildWorker35", "src\Main\ICSharpCode.SharpDevelop.BuildWorker35\ICSharpCode.SharpDevelop.BuildWorker35.csproj", "{B5F54272-49F0-40DB-845A-8D837875D3BA}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartUp", "src\Main\StartUp\Project\StartUp.csproj", "{1152B71B-3C05-4598-B20D-823B5D40559E}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection @@ -72,304 +72,295 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{ ProjectSection(SolutionItems) = postProject EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.TreeView", "src\Libraries\SharpTreeView\ICSharpCode.TreeView\ICSharpCode.TreeView.csproj", "{DDE2A481-8271-4EAC-A330-8FA6A38D13D1}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Cecil", "src\Libraries\Mono.Cecil\Mono.Cecil.csproj", "{D68133BD-1E63-496E-9EDE-4FBDBF77B486}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.AvalonEdit.Tests", "src\Libraries\AvalonEdit\ICSharpCode.AvalonEdit.Tests\ICSharpCode.AvalonEdit.Tests.csproj", "{6222A3A1-83CE-47A3-A4E4-A018F82D44D8}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aga.Controls", "src\Libraries\TreeViewAdv\Aga.Controls\Aga.Controls.csproj", "{E73BB233-D88B-44A7-A98F-D71EE158381D}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NRefactory", "NRefactory", "{E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865}" + ProjectSection(SolutionItems) = postProject + EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Build.Tasks", "src\Libraries\ICSharpCode.Build.Tasks\Project\ICSharpCode.Build.Tasks.csproj", "{4139CCF6-FB49-4A9D-B2CF-331E9EA3198D}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactoryTests", "src\Libraries\NRefactory\Test\NRefactoryTests.csproj", "{870115DD-960A-4406-A6B9-600BCDC36A03}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.AvalonEdit", "src\Libraries\AvalonEdit\ICSharpCode.AvalonEdit\ICSharpCode.AvalonEdit.csproj", "{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactoryASTGenerator", "src\Libraries\NRefactory\NRefactoryASTGenerator\NRefactoryASTGenerator.csproj", "{B22522AA-B5BF-4A58-AC6D-D4B45805521F}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AvalonDock", "src\Libraries\AvalonDock\AvalonDock\AvalonDock.csproj", "{2FF700C2-A38A-48BD-A637-8CAFD4FE6237}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NRefactory", "NRefactory", "{E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865}" - ProjectSection(SolutionItems) = postProject - EndProjectSection -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactory", "src\Libraries\NRefactory\Project\NRefactory.csproj", "{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactoryASTGenerator", "src\Libraries\NRefactory\NRefactoryASTGenerator\NRefactoryASTGenerator.csproj", "{B22522AA-B5BF-4A58-AC6D-D4B45805521F}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AvalonDock", "src\Libraries\AvalonDock\AvalonDock\AvalonDock.csproj", "{2FF700C2-A38A-48BD-A637-8CAFD4FE6237}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.AvalonEdit", "src\Libraries\AvalonEdit\ICSharpCode.AvalonEdit\ICSharpCode.AvalonEdit.csproj", "{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactoryTests", "src\Libraries\NRefactory\Test\NRefactoryTests.csproj", "{870115DD-960A-4406-A6B9-600BCDC36A03}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Build.Tasks", "src\Libraries\ICSharpCode.Build.Tasks\Project\ICSharpCode.Build.Tasks.csproj", "{4139CCF6-FB49-4A9D-B2CF-331E9EA3198D}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.AvalonEdit.Tests", "src\Libraries\AvalonEdit\ICSharpCode.AvalonEdit.Tests\ICSharpCode.AvalonEdit.Tests.csproj", "{6222A3A1-83CE-47A3-A4E4-A018F82D44D8}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.TreeView", "src\Libraries\SharpTreeView\ICSharpCode.TreeView\ICSharpCode.TreeView.csproj", "{DDE2A481-8271-4EAC-A330-8FA6A38D13D1}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Cecil", "src\Libraries\Mono.Cecil\Mono.Cecil.csproj", "{D68133BD-1E63-496E-9EDE-4FBDBF77B486}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AddIns", "AddIns", "{39327899-ED91-4F7F-988C-4FE4E17C014D}" ProjectSection(SolutionItems) = postProject EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Analysis", "Analysis", "{F355E45F-F54F-4B42-8916-9A633A392789}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Version Control", "Version Control", "{F208FF4F-E5D8-41D5-A7C7-B463976F156E}" ProjectSection(SolutionItems) = postProject EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeQualityAnalysis", "src\AddIns\Analysis\CodeQuality\CodeQualityAnalysis.csproj", "{76DD1CC0-0D86-44A1-9BD6-D91F79807BC3}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitAddIn", "src\AddIns\VersionControl\GitAddIn\GitAddIn.csproj", "{83F15BA7-8478-4664-81BB-A82F146D88B3}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTesting.Tests", "src\AddIns\Analysis\UnitTesting\Test\UnitTesting.Tests.csproj", "{44A8DE09-CAB9-49D8-9CFC-5EB0A552F181}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SubversionAddIn", "src\AddIns\VersionControl\SubversionAddIn\SubversionAddIn.csproj", "{17F4D7E0-6933-4C2E-8714-FD7E98D625D5}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} - {1152B71B-3C05-4598-B20D-823B5D40559E} = {1152B71B-3C05-4598-B20D-823B5D40559E} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SourceAnalysis", "src\AddIns\Analysis\SourceAnalysis\SourceAnalysis.csproj", "{CE498514-D12D-4B6E-AE0E-FEC29BD43748}" - ProjectSection(ProjectDependencies) = postProject - {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Reports", "Reports", "{8789D7FF-B36C-4187-B57D-55ED64623272}" + ProjectSection(SolutionItems) = postProject EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeCoverage", "src\AddIns\Analysis\CodeCoverage\Project\CodeCoverage.csproj", "{08CE9972-283B-44F4-82FA-966F7DFA6B7A}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Reports.Addin.Test", "src\AddIns\Misc\Reports\ICSharpCode.Reports.Addin\Test\ICSharpCode.Reports.Addin.Test.csproj", "{2B232C7E-CFB6-4B73-A1B8-134A8A2ED4F7}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeAnalysis", "src\AddIns\Analysis\CodeAnalysis\CodeAnalysis.csproj", "{3EAA45A9-735C-4AC7-A799-947B93EA449D}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Reports.Addin", "src\AddIns\Misc\Reports\ICSharpCode.Reports.Addin\ICSharpCode.Reports.Addin.csproj", "{35D002D7-C78B-44FB-92AA-104BEB431678}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTesting", "src\AddIns\Analysis\UnitTesting\UnitTesting.csproj", "{1F261725-6318-4434-A1B1-6C70CE4CD324}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Reports.Core.Test", "src\AddIns\Misc\Reports\ICSharpCode.Reports.Core\Test\ICSharpCode.Reports.Core.Test\ICSharpCode.Reports.Core.Test.csproj", "{E16B73CA-3603-47EE-915E-6F8B2A07304B}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeCoverage.Tests", "src\AddIns\Analysis\CodeCoverage\Test\CodeCoverage.Tests.csproj", "{A5C0E8F8-9D04-46ED-91D6-1DEF1575313B}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Reports.Core", "src\AddIns\Misc\Reports\ICSharpCode.Reports.Core\ICSharpCode.Reports.Core.csproj", "{4B2239FF-8FD6-431D-9D22-1B8049BA6917}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Display Bindings", "Display Bindings", "{11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}" - ProjectSection(SolutionItems) = postProject - EndProjectSection +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Irony", "src\AddIns\Misc\Reports\Irony\Irony.csproj", "{D81F5C91-D7DB-46E5-BC99-49488FB6814C}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WpfDesign", "WpfDesign", "{6022AC51-B658-4C54-97EF-79187AC65B47}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Profiler", "Profiler", "{C4035C32-026F-4158-AF15-113EA1EF1960}" ProjectSection(SolutionItems) = postProject EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.XamlDom", "src\AddIns\DisplayBindings\WpfDesign\WpfDesign.XamlDom\Project\WpfDesign.XamlDom.csproj", "{88DA149F-21B2-48AB-82C4-28FB6BDFD783}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.AddIn", "src\AddIns\Analysis\Profiler\Frontend\AddIn\Profiler.AddIn.csproj", "{D294A12D-4B38-4F25-9AA6-3D4A6CE26E7B}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} + {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} = {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.Tests", "src\AddIns\DisplayBindings\WpfDesign\WpfDesign.Designer\Tests\WpfDesign.Tests.csproj", "{943DBBB3-E84E-4CF4-917C-C05AFA8743C1}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.Controls", "src\AddIns\Analysis\Profiler\Frontend\Controls\Profiler.Controls.csproj", "{BDA49550-5ED1-4C6B-B648-657B2CACD8E0}" ProjectSection(ProjectDependencies) = postProject + {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} = {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.Designer", "src\AddIns\DisplayBindings\WpfDesign\WpfDesign.Designer\Project\WpfDesign.Designer.csproj", "{78CC29AC-CC79-4355-B1F2-97936DF198AC}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.Controller", "src\AddIns\Analysis\Profiler\Controller\Profiler.Controller.csproj", "{72FFB35A-C9E2-4A31-B4FA-E3E3E28DED5F}" ProjectSection(ProjectDependencies) = postProject + {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} = {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.AddIn", "src\AddIns\DisplayBindings\WpfDesign\WpfDesign.AddIn\WpfDesign.AddIn.csproj", "{9A9D6FD4-6A2E-455D-ACC3-DDA775FE9865}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.X64Converter", "src\AddIns\Analysis\Profiler\X64Converter\Profiler.X64Converter.csproj", "{FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign", "src\AddIns\DisplayBindings\WpfDesign\WpfDesign\Project\WpfDesign.csproj", "{66A378A1-E9F4-4AD5-8946-D0EC06C2902F}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.Tests", "src\AddIns\Analysis\Profiler\Tests\Profiler.Tests\Profiler.Tests.csproj", "{068F9531-5D29-49E0-980E-59982A3A0469}" ProjectSection(ProjectDependencies) = postProject + {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} = {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XmlEditor.Tests", "src\AddIns\DisplayBindings\XmlEditor\Test\XmlEditor.Tests.csproj", "{FC0FE702-A87D-4D70-A9B6-1ECCD611125F}" - ProjectSection(ProjectDependencies) = postProject - {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Language Bindings", "Language Bindings", "{E0646C25-36F2-4524-969F-FA621353AB94}" + ProjectSection(SolutionItems) = postProject EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IconEditor", "IconEditor", "{0773ED53-08E2-4495-A3BE-CA0B5D413C15}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Ruby", "Ruby", "{C7288E72-FFBE-48CD-84B4-6CBF95A7195A}" ProjectSection(SolutionItems) = postProject EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IconEditorAddIn", "src\AddIns\DisplayBindings\IconEditor\IconEditorAddIn\IconEditorAddIn.csproj", "{DFB936AD-90EE-4B4F-941E-4F4A636F0D92}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RubyBinding.Tests", "src\AddIns\BackendBindings\Ruby\RubyBinding\Test\RubyBinding.Tests.csproj", "{01DF0475-0CB2-4E81-971B-BADC60CDE3A5}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IconEditor", "src\AddIns\DisplayBindings\IconEditor\IconEditor\IconEditor.csproj", "{DC1CCE11-CB91-40FA-9C47-4D9EB5D67BFD}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RubyBinding", "src\AddIns\BackendBindings\Ruby\RubyBinding\Project\RubyBinding.csproj", "{C896FFFF-5B6C-4B0E-B6DF-049865F501B4}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HexEditor", "src\AddIns\DisplayBindings\HexEditor\Project\HexEditor.csproj", "{E618A9CD-A39F-4925-A538-E8A3FEF24E54}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CppBinding", "src\AddIns\BackendBindings\CppBinding\CppBinding\CppBinding.csproj", "{70966F84-74C9-4067-A379-0C674A929233}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceEditor", "src\AddIns\DisplayBindings\ResourceEditor\Project\ResourceEditor.csproj", "{CBC6C247-747B-4908-B09A-4D2E0F640B6B}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpBinding.Tests", "src\AddIns\BackendBindings\CSharpBinding\Tests\CSharpBinding.Tests.csproj", "{52006F3F-3156-45DE-89D8-C4813694FBA4}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AvalonEdit.AddIn", "src\AddIns\DisplayBindings\AvalonEdit.AddIn\AvalonEdit.AddIn.csproj", "{0162E499-42D0-409B-AA25-EED21F75336B}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VBNetBinding.Tests", "src\AddIns\BackendBindings\VBNetBinding\Test\VBNetBinding.Tests.csproj", "{50A89267-A28B-4DF3-8E62-912E005143B8}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XmlEditor", "src\AddIns\DisplayBindings\XmlEditor\Project\XmlEditor.csproj", "{DCA2703D-250A-463E-A68A-07ED105AE6BD}" - ProjectSection(ProjectDependencies) = postProject - {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Boo", "Boo", "{97B3B514-AB0E-4FE1-89DE-8A945F5112AE}" + ProjectSection(SolutionItems) = postProject EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FormsDesigner", "src\AddIns\DisplayBindings\FormsDesigner\Project\FormsDesigner.csproj", "{7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BooBinding.Tests", "src\AddIns\BackendBindings\Boo\BooBinding\Test\BooBinding.Tests.csproj", "{6FA16499-896F-4C02-BB43-1AF5C6C7C713}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ClassDiagram", "ClassDiagram", "{BFA3BF26-33BD-4A65-B84D-C7F30D131668}" - ProjectSection(SolutionItems) = postProject - EndProjectSection -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassCanvas", "src\AddIns\DisplayBindings\ClassDiagram\ClassCanvas\ClassCanvas.csproj", "{08F772A1-F0BE-433E-8B37-F6522953DB05}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BooBinding", "src\AddIns\BackendBindings\Boo\BooBinding\Project\BooBinding.csproj", "{4AC2D5F1-F671-480C-A075-6BF62B3721B2}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassDiagramAddin", "src\AddIns\DisplayBindings\ClassDiagram\ClassDiagramAddin\ClassDiagramAddin.csproj", "{5A1354DF-4989-4BB4-BC6B-D627C2E9FA13}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactoryToBooConverter", "src\AddIns\BackendBindings\Boo\NRefactoryToBooConverter\Project\NRefactoryToBooConverter.csproj", "{DBCF20A1-BA13-4582-BFA9-74DE4D987B73}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Diagrams", "src\AddIns\DisplayBindings\ClassDiagram\DiagramRouter\Diagrams.csproj", "{0991423A-DBF6-4C89-B365-A1DF1EB32E42}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactoryToBooConverter.Tests", "src\AddIns\BackendBindings\Boo\NRefactoryToBooConverter\Test\NRefactoryToBooConverter.Tests.csproj", "{C9DE556D-325C-4544-B29F-16A9EB7C9830}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Data", "Data", "{C7F29FC2-1B03-4CDD-9E30-400F4765FF04}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Python", "Python", "{CA76F702-5B4E-4918-B8D8-7FF8382434FF}" ProjectSection(SolutionItems) = postProject EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.Addin", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.Addin\ICSharpCode.Data.Addin.csproj", "{A9F12710-24E4-46D4-832C-6ECB395B9EAD}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PythonBinding.Tests", "src\AddIns\BackendBindings\Python\PythonBinding\Test\PythonBinding.Tests.csproj", "{23B517C9-1ECC-4419-A13F-0B7136D085CB}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.Core", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.Core\ICSharpCode.Data.Core.csproj", "{B7823AE9-4B43-4859-8796-2EBDC116FBB8}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Python.Build.Tasks.Tests", "src\AddIns\BackendBindings\Python\Python.Build.Tasks\Test\Python.Build.Tasks.Tests.csproj", "{833904AB-3CD4-4071-9B48-5770E44685AA}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.Core.UI", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.Core.UI\ICSharpCode.Data.Core.UI.csproj", "{BAD94D6E-4159-4CB6-B991-486F412D9BB6}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Python.Build.Tasks", "src\AddIns\BackendBindings\Python\Python.Build.Tasks\Project\Python.Build.Tasks.csproj", "{D332F2D1-2CF1-43B7-903C-844BD5211A7E}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.EDMDesigner.Core", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.EDMDesigner.Core\ICSharpCode.Data.EDMDesigner.Core.csproj", "{5C70D6AB-0A33-43F9-B8B5-54558C35BBB1}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PythonBinding", "src\AddIns\BackendBindings\Python\PythonBinding\Project\PythonBinding.csproj", "{8D732610-8FC6-43BA-94C9-7126FD7FE361}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.EDMDesigner.Core.UI", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.EDMDesigner.Core.UI\ICSharpCode.Data.EDMDesigner.Core.UI.csproj", "{EEF5E054-4192-4A57-8FBF-E860D808A51D}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixBinding", "src\AddIns\BackendBindings\WixBinding\Project\WixBinding.csproj", "{E1B288A2-08EE-4318-8BBB-8AB72C69E33E}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.SQLServer", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.SQLServer\ICSharpCode.Data.SQLServer.csproj", "{AFE34868-AFA1-4E1C-9450-47AB4BE329D5}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpBinding", "src\AddIns\BackendBindings\CSharpBinding\Project\CSharpBinding.csproj", "{1F1AC7CD-D154-45BB-8EAF-804CA8055F5A}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SettingsEditor", "src\AddIns\DisplayBindings\SettingsEditor\Project\SettingsEditor.csproj", "{85226AFB-CE71-4851-9A75-7EEC663A8E8A}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VBNetBinding", "src\AddIns\BackendBindings\VBNetBinding\Project\VBNetBinding.csproj", "{BF38FB72-B380-4196-AF8C-95749D726C61}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Misc", "Misc", "{F3662720-9EA2-4591-BBC6-97361DCE50A9}" - ProjectSection(SolutionItems) = postProject - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PackageManagement", "PackageManagement", "{C6410CCE-C29F-4BF4-94BF-545DE1CBB144}" - ProjectSection(SolutionItems) = postProject - EndProjectSection -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PackageManagement.PowerShell", "src\AddIns\Misc\PackageManagement\PowerShell\Project\PackageManagement.PowerShell.csproj", "{A406803B-C584-43A3-BCEE-A0BB3132CB5F}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PackageManagement.Cmdlets.Tests", "src\AddIns\Misc\PackageManagement\Cmdlets\Test\PackageManagement.Cmdlets.Tests.csproj", "{11115C83-3DB1-431F-8B98-59040359238D}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PackageManagement.Cmdlets", "src\AddIns\Misc\PackageManagement\Cmdlets\Project\PackageManagement.Cmdlets.csproj", "{E0A5E80A-003B-4335-A9DC-A76E2E46D38D}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PackageManagement.Tests", "src\AddIns\Misc\PackageManagement\Test\PackageManagement.Tests.csproj", "{56E98A01-8398-4A08-9578-C7337711A52B}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamlBinding", "src\AddIns\BackendBindings\XamlBinding\XamlBinding\XamlBinding.csproj", "{7C96B65D-28A5-4F28-A35B-8D83CE831EE8}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PackageManagement", "src\AddIns\Misc\PackageManagement\Project\PackageManagement.csproj", "{AE4AB0FA-6087-4480-AF37-0FA1452B3DA1}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamlBinding.Tests", "src\AddIns\BackendBindings\XamlBinding\XamlBinding.Tests\XamlBinding.Tests.csproj", "{F390DA70-1FE1-4715-81A0-389AB010C130}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UsageDataCollector", "UsageDataCollector", "{DEFC8584-BEC3-4921-BD0F-40482E450B7B}" - ProjectSection(SolutionItems) = postProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixBinding.Tests", "src\AddIns\BackendBindings\WixBinding\Test\WixBinding.Tests.csproj", "{388E7B64-0393-4EB4-A3E3-5C474F141853}" + ProjectSection(ProjectDependencies) = postProject + {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UsageDataCollector.AddIn", "src\AddIns\Misc\UsageDataCollector\UsageDataCollector.AddIn\UsageDataCollector.AddIn.csproj", "{0008FCE9-9EB4-4E2E-979B-553278E5BBA6}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSharpBinding", "src\AddIns\BackendBindings\FSharpBinding\FSharpBinding.csproj", "{E954F3CB-A446-492F-A664-2B376EBC86E8}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UsageDataCollector", "src\AddIns\Misc\UsageDataCollector\UsageDataCollector\UsageDataCollector.csproj", "{6B1CFE35-DA17-4DEB-9C6E-227E5E251DA0}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Scripting", "src\AddIns\BackendBindings\Scripting\Project\ICSharpCode.Scripting.csproj", "{7048AE18-EB93-4A84-82D0-DD60EB58ADBD}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SearchAndReplace.Tests", "src\AddIns\Misc\SearchAndReplace\Test\SearchAndReplace.Tests.csproj", "{A569DCC1-C608-45FD-B770-4F79335EF154}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Scripting.Tests", "src\AddIns\BackendBindings\Scripting\Test\ICSharpCode.Scripting.Tests.csproj", "{85C09AD8-183B-403A-869A-7226646218A9}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceToolkit.Tests", "src\AddIns\Misc\ResourceToolkit\Test\ResourceToolkit.Tests.csproj", "{DD9AE6A5-2B9D-443A-BC71-38BE578C36BD}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Debugger", "Debugger", "{CDE0C5A4-2096-48B5-BEA3-74DBA0F0E1EF}" + ProjectSection(SolutionItems) = postProject + EndProjectSection +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.Tests", "src\AddIns\Debugger\Debugger.Tests\Debugger.Tests.csproj", "{A4C858C8-51B6-4265-A695-A20FCEBA1D19}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceToolkit", "src\AddIns\Misc\ResourceToolkit\Project\ResourceToolkit.csproj", "{461606BD-E824-4D0A-8CBA-01810B1F5E02}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.Core", "src\AddIns\Debugger\Debugger.Core\Debugger.Core.csproj", "{1D18D788-F7EE-4585-A23B-34DC8EC63CB8}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RegExpTk", "src\AddIns\Misc\RegExpTk\Project\RegExpTk.csproj", "{64A3E5E6-90BF-47F6-94DF-68C94B62C817}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.AddIn", "src\AddIns\Debugger\Debugger.AddIn\Debugger.AddIn.csproj", "{EC06F96A-AEEC-49D6-B03D-AB87C6EB674C}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PInvokeAddIn", "src\AddIns\Misc\PInvokeAddIn\Project\PInvokeAddIn.csproj", "{5EEB99CF-EA2B-4733-80A6-CE9192D68170}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Misc", "Misc", "{F3662720-9EA2-4591-BBC6-97361DCE50A9}" + ProjectSection(SolutionItems) = postProject + EndProjectSection +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextTemplating.Tests", "src\AddIns\Misc\TextTemplating\Test\TextTemplating.Tests.csproj", "{5186325C-DD7F-4246-9BE7-3F384EFBF5A6}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextTemplating", "src\AddIns\Misc\TextTemplating\Project\TextTemplating.csproj", "{B5D8C3E6-42EC-4D4B-AD05-3644B32563EF}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelpViewer", "src\AddIns\Misc\HelpViewer\HelpViewer.csproj", "{80F76D10-0B44-4D55-B4BD-DAEB5464090C}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FiletypeRegisterer", "src\AddIns\Misc\FiletypeRegisterer\Project\FiletypeRegisterer.csproj", "{D022A6CE-7438-41E8-AC64-F2DE18EC54C6}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpRefactoring.Tests", "src\AddIns\Misc\SharpRefactoring\Test\SharpRefactoring.Tests.csproj", "{A4AA51DE-A096-47EC-AA5D-D91457834ECF}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AddinScout", "src\AddIns\Misc\AddinScout\Project\AddinScout.csproj", "{4B8F0F98-8BE1-402B-AA8B-C8D548577B38}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpRefactoring", "src\AddIns\Misc\SharpRefactoring\Project\SharpRefactoring.csproj", "{3CA90546-3B4C-4663-9445-C4E9371750A7}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AddInManager", "src\AddIns\Misc\AddInManager\Project\AddInManager.csproj", "{F93E52FD-DA66-4CE5-A0CB-BCD902811122}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SearchAndReplace", "src\AddIns\Misc\SearchAndReplace\Project\SearchAndReplace.csproj", "{9196DD8A-B4D4-4780-8742-C5762E547FC2}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection @@ -379,244 +370,251 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartPage", "src\AddIns\Mis {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SearchAndReplace", "src\AddIns\Misc\SearchAndReplace\Project\SearchAndReplace.csproj", "{9196DD8A-B4D4-4780-8742-C5762E547FC2}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AddInManager", "src\AddIns\Misc\AddInManager\Project\AddInManager.csproj", "{F93E52FD-DA66-4CE5-A0CB-BCD902811122}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpRefactoring", "src\AddIns\Misc\SharpRefactoring\Project\SharpRefactoring.csproj", "{3CA90546-3B4C-4663-9445-C4E9371750A7}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AddinScout", "src\AddIns\Misc\AddinScout\Project\AddinScout.csproj", "{4B8F0F98-8BE1-402B-AA8B-C8D548577B38}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpRefactoring.Tests", "src\AddIns\Misc\SharpRefactoring\Test\SharpRefactoring.Tests.csproj", "{A4AA51DE-A096-47EC-AA5D-D91457834ECF}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FiletypeRegisterer", "src\AddIns\Misc\FiletypeRegisterer\Project\FiletypeRegisterer.csproj", "{D022A6CE-7438-41E8-AC64-F2DE18EC54C6}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelpViewer", "src\AddIns\Misc\HelpViewer\HelpViewer.csproj", "{80F76D10-0B44-4D55-B4BD-DAEB5464090C}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PInvokeAddIn", "src\AddIns\Misc\PInvokeAddIn\Project\PInvokeAddIn.csproj", "{5EEB99CF-EA2B-4733-80A6-CE9192D68170}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextTemplating", "src\AddIns\Misc\TextTemplating\Project\TextTemplating.csproj", "{B5D8C3E6-42EC-4D4B-AD05-3644B32563EF}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextTemplating.Tests", "src\AddIns\Misc\TextTemplating\Test\TextTemplating.Tests.csproj", "{5186325C-DD7F-4246-9BE7-3F384EFBF5A6}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Debugger", "Debugger", "{CDE0C5A4-2096-48B5-BEA3-74DBA0F0E1EF}" - ProjectSection(SolutionItems) = postProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RegExpTk", "src\AddIns\Misc\RegExpTk\Project\RegExpTk.csproj", "{64A3E5E6-90BF-47F6-94DF-68C94B62C817}" + ProjectSection(ProjectDependencies) = postProject + {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.AddIn", "src\AddIns\Debugger\Debugger.AddIn\Debugger.AddIn.csproj", "{EC06F96A-AEEC-49D6-B03D-AB87C6EB674C}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceToolkit", "src\AddIns\Misc\ResourceToolkit\Project\ResourceToolkit.csproj", "{461606BD-E824-4D0A-8CBA-01810B1F5E02}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.Core", "src\AddIns\Debugger\Debugger.Core\Debugger.Core.csproj", "{1D18D788-F7EE-4585-A23B-34DC8EC63CB8}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceToolkit.Tests", "src\AddIns\Misc\ResourceToolkit\Test\ResourceToolkit.Tests.csproj", "{DD9AE6A5-2B9D-443A-BC71-38BE578C36BD}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.Tests", "src\AddIns\Debugger\Debugger.Tests\Debugger.Tests.csproj", "{A4C858C8-51B6-4265-A695-A20FCEBA1D19}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SearchAndReplace.Tests", "src\AddIns\Misc\SearchAndReplace\Test\SearchAndReplace.Tests.csproj", "{A569DCC1-C608-45FD-B770-4F79335EF154}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Language Bindings", "Language Bindings", "{E0646C25-36F2-4524-969F-FA621353AB94}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UsageDataCollector", "UsageDataCollector", "{DEFC8584-BEC3-4921-BD0F-40482E450B7B}" ProjectSection(SolutionItems) = postProject EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Scripting.Tests", "src\AddIns\BackendBindings\Scripting\Test\ICSharpCode.Scripting.Tests.csproj", "{85C09AD8-183B-403A-869A-7226646218A9}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UsageDataCollector", "src\AddIns\Misc\UsageDataCollector\UsageDataCollector\UsageDataCollector.csproj", "{6B1CFE35-DA17-4DEB-9C6E-227E5E251DA0}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Scripting", "src\AddIns\BackendBindings\Scripting\Project\ICSharpCode.Scripting.csproj", "{7048AE18-EB93-4A84-82D0-DD60EB58ADBD}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UsageDataCollector.AddIn", "src\AddIns\Misc\UsageDataCollector\UsageDataCollector.AddIn\UsageDataCollector.AddIn.csproj", "{0008FCE9-9EB4-4E2E-979B-553278E5BBA6}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSharpBinding", "src\AddIns\BackendBindings\FSharpBinding\FSharpBinding.csproj", "{E954F3CB-A446-492F-A664-2B376EBC86E8}" - ProjectSection(ProjectDependencies) = postProject - {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PackageManagement", "PackageManagement", "{C6410CCE-C29F-4BF4-94BF-545DE1CBB144}" + ProjectSection(SolutionItems) = postProject EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixBinding.Tests", "src\AddIns\BackendBindings\WixBinding\Test\WixBinding.Tests.csproj", "{388E7B64-0393-4EB4-A3E3-5C474F141853}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PackageManagement", "src\AddIns\Misc\PackageManagement\Project\PackageManagement.csproj", "{AE4AB0FA-6087-4480-AF37-0FA1452B3DA1}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamlBinding.Tests", "src\AddIns\BackendBindings\XamlBinding\XamlBinding.Tests\XamlBinding.Tests.csproj", "{F390DA70-1FE1-4715-81A0-389AB010C130}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PackageManagement.Tests", "src\AddIns\Misc\PackageManagement\Test\PackageManagement.Tests.csproj", "{56E98A01-8398-4A08-9578-C7337711A52B}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamlBinding", "src\AddIns\BackendBindings\XamlBinding\XamlBinding\XamlBinding.csproj", "{7C96B65D-28A5-4F28-A35B-8D83CE831EE8}" - ProjectSection(ProjectDependencies) = postProject - {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PackageManagement.Cmdlets", "src\AddIns\Misc\PackageManagement\Cmdlets\Project\PackageManagement.Cmdlets.csproj", "{E0A5E80A-003B-4335-A9DC-A76E2E46D38D}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PackageManagement.Cmdlets.Tests", "src\AddIns\Misc\PackageManagement\Cmdlets\Test\PackageManagement.Cmdlets.Tests.csproj", "{11115C83-3DB1-431F-8B98-59040359238D}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PackageManagement.PowerShell", "src\AddIns\Misc\PackageManagement\PowerShell\Project\PackageManagement.PowerShell.csproj", "{A406803B-C584-43A3-BCEE-A0BB3132CB5F}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Display Bindings", "Display Bindings", "{11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}" + ProjectSection(SolutionItems) = postProject EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VBNetBinding", "src\AddIns\BackendBindings\VBNetBinding\Project\VBNetBinding.csproj", "{BF38FB72-B380-4196-AF8C-95749D726C61}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SettingsEditor", "src\AddIns\DisplayBindings\SettingsEditor\Project\SettingsEditor.csproj", "{85226AFB-CE71-4851-9A75-7EEC663A8E8A}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpBinding", "src\AddIns\BackendBindings\CSharpBinding\Project\CSharpBinding.csproj", "{1F1AC7CD-D154-45BB-8EAF-804CA8055F5A}" - ProjectSection(ProjectDependencies) = postProject - {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Data", "Data", "{C7F29FC2-1B03-4CDD-9E30-400F4765FF04}" + ProjectSection(SolutionItems) = postProject EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixBinding", "src\AddIns\BackendBindings\WixBinding\Project\WixBinding.csproj", "{E1B288A2-08EE-4318-8BBB-8AB72C69E33E}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.SQLServer", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.SQLServer\ICSharpCode.Data.SQLServer.csproj", "{AFE34868-AFA1-4E1C-9450-47AB4BE329D5}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Python", "Python", "{CA76F702-5B4E-4918-B8D8-7FF8382434FF}" - ProjectSection(SolutionItems) = postProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.EDMDesigner.Core.UI", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.EDMDesigner.Core.UI\ICSharpCode.Data.EDMDesigner.Core.UI.csproj", "{EEF5E054-4192-4A57-8FBF-E860D808A51D}" + ProjectSection(ProjectDependencies) = postProject + {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PythonBinding", "src\AddIns\BackendBindings\Python\PythonBinding\Project\PythonBinding.csproj", "{8D732610-8FC6-43BA-94C9-7126FD7FE361}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.EDMDesigner.Core", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.EDMDesigner.Core\ICSharpCode.Data.EDMDesigner.Core.csproj", "{5C70D6AB-0A33-43F9-B8B5-54558C35BBB1}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Python.Build.Tasks", "src\AddIns\BackendBindings\Python\Python.Build.Tasks\Project\Python.Build.Tasks.csproj", "{D332F2D1-2CF1-43B7-903C-844BD5211A7E}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.Core.UI", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.Core.UI\ICSharpCode.Data.Core.UI.csproj", "{BAD94D6E-4159-4CB6-B991-486F412D9BB6}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Python.Build.Tasks.Tests", "src\AddIns\BackendBindings\Python\Python.Build.Tasks\Test\Python.Build.Tasks.Tests.csproj", "{833904AB-3CD4-4071-9B48-5770E44685AA}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.Core", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.Core\ICSharpCode.Data.Core.csproj", "{B7823AE9-4B43-4859-8796-2EBDC116FBB8}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PythonBinding.Tests", "src\AddIns\BackendBindings\Python\PythonBinding\Test\PythonBinding.Tests.csproj", "{23B517C9-1ECC-4419-A13F-0B7136D085CB}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.Addin", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.Addin\ICSharpCode.Data.Addin.csproj", "{A9F12710-24E4-46D4-832C-6ECB395B9EAD}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Boo", "Boo", "{97B3B514-AB0E-4FE1-89DE-8A945F5112AE}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ClassDiagram", "ClassDiagram", "{BFA3BF26-33BD-4A65-B84D-C7F30D131668}" ProjectSection(SolutionItems) = postProject EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactoryToBooConverter.Tests", "src\AddIns\BackendBindings\Boo\NRefactoryToBooConverter\Test\NRefactoryToBooConverter.Tests.csproj", "{C9DE556D-325C-4544-B29F-16A9EB7C9830}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Diagrams", "src\AddIns\DisplayBindings\ClassDiagram\DiagramRouter\Diagrams.csproj", "{0991423A-DBF6-4C89-B365-A1DF1EB32E42}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactoryToBooConverter", "src\AddIns\BackendBindings\Boo\NRefactoryToBooConverter\Project\NRefactoryToBooConverter.csproj", "{DBCF20A1-BA13-4582-BFA9-74DE4D987B73}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassDiagramAddin", "src\AddIns\DisplayBindings\ClassDiagram\ClassDiagramAddin\ClassDiagramAddin.csproj", "{5A1354DF-4989-4BB4-BC6B-D627C2E9FA13}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BooBinding", "src\AddIns\BackendBindings\Boo\BooBinding\Project\BooBinding.csproj", "{4AC2D5F1-F671-480C-A075-6BF62B3721B2}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassCanvas", "src\AddIns\DisplayBindings\ClassDiagram\ClassCanvas\ClassCanvas.csproj", "{08F772A1-F0BE-433E-8B37-F6522953DB05}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BooBinding.Tests", "src\AddIns\BackendBindings\Boo\BooBinding\Test\BooBinding.Tests.csproj", "{6FA16499-896F-4C02-BB43-1AF5C6C7C713}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FormsDesigner", "src\AddIns\DisplayBindings\FormsDesigner\Project\FormsDesigner.csproj", "{7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VBNetBinding.Tests", "src\AddIns\BackendBindings\VBNetBinding\Test\VBNetBinding.Tests.csproj", "{50A89267-A28B-4DF3-8E62-912E005143B8}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XmlEditor", "src\AddIns\DisplayBindings\XmlEditor\Project\XmlEditor.csproj", "{DCA2703D-250A-463E-A68A-07ED105AE6BD}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpBinding.Tests", "src\AddIns\BackendBindings\CSharpBinding\Tests\CSharpBinding.Tests.csproj", "{52006F3F-3156-45DE-89D8-C4813694FBA4}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AvalonEdit.AddIn", "src\AddIns\DisplayBindings\AvalonEdit.AddIn\AvalonEdit.AddIn.csproj", "{0162E499-42D0-409B-AA25-EED21F75336B}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CppBinding", "src\AddIns\BackendBindings\CppBinding\CppBinding\CppBinding.csproj", "{70966F84-74C9-4067-A379-0C674A929233}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceEditor", "src\AddIns\DisplayBindings\ResourceEditor\Project\ResourceEditor.csproj", "{CBC6C247-747B-4908-B09A-4D2E0F640B6B}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Ruby", "Ruby", "{C7288E72-FFBE-48CD-84B4-6CBF95A7195A}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HexEditor", "src\AddIns\DisplayBindings\HexEditor\Project\HexEditor.csproj", "{E618A9CD-A39F-4925-A538-E8A3FEF24E54}" + ProjectSection(ProjectDependencies) = postProject + {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IconEditor", "IconEditor", "{0773ED53-08E2-4495-A3BE-CA0B5D413C15}" ProjectSection(SolutionItems) = postProject EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RubyBinding", "src\AddIns\BackendBindings\Ruby\RubyBinding\Project\RubyBinding.csproj", "{C896FFFF-5B6C-4B0E-B6DF-049865F501B4}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IconEditor", "src\AddIns\DisplayBindings\IconEditor\IconEditor\IconEditor.csproj", "{DC1CCE11-CB91-40FA-9C47-4D9EB5D67BFD}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RubyBinding.Tests", "src\AddIns\BackendBindings\Ruby\RubyBinding\Test\RubyBinding.Tests.csproj", "{01DF0475-0CB2-4E81-971B-BADC60CDE3A5}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IconEditorAddIn", "src\AddIns\DisplayBindings\IconEditor\IconEditorAddIn\IconEditorAddIn.csproj", "{DFB936AD-90EE-4B4F-941E-4F4A636F0D92}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Profiler", "Profiler", "{C4035C32-026F-4158-AF15-113EA1EF1960}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XmlEditor.Tests", "src\AddIns\DisplayBindings\XmlEditor\Test\XmlEditor.Tests.csproj", "{FC0FE702-A87D-4D70-A9B6-1ECCD611125F}" + ProjectSection(ProjectDependencies) = postProject + {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WpfDesign", "WpfDesign", "{6022AC51-B658-4C54-97EF-79187AC65B47}" ProjectSection(SolutionItems) = postProject EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.Tests", "src\AddIns\Analysis\Profiler\Tests\Profiler.Tests\Profiler.Tests.csproj", "{068F9531-5D29-49E0-980E-59982A3A0469}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign", "src\AddIns\DisplayBindings\WpfDesign\WpfDesign\Project\WpfDesign.csproj", "{66A378A1-E9F4-4AD5-8946-D0EC06C2902F}" ProjectSection(ProjectDependencies) = postProject - {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} = {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.X64Converter", "src\AddIns\Analysis\Profiler\X64Converter\Profiler.X64Converter.csproj", "{FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.AddIn", "src\AddIns\DisplayBindings\WpfDesign\WpfDesign.AddIn\WpfDesign.AddIn.csproj", "{9A9D6FD4-6A2E-455D-ACC3-DDA775FE9865}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.Controller", "src\AddIns\Analysis\Profiler\Controller\Profiler.Controller.csproj", "{72FFB35A-C9E2-4A31-B4FA-E3E3E28DED5F}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.Designer", "src\AddIns\DisplayBindings\WpfDesign\WpfDesign.Designer\Project\WpfDesign.Designer.csproj", "{78CC29AC-CC79-4355-B1F2-97936DF198AC}" ProjectSection(ProjectDependencies) = postProject - {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} = {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.Controls", "src\AddIns\Analysis\Profiler\Frontend\Controls\Profiler.Controls.csproj", "{BDA49550-5ED1-4C6B-B648-657B2CACD8E0}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.Tests", "src\AddIns\DisplayBindings\WpfDesign\WpfDesign.Designer\Tests\WpfDesign.Tests.csproj", "{943DBBB3-E84E-4CF4-917C-C05AFA8743C1}" ProjectSection(ProjectDependencies) = postProject - {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} = {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.AddIn", "src\AddIns\Analysis\Profiler\Frontend\AddIn\Profiler.AddIn.csproj", "{D294A12D-4B38-4F25-9AA6-3D4A6CE26E7B}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.XamlDom", "src\AddIns\DisplayBindings\WpfDesign\WpfDesign.XamlDom\Project\WpfDesign.XamlDom.csproj", "{88DA149F-21B2-48AB-82C4-28FB6BDFD783}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} - {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} = {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Reports", "Reports", "{8789D7FF-B36C-4187-B57D-55ED64623272}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Analysis", "Analysis", "{F355E45F-F54F-4B42-8916-9A633A392789}" ProjectSection(SolutionItems) = postProject EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Irony", "src\AddIns\Misc\Reports\Irony\Irony.csproj", "{D81F5C91-D7DB-46E5-BC99-49488FB6814C}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Reports.Core", "src\AddIns\Misc\Reports\ICSharpCode.Reports.Core\ICSharpCode.Reports.Core.csproj", "{4B2239FF-8FD6-431D-9D22-1B8049BA6917}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeCoverage.Tests", "src\AddIns\Analysis\CodeCoverage\Test\CodeCoverage.Tests.csproj", "{A5C0E8F8-9D04-46ED-91D6-1DEF1575313B}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Reports.Core.Test", "src\AddIns\Misc\Reports\ICSharpCode.Reports.Core\Test\ICSharpCode.Reports.Core.Test\ICSharpCode.Reports.Core.Test.csproj", "{E16B73CA-3603-47EE-915E-6F8B2A07304B}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTesting", "src\AddIns\Analysis\UnitTesting\UnitTesting.csproj", "{1F261725-6318-4434-A1B1-6C70CE4CD324}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Reports.Addin", "src\AddIns\Misc\Reports\ICSharpCode.Reports.Addin\ICSharpCode.Reports.Addin.csproj", "{35D002D7-C78B-44FB-92AA-104BEB431678}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeAnalysis", "src\AddIns\Analysis\CodeAnalysis\CodeAnalysis.csproj", "{3EAA45A9-735C-4AC7-A799-947B93EA449D}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Reports.Addin.Test", "src\AddIns\Misc\Reports\ICSharpCode.Reports.Addin\Test\ICSharpCode.Reports.Addin.Test.csproj", "{2B232C7E-CFB6-4B73-A1B8-134A8A2ED4F7}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeCoverage", "src\AddIns\Analysis\CodeCoverage\Project\CodeCoverage.csproj", "{08CE9972-283B-44F4-82FA-966F7DFA6B7A}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Version Control", "Version Control", "{F208FF4F-E5D8-41D5-A7C7-B463976F156E}" - ProjectSection(SolutionItems) = postProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SourceAnalysis", "src\AddIns\Analysis\SourceAnalysis\SourceAnalysis.csproj", "{CE498514-D12D-4B6E-AE0E-FEC29BD43748}" + ProjectSection(ProjectDependencies) = postProject + {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SubversionAddIn", "src\AddIns\VersionControl\SubversionAddIn\SubversionAddIn.csproj", "{17F4D7E0-6933-4C2E-8714-FD7E98D625D5}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTesting.Tests", "src\AddIns\Analysis\UnitTesting\Test\UnitTesting.Tests.csproj", "{44A8DE09-CAB9-49D8-9CFC-5EB0A552F181}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} + {1152B71B-3C05-4598-B20D-823B5D40559E} = {1152B71B-3C05-4598-B20D-823B5D40559E} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitAddIn", "src\AddIns\VersionControl\GitAddIn\GitAddIn.csproj", "{83F15BA7-8478-4664-81BB-A82F146D88B3}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeQualityAnalysis", "src\AddIns\Analysis\CodeQuality\CodeQualityAnalysis.csproj", "{76DD1CC0-0D86-44A1-9BD6-D91F79807BC3}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection @@ -683,10 +681,6 @@ Global {3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}.Debug|Any CPU.Build.0 = Debug|Any CPU {3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}.Release|Any CPU.ActiveCfg = Release|Any CPU {3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}.Release|Any CPU.Build.0 = Release|Any CPU - {E73BB233-D88B-44A7-A98F-D71EE158381D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E73BB233-D88B-44A7-A98F-D71EE158381D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E73BB233-D88B-44A7-A98F-D71EE158381D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E73BB233-D88B-44A7-A98F-D71EE158381D}.Release|Any CPU.Build.0 = Release|Any CPU {4AC2D5F1-F671-480C-A075-6BF62B3721B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4AC2D5F1-F671-480C-A075-6BF62B3721B2}.Debug|Any CPU.Build.0 = Debug|Any CPU {4AC2D5F1-F671-480C-A075-6BF62B3721B2}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -1388,135 +1382,134 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {B5F54272-49F0-40DB-845A-8D837875D3BA} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01} - {C3CBC8E3-81D8-4C5B-9941-DCCD12D50B1F} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01} - {7DB80259-24D4-46C3-A024-53FF1987733D} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01} - {4980B743-B32F-4aba-AABD-45E2CAD3568D} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01} - {AD6FAA08-D6F5-4DBA-AF85-F4DA9F40C3B5} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01} - {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01} - {7E4A7172-7FF5-48D0-B719-7CD959DD1AC9} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01} - {857CA1A3-FC88-4BE0-AB6A-D1EE772AB288} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01} - {924EE450-603D-49C1-A8E5-4AFAA31CE6F3} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01} - {80318B5F-A25D-45AB-8A95-EF31D2370A4C} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01} - {2748AD25-9C63-4E12-877B-4DCE96FBED54} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01} - {8035765F-D51F-4A0C-A746-2FD100E19419} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01} {1152B71B-3C05-4598-B20D-823B5D40559E} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01} - {D68133BD-1E63-496E-9EDE-4FBDBF77B486} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C} - {6222A3A1-83CE-47A3-A4E4-A018F82D44D8} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C} - {E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C} - {2FF700C2-A38A-48BD-A637-8CAFD4FE6237} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C} - {6C55B776-26D4-4DB3-A6AB-87E783B2F3D1} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C} - {4139CCF6-FB49-4A9D-B2CF-331E9EA3198D} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C} - {E73BB233-D88B-44A7-A98F-D71EE158381D} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C} + {8035765F-D51F-4A0C-A746-2FD100E19419} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01} + {2748AD25-9C63-4E12-877B-4DCE96FBED54} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01} + {80318B5F-A25D-45AB-8A95-EF31D2370A4C} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01} + {924EE450-603D-49C1-A8E5-4AFAA31CE6F3} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01} + {857CA1A3-FC88-4BE0-AB6A-D1EE772AB288} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01} + {7E4A7172-7FF5-48D0-B719-7CD959DD1AC9} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01} + {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01} + {AD6FAA08-D6F5-4DBA-AF85-F4DA9F40C3B5} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01} + {4980B743-B32F-4aba-AABD-45E2CAD3568D} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01} + {7DB80259-24D4-46C3-A024-53FF1987733D} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01} + {C3CBC8E3-81D8-4C5B-9941-DCCD12D50B1F} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01} + {B5F54272-49F0-40DB-845A-8D837875D3BA} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01} {DDE2A481-8271-4EAC-A330-8FA6A38D13D1} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C} - {870115DD-960A-4406-A6B9-600BCDC36A03} = {E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865} - {B22522AA-B5BF-4A58-AC6D-D4B45805521F} = {E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865} + {4139CCF6-FB49-4A9D-B2CF-331E9EA3198D} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C} + {6C55B776-26D4-4DB3-A6AB-87E783B2F3D1} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C} + {2FF700C2-A38A-48BD-A637-8CAFD4FE6237} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C} + {E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C} + {6222A3A1-83CE-47A3-A4E4-A018F82D44D8} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C} + {D68133BD-1E63-496E-9EDE-4FBDBF77B486} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C} {3A9AE6AA-BC07-4A2F-972C-581E3AE2F195} = {E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865} - {F208FF4F-E5D8-41D5-A7C7-B463976F156E} = {39327899-ED91-4F7F-988C-4FE4E17C014D} - {8789D7FF-B36C-4187-B57D-55ED64623272} = {39327899-ED91-4F7F-988C-4FE4E17C014D} - {C4035C32-026F-4158-AF15-113EA1EF1960} = {39327899-ED91-4F7F-988C-4FE4E17C014D} - {E0646C25-36F2-4524-969F-FA621353AB94} = {39327899-ED91-4F7F-988C-4FE4E17C014D} - {CDE0C5A4-2096-48B5-BEA3-74DBA0F0E1EF} = {39327899-ED91-4F7F-988C-4FE4E17C014D} - {F3662720-9EA2-4591-BBC6-97361DCE50A9} = {39327899-ED91-4F7F-988C-4FE4E17C014D} - {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F} = {39327899-ED91-4F7F-988C-4FE4E17C014D} + {B22522AA-B5BF-4A58-AC6D-D4B45805521F} = {E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865} + {870115DD-960A-4406-A6B9-600BCDC36A03} = {E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865} {F355E45F-F54F-4B42-8916-9A633A392789} = {39327899-ED91-4F7F-988C-4FE4E17C014D} - {A5C0E8F8-9D04-46ED-91D6-1DEF1575313B} = {F355E45F-F54F-4B42-8916-9A633A392789} - {1F261725-6318-4434-A1B1-6C70CE4CD324} = {F355E45F-F54F-4B42-8916-9A633A392789} - {3EAA45A9-735C-4AC7-A799-947B93EA449D} = {F355E45F-F54F-4B42-8916-9A633A392789} - {08CE9972-283B-44F4-82FA-966F7DFA6B7A} = {F355E45F-F54F-4B42-8916-9A633A392789} - {CE498514-D12D-4B6E-AE0E-FEC29BD43748} = {F355E45F-F54F-4B42-8916-9A633A392789} - {44A8DE09-CAB9-49D8-9CFC-5EB0A552F181} = {F355E45F-F54F-4B42-8916-9A633A392789} - {76DD1CC0-0D86-44A1-9BD6-D91F79807BC3} = {F355E45F-F54F-4B42-8916-9A633A392789} - {85226AFB-CE71-4851-9A75-7EEC663A8E8A} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F} - {C7F29FC2-1B03-4CDD-9E30-400F4765FF04} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F} - {BFA3BF26-33BD-4A65-B84D-C7F30D131668} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F} - {7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F} - {DCA2703D-250A-463E-A68A-07ED105AE6BD} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F} - {0162E499-42D0-409B-AA25-EED21F75336B} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F} - {CBC6C247-747B-4908-B09A-4D2E0F640B6B} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F} - {E618A9CD-A39F-4925-A538-E8A3FEF24E54} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F} - {0773ED53-08E2-4495-A3BE-CA0B5D413C15} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F} - {FC0FE702-A87D-4D70-A9B6-1ECCD611125F} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F} - {6022AC51-B658-4C54-97EF-79187AC65B47} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F} - {66A378A1-E9F4-4AD5-8946-D0EC06C2902F} = {6022AC51-B658-4C54-97EF-79187AC65B47} - {9A9D6FD4-6A2E-455D-ACC3-DDA775FE9865} = {6022AC51-B658-4C54-97EF-79187AC65B47} - {78CC29AC-CC79-4355-B1F2-97936DF198AC} = {6022AC51-B658-4C54-97EF-79187AC65B47} - {943DBBB3-E84E-4CF4-917C-C05AFA8743C1} = {6022AC51-B658-4C54-97EF-79187AC65B47} - {88DA149F-21B2-48AB-82C4-28FB6BDFD783} = {6022AC51-B658-4C54-97EF-79187AC65B47} - {DC1CCE11-CB91-40FA-9C47-4D9EB5D67BFD} = {0773ED53-08E2-4495-A3BE-CA0B5D413C15} - {DFB936AD-90EE-4B4F-941E-4F4A636F0D92} = {0773ED53-08E2-4495-A3BE-CA0B5D413C15} - {0991423A-DBF6-4C89-B365-A1DF1EB32E42} = {BFA3BF26-33BD-4A65-B84D-C7F30D131668} - {5A1354DF-4989-4BB4-BC6B-D627C2E9FA13} = {BFA3BF26-33BD-4A65-B84D-C7F30D131668} - {08F772A1-F0BE-433E-8B37-F6522953DB05} = {BFA3BF26-33BD-4A65-B84D-C7F30D131668} - {AFE34868-AFA1-4E1C-9450-47AB4BE329D5} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04} - {EEF5E054-4192-4A57-8FBF-E860D808A51D} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04} - {5C70D6AB-0A33-43F9-B8B5-54558C35BBB1} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04} - {BAD94D6E-4159-4CB6-B991-486F412D9BB6} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04} - {B7823AE9-4B43-4859-8796-2EBDC116FBB8} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04} - {A9F12710-24E4-46D4-832C-6ECB395B9EAD} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04} - {5186325C-DD7F-4246-9BE7-3F384EFBF5A6} = {F3662720-9EA2-4591-BBC6-97361DCE50A9} - {B5D8C3E6-42EC-4D4B-AD05-3644B32563EF} = {F3662720-9EA2-4591-BBC6-97361DCE50A9} - {80F76D10-0B44-4D55-B4BD-DAEB5464090C} = {F3662720-9EA2-4591-BBC6-97361DCE50A9} - {A4AA51DE-A096-47EC-AA5D-D91457834ECF} = {F3662720-9EA2-4591-BBC6-97361DCE50A9} - {3CA90546-3B4C-4663-9445-C4E9371750A7} = {F3662720-9EA2-4591-BBC6-97361DCE50A9} - {9196DD8A-B4D4-4780-8742-C5762E547FC2} = {F3662720-9EA2-4591-BBC6-97361DCE50A9} - {7D5C266F-D6FF-4D14-B315-0C0FC6C4EF51} = {F3662720-9EA2-4591-BBC6-97361DCE50A9} - {F93E52FD-DA66-4CE5-A0CB-BCD902811122} = {F3662720-9EA2-4591-BBC6-97361DCE50A9} - {4B8F0F98-8BE1-402B-AA8B-C8D548577B38} = {F3662720-9EA2-4591-BBC6-97361DCE50A9} - {D022A6CE-7438-41E8-AC64-F2DE18EC54C6} = {F3662720-9EA2-4591-BBC6-97361DCE50A9} - {5EEB99CF-EA2B-4733-80A6-CE9192D68170} = {F3662720-9EA2-4591-BBC6-97361DCE50A9} - {64A3E5E6-90BF-47F6-94DF-68C94B62C817} = {F3662720-9EA2-4591-BBC6-97361DCE50A9} - {461606BD-E824-4D0A-8CBA-01810B1F5E02} = {F3662720-9EA2-4591-BBC6-97361DCE50A9} - {DD9AE6A5-2B9D-443A-BC71-38BE578C36BD} = {F3662720-9EA2-4591-BBC6-97361DCE50A9} - {A569DCC1-C608-45FD-B770-4F79335EF154} = {F3662720-9EA2-4591-BBC6-97361DCE50A9} - {DEFC8584-BEC3-4921-BD0F-40482E450B7B} = {F3662720-9EA2-4591-BBC6-97361DCE50A9} - {C6410CCE-C29F-4BF4-94BF-545DE1CBB144} = {F3662720-9EA2-4591-BBC6-97361DCE50A9} - {AE4AB0FA-6087-4480-AF37-0FA1452B3DA1} = {C6410CCE-C29F-4BF4-94BF-545DE1CBB144} - {56E98A01-8398-4A08-9578-C7337711A52B} = {C6410CCE-C29F-4BF4-94BF-545DE1CBB144} - {E0A5E80A-003B-4335-A9DC-A76E2E46D38D} = {C6410CCE-C29F-4BF4-94BF-545DE1CBB144} - {11115C83-3DB1-431F-8B98-59040359238D} = {C6410CCE-C29F-4BF4-94BF-545DE1CBB144} - {A406803B-C584-43A3-BCEE-A0BB3132CB5F} = {C6410CCE-C29F-4BF4-94BF-545DE1CBB144} - {6B1CFE35-DA17-4DEB-9C6E-227E5E251DA0} = {DEFC8584-BEC3-4921-BD0F-40482E450B7B} - {0008FCE9-9EB4-4E2E-979B-553278E5BBA6} = {DEFC8584-BEC3-4921-BD0F-40482E450B7B} - {A4C858C8-51B6-4265-A695-A20FCEBA1D19} = {CDE0C5A4-2096-48B5-BEA3-74DBA0F0E1EF} - {1D18D788-F7EE-4585-A23B-34DC8EC63CB8} = {CDE0C5A4-2096-48B5-BEA3-74DBA0F0E1EF} - {EC06F96A-AEEC-49D6-B03D-AB87C6EB674C} = {CDE0C5A4-2096-48B5-BEA3-74DBA0F0E1EF} - {C7288E72-FFBE-48CD-84B4-6CBF95A7195A} = {E0646C25-36F2-4524-969F-FA621353AB94} - {70966F84-74C9-4067-A379-0C674A929233} = {E0646C25-36F2-4524-969F-FA621353AB94} - {52006F3F-3156-45DE-89D8-C4813694FBA4} = {E0646C25-36F2-4524-969F-FA621353AB94} - {50A89267-A28B-4DF3-8E62-912E005143B8} = {E0646C25-36F2-4524-969F-FA621353AB94} - {97B3B514-AB0E-4FE1-89DE-8A945F5112AE} = {E0646C25-36F2-4524-969F-FA621353AB94} - {CA76F702-5B4E-4918-B8D8-7FF8382434FF} = {E0646C25-36F2-4524-969F-FA621353AB94} - {E1B288A2-08EE-4318-8BBB-8AB72C69E33E} = {E0646C25-36F2-4524-969F-FA621353AB94} - {1F1AC7CD-D154-45BB-8EAF-804CA8055F5A} = {E0646C25-36F2-4524-969F-FA621353AB94} - {BF38FB72-B380-4196-AF8C-95749D726C61} = {E0646C25-36F2-4524-969F-FA621353AB94} - {7C96B65D-28A5-4F28-A35B-8D83CE831EE8} = {E0646C25-36F2-4524-969F-FA621353AB94} - {F390DA70-1FE1-4715-81A0-389AB010C130} = {E0646C25-36F2-4524-969F-FA621353AB94} - {388E7B64-0393-4EB4-A3E3-5C474F141853} = {E0646C25-36F2-4524-969F-FA621353AB94} - {E954F3CB-A446-492F-A664-2B376EBC86E8} = {E0646C25-36F2-4524-969F-FA621353AB94} - {7048AE18-EB93-4A84-82D0-DD60EB58ADBD} = {E0646C25-36F2-4524-969F-FA621353AB94} + {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F} = {39327899-ED91-4F7F-988C-4FE4E17C014D} + {F3662720-9EA2-4591-BBC6-97361DCE50A9} = {39327899-ED91-4F7F-988C-4FE4E17C014D} + {CDE0C5A4-2096-48B5-BEA3-74DBA0F0E1EF} = {39327899-ED91-4F7F-988C-4FE4E17C014D} + {E0646C25-36F2-4524-969F-FA621353AB94} = {39327899-ED91-4F7F-988C-4FE4E17C014D} + {C4035C32-026F-4158-AF15-113EA1EF1960} = {39327899-ED91-4F7F-988C-4FE4E17C014D} + {8789D7FF-B36C-4187-B57D-55ED64623272} = {39327899-ED91-4F7F-988C-4FE4E17C014D} + {F208FF4F-E5D8-41D5-A7C7-B463976F156E} = {39327899-ED91-4F7F-988C-4FE4E17C014D} + {17F4D7E0-6933-4C2E-8714-FD7E98D625D5} = {F208FF4F-E5D8-41D5-A7C7-B463976F156E} + {83F15BA7-8478-4664-81BB-A82F146D88B3} = {F208FF4F-E5D8-41D5-A7C7-B463976F156E} + {D81F5C91-D7DB-46E5-BC99-49488FB6814C} = {8789D7FF-B36C-4187-B57D-55ED64623272} + {4B2239FF-8FD6-431D-9D22-1B8049BA6917} = {8789D7FF-B36C-4187-B57D-55ED64623272} + {E16B73CA-3603-47EE-915E-6F8B2A07304B} = {8789D7FF-B36C-4187-B57D-55ED64623272} + {35D002D7-C78B-44FB-92AA-104BEB431678} = {8789D7FF-B36C-4187-B57D-55ED64623272} + {2B232C7E-CFB6-4B73-A1B8-134A8A2ED4F7} = {8789D7FF-B36C-4187-B57D-55ED64623272} + {068F9531-5D29-49E0-980E-59982A3A0469} = {C4035C32-026F-4158-AF15-113EA1EF1960} + {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} = {C4035C32-026F-4158-AF15-113EA1EF1960} + {72FFB35A-C9E2-4A31-B4FA-E3E3E28DED5F} = {C4035C32-026F-4158-AF15-113EA1EF1960} + {BDA49550-5ED1-4C6B-B648-657B2CACD8E0} = {C4035C32-026F-4158-AF15-113EA1EF1960} + {D294A12D-4B38-4F25-9AA6-3D4A6CE26E7B} = {C4035C32-026F-4158-AF15-113EA1EF1960} {85C09AD8-183B-403A-869A-7226646218A9} = {E0646C25-36F2-4524-969F-FA621353AB94} - {23B517C9-1ECC-4419-A13F-0B7136D085CB} = {CA76F702-5B4E-4918-B8D8-7FF8382434FF} - {833904AB-3CD4-4071-9B48-5770E44685AA} = {CA76F702-5B4E-4918-B8D8-7FF8382434FF} - {D332F2D1-2CF1-43B7-903C-844BD5211A7E} = {CA76F702-5B4E-4918-B8D8-7FF8382434FF} - {8D732610-8FC6-43BA-94C9-7126FD7FE361} = {CA76F702-5B4E-4918-B8D8-7FF8382434FF} - {6FA16499-896F-4C02-BB43-1AF5C6C7C713} = {97B3B514-AB0E-4FE1-89DE-8A945F5112AE} - {4AC2D5F1-F671-480C-A075-6BF62B3721B2} = {97B3B514-AB0E-4FE1-89DE-8A945F5112AE} - {DBCF20A1-BA13-4582-BFA9-74DE4D987B73} = {97B3B514-AB0E-4FE1-89DE-8A945F5112AE} - {C9DE556D-325C-4544-B29F-16A9EB7C9830} = {97B3B514-AB0E-4FE1-89DE-8A945F5112AE} - {01DF0475-0CB2-4E81-971B-BADC60CDE3A5} = {C7288E72-FFBE-48CD-84B4-6CBF95A7195A} + {7048AE18-EB93-4A84-82D0-DD60EB58ADBD} = {E0646C25-36F2-4524-969F-FA621353AB94} + {E954F3CB-A446-492F-A664-2B376EBC86E8} = {E0646C25-36F2-4524-969F-FA621353AB94} + {388E7B64-0393-4EB4-A3E3-5C474F141853} = {E0646C25-36F2-4524-969F-FA621353AB94} + {F390DA70-1FE1-4715-81A0-389AB010C130} = {E0646C25-36F2-4524-969F-FA621353AB94} + {7C96B65D-28A5-4F28-A35B-8D83CE831EE8} = {E0646C25-36F2-4524-969F-FA621353AB94} + {BF38FB72-B380-4196-AF8C-95749D726C61} = {E0646C25-36F2-4524-969F-FA621353AB94} + {1F1AC7CD-D154-45BB-8EAF-804CA8055F5A} = {E0646C25-36F2-4524-969F-FA621353AB94} + {E1B288A2-08EE-4318-8BBB-8AB72C69E33E} = {E0646C25-36F2-4524-969F-FA621353AB94} + {CA76F702-5B4E-4918-B8D8-7FF8382434FF} = {E0646C25-36F2-4524-969F-FA621353AB94} + {97B3B514-AB0E-4FE1-89DE-8A945F5112AE} = {E0646C25-36F2-4524-969F-FA621353AB94} + {50A89267-A28B-4DF3-8E62-912E005143B8} = {E0646C25-36F2-4524-969F-FA621353AB94} + {52006F3F-3156-45DE-89D8-C4813694FBA4} = {E0646C25-36F2-4524-969F-FA621353AB94} + {70966F84-74C9-4067-A379-0C674A929233} = {E0646C25-36F2-4524-969F-FA621353AB94} + {C7288E72-FFBE-48CD-84B4-6CBF95A7195A} = {E0646C25-36F2-4524-969F-FA621353AB94} {C896FFFF-5B6C-4B0E-B6DF-049865F501B4} = {C7288E72-FFBE-48CD-84B4-6CBF95A7195A} - {D294A12D-4B38-4F25-9AA6-3D4A6CE26E7B} = {C4035C32-026F-4158-AF15-113EA1EF1960} - {BDA49550-5ED1-4C6B-B648-657B2CACD8E0} = {C4035C32-026F-4158-AF15-113EA1EF1960} - {72FFB35A-C9E2-4A31-B4FA-E3E3E28DED5F} = {C4035C32-026F-4158-AF15-113EA1EF1960} - {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} = {C4035C32-026F-4158-AF15-113EA1EF1960} - {068F9531-5D29-49E0-980E-59982A3A0469} = {C4035C32-026F-4158-AF15-113EA1EF1960} - {2B232C7E-CFB6-4B73-A1B8-134A8A2ED4F7} = {8789D7FF-B36C-4187-B57D-55ED64623272} - {35D002D7-C78B-44FB-92AA-104BEB431678} = {8789D7FF-B36C-4187-B57D-55ED64623272} - {E16B73CA-3603-47EE-915E-6F8B2A07304B} = {8789D7FF-B36C-4187-B57D-55ED64623272} - {4B2239FF-8FD6-431D-9D22-1B8049BA6917} = {8789D7FF-B36C-4187-B57D-55ED64623272} - {D81F5C91-D7DB-46E5-BC99-49488FB6814C} = {8789D7FF-B36C-4187-B57D-55ED64623272} - {83F15BA7-8478-4664-81BB-A82F146D88B3} = {F208FF4F-E5D8-41D5-A7C7-B463976F156E} - {17F4D7E0-6933-4C2E-8714-FD7E98D625D5} = {F208FF4F-E5D8-41D5-A7C7-B463976F156E} + {01DF0475-0CB2-4E81-971B-BADC60CDE3A5} = {C7288E72-FFBE-48CD-84B4-6CBF95A7195A} + {C9DE556D-325C-4544-B29F-16A9EB7C9830} = {97B3B514-AB0E-4FE1-89DE-8A945F5112AE} + {DBCF20A1-BA13-4582-BFA9-74DE4D987B73} = {97B3B514-AB0E-4FE1-89DE-8A945F5112AE} + {4AC2D5F1-F671-480C-A075-6BF62B3721B2} = {97B3B514-AB0E-4FE1-89DE-8A945F5112AE} + {6FA16499-896F-4C02-BB43-1AF5C6C7C713} = {97B3B514-AB0E-4FE1-89DE-8A945F5112AE} + {8D732610-8FC6-43BA-94C9-7126FD7FE361} = {CA76F702-5B4E-4918-B8D8-7FF8382434FF} + {D332F2D1-2CF1-43B7-903C-844BD5211A7E} = {CA76F702-5B4E-4918-B8D8-7FF8382434FF} + {833904AB-3CD4-4071-9B48-5770E44685AA} = {CA76F702-5B4E-4918-B8D8-7FF8382434FF} + {23B517C9-1ECC-4419-A13F-0B7136D085CB} = {CA76F702-5B4E-4918-B8D8-7FF8382434FF} + {EC06F96A-AEEC-49D6-B03D-AB87C6EB674C} = {CDE0C5A4-2096-48B5-BEA3-74DBA0F0E1EF} + {1D18D788-F7EE-4585-A23B-34DC8EC63CB8} = {CDE0C5A4-2096-48B5-BEA3-74DBA0F0E1EF} + {A4C858C8-51B6-4265-A695-A20FCEBA1D19} = {CDE0C5A4-2096-48B5-BEA3-74DBA0F0E1EF} + {C6410CCE-C29F-4BF4-94BF-545DE1CBB144} = {F3662720-9EA2-4591-BBC6-97361DCE50A9} + {DEFC8584-BEC3-4921-BD0F-40482E450B7B} = {F3662720-9EA2-4591-BBC6-97361DCE50A9} + {A569DCC1-C608-45FD-B770-4F79335EF154} = {F3662720-9EA2-4591-BBC6-97361DCE50A9} + {DD9AE6A5-2B9D-443A-BC71-38BE578C36BD} = {F3662720-9EA2-4591-BBC6-97361DCE50A9} + {461606BD-E824-4D0A-8CBA-01810B1F5E02} = {F3662720-9EA2-4591-BBC6-97361DCE50A9} + {64A3E5E6-90BF-47F6-94DF-68C94B62C817} = {F3662720-9EA2-4591-BBC6-97361DCE50A9} + {5EEB99CF-EA2B-4733-80A6-CE9192D68170} = {F3662720-9EA2-4591-BBC6-97361DCE50A9} + {D022A6CE-7438-41E8-AC64-F2DE18EC54C6} = {F3662720-9EA2-4591-BBC6-97361DCE50A9} + {4B8F0F98-8BE1-402B-AA8B-C8D548577B38} = {F3662720-9EA2-4591-BBC6-97361DCE50A9} + {F93E52FD-DA66-4CE5-A0CB-BCD902811122} = {F3662720-9EA2-4591-BBC6-97361DCE50A9} + {7D5C266F-D6FF-4D14-B315-0C0FC6C4EF51} = {F3662720-9EA2-4591-BBC6-97361DCE50A9} + {9196DD8A-B4D4-4780-8742-C5762E547FC2} = {F3662720-9EA2-4591-BBC6-97361DCE50A9} + {3CA90546-3B4C-4663-9445-C4E9371750A7} = {F3662720-9EA2-4591-BBC6-97361DCE50A9} + {A4AA51DE-A096-47EC-AA5D-D91457834ECF} = {F3662720-9EA2-4591-BBC6-97361DCE50A9} + {80F76D10-0B44-4D55-B4BD-DAEB5464090C} = {F3662720-9EA2-4591-BBC6-97361DCE50A9} + {B5D8C3E6-42EC-4D4B-AD05-3644B32563EF} = {F3662720-9EA2-4591-BBC6-97361DCE50A9} + {5186325C-DD7F-4246-9BE7-3F384EFBF5A6} = {F3662720-9EA2-4591-BBC6-97361DCE50A9} + {0008FCE9-9EB4-4E2E-979B-553278E5BBA6} = {DEFC8584-BEC3-4921-BD0F-40482E450B7B} + {6B1CFE35-DA17-4DEB-9C6E-227E5E251DA0} = {DEFC8584-BEC3-4921-BD0F-40482E450B7B} + {A406803B-C584-43A3-BCEE-A0BB3132CB5F} = {C6410CCE-C29F-4BF4-94BF-545DE1CBB144} + {11115C83-3DB1-431F-8B98-59040359238D} = {C6410CCE-C29F-4BF4-94BF-545DE1CBB144} + {E0A5E80A-003B-4335-A9DC-A76E2E46D38D} = {C6410CCE-C29F-4BF4-94BF-545DE1CBB144} + {56E98A01-8398-4A08-9578-C7337711A52B} = {C6410CCE-C29F-4BF4-94BF-545DE1CBB144} + {AE4AB0FA-6087-4480-AF37-0FA1452B3DA1} = {C6410CCE-C29F-4BF4-94BF-545DE1CBB144} + {6022AC51-B658-4C54-97EF-79187AC65B47} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F} + {FC0FE702-A87D-4D70-A9B6-1ECCD611125F} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F} + {0773ED53-08E2-4495-A3BE-CA0B5D413C15} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F} + {E618A9CD-A39F-4925-A538-E8A3FEF24E54} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F} + {CBC6C247-747B-4908-B09A-4D2E0F640B6B} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F} + {0162E499-42D0-409B-AA25-EED21F75336B} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F} + {DCA2703D-250A-463E-A68A-07ED105AE6BD} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F} + {7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F} + {BFA3BF26-33BD-4A65-B84D-C7F30D131668} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F} + {C7F29FC2-1B03-4CDD-9E30-400F4765FF04} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F} + {85226AFB-CE71-4851-9A75-7EEC663A8E8A} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F} + {A9F12710-24E4-46D4-832C-6ECB395B9EAD} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04} + {B7823AE9-4B43-4859-8796-2EBDC116FBB8} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04} + {BAD94D6E-4159-4CB6-B991-486F412D9BB6} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04} + {5C70D6AB-0A33-43F9-B8B5-54558C35BBB1} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04} + {EEF5E054-4192-4A57-8FBF-E860D808A51D} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04} + {AFE34868-AFA1-4E1C-9450-47AB4BE329D5} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04} + {08F772A1-F0BE-433E-8B37-F6522953DB05} = {BFA3BF26-33BD-4A65-B84D-C7F30D131668} + {5A1354DF-4989-4BB4-BC6B-D627C2E9FA13} = {BFA3BF26-33BD-4A65-B84D-C7F30D131668} + {0991423A-DBF6-4C89-B365-A1DF1EB32E42} = {BFA3BF26-33BD-4A65-B84D-C7F30D131668} + {DFB936AD-90EE-4B4F-941E-4F4A636F0D92} = {0773ED53-08E2-4495-A3BE-CA0B5D413C15} + {DC1CCE11-CB91-40FA-9C47-4D9EB5D67BFD} = {0773ED53-08E2-4495-A3BE-CA0B5D413C15} + {88DA149F-21B2-48AB-82C4-28FB6BDFD783} = {6022AC51-B658-4C54-97EF-79187AC65B47} + {943DBBB3-E84E-4CF4-917C-C05AFA8743C1} = {6022AC51-B658-4C54-97EF-79187AC65B47} + {78CC29AC-CC79-4355-B1F2-97936DF198AC} = {6022AC51-B658-4C54-97EF-79187AC65B47} + {9A9D6FD4-6A2E-455D-ACC3-DDA775FE9865} = {6022AC51-B658-4C54-97EF-79187AC65B47} + {66A378A1-E9F4-4AD5-8946-D0EC06C2902F} = {6022AC51-B658-4C54-97EF-79187AC65B47} + {76DD1CC0-0D86-44A1-9BD6-D91F79807BC3} = {F355E45F-F54F-4B42-8916-9A633A392789} + {44A8DE09-CAB9-49D8-9CFC-5EB0A552F181} = {F355E45F-F54F-4B42-8916-9A633A392789} + {CE498514-D12D-4B6E-AE0E-FEC29BD43748} = {F355E45F-F54F-4B42-8916-9A633A392789} + {08CE9972-283B-44F4-82FA-966F7DFA6B7A} = {F355E45F-F54F-4B42-8916-9A633A392789} + {3EAA45A9-735C-4AC7-A799-947B93EA449D} = {F355E45F-F54F-4B42-8916-9A633A392789} + {1F261725-6318-4434-A1B1-6C70CE4CD324} = {F355E45F-F54F-4B42-8916-9A633A392789} + {A5C0E8F8-9D04-46ED-91D6-1DEF1575313B} = {F355E45F-F54F-4B42-8916-9A633A392789} EndGlobalSection EndGlobal diff --git a/SharpDevelop.sln b/SharpDevelop.sln index 85abca055a..3dc27a53b4 100644 --- a/SharpDevelop.sln +++ b/SharpDevelop.sln @@ -1,69 +1,69 @@  Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 -# SharpDevelop 4.1.0.7646-alpha +# SharpDevelop 4.1.0.7854-beta Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Main", "Main", "{256F5C28-532C-44C0-8AB8-D8EC5E492E01}" ProjectSection(SolutionItems) = postProject EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.BuildWorker35", "src\Main\ICSharpCode.SharpDevelop.BuildWorker35\ICSharpCode.SharpDevelop.BuildWorker35.csproj", "{B5F54272-49F0-40DB-845A-8D837875D3BA}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartUp", "src\Main\StartUp\Project\StartUp.csproj", "{1152B71B-3C05-4598-B20D-823B5D40559E}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.BuildWorker", "src\Main\ICSharpCode.SharpDevelop.BuildWorker\ICSharpCode.SharpDevelop.BuildWorker.csproj", "{C3CBC8E3-81D8-4C5B-9941-DCCD12D50B1F}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Widgets", "src\Main\ICSharpCode.SharpDevelop.Widgets\Project\ICSharpCode.SharpDevelop.Widgets.csproj", "{8035765F-D51F-4A0C-A746-2FD100E19419}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Dom.Tests", "src\Main\ICSharpCode.SharpDevelop.Dom\Tests\ICSharpCode.SharpDevelop.Dom.Tests\ICSharpCode.SharpDevelop.Dom.Tests.csproj", "{7DB80259-24D4-46C3-A024-53FF1987733D}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop", "src\Main\Base\Project\ICSharpCode.SharpDevelop.csproj", "{2748AD25-9C63-4E12-877B-4DCE96FBED54}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Tests", "src\Main\Base\Test\ICSharpCode.SharpDevelop.Tests.csproj", "{4980B743-B32F-4aba-AABD-45E2CAD3568D}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Sda", "src\Main\ICSharpCode.SharpDevelop.Sda\ICSharpCode.SharpDevelop.Sda.csproj", "{80318B5F-A25D-45AB-8A95-EF31D2370A4C}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core.Tests", "src\Main\Core\Test\ICSharpCode.Core.Tests.csproj", "{AD6FAA08-D6F5-4DBA-AF85-F4DA9F40C3B5}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Dom", "src\Main\ICSharpCode.SharpDevelop.Dom\Project\ICSharpCode.SharpDevelop.Dom.csproj", "{924EE450-603D-49C1-A8E5-4AFAA31CE6F3}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core", "src\Main\Core\Project\ICSharpCode.Core.csproj", "{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core.Presentation", "src\Main\ICSharpCode.Core.Presentation\ICSharpCode.Core.Presentation.csproj", "{7E4A7172-7FF5-48D0-B719-7CD959DD1AC9}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core.WinForms", "src\Main\ICSharpCode.Core.WinForms\ICSharpCode.Core.WinForms.csproj", "{857CA1A3-FC88-4BE0-AB6A-D1EE772AB288}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core.WinForms", "src\Main\ICSharpCode.Core.WinForms\ICSharpCode.Core.WinForms.csproj", "{857CA1A3-FC88-4BE0-AB6A-D1EE772AB288}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core.Presentation", "src\Main\ICSharpCode.Core.Presentation\ICSharpCode.Core.Presentation.csproj", "{7E4A7172-7FF5-48D0-B719-7CD959DD1AC9}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Dom", "src\Main\ICSharpCode.SharpDevelop.Dom\Project\ICSharpCode.SharpDevelop.Dom.csproj", "{924EE450-603D-49C1-A8E5-4AFAA31CE6F3}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core", "src\Main\Core\Project\ICSharpCode.Core.csproj", "{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core.Tests", "src\Main\Core\Test\ICSharpCode.Core.Tests.csproj", "{AD6FAA08-D6F5-4DBA-AF85-F4DA9F40C3B5}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Sda", "src\Main\ICSharpCode.SharpDevelop.Sda\ICSharpCode.SharpDevelop.Sda.csproj", "{80318B5F-A25D-45AB-8A95-EF31D2370A4C}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Tests", "src\Main\Base\Test\ICSharpCode.SharpDevelop.Tests.csproj", "{4980B743-B32F-4aba-AABD-45E2CAD3568D}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop", "src\Main\Base\Project\ICSharpCode.SharpDevelop.csproj", "{2748AD25-9C63-4E12-877B-4DCE96FBED54}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Dom.Tests", "src\Main\ICSharpCode.SharpDevelop.Dom\Tests\ICSharpCode.SharpDevelop.Dom.Tests\ICSharpCode.SharpDevelop.Dom.Tests.csproj", "{7DB80259-24D4-46C3-A024-53FF1987733D}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Widgets", "src\Main\ICSharpCode.SharpDevelop.Widgets\Project\ICSharpCode.SharpDevelop.Widgets.csproj", "{8035765F-D51F-4A0C-A746-2FD100E19419}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.BuildWorker", "src\Main\ICSharpCode.SharpDevelop.BuildWorker\ICSharpCode.SharpDevelop.BuildWorker.csproj", "{C3CBC8E3-81D8-4C5B-9941-DCCD12D50B1F}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartUp", "src\Main\StartUp\Project\StartUp.csproj", "{1152B71B-3C05-4598-B20D-823B5D40559E}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.BuildWorker35", "src\Main\ICSharpCode.SharpDevelop.BuildWorker35\ICSharpCode.SharpDevelop.BuildWorker35.csproj", "{B5F54272-49F0-40DB-845A-8D837875D3BA}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection @@ -72,188 +72,203 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{ ProjectSection(SolutionItems) = postProject EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Cecil", "src\Libraries\Mono.Cecil\Mono.Cecil.csproj", "{D68133BD-1E63-496E-9EDE-4FBDBF77B486}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NRefactory", "NRefactory", "{E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865}" - ProjectSection(SolutionItems) = postProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.TreeView", "src\Libraries\SharpTreeView\ICSharpCode.TreeView\ICSharpCode.TreeView.csproj", "{DDE2A481-8271-4EAC-A330-8FA6A38D13D1}" + ProjectSection(ProjectDependencies) = postProject + {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactoryASTGenerator", "src\Libraries\NRefactory\NRefactoryASTGenerator\NRefactoryASTGenerator.csproj", "{B22522AA-B5BF-4A58-AC6D-D4B45805521F}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Build.Tasks", "src\Libraries\ICSharpCode.Build.Tasks\Project\ICSharpCode.Build.Tasks.csproj", "{4139CCF6-FB49-4A9D-B2CF-331E9EA3198D}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactory", "src\Libraries\NRefactory\Project\NRefactory.csproj", "{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.AvalonEdit", "src\Libraries\AvalonEdit\ICSharpCode.AvalonEdit\ICSharpCode.AvalonEdit.csproj", "{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AvalonDock", "src\Libraries\AvalonDock\AvalonDock\AvalonDock.csproj", "{2FF700C2-A38A-48BD-A637-8CAFD4FE6237}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.AvalonEdit", "src\Libraries\AvalonEdit\ICSharpCode.AvalonEdit\ICSharpCode.AvalonEdit.csproj", "{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}" - ProjectSection(ProjectDependencies) = postProject - {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NRefactory", "NRefactory", "{E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865}" + ProjectSection(SolutionItems) = postProject EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Build.Tasks", "src\Libraries\ICSharpCode.Build.Tasks\Project\ICSharpCode.Build.Tasks.csproj", "{4139CCF6-FB49-4A9D-B2CF-331E9EA3198D}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactory", "src\Libraries\NRefactory\Project\NRefactory.csproj", "{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aga.Controls", "src\Libraries\TreeViewAdv\Aga.Controls\Aga.Controls.csproj", "{E73BB233-D88B-44A7-A98F-D71EE158381D}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.TreeView", "src\Libraries\SharpTreeView\ICSharpCode.TreeView\ICSharpCode.TreeView.csproj", "{DDE2A481-8271-4EAC-A330-8FA6A38D13D1}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactoryASTGenerator", "src\Libraries\NRefactory\NRefactoryASTGenerator\NRefactoryASTGenerator.csproj", "{B22522AA-B5BF-4A58-AC6D-D4B45805521F}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Cecil", "src\Libraries\Mono.Cecil\Mono.Cecil.csproj", "{D68133BD-1E63-496E-9EDE-4FBDBF77B486}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AddIns", "AddIns", "{39327899-ED91-4F7F-988C-4FE4E17C014D}" ProjectSection(SolutionItems) = postProject EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Version Control", "Version Control", "{F208FF4F-E5D8-41D5-A7C7-B463976F156E}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Analysis", "Analysis", "{F355E45F-F54F-4B42-8916-9A633A392789}" ProjectSection(SolutionItems) = postProject EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitAddIn", "src\AddIns\VersionControl\GitAddIn\GitAddIn.csproj", "{83F15BA7-8478-4664-81BB-A82F146D88B3}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeQualityAnalysis", "src\AddIns\Analysis\CodeQuality\CodeQualityAnalysis.csproj", "{76DD1CC0-0D86-44A1-9BD6-D91F79807BC3}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SubversionAddIn", "src\AddIns\VersionControl\SubversionAddIn\SubversionAddIn.csproj", "{17F4D7E0-6933-4C2E-8714-FD7E98D625D5}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SourceAnalysis", "src\AddIns\Analysis\SourceAnalysis\SourceAnalysis.csproj", "{CE498514-D12D-4B6E-AE0E-FEC29BD43748}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Reports", "Reports", "{8789D7FF-B36C-4187-B57D-55ED64623272}" - ProjectSection(SolutionItems) = postProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeCoverage", "src\AddIns\Analysis\CodeCoverage\Project\CodeCoverage.csproj", "{08CE9972-283B-44F4-82FA-966F7DFA6B7A}" + ProjectSection(ProjectDependencies) = postProject + {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Reports.Addin", "src\AddIns\Misc\Reports\ICSharpCode.Reports.Addin\ICSharpCode.Reports.Addin.csproj", "{35D002D7-C78B-44FB-92AA-104BEB431678}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeAnalysis", "src\AddIns\Analysis\CodeAnalysis\CodeAnalysis.csproj", "{3EAA45A9-735C-4AC7-A799-947B93EA449D}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Reports.Core", "src\AddIns\Misc\Reports\ICSharpCode.Reports.Core\ICSharpCode.Reports.Core.csproj", "{4B2239FF-8FD6-431D-9D22-1B8049BA6917}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTesting", "src\AddIns\Analysis\UnitTesting\UnitTesting.csproj", "{1F261725-6318-4434-A1B1-6C70CE4CD324}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Irony", "src\AddIns\Misc\Reports\Irony\Irony.csproj", "{D81F5C91-D7DB-46E5-BC99-49488FB6814C}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Display Bindings", "Display Bindings", "{11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}" + ProjectSection(SolutionItems) = postProject + EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Profiler", "Profiler", "{C4035C32-026F-4158-AF15-113EA1EF1960}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Decompiler", "Decompiler", "{814DFF39-5324-40BE-90EA-F62F758660B3}" ProjectSection(SolutionItems) = postProject EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.AddIn", "src\AddIns\Analysis\Profiler\Frontend\AddIn\Profiler.AddIn.csproj", "{D294A12D-4B38-4F25-9AA6-3D4A6CE26E7B}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ILSpyAddIn", "src\AddIns\DisplayBindings\ILSpyAddIn\ILSpyAddIn.csproj", "88305E42-C90D-410F-B831-15161E23BAAA" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory", "src\Libraries\NewNRefactory\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj", "{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Decompiler", "src\Libraries\ICSharpCode.Decompiler\ICSharpCode.Decompiler.csproj", "{984CC812-9470-4A13-AFF9-CC44068D666C}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WpfDesign", "WpfDesign", "{6022AC51-B658-4C54-97EF-79187AC65B47}" + ProjectSection(SolutionItems) = postProject + EndProjectSection +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.XamlDom", "src\AddIns\DisplayBindings\WpfDesign\WpfDesign.XamlDom\Project\WpfDesign.XamlDom.csproj", "{88DA149F-21B2-48AB-82C4-28FB6BDFD783}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} - {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} = {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.Controls", "src\AddIns\Analysis\Profiler\Frontend\Controls\Profiler.Controls.csproj", "{BDA49550-5ED1-4C6B-B648-657B2CACD8E0}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.Designer", "src\AddIns\DisplayBindings\WpfDesign\WpfDesign.Designer\Project\WpfDesign.Designer.csproj", "{78CC29AC-CC79-4355-B1F2-97936DF198AC}" ProjectSection(ProjectDependencies) = postProject - {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} = {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.Controller", "src\AddIns\Analysis\Profiler\Controller\Profiler.Controller.csproj", "{72FFB35A-C9E2-4A31-B4FA-E3E3E28DED5F}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.AddIn", "src\AddIns\DisplayBindings\WpfDesign\WpfDesign.AddIn\WpfDesign.AddIn.csproj", "{9A9D6FD4-6A2E-455D-ACC3-DDA775FE9865}" ProjectSection(ProjectDependencies) = postProject - {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} = {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.X64Converter", "src\AddIns\Analysis\Profiler\X64Converter\Profiler.X64Converter.csproj", "{FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign", "src\AddIns\DisplayBindings\WpfDesign\WpfDesign\Project\WpfDesign.csproj", "{66A378A1-E9F4-4AD5-8946-D0EC06C2902F}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Language Bindings", "Language Bindings", "{E0646C25-36F2-4524-969F-FA621353AB94}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IconEditor", "IconEditor", "{0773ED53-08E2-4495-A3BE-CA0B5D413C15}" ProjectSection(SolutionItems) = postProject EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Ruby", "Ruby", "{C7288E72-FFBE-48CD-84B4-6CBF95A7195A}" - ProjectSection(SolutionItems) = postProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IconEditorAddIn", "src\AddIns\DisplayBindings\IconEditor\IconEditorAddIn\IconEditorAddIn.csproj", "{DFB936AD-90EE-4B4F-941E-4F4A636F0D92}" + ProjectSection(ProjectDependencies) = postProject + {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RubyBinding", "src\AddIns\BackendBindings\Ruby\RubyBinding\Project\RubyBinding.csproj", "{C896FFFF-5B6C-4B0E-B6DF-049865F501B4}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IconEditor", "src\AddIns\DisplayBindings\IconEditor\IconEditor\IconEditor.csproj", "{DC1CCE11-CB91-40FA-9C47-4D9EB5D67BFD}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CppBinding", "src\AddIns\BackendBindings\CppBinding\CppBinding\CppBinding.csproj", "{70966F84-74C9-4067-A379-0C674A929233}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HexEditor", "src\AddIns\DisplayBindings\HexEditor\Project\HexEditor.csproj", "{E618A9CD-A39F-4925-A538-E8A3FEF24E54}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Boo", "Boo", "{97B3B514-AB0E-4FE1-89DE-8A945F5112AE}" - ProjectSection(SolutionItems) = postProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceEditor", "src\AddIns\DisplayBindings\ResourceEditor\Project\ResourceEditor.csproj", "{CBC6C247-747B-4908-B09A-4D2E0F640B6B}" + ProjectSection(ProjectDependencies) = postProject + {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BooBinding", "src\AddIns\BackendBindings\Boo\BooBinding\Project\BooBinding.csproj", "{4AC2D5F1-F671-480C-A075-6BF62B3721B2}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AvalonEdit.AddIn", "src\AddIns\DisplayBindings\AvalonEdit.AddIn\AvalonEdit.AddIn.csproj", "{0162E499-42D0-409B-AA25-EED21F75336B}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactoryToBooConverter", "src\AddIns\BackendBindings\Boo\NRefactoryToBooConverter\Project\NRefactoryToBooConverter.csproj", "{DBCF20A1-BA13-4582-BFA9-74DE4D987B73}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XmlEditor", "src\AddIns\DisplayBindings\XmlEditor\Project\XmlEditor.csproj", "{DCA2703D-250A-463E-A68A-07ED105AE6BD}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Python", "Python", "{CA76F702-5B4E-4918-B8D8-7FF8382434FF}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FormsDesigner", "src\AddIns\DisplayBindings\FormsDesigner\Project\FormsDesigner.csproj", "{7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57}" + ProjectSection(ProjectDependencies) = postProject + {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ClassDiagram", "ClassDiagram", "{BFA3BF26-33BD-4A65-B84D-C7F30D131668}" ProjectSection(SolutionItems) = postProject EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Python.Build.Tasks", "src\AddIns\BackendBindings\Python\Python.Build.Tasks\Project\Python.Build.Tasks.csproj", "{D332F2D1-2CF1-43B7-903C-844BD5211A7E}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassCanvas", "src\AddIns\DisplayBindings\ClassDiagram\ClassCanvas\ClassCanvas.csproj", "{08F772A1-F0BE-433E-8B37-F6522953DB05}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PythonBinding", "src\AddIns\BackendBindings\Python\PythonBinding\Project\PythonBinding.csproj", "{8D732610-8FC6-43BA-94C9-7126FD7FE361}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassDiagramAddin", "src\AddIns\DisplayBindings\ClassDiagram\ClassDiagramAddin\ClassDiagramAddin.csproj", "{5A1354DF-4989-4BB4-BC6B-D627C2E9FA13}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixBinding", "src\AddIns\BackendBindings\WixBinding\Project\WixBinding.csproj", "{E1B288A2-08EE-4318-8BBB-8AB72C69E33E}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Diagrams", "src\AddIns\DisplayBindings\ClassDiagram\DiagramRouter\Diagrams.csproj", "{0991423A-DBF6-4C89-B365-A1DF1EB32E42}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpBinding", "src\AddIns\BackendBindings\CSharpBinding\Project\CSharpBinding.csproj", "{1F1AC7CD-D154-45BB-8EAF-804CA8055F5A}" - ProjectSection(ProjectDependencies) = postProject - {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Data", "Data", "{C7F29FC2-1B03-4CDD-9E30-400F4765FF04}" + ProjectSection(SolutionItems) = postProject EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VBNetBinding", "src\AddIns\BackendBindings\VBNetBinding\Project\VBNetBinding.csproj", "{BF38FB72-B380-4196-AF8C-95749D726C61}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.Addin", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.Addin\ICSharpCode.Data.Addin.csproj", "{A9F12710-24E4-46D4-832C-6ECB395B9EAD}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamlBinding", "src\AddIns\BackendBindings\XamlBinding\XamlBinding\XamlBinding.csproj", "{7C96B65D-28A5-4F28-A35B-8D83CE831EE8}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.Core", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.Core\ICSharpCode.Data.Core.csproj", "{B7823AE9-4B43-4859-8796-2EBDC116FBB8}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSharpBinding", "src\AddIns\BackendBindings\FSharpBinding\FSharpBinding.csproj", "{E954F3CB-A446-492F-A664-2B376EBC86E8}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.Core.UI", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.Core.UI\ICSharpCode.Data.Core.UI.csproj", "{BAD94D6E-4159-4CB6-B991-486F412D9BB6}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Scripting", "src\AddIns\BackendBindings\Scripting\Project\ICSharpCode.Scripting.csproj", "{7048AE18-EB93-4A84-82D0-DD60EB58ADBD}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.EDMDesigner.Core", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.EDMDesigner.Core\ICSharpCode.Data.EDMDesigner.Core.csproj", "{5C70D6AB-0A33-43F9-B8B5-54558C35BBB1}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Debugger", "Debugger", "{CDE0C5A4-2096-48B5-BEA3-74DBA0F0E1EF}" - ProjectSection(SolutionItems) = postProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.EDMDesigner.Core.UI", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.EDMDesigner.Core.UI\ICSharpCode.Data.EDMDesigner.Core.UI.csproj", "{EEF5E054-4192-4A57-8FBF-E860D808A51D}" + ProjectSection(ProjectDependencies) = postProject + {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.Core", "src\AddIns\Debugger\Debugger.Core\Debugger.Core.csproj", "{1D18D788-F7EE-4585-A23B-34DC8EC63CB8}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.SQLServer", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.SQLServer\ICSharpCode.Data.SQLServer.csproj", "{AFE34868-AFA1-4E1C-9450-47AB4BE329D5}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.AddIn", "src\AddIns\Debugger\Debugger.AddIn\Debugger.AddIn.csproj", "{EC06F96A-AEEC-49D6-B03D-AB87C6EB674C}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SettingsEditor", "src\AddIns\DisplayBindings\SettingsEditor\Project\SettingsEditor.csproj", "{85226AFB-CE71-4851-9A75-7EEC663A8E8A}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection @@ -262,42 +277,36 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Misc", "Misc", "{F3662720-9 ProjectSection(SolutionItems) = postProject EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextTemplating", "src\AddIns\Misc\TextTemplating\Project\TextTemplating.csproj", "{B5D8C3E6-42EC-4D4B-AD05-3644B32563EF}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PackageManagement", "PackageManagement", "{50B51AAA-80E3-4C4A-8B2D-CAF440A82B78}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UsageDataCollector", "UsageDataCollector", "{DEFC8584-BEC3-4921-BD0F-40482E450B7B}" ProjectSection(SolutionItems) = postProject EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PackageManagement.Cmdlets", "src\AddIns\Misc\PackageManagement\Cmdlets\Project\PackageManagement.Cmdlets.csproj", "{E0A5E80A-003B-4335-A9DC-A76E2E46D38D}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PackageManagement", "src\AddIns\Misc\PackageManagement\Project\PackageManagement.csproj", "{AE4AB0FA-6087-4480-AF37-0FA1452B3DA1}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UsageDataCollector.AddIn", "src\AddIns\Misc\UsageDataCollector\UsageDataCollector.AddIn\UsageDataCollector.AddIn.csproj", "{0008FCE9-9EB4-4E2E-979B-553278E5BBA6}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PackageManagement.PowerShell", "src\AddIns\Misc\PackageManagement\PowerShell\Project\PackageManagement.PowerShell.csproj", "{A406803B-C584-43A3-BCEE-A0BB3132CB5F}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelpViewer", "src\AddIns\Misc\HelpViewer\HelpViewer.csproj", "{80F76D10-0B44-4D55-B4BD-DAEB5464090C}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UsageDataCollector", "src\AddIns\Misc\UsageDataCollector\UsageDataCollector\UsageDataCollector.csproj", "{6B1CFE35-DA17-4DEB-9C6E-227E5E251DA0}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpRefactoring", "src\AddIns\Misc\SharpRefactoring\Project\SharpRefactoring.csproj", "{3CA90546-3B4C-4663-9445-C4E9371750A7}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceToolkit", "src\AddIns\Misc\ResourceToolkit\Project\ResourceToolkit.csproj", "{461606BD-E824-4D0A-8CBA-01810B1F5E02}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SearchAndReplace", "src\AddIns\Misc\SearchAndReplace\Project\SearchAndReplace.csproj", "{9196DD8A-B4D4-4780-8742-C5762E547FC2}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RegExpTk", "src\AddIns\Misc\RegExpTk\Project\RegExpTk.csproj", "{64A3E5E6-90BF-47F6-94DF-68C94B62C817}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartPage", "src\AddIns\Misc\StartPage\Project\StartPage.csproj", "{7D5C266F-D6FF-4D14-B315-0C0FC6C4EF51}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PInvokeAddIn", "src\AddIns\Misc\PInvokeAddIn\Project\PInvokeAddIn.csproj", "{5EEB99CF-EA2B-4733-80A6-CE9192D68170}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AddInManager", "src\AddIns\Misc\AddInManager\Project\AddInManager.csproj", "{F93E52FD-DA66-4CE5-A0CB-BCD902811122}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FiletypeRegisterer", "src\AddIns\Misc\FiletypeRegisterer\Project\FiletypeRegisterer.csproj", "{D022A6CE-7438-41E8-AC64-F2DE18EC54C6}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection @@ -307,200 +316,189 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AddinScout", "src\AddIns\Mi {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FiletypeRegisterer", "src\AddIns\Misc\FiletypeRegisterer\Project\FiletypeRegisterer.csproj", "{D022A6CE-7438-41E8-AC64-F2DE18EC54C6}" - ProjectSection(ProjectDependencies) = postProject - {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} - EndProjectSection -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PInvokeAddIn", "src\AddIns\Misc\PInvokeAddIn\Project\PInvokeAddIn.csproj", "{5EEB99CF-EA2B-4733-80A6-CE9192D68170}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AddInManager", "src\AddIns\Misc\AddInManager\Project\AddInManager.csproj", "{F93E52FD-DA66-4CE5-A0CB-BCD902811122}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RegExpTk", "src\AddIns\Misc\RegExpTk\Project\RegExpTk.csproj", "{64A3E5E6-90BF-47F6-94DF-68C94B62C817}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartPage", "src\AddIns\Misc\StartPage\Project\StartPage.csproj", "{7D5C266F-D6FF-4D14-B315-0C0FC6C4EF51}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceToolkit", "src\AddIns\Misc\ResourceToolkit\Project\ResourceToolkit.csproj", "{461606BD-E824-4D0A-8CBA-01810B1F5E02}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SearchAndReplace", "src\AddIns\Misc\SearchAndReplace\Project\SearchAndReplace.csproj", "{9196DD8A-B4D4-4780-8742-C5762E547FC2}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UsageDataCollector", "UsageDataCollector", "{DEFC8584-BEC3-4921-BD0F-40482E450B7B}" - ProjectSection(SolutionItems) = postProject - EndProjectSection -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UsageDataCollector", "src\AddIns\Misc\UsageDataCollector\UsageDataCollector\UsageDataCollector.csproj", "{6B1CFE35-DA17-4DEB-9C6E-227E5E251DA0}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpRefactoring", "src\AddIns\Misc\SharpRefactoring\Project\SharpRefactoring.csproj", "{3CA90546-3B4C-4663-9445-C4E9371750A7}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UsageDataCollector.AddIn", "src\AddIns\Misc\UsageDataCollector\UsageDataCollector.AddIn\UsageDataCollector.AddIn.csproj", "{0008FCE9-9EB4-4E2E-979B-553278E5BBA6}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelpViewer", "src\AddIns\Misc\HelpViewer\HelpViewer.csproj", "{80F76D10-0B44-4D55-B4BD-DAEB5464090C}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Display Bindings", "Display Bindings", "{11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PackageManagement", "PackageManagement", "{50B51AAA-80E3-4C4A-8B2D-CAF440A82B78}" ProjectSection(SolutionItems) = postProject EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SettingsEditor", "src\AddIns\DisplayBindings\SettingsEditor\Project\SettingsEditor.csproj", "{85226AFB-CE71-4851-9A75-7EEC663A8E8A}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PackageManagement.PowerShell", "src\AddIns\Misc\PackageManagement\PowerShell\Project\PackageManagement.PowerShell.csproj", "{A406803B-C584-43A3-BCEE-A0BB3132CB5F}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PackageManagement", "src\AddIns\Misc\PackageManagement\Project\PackageManagement.csproj", "{AE4AB0FA-6087-4480-AF37-0FA1452B3DA1}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Data", "Data", "{C7F29FC2-1B03-4CDD-9E30-400F4765FF04}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PackageManagement.Cmdlets", "src\AddIns\Misc\PackageManagement\Cmdlets\Project\PackageManagement.Cmdlets.csproj", "{E0A5E80A-003B-4335-A9DC-A76E2E46D38D}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextTemplating", "src\AddIns\Misc\TextTemplating\Project\TextTemplating.csproj", "{B5D8C3E6-42EC-4D4B-AD05-3644B32563EF}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Debugger", "Debugger", "{CDE0C5A4-2096-48B5-BEA3-74DBA0F0E1EF}" ProjectSection(SolutionItems) = postProject EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.SQLServer", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.SQLServer\ICSharpCode.Data.SQLServer.csproj", "{AFE34868-AFA1-4E1C-9450-47AB4BE329D5}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.AddIn", "src\AddIns\Debugger\Debugger.AddIn\Debugger.AddIn.csproj", "{EC06F96A-AEEC-49D6-B03D-AB87C6EB674C}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.EDMDesigner.Core.UI", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.EDMDesigner.Core.UI\ICSharpCode.Data.EDMDesigner.Core.UI.csproj", "{EEF5E054-4192-4A57-8FBF-E860D808A51D}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.Core", "src\AddIns\Debugger\Debugger.Core\Debugger.Core.csproj", "{1D18D788-F7EE-4585-A23B-34DC8EC63CB8}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.EDMDesigner.Core", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.EDMDesigner.Core\ICSharpCode.Data.EDMDesigner.Core.csproj", "{5C70D6AB-0A33-43F9-B8B5-54558C35BBB1}" - ProjectSection(ProjectDependencies) = postProject - {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Language Bindings", "Language Bindings", "{E0646C25-36F2-4524-969F-FA621353AB94}" + ProjectSection(SolutionItems) = postProject EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.Core.UI", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.Core.UI\ICSharpCode.Data.Core.UI.csproj", "{BAD94D6E-4159-4CB6-B991-486F412D9BB6}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Scripting", "src\AddIns\BackendBindings\Scripting\Project\ICSharpCode.Scripting.csproj", "{7048AE18-EB93-4A84-82D0-DD60EB58ADBD}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.Core", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.Core\ICSharpCode.Data.Core.csproj", "{B7823AE9-4B43-4859-8796-2EBDC116FBB8}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSharpBinding", "src\AddIns\BackendBindings\FSharpBinding\FSharpBinding.csproj", "{E954F3CB-A446-492F-A664-2B376EBC86E8}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.Addin", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.Addin\ICSharpCode.Data.Addin.csproj", "{A9F12710-24E4-46D4-832C-6ECB395B9EAD}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamlBinding", "src\AddIns\BackendBindings\XamlBinding\XamlBinding\XamlBinding.csproj", "{7C96B65D-28A5-4F28-A35B-8D83CE831EE8}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ClassDiagram", "ClassDiagram", "{BFA3BF26-33BD-4A65-B84D-C7F30D131668}" - ProjectSection(SolutionItems) = postProject - EndProjectSection -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Diagrams", "src\AddIns\DisplayBindings\ClassDiagram\DiagramRouter\Diagrams.csproj", "{0991423A-DBF6-4C89-B365-A1DF1EB32E42}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VBNetBinding", "src\AddIns\BackendBindings\VBNetBinding\Project\VBNetBinding.csproj", "{BF38FB72-B380-4196-AF8C-95749D726C61}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassDiagramAddin", "src\AddIns\DisplayBindings\ClassDiagram\ClassDiagramAddin\ClassDiagramAddin.csproj", "{5A1354DF-4989-4BB4-BC6B-D627C2E9FA13}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpBinding", "src\AddIns\BackendBindings\CSharpBinding\Project\CSharpBinding.csproj", "{1F1AC7CD-D154-45BB-8EAF-804CA8055F5A}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClassCanvas", "src\AddIns\DisplayBindings\ClassDiagram\ClassCanvas\ClassCanvas.csproj", "{08F772A1-F0BE-433E-8B37-F6522953DB05}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixBinding", "src\AddIns\BackendBindings\WixBinding\Project\WixBinding.csproj", "{E1B288A2-08EE-4318-8BBB-8AB72C69E33E}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FormsDesigner", "src\AddIns\DisplayBindings\FormsDesigner\Project\FormsDesigner.csproj", "{7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Python", "Python", "{CA76F702-5B4E-4918-B8D8-7FF8382434FF}" + ProjectSection(SolutionItems) = postProject + EndProjectSection +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PythonBinding", "src\AddIns\BackendBindings\Python\PythonBinding\Project\PythonBinding.csproj", "{8D732610-8FC6-43BA-94C9-7126FD7FE361}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XmlEditor", "src\AddIns\DisplayBindings\XmlEditor\Project\XmlEditor.csproj", "{DCA2703D-250A-463E-A68A-07ED105AE6BD}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Python.Build.Tasks", "src\AddIns\BackendBindings\Python\Python.Build.Tasks\Project\Python.Build.Tasks.csproj", "{D332F2D1-2CF1-43B7-903C-844BD5211A7E}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AvalonEdit.AddIn", "src\AddIns\DisplayBindings\AvalonEdit.AddIn\AvalonEdit.AddIn.csproj", "{0162E499-42D0-409B-AA25-EED21F75336B}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Boo", "Boo", "{97B3B514-AB0E-4FE1-89DE-8A945F5112AE}" + ProjectSection(SolutionItems) = postProject + EndProjectSection +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactoryToBooConverter", "src\AddIns\BackendBindings\Boo\NRefactoryToBooConverter\Project\NRefactoryToBooConverter.csproj", "{DBCF20A1-BA13-4582-BFA9-74DE4D987B73}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceEditor", "src\AddIns\DisplayBindings\ResourceEditor\Project\ResourceEditor.csproj", "{CBC6C247-747B-4908-B09A-4D2E0F640B6B}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BooBinding", "src\AddIns\BackendBindings\Boo\BooBinding\Project\BooBinding.csproj", "{4AC2D5F1-F671-480C-A075-6BF62B3721B2}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HexEditor", "src\AddIns\DisplayBindings\HexEditor\Project\HexEditor.csproj", "{E618A9CD-A39F-4925-A538-E8A3FEF24E54}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CppBinding", "src\AddIns\BackendBindings\CppBinding\CppBinding\CppBinding.csproj", "{70966F84-74C9-4067-A379-0C674A929233}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IconEditor", "IconEditor", "{0773ED53-08E2-4495-A3BE-CA0B5D413C15}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Ruby", "Ruby", "{C7288E72-FFBE-48CD-84B4-6CBF95A7195A}" ProjectSection(SolutionItems) = postProject EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IconEditor", "src\AddIns\DisplayBindings\IconEditor\IconEditor\IconEditor.csproj", "{DC1CCE11-CB91-40FA-9C47-4D9EB5D67BFD}" - ProjectSection(ProjectDependencies) = postProject - {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} - EndProjectSection -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IconEditorAddIn", "src\AddIns\DisplayBindings\IconEditor\IconEditorAddIn\IconEditorAddIn.csproj", "{DFB936AD-90EE-4B4F-941E-4F4A636F0D92}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RubyBinding", "src\AddIns\BackendBindings\Ruby\RubyBinding\Project\RubyBinding.csproj", "{C896FFFF-5B6C-4B0E-B6DF-049865F501B4}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WpfDesign", "WpfDesign", "{6022AC51-B658-4C54-97EF-79187AC65B47}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Profiler", "Profiler", "{C4035C32-026F-4158-AF15-113EA1EF1960}" ProjectSection(SolutionItems) = postProject EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign", "src\AddIns\DisplayBindings\WpfDesign\WpfDesign\Project\WpfDesign.csproj", "{66A378A1-E9F4-4AD5-8946-D0EC06C2902F}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.X64Converter", "src\AddIns\Analysis\Profiler\X64Converter\Profiler.X64Converter.csproj", "{FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.AddIn", "src\AddIns\DisplayBindings\WpfDesign\WpfDesign.AddIn\WpfDesign.AddIn.csproj", "{9A9D6FD4-6A2E-455D-ACC3-DDA775FE9865}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.Controller", "src\AddIns\Analysis\Profiler\Controller\Profiler.Controller.csproj", "{72FFB35A-C9E2-4A31-B4FA-E3E3E28DED5F}" ProjectSection(ProjectDependencies) = postProject + {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} = {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.Designer", "src\AddIns\DisplayBindings\WpfDesign\WpfDesign.Designer\Project\WpfDesign.Designer.csproj", "{78CC29AC-CC79-4355-B1F2-97936DF198AC}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.Controls", "src\AddIns\Analysis\Profiler\Frontend\Controls\Profiler.Controls.csproj", "{BDA49550-5ED1-4C6B-B648-657B2CACD8E0}" ProjectSection(ProjectDependencies) = postProject + {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} = {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfDesign.XamlDom", "src\AddIns\DisplayBindings\WpfDesign\WpfDesign.XamlDom\Project\WpfDesign.XamlDom.csproj", "{88DA149F-21B2-48AB-82C4-28FB6BDFD783}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.AddIn", "src\AddIns\Analysis\Profiler\Frontend\AddIn\Profiler.AddIn.csproj", "{D294A12D-4B38-4F25-9AA6-3D4A6CE26E7B}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} + {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} = {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Decompiler", "Decompiler", "{814DFF39-5324-40BE-90EA-F62F758660B3}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Reports", "Reports", "{8789D7FF-B36C-4187-B57D-55ED64623272}" ProjectSection(SolutionItems) = postProject EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Decompiler", "src\Libraries\ICSharpCode.Decompiler\ICSharpCode.Decompiler.csproj", "{984CC812-9470-4A13-AFF9-CC44068D666C}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory", "src\Libraries\NewNRefactory\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj", "{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ILSpyAddIn", "src\AddIns\DisplayBindings\ILSpyAddIn\ILSpyAddIn.csproj", "88305E42-C90D-410F-B831-15161E23BAAA" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Analysis", "Analysis", "{F355E45F-F54F-4B42-8916-9A633A392789}" - ProjectSection(SolutionItems) = postProject - EndProjectSection +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Irony", "src\AddIns\Misc\Reports\Irony\Irony.csproj", "{D81F5C91-D7DB-46E5-BC99-49488FB6814C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTesting", "src\AddIns\Analysis\UnitTesting\UnitTesting.csproj", "{1F261725-6318-4434-A1B1-6C70CE4CD324}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Reports.Core", "src\AddIns\Misc\Reports\ICSharpCode.Reports.Core\ICSharpCode.Reports.Core.csproj", "{4B2239FF-8FD6-431D-9D22-1B8049BA6917}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeAnalysis", "src\AddIns\Analysis\CodeAnalysis\CodeAnalysis.csproj", "{3EAA45A9-735C-4AC7-A799-947B93EA449D}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Reports.Addin", "src\AddIns\Misc\Reports\ICSharpCode.Reports.Addin\ICSharpCode.Reports.Addin.csproj", "{35D002D7-C78B-44FB-92AA-104BEB431678}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeCoverage", "src\AddIns\Analysis\CodeCoverage\Project\CodeCoverage.csproj", "{08CE9972-283B-44F4-82FA-966F7DFA6B7A}" - ProjectSection(ProjectDependencies) = postProject - {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Version Control", "Version Control", "{F208FF4F-E5D8-41D5-A7C7-B463976F156E}" + ProjectSection(SolutionItems) = postProject EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SourceAnalysis", "src\AddIns\Analysis\SourceAnalysis\SourceAnalysis.csproj", "{CE498514-D12D-4B6E-AE0E-FEC29BD43748}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SubversionAddIn", "src\AddIns\VersionControl\SubversionAddIn\SubversionAddIn.csproj", "{17F4D7E0-6933-4C2E-8714-FD7E98D625D5}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeQualityAnalysis", "src\AddIns\Analysis\CodeQuality\CodeQualityAnalysis.csproj", "{76DD1CC0-0D86-44A1-9BD6-D91F79807BC3}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitAddIn", "src\AddIns\VersionControl\GitAddIn\GitAddIn.csproj", "{83F15BA7-8478-4664-81BB-A82F146D88B3}" ProjectSection(ProjectDependencies) = postProject {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} EndProjectSection @@ -567,10 +565,6 @@ Global {3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}.Debug|Any CPU.Build.0 = Debug|Any CPU {3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}.Release|Any CPU.ActiveCfg = Release|Any CPU {3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}.Release|Any CPU.Build.0 = Release|Any CPU - {E73BB233-D88B-44A7-A98F-D71EE158381D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E73BB233-D88B-44A7-A98F-D71EE158381D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E73BB233-D88B-44A7-A98F-D71EE158381D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E73BB233-D88B-44A7-A98F-D71EE158381D}.Release|Any CPU.Build.0 = Release|Any CPU {4AC2D5F1-F671-480C-A075-6BF62B3721B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4AC2D5F1-F671-480C-A075-6BF62B3721B2}.Debug|Any CPU.Build.0 = Debug|Any CPU {4AC2D5F1-F671-480C-A075-6BF62B3721B2}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -1124,113 +1118,112 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {1152B71B-3C05-4598-B20D-823B5D40559E} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01} - {8035765F-D51F-4A0C-A746-2FD100E19419} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01} - {2748AD25-9C63-4E12-877B-4DCE96FBED54} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01} - {80318B5F-A25D-45AB-8A95-EF31D2370A4C} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01} - {924EE450-603D-49C1-A8E5-4AFAA31CE6F3} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01} - {857CA1A3-FC88-4BE0-AB6A-D1EE772AB288} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01} - {7E4A7172-7FF5-48D0-B719-7CD959DD1AC9} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01} - {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01} - {AD6FAA08-D6F5-4DBA-AF85-F4DA9F40C3B5} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01} - {4980B743-B32F-4aba-AABD-45E2CAD3568D} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01} - {7DB80259-24D4-46C3-A024-53FF1987733D} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01} - {C3CBC8E3-81D8-4C5B-9941-DCCD12D50B1F} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01} {B5F54272-49F0-40DB-845A-8D837875D3BA} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01} - {DDE2A481-8271-4EAC-A330-8FA6A38D13D1} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C} - {E73BB233-D88B-44A7-A98F-D71EE158381D} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C} - {4139CCF6-FB49-4A9D-B2CF-331E9EA3198D} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C} - {6C55B776-26D4-4DB3-A6AB-87E783B2F3D1} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C} - {2FF700C2-A38A-48BD-A637-8CAFD4FE6237} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C} - {E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C} + {C3CBC8E3-81D8-4C5B-9941-DCCD12D50B1F} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01} + {7DB80259-24D4-46C3-A024-53FF1987733D} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01} + {4980B743-B32F-4aba-AABD-45E2CAD3568D} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01} + {AD6FAA08-D6F5-4DBA-AF85-F4DA9F40C3B5} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01} + {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01} + {7E4A7172-7FF5-48D0-B719-7CD959DD1AC9} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01} + {857CA1A3-FC88-4BE0-AB6A-D1EE772AB288} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01} + {924EE450-603D-49C1-A8E5-4AFAA31CE6F3} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01} + {80318B5F-A25D-45AB-8A95-EF31D2370A4C} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01} + {2748AD25-9C63-4E12-877B-4DCE96FBED54} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01} + {8035765F-D51F-4A0C-A746-2FD100E19419} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01} + {1152B71B-3C05-4598-B20D-823B5D40559E} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01} {D68133BD-1E63-496E-9EDE-4FBDBF77B486} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C} - {3A9AE6AA-BC07-4A2F-972C-581E3AE2F195} = {E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865} + {E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C} + {2FF700C2-A38A-48BD-A637-8CAFD4FE6237} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C} + {6C55B776-26D4-4DB3-A6AB-87E783B2F3D1} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C} + {4139CCF6-FB49-4A9D-B2CF-331E9EA3198D} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C} + {DDE2A481-8271-4EAC-A330-8FA6A38D13D1} = {2A232EF1-EB95-41C6-B63A-C106E0C95D3C} {B22522AA-B5BF-4A58-AC6D-D4B45805521F} = {E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865} - {F355E45F-F54F-4B42-8916-9A633A392789} = {39327899-ED91-4F7F-988C-4FE4E17C014D} - {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F} = {39327899-ED91-4F7F-988C-4FE4E17C014D} - {F3662720-9EA2-4591-BBC6-97361DCE50A9} = {39327899-ED91-4F7F-988C-4FE4E17C014D} - {CDE0C5A4-2096-48B5-BEA3-74DBA0F0E1EF} = {39327899-ED91-4F7F-988C-4FE4E17C014D} - {E0646C25-36F2-4524-969F-FA621353AB94} = {39327899-ED91-4F7F-988C-4FE4E17C014D} - {C4035C32-026F-4158-AF15-113EA1EF1960} = {39327899-ED91-4F7F-988C-4FE4E17C014D} - {8789D7FF-B36C-4187-B57D-55ED64623272} = {39327899-ED91-4F7F-988C-4FE4E17C014D} + {3A9AE6AA-BC07-4A2F-972C-581E3AE2F195} = {E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865} {F208FF4F-E5D8-41D5-A7C7-B463976F156E} = {39327899-ED91-4F7F-988C-4FE4E17C014D} - {17F4D7E0-6933-4C2E-8714-FD7E98D625D5} = {F208FF4F-E5D8-41D5-A7C7-B463976F156E} - {83F15BA7-8478-4664-81BB-A82F146D88B3} = {F208FF4F-E5D8-41D5-A7C7-B463976F156E} - {D81F5C91-D7DB-46E5-BC99-49488FB6814C} = {8789D7FF-B36C-4187-B57D-55ED64623272} - {4B2239FF-8FD6-431D-9D22-1B8049BA6917} = {8789D7FF-B36C-4187-B57D-55ED64623272} - {35D002D7-C78B-44FB-92AA-104BEB431678} = {8789D7FF-B36C-4187-B57D-55ED64623272} - {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} = {C4035C32-026F-4158-AF15-113EA1EF1960} - {72FFB35A-C9E2-4A31-B4FA-E3E3E28DED5F} = {C4035C32-026F-4158-AF15-113EA1EF1960} - {BDA49550-5ED1-4C6B-B648-657B2CACD8E0} = {C4035C32-026F-4158-AF15-113EA1EF1960} - {D294A12D-4B38-4F25-9AA6-3D4A6CE26E7B} = {C4035C32-026F-4158-AF15-113EA1EF1960} - {7048AE18-EB93-4A84-82D0-DD60EB58ADBD} = {E0646C25-36F2-4524-969F-FA621353AB94} - {E954F3CB-A446-492F-A664-2B376EBC86E8} = {E0646C25-36F2-4524-969F-FA621353AB94} - {7C96B65D-28A5-4F28-A35B-8D83CE831EE8} = {E0646C25-36F2-4524-969F-FA621353AB94} - {BF38FB72-B380-4196-AF8C-95749D726C61} = {E0646C25-36F2-4524-969F-FA621353AB94} - {1F1AC7CD-D154-45BB-8EAF-804CA8055F5A} = {E0646C25-36F2-4524-969F-FA621353AB94} - {E1B288A2-08EE-4318-8BBB-8AB72C69E33E} = {E0646C25-36F2-4524-969F-FA621353AB94} - {CA76F702-5B4E-4918-B8D8-7FF8382434FF} = {E0646C25-36F2-4524-969F-FA621353AB94} - {97B3B514-AB0E-4FE1-89DE-8A945F5112AE} = {E0646C25-36F2-4524-969F-FA621353AB94} - {70966F84-74C9-4067-A379-0C674A929233} = {E0646C25-36F2-4524-969F-FA621353AB94} - {C7288E72-FFBE-48CD-84B4-6CBF95A7195A} = {E0646C25-36F2-4524-969F-FA621353AB94} - {C896FFFF-5B6C-4B0E-B6DF-049865F501B4} = {C7288E72-FFBE-48CD-84B4-6CBF95A7195A} - {DBCF20A1-BA13-4582-BFA9-74DE4D987B73} = {97B3B514-AB0E-4FE1-89DE-8A945F5112AE} - {4AC2D5F1-F671-480C-A075-6BF62B3721B2} = {97B3B514-AB0E-4FE1-89DE-8A945F5112AE} - {8D732610-8FC6-43BA-94C9-7126FD7FE361} = {CA76F702-5B4E-4918-B8D8-7FF8382434FF} - {D332F2D1-2CF1-43B7-903C-844BD5211A7E} = {CA76F702-5B4E-4918-B8D8-7FF8382434FF} - {EC06F96A-AEEC-49D6-B03D-AB87C6EB674C} = {CDE0C5A4-2096-48B5-BEA3-74DBA0F0E1EF} - {1D18D788-F7EE-4585-A23B-34DC8EC63CB8} = {CDE0C5A4-2096-48B5-BEA3-74DBA0F0E1EF} - {DEFC8584-BEC3-4921-BD0F-40482E450B7B} = {F3662720-9EA2-4591-BBC6-97361DCE50A9} - {461606BD-E824-4D0A-8CBA-01810B1F5E02} = {F3662720-9EA2-4591-BBC6-97361DCE50A9} - {64A3E5E6-90BF-47F6-94DF-68C94B62C817} = {F3662720-9EA2-4591-BBC6-97361DCE50A9} - {5EEB99CF-EA2B-4733-80A6-CE9192D68170} = {F3662720-9EA2-4591-BBC6-97361DCE50A9} - {D022A6CE-7438-41E8-AC64-F2DE18EC54C6} = {F3662720-9EA2-4591-BBC6-97361DCE50A9} - {4B8F0F98-8BE1-402B-AA8B-C8D548577B38} = {F3662720-9EA2-4591-BBC6-97361DCE50A9} - {F93E52FD-DA66-4CE5-A0CB-BCD902811122} = {F3662720-9EA2-4591-BBC6-97361DCE50A9} - {7D5C266F-D6FF-4D14-B315-0C0FC6C4EF51} = {F3662720-9EA2-4591-BBC6-97361DCE50A9} - {9196DD8A-B4D4-4780-8742-C5762E547FC2} = {F3662720-9EA2-4591-BBC6-97361DCE50A9} - {3CA90546-3B4C-4663-9445-C4E9371750A7} = {F3662720-9EA2-4591-BBC6-97361DCE50A9} - {80F76D10-0B44-4D55-B4BD-DAEB5464090C} = {F3662720-9EA2-4591-BBC6-97361DCE50A9} - {50B51AAA-80E3-4C4A-8B2D-CAF440A82B78} = {F3662720-9EA2-4591-BBC6-97361DCE50A9} - {B5D8C3E6-42EC-4D4B-AD05-3644B32563EF} = {F3662720-9EA2-4591-BBC6-97361DCE50A9} - {A406803B-C584-43A3-BCEE-A0BB3132CB5F} = {50B51AAA-80E3-4C4A-8B2D-CAF440A82B78} - {AE4AB0FA-6087-4480-AF37-0FA1452B3DA1} = {50B51AAA-80E3-4C4A-8B2D-CAF440A82B78} - {E0A5E80A-003B-4335-A9DC-A76E2E46D38D} = {50B51AAA-80E3-4C4A-8B2D-CAF440A82B78} - {0008FCE9-9EB4-4E2E-979B-553278E5BBA6} = {DEFC8584-BEC3-4921-BD0F-40482E450B7B} - {6B1CFE35-DA17-4DEB-9C6E-227E5E251DA0} = {DEFC8584-BEC3-4921-BD0F-40482E450B7B} - {814DFF39-5324-40BE-90EA-F62F758660B3} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F} - {6022AC51-B658-4C54-97EF-79187AC65B47} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F} - {0773ED53-08E2-4495-A3BE-CA0B5D413C15} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F} - {E618A9CD-A39F-4925-A538-E8A3FEF24E54} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F} - {CBC6C247-747B-4908-B09A-4D2E0F640B6B} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F} - {0162E499-42D0-409B-AA25-EED21F75336B} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F} - {DCA2703D-250A-463E-A68A-07ED105AE6BD} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F} - {7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F} - {BFA3BF26-33BD-4A65-B84D-C7F30D131668} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F} - {C7F29FC2-1B03-4CDD-9E30-400F4765FF04} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F} + {8789D7FF-B36C-4187-B57D-55ED64623272} = {39327899-ED91-4F7F-988C-4FE4E17C014D} + {C4035C32-026F-4158-AF15-113EA1EF1960} = {39327899-ED91-4F7F-988C-4FE4E17C014D} + {E0646C25-36F2-4524-969F-FA621353AB94} = {39327899-ED91-4F7F-988C-4FE4E17C014D} + {CDE0C5A4-2096-48B5-BEA3-74DBA0F0E1EF} = {39327899-ED91-4F7F-988C-4FE4E17C014D} + {F3662720-9EA2-4591-BBC6-97361DCE50A9} = {39327899-ED91-4F7F-988C-4FE4E17C014D} + {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F} = {39327899-ED91-4F7F-988C-4FE4E17C014D} + {F355E45F-F54F-4B42-8916-9A633A392789} = {39327899-ED91-4F7F-988C-4FE4E17C014D} + {1F261725-6318-4434-A1B1-6C70CE4CD324} = {F355E45F-F54F-4B42-8916-9A633A392789} + {3EAA45A9-735C-4AC7-A799-947B93EA449D} = {F355E45F-F54F-4B42-8916-9A633A392789} + {08CE9972-283B-44F4-82FA-966F7DFA6B7A} = {F355E45F-F54F-4B42-8916-9A633A392789} + {CE498514-D12D-4B6E-AE0E-FEC29BD43748} = {F355E45F-F54F-4B42-8916-9A633A392789} + {76DD1CC0-0D86-44A1-9BD6-D91F79807BC3} = {F355E45F-F54F-4B42-8916-9A633A392789} {85226AFB-CE71-4851-9A75-7EEC663A8E8A} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F} - {A9F12710-24E4-46D4-832C-6ECB395B9EAD} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04} - {B7823AE9-4B43-4859-8796-2EBDC116FBB8} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04} - {BAD94D6E-4159-4CB6-B991-486F412D9BB6} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04} - {5C70D6AB-0A33-43F9-B8B5-54558C35BBB1} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04} - {EEF5E054-4192-4A57-8FBF-E860D808A51D} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04} - {AFE34868-AFA1-4E1C-9450-47AB4BE329D5} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04} - {08F772A1-F0BE-433E-8B37-F6522953DB05} = {BFA3BF26-33BD-4A65-B84D-C7F30D131668} - {5A1354DF-4989-4BB4-BC6B-D627C2E9FA13} = {BFA3BF26-33BD-4A65-B84D-C7F30D131668} - {0991423A-DBF6-4C89-B365-A1DF1EB32E42} = {BFA3BF26-33BD-4A65-B84D-C7F30D131668} - {DFB936AD-90EE-4B4F-941E-4F4A636F0D92} = {0773ED53-08E2-4495-A3BE-CA0B5D413C15} - {DC1CCE11-CB91-40FA-9C47-4D9EB5D67BFD} = {0773ED53-08E2-4495-A3BE-CA0B5D413C15} - {88DA149F-21B2-48AB-82C4-28FB6BDFD783} = {6022AC51-B658-4C54-97EF-79187AC65B47} - {78CC29AC-CC79-4355-B1F2-97936DF198AC} = {6022AC51-B658-4C54-97EF-79187AC65B47} - {9A9D6FD4-6A2E-455D-ACC3-DDA775FE9865} = {6022AC51-B658-4C54-97EF-79187AC65B47} - {66A378A1-E9F4-4AD5-8946-D0EC06C2902F} = {6022AC51-B658-4C54-97EF-79187AC65B47} - 88305E42-C90D-410F-B831-15161E23BAAA = {814DFF39-5324-40BE-90EA-F62F758660B3} - {3B2A5653-EC97-4001-BB9B-D90F1AF2C371} = {814DFF39-5324-40BE-90EA-F62F758660B3} + {C7F29FC2-1B03-4CDD-9E30-400F4765FF04} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F} + {BFA3BF26-33BD-4A65-B84D-C7F30D131668} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F} + {7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F} + {DCA2703D-250A-463E-A68A-07ED105AE6BD} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F} + {0162E499-42D0-409B-AA25-EED21F75336B} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F} + {CBC6C247-747B-4908-B09A-4D2E0F640B6B} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F} + {E618A9CD-A39F-4925-A538-E8A3FEF24E54} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F} + {0773ED53-08E2-4495-A3BE-CA0B5D413C15} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F} + {6022AC51-B658-4C54-97EF-79187AC65B47} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F} + {814DFF39-5324-40BE-90EA-F62F758660B3} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F} {984CC812-9470-4A13-AFF9-CC44068D666C} = {814DFF39-5324-40BE-90EA-F62F758660B3} - {76DD1CC0-0D86-44A1-9BD6-D91F79807BC3} = {F355E45F-F54F-4B42-8916-9A633A392789} - {CE498514-D12D-4B6E-AE0E-FEC29BD43748} = {F355E45F-F54F-4B42-8916-9A633A392789} - {08CE9972-283B-44F4-82FA-966F7DFA6B7A} = {F355E45F-F54F-4B42-8916-9A633A392789} - {3EAA45A9-735C-4AC7-A799-947B93EA449D} = {F355E45F-F54F-4B42-8916-9A633A392789} - {1F261725-6318-4434-A1B1-6C70CE4CD324} = {F355E45F-F54F-4B42-8916-9A633A392789} + {3B2A5653-EC97-4001-BB9B-D90F1AF2C371} = {814DFF39-5324-40BE-90EA-F62F758660B3} + 88305E42-C90D-410F-B831-15161E23BAAA = {814DFF39-5324-40BE-90EA-F62F758660B3} + {66A378A1-E9F4-4AD5-8946-D0EC06C2902F} = {6022AC51-B658-4C54-97EF-79187AC65B47} + {9A9D6FD4-6A2E-455D-ACC3-DDA775FE9865} = {6022AC51-B658-4C54-97EF-79187AC65B47} + {78CC29AC-CC79-4355-B1F2-97936DF198AC} = {6022AC51-B658-4C54-97EF-79187AC65B47} + {88DA149F-21B2-48AB-82C4-28FB6BDFD783} = {6022AC51-B658-4C54-97EF-79187AC65B47} + {DC1CCE11-CB91-40FA-9C47-4D9EB5D67BFD} = {0773ED53-08E2-4495-A3BE-CA0B5D413C15} + {DFB936AD-90EE-4B4F-941E-4F4A636F0D92} = {0773ED53-08E2-4495-A3BE-CA0B5D413C15} + {0991423A-DBF6-4C89-B365-A1DF1EB32E42} = {BFA3BF26-33BD-4A65-B84D-C7F30D131668} + {5A1354DF-4989-4BB4-BC6B-D627C2E9FA13} = {BFA3BF26-33BD-4A65-B84D-C7F30D131668} + {08F772A1-F0BE-433E-8B37-F6522953DB05} = {BFA3BF26-33BD-4A65-B84D-C7F30D131668} + {AFE34868-AFA1-4E1C-9450-47AB4BE329D5} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04} + {EEF5E054-4192-4A57-8FBF-E860D808A51D} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04} + {5C70D6AB-0A33-43F9-B8B5-54558C35BBB1} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04} + {BAD94D6E-4159-4CB6-B991-486F412D9BB6} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04} + {B7823AE9-4B43-4859-8796-2EBDC116FBB8} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04} + {A9F12710-24E4-46D4-832C-6ECB395B9EAD} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04} + {B5D8C3E6-42EC-4D4B-AD05-3644B32563EF} = {F3662720-9EA2-4591-BBC6-97361DCE50A9} + {50B51AAA-80E3-4C4A-8B2D-CAF440A82B78} = {F3662720-9EA2-4591-BBC6-97361DCE50A9} + {80F76D10-0B44-4D55-B4BD-DAEB5464090C} = {F3662720-9EA2-4591-BBC6-97361DCE50A9} + {3CA90546-3B4C-4663-9445-C4E9371750A7} = {F3662720-9EA2-4591-BBC6-97361DCE50A9} + {9196DD8A-B4D4-4780-8742-C5762E547FC2} = {F3662720-9EA2-4591-BBC6-97361DCE50A9} + {7D5C266F-D6FF-4D14-B315-0C0FC6C4EF51} = {F3662720-9EA2-4591-BBC6-97361DCE50A9} + {F93E52FD-DA66-4CE5-A0CB-BCD902811122} = {F3662720-9EA2-4591-BBC6-97361DCE50A9} + {4B8F0F98-8BE1-402B-AA8B-C8D548577B38} = {F3662720-9EA2-4591-BBC6-97361DCE50A9} + {D022A6CE-7438-41E8-AC64-F2DE18EC54C6} = {F3662720-9EA2-4591-BBC6-97361DCE50A9} + {5EEB99CF-EA2B-4733-80A6-CE9192D68170} = {F3662720-9EA2-4591-BBC6-97361DCE50A9} + {64A3E5E6-90BF-47F6-94DF-68C94B62C817} = {F3662720-9EA2-4591-BBC6-97361DCE50A9} + {461606BD-E824-4D0A-8CBA-01810B1F5E02} = {F3662720-9EA2-4591-BBC6-97361DCE50A9} + {DEFC8584-BEC3-4921-BD0F-40482E450B7B} = {F3662720-9EA2-4591-BBC6-97361DCE50A9} + {6B1CFE35-DA17-4DEB-9C6E-227E5E251DA0} = {DEFC8584-BEC3-4921-BD0F-40482E450B7B} + {0008FCE9-9EB4-4E2E-979B-553278E5BBA6} = {DEFC8584-BEC3-4921-BD0F-40482E450B7B} + {E0A5E80A-003B-4335-A9DC-A76E2E46D38D} = {50B51AAA-80E3-4C4A-8B2D-CAF440A82B78} + {AE4AB0FA-6087-4480-AF37-0FA1452B3DA1} = {50B51AAA-80E3-4C4A-8B2D-CAF440A82B78} + {A406803B-C584-43A3-BCEE-A0BB3132CB5F} = {50B51AAA-80E3-4C4A-8B2D-CAF440A82B78} + {1D18D788-F7EE-4585-A23B-34DC8EC63CB8} = {CDE0C5A4-2096-48B5-BEA3-74DBA0F0E1EF} + {EC06F96A-AEEC-49D6-B03D-AB87C6EB674C} = {CDE0C5A4-2096-48B5-BEA3-74DBA0F0E1EF} + {C7288E72-FFBE-48CD-84B4-6CBF95A7195A} = {E0646C25-36F2-4524-969F-FA621353AB94} + {70966F84-74C9-4067-A379-0C674A929233} = {E0646C25-36F2-4524-969F-FA621353AB94} + {97B3B514-AB0E-4FE1-89DE-8A945F5112AE} = {E0646C25-36F2-4524-969F-FA621353AB94} + {CA76F702-5B4E-4918-B8D8-7FF8382434FF} = {E0646C25-36F2-4524-969F-FA621353AB94} + {E1B288A2-08EE-4318-8BBB-8AB72C69E33E} = {E0646C25-36F2-4524-969F-FA621353AB94} + {1F1AC7CD-D154-45BB-8EAF-804CA8055F5A} = {E0646C25-36F2-4524-969F-FA621353AB94} + {BF38FB72-B380-4196-AF8C-95749D726C61} = {E0646C25-36F2-4524-969F-FA621353AB94} + {7C96B65D-28A5-4F28-A35B-8D83CE831EE8} = {E0646C25-36F2-4524-969F-FA621353AB94} + {E954F3CB-A446-492F-A664-2B376EBC86E8} = {E0646C25-36F2-4524-969F-FA621353AB94} + {7048AE18-EB93-4A84-82D0-DD60EB58ADBD} = {E0646C25-36F2-4524-969F-FA621353AB94} + {D332F2D1-2CF1-43B7-903C-844BD5211A7E} = {CA76F702-5B4E-4918-B8D8-7FF8382434FF} + {8D732610-8FC6-43BA-94C9-7126FD7FE361} = {CA76F702-5B4E-4918-B8D8-7FF8382434FF} + {4AC2D5F1-F671-480C-A075-6BF62B3721B2} = {97B3B514-AB0E-4FE1-89DE-8A945F5112AE} + {DBCF20A1-BA13-4582-BFA9-74DE4D987B73} = {97B3B514-AB0E-4FE1-89DE-8A945F5112AE} + {C896FFFF-5B6C-4B0E-B6DF-049865F501B4} = {C7288E72-FFBE-48CD-84B4-6CBF95A7195A} + {D294A12D-4B38-4F25-9AA6-3D4A6CE26E7B} = {C4035C32-026F-4158-AF15-113EA1EF1960} + {BDA49550-5ED1-4C6B-B648-657B2CACD8E0} = {C4035C32-026F-4158-AF15-113EA1EF1960} + {72FFB35A-C9E2-4A31-B4FA-E3E3E28DED5F} = {C4035C32-026F-4158-AF15-113EA1EF1960} + {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} = {C4035C32-026F-4158-AF15-113EA1EF1960} + {35D002D7-C78B-44FB-92AA-104BEB431678} = {8789D7FF-B36C-4187-B57D-55ED64623272} + {4B2239FF-8FD6-431D-9D22-1B8049BA6917} = {8789D7FF-B36C-4187-B57D-55ED64623272} + {D81F5C91-D7DB-46E5-BC99-49488FB6814C} = {8789D7FF-B36C-4187-B57D-55ED64623272} + {83F15BA7-8478-4664-81BB-A82F146D88B3} = {F208FF4F-E5D8-41D5-A7C7-B463976F156E} + {17F4D7E0-6933-4C2E-8714-FD7E98D625D5} = {F208FF4F-E5D8-41D5-A7C7-B463976F156E} EndGlobalSection EndGlobal diff --git a/data/resources/StringResources.cz.resx b/data/resources/StringResources.cz.resx index beb30ead66..1face74cb4 100644 --- a/data/resources/StringResources.cz.resx +++ b/data/resources/StringResources.cz.resx @@ -574,9 +574,6 @@ SharpDevelop může sledovat využívání jednotlivých funkcí a informace aut Soubor - - Řádek - O Inspektoru @@ -2983,6 +2980,9 @@ Můžete se také rozhodnout, že všechny volby budou uloženy ve vlastním .us Start + + Řádek + Akt&ualizovat @@ -3250,9 +3250,6 @@ Můžete se také rozhodnout, že všechny volby budou uloženy ve vlastním .us Koncový řádek - - Řádek - Nemohu najít konzolovou aplikaci NCover. diff --git a/data/resources/StringResources.de.resx b/data/resources/StringResources.de.resx index 76e3769c3e..53ccae4c4c 100644 --- a/data/resources/StringResources.de.resx +++ b/data/resources/StringResources.de.resx @@ -298,6 +298,15 @@ Laden Sie ein AddIn aus dem Internet herunter, klicken Sie auf "AddIn installier Zahlensystem + + Dezimal + + + Hexadezimal + + + Oktal + Größe an aktuelle Breite anpassen @@ -780,9 +789,6 @@ Optional können Sie auch ein Arbeitsverzeichnis und Kommandozeilen-Argumente an '{0}' wurde von der Ignorier-Liste entfernt. - - Alte Projektmappe offen halten - Datei sperren @@ -810,13 +816,6 @@ Optional können Sie auch ein Arbeitsverzeichnis und Kommandozeilen-Argumente an Zeige &Vergangenheits-Tab für Dateien unter Versionskontrolle - - Projektmappe neu laden - - - SharpDevelop hat festgestellt, dass die Versionskontroll-Operation Projektdateien verändert hat. -Sie sollten die Projektmappe neu laden. - Umplatzieren @@ -978,9 +977,6 @@ Ein Ausführungskommando kann in den Projektoptionen eingestellt werden. Datei - - Zeile - Info @@ -3482,6 +3478,9 @@ Sie können die Einstellungen auch in einer .user-Datei anstelle der Projektdate Start + + Zeile + Akt&ualisieren @@ -3759,9 +3758,6 @@ Bitte einen anderen Dateinamen wählen. Endzeile - - Zeile - Kann die NCover Konsolenanwendung nicht finden. @@ -4803,6 +4799,12 @@ Grund: Der Wert zu dem zurückgesetzt werden soll ist ungültig weil sich eine a Lade ${Filename}... + + Alte Projektmappe offen halten + + + Projektmappe neu laden + Neue &Compilerversion: diff --git a/data/resources/StringResources.es-mx.resx b/data/resources/StringResources.es-mx.resx index eb0f16db1a..fd41512f3c 100644 --- a/data/resources/StringResources.es-mx.resx +++ b/data/resources/StringResources.es-mx.resx @@ -298,6 +298,15 @@ Descargue un complemento de Internet, luego haga clic en "Instalar AddIn" y sele Sistema numérico + + Decimal + + + Hexadecimal + + + Octal + Ajustar al ancho actual @@ -781,9 +790,6 @@ Opcionalmente puede especificar un directorio de trabajo y argumentos de línea '{0}' fue quitado de la lista de ignorados. - - Mantener abierta la solución antigua - Bloquear @@ -811,13 +817,6 @@ Opcionalmente puede especificar un directorio de trabajo y argumentos de línea Mostrar el tab &historial para archivos de control de versión - - Recargar solución - - - SharpDevelop detectó que la operación de control de versión cambió archivos de proyecto. -Debería recargar la solución. - Realojar @@ -979,9 +978,6 @@ SharpDevelop puede obtener esta información y enviarla automáticamente. Archivo - - Línea - Acerca de @@ -2420,6 +2416,12 @@ Adicionalmente, se le puede asignar a una extensión un conjunto de reglas defin Depuración + + Excepciones + + + Pausar en excepciones controladas + Paso por Instrucciones @@ -2618,6 +2620,15 @@ Adicionalmente, se le puede asignar a una extensión un conjunto de reglas defin Apariencia + + Expandir referencias de proyectos (reflect references) + + + Opciones de Interfaz Gráfica de Sharp Develop + + + Opciones de Interfaz Gráfica de Sharp Develop + Etiquetas de comentarios @@ -2973,7 +2984,7 @@ Adicionalmente, se le puede asignar a una extensión un conjunto de reglas defin Procesador Intel Itanium de 64-bits - Procesador AMD de 64-bits + Procesador x86-64 Procesador Intel-compatible de 32-bits @@ -3487,6 +3498,9 @@ También puede elegir guardar la opción en el archivo .user en lugar de en el a Iniciar + + Línea + &Actualizar @@ -3763,9 +3777,6 @@ También puede elegir guardar la opción en el archivo .user en lugar de en el a Línea Final - - Línea - Si NCover está instalado, por favor especifique la ubicación de la aplicación en las opciones de Cobertura de Código. @@ -4282,7 +4293,7 @@ Por favor configure la ubicación del archivo ejecutable de NAnt en las opciones El archivo ${File} -ha sido cambiado de manera externa, ¿desea recargarlo? +ha sido cambiado de manera externa. ¿Desea recargarlo? Búsqueda Incremental: @@ -4801,6 +4812,15 @@ Utilice solamente letras, dígitos, espacio, '.' ó '_'. Cargando ${Filename}... + + Mantener abierta la solución antigua + + + Recargar solución + + + La solución ha sido cambiada externamente. + Convertir &proyectos seleccionados a: @@ -5335,6 +5355,24 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension< Salida XSLT + + ILSpy no se pudo encontrar en la ubicación especificada, o SharpDevelop no tiene suficientes permisos para acceder a dicha ubicación. + + + La ruta a ILSpy aun no ha sido establecida. + + + Abrir ILSpy + + + Esta caracteristica requiere ILSpy. Si aun no la tiene, puede descargarlo gratuitamente aquí: + + + Ruta completa a ILSpy.exe + + + Establecer ruta a ILSpy + No se pudo cargar el archivo de configuración de herramientas externas. @@ -5503,6 +5541,9 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension< Lenguaje + + Módulo + Mostrar nombres de argumentos @@ -5512,6 +5553,12 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension< Mostrar métodos externos + + Mostrar número de línea + + + Mostrar nombres de módulos + Preguntar @@ -5659,6 +5706,39 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension< Miembros Estáticos (Static) + + Memoria + + + La dirección {0} no se encontró! + + + Mostrar tamaño en bytes: + + + Saltar a la dirección: + + + Siguientes direcciones virtuales + + + No hay mapeo para direcciones de memoria! + + + Ninguna depuración o proceso esta en ejecución! + + + Anteriores direcciones virtuales + + + Leyendo desde {0} hasta {1} - tamaño {2}. + + + Actualizar direcciones actuales + + + Incapaz de leer la dirección {0} de tamaño {1}. + Módulos cargados @@ -5987,7 +6067,7 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension< Copiar ruta/nombre de archivo - Abrir Carpeta Contenedora en el Explorador + Abrir carpeta contenedora en el Explorador Colapsar todos los nodos @@ -7502,6 +7582,9 @@ Los archivos de recursos han sido renombrados/movidos convenientemente. Eliminar todos los puntos de interrupción + + Ejecutar último build + Ejecutar &sin depurador diff --git a/data/resources/StringResources.es.resx b/data/resources/StringResources.es.resx index 322dd03f4a..94be487eac 100644 --- a/data/resources/StringResources.es.resx +++ b/data/resources/StringResources.es.resx @@ -298,6 +298,15 @@ Descargue un complemento de Internet, luego haga clic en 'Instalar Complemento' Sistema numérico + + Decimal + + + Hexadecimal + + + Octal + Ajustar al ancho actual @@ -780,9 +789,6 @@ Opcionalmente puede especificar un directorio de trabajo y argumentos de línea '{0}' fue quitado de la lista de ignorados. - - Mantener abierta la solución antigua - Bloquear @@ -810,13 +816,6 @@ Opcionalmente puede especificar un directorio de trabajo y argumentos de línea Mostrar el tab &historial para archivos de control de versión - - Recargar solución - - - SharpDevelop ha detectado que la operación de control de versión ha cambiado archivos de proyecto. -Debería recargar la solución. - Realojar @@ -977,9 +976,6 @@ SharpDevelop puede obtener esta información y enviarla automáticamente. Archivo - - Línea - Acerca de @@ -2417,6 +2413,12 @@ Adicionalmente, se le puede asignar a una extensión un conjunto de reglas defin Depuración + + Excepciones + + + Pausar en excepciones controladas + Paso por Instrucciones @@ -2615,6 +2617,15 @@ Adicionalmente, se le puede asignar a una extensión un conjunto de reglas defin Apariencia + + Expandir referencias de proyectos (reflect references) + + + Opciones de Interfaz Gráfica de Sharp Develop + + + Opciones de Interfaz Gráfica de Sharp Develop + Etiquetas de Comentarios @@ -2970,7 +2981,7 @@ Adicionalmente, se le puede asignar a una extensión un conjunto de reglas defin Procesador Intel Itanium de 64 bits - Procesador AMD de 64 bits + Procesador x86-64 procesador compatible con un Intel de 32 bits @@ -3488,6 +3499,9 @@ También puede escoger almacenar el parámetro de configuración en el archivo . Empezar + + Línea + &Actualizar @@ -3764,9 +3778,6 @@ También puede escoger almacenar el parámetro de configuración en el archivo . Línea Final - - Línea - Si NCover está instalado, por favor especifique la ubicación de la aplicación en las opciones de Cobertura de Código. @@ -4284,7 +4295,7 @@ Se perderán todos los cambios. El archivo ${File} -ha sido modificado externamente, ¿desea volver a cargarlo? +ha sido modificado externamente. ¿Desea volver a cargarlo? Búsqueda Incremental: @@ -4804,6 +4815,15 @@ Solamente letras, dígitos, espacio, '.' o '_' son permitidos. Cargando ${Filename}... + + Mantener abierta la solución antigua + + + Recargar solución + + + La solución ha sido cambiada externamente. + Convertir &proyectos seleccionados a: @@ -5339,6 +5359,24 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension< Salida XSLT + + ILSpy no se pudo encontrar en la ubicación especificada, o SharpDevelop no tiene suficientes permisos para acceder a dicha ubicación. + + + La ruta a ILSpy aun no ha sido establecida. + + + Abrir ILSpy + + + Esta caracteristica requiere ILSpy. Si aun no la tiene, puede descargarlo gratuitamente aquí: + + + Ruta completa a ILSpy.exe + + + Establecer ruta a ILSpy + No se puede cargar archivo de configuración de herramientas externas. @@ -5507,6 +5545,9 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension< Lenguaje + + Módulo + Mostrar los nombres de los argumentos @@ -5516,6 +5557,12 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension< Mostrar métodos externos + + Mostrar número de línea + + + Mostrar nombres de módulos + Preguntar @@ -5663,6 +5710,39 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension< Miembros Estáticos (Static) + + Memoria + + + La dirección {0} no se encontró! + + + Mostrar tamaño en bytes: + + + Saltar a la dirección: + + + Siguientes direcciones virtuales + + + No hay mapeo para direcciones de memoria! + + + Ninguna depuración o proceso esta en ejecución! + + + Anteriores direcciones virtuales + + + Leyendo desde {0} hasta {1} - tamaño {2}. + + + Actualizar direcciones actuales + + + Incapaz de leer la dirección {0} de tamaño {1}. + Módulos Cargados @@ -5991,7 +6071,7 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension< Copiar ruta/nombre del archivo - Abrir Carpeta Contenedora en el Explorador + Abrir carpeta contenedora en el Explorador Colapsar todos los nodos @@ -7507,6 +7587,9 @@ Los archivos de recursos han sido renombrados o cambiados de ubicación de acuer Eliminar todos los puntos de interrupción + + Ejecutar último build + Ejecutar &sin depurador diff --git a/data/resources/StringResources.fr.resx b/data/resources/StringResources.fr.resx index 805186f327..6a1a0f7203 100644 --- a/data/resources/StringResources.fr.resx +++ b/data/resources/StringResources.fr.resx @@ -779,9 +779,6 @@ En option, vous pouvez spécifer un répertoire de travail et des arguments en l '{0}' a été supprimé de la liste d'ignorés. - - Laisser la solution précédente ouverte - Poser un verrou @@ -809,12 +806,6 @@ En option, vous pouvez spécifer un répertoire de travail et des arguments en l Afficher l'&historique des fichiers sous contrôle de version - - Recharger la solution - - - SharpDevelop a detecté que l'opération de contrôle de version a changée des fichiers du projet. Rechargez la solution. - Relocaliser @@ -975,9 +966,6 @@ Sauvegardez ces fichiers avant de déclencher l'opération. Fichier - - Ligne - A propos @@ -2412,6 +2400,12 @@ Voulez-vous ajouter le nouveau fichier au projet ${CurrentProjectName}? Déboguage en cours + + Exceptions + + + Pause lors des exceptions gérées + Pas-à-pas en cours @@ -2976,7 +2970,7 @@ Un changement des arrangements est visible lors du prochain relancement de #Deve Processeur Itanium 64bits - Processeur AMD 64bits + Processeur 64 bits (x64) Processeur 32bits compatible Intel @@ -3491,6 +3485,9 @@ Vous pouvez aussi choisir de stocker la configuration dans le fichier .user-file Démarrer + + Ligne + Mettre à jo&ur @@ -3767,9 +3764,6 @@ Vous pouvez aussi choisir de stocker la configuration dans le fichier .user-file Fin de ligne - - Ligne - Impossible de localiser l'application console NCover. @@ -4806,6 +4800,12 @@ Utilisez seulement des lettres, chiffres, espace, '.' ou '_'. Chargement de ${Filename}... + + Laisser la solution précédente ouverte + + + Recharger la solution + Convertir les projets sélectionnés vers: @@ -5525,9 +5525,6 @@ Soit ils n'existent pas, soit le document Wix n'est pas pour WiX 3.0 et l'espace Langage - - Ligne - Module diff --git a/data/resources/StringResources.it.resx b/data/resources/StringResources.it.resx index 99f769d45c..f42c8f0fa6 100644 --- a/data/resources/StringResources.it.resx +++ b/data/resources/StringResources.it.resx @@ -779,9 +779,6 @@ Installare il .NET Framework SDK per utilizzare il sistema di help. '{0}' è stato rimosso dalla lista degli elementi da ignorare. - - Mantieni aperta la vecchia soluzione - Acquisisci blocco @@ -809,12 +806,6 @@ Installare il .NET Framework SDK per utilizzare il sistema di help. Mostra cronologia per i files sotto il controllo della versione - - Ricarica soluzione - - - SharpDevelop ha individuato dei cambiamenti nei file di progetto a causa del sistema di controllo versione. E' necessario ricaricare la soluzione. - Cambia posizione @@ -975,9 +966,6 @@ Salva questi file prima di eseguire l'operazione. File - - Linea - Informazioni su @@ -2416,6 +2404,12 @@ Vuoi aggiungere il nuovo file al progetto ${CurrentProjectName}? Debugging + + Eccezioni + + + Fermati sulle Eccezioni gestite + Stepping @@ -2979,7 +2973,7 @@ Vuoi aggiungere il nuovo file al progetto ${CurrentProjectName}? Processore Intel 64-bit Itanium - Processori AMD 64-bit + Processore x86-64 Processore compatibile Intel 32-bit @@ -3495,6 +3489,9 @@ Puoi anche scegliere di memorizzare le impostazioni in un file .user invece che Esegui + + Linea + &Aggiorna @@ -3771,9 +3768,6 @@ Puoi anche scegliere di memorizzare le impostazioni in un file .user invece che Fine riga - - Riga - Impossibile trovare l'applicazione console NCover @@ -4815,6 +4809,12 @@ Sono ammesse solo lettere, numeri, spazi, '.' o '_'. Caricamento ${Filename}... + + Mantieni aperta la vecchia soluzione + + + Ricarica soluzione + Converti &progetti selezionati in: @@ -5534,9 +5534,6 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension< Linguaggio - - Riga - Modulo @@ -6063,7 +6060,7 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension< Percorso/nome del file di copia - Apri la cartella in Explorer + Apri la cartella in Esplora risorse Comprimi tutti i nodi diff --git a/data/resources/StringResources.kr.resx b/data/resources/StringResources.kr.resx index 60675487fd..fce49b4fa7 100644 --- a/data/resources/StringResources.kr.resx +++ b/data/resources/StringResources.kr.resx @@ -508,9 +508,6 @@ 파일 - - - 정보 @@ -2945,6 +2942,9 @@ ${CurrentProjectName} 프로젝트에 이 새 파일을 더하겠습니까? 시작 + + + 새로 고침(&U) @@ -3212,9 +3212,6 @@ ${CurrentProjectName} 프로젝트에 이 새 파일을 더하겠습니까? 마지막 줄 - - - NCover 콘솔 응용 프로그램을 찾을 수 없습니다. diff --git a/data/resources/StringResources.nl.resx b/data/resources/StringResources.nl.resx index 168ac7ce31..731b43068c 100644 --- a/data/resources/StringResources.nl.resx +++ b/data/resources/StringResources.nl.resx @@ -297,6 +297,15 @@ Nummering systeem + + Decimaal + + + Hexadecimaal + + + Octaal + De breedte aanpassen aan de aktueel benodigde @@ -780,9 +789,6 @@ De geselecteerde code bevat een break commando zonder de insluitende lus. Wijzig '{0}' is verwijderd uit de negeer lijst. - - De oude oplossing open houden. - Vergrendel @@ -810,12 +816,6 @@ De geselecteerde code bevat een break commando zonder de insluitende lus. Wijzig Geef gesc&hiedenis tab weer voor versie-controle bestanden - - Oplossing opnieuw laden - - - SharpDevelop heeft ontdekt dat de versiecontrole project bestanden gewijzigd heeft. U dient de oplossing opnieuw te laden. - Verplaatsen @@ -975,9 +975,6 @@ De geselecteerde code bevat een break commando zonder de insluitende lus. Wijzig Bestand - - Regel - Info @@ -2419,6 +2416,12 @@ Wilt u het nieuwe bestand toevoegen aan project ${CurrentProjectName}? Foutopsporing + + Uitzonderingen + + + Wachten na afhandeling van uitzonderingen + Stapsgewijs @@ -2981,7 +2984,7 @@ Wilt u het nieuwe bestand toevoegen aan project ${CurrentProjectName}? Intel 64-bit Itanium processor - AMD 64-bit processor + AMD / Intel 64-bit processor 32 bit Intel-compatibele processor @@ -3494,6 +3497,9 @@ Er kan worden gekozen voor opslag van de instellingen in het .user bestand inpla Starten + + Regel + Bijwerken @@ -3770,9 +3776,6 @@ Er kan worden gekozen voor opslag van de instellingen in het .user bestand inpla Eindregel - - Regel - Kan de NCover console toepassing niet vinden. @@ -4289,7 +4292,7 @@ Noot: Dit beïnvloed eigen aangepaste opmaak niet. ${CurrentMethodNumber} van ${NumberOfTotalMethods} - Bestand ${File} is extern gewijzigd. Wilt u deze opnieuw laden? + Bestand ${File} is extern gewijzigd. Wilt u het herladen? Aanvullend zoeken: @@ -4807,6 +4810,15 @@ Alleen letters, getallen, spatie, '.' of '_' zijn toegestaan. Laden van ${Filename}... + + De oude oplossing open houden. + + + Oplossing opnieuw laden + + + De oplossing is extern gewijzigd. + Converteer geselecteerde &projecten naar @@ -5526,9 +5538,6 @@ Microsoft.Tools.WindowsInstallerXml.Extenties.NetFxCompiler, WixNetFxExtentie Taal - - Regel - Module @@ -6055,7 +6064,7 @@ Microsoft.Tools.WindowsInstallerXml.Extenties.NetFxCompiler, WixNetFxExtentieKopieer bestandspad/-naam - Open de map met document in de Explorer + Open de document bevattende map in de Explorer Alle knooppunten invouwen @@ -7571,6 +7580,9 @@ De hulpbron bestanden zijn hernoemd/verplaatst op de beschreven wijze. Verwijder alle breekpunten + + Voer laatste bouw uit. + Uitvoeren &zonder foutopsporing diff --git a/data/resources/StringResources.no.resx b/data/resources/StringResources.no.resx index 0d505ea8a2..f949f6d2d1 100644 --- a/data/resources/StringResources.no.resx +++ b/data/resources/StringResources.no.resx @@ -779,9 +779,6 @@ Du må installere .NET Framework SDK for å få tilgang til hjelpesystemet. '{0}' ble fjernet fra ignorerings-listen. - - Behold den gamle løsningen åpen - Sett lås @@ -809,12 +806,6 @@ Du må installere .NET Framework SDK for å få tilgang til hjelpesystemet. Vis historikk-fanen for filer under versjonskontroll - - Last inn løsningen på nytt - - - SharpDevelop har oppdaget at versjonskontroll-handlingen har endret prosjektfilene. Du bør laste inn løsningen på nytt. - Skift server @@ -976,9 +967,6 @@ SharpDevelop kan samle inn denne informasjonen og laste den opp automatisk. Fil - - Linje - Om @@ -3477,6 +3465,9 @@ Du kan også velge å lagre innstillingen i .user-filen istedet for i prosjektfi Start + + Linje + Oppdater @@ -3753,9 +3744,6 @@ Du kan også velge å lagre innstillingen i .user-filen istedet for i prosjektfi Linjeslutt - - Linje - Finner ikke NCover konsollapplikasjonen. @@ -4790,6 +4778,12 @@ Bare bokstaver, tall, mellomrom, '.' eller '_' er tillatt. Laster ${Filename}... + + Behold den gamle løsningen åpen + + + Last inn løsningen på nytt + Konverter valgte &prosjekter til: diff --git a/data/resources/StringResources.pl.resx b/data/resources/StringResources.pl.resx index 1463b17f9e..8e5f55f0c5 100644 --- a/data/resources/StringResources.pl.resx +++ b/data/resources/StringResources.pl.resx @@ -527,9 +527,6 @@ Musisz zainstalować .NET Framework SDK aby otrzymać system pomocy. Plik - - Wiersz - O... @@ -2753,6 +2750,9 @@ Możesz również wybrać przechowywanie ustawienia w pliku użytkownika zamiast Start + + Wiersz + Akt&ualizuj @@ -2969,9 +2969,6 @@ Możesz również wybrać przechowywanie ustawienia w pliku użytkownika zamiast Końcowy Wiersz - - Wiersz - Jeżeli NCover jest zainstalowane, proszę wskazać lokalizację aplikacji w opcjach Pokrywania Kodu. diff --git a/data/resources/StringResources.pt-br.resx b/data/resources/StringResources.pt-br.resx index 054e4babe7..0c7011bf1f 100644 --- a/data/resources/StringResources.pt-br.resx +++ b/data/resources/StringResources.pt-br.resx @@ -775,9 +775,6 @@ Voce precisa instalar o .Net Framework SDK para acessar o sistema de ajuda. '{0} foi removido da lista ignorar. - - Manter a solução antiga aberta - Obter trava @@ -805,12 +802,6 @@ Voce precisa instalar o .Net Framework SDK para acessar o sistema de ajuda. Exibir aba do &historico para arquivos de versão controlada - - Recarregar solução - - - SharpDevelop verificou que a operação de controle de versão mudou os arquivos do projeto. - Realocar @@ -970,9 +961,6 @@ Voce precisa instalar o .Net Framework SDK para acessar o sistema de ajuda. Arquivo - - Linha - Sobre @@ -3466,6 +3454,9 @@ Além disso, um span pode definir um rule set nomedo que permite uma formataçã Iniciar + + Linha + &Atualizar @@ -3742,9 +3733,6 @@ Além disso, um span pode definir um rule set nomedo que permite uma formataçã Linha Final - - Linha - Se NCover estiver instalado, favor especificar a localização da aplicação nas opções do Code Coverage. @@ -4604,6 +4592,12 @@ Use somente letras, dígitos, espaço, "." ou "_" são permitidos. Carregando ${Filename}... + + Manter a solução antiga aberta + + + Recarregar solução + Ambiente corrente não encontrado. Va para 'Opções->Estilo Visual' e mude o idioma corrente. diff --git a/data/resources/StringResources.pt.resx b/data/resources/StringResources.pt.resx index c941440833..7976b9b2b2 100644 --- a/data/resources/StringResources.pt.resx +++ b/data/resources/StringResources.pt.resx @@ -479,12 +479,24 @@ Precisa de instalar o .NET Framework SDK para utilizar o sistema de ajuda. O perfil de sessão SharpDevelop seleccionado foi criado por uma versão mais recente de SharpDevelop e assim não pode ser aberto. + + Sessão de Profiling SharpDevelop + Este projecto não pode ser iniciado porque o ficheiro executável não foi encontrado, assegure-se, por favor,de que o projecto e todas as suas dependências são construídas correctamente! Nenhum projecto iniciável foi encontrado. Abortar... + + Este projecto não pode ser iniciado. Deseja obter perfil da solução do projecto StartUp em seu lugar? + + + A preparar a análise ... + + + Não foi registado o perfilador no COM Registry. Não é possível começar a obter perfil! + Ciclos CPU: @@ -599,9 +611,6 @@ Precisa de instalar o .NET Framework SDK para utilizar o sistema de ajuda. Ficheiro - - Linha - Acerca @@ -2880,6 +2889,9 @@ Pode também escolher guardar o parâmetro num ficheiro .user-file em vez de no Iniciar + + Linha + &Actualizar @@ -3105,9 +3117,6 @@ Pode também escolher guardar o parâmetro num ficheiro .user-file em vez de no Fim de Linha - - Linha - Impossível localizar o executável de consola NCover. diff --git a/data/resources/StringResources.resx b/data/resources/StringResources.resx index 2a7576fdb0..efa4f23cf3 100644 --- a/data/resources/StringResources.resx +++ b/data/resources/StringResources.resx @@ -234,7 +234,6 @@ Download an AddIn from the Internet, then click 'Install AddIn' and choose the d TortoiseGit needs to be installed to execute this action. - Error message when executing git command but TortoiseGit cannot be found Contents @@ -283,15 +282,12 @@ Download an AddIn from the Internet, then click 'Install AddIn' and choose the d Number of bytes per line - hex editor option (number of bytes displayed in one line) Display - 'display' group box in hex editor options Elements - Elements that can be configured in hex editor options Data @@ -302,9 +298,17 @@ Download an AddIn from the Internet, then click 'Install AddIn' and choose the d Numeral system + + Decimal + + + Hexadecimal + + + Octal + Resize to fit current width - Used for the HexEditor's full width display button in the left corner of the display. Add to Help Favorites @@ -657,7 +661,6 @@ Optionally you can specify a working directory and command line arguments. Extract method - Text of the "Extract Method" refactoring menu command. The selected code contains a break statement without the enclosing loop. Please change the selection! @@ -679,9 +682,6 @@ Optionally you can specify a working directory and command line arguments. Extracting methods in {0} is currently not supported! - Used to notify the user that the MethodExtractor can not extract the code in the current programming language. - -{0} is the value from ProjectService.CurrentProject.Language Insert constructor @@ -739,11 +739,9 @@ Optionally you can specify a working directory and command line arguments. Blame - blame/praise/annotate- show author for each line of code in the file Branch/tag - Shows the dialog for branching/tagging The file/directory cannot be copied because it is in subversion status '{0}'. @@ -756,42 +754,33 @@ Optionally you can specify a working directory and command line arguments. Check for modifications - Command to check a directory for modifications (both local and remote) Checkout - Download source code from the version control server Clean up - Runs svn cleanup, fixing problems in the working copy Commit - Command to upload local changes to version control system Create patch - Create a patch file containing the local modifications Delete directory Diff - Command to show local modifications done to a file Edit conflicts - Command to edit version-control conflicts in a file Error deleting ${File} - Message shown when a file or directory cannot be deleted Export - Export files from the local working copy Force delete @@ -802,20 +791,14 @@ Optionally you can specify a working directory and command line arguments. '{0}' was removed from the ignore list. - - Keep old solution open - Button text to keep old solution open - Get lock Mark conflicts as resolved - Command to tell version-control system that conflicts were resolved Merge - Merge changes from another branch to this directory Automatically &add new files @@ -831,23 +814,12 @@ Optionally you can specify a working directory and command line arguments. Subversion Options - Title of the subversion options panel Show &history tab for version-controlled files - Show tab page History for each version-controlled file - - - Reload solution - Button to confirm reloading the solution after project files were changes - - - SharpDevelop detected that the version control operation changed project files. -You should reload the solution. Relocate - Change the URL of the version control server Remove from ignore list @@ -857,26 +829,21 @@ You should reload the solution. Repository browser - Launch a tool to view the repository of the version control system Revert - Command to revert local modifications done to a version-controlled file The file has local modifications. Do you really want to remove it? Revision graph - Show the revision graph for a directory Save files - Button text to confirm saving all open files Show Log - Shows the history for the file The version control operation would affect files with unsaved modifications. @@ -884,51 +851,40 @@ You have to save those files before running the operation. Switch - Switch the working copy to a different branch TortoiseSVN needs to be installed to execute this action. Update - Command to download changes done by other developers to the working copy Update to revision - Command to update a file to a specific version Thank you for participating! You can still opt-out later using the SharpDevelop options. - text that confirms the user accepted UDC I would like to participate - collect and upload usage data - Option to start participating in usage data collection You can still opt-in later using the SharpDevelop options. - Text that confirms the user declined UDC I do not want to participate - Option for declining to participate in usage data collection We need your help! To improve SharpDevelop in the future, we would like to know which features are used most. SharpDevelop can collect this information and upload it automatically. - introduction to UsageDataCollector, appears on first start of SharpDevelop 4.0 Privacy Statement - text for link to privacy statement Show collected data - button for showing the data collected so far Usage Data Collector - title of the usage data collector start page message (only visible on first start of SharpDevelop 4) and name of the corresponding page in the options dialog Let SharpDevelop figure out the type based on the initializer. @@ -1007,7 +963,6 @@ SharpDevelop can collect this information and upload it automatically. Continue - continue using the current encoding (may cause data loss) Save as UTF-8 @@ -1025,9 +980,6 @@ You can specifiy an execution command in the project options. File - - Line - About @@ -1078,7 +1030,6 @@ You can specifiy an execution command in the project options. Process - Labels a running process Attach @@ -1632,7 +1583,6 @@ To create/manipulate a ActiveX/COM object, drag a class within a TypeLib/Control <Empty> - Copy from empty item Enter the new name: @@ -1651,7 +1601,6 @@ To create/manipulate a ActiveX/COM object, drag a class within a TypeLib/Control Go to - Title of the "go to" dialog window Go to line @@ -1714,7 +1663,6 @@ Examples: "120", "MainClass", "Main.cs, 120". Caret Line - Name for the vertical line showing the caret position Caret marker @@ -1939,7 +1887,6 @@ When an extension is used by both a built-in and a user-defined scheme, the user Escape character: - Escape character inside highlighting spans, e.g. \ in C# In "Begin" and "End", @ has a special meaning: @!string@ doesn't match string when searching for the begin/end, and @@ matches a single @. @@ -2020,11 +1967,9 @@ Do you want to add the new file to the project ${CurrentProjectName}? Create file inside project - Answer 1 Create standalone file - Answer 2 Add file to project? @@ -2193,7 +2138,6 @@ Do you want to add the new file to the project ${CurrentProjectName}? &Edit extensions - Edits the list of file extensions associated with a code snippet group &Description @@ -2212,7 +2156,6 @@ Do you want to add the new file to the project ${CurrentProjectName}? Press Tab to insert this code template. - Appears in description box in template completion. Re&move Group @@ -2237,7 +2180,6 @@ Do you want to add the new file to the project ${CurrentProjectName}? Configuration Editor - Title of the solution configuration editor dialog <Edit> @@ -2262,7 +2204,6 @@ Do you want to add the new file to the project ${CurrentProjectName}? &Solution configuration: - label in front of combo box where the build configuration (Debug/Release) of the solution can be chosen Depends on: @@ -2419,18 +2360,15 @@ Do you want to add the new file to the project ${CurrentProjectName}? Use the following option to turn code completion completely off: - Text in label above the "Enable Code Completion" checkbox. Re-open tooltip with better overload when pressing comma items - Save *inputbox* items Save - Save *inputbox* items Pre-select recently used members @@ -2479,7 +2417,6 @@ Do you want to add the new file to the project ${CurrentProjectName}? Debugging - The root node in the options dialog Exceptions @@ -2558,14 +2495,12 @@ Do you want to add the new file to the project ${CurrentProjectName}? &Auto-load changes if saved - (checkbox) automatically load externally changed files if there are no unsaved modifications in SharpDevelop Use &temporary file for saving Default file &encoding: - Default encoding used for new files &Detect external changes to files @@ -2581,7 +2516,6 @@ Do you want to add the new file to the project ${CurrentProjectName}? Macintosh (CR) - Line terminator style for the MacOS. I think this doesn't need translation. Load/Save @@ -2591,18 +2525,12 @@ Do you want to add the new file to the project ${CurrentProjectName}? Unix (LF) - LF = line feed -Line terminator style for 'unix' like oprating -systems. I don't think that this needs translation. Use &recycle bin when deleting files Windows (CRLF) - CRLF = carriage return, line feed -line terminator style for the 'Windows' operating -system. I don't think that it needs translation. Format @@ -2615,7 +2543,6 @@ system. I don't think that it needs translation. Profiler - option page of the performance profiler Build and Run options @@ -2646,7 +2573,6 @@ system. I don't think that it needs translation. When running: - option that specifies how to build when running the project Build modified projects and projects depending on them @@ -2728,7 +2654,6 @@ system. I don't think that it needs translation. Use Ctrl+Click for "Go to Definition" - Checkbox for enabling Ctrl+Leftclick as shortcut for 'go to definition' A&uto insert curly braces @@ -2777,11 +2702,9 @@ system. I don't think that it needs translation. Use smart indentation - Checkbox for disabling/enabling smart indentation Code Completion - Title of the code completion option panel &Render font antialiased @@ -2821,7 +2744,6 @@ system. I don't think that it needs translation. at colum&n - I've mixed up row and column. Column is right After Caret @@ -2970,7 +2892,6 @@ A change in the highlighting schemes is visible upon the next restart of #Develo {0} is not a valid icon file. - Error message displayed when the user tries to set the application's icon to a file that is not an icon. Localized string file: @@ -2986,7 +2907,6 @@ A change in the highlighting schemes is visible upon the next restart of #Develo Manifest files - File filter description for *.manifest files Output name: @@ -3067,7 +2987,7 @@ A change in the highlighting schemes is visible upon the next restart of #Develo Intel 64-bit Itanium processor - AMD 64-bit processor + x86-64 processor 32-bit Intel-compatible processor @@ -3221,7 +3141,6 @@ A change in the highlighting schemes is visible upon the next restart of #Develo Select folder - Description for folder selection dialog Signing @@ -3402,7 +3321,6 @@ You can also choose to store the setting in the .user-file instead of the projec Can't find ${Executable} in any of the SDK bin folders. - Message for an exception that is thrown if a sdk executable cannot be found. Can't load ${File}.File not found. @@ -3439,7 +3357,6 @@ You can also choose to store the setting in the .user-file instead of the projec Browse - text for buttons that open a dialog for searching a file/folder Cancel @@ -3464,7 +3381,6 @@ You can also choose to store the setting in the .user-file instead of the projec Unselect All - The words "Unselect All" translated into the local language. &Edit @@ -3492,7 +3408,6 @@ You can also choose to store the setting in the .user-file instead of the projec Custom - Choose custom color Select font @@ -3505,7 +3420,6 @@ You can also choose to store the setting in the .user-file instead of the projec ID - Abbrevation for Identifier Ignore @@ -3533,7 +3447,6 @@ You can also choose to store the setting in the .user-file instead of the projec N/A - Stands for 'Not applicable' Name @@ -3552,7 +3465,6 @@ You can also choose to store the setting in the .user-file instead of the projec Options - The word "Options" translated to a particular language. Path @@ -3568,7 +3480,6 @@ You can also choose to store the setting in the .user-file instead of the projec readonly - The word "readonly" in lowercase. &Remove @@ -3584,7 +3495,6 @@ You can also choose to store the setting in the .user-file instead of the projec Select &All - selects all items in a list Small Icons @@ -3592,6 +3502,9 @@ You can also choose to store the setting in the .user-file instead of the projec Start + + Line + &Update @@ -3612,15 +3525,12 @@ You can also choose to store the setting in the .user-file instead of the projec Open - verb for opening an item (usually file) Open Folder in Explorer - Command that opens the selected folder in Windows Explorer Open With... - Open file with non-default tool Add program @@ -3645,7 +3555,6 @@ You can also choose to store the setting in the .user-file instead of the projec Text editor (choose encoding) - Entry in "open with" menu for explicitly choosing the file encoding when opening a text file Built-in Web Browser @@ -3733,7 +3642,6 @@ You can also choose to store the setting in the .user-file instead of the projec <KEY NOT FOUND> - Value to display when a resource key is missing Resource in {0}: @@ -3767,7 +3675,6 @@ You can also choose to store the setting in the .user-file instead of the projec Boo Interpreter - Title of the Boo Interpreter pad Error: 'Debugger is not loaded' @@ -3780,7 +3687,6 @@ You can also choose to store the setting in the .user-file instead of the projec Debuggee - Name for program being debugged Runs commands in the debugged progam @@ -3811,7 +3717,6 @@ You can also choose to store the setting in the .user-file instead of the projec Select FxCop path - Button to select the FxCop path FxCop was found in the following directory: @@ -3821,7 +3726,6 @@ You can also choose to store the setting in the .user-file instead of the projec FxCop path - Title of FxCop path choosing groupbox Add/Remove rule assembly @@ -3858,80 +3762,59 @@ You can also choose to store the setting in the .user-file instead of the projec Suppress message - Context menu command to suppress a code analysis warning Code Covered - One of the display items that exists in the Code Coverage Options Panel. Selecting this one allows the user to configure the colours for the code that has been covered by the unit tests. Code Not Covered - One of the display items that exists in the Code Coverage Options Panel. Selecting this one allows the user to configure the colours for the code that has NOT been covered by the unit tests. Column - List view column header holding the code coverage start column number. Display Options End Column - List view column header containing the end column number for the code coverage. End Line - List view column header containing the code coverage end line. - - - Line - Code coverage line number column header for the list view. Unable to locate the NCover console application. If NCover is installed, please specify the location of the application in the Code Coverage options. - Error message displayed when the NCover console application cannot be found. No code coverage results file generated: - Error message added to error list pad when the code coverage results file was not generated. Code Coverage Colors - Group box title containing the text colors to use for code coverage highlighting. &Command: - Label indicating the NCover command line. &Display Items: - Code coverage options label that indicates the different text display items that can have their colours configured. Item bac&kground: - Label for the code coverage text background colour. Item fo&reground: - Label for the code coverage item's foreground colour. NCover Configuration - Code coverage options panel. Title of the group box containing NCover configuration options. AaBbCcXxYyZz - Sample text that is displayed when showing the code coverage colours selected. &Assemblies to watch: - Label for assembly names that will be watched whilst running code coverage. Excluded Attributes - Attributes used to exclude types from code coverage Exclude @@ -3941,15 +3824,12 @@ If NCover is installed, please specify the location of the application in the Co Running code coverage... - First line of text sent to output window when running code coverage. Run tests with code coverage - Right menu option when selecting a Unit test tree node. Run with code coverage - Right click menu to run tests with code coverage - displayed when right clicking a test fixture or test method in the source code. Show Code Co&verage @@ -3962,11 +3842,9 @@ If NCover is installed, please specify the location of the application in the Co Toggle Code Coverage - Tooltip for button that shows/hides code coverage highlighting in the source code. Visit Count - Column header in code coverage list view which indicates how many times a particular line of code was visited when running the tests. Change to project directory @@ -4059,103 +3937,78 @@ Please configure the NAnt executable's location in the SharpDevelop Options. NAnt build stopped. - Message sent to Output window after the NAnt process has been successfully stopped. Project does not contain a '.build' file. - Error message reported to the user when they attempt to run NAnt when there is no .build file in the SharpDevelop project. Running NAnt. - Message sent to the Output window indicating that the NAnt build is about to be started/run. This will terminate the NAnt process. Are you sure? - Message displayed to the user if they select the "Stop NAnt" menu option. Create &Build File - Menu option to create a NAnt build file. &Goto Definition - NAnt pad right click menu option which will open up the .build file and put the cursor on the specified NAnt target. &Goto Error - NAnt pad right click menu option - when an error tree node is selected the build file is opened up and the cursor is moved to the error. &Arguments - Label for the NAnt command line arguments text box. Build File Generation - Options panel. Name of the group containing NAnt build file generation configuration. &Command - Label for the NAnt command line textbox. &Debug - Checkbox label for NAnt's "debug" command line option. NAnt Configuration - Options panel. Group box for NAnt config options. NAnt &Version - Label for the drop down list containing NAnt version numbers. &Quiet - Label for the NAnt "quiet" option checkbox. Show &Logo - Check box text for NAnt's show logo command line option. Ver&bose - Checkbox text for NAnt's "verbose" command line option. Enter NAnt properties. - Text tooltip shown when the user moves the mouse over the TextBox at the bottom of the NAnt pad. This area is used to enter ad hoc command line options or properties when running NAnt (e.g. "-D:optimize". Reloads the build files - Tooltip for the Refresh button in the NAnt pad. Refreshes the pad's view from the build files in the combine. Runs the selected target - Tooltip text displayed when the user moves the mouse over the NAnt pad's run button. The button runs the NAnt target selected in the tree view. Stops the current build - Tooltip for the NAnt pad's stop button. Will stop the currently running build. No process running. - Attempted to wait for a process to finish but the process is not running error message. Run &Clean Target - Menu option to run NAnt to call the build file's "clean" target. Run Default &Target - Menu option that runs NAnt to build the build file's default target. Run &Target - NAnt pad right click menu option to run the selected NAnt target. &Stop NAnt - Menu option to stop the currently running NAnt build. There is no startup project to debug. @@ -4165,47 +4018,36 @@ Please configure the NAnt executable's location in the SharpDevelop Options. All - Drop down list option indicating "All" the languages should be returned. Insert PInvoke Signature - Insert PInvoke signature dialog title. Find - Find button text. Finds the matching pinvoke signature for the given search criteria. Function: - Label for drop down list of PInvoke/Dll methods/functions (e.g. MessageBeep, CreateProcess). Insert - Insert button text. Inserts pinvoke signature into source code. Language: - Label for the drop down list of source code languages (e.g. C#, VB). Module: - Label for drop down list of modules/dlls (e.g. user32) More info - Hyperlink label that the user can click to get "more information" on a particular pinvoke signature. No signature found for language '{0}'. - Error message returned when no p-invoke signatures found for the particular language (C# or VB). No signatures found. - Error message indicating that no P-Invoke signatures were found for specified search criteria. Insert PInvoke signatures... - Menu option that shows the "Insert PInvoke signatures" dialog. From C# to Python @@ -4215,19 +4057,15 @@ Please configure the NAnt executable's location in the SharpDevelop Options. Python Console - interactive python interpreter Python Files - file filter for *.py files Python Project Files - file filter for *.pyproj files Send Line to Python Console - Sends the line under the cursor in the text editor to the IronPython console window. Send to Python Console @@ -4237,7 +4075,6 @@ Please configure the NAnt executable's location in the SharpDevelop Options. The selected element is not a class or overridable member, so no derived symbols can be shown. - Error message when using 'Search>Find Derived Symbols' when it isn't applicable. Send Line to Ruby Console @@ -4354,10 +4191,6 @@ Note: This doesn't affect own custom layouts. Convert - Menu item in project conctext menu -Subitems: - Convert to VB - Convert to c# Conversion complete. @@ -4391,7 +4224,6 @@ Subitems: Project conversion has been successfully finished. You can find the converted project at this location: - Message appears after a project has been successfully converted. From C# to Boo @@ -4419,30 +4251,24 @@ Subitems: A write protected file with this name already exists at this location. - Appears when the user tries to add a file to the project that already exists and is write protected. No backend for project type installed. - Project browser node text for unknown project types. The project file cannot be found. - Project browser node text for missing project files. References Unable to read web service description. Url='{0}' - Error message displayed when the user tries to refresh the web service proxy code, but for some reason the server hosting the web service is unavailable. Solution Items - Folder containing files associated with the solution Solution - Text of root node in project browser The file can not be found anymore. @@ -4465,7 +4291,6 @@ All changes get lost. Navigate to file in project browser - From tab strip (tabs above editor), allows to navigate (expand and scroll) to given file in project browser (i.e. solution explorer) From VB.NET to C# @@ -4479,7 +4304,7 @@ All changes get lost. The file ${File} -has been changed externally do you want to reload it? +has been changed externally. Do you want to reload it? Incremental Search: @@ -4510,7 +4335,6 @@ has been changed externally do you want to reload it? How to report errors efficiently: We have set up a Web-based forum to report and track errors that are reported by users of SharpDevelop. To minimize necessary questions by the team members, in addition to providing the error message that is copied to the clipboard for easier pasting in the error report, we ask that you provide us with an as detailed as possible step-by-step procedure to reproduce this bug. - When translating this message, add a notice that error reports should be done in English. Do you really want to quit SharpDevelop? Unsaved changes will be lost! @@ -4607,23 +4431,18 @@ has been changed externally do you want to reload it? Local resource - Text of the radio button to select a local resource (which will be stored in the resource file of the form being designed) None - Text of radio button to select no resource Preview - Title of the image preview box in the image resource editor dialog Project resource - Text of radio button to select a project resource (which is stored in a resource file in the current project) Select resource - Title of a dialog in the Windows.Forms designer that allows selecting a resource for an image property Generated code @@ -4744,86 +4563,66 @@ No Windows Forms components will be avaiable, please configure the side bar manu Back - Add web reference back button tooltip. Binding - Property name for a web service port binding. Add Web Reference - Title of the Add Web Reference dialog. Documentation - Property name displayed next to the web service documentation text. Forward - Tooltip for the browser forward button. Go - Tooltip for browser's go button. The namespace contains invalid characters. A namespace can only contain letters, digits or underscores. - Shown to the user if they attempt to create a web reference where the namespace has invalid characters. Reference name contains invalid characters. - Error message shown when the web reference name entered by the user is invalid. &Namespace: - Label next to the namespace text box that will be used when generating the web proxy code. Parameters - Text displayed next to web service parameters when the user selects the web service node. Property - Title of list view column showing the names of various web service properties. &Reference Name: - Label next to the text box containing the name that will be used for the web reference. Refresh - Add web reference dialog browser refresh button tooltip. Retrieval URI - Text displayed in the property/value list when the user selects the service description list view node. Service - Displayed next to a web service name when the user selects a web service node in the list view. Stop - Tooltip for the browser stop button. &Address: - Label next to text box where the user types in the http url to a web service description. Value - Name of list column header showing web service property values. Available Web Services - Title for the tab that shows the web service operations available for a given url. Attach Managed - Indicates that a process is managed code in the attach to process dialog. Attach to Process @@ -4844,7 +4643,6 @@ Only letters, digits, space, '.' or '_' are allowed. You must specify a valid absolute path as project location. - Error message when location for new project is invalid &Select the file types you want to associate with SharpDevelop: @@ -4878,11 +4676,9 @@ Only letters, digits, space, '.' or '_' are allowed. Tool not found - Title of dialog window that appears when an external tool (SHFB or TortoiseSVN) is missing Discovery Credential - UserCredentials dialog title. Dialog pops up when the user needs to specify username/pass to view a web service. &Domain: @@ -4901,7 +4697,6 @@ Only letters, digits, space, '.' or '_' are allowed. Outline - Document outline pad Outline view is not available for the current document. @@ -4920,7 +4715,6 @@ Only letters, digits, space, '.' or '_' are allowed. Parsing - Status bar message indicating that SharpDevelop is parsing the user code Build action @@ -4948,11 +4742,9 @@ Only letters, digits, space, '.' or '_' are allowed. The full path to the file. - Description shown for the 'File name' property in the property grid when a file is selected in the project browser. Logical Name - Logical Name property for embedded resource files The name of the embedded resource. If left empty, the name is automatically generated. @@ -4965,11 +4757,9 @@ Only letters, digits, space, '.' or '_' are allowed. Culture - Reference's culture property. The culture supported by the reference - Reference's culture property description. Local copy @@ -4979,51 +4769,39 @@ Only letters, digits, space, '.' or '_' are allowed. (Name) - Property value for the reference name. Keep the () brackets so that this property appears at first (i.e. at the top of the property list). The reference name - Property value description. Public Key Token - Assembly reference's public key token property. The public key token - Assembly reference's public key token property description Specific Version - Reference property name indicating if the reference is to a specific version Indicates if this reference is bound to a specific version of the assembly - Reference property description. URL Behaviour - Web reference url behaviour property displayed in property browser. Web reference URL behaviour - Property description for web reference url behaviour . Version - Property name indicating the assembly reference version number. The major, minor, revision and build numbers of the reference - Reference's version property description. Web Reference URL - Name of property showing the web reference's url. Web reference URL - Property description for the web reference url. Solution file ${combineLocation} already exists, do you want to overwrite the existing file? @@ -5046,6 +4824,15 @@ Only letters, digits, space, '.' or '_' are allowed. Loading ${Filename}... + + Keep old solution open + + + Reload solution + + + The solution has been changed externally. + Convert selected &projects to: @@ -5054,7 +4841,6 @@ Only letters, digits, space, '.' or '_' are allowed. Change version of selected projects - Title of group box that allows changing the version of the selected projects Compiler Version @@ -5064,7 +4850,6 @@ Only letters, digits, space, '.' or '_' are allowed. <do not change> - item in compiler version/target framework combo boxes that is used to indicate an ambiguous selection (several projects with different targets frameworks) and allows the user to change one of (compiler version, target framework) without changing the other Target Framework @@ -5088,7 +4873,6 @@ Goto 'Options->Visual Style' and change the current language ambience. All Tests - Unit Tests tree root node text when a solution contains multiple test projects. Code Coverage @@ -5128,11 +4912,9 @@ Goto 'Options->Visual Style' and change the current language ambience. Testing ${Name}... - Label next to the progress bar in the status bar when running unit tests &Test - The "Test" submenu in the "Analysis" menu Unable to run unit tests. The file '{0}' cannot be found. @@ -5223,7 +5005,6 @@ Goto 'Options->Visual Style' and change the current language ambience. Could not find dialog id '{0}' in the document. - Error message displayed by the forms designer when for some reason it cannot find the dialog id in the document. An extension must be of the form: Class, Assembly @@ -5276,7 +5057,6 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension< Add WiX Library - Menu item to add a Wix Library (wixlib) to a Wix project. Installation Package @@ -5292,12 +5072,6 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension< Unable to find '{0}' in {1} - {0} = Dialog id. -{1} = Filename. - -The full string will be: - -Unable to find 'WelcomeDialogId' in Dialogs.wxs Add... @@ -5307,7 +5081,6 @@ Unable to find 'WelcomeDialogId' in Dialogs.wxs Required attribute '{0}' is missing. - Error message specifying the xml attribute that is required but missing in the Wix dialog xml. No setup dialog selected in Wix document. Please move the cursor inside a dialog element or use the Setup Dialogs window to open a dialog. @@ -5386,7 +5159,6 @@ Unable to find 'WelcomeDialogId' in Dialogs.wxs WiX files - Name of file filter for WiX files. WiX Libraries @@ -5399,15 +5171,12 @@ Unable to find 'WelcomeDialogId' in Dialogs.wxs No difference found. - Message displayed in the Wix diff control to indicate that no differences between the files specified in the Wix setup document and the files on the file system were found. WiX Project - Title displayed in the File Format Associations options page for Wix projects. WiX Project Files - Name for the WiX Projects file filter in the File Open dialog. COM+ and Message Queue Extension (pubca) @@ -5471,11 +5240,9 @@ Unable to find 'WelcomeDialogId' in Dialogs.wxs &Create Schema - Menu option that creates or generates an simple xml schema from the xml file currently displayed. Hide &XPath Results - Menu item that is used to remove the highlighting on items matched by the XPath query. &Open XSLT @@ -5485,71 +5252,54 @@ Unable to find 'WelcomeDialogId' in Dialogs.wxs Select XML Schema - Name of dialog allowing the user to choose a schema from a list of schema namespaces. Dialog is opened when the user is associating a schema with a file extension. &Validate XML - Menu option to validate the xml file currently open. Folding - Name of the group label that holds settings for xml folding. Show &attributes when folded - Check box label - shows/hides xml attributes when the element is folded. Show schema anno&tation - Check box label. Toggles on/off the display of xs:annotation/xs:documentation text, found in the schema, alongside the xml intellisense list. XML Options - Name of the xml editor options panel. XML Completion - Label for xml auto-completion/intellisense options group. &Extension: - Label for a drop down list of file extensions. File Extensions - Name of group box containing the file extensions and their associated schemas. &Prefix: - Label for the namespace prefix (e.g. "xs") that will be associated with a given xml file extension by default. &Schema: - Label for the schema namespace associated with a file extension. Schemas - Name of xml schemas group box in the xml schema options dialog. Unable to add schema. The namespace '{0}' already exists. - User tried to add a schema to SharpDevelop but one has been added before with that particular namespace. Schema '{0}' does not have a target namespace. - For a schema to be added to the xml intellisense it must have a namespace associated with it. This error occurs when the user tries to add a schema 'filename' that does not have a targetNamespace attribute. XML Schemas - Name of the options panel for configuring xml schemas that SharpDevelop will provide autocomplete/intellisense for. Unable to add schema. - User browsed for an xml schema on the file system, but we could not add it to SharpDevelop for some reason. Unable to save changes. - This message is shown if SharpDevelop could not save the changes the user made to the xml schemas options panel. Add Attribute... @@ -5586,7 +5336,6 @@ Unable to find 'WelcomeDialogId' in Dialogs.wxs XML Tree - The title for the Xml Tree tab. Namespace @@ -5647,11 +5396,9 @@ Unable to find 'WelcomeDialogId' in Dialogs.wxs The build must finish before SharpDevelop can be closed. - Warning message displayed to user if they try to close SharpDevelop whilst a build is running. Build was cancelled. - Message when build was cancelled by user Build failed. @@ -5667,11 +5414,9 @@ Unable to find 'WelcomeDialogId' in Dialogs.wxs Building - Verb describing that SharpDevelop is currently building a project Compiling - Verb describing that SharpDevelop is currently compiling a project Building COM interop assembly... @@ -5690,7 +5435,6 @@ Unable to find 'WelcomeDialogId' in Dialogs.wxs Skipped ${Name} (no changes inside SharpDevelop) - Message when a project is not compiled because it was not modified SharpDevelop @@ -5712,7 +5456,6 @@ Unable to find 'WelcomeDialogId' in Dialogs.wxs Delete all bookmarks in all buffers. - DeleteAllMarks icon tooltip. Delete bookmark @@ -5728,11 +5471,9 @@ Unable to find 'WelcomeDialogId' in Dialogs.wxs {0} @line {1} - format string for displaying "filename @line #" in the bookmarks pad Location - Column title for the bookmark location Bookmarks @@ -5808,7 +5549,6 @@ Unable to find 'WelcomeDialogId' in Dialogs.wxs [External methods] - Show in the callstack instead of external methods (without symbols) Function switch @@ -5816,9 +5556,6 @@ Unable to find 'WelcomeDialogId' in Dialogs.wxs Language - - Line - Module @@ -5860,7 +5597,6 @@ Unable to find 'WelcomeDialogId' in Dialogs.wxs Condition - column title for a conditional breakpoint's condition Continue @@ -5891,18 +5627,12 @@ Unable to find 'WelcomeDialogId' in Dialogs.wxs Break - Button. -Breaks the execution. Shows the current location of debuggee in the editor. Continue - Button. -Continues the execution of debuggee. -Button is enabled only for handled exceptions. Can not intercept exception. Debugged program can not be continued and properties can not be evaluated. - eg. Happens on StackOverflow exception. Hide Exception Details @@ -5912,11 +5642,9 @@ Button is enabled only for handled exceptions. at {0} - NB: Only used for exceptions that can not be intercepted (eg. StackOverflow) at {0} in {1}:line {2} - NB: Only used for exceptions that can not be intercepted (eg. StackOverflow) An exception of type {0} was thrown:\n{1} @@ -5926,12 +5654,9 @@ Button is enabled only for handled exceptions. Terminate - Button. -Stop/terminate the debuggee. Exception - NOT USED Handled exception @@ -5959,25 +5684,21 @@ Stop/terminate the debuggee. Base class - Name of submenu which contains members of type's base class You cannot explore variables while the debuggee is running. Can not convert {0} to {1} - Occurs when user edits value but enters value in a bad format Can not set value Can not set value - Generic error. Occurs when user edits value. Copy value to clipboard - Item in variable's context menu Non-Public members @@ -5987,21 +5708,15 @@ Stop/terminate the debuggee. Private members - obsolete Private Static members - obsolete Show full error... - Context menu item. -Shown for values that could not be obtained due to error. -Shows the full callstack of the error. Show values in hexadecimal - Item in variable's context menu Static members @@ -6150,9 +5865,11 @@ Shows the full callstack of the error. Remove watch + + Do you want to stop debugging? + Definition View - Title of the definition view pad Errors @@ -6177,19 +5894,15 @@ Shows the full callstack of the error. CD - CD/DVD Fixed - fixed drive => hard disk Remote - Network drive Removeable - removeable drive, e.g. floppy Last modified @@ -6235,7 +5948,6 @@ Shows the full callstack of the error. <Clear History> - Menu command to remove previous searches Collapse all @@ -6251,7 +5963,6 @@ Shows the full callstack of the error. in - used like this: occurrences IN files ${Count} occurrences @@ -6309,15 +6020,12 @@ Shows the full callstack of the error. Validation: failed - Displayed in the output window when the xml validation failed. ------ Validating XML ------ - Displayed in output window to indicate that the xml validation has started. Validation: succeeded - Displayed in the output window after the xml has been successfully validated. Unloads the test assemblies, cancels the auto loading. @@ -6351,9 +6059,6 @@ Shows the full callstack of the error. Test case '${TestCase}' failed. - Indicates that the test failed if the test has no error message to display. - -Removed the end part of the original message ", reason '${Message}'" since this is often not visible in the errors list if the test case name is long. Test case '${TestCase}' was not executed. @@ -6387,7 +6092,6 @@ Removed the end part of the original message ", reason '${Message}'" since this Open containing folder in Explorer - String for the editor tab context menu that will open the directory in which a documents file is contained in Windows Explorer. Collapse all nodes @@ -6421,7 +6125,6 @@ Removed the end part of the original message ", reason '${Message}'" since this Add Web Reference - Right click context menu option to add a web reference to the project. B&uild @@ -6431,7 +6134,6 @@ Removed the end part of the original message ", reason '${Message}'" since this Collapse all - Collapses this node and all its subtree in project browser (i.e. solution explorer) Delete '${FileName}' permanently? @@ -6450,7 +6152,6 @@ Removed the end part of the original message ", reason '${Message}'" since this Existing folder... - Project > Add > Existing folder Do you want to copy the folder to the target directory? @@ -6460,14 +6161,12 @@ Removed the end part of the original message ", reason '${Message}'" since this Existing Item as Dependent Item... - Context menu entry for a file; adds an existing item which will be dependent upon the selected file &Existing Project... Build documentation from XML comments - Build documentation from XML comments using Sandcastle You need to edit the project build options to generate a xml documentation file. @@ -6480,7 +6179,6 @@ Removed the end part of the original message ", reason '${Message}'" since this Generating documentation from XML comments requires the 'Sandcastle Help File Builder' to be installed. - Message when clicking on 'generate documentation' and SHFB is missing Html E&xport @@ -6496,7 +6194,6 @@ Removed the end part of the original message ", reason '${Message}'" since this New Dependent Item... - Context menu entry for a file; adds a new file which will be dependent upon the selected file N&ew Folder @@ -6515,14 +6212,12 @@ Removed the end part of the original message ", reason '${Message}'" since this Open Output Folder - Opens the output folder (where the project binaries get created) in windows explorer. R&ebuild Refresh Web Reference - Right click context menu option that will update/refresh the web reference (i.e. regenerates the web proxy and downloads any extra files from the web service url). Re&name @@ -6541,7 +6236,6 @@ Removed the end part of the original message ", reason '${Message}'" since this Delete all web references - Title of the dialog box when the user tries to remove all web references. Assemblies (*.dll)|*.dll @@ -6662,21 +6356,18 @@ Removed the end part of the original message ", reason '${Message}'" since this Ungreedy star - An ungreedy star can match any number of characters, but unlike the normal star, it only matches as few as required (by the rest of the expression). Whitespace character Word border - "Word border" is a "character" of length 0 representing a location between word and non-word character - either start or end of a word. Word character value Update bitmap ... - Text for the link label that make it possible to update the stored bitmap Do you really want to delete the selected resource(s)? @@ -6686,9 +6377,6 @@ Removed the end part of the original message ", reason '${Message}'" since this Can't load resource - start of messagebox warning text, ex: - -"Can't load resource" + resourceName Error: Resource code generator is skipping resource file "{0}" because the generated class would conflict with the existing class "{1}". @@ -6707,7 +6395,6 @@ Removed the end part of the original message ", reason '${Message}'" since this Copy resource name - Context menu item; copies the name of the currently selcted resource item to the clipboard &Rename @@ -6768,7 +6455,6 @@ Removed the end part of the original message ", reason '${Message}'" since this Key files - File filter for .snk, .pfx and .key files NAnt Build Files @@ -6793,7 +6479,6 @@ Removed the end part of the original message ", reason '${Message}'" since this XML Schema Files (*.xsd) - File filter for .xsd files. XSL files @@ -6824,7 +6509,6 @@ Removed the end part of the original message ", reason '${Message}'" since this Classes deriving from ${Name} - Title for search results for derived classes Convert to automatic property @@ -6846,14 +6530,12 @@ Removed the end part of the original message ", reason '${Message}'" since this Declaring type - Menu item that contains refactoring entries for the class that contains the selected member. Expand automatic property Extract Interface - Used by the refactoring context menu to call the Extract Interface dialog. Find base classes @@ -6914,25 +6596,21 @@ Removed the end part of the original message ", reason '${Message}'" since this References to ${Name} - Title for search results for references Remove &unused import statements Rename - Title of rename input box Enter the new name of the class: &Rename - Menu command to rename a member Should SharpDevelop rename the property '{0}' to '{1}'? - displayed when a field that has a property is renamed Rename file to '${FileName}' @@ -6957,7 +6635,6 @@ Removed the end part of the original message ", reason '${Message}'" since this There are no tools available for the current document. - Text shown in the 'tools' pad when there are no tools available XSL-T @@ -6971,18 +6648,12 @@ Try using SharpDevelop 3.2 for the conversion; or create a new project and add t Could not save {0}:\n{1} - {0} is the name of the solution. -{1} is the IOException.Message property. Cannot save solution file {0}. It is marked readonly. - {0} is the name of the sln file. -Message shown when Solution.Save() is called on a solution with the ReadOnly attribute. Could not save {0}:\n{1}\n\nEnsure the file is writable. - {0} is the file name of the solution. -{1} is the value of the property UnauthorizedAccessException.Message. There were resource files in the project. @@ -6992,37 +6663,30 @@ The resources files have been renamed/moved accordingly. The following files could not be renamed/moved automatically: - used when moving of files failed '{0}' is not a valid solution file. - Shown when .sln file contains invalid data. Can't read Microsoft Solution file format {0}. One (or more) of the parameter values are invalid. - Message displayed when the user write an invalid value into the prameter input windows not supported by Can't open the connection. Check your connection string. - Message displayed when #Query can't open a connection Can't execute the procedure due to an error. - Message displayed when an error occur during the execution of a procedure. Can't execute your SQL query due to an error - Message displayed when an error occur during a data extract or a SQL query Invalid connection string! - Message displayed when the connection string is wrong. key must be of type String. @@ -7032,93 +6696,72 @@ The resources files have been renamed/moved accordingly. Add Connection ... - Context menu for add a connection in the sharpquery's treeview Connect to database - context menu in the sharpquery's treeview Database connections - text of the root node into the sharpquery's treeview Disconnect - context menu of the sharpquery's treeview Execute - context menu that execute a SQL procedure Extract Data - context menu command that extracts data from a table and display it into a grid. Modify the connection ... - context menu that displays the windows connection properties to change a connection string. Procedures - name of the root procedures node into the sharpquery's treeview Refresh - context menu to refresh a connection Remove - context menu to remove a connection from the sharpquery's treeview Schemas - i think this translatiopn is invariant because it's the technical name of schemas ... Database Tables - Name of the root tables node in the treeview Views - name of the root views node Database Explorer Add connection - context menu to add a connection Refresh - tooltip of the context menu taht refreshs a connection Reset - Caption a the button that reset the user parameters input Parameter's data type - Listview header column caption that list parameters data type Parameters input - Caption of the windows that allows a user to input parameters values while he executes a procedure in #Query. Parameter's name - displayed in column header of the listview that lists all parameters of a procedure Parameter's type - Caption of a listview header column that display parameters type Parameter's value - Caption of a listview header column that display parameters values SharpDevelop Reports @@ -7134,7 +6777,6 @@ The resources files have been renamed/moved accordingly. Grouping/Sorting - Manage grouping and sorting of the Data Paste Field @@ -7171,14 +6813,12 @@ The resources files have been renamed/moved accordingly. To run SharpDevelop Reports you need at least one(1) installed Printer - Errormessage when no printer is installed This is not a valid report created with 'SharpReport'. Could not read file , file corrupt (SharpReportFile is improperly formatted) - Message when something is wrong with the file format Available Fields @@ -7353,11 +6993,9 @@ The resources files have been renamed/moved accordingly. Save Result (Schema and Data) - Save displayed Data to *.xsd File Save Result (Schema only) - Save only the Schema to *.xsd File Show Query result @@ -7478,31 +7116,24 @@ The resources files have been renamed/moved accordingly. Windows Applications - Category for windows applications project/file templates. Class that implements ConfigurationElement. - Description for CSharp.ConfigurationElement.xft Configuration Element - Name of the CSharp.ConfigurationElement Class that inherits ConfigurationElementCollection. - Description string for ConfigurationElementCollection.xft Configuration Element Collection - Name string for ConfigurationElementCollection.xft Class that implements ConfigurationSection - Description for CSharp.ConfigurationSection.xft Configuration Section - Name for CSharp.ConfigurationSection.xft An empty class declaration. @@ -7521,11 +7152,9 @@ The resources files have been renamed/moved accordingly. A window for a Gtk# application. - Description for Gtk# Window file template. Gtk# Window - Name of the file template for a Gtk# Window. Creates an empty header file. @@ -7550,7 +7179,6 @@ The resources files have been renamed/moved accordingly. Module - VB Module Creates a MSBuild file with an empty "Build" target. @@ -7566,11 +7194,9 @@ The resources files have been renamed/moved accordingly. Creates a new NAnt build file. - Description for the NAnt build file template. NAnt Build File - Name for the template that creates a new NAnt build file. Add '#if TEST ... #endif' @@ -7595,7 +7221,6 @@ The resources files have been renamed/moved accordingly. Set to true to declare the class as sealed. - Class templates should use this property if they want to offer the user the option of creating their class as sealed. Options @@ -7731,11 +7356,9 @@ The resources files have been renamed/moved accordingly. Generates an app.config file. For your application. MSBuild will rename this to appname.exe.config if this project is an executable. - Describes the app.config template. App.Config File - File name for the app.config template. Empty XML file @@ -7778,7 +7401,6 @@ The resources files have been renamed/moved accordingly. Unmanaged console project - Name for project template (A project that creates a command line application in unmanaged (native) code.) A project for creating an Application with Direct3D interface. @@ -7794,19 +7416,15 @@ The resources files have been renamed/moved accordingly. A project that creates a Glade# application - Glade# project template description. Glade# Application - Name of Glade# project template. A project that creates a Gtk# application - Gtk# project template description. Gtk# Application - Name of Gtk# project template. A windows installer project for creating a MSI installer. @@ -7840,7 +7458,6 @@ The resources files have been renamed/moved accordingly. A project that creates an application with a icon in the notification area on the taskbar. - Note: "System Tray" is NOT a valid name for the notification area. See http://blogs.msdn.com/oldnewthing/archive/2003/09/10/54831.aspx NotifyIcon Application @@ -7895,7 +7512,6 @@ The resources files have been renamed/moved accordingly. &Analysis - Analysis / Quality Tools main menu entry B&uild @@ -7905,7 +7521,6 @@ The resources files have been renamed/moved accordingly. Break - The caption of the Pause/Break key on the keyboard, as shortcut for aborting the build B&uild ${CurrentProjectName} @@ -7936,7 +7551,6 @@ The resources files have been renamed/moved accordingly. Set configuration - Set the project configuration (debug/release) Set platform @@ -7991,7 +7605,9 @@ The resources files have been renamed/moved accordingly. Remove all breakpoints - Main menu command for removing all breakpoints + tooltip for the corresponding toolbar button (in the breakpoints pad) + + + Run last build Run &without debugger @@ -8025,7 +7641,6 @@ The resources files have been renamed/moved accordingly. Toggle Breakpoint - Set/remove breakpoint on current line &Edit @@ -8107,7 +7722,6 @@ The resources files have been renamed/moved accordingly. Paste as string - Pastes the clipboard content as string literal Paste text from clipboard @@ -8189,8 +7803,6 @@ The resources files have been renamed/moved accordingly. Print &Preview - Changed hotkey: -P&rint Preview to Print &Preview Recent &Files @@ -8218,7 +7830,6 @@ P&rint Preview to Print &Preview Save with &encoding... - Saves a text file by choosing the target encoding F&ormat @@ -8418,7 +8029,6 @@ Do you want to stop debugging? Find Next &Selected - Search menu option that finds the next match based on the currently selected text. &Go To... diff --git a/data/resources/StringResources.ru.resx b/data/resources/StringResources.ru.resx index 3ab70799fe..a05abc0c12 100644 --- a/data/resources/StringResources.ru.resx +++ b/data/resources/StringResources.ru.resx @@ -756,9 +756,6 @@ '{0}' был удалён из чёрного списка. - - Держать старое решение открытым - Заблокировать @@ -786,9 +783,6 @@ Показывать вкладку истории для файлов управления версиями - - Перезагрузить решение - Переместить @@ -911,9 +905,6 @@ Файл - - Строка - О программе @@ -3265,6 +3256,9 @@ Старт + + Строка + Перерисовать @@ -3523,9 +3517,6 @@ Конец строки - - Строка - Цвета сокрытия кода @@ -4461,6 +4452,12 @@ Загрузка ${Filename}... + + Держать старое решение открытым + + + Перезагрузить решение + Преобразовать выбранные проекты в: diff --git a/data/resources/StringResources.tr.resx b/data/resources/StringResources.tr.resx index bd93d43c8c..d245482d29 100644 --- a/data/resources/StringResources.tr.resx +++ b/data/resources/StringResources.tr.resx @@ -614,9 +614,6 @@ Yardım sistemini elde edebilmek için .NET Framework SDK 'yı yüklemelisiniz.< Geçmiş - - Eski çözümü açık tut - Birleştir @@ -629,12 +626,6 @@ Yardım sistemini elde edebilmek için .NET Framework SDK 'yı yüklemelisiniz.< Yansürüm Ayarları - - Çözümü yenile - - - SharpDevelop sürüm kontrol işleminin proje dosyalarını değiştirdiğini algıladı. Bu çözümü yenilemeniz gerekiyor. - Yerleştir @@ -702,9 +693,6 @@ SharpDevelop bu bilgileri otomatik olarak toplayıp gönderebilir. Dosya - - Satır - Hakkında @@ -2929,6 +2917,9 @@ Ayrıca bir ayarı proje dosyası yerine .kullanıcı-dosyası(.user-file) için Başla + + Satır + Güncelle @@ -3142,9 +3133,6 @@ Ayrıca bir ayarı proje dosyası yerine .kullanıcı-dosyası(.user-file) için Satır Sonu - - Satır - NCover konsol uygulaması bulunamadı. @@ -4008,6 +3996,12 @@ Sadece harf,rakam, boşluk, '.' yada '_' kullanabilirsiniz. Yüklüyor ${Filename}... + + Eski çözümü açık tut + + + Çözümü yenile + Derleyici Sürümü diff --git a/data/templates/project/CSharp/EmptyMvcWebProject.xpt b/data/templates/project/CSharp/EmptyMvcWebProject.xpt index e9f1a5c68f..8a5cd10b91 100644 --- a/data/templates/project/CSharp/EmptyMvcWebProject.xpt +++ b/data/templates/project/CSharp/EmptyMvcWebProject.xpt @@ -5,9 +5,9 @@ - Empty ASP.NET MVC Application + Empty MVC Application C# - ASP.NET + ASP.NET MVC C#.Project.Form Empty ASP.NET MVC Application v4.0 diff --git a/data/templates/project/CSharp/MvcWebProject.xpt b/data/templates/project/CSharp/MvcWebProject.xpt index e8ddcc4c13..fa2518c5ad 100644 --- a/data/templates/project/CSharp/MvcWebProject.xpt +++ b/data/templates/project/CSharp/MvcWebProject.xpt @@ -5,9 +5,9 @@ - ASP.NET MVC Application + MVC Application C# - ASP.NET + ASP.NET MVC C#.Project.Form ASP.NET MVC Application v4.0 diff --git a/data/templates/project/VB/EmptyMvcWebProject.xpt b/data/templates/project/VB/EmptyMvcWebProject.xpt index 129f8b4b9e..a68b97e873 100644 --- a/data/templates/project/VB/EmptyMvcWebProject.xpt +++ b/data/templates/project/VB/EmptyMvcWebProject.xpt @@ -5,9 +5,9 @@ - Empty ASP.NET MVC Application + Empty MVC Application VB - ASP.NET + ASP.NET MVC VBNet.Project.Form Empty ASP.NET MVC Application v4.0 diff --git a/data/templates/project/VB/MvcWebProject.xpt b/data/templates/project/VB/MvcWebProject.xpt index b12f8c38cb..38dae26dbc 100644 --- a/data/templates/project/VB/MvcWebProject.xpt +++ b/data/templates/project/VB/MvcWebProject.xpt @@ -5,9 +5,9 @@ - ASP.NET MVC Application + MVC Application VB - ASP.NET + ASP.NET MVC VBNet.Project.Form ASP.NET MVC Application v4.0 diff --git a/data/templates/project/VB/NotifyIcon.xpt b/data/templates/project/VB/NotifyIcon.xpt index c8b38aa0d6..7fd00bbc6f 100644 --- a/data/templates/project/VB/NotifyIcon.xpt +++ b/data/templates/project/VB/NotifyIcon.xpt @@ -27,17 +27,25 @@ + + + + + + + + + + WinExe Properties + WindowsFormsWithCustomSubMain - + diff --git a/samples/ILAsmBinding/Project/Src/ILAsmProjectBinding.cs b/samples/ILAsmBinding/Project/Src/ILAsmProjectBinding.cs index ce5c29d7f1..bb47bd4904 100644 --- a/samples/ILAsmBinding/Project/Src/ILAsmProjectBinding.cs +++ b/samples/ILAsmBinding/Project/Src/ILAsmProjectBinding.cs @@ -31,5 +31,9 @@ namespace ICSharpCode.ILAsmBinding { return new ILAsmProject(info); } + + public bool HandlingMissingProject { + get { return false; } + } } } diff --git a/samples/SharpDevelopReports/SampleReports/Ilist/ContributorsList.srd b/samples/SharpDevelopReports/SampleReports/Ilist/ContributorsList.srd index 1b7b660a2c..0426263d32 100644 --- a/samples/SharpDevelopReports/SampleReports/Ilist/ContributorsList.srd +++ b/samples/SharpDevelopReports/SampleReports/Ilist/ContributorsList.srd @@ -2,282 +2,279 @@ - Microsoft Sans Serif, 10pt - PushData - 50 - True - - - No Data for this Report + Report1 + DataReport + 50 + 50 50 + 50 827, 1169 - 5, 5, 5, 5 - 50 - Text - False - Report1 - 50 - Millimeter - - DataReport + 5, 5, 5, 5 + + + + + + Text + PushData + No Data for this Report + Microsoft Sans Serif, 10pt + True + 50, 50 786, 35 - ReportHeader - False - 50 - 0 Window - - 50, 50 + 0 + 50 False + False + + Black + ReportHeader + 50, 100 786, 108 - ReportPageHeader - False - 50 - 0 Window + 0 + 50 + False + False + 429, 63 + 100, 20 White - False + Microsoft Sans Serif, 12pt, style=Bold None - Job - 429, 63 TopLeft - True - False - Microsoft Sans Serif, 12pt, style=Bold False - - Job + False + Job + False WindowFrame - 100, 20 ControlText + True + Job + 234, 63 + 100, 20 White - False + Microsoft Sans Serif, 12pt, style=Bold None - Lastname - 234, 63 TopLeft - True - False - Microsoft Sans Serif, 12pt, style=Bold False - - Lastname + False + Lastname + False WindowFrame - 100, 20 ControlText + True + Lastname - File 47, 6 - ReportImageControl 661, 42 - False Window - ..\..\..\..\..\..\SharpDevelop3.0_CHECKOUT\SharpDevelop\samples\SharpDevelopReports\SampleReports\Logos\Bannerbeige2.gif - D:\SharpDevelop3.0_CHECKOUT\SharpDevelop\samples\SharpDevelopReports\SampleReports\Logos\Bannerbeige2.gif + D:\git_Sharpdevelop_Reporting\samples\SharpDevelopReports\SampleReports\Logos\Bannerbeige2.gif + False + File + ..\..\Logos\Bannerbeige2.gif + ReportImageControl - Flat - 0, 3 47, 87 - 661, 18 - Flat - Solid White - Flat ControlText + 0, 3 614, 3 + Flat + Flat + Flat + Solid 2 + + 46, 63 + 109, 20 White - False + Microsoft Sans Serif, 12pt, style=Bold EllipsisCharacter - Firstname - 46, 63 TopLeft - True - False - Microsoft Sans Serif, 12pt, style=Bold False - - reportTextItem1 + False + Firstname + False WindowFrame - 109, 20 ControlText + True + reportTextItem1 - 50, 100 - False + Black + ReportPageHeader - 750, 51 - ReportDetail - False - 50 - 0 + 50, 223 + 750, 60 Window + 0 + 50 + False + False 3, 10 - - Row + 699, 47 + White + False + ControlText + True + WindowFrame - System.String - First - Microsoft Sans Serif, 10pt 43, 12 + 147, 25 + White + Microsoft Sans Serif, 10pt + EllipsisCharacter + MiddleLeft False + False + System.String + First + False + WindowFrame ControlText - EllipsisCharacter + True First - False - False - MiddleLeft - White - unbound1 - True - 147, 25 - WindowFrame - System.String - last - Microsoft Sans Serif, 10pt 231, 12 - False - ControlText + 139, 25 + White + Microsoft Sans Serif, 10pt EllipsisCharacter - last - False - False MiddleLeft - White - - unbound2 - True - 139, 25 + False + False + System.String + Last + False WindowFrame + ControlText + True + Last + unbound2 - System.String - Job - Microsoft Sans Serif, 10pt 426, 10 + 216, 25 + White + Microsoft Sans Serif, 10pt + EllipsisCharacter + MiddleLeft False + False + System.String + Job + False + WindowFrame ControlText - EllipsisCharacter + True Job - False -------------- - False - MiddleLeft - White - unbound3 - True - 216, 25 - WindowFrame - False + 0 - WindowFrame - 699, 40 - White - True - ControlText + Row - 50, 223 - False + Black + ReportDetail + 50, 298 750, 49 - ReportPageFooter - False - 50 - 0 Window + 0 + 50 + False + False + 45, 24 + 483, 20 White - False + Microsoft Sans Serif, 8.25pt None - =Globals!ReportFolder - 45, 24 TopLeft - True - False - Microsoft Sans Serif, 8.25pt False - - =Globals!ReportFolder + False + =Globals!ReportFolder + False WindowFrame - 483, 20 ControlText + True + =Globals!ReportFolder - Flat - 0, 0 45, 3 - object_177a5444_b8e0_4202_87d2_05cdc7cd1194 663, 15 - Flat - Solid White - Flat ControlText + 0, 0 656, 0 + Flat + Flat + Flat + Solid 2 + object_177a5444_b8e0_4202_87d2_05cdc7cd1194 + 602, 24 + 100, 20 White - False + Microsoft Sans Serif, 8.25pt None - ='Page ' + Globals!PageNumber - 602, 24 TopLeft - True - False - Microsoft Sans Serif, 8.25pt False - - ='Page ' + Globals!PageNumber + False + ='Page ' + Globals!PageNumber + False WindowFrame - 100, 20 ControlText + True + ='Page ' + Globals!PageNumber - 50, 289 - False + Black + ReportPageFooter + 50, 362 750, 55 - ReportFooter - False - 50 - 0 Window - - 50, 353 + 0 + 50 False + False + + Black + ReportFooter \ No newline at end of file diff --git a/samples/SharpDevelopReports/src/SharpReportSamples/ContributorsList.cs b/samples/SharpDevelopReports/src/SharpReportSamples/ContributorsList.cs index e3f44d5bb9..a21a80ae0e 100644 --- a/samples/SharpDevelopReports/src/SharpReportSamples/ContributorsList.cs +++ b/samples/SharpDevelopReports/src/SharpReportSamples/ContributorsList.cs @@ -41,6 +41,7 @@ namespace SharpReportSamples list.Add(new Contributor("Nathan","Allen","")); list.Add(new Contributor("Troy","Simpson","Prg.")); list.Add(new Contributor("David","Alpert","Prg.")); + list.Add(new Contributor("Fred","Flintstone",null)); return list; } } diff --git a/samples/SharpDevelopReports/src/SharpReportSamples/MainForm.cs b/samples/SharpDevelopReports/src/SharpReportSamples/MainForm.cs index 4673dcc811..1e021521b9 100644 --- a/samples/SharpDevelopReports/src/SharpReportSamples/MainForm.cs +++ b/samples/SharpDevelopReports/src/SharpReportSamples/MainForm.cs @@ -153,6 +153,9 @@ namespace SharpReportSamples private void RunContributors (string fileName) { ReportModel model = ReportEngine.LoadReportModel(fileName); +// Console.WriteLine(model.ReportSettings.PageSize); +// model.ReportSettings.PageSize = new Size(model.ReportSettings.PageSize.Width,400); +// Console.WriteLine(model.ReportSettings.PageSize); // sorting is done here, but, be carefull, misspelled fieldnames will cause an exception @@ -302,7 +305,7 @@ namespace SharpReportSamples private void PushPrinting (object sender, SectionRenderEventArgs e ) { string sectionName = e.Section.Name; - + /* if (sectionName == ReportSectionNames.ReportHeader) { Console.WriteLine("PushPrinting :" + ReportSectionNames.ReportHeader); } @@ -372,6 +375,7 @@ namespace SharpReportSamples else{ throw new WrongSectionException(sectionName); } + */ } diff --git a/src/AddIns/Analysis/CodeCoverage/Project/Src/CodeCoverageControl.cs b/src/AddIns/Analysis/CodeCoverage/Project/Src/CodeCoverageControl.cs index 9c8a992284..63dbcc65e1 100644 --- a/src/AddIns/Analysis/CodeCoverage/Project/Src/CodeCoverageControl.cs +++ b/src/AddIns/Analysis/CodeCoverage/Project/Src/CodeCoverageControl.cs @@ -368,7 +368,7 @@ namespace ICSharpCode.CodeCoverage visitCountColumnHeader.Width = 80; startLineColumnHeader = new ColumnHeader(); - startLineColumnHeader.Text = StringParser.Parse("${res:ICSharpCode.CodeCoverage.Line}"); + startLineColumnHeader.Text = StringParser.Parse("${res:Global.TextLine}"); startLineColumnHeader.Width = 80; startColumnColumnHeader = new ColumnHeader(); diff --git a/src/AddIns/Analysis/CodeCoverage/Test/Coverage/PartCoverSettingsTestFixture.cs b/src/AddIns/Analysis/CodeCoverage/Test/Coverage/PartCoverSettingsTestFixture.cs index a99b7dfe7f..fd1d19bfa9 100644 --- a/src/AddIns/Analysis/CodeCoverage/Test/Coverage/PartCoverSettingsTestFixture.cs +++ b/src/AddIns/Analysis/CodeCoverage/Test/Coverage/PartCoverSettingsTestFixture.cs @@ -1,15 +1,17 @@ // Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) // This code is distributed under the GNU LGPL (for details please see \doc\license.txt) -using ICSharpCode.SharpDevelop.Internal.Templates; using System; using System.IO; using System.Text; using System.Xml; + using ICSharpCode.CodeCoverage; using ICSharpCode.Core; +using ICSharpCode.SharpDevelop.Internal.Templates; using ICSharpCode.SharpDevelop.Project; using NUnit.Framework; +using UnitTesting.Tests.Utils; namespace ICSharpCode.CodeCoverage.Tests.Coverage { @@ -59,7 +61,7 @@ namespace ICSharpCode.CodeCoverage.Tests.Coverage { MSBuildBasedProject project = new MSBuildBasedProject( new ProjectCreateInformation { - Solution = new Solution(), + Solution = new Solution(new MockProjectChangeWatcher()), OutputProjectFileName = @"C:\temp\test.csproj", ProjectName = "test" }); diff --git a/src/AddIns/Analysis/Profiler/Frontend/AddIn/ICSharpCode.Profiler.AddIn.addin b/src/AddIns/Analysis/Profiler/Frontend/AddIn/ICSharpCode.Profiler.AddIn.addin index 371d3819e6..7f0261bd91 100644 --- a/src/AddIns/Analysis/Profiler/Frontend/AddIn/ICSharpCode.Profiler.AddIn.addin +++ b/src/AddIns/Analysis/Profiler/Frontend/AddIn/ICSharpCode.Profiler.AddIn.addin @@ -36,7 +36,7 @@ @@ -78,7 +78,8 @@ + extensions = "*.sdps" + mimeType = "application/x-sharpdevelop-profiler"/> diff --git a/src/AddIns/Analysis/Profiler/Frontend/AddIn/Src/Commands/FindReferences.cs b/src/AddIns/Analysis/Profiler/Frontend/AddIn/Src/Commands/FindReferences.cs index 08d532e627..84e570fd70 100644 --- a/src/AddIns/Analysis/Profiler/Frontend/AddIn/Src/Commands/FindReferences.cs +++ b/src/AddIns/Analysis/Profiler/Frontend/AddIn/Src/Commands/FindReferences.cs @@ -35,9 +35,9 @@ namespace ICSharpCode.Profiler.AddIn.Commands string memberName = member.DeclaringType.Name + "." + member.Name; using (AsynchronousWaitDialog monitor = AsynchronousWaitDialog.ShowWaitDialog("${res:SharpDevelop.Refactoring.FindReferences}")) { - FindReferencesAndRenameHelper.ShowAsSearchResults(StringParser.Parse("${res:SharpDevelop.Refactoring.ReferencesTo}", - new string[,] {{ "Name", memberName }}), - RefactoringService.FindReferences(member, monitor)); + FindReferencesAndRenameHelper.ShowAsSearchResults( + StringParser.Parse("${res:SharpDevelop.Refactoring.ReferencesTo}", new StringTagPair("Name", memberName)), + RefactoringService.FindReferences(member, monitor)); } } } diff --git a/src/AddIns/Analysis/Profiler/Frontend/AddIn/Src/Views/ProfilerDisplayBinding.cs b/src/AddIns/Analysis/Profiler/Frontend/AddIn/Src/Views/ProfilerDisplayBinding.cs index c5a4104412..e7230c3ea1 100644 --- a/src/AddIns/Analysis/Profiler/Frontend/AddIn/Src/Views/ProfilerDisplayBinding.cs +++ b/src/AddIns/Analysis/Profiler/Frontend/AddIn/Src/Views/ProfilerDisplayBinding.cs @@ -21,7 +21,7 @@ namespace ICSharpCode.Profiler.AddIn.Views public bool CanCreateContentForFile(string fileName) { - return Path.GetExtension(fileName) == ".sdps"; + return true; // definition in .addin does extension-based filtering } public ICSharpCode.SharpDevelop.Gui.IViewContent CreateContentForFile(OpenedFile file) @@ -45,5 +45,15 @@ namespace ICSharpCode.Profiler.AddIn.Views } return new WpfViewer(file, provider); } + + public bool IsPreferredBindingForFile(string fileName) + { + return true; + } + + public double AutoDetectFileContent(string fileName, Stream fileContent, string detectedMimeType) + { + return 1; + } } } diff --git a/src/AddIns/Analysis/SourceAnalysis/SharpDevelop.SourceAnalysis.targets b/src/AddIns/Analysis/SourceAnalysis/SharpDevelop.SourceAnalysis.targets index 7ebbeac80b..71751405a4 100644 --- a/src/AddIns/Analysis/SourceAnalysis/SharpDevelop.SourceAnalysis.targets +++ b/src/AddIns/Analysis/SourceAnalysis/SharpDevelop.SourceAnalysis.targets @@ -1,7 +1,8 @@  - + $(BuildDependsOn);SourceAnalysis diff --git a/src/AddIns/Analysis/SourceAnalysis/SourceAnalysis.addin b/src/AddIns/Analysis/SourceAnalysis/SourceAnalysis.addin index 7ef9c1efe6..03e057c421 100644 --- a/src/AddIns/Analysis/SourceAnalysis/SourceAnalysis.addin +++ b/src/AddIns/Analysis/SourceAnalysis/SourceAnalysis.addin @@ -17,10 +17,6 @@ - - - - diff --git a/src/AddIns/Analysis/UnitTesting/Test/Tree/ClassWithNoRootNamespaceTestFixture.cs b/src/AddIns/Analysis/UnitTesting/Test/Tree/ClassWithNoRootNamespaceTestFixture.cs index 2752da73e6..8e788c1dff 100644 --- a/src/AddIns/Analysis/UnitTesting/Test/Tree/ClassWithNoRootNamespaceTestFixture.cs +++ b/src/AddIns/Analysis/UnitTesting/Test/Tree/ClassWithNoRootNamespaceTestFixture.cs @@ -36,7 +36,7 @@ namespace UnitTesting.Tests.Tree public void SetUp() { // Create solution. - solution = new Solution(); + solution = new Solution(new MockProjectChangeWatcher()); // Create a project to display in the test tree view. project = new MockCSharpProject(); diff --git a/src/AddIns/Analysis/UnitTesting/Test/Tree/GetProjectsTestFixture.cs b/src/AddIns/Analysis/UnitTesting/Test/Tree/GetProjectsTestFixture.cs index ab20812129..14c40c6ecf 100644 --- a/src/AddIns/Analysis/UnitTesting/Test/Tree/GetProjectsTestFixture.cs +++ b/src/AddIns/Analysis/UnitTesting/Test/Tree/GetProjectsTestFixture.cs @@ -27,7 +27,7 @@ namespace UnitTesting.Tests.Tree [SetUp] public void Init() { - solution = new Solution(); + solution = new Solution(new MockProjectChangeWatcher()); project1 = new MockCSharpProject(solution, "A"); ReferenceProjectItem refProjectItem = new ReferenceProjectItem(project1); refProjectItem.Include = "NUnit.Framework"; diff --git a/src/AddIns/Analysis/UnitTesting/Test/Tree/MultipleTestProjectsTestFixture.cs b/src/AddIns/Analysis/UnitTesting/Test/Tree/MultipleTestProjectsTestFixture.cs index 16a6813017..baba5489a9 100644 --- a/src/AddIns/Analysis/UnitTesting/Test/Tree/MultipleTestProjectsTestFixture.cs +++ b/src/AddIns/Analysis/UnitTesting/Test/Tree/MultipleTestProjectsTestFixture.cs @@ -33,7 +33,7 @@ namespace UnitTesting.Tests.Tree treeView = new DummyParserServiceTestTreeView(testFrameworks); // Create a solution with two test projects. - solution = new Solution(); + solution = new Solution(new MockProjectChangeWatcher()); // Create the first test project. firstProject = new MockCSharpProject(solution, "FirstTestProject"); diff --git a/src/AddIns/Analysis/UnitTesting/Test/Tree/NonTestProjectNotAddedToTestTreeTestFixture.cs b/src/AddIns/Analysis/UnitTesting/Test/Tree/NonTestProjectNotAddedToTestTreeTestFixture.cs index 67f67ad4e7..898dd38d83 100644 --- a/src/AddIns/Analysis/UnitTesting/Test/Tree/NonTestProjectNotAddedToTestTreeTestFixture.cs +++ b/src/AddIns/Analysis/UnitTesting/Test/Tree/NonTestProjectNotAddedToTestTreeTestFixture.cs @@ -23,7 +23,7 @@ namespace UnitTesting.Tests.Tree [SetUp] public void Init() { - solution = new Solution(); + solution = new Solution(new MockProjectChangeWatcher()); testProject = new MockCSharpProject(solution, "A"); solution.Folders.Add(testProject); diff --git a/src/AddIns/Analysis/UnitTesting/Test/Tree/OpenUnitTestsPadWithSolutionOpenTestFixture.cs b/src/AddIns/Analysis/UnitTesting/Test/Tree/OpenUnitTestsPadWithSolutionOpenTestFixture.cs index 9d17c352b1..83e30381dd 100644 --- a/src/AddIns/Analysis/UnitTesting/Test/Tree/OpenUnitTestsPadWithSolutionOpenTestFixture.cs +++ b/src/AddIns/Analysis/UnitTesting/Test/Tree/OpenUnitTestsPadWithSolutionOpenTestFixture.cs @@ -23,7 +23,7 @@ namespace UnitTesting.Tests.Tree [TestFixtureSetUp] public void SetUp() { - Solution solution = new Solution(); + Solution solution = new Solution(new MockProjectChangeWatcher()); MockCSharpProject project = new MockCSharpProject(); MockProjectContent projectContent = new MockProjectContent(); projectContent.Project = project; diff --git a/src/AddIns/Analysis/UnitTesting/Test/Tree/SolutionLoadedAfterUnitTestsTreeDisposedTestFixture.cs b/src/AddIns/Analysis/UnitTesting/Test/Tree/SolutionLoadedAfterUnitTestsTreeDisposedTestFixture.cs index 9ab730eb3b..20abdc74b7 100644 --- a/src/AddIns/Analysis/UnitTesting/Test/Tree/SolutionLoadedAfterUnitTestsTreeDisposedTestFixture.cs +++ b/src/AddIns/Analysis/UnitTesting/Test/Tree/SolutionLoadedAfterUnitTestsTreeDisposedTestFixture.cs @@ -24,7 +24,7 @@ namespace UnitTesting.Tests.Tree [Test] public void SolutionLoadedAfterTreeDisposedDoesNotThrowNullReferenceException() { - Solution solution = new Solution(); + Solution solution = new Solution(new MockProjectChangeWatcher()); Assert.DoesNotThrow(delegate { pad.CallSolutionLoaded(solution); }); } } diff --git a/src/AddIns/Analysis/UnitTesting/Test/Tree/SolutionOpenedTestFixture.cs b/src/AddIns/Analysis/UnitTesting/Test/Tree/SolutionOpenedTestFixture.cs index d2186aa14a..9286080062 100644 --- a/src/AddIns/Analysis/UnitTesting/Test/Tree/SolutionOpenedTestFixture.cs +++ b/src/AddIns/Analysis/UnitTesting/Test/Tree/SolutionOpenedTestFixture.cs @@ -37,7 +37,7 @@ namespace UnitTesting.Tests.Tree testFrameworks = new MockTestFrameworksWithNUnitFrameworkSupport(); projectContent = new MockProjectContent(); pad.ProjectContent = projectContent; - solution = new Solution(); + solution = new Solution(new MockProjectChangeWatcher()); project = new MockCSharpProject(); projectContent.Project = project; projectContent.Language = LanguageProperties.None; diff --git a/src/AddIns/Analysis/UnitTesting/Test/Tree/TwoTestClassesInDifferentNamespacesTestFixture.cs b/src/AddIns/Analysis/UnitTesting/Test/Tree/TwoTestClassesInDifferentNamespacesTestFixture.cs index cbe55ee51d..5af4036fb0 100644 --- a/src/AddIns/Analysis/UnitTesting/Test/Tree/TwoTestClassesInDifferentNamespacesTestFixture.cs +++ b/src/AddIns/Analysis/UnitTesting/Test/Tree/TwoTestClassesInDifferentNamespacesTestFixture.cs @@ -37,7 +37,7 @@ namespace UnitTesting.Tests.Tree [SetUp] public void SetUp() { - solution = new Solution(); + solution = new Solution(new MockProjectChangeWatcher()); // Create a project to display in the test tree view. project = new MockCSharpProject(solution, "TestProject"); diff --git a/src/AddIns/Analysis/UnitTesting/Test/Utils/MockCSharpProject.cs b/src/AddIns/Analysis/UnitTesting/Test/Utils/MockCSharpProject.cs index 479b3899bc..2be850a964 100644 --- a/src/AddIns/Analysis/UnitTesting/Test/Utils/MockCSharpProject.cs +++ b/src/AddIns/Analysis/UnitTesting/Test/Utils/MockCSharpProject.cs @@ -13,7 +13,7 @@ namespace UnitTesting.Tests.Utils bool saved; public MockCSharpProject() - : this(new Solution(), "MyTests") + : this(new Solution(new MockProjectChangeWatcher()), "MyTests") { } diff --git a/src/AddIns/BackendBindings/Boo/BooBinding/Project/BooBinding.addin b/src/AddIns/BackendBindings/Boo/BooBinding/Project/BooBinding.addin index 363de2765e..e1d47ff846 100644 --- a/src/AddIns/BackendBindings/Boo/BooBinding/Project/BooBinding.addin +++ b/src/AddIns/BackendBindings/Boo/BooBinding/Project/BooBinding.addin @@ -29,7 +29,8 @@ + extensions = "*.boo" + mimeType = "text/plain"/> diff --git a/src/AddIns/BackendBindings/Boo/NRefactoryToBooConverter/Project/ConvertVisitorExpressions.cs b/src/AddIns/BackendBindings/Boo/NRefactoryToBooConverter/Project/ConvertVisitorExpressions.cs index 4e63f45a96..ff1f51c5c0 100644 --- a/src/AddIns/BackendBindings/Boo/NRefactoryToBooConverter/Project/ConvertVisitorExpressions.cs +++ b/src/AddIns/BackendBindings/Boo/NRefactoryToBooConverter/Project/ConvertVisitorExpressions.cs @@ -468,13 +468,7 @@ namespace NRefactoryToBooConverter newRank[i] = elementType.RankSpecifier[i + 1]; elementType.RankSpecifier = newRank; mie.Arguments.Add(MakeReferenceExpression(elementType)); - if (arrayCreateExpression.Arguments.Count == 1) { - mie.Arguments.Add(ConvertExpression(arrayCreateExpression.Arguments[0])); - } else { - B.ArrayLiteralExpression dims = new B.ArrayLiteralExpression(GetLexicalInfo(arrayCreateExpression)); - ConvertExpressions(arrayCreateExpression.Arguments, dims.Items); - mie.Arguments.Add(dims); - } + ConvertExpressions(arrayCreateExpression.Arguments, mie.Arguments); return mie; } diff --git a/src/AddIns/BackendBindings/Boo/NRefactoryToBooConverter/Test/ExpressionTests.cs b/src/AddIns/BackendBindings/Boo/NRefactoryToBooConverter/Test/ExpressionTests.cs index 4859c11616..2e574696e6 100644 --- a/src/AddIns/BackendBindings/Boo/NRefactoryToBooConverter/Test/ExpressionTests.cs +++ b/src/AddIns/BackendBindings/Boo/NRefactoryToBooConverter/Test/ExpressionTests.cs @@ -204,7 +204,7 @@ namespace NRefactoryToBooConverter.Tests [Test] public void CreateMultidimensionalArray() { - TestExpr("new int[2, 3]", "matrix(System.Int32, (2, 3))"); + TestExpr("new int[2, 3]", "matrix(System.Int32, 2, 3)"); } [Test] diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.addin b/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.addin index cbb95cfdbc..15bccf626c 100644 --- a/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.addin +++ b/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.addin @@ -36,7 +36,8 @@ + extensions = "*.cs" + mimeType = "text/plain"/> diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/CSharpCompletionBinding.cs b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/CSharpCompletionBinding.cs index 640e829325..74454d7e08 100644 --- a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/CSharpCompletionBinding.cs +++ b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/CSharpCompletionBinding.cs @@ -43,7 +43,6 @@ namespace CSharpBinding } else if (ch == ',' && CodeCompletionOptions.InsightRefreshOnComma && CodeCompletionOptions.InsightEnabled) { IInsightWindow insightWindow; if (insightHandler.InsightRefreshOnComma(editor, ch, out insightWindow)) { - insightHandler.HighlightParameter(insightWindow, -1); // disable highlighting return CodeCompletionKeyPressResult.Completed; } } else if(ch == '=') { diff --git a/src/AddIns/BackendBindings/CppBinding/CppBinding/CppBinding.addin b/src/AddIns/BackendBindings/CppBinding/CppBinding/CppBinding.addin index d56ef76297..28e1453704 100644 --- a/src/AddIns/BackendBindings/CppBinding/CppBinding/CppBinding.addin +++ b/src/AddIns/BackendBindings/CppBinding/CppBinding/CppBinding.addin @@ -65,7 +65,8 @@ insertafter="C#" insertbefore="Resources" name="C++ files (*.cpp, *.h)" - extensions="*.cpp;*.c;*.hpp;*.h"/> + extensions="*.cpp;*.c;*.hpp;*.h" + mimeType = "text/plain"/> diff --git a/src/AddIns/BackendBindings/FSharpBinding/FSharpBinding.addin b/src/AddIns/BackendBindings/FSharpBinding/FSharpBinding.addin index a8dd642bb4..fe19391181 100644 --- a/src/AddIns/BackendBindings/FSharpBinding/FSharpBinding.addin +++ b/src/AddIns/BackendBindings/FSharpBinding/FSharpBinding.addin @@ -41,7 +41,8 @@ + extensions = "*.fs" + mimeType = "text/plain"/> diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/PythonBinding.addin b/src/AddIns/BackendBindings/Python/PythonBinding/Project/PythonBinding.addin index 89f2ad3c25..02d32890c9 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/PythonBinding.addin +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/PythonBinding.addin @@ -19,33 +19,34 @@ + extensions=".py" + name="Python" + resource="ICSharpCode.PythonBinding.Resources.Python.xshd"/> + class="ICSharpCode.PythonBinding.PythonLanguageBinding" + extensions=".py" /> + insertbefore="Resources" + insertafter="Icons" + name="${res:ICSharpCode.PythonBinding.PythonFiles} (*.py)" + extensions="*.py" + mimeType = "text/plain"/> + insertbefore="AllFiles" + name="${res:ICSharpCode.PythonBinding.PythonProjectFiles} (*.pyproj)" + class="ICSharpCode.SharpDevelop.Project.LoadProject" + extensions="*.pyproj"/> @@ -57,36 +58,36 @@ + insertafter="Search" + insertbefore="Tools" + label="&Python" + type="Menu"> + icon="Icons.16x16.RunProgramIcon" + class="ICSharpCode.PythonBinding.RunDebugPythonCommand" + label="${res:XML.MainMenu.RunMenu.Run}" + shortcut="Control|Shift|R"/> + icon="Icons.16x16.Debug.StartWithoutDebugging" + class="ICSharpCode.PythonBinding.RunPythonCommand" + label="${res:XML.MainMenu.DebugMenu.RunWithoutDebug}" + shortcut="Control|Shift|W"/> + icon="Icons.16x16.StopProcess" + class="ICSharpCode.SharpDevelop.Project.Commands.StopDebuggingCommand" + label="${res:XML.MainMenu.DebugMenu.Stop}"/> + class="ICSharpCode.PythonBinding.SendLineToPythonConsoleCommand" + label="${res:ICSharpCode.PythonBinding.SendLineToPythonConsole}"/> + class="ICSharpCode.PythonBinding.SendSelectedTextToPythonConsoleCommand" + label="${res:ICSharpCode.PythonBinding.SendSelectedTextToPythonConsole}"/> @@ -95,18 +96,18 @@ + supportedextensions=".py" + projectfileextension=".pyproj" + class="ICSharpCode.PythonBinding.PythonParser"/> + guid="{FD48973F-F585-4F70-812B-4D0503B36CE9}" + supportedextensions=".py" + projectfileextension=".pyproj" + class="ICSharpCode.PythonBinding.PythonProjectBinding" /> @@ -127,33 +128,33 @@ + label="Python" + class="ICSharpCode.PythonBinding.PythonOptionsPanel"/> + label="${res:Dialog.ProjectOptions.ApplicationSettings}" + class="ICSharpCode.PythonBinding.ApplicationSettingsPanel"/> + label="${res:Dialog.ProjectOptions.BuildEvents}" + class="ICSharpCode.SharpDevelop.Gui.OptionPanels.BuildEvents"/> + label="${res:Dialog.ProjectOptions.BuildOptions}" + class="ICSharpCode.PythonBinding.CompilingOptionsPanel"/> + label="${res:Dialog.ProjectOptions.DebugOptions}" + class="ICSharpCode.SharpDevelop.Gui.OptionPanels.DebugOptions"/> + type="Secondary" + fileNamePattern="\.py$" + languagePattern="^Python$" + class="ICSharpCode.PythonBinding.PythonFormsDesignerDisplayBinding" /> @@ -163,63 +164,63 @@ + insertafter="CSharp" + insertbefore="VBNet" + label="Python" + class="ICSharpCode.PythonBinding.ConvertToPythonMenuCommand"/> + label="${res:ICSharpCode.PythonBinding.ConvertCSharpProjectToPythonProject}" + class="ICSharpCode.PythonBinding.ConvertProjectToPythonProjectCommand"/> + label="${res:ICSharpCode.PythonBinding.ConvertVBNetProjectToPythonProject}" + class="ICSharpCode.PythonBinding.ConvertProjectToPythonProjectCommand"/> + category="Tools" + title="${res:ICSharpCode.PythonBinding.PythonConsole}" + insertbefore="DefinitionView" + icon="PadIcons.Output" + defaultPosition="Bottom, Hidden" + class="ICSharpCode.PythonBinding.PythonConsolePad"/> + extensions=".py" + resource="Python.ProjectBrowser.File"/> + language="Python" + resource="Python.ProjectBrowser.Project"/> + class="ICSharpCode.PythonBinding.PythonTestFramework" + supportedProjects=".pyproj"/> - + + insertafter="Indent" + type="Separator"/> + class="ICSharpCode.PythonBinding.SendLineToPythonConsoleCommand" + label="${res:ICSharpCode.PythonBinding.SendLineToPythonConsole}"/> + class="ICSharpCode.PythonBinding.SendSelectedTextToPythonConsoleCommand" + label="${res:ICSharpCode.PythonBinding.SendSelectedTextToPythonConsole}"/> diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Converter/ProjectHasStartupObjectTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Converter/ProjectHasStartupObjectTestFixture.cs index 683317e769..2187ed3917 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Converter/ProjectHasStartupObjectTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Converter/ProjectHasStartupObjectTestFixture.cs @@ -71,7 +71,7 @@ namespace PythonBinding.Tests.Converter convertProjectCommand.ProjectContent = mockProjectContent; convertProjectCommand.FileServiceDefaultEncoding = Encoding.Unicode; - Solution solution = new Solution(); + Solution solution = new Solution(new MockProjectChangeWatcher()); sourceProject = new MSBuildBasedProject( new ProjectCreateInformation() { Solution = solution, diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Gui/AppSettingsPanelTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Gui/AppSettingsPanelTestFixture.cs index 0b64a468e5..8c8062b2d0 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Gui/AppSettingsPanelTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Gui/AppSettingsPanelTestFixture.cs @@ -4,6 +4,7 @@ using System; using System.IO; using System.Windows.Forms; + using ICSharpCode.Core; using ICSharpCode.PythonBinding; using ICSharpCode.SharpDevelop; @@ -11,6 +12,7 @@ using ICSharpCode.SharpDevelop.Internal.Templates; using ICSharpCode.SharpDevelop.Project; using NUnit.Framework; using PythonBinding.Tests.Utils; +using UnitTesting.Tests.Utils; namespace PythonBinding.Tests.Gui { @@ -29,7 +31,7 @@ namespace PythonBinding.Tests.Gui PythonMSBuildEngineHelper.InitMSBuildEngine(); ProjectCreateInformation info = new ProjectCreateInformation(); - info.Solution = new Solution(); + info.Solution = new Solution(new MockProjectChangeWatcher()); info.ProjectName = "Test"; info.OutputProjectFileName = @"C:\Projects\Test\Test.pyproj"; info.RootNamespace = "Test"; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Gui/CompilingOptionsPanelTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Gui/CompilingOptionsPanelTestFixture.cs index 4de16ba5ef..018f2464a2 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Gui/CompilingOptionsPanelTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Gui/CompilingOptionsPanelTestFixture.cs @@ -4,6 +4,7 @@ using System; using System.IO; using System.Windows.Forms; + using ICSharpCode.Core; using ICSharpCode.PythonBinding; using ICSharpCode.SharpDevelop; @@ -11,6 +12,7 @@ using ICSharpCode.SharpDevelop.Internal.Templates; using ICSharpCode.SharpDevelop.Project; using NUnit.Framework; using PythonBinding.Tests.Utils; +using UnitTesting.Tests.Utils; namespace PythonBinding.Tests.Gui { @@ -29,7 +31,7 @@ namespace PythonBinding.Tests.Gui PythonMSBuildEngineHelper.InitMSBuildEngine(); ProjectCreateInformation info = new ProjectCreateInformation(); - info.Solution = new Solution(); + info.Solution = new Solution(new MockProjectChangeWatcher()); info.ProjectName = "Test"; info.OutputProjectFileName = @"C:\Projects\Test\Test.pyproj"; info.RootNamespace = "Test"; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Parsing/ParserTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Parsing/ParserTestFixture.cs index 111a70383c..dcc601ca6b 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Parsing/ParserTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Parsing/ParserTestFixture.cs @@ -11,6 +11,7 @@ using ICSharpCode.SharpDevelop.Project; using NUnit.Framework; using PythonBinding.Tests; using PythonBinding.Tests.Utils; +using UnitTesting.Tests.Utils; namespace PythonBinding.Tests.Parsing { @@ -87,7 +88,7 @@ namespace PythonBinding.Tests.Parsing public void CanParsePythonProject() { ProjectCreateInformation createInfo = new ProjectCreateInformation(); - createInfo.Solution = new Solution(); + createInfo.Solution = new Solution(new MockProjectChangeWatcher()); createInfo.OutputProjectFileName = @"C:\projects\test.pyproj"; PythonProject project = new PythonProject(createInfo); Assert.IsTrue(parser.CanParse(project)); diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonLanguage/CreateNewPythonProjectTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonLanguage/CreateNewPythonProjectTestFixture.cs index a26c84f4de..0cef523954 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonLanguage/CreateNewPythonProjectTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonLanguage/CreateNewPythonProjectTestFixture.cs @@ -2,9 +2,10 @@ // This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; -using System.Linq; using System.IO; +using System.Linq; using System.Text; + using ICSharpCode.PythonBinding; using ICSharpCode.SharpDevelop; using ICSharpCode.SharpDevelop.Dom; @@ -12,6 +13,7 @@ using ICSharpCode.SharpDevelop.Internal.Templates; using ICSharpCode.SharpDevelop.Project; using NUnit.Framework; using PythonBinding.Tests.Utils; +using UnitTesting.Tests.Utils; namespace PythonBinding.Tests.PythonLanguage { @@ -30,7 +32,7 @@ namespace PythonBinding.Tests.PythonLanguage PythonMSBuildEngineHelper.InitMSBuildEngine(); info = new ProjectCreateInformation(); - info.Solution = new Solution(); + info.Solution = new Solution(new MockProjectChangeWatcher()); info.ProjectName = "Test"; info.OutputProjectFileName = @"C:\Projects\Test\Test.pyproj"; info.RootNamespace = "Test"; diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonLanguage/ProjectBindingTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonLanguage/ProjectBindingTestFixture.cs index 3c4ba9027f..f39bf9d297 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonLanguage/ProjectBindingTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonLanguage/ProjectBindingTestFixture.cs @@ -3,9 +3,10 @@ using System; using ICSharpCode.PythonBinding; -using ICSharpCode.SharpDevelop.Project; using ICSharpCode.SharpDevelop.Internal.Templates; +using ICSharpCode.SharpDevelop.Project; using NUnit.Framework; +using UnitTesting.Tests.Utils; namespace PythonBinding.Tests.PythonLanguage { @@ -25,7 +26,7 @@ namespace PythonBinding.Tests.PythonLanguage ProjectCreateInformation createInfo = new ProjectCreateInformation(); createInfo.ProjectName = "Python"; createInfo.OutputProjectFileName = @"C:\Projects\Python.pyproj"; - createInfo.Solution = new Solution(); + createInfo.Solution = new Solution(new MockProjectChangeWatcher()); project = projectBinding.CreateProject(createInfo) as PythonProject; } diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Testing/PythonTestFrameworkIsTestProjectTests.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Testing/PythonTestFrameworkIsTestProjectTests.cs index 52f59f7f56..b6db67dbe0 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Testing/PythonTestFrameworkIsTestProjectTests.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Testing/PythonTestFrameworkIsTestProjectTests.cs @@ -39,7 +39,7 @@ namespace PythonBinding.Tests.Testing public void IsTestProjectReturnsTrueForPythonProject() { ProjectCreateInformation createInfo = new ProjectCreateInformation(); - createInfo.Solution = new Solution(); + createInfo.Solution = new Solution(new MockProjectChangeWatcher()); createInfo.OutputProjectFileName = @"C:\projects\test.pyproj"; PythonProject project = new PythonProject(createInfo); diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/RubyBinding.addin b/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/RubyBinding.addin index fd03659bfa..ef305f5c6f 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/RubyBinding.addin +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Project/RubyBinding.addin @@ -1,8 +1,8 @@  + author = "Matt Ward" + copyright = "prj:///doc/copyright.txt" + description = "IronRuby addin" + addInManagerHidden = "preinstalled"> @@ -19,27 +19,28 @@ - + extensions=".rb" + name="Ruby" + resource="ICSharpCode.RubyBinding.Resources.Ruby.xshd"/> + + insertbefore="Resources" + insertafter="Icons" + name="Ruby Files (*.rb)" + extensions="*.rb" + mimeType = "text/plain"/> + insertbefore="AllFiles" + name="Ruby Project Files (*.rbproj)" + class="ICSharpCode.SharpDevelop.Project.LoadProject" + extensions="*.rbproj"/> @@ -51,36 +52,36 @@ + insertafter="Search" + insertbefore="Tools" + label="&Ruby" + type="Menu"> + icon="Icons.16x16.RunProgramIcon" + class="ICSharpCode.RubyBinding.RunDebugRubyCommand" + label="${res:XML.MainMenu.RunMenu.Run}" + shortcut="Control|Shift|R"/> + icon="Icons.16x16.Debug.StartWithoutDebugging" + class="ICSharpCode.RubyBinding.RunRubyCommand" + label="${res:XML.MainMenu.DebugMenu.RunWithoutDebug}" + shortcut="Control|Shift|W"/> + icon="Icons.16x16.StopProcess" + class="ICSharpCode.SharpDevelop.Project.Commands.StopDebuggingCommand" + label="${res:XML.MainMenu.DebugMenu.Stop}"/> + class="ICSharpCode.RubyBinding.SendLineToRubyConsoleCommand" + label="${res:ICSharpCode.RubyBinding.SendLineToRubyConsole}"/> + class="ICSharpCode.RubyBinding.SendSelectedTextToRubyConsoleCommand" + label="${res:ICSharpCode.RubyBinding.SendSelectedTextToRubyConsole}"/> @@ -89,28 +90,28 @@ + supportedextensions=".rb" + projectfileextension=".rbproj" + class="ICSharpCode.RubyBinding.RubyParser"/> - + + guid="{BD8E9625-815A-4BDB-B228-5D4F9C2541A1}" + supportedextensions=".rb" + projectfileextension=".rbproj" + class="ICSharpCode.RubyBinding.RubyProjectBinding" /> + class="ICSharpCode.RubyBinding.RubyLanguageBinding" + extensions=".rb" /> - + label="Ruby" + class="ICSharpCode.RubyBinding.RubyOptionsPanel"/> + label="${res:Dialog.ProjectOptions.DebugOptions}" + class="ICSharpCode.SharpDevelop.Gui.OptionPanels.DebugOptions"/> + type="Secondary" + fileNamePattern="\.rb$" + languagePattern="^Ruby$" + class="ICSharpCode.RubyBinding.RubyFormsDesignerDisplayBinding" /> @@ -150,64 +151,64 @@ + insertafter="CSharp" + insertbefore="VBNet" + label="Ruby" + class="ICSharpCode.RubyBinding.ConvertToRubyMenuCommand"/> + label="From C# to Ruby" + class="ICSharpCode.RubyBinding.ConvertProjectToRubyProjectCommand"/> + label="From VB.NET to Ruby" + class="ICSharpCode.RubyBinding.ConvertProjectToRubyProjectCommand"/> + category="Tools" + title="Ruby Console" + insertbefore="DefinitionView" + icon="PadIcons.Output" + defaultPosition="Bottom, Hidden" + class="ICSharpCode.RubyBinding.RubyConsolePad"/> + extensions=".rb" + resource="Ruby.ProjectBrowser.File"/> + language="Ruby" + resource="Ruby.ProjectBrowser.Project"/> - + + class="ICSharpCode.RubyBinding.RubyTestFramework" + supportedProjects=".rbproj"/> + insertafter="Indent" + type="Separator"/> + class="ICSharpCode.RubyBinding.SendLineToRubyConsoleCommand" + label="${res:ICSharpCode.RubyBinding.SendLineToRubyConsole}"/> + class="ICSharpCode.RubyBinding.SendSelectedTextToRubyConsoleCommand" + label="${res:ICSharpCode.RubyBinding.SendSelectedTextToRubyConsole}"/> - + diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Parsing/RubyParserTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Parsing/RubyParserTestFixture.cs index 33390d331a..a7689a6a48 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Parsing/RubyParserTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Parsing/RubyParserTestFixture.cs @@ -12,6 +12,7 @@ using ICSharpCode.SharpDevelop.Project; using NUnit.Framework; using RubyBinding.Tests; using RubyBinding.Tests.Utils; +using UnitTesting.Tests.Utils; namespace RubyBinding.Tests.Parsing { @@ -87,7 +88,7 @@ namespace RubyBinding.Tests.Parsing public void CanParseRubyProject() { ProjectCreateInformation createInfo = new ProjectCreateInformation(); - createInfo.Solution = new Solution(); + createInfo.Solution = new Solution(new MockProjectChangeWatcher()); createInfo.OutputProjectFileName = @"C:\projects\test.rbproj"; RubyProject project = new RubyProject(createInfo); Assert.IsTrue(parser.CanParse(project)); diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/RubyLanguage/CreateNewRubyProjectTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/RubyLanguage/CreateNewRubyProjectTestFixture.cs index 37d4dd250d..8d9cea581a 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/RubyLanguage/CreateNewRubyProjectTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/RubyLanguage/CreateNewRubyProjectTestFixture.cs @@ -4,6 +4,7 @@ using System; using System.IO; using System.Text; + using ICSharpCode.RubyBinding; using ICSharpCode.SharpDevelop; using ICSharpCode.SharpDevelop.Dom; @@ -11,6 +12,7 @@ using ICSharpCode.SharpDevelop.Internal.Templates; using ICSharpCode.SharpDevelop.Project; using Microsoft.Build.Construction; using NUnit.Framework; +using UnitTesting.Tests.Utils; namespace RubyBinding.Tests.RubyLanguage { @@ -27,7 +29,7 @@ namespace RubyBinding.Tests.RubyLanguage public void SetUpFixture() { info = new ProjectCreateInformation(); - info.Solution = new Solution(); + info.Solution = new Solution(new MockProjectChangeWatcher()); info.ProjectName = "Test"; info.OutputProjectFileName = @"C:\Projects\Test\Test.rbproj"; info.RootNamespace = "Test"; diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/RubyLanguage/ProjectBindingTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/RubyLanguage/ProjectBindingTestFixture.cs index a9634a37bb..2d3dc046e7 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/RubyLanguage/ProjectBindingTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/RubyLanguage/ProjectBindingTestFixture.cs @@ -3,9 +3,10 @@ using System; using ICSharpCode.RubyBinding; -using ICSharpCode.SharpDevelop.Project; using ICSharpCode.SharpDevelop.Internal.Templates; +using ICSharpCode.SharpDevelop.Project; using NUnit.Framework; +using UnitTesting.Tests.Utils; namespace RubyBinding.Tests.RubyLanguage { @@ -25,7 +26,7 @@ namespace RubyBinding.Tests.RubyLanguage ProjectCreateInformation createInfo = new ProjectCreateInformation(); createInfo.ProjectName = "Ruby"; createInfo.OutputProjectFileName = @"C:\Projects\Ruby.rbproj"; - createInfo.Solution = new Solution(); + createInfo.Solution = new Solution(new MockProjectChangeWatcher()); project = projectBinding.CreateProject(createInfo) as RubyProject; } diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Testing/RubyTestFrameworkIsTestProjectTests.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Testing/RubyTestFrameworkIsTestProjectTests.cs index cce2c38ddb..4e442df413 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Testing/RubyTestFrameworkIsTestProjectTests.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Testing/RubyTestFrameworkIsTestProjectTests.cs @@ -39,7 +39,7 @@ namespace RubyBinding.Tests.Testing public void IsTestProjectWhenPassedRubyPythonProjectReturnsTrue() { ProjectCreateInformation createInfo = new ProjectCreateInformation(); - createInfo.Solution = new Solution(); + createInfo.Solution = new Solution(new MockProjectChangeWatcher()); createInfo.OutputProjectFileName = @"C:\projects\test.rbproj"; RubyProject project = new RubyProject(createInfo); diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Testing/RubyTestRunnerResponseFileTestFixture.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Testing/RubyTestRunnerResponseFileTestFixture.cs index 8c3140f379..311de2b041 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Testing/RubyTestRunnerResponseFileTestFixture.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Testing/RubyTestRunnerResponseFileTestFixture.cs @@ -67,7 +67,7 @@ namespace RubyBinding.Tests.Testing [Test] public void WriteTestsAddsFileNamesForFileInProject() { - MockCSharpProject project = new MockCSharpProject(new Solution(), "mytests"); + MockCSharpProject project = new MockCSharpProject(new Solution(new MockProjectChangeWatcher()), "mytests"); FileProjectItem item = new FileProjectItem(project, ItemType.Compile); item.FileName = @"c:\projects\mytests\myTests.rb"; @@ -83,7 +83,7 @@ namespace RubyBinding.Tests.Testing [Test] public void WriteTestsDoesNotThrowNullReferenceExceptionWhenNonFileProjectItemInProject() { - MockCSharpProject project = new MockCSharpProject(new Solution(), "mytests"); + MockCSharpProject project = new MockCSharpProject(new Solution(new MockProjectChangeWatcher()), "mytests"); WebReferenceUrl webRef = new WebReferenceUrl(project); webRef.Include = "test"; ProjectService.AddProjectItem(project, webRef); diff --git a/src/AddIns/BackendBindings/Scripting/Project/Src/ScriptingDesignerGenerator.cs b/src/AddIns/BackendBindings/Scripting/Project/Src/ScriptingDesignerGenerator.cs index e6a373e319..e8d770a891 100644 --- a/src/AddIns/BackendBindings/Scripting/Project/Src/ScriptingDesignerGenerator.cs +++ b/src/AddIns/BackendBindings/Scripting/Project/Src/ScriptingDesignerGenerator.cs @@ -120,7 +120,7 @@ namespace ICSharpCode.Scripting return method.Parameters.Count == 2; } - public void NotifyFormRenamed(string newName) + public void NotifyComponentRenamed(object component, string newName, string oldName) { } @@ -285,6 +285,6 @@ namespace ICSharpCode.Scripting public virtual int InsertEventHandler(IDocument document, string eventHandler) { return 0; - } + } } } diff --git a/src/AddIns/BackendBindings/Scripting/Test/Utils/MockDesignerGenerator.cs b/src/AddIns/BackendBindings/Scripting/Test/Utils/MockDesignerGenerator.cs index 041b9e738a..f138db33e8 100644 --- a/src/AddIns/BackendBindings/Scripting/Test/Utils/MockDesignerGenerator.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Utils/MockDesignerGenerator.cs @@ -55,7 +55,7 @@ namespace ICSharpCode.Scripting.Tests.Utils { } - public void NotifyFormRenamed(string newName) + public void NotifyComponentRenamed(object component, string newName, string oldName) { } diff --git a/src/AddIns/BackendBindings/Scripting/Test/Utils/MockProject.cs b/src/AddIns/BackendBindings/Scripting/Test/Utils/MockProject.cs index cab9118b36..15941e676e 100644 --- a/src/AddIns/BackendBindings/Scripting/Test/Utils/MockProject.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Utils/MockProject.cs @@ -4,10 +4,12 @@ using System; using System.Collections.Generic; using System.Collections.ObjectModel; + using ICSharpCode.Core; using ICSharpCode.SharpDevelop; using ICSharpCode.SharpDevelop.Internal.Templates; using ICSharpCode.SharpDevelop.Project; +using UnitTesting.Tests.Utils; namespace ICSharpCode.Scripting.Tests.Utils { @@ -169,7 +171,7 @@ namespace ICSharpCode.Scripting.Tests.Utils } public Solution ParentSolution { - get { return new Solution(); } + get { return new Solution(new MockProjectChangeWatcher()); } } public string TypeGuid { @@ -214,6 +216,12 @@ namespace ICSharpCode.Scripting.Tests.Utils } } + public Properties ProjectSpecificProperties { + get { + throw new NotImplementedException(); + } + } + public IEnumerable GetItemsOfType(ItemType type) { throw new NotImplementedException(); @@ -310,6 +318,5 @@ namespace ICSharpCode.Scripting.Tests.Utils throw new NotImplementedException(); } #endregion - } } diff --git a/src/AddIns/BackendBindings/VBNetBinding/Project/Src/VBNetCompletionBinding.cs b/src/AddIns/BackendBindings/VBNetBinding/Project/Src/VBNetCompletionBinding.cs index b9a93d47a8..f3457d140a 100644 --- a/src/AddIns/BackendBindings/VBNetBinding/Project/Src/VBNetCompletionBinding.cs +++ b/src/AddIns/BackendBindings/VBNetBinding/Project/Src/VBNetCompletionBinding.cs @@ -67,7 +67,6 @@ namespace ICSharpCode.VBNetBinding if (insightWindow != null) { insightHandler.InitializeOpenedInsightWindow(editor, insightWindow); insightHandler.HighlightParameter(insightWindow, 0); - insightWindow.CaretPositionChanged += delegate { Run(insightWindow, editor); }; } return CodeCompletionKeyPressResult.Completed; } @@ -75,14 +74,8 @@ namespace ICSharpCode.VBNetBinding case ',': if (CodeCompletionOptions.InsightRefreshOnComma && CodeCompletionOptions.InsightEnabled) { IInsightWindow insightWindow; - editor.Document.Insert(editor.Caret.Offset, ","); - if (insightHandler.InsightRefreshOnComma(editor, ch, out insightWindow)) { - if (insightWindow != null) { - insightHandler.HighlightParameter(insightWindow, GetArgumentIndex(editor) + 1); - insightWindow.CaretPositionChanged += delegate { Run(insightWindow, editor); };; - } - } - return CodeCompletionKeyPressResult.EatKey; + if (insightHandler.InsightRefreshOnComma(editor, ch, out insightWindow)) + return CodeCompletionKeyPressResult.Completed; } break; case '\n': @@ -145,26 +138,6 @@ namespace ICSharpCode.VBNetBinding return CodeCompletionKeyPressResult.None; } - void Run(IInsightWindow insightWindow, ITextEditor editor) - { - insightHandler.HighlightParameter(insightWindow, GetArgumentIndex(editor)); - } - - static int GetArgumentIndex(ITextEditor editor) - { - ILexer lexer = ParserFactory.CreateLexer(SupportedLanguage.VBNet, editor.Document.CreateReader()); - ExpressionFinder ef = new ExpressionFinder(); - - Token t = lexer.NextToken(); - - while (t.Kind != Tokens.EOF && t.Location < editor.Caret.Position) { - ef.InformToken(t); - t = lexer.NextToken(); - } - - return ef.ActiveArgument; - } - static bool IsTypeCharacter(char ch, char prevChar) { ch = char.ToUpperInvariant(ch); diff --git a/src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.addin b/src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.addin index 2a08dd5a78..0ad5f20b5d 100644 --- a/src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.addin +++ b/src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.addin @@ -23,7 +23,8 @@ + extensions = "*.vb" + mimeType = "text/plain"/> diff --git a/src/AddIns/BackendBindings/WixBinding/Project/Src/Gui/WixDialogDesignerGenerator.cs b/src/AddIns/BackendBindings/WixBinding/Project/Src/Gui/WixDialogDesignerGenerator.cs index 5270738dd5..d0738f3f15 100644 --- a/src/AddIns/BackendBindings/WixBinding/Project/Src/Gui/WixDialogDesignerGenerator.cs +++ b/src/AddIns/BackendBindings/WixBinding/Project/Src/Gui/WixDialogDesignerGenerator.cs @@ -101,7 +101,7 @@ namespace ICSharpCode.WixBinding { } - public void NotifyFormRenamed(string newName) + public void NotifyComponentRenamed(object component, string newName, string oldName) { } diff --git a/src/AddIns/BackendBindings/WixBinding/Project/WixBinding.addin b/src/AddIns/BackendBindings/WixBinding/Project/WixBinding.addin index 47938d8081..86f0093fea 100644 --- a/src/AddIns/BackendBindings/WixBinding/Project/WixBinding.addin +++ b/src/AddIns/BackendBindings/WixBinding/Project/WixBinding.addin @@ -28,7 +28,8 @@ + extensions = "*.wxs;*.wxi" + mimeType = "text/xml"/> diff --git a/src/AddIns/BackendBindings/WixBinding/Test/Gui/DeleteWixExtensionNodeTestFixture.cs b/src/AddIns/BackendBindings/WixBinding/Test/Gui/DeleteWixExtensionNodeTestFixture.cs index c64faf184b..fea6c09e58 100644 --- a/src/AddIns/BackendBindings/WixBinding/Test/Gui/DeleteWixExtensionNodeTestFixture.cs +++ b/src/AddIns/BackendBindings/WixBinding/Test/Gui/DeleteWixExtensionNodeTestFixture.cs @@ -29,7 +29,7 @@ namespace WixBinding.Tests.Gui // create the project. ProjectCreateInformation info = new ProjectCreateInformation(); - info.Solution = new Solution(); + info.Solution = new Solution(new MockProjectChangeWatcher()); info.ProjectName = "Test"; info.OutputProjectFileName = @"C:\Projects\Test\Test.wixproj"; diff --git a/src/AddIns/BackendBindings/WixBinding/Test/Gui/DeleteWixLibraryNodeTestFixture.cs b/src/AddIns/BackendBindings/WixBinding/Test/Gui/DeleteWixLibraryNodeTestFixture.cs index 62bd097cff..950f8c80e2 100644 --- a/src/AddIns/BackendBindings/WixBinding/Test/Gui/DeleteWixLibraryNodeTestFixture.cs +++ b/src/AddIns/BackendBindings/WixBinding/Test/Gui/DeleteWixLibraryNodeTestFixture.cs @@ -29,7 +29,7 @@ namespace WixBinding.Tests.Gui // create the project. ProjectCreateInformation info = new ProjectCreateInformation(); - info.Solution = new Solution(); + info.Solution = new Solution(new MockProjectChangeWatcher()); info.ProjectName = "Test"; info.OutputProjectFileName = @"C:\Projects\Test\Test.wixproj"; diff --git a/src/AddIns/BackendBindings/WixBinding/Test/Project/CreateNewWixProjectObjectTestFixture.cs b/src/AddIns/BackendBindings/WixBinding/Test/Project/CreateNewWixProjectObjectTestFixture.cs index 2d6c0f1d4b..a908ac2652 100644 --- a/src/AddIns/BackendBindings/WixBinding/Test/Project/CreateNewWixProjectObjectTestFixture.cs +++ b/src/AddIns/BackendBindings/WixBinding/Test/Project/CreateNewWixProjectObjectTestFixture.cs @@ -29,7 +29,7 @@ namespace WixBinding.Tests.Project WixBindingTestsHelper.InitMSBuildEngine(); info = new ProjectCreateInformation(); - info.Solution = new Solution(); + info.Solution = new Solution(new MockProjectChangeWatcher()); info.ProjectName = "Test"; info.OutputProjectFileName = @"C:\Projects\Test\Test.wixproj"; info.RootNamespace = "Test"; diff --git a/src/AddIns/BackendBindings/WixBinding/Test/Project/WixBuilderCannotBuildNonWixProjectTestFixture.cs b/src/AddIns/BackendBindings/WixBinding/Test/Project/WixBuilderCannotBuildNonWixProjectTestFixture.cs index 82808c344f..7108a00d9c 100644 --- a/src/AddIns/BackendBindings/WixBinding/Test/Project/WixBuilderCannotBuildNonWixProjectTestFixture.cs +++ b/src/AddIns/BackendBindings/WixBinding/Test/Project/WixBuilderCannotBuildNonWixProjectTestFixture.cs @@ -1,11 +1,12 @@ // Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) // This code is distributed under the GNU LGPL (for details please see \doc\license.txt) -using ICSharpCode.SharpDevelop.Internal.Templates; using System; +using ICSharpCode.SharpDevelop.Internal.Templates; using ICSharpCode.SharpDevelop.Project; using ICSharpCode.WixBinding; using NUnit.Framework; +using WixBinding.Tests.Utils; namespace WixBinding.Tests.Project { @@ -25,7 +26,7 @@ namespace WixBinding.Tests.Project project = new MSBuildBasedProject( new ProjectCreateInformation { OutputProjectFileName = @"C:\Projects\Test\test.csproj", - Solution = new Solution(), + Solution = new Solution(new MockProjectChangeWatcher()), ProjectName = "test" } ); diff --git a/src/AddIns/BackendBindings/WixBinding/Test/Utils/WixBindingTestsHelper.cs b/src/AddIns/BackendBindings/WixBinding/Test/Utils/WixBindingTestsHelper.cs index ec4b8ef96f..2eeb495b0c 100644 --- a/src/AddIns/BackendBindings/WixBinding/Test/Utils/WixBindingTestsHelper.cs +++ b/src/AddIns/BackendBindings/WixBinding/Test/Utils/WixBindingTestsHelper.cs @@ -43,7 +43,7 @@ namespace WixBinding.Tests.Utils // create the project. ProjectCreateInformation info = new ProjectCreateInformation(); - info.Solution = new Solution(); + info.Solution = new Solution(new MockProjectChangeWatcher()); info.ProjectName = "Test"; info.OutputProjectFileName = @"C:\Projects\Test\Test.wixproj"; diff --git a/src/AddIns/BackendBindings/XamlBinding/XamlBinding/Options/CodeCompletion.xaml b/src/AddIns/BackendBindings/XamlBinding/XamlBinding/Options/CodeCompletion.xaml index 670276cfd7..bdc62784ee 100644 --- a/src/AddIns/BackendBindings/XamlBinding/XamlBinding/Options/CodeCompletion.xaml +++ b/src/AddIns/BackendBindings/XamlBinding/XamlBinding/Options/CodeCompletion.xaml @@ -1,45 +1,46 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:gui="clr-namespace:ICSharpCode.SharpDevelop.Gui;assembly=ICSharpCode.SharpDevelop" + xmlns:addin="clr-namespace:ICSharpCode.XamlBinding" + xmlns:wd="http://icsharpcode.net/sharpdevelop/widgets" + xmlns:sd="http://icsharpcode.net/sharpdevelop/core" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlBinding.addin b/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlBinding.addin index 920aa5a7ac..125e64d183 100644 --- a/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlBinding.addin +++ b/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlBinding.addin @@ -29,7 +29,8 @@ + extensions = "*.xaml" + mimeType = "text/xml"/> diff --git a/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlCompletionItem.cs b/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlCompletionItem.cs index e498f928ba..fa2370a7bb 100644 --- a/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlCompletionItem.cs +++ b/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlCompletionItem.cs @@ -23,18 +23,21 @@ namespace ICSharpCode.XamlBinding this.Text = entity.Name; else this.Text = prefix + ":" + entity.Name; + this.Content = this.Text; } public XamlCodeCompletionItem(IEntity entity) : base(entity) { this.Text = entity.Name; + this.Content = this.Text; } public XamlCodeCompletionItem(string text, IEntity entity) : base(entity) { this.Text = text; + this.Content = this.Text; } public XamlCodeCompletionItem(IEntity entity, string prefix, string className) @@ -44,6 +47,7 @@ namespace ICSharpCode.XamlBinding this.Text = className + "." + entity.Name; else this.Text = prefix + ":" + className + "." + entity.Name; + this.Content = this.Text; } public override string ToString() @@ -61,6 +65,7 @@ namespace ICSharpCode.XamlBinding { this.addType = addType; this.Text = text; + this.Content = this.Text; } public override void Complete(CompletionContext context) diff --git a/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlOutlineContentHost.xaml.cs b/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlOutlineContentHost.xaml.cs index 8f2881569b..d644ab0f9e 100644 --- a/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlOutlineContentHost.xaml.cs +++ b/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlOutlineContentHost.xaml.cs @@ -79,7 +79,6 @@ namespace ICSharpCode.XamlBinding XamlOutlineNode node = new XamlOutlineNode() { Name = item.Name, ElementName = item.ElementName, - ShowIcon = false, Marker = editor.Document.CreateAnchor(Utils.MinMax(item.StartOffset, 0, editor.Document.TextLength - 1)), EndMarker = editor.Document.CreateAnchor(Utils.MinMax(item.EndOffset, 0, editor.Document.TextLength - 1)), Editor = editor diff --git a/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlOutlineNode.cs b/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlOutlineNode.cs index 58268015a2..a128a0e7de 100644 --- a/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlOutlineNode.cs +++ b/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlOutlineNode.cs @@ -40,14 +40,9 @@ namespace ICSharpCode.XamlBinding return false; //nodes.All(node => node.Parent != null); } - public override DropEffect CanDrop(IDataObject data, DropEffect requestedEffect) + public override bool CanDrop(DragEventArgs e, int index) { - return DropEffect.None; //DropEffect.Move; - } - - public override bool CanCopy(SharpTreeNode[] nodes) - { - return true; + return false; } public string GetMarkupText() @@ -67,64 +62,47 @@ namespace ICSharpCode.XamlBinding return dataObject; } - public override bool CanDelete(SharpTreeNode[] nodes) + public override bool CanDelete() { - return nodes.All(node => node.Parent != null); + return Parent != null; } - public override void Drop(IDataObject data, int index, DropEffect finalEffect) - { - try { - string insertText = (data.GetData(typeof(string[])) as string[]) - .Aggregate((text, part) => text += part); - ITextAnchor marker; - int length = 0; - if (index == this.Children.Count) { - if (index == 0) - marker = null; - else - marker = (this.Children[index - 1] as XamlOutlineNode).EndMarker; - if (marker == null) { - marker = this.EndMarker; - length = -1; // move backwards - } else { - length = 2 + (this.Children[index - 1] as XamlOutlineNode).elementName.Length; - } - } else - marker = (this.Children[index] as XamlOutlineNode).Marker; - - int offset = marker.Offset + length; - Editor.Document.Insert(offset, insertText); - } catch (Exception ex) { - throw ex; - } - } +// public override void Drop(IDataObject data, int index, DropEffect finalEffect) +// { +// try { +// string insertText = (data.GetData(typeof(string[])) as string[]) +// .Aggregate((text, part) => text += part); +// ITextAnchor marker; +// int length = 0; +// if (index == this.Children.Count) { +// if (index == 0) +// marker = null; +// else +// marker = (this.Children[index - 1] as XamlOutlineNode).EndMarker; +// if (marker == null) { +// marker = this.EndMarker; +// length = -1; // move backwards +// } else { +// length = 2 + (this.Children[index - 1] as XamlOutlineNode).elementName.Length; +// } +// } else +// marker = (this.Children[index] as XamlOutlineNode).Marker; +// +// int offset = marker.Offset + length; +// Editor.Document.Insert(offset, insertText); +// } catch (Exception ex) { +// throw ex; +// } +// } - public override void Delete(SharpTreeNode[] nodes) + public override void Delete() { - DeleteCore(nodes); + DeleteCore(); } - public override void DeleteCore(SharpTreeNode[] nodes) + public override void DeleteCore() { - foreach (XamlOutlineNode node in nodes.OfType()) { - node.Editor.Document.Remove(node.Marker.Offset, node.EndMarker.Offset - node.Marker.Offset); - } - } - - ContextMenu menu; - - public override ContextMenu GetContextMenu() - { - if (menu == null) { - menu = new ContextMenu(); - menu.Items.Add(new MenuItem() { Command = ApplicationCommands.Cut }); - menu.Items.Add(new MenuItem() { Command = ApplicationCommands.Copy }); - menu.Items.Add(new MenuItem() { Command = ApplicationCommands.Paste }); - menu.Items.Add(new Separator()); - menu.Items.Add(new MenuItem() { Command = ApplicationCommands.Delete }); - } - return menu; + Editor.Document.Remove(Marker.Offset, EndMarker.Offset - Marker.Offset); } public override object Text { diff --git a/src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.csproj b/src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.csproj index fff7b5da32..ccf1be5984 100644 --- a/src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.csproj +++ b/src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.csproj @@ -300,9 +300,6 @@ - - Component - @@ -418,11 +415,6 @@ NRefactory False - - {E73BB233-D88B-44A7-A98F-D71EE158381D} - Aga.Controls - False - {857CA1A3-FC88-4BE0-AB6A-D1EE772AB288} ICSharpCode.Core.WinForms diff --git a/src/AddIns/Debugger/Debugger.AddIn/Pads/CallStackPad.xaml b/src/AddIns/Debugger/Debugger.AddIn/Pads/CallStackPad.xaml index d9accbd7b3..ce438db750 100644 --- a/src/AddIns/Debugger/Debugger.AddIn/Pads/CallStackPad.xaml +++ b/src/AddIns/Debugger/Debugger.AddIn/Pads/CallStackPad.xaml @@ -20,7 +20,7 @@ - + diff --git a/src/AddIns/Debugger/Debugger.AddIn/Pads/Commands/WatchPadCommands.cs b/src/AddIns/Debugger/Debugger.AddIn/Pads/Commands/WatchPadCommands.cs index 76a52e5038..d62dde6c6e 100644 --- a/src/AddIns/Debugger/Debugger.AddIn/Pads/Commands/WatchPadCommands.cs +++ b/src/AddIns/Debugger/Debugger.AddIn/Pads/Commands/WatchPadCommands.cs @@ -3,12 +3,9 @@ using System; using System.Collections.Generic; -using System.Windows.Controls; using System.Windows.Forms; -using Aga.Controls.Tree; using Debugger.AddIn.Pads; -using Debugger.AddIn.Pads.Controls; using Debugger.AddIn.TreeModel; using ICSharpCode.Core; using ICSharpCode.Core.Presentation; @@ -17,7 +14,6 @@ using ICSharpCode.NRefactory; using ICSharpCode.SharpDevelop; using ICSharpCode.SharpDevelop.Gui.Pads; using ICSharpCode.SharpDevelop.Project; -using ICSharpCode.SharpDevelop.Debugging; namespace Debugger.AddIn { @@ -43,7 +39,7 @@ namespace Debugger.AddIn string language = ProjectService.CurrentProject.Language; - TextNode text = new TextNode(input, + TextNode text = new TextNode(null, input, language == "VB" || language == "VBNet" ? SupportedLanguage.VBNet : SupportedLanguage.CSharp); var list = pad.WatchList; @@ -120,21 +116,22 @@ namespace Debugger.AddIn if (owner is WatchPad) { WatchPad pad = (WatchPad)owner; - TreeViewVarNode node = ((TreeViewAdv)pad.Control).SelectedNode as TreeViewVarNode; + var node = pad.WatchList.SelectedNode; if (node == null) return items.ToArray(); - while (node.Parent != ((TreeViewAdv)pad.Control).Root) + + while (node.Parent != null && node.Parent.Parent != null) { - node = node.Parent as TreeViewVarNode; + node = node.Parent; } - if (!(node.Content is TextNode)) + if (!(node is TextNode)) return items.ToArray(); foreach (string item in SupportedLanguage.GetNames(typeof(SupportedLanguage))) { - items.Add(MakeItem(item, item, node.Content as TextNode, (sender, e) => HandleItem(sender))); + items.Add(MakeItem(item, item, node as TextNode, (sender, e) => HandleItem(sender))); } } diff --git a/src/AddIns/Debugger/Debugger.AddIn/Pads/Controls/ConditionCell.xaml.cs b/src/AddIns/Debugger/Debugger.AddIn/Pads/Controls/ConditionCell.xaml.cs index 4f01c5951a..eb8e1b2066 100644 --- a/src/AddIns/Debugger/Debugger.AddIn/Pads/Controls/ConditionCell.xaml.cs +++ b/src/AddIns/Debugger/Debugger.AddIn/Pads/Controls/ConditionCell.xaml.cs @@ -121,17 +121,21 @@ namespace Debugger.AddIn.Pads.Controls if (!string.IsNullOrEmpty(console.CommandText)) { Breakpoint.Action = BreakpointAction.Condition; - Model.Image = PresentationResourceService.GetImage("Bookmarks.BreakpointConditional").Source; + if (Breakpoint.IsEnabled) + Model.Image = BreakpointBookmark.BreakpointConditionalImage.ImageSource; } else { Breakpoint.Action = BreakpointAction.Break; - Model.Image = PresentationResourceService.GetImage("Bookmarks.Breakpoint").Source; + if (Breakpoint.IsEnabled) + Model.Image = BreakpointBookmark.BreakpointImage.ImageSource; } } private bool CheckSyntax() { string command = CommandText; + if (string.IsNullOrEmpty(command)) + return true; // FIXME workaround the NRefactory issue that needs a ; at the end if (language == "C#") { diff --git a/src/AddIns/Debugger/Debugger.AddIn/Pads/WatchPad.cs b/src/AddIns/Debugger/Debugger.AddIn/Pads/WatchPad.cs index 439053f00c..13305f868b 100644 --- a/src/AddIns/Debugger/Debugger.AddIn/Pads/WatchPad.cs +++ b/src/AddIns/Debugger/Debugger.AddIn/Pads/WatchPad.cs @@ -3,8 +3,11 @@ using System; using System.Collections.Generic; +using System.Collections.Specialized; +using System.Linq; using System.Windows; using System.Windows.Input; +using System.Xml.Serialization; using Debugger; using Debugger.AddIn; @@ -13,9 +16,9 @@ using Debugger.AddIn.TreeModel; using ICSharpCode.Core; using ICSharpCode.Core.Presentation; using ICSharpCode.NRefactory; +using ICSharpCode.SharpDevelop.Debugging; using ICSharpCode.SharpDevelop.Project; using Exception = System.Exception; -using ICSharpCode.SharpDevelop.Debugging; namespace ICSharpCode.SharpDevelop.Gui.Pads { @@ -58,11 +61,71 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads watchList.Drop += watchList_Drop; watchList.MouseDoubleClick += watchList_DoubleClick; watchList.KeyUp += watchList_KeyUp; + watchList.WatchItems.CollectionChanged += OnWatchItemsCollectionChanged; panel.Children.Add(watchList); panel.KeyUp += new KeyEventHandler(panel_KeyUp); + + // wire events that influence the items + LoadSavedNodes(); + ProjectService.SolutionClosed += delegate { watchList.WatchItems.Clear(); }; + ProjectService.ProjectAdded += delegate { LoadSavedNodes(); }; + ProjectService.SolutionLoaded += delegate { LoadSavedNodes(); }; } + #region Saved nodes + + void LoadSavedNodes() + { + var props = GetSavedVariablesProperties(); + if (props == null) + return; + + foreach (var element in props.Elements) { + watchList.WatchItems.Add(new TextNode(null, element, (SupportedLanguage)Enum.Parse(typeof(SupportedLanguage), props[element]))); + } + } + + void OnWatchItemsCollectionChanged(object sender, NotifyCollectionChangedEventArgs e) + { + if (e.Action == NotifyCollectionChangedAction.Add) { + // add to saved data + var data = e.NewItems[0] as TextNode; + if (data != null) { + var props = GetSavedVariablesProperties(); + if (props == null) return; + props.Set(data.FullName, data.Language.ToString()); + } + } + + if (e.Action == NotifyCollectionChangedAction.Remove) { + // remove from saved data + var data = e.OldItems[0] as TextNode; + if (data != null) { + var props = GetSavedVariablesProperties(); + if (props == null) return; + props.Remove(data.FullName); + } + } + } + + Properties GetSavedVariablesProperties() + { + if (ProjectService.CurrentProject == null) + return null; + if (ProjectService.CurrentProject.ProjectSpecificProperties == null) + return null; + + var props = ProjectService.CurrentProject.ProjectSpecificProperties.Get("watchVars") as Properties; + if (props == null) { + ProjectService.CurrentProject.ProjectSpecificProperties.Set("watchVars", new Properties()); + } + + return ProjectService.CurrentProject.ProjectSpecificProperties.Get("watchVars") as Properties; + } + + #endregion + void panel_KeyUp(object sender, KeyEventArgs e) { if (e.Key == Key.Insert) { @@ -89,7 +152,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads string language = ProjectService.CurrentProject.Language; // FIXME languages - TextNode text = new TextNode(e.Data.GetData(DataFormats.StringFormat).ToString(), + TextNode text = new TextNode(null, e.Data.GetData(DataFormats.StringFormat).ToString(), language == "VB" || language == "VBNet" ? SupportedLanguage.VBNet : SupportedLanguage.CSharp); if (!watchList.WatchItems.Contains(text)) @@ -133,7 +196,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads // rebuild list var nodes = new List(); foreach (var nod in watchList.WatchItems) - nodes.Add(new TextNode(nod.Name, + nodes.Add(new TextNode(null, nod.Name, language == "VB" || language == "VBNet" ? SupportedLanguage.VBNet : SupportedLanguage.CSharp)); watchList.WatchItems.Clear(); @@ -175,7 +238,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads LoggingService.Info("Evaluating: " + (string.IsNullOrEmpty(node.Name) ? "is null or empty!" : node.Name)); var nodExpression = debugger.GetExpression(node.Name); //Value val = ExpressionEvaluator.Evaluate(nod.Name, nod.Language, debuggedProcess.SelectedStackFrame); - ExpressionNode valNode = new ExpressionNode(null, node.Name, nodExpression); + ExpressionNode valNode = new ExpressionNode(null, null, node.Name, nodExpression); nodes.Add(valNode); } catch (GetValueException) { diff --git a/src/AddIns/Debugger/Debugger.AddIn/Pads/WatchPadModel.cs b/src/AddIns/Debugger/Debugger.AddIn/Pads/WatchPadModel.cs index ce3906bf27..2357c06e6b 100644 --- a/src/AddIns/Debugger/Debugger.AddIn/Pads/WatchPadModel.cs +++ b/src/AddIns/Debugger/Debugger.AddIn/Pads/WatchPadModel.cs @@ -2,15 +2,17 @@ // This code is distributed under the BSD license (for details please see \src\AddIns\Debugger\Debugger.AddIn\license.txt) using System; +using System.Text; using Debugger.AddIn.TreeModel; using ICSharpCode.NRefactory; -using ICSharpCode.SharpDevelop.Debugging; +using ICSharpCode.SharpDevelop.Project; namespace ICSharpCode.SharpDevelop.Gui.Pads { public class TextNode : TreeNode, ISetText { - public TextNode(string text, SupportedLanguage language) + public TextNode(TreeNode parent, string text, SupportedLanguage language) + : base(parent) { this.Name = text; this.Language = language; @@ -39,7 +41,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads public class ErrorInfoNode : ICorDebug.InfoNode { - public ErrorInfoNode(string name, string text) : base(name, text) + public ErrorInfoNode(string name, string text) : base(null, name, text) { IconImage = DebuggerResourceService.GetImage("Icons.16x16.Error"); } diff --git a/src/AddIns/Debugger/Debugger.AddIn/Service/DebuggeeExceptionForm.cs b/src/AddIns/Debugger/Debugger.AddIn/Service/DebuggeeExceptionForm.cs index 632275aec2..eca5787f6a 100644 --- a/src/AddIns/Debugger/Debugger.AddIn/Service/DebuggeeExceptionForm.cs +++ b/src/AddIns/Debugger/Debugger.AddIn/Service/DebuggeeExceptionForm.cs @@ -1,16 +1,13 @@ // Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) // This code is distributed under the BSD license (for details please see \src\AddIns\Debugger\Debugger.AddIn\license.txt) -using ICSharpCode.Core.WinForms; using System; -using System.Collections.Generic; using System.Drawing; using System.Windows.Forms; -using Aga.Controls.Tree; -using Aga.Controls.Tree.NodeControls; + using Debugger; -using Debugger.AddIn.TreeModel; using ICSharpCode.Core; +using ICSharpCode.Core.WinForms; using ICSharpCode.SharpDevelop.Gui; namespace ICSharpCode.SharpDevelop.Services diff --git a/src/AddIns/Debugger/Debugger.AddIn/Service/WindowsDebugger.cs b/src/AddIns/Debugger/Debugger.AddIn/Service/WindowsDebugger.cs index 41d9da6c51..27d5dc29c0 100644 --- a/src/AddIns/Debugger/Debugger.AddIn/Service/WindowsDebugger.cs +++ b/src/AddIns/Debugger/Debugger.AddIn/Service/WindowsDebugger.cs @@ -147,12 +147,12 @@ namespace ICSharpCode.SharpDevelop.Services if (FileUtility.IsUrl(processStartInfo.FileName)) { if (!CheckWebProjectStartInfo()) return; - - var project = ProjectService.OpenSolution.StartupProject as CompilableProject; - var options = WebProjectsOptions.Instance.GetWebProjectOptions(project.Name); - System.Diagnostics.Process defaultAppProcess = null; - - if (options.Data.WebServer != WebServer.None) { + // we deal with a WebProject + try { + var project = ProjectService.OpenSolution.StartupProject as CompilableProject; + var options = WebProjectsOptions.Instance.GetWebProjectOptions(project.Name); + System.Diagnostics.Process defaultAppProcess = null; + string processName = WebProjectService.WorkerProcessName; // try find the worker process directly or using the process monitor callback @@ -175,28 +175,50 @@ namespace ICSharpCode.SharpDevelop.Services if (options.Data.WebServer == WebServer.IISExpress) { // start IIS express and attach to it - if (WebProjectService.IISVersion == IISVersion.IISExpress) + if (WebProjectService.IISVersion == IISVersion.IISExpress) { System.Diagnostics.Process.Start(WebProjectService.IISExpressProcessLocation); - else { + } else { MessageService.ShowError("${res:ICSharpCode.WepProjectOptionsPanel.NoProjectUrlOrProgramAction}"); return; } } - } - - // start default application(e.g. browser) - if (project.StartAction == StartAction.StartURL) - defaultAppProcess = System.Diagnostics.Process.Start(project.StartUrl); - else { - if (!string.IsNullOrEmpty(options.Data.ProjectUrl) && options.Data.WebServer == WebServer.IIS) - defaultAppProcess = System.Diagnostics.Process.Start(options.Data.ProjectUrl); - else { - if (options.Data.WebServer == WebServer.IISExpress) - defaultAppProcess = System.Diagnostics.Process.Start(options.Data.ProjectUrl); + + // start default application(e.g. browser) or the one specified + switch (project.StartAction) { + case StartAction.Project: + if (FileUtility.IsUrl(options.Data.ProjectUrl)) { + defaultAppProcess = System.Diagnostics.Process.Start(options.Data.ProjectUrl); + } else { + MessageService.ShowError("${res:ICSharpCode.WepProjectOptionsPanel.NoProjectUrlOrProgramAction}"); + return; + } + break; + case StartAction.Program: + defaultAppProcess = System.Diagnostics.Process.Start(project.StartProgram); + break; + case StartAction.StartURL: + if (FileUtility.IsUrl(project.StartUrl)) + defaultAppProcess = System.Diagnostics.Process.Start(project.StartUrl); + else { + string url = string.Concat(options.Data.ProjectUrl, project.StartUrl); + if (FileUtility.IsUrl(url)) { + defaultAppProcess = System.Diagnostics.Process.Start(url); + } else { + MessageService.ShowError("${res:ICSharpCode.WepProjectOptionsPanel.NoProjectUrlOrProgramAction}"); + return; + } + } + break; + default: + throw new System.Exception("Invalid value for StartAction"); } + } catch (System.Exception ex) { + string err = "Error: " + ex.Message; + MessageService.ShowError(err); + LoggingService.Error(err); + return; } - } - else { + } else { string version = debugger.GetProgramVersion(processStartInfo.FileName); if (version.StartsWith("v1.0")) { @@ -309,11 +331,11 @@ namespace ICSharpCode.SharpDevelop.Services if (FileUtility.IsUrl(processStartInfo.FileName)) { if (!CheckWebProjectStartInfo()) return; - - var project = ProjectService.OpenSolution.Preferences.StartupProject as CompilableProject; - var options = WebProjectsOptions.Instance.GetWebProjectOptions(project.Name); - - if (options.Data.WebServer != WebServer.None) { + // we deal with a WebProject + try { + var project = ProjectService.OpenSolution.StartupProject as CompilableProject; + var options = WebProjectsOptions.Instance.GetWebProjectOptions(project.Name); + string processName = WebProjectService.WorkerProcessName; if (options.Data.WebServer == WebServer.IISExpress) { @@ -325,23 +347,43 @@ namespace ICSharpCode.SharpDevelop.Services return; } } - } - - // start default application(e.g. browser) - if (project.StartAction == StartAction.StartURL) - System.Diagnostics.Process.Start(project.StartUrl); - else { - if (!string.IsNullOrEmpty(options.Data.ProjectUrl) && options.Data.WebServer == WebServer.IIS) - System.Diagnostics.Process.Start(options.Data.ProjectUrl); - else { - if (!string.IsNullOrEmpty(options.Data.ProjectUrl) && options.Data.WebServer == WebServer.IISExpress) - System.Diagnostics.Process.Start(options.Data.ProjectUrl); - else - System.Diagnostics.Process.Start(processStartInfo.FileName); + + // start default application(e.g. browser) or the one specified + switch (project.StartAction) { + case StartAction.Project: + if (FileUtility.IsUrl(options.Data.ProjectUrl)) { + System.Diagnostics.Process.Start(options.Data.ProjectUrl); + } else { + MessageService.ShowError("${res:ICSharpCode.WepProjectOptionsPanel.NoProjectUrlOrProgramAction}"); + return; + } + break; + case StartAction.Program: + System.Diagnostics.Process.Start(project.StartProgram); + break; + case StartAction.StartURL: + if (FileUtility.IsUrl(project.StartUrl)) + System.Diagnostics.Process.Start(project.StartUrl); + else { + string url = string.Concat(options.Data.ProjectUrl, project.StartUrl); + if (FileUtility.IsUrl(url)) { + System.Diagnostics.Process.Start(url); + } else { + MessageService.ShowError("${res:ICSharpCode.WepProjectOptionsPanel.NoProjectUrlOrProgramAction}"); + return; + } + } + break; + default: + throw new System.Exception("Invalid value for StartAction"); } + } catch (System.Exception ex) { + string err = "Error: " + ex.Message; + MessageService.ShowError(err); + LoggingService.Error(err); + return; } - } - else + } else System.Diagnostics.Process.Start(processStartInfo); } @@ -640,7 +682,7 @@ namespace ICSharpCode.SharpDevelop.Services var tooltipExpression = GetExpression(variableName); string imageName; var image = ExpressionNode.GetImageForLocalVariable(out imageName); - ExpressionNode expressionNode = new ExpressionNode(image, variableName, tooltipExpression); + ExpressionNode expressionNode = new ExpressionNode(null, image, variableName, tooltipExpression); expressionNode.ImageName = imageName; return new DebuggerTooltipControl(logicalPosition, expressionNode) { ShowPins = debuggedProcess.GetCurrentExecutingFrame().HasSymbols }; } catch (System.Exception ex) { @@ -662,7 +704,7 @@ namespace ICSharpCode.SharpDevelop.Services image = new ResourceServiceImage(currentImageName); imageName = currentImageName; } - ExpressionNode expressionNode = new ExpressionNode(image, variable, expression); + ExpressionNode expressionNode = new ExpressionNode(null, image, variable, expression); expressionNode.ImageName = imageName; return expressionNode; } catch (GetValueException) { diff --git a/src/AddIns/Debugger/Debugger.AddIn/TreeModel/Adapters/TreeViewVarNode.cs b/src/AddIns/Debugger/Debugger.AddIn/TreeModel/Adapters/TreeViewVarNode.cs deleted file mode 100644 index da531692d9..0000000000 --- a/src/AddIns/Debugger/Debugger.AddIn/TreeModel/Adapters/TreeViewVarNode.cs +++ /dev/null @@ -1,291 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the BSD license (for details please see \src\AddIns\Debugger\Debugger.AddIn\license.txt) - -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Drawing; -using System.Windows.Forms; - -using Aga.Controls.Tree; -using Aga.Controls.Tree.NodeControls; -using ICSharpCode.Core; -using TreeNode = Debugger.AddIn.TreeModel.TreeNode; - -namespace Debugger.AddIn.TreeModel -{ - public sealed class ItemIcon: NodeIcon { - protected override Image GetIcon(TreeNodeAdv node) - { - return ((TreeViewVarNode)node).Content.Image; - } - } - - public sealed class ItemName: NodeTextBox { - protected override bool CanEdit(TreeNodeAdv node) - { - return false; - } - public override object GetValue(TreeNodeAdv node) - { - if (node is TreeViewVarNode) { - return ((TreeViewVarNode)node).Content.Name; - } else { - // Happens during incremental search - return base.GetValue(node); - } - } - } - - public sealed class ItemText: NodeTextBox { - public ItemText() - { - this.EditEnabled = true; - this.EditOnClick = true; - } - protected override bool CanEdit(TreeNodeAdv node) - { - TreeNode content = ((TreeViewVarNode)node).Content; - return (content is ISetText) && ((ISetText)content).CanSetText; - } - public override object GetValue(TreeNodeAdv node) - { - if (node is TreeViewVarNode) { - return ((TreeViewVarNode)node).Content.Text; - } else { - // Happens during incremental search - return base.GetValue(node); - } - } - public override void SetValue(TreeNodeAdv node, object value) - { - ISetText content = (ISetText)((TreeViewVarNode)node).Content; - if (content.CanSetText) { - content.SetText(value.ToString()); - } - } - protected override void OnDrawText(DrawEventArgs args) - { - TreeNode content = ((TreeViewVarNode)args.Node).Content; - if (content is ExpressionNode && ((ExpressionNode)content).Error != null) { - args.TextColor = Color.Red; - } else if (((TreeViewVarNode)args.Node).TextChanged) { - args.TextColor = Color.Blue; - } - base.OnDrawText(args); - } - public override void MouseDown(TreeNodeAdvMouseEventArgs args) - { - TreeNode content = ((TreeViewVarNode)args.Node).Content; - if (content is IContextMenu && args.Button == MouseButtons.Right) { - ContextMenuStrip menu = ((IContextMenu)content).GetContextMenu(); - if (menu != null) { - menu.Show(args.Node.Tree, args.Location); - args.Handled = true; - } - } else { - base.MouseDown(args); - } - } - } - - public sealed class ItemType: NodeTextBox { - protected override bool CanEdit(TreeNodeAdv node) - { - return false; - } - public override object GetValue(TreeNodeAdv node) - { - if (node is TreeViewVarNode) { - return ((TreeViewVarNode)node).Content.Type; - } else { - // Happens during incremental search - return base.GetValue(node); - } - } - } - - /// - /// A child class of TreeNodeAdv that displays exceptions. - /// - public class TreeViewVarNode: TreeNodeAdv - { - static Dictionary expandedNodes = new Dictionary(); - - TreeViewAdv localVarList; - Process process; - TreeNode content; - - bool childsLoaded; - bool textChanged; - - public TreeNode Content { - get { return content; } - } - - public bool TextChanged { - get { return textChanged; } - } - - string FullName { - get { - if (this.Parent != null && this.Parent is TreeViewVarNode) { - return ((TreeViewVarNode)this.Parent).FullName + "." + Content.Name; - } else { - return Content.Name; - } - } - } - - public TreeViewVarNode(Process process, TreeViewAdv localVarList, TreeNode content): base(localVarList, new object()) - { - this.process = process; - this.localVarList = localVarList; - SetContentRecursive(content); - } - - static TimeSpan workTime = TimeSpan.FromMilliseconds(40); - static Stopwatch timeSinceLastRepaintEnd; - - #region SetContentRecursive - - /// - /// A simple form of SetContentRecursive that changes the current ChildViewNode to - /// display the data provided by content. If the node had any children and is expanded, - /// it will recureively set those as well. - /// - /// Contains the name value and type of the variable stored in this particular TreeViewNode. - private void SetContentRecursive(TreeNode content) - { - this.textChanged = - this.content != null && - this.content.Name == content.Name && - this.content.Text != content.Text; - this.content = content; - this.IsLeaf = (content.ChildNodes == null); - childsLoaded = false; - this.IsExpandedOnce = false; - if (!IsLeaf && expandedNodes.ContainsKey(this.FullName) && expandedNodes[this.FullName]) { - LoadChildren(); - this.Expand(); - } else { - this.Children.Clear(); - this.Collapse(); - } - // Process user commands - Utils.DoEvents(process); - // Repaint - if (timeSinceLastRepaintEnd == null || timeSinceLastRepaintEnd.Elapsed > workTime) { - using(new PrintTime("Repainting Local Variables Pad")) { - try { - this.Tree.EndUpdate(); // Enable painting - Utils.DoEvents(process); // Paint - } finally { - this.Tree.BeginUpdate(); // Disable painting - timeSinceLastRepaintEnd = new Stopwatch(); - timeSinceLastRepaintEnd.Start(); - } - } - } - } - - /// - /// Private form of SetContentRecursive. This form contains an extra parameter used by LoadChildren. - /// This adds the childNodes parameter, which can be set to the children of a particular child element. - /// - /// - /// - /// - /// - private static void SetContentRecursive(Process process, TreeViewAdv localVarList, IList childNodes, IEnumerable contentEnum) - { - contentEnum = contentEnum ?? new TreeNode[0]; - - int index = 0; - foreach(TreeNode content in contentEnum) { - // Add or overwrite existing items - if (index < childNodes.Count) { - // Overwrite - ((TreeViewVarNode)childNodes[index]).SetContentRecursive(content); - } else { - // Add - childNodes.Add(new TreeViewVarNode(process, localVarList, content)); - } - index++; - } - int count = index; - // Delete other nodes - while(childNodes.Count > count) { - childNodes.RemoveAt(count); - } - } - - /// - /// Function for setting the root treenode of a TreeViewAdv ment to display debugger variables. - /// - /// The process that contains the stackframe with the given variables. - /// A list of local variables. - /// A list of local variables. - public static void SetContentRecursive(Process process, TreeViewAdv localVarList, IEnumerable contentEnum) { - IList childNodes = localVarList.Root.Children; - SetContentRecursive(process, localVarList, childNodes, contentEnum); - } - - #endregion SetContentRecursive - - protected override void OnExpanding() - { - base.OnExpanding(); - } - - - /// - /// This displays all the immediate children of a TreeViewNode in its containing TreeViewAdv. - /// - void LoadChildren() - { - if (!childsLoaded) { - childsLoaded = true; - this.IsExpandedOnce = true; - SetContentRecursive(process, this.localVarList, this.Children, this.Content.ChildNodes); - } - } - - - /// - /// Expands the current treenode and displays all its immediate children. - /// - protected override void OnExpanded() - { - base.OnExpanded(); - if (process == null) - return; - expandedNodes[FullName] = true; - if (process.IsRunning) { - MessageService.ShowMessage( - "${res:MainWindow.Windows.Debug.LocalVariables.CannotExploreVariablesWhileRunning}", - "${res:MainWindow.Windows.Debug.LocalVariables}" - ); - return; - } - try { - this.Tree.BeginUpdate(); - LoadChildren(); - } catch (AbortedBecauseDebuggeeResumedException) { - } finally { - this.Tree.EndUpdate(); - } - } - - protected override void OnCollapsing() - { - base.OnCollapsing(); - } - - protected override void OnCollapsed() - { - base.OnCollapsed(); - expandedNodes[FullName] = false; - } - } -} diff --git a/src/AddIns/Debugger/Debugger.AddIn/TreeModel/ArrayRangeNode.cs b/src/AddIns/Debugger/Debugger.AddIn/TreeModel/ArrayRangeNode.cs index 814b3ce198..e341b77e21 100644 --- a/src/AddIns/Debugger/Debugger.AddIn/TreeModel/ArrayRangeNode.cs +++ b/src/AddIns/Debugger/Debugger.AddIn/TreeModel/ArrayRangeNode.cs @@ -11,12 +11,12 @@ namespace Debugger.AddIn.TreeModel { public partial class Utils { - public static IEnumerable LazyGetChildNodesOfArray(Expression expression, ArrayDimensions dimensions) + public static IEnumerable LazyGetChildNodesOfArray(TreeNode parent, Expression expression, ArrayDimensions dimensions) { if (dimensions.TotalElementCount == 0) - return new TreeNode[] { new TreeNode(null, "(empty)", null, null, null) }; + return new TreeNode[] { new TreeNode(null, "(empty)", null, null, parent, null) }; - return new ArrayRangeNode(expression, dimensions, dimensions).ChildNodes; + return new ArrayRangeNode(parent, expression, dimensions, dimensions).ChildNodes; } } @@ -29,14 +29,19 @@ namespace Debugger.AddIn.TreeModel ArrayDimensions bounds; ArrayDimensions originalBounds; - public ArrayRangeNode(Expression arrayTarget, ArrayDimensions bounds, ArrayDimensions originalBounds) + public ArrayRangeNode(TreeNode parent, Expression arrayTarget, ArrayDimensions bounds, ArrayDimensions originalBounds) + : base(parent) { this.arrayTarget = arrayTarget; this.bounds = bounds; this.originalBounds = originalBounds; this.Name = GetName(); - this.ChildNodes = LazyGetChildren(); + this.childNodes = LazyGetChildren(); + } + + public override IEnumerable ChildNodes { + get { return base.ChildNodes; } } string GetName() @@ -87,7 +92,7 @@ namespace Debugger.AddIn.TreeModel foreach(int[] indices in bounds.Indices) { string imageName; var image = ExpressionNode.GetImageForArrayIndexer(out imageName); - var expression = new ExpressionNode(image, GetName(indices), arrayTarget.AppendIndexer(indices)); + var expression = new ExpressionNode(this, image, GetName(indices), arrayTarget.AppendIndexer(indices)); expression.ImageName = imageName; yield return expression; } @@ -112,7 +117,7 @@ namespace Debugger.AddIn.TreeModel for(int i = splitDim.LowerBound; i <= splitDim.UpperBound; i += elementsPerSegment) { List newDims = new List(bounds); newDims[splitDimensionIndex] = new ArrayDimension(i, Math.Min(i + elementsPerSegment - 1, splitDim.UpperBound)); - yield return new ArrayRangeNode(arrayTarget, new ArrayDimensions(newDims), originalBounds); + yield return new ArrayRangeNode(this, arrayTarget, new ArrayDimensions(newDims), originalBounds); } yield break; } diff --git a/src/AddIns/Debugger/Debugger.AddIn/TreeModel/ChildNodesOfObject.cs b/src/AddIns/Debugger/Debugger.AddIn/TreeModel/ChildNodesOfObject.cs index c96c5d35dc..2dcc272963 100644 --- a/src/AddIns/Debugger/Debugger.AddIn/TreeModel/ChildNodesOfObject.cs +++ b/src/AddIns/Debugger/Debugger.AddIn/TreeModel/ChildNodesOfObject.cs @@ -17,7 +17,7 @@ namespace Debugger.AddIn.TreeModel { public partial class Utils { - public static IEnumerable LazyGetChildNodesOfObject(Expression targetObject, DebugType shownType) + public static IEnumerable LazyGetChildNodesOfObject(TreeNode current, Expression targetObject, DebugType shownType) { MemberInfo[] publicStatic = shownType.GetFieldsAndNonIndexedProperties(BindingFlags.Public | BindingFlags.Static | BindingFlags.DeclaredOnly); MemberInfo[] publicInstance = shownType.GetFieldsAndNonIndexedProperties(BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly); @@ -31,7 +31,8 @@ namespace Debugger.AddIn.TreeModel StringParser.Parse("${res:MainWindow.Windows.Debug.LocalVariables.BaseClass}"), baseType.Name, baseType.FullName, - baseType.FullName == "System.Object" ? null : Utils.LazyGetChildNodesOfObject(targetObject, baseType) + current, + newNode => baseType.FullName == "System.Object" ? null : Utils.LazyGetChildNodesOfObject(newNode, targetObject, baseType) ); } @@ -41,53 +42,58 @@ namespace Debugger.AddIn.TreeModel StringParser.Parse("${res:MainWindow.Windows.Debug.LocalVariables.NonPublicMembers}"), string.Empty, string.Empty, - Utils.LazyGetMembersOfObject(targetObject, nonPublicInstance) + current, + newNode => Utils.LazyGetMembersOfObject(newNode, targetObject, nonPublicInstance) ); } if (publicStatic.Length > 0 || nonPublicStatic.Length > 0) { - IEnumerable childs = Utils.LazyGetMembersOfObject(targetObject, publicStatic); - if (nonPublicStatic.Length > 0) { - TreeNode nonPublicStaticNode = new TreeNode( - null, - StringParser.Parse("${res:MainWindow.Windows.Debug.LocalVariables.NonPublicStaticMembers}"), - string.Empty, - string.Empty, - Utils.LazyGetMembersOfObject(targetObject, nonPublicStatic) - ); - childs = Utils.PrependNode(nonPublicStaticNode, childs); - } yield return new TreeNode( null, StringParser.Parse("${res:MainWindow.Windows.Debug.LocalVariables.StaticMembers}"), string.Empty, string.Empty, - childs + current, + p => { + var children = Utils.LazyGetMembersOfObject(p, targetObject, publicStatic); + if (nonPublicStatic.Length > 0) { + TreeNode nonPublicStaticNode = new TreeNode( + null, + StringParser.Parse("${res:MainWindow.Windows.Debug.LocalVariables.NonPublicStaticMembers}"), + string.Empty, + string.Empty, + p, + newNode => Utils.LazyGetMembersOfObject(newNode, targetObject, nonPublicStatic) + ); + children = Utils.PrependNode(nonPublicStaticNode, children); + } + return children; + } ); } DebugType iListType = (DebugType)shownType.GetInterface(typeof(IList).FullName); if (iListType != null) { - yield return new IListNode(targetObject); + yield return new IListNode(current, targetObject); } else { DebugType iEnumerableType, itemType; if (shownType.ResolveIEnumerableImplementation(out iEnumerableType, out itemType)) { - yield return new IEnumerableNode(targetObject, itemType); + yield return new IEnumerableNode(current, targetObject, itemType); } } - foreach(TreeNode node in LazyGetMembersOfObject(targetObject, publicInstance)) { + foreach(TreeNode node in LazyGetMembersOfObject(current, targetObject, publicInstance)) { yield return node; } } - public static IEnumerable LazyGetMembersOfObject(Expression expression, MemberInfo[] members) + public static IEnumerable LazyGetMembersOfObject(TreeNode parent, Expression expression, MemberInfo[] members) { List nodes = new List(); foreach(MemberInfo memberInfo in members) { string imageName; var image = ExpressionNode.GetImageForMember((IDebugMemberInfo)memberInfo, out imageName); - var exp = new ExpressionNode(image, memberInfo.Name, expression.AppendMemberReference((IDebugMemberInfo)memberInfo)); + var exp = new ExpressionNode(parent, image, memberInfo.Name, expression.AppendMemberReference((IDebugMemberInfo)memberInfo)); exp.ImageName = imageName; nodes.Add(exp); } @@ -96,7 +102,7 @@ namespace Debugger.AddIn.TreeModel } - public static IEnumerable LazyGetItemsOfIList(Expression targetObject) + public static IEnumerable LazyGetItemsOfIList(TreeNode parent, Expression targetObject) { // Add a cast, so that we are sure the expression has an indexer. // (The expression can be e.g. of type 'object' but its value is a List. @@ -111,14 +117,14 @@ namespace Debugger.AddIn.TreeModel error = e; } if (error != null) { - yield return new TreeNode(null, "(error)", error.Message, null, null); + yield return new TreeNode(null, "(error)", error.Message, null, null, null); } else if (count == 0) { - yield return new TreeNode(null, "(empty)", null, null, null); + yield return new TreeNode(null, "(empty)", null, null, null, null); } else { for(int i = 0; i < count; i++) { string imageName; var image = ExpressionNode.GetImageForArrayIndexer(out imageName); - var itemNode = new ExpressionNode(image, "[" + i + "]", targetObject.AppendIndexer(i)); + var itemNode = new ExpressionNode(parent, image, "[" + i + "]", targetObject.AppendIndexer(i)); itemNode.ImageName = imageName; yield return itemNode; } diff --git a/src/AddIns/Debugger/Debugger.AddIn/TreeModel/ExpressionNode.cs b/src/AddIns/Debugger/Debugger.AddIn/TreeModel/ExpressionNode.cs index b100ab6c1c..8445a53d97 100644 --- a/src/AddIns/Debugger/Debugger.AddIn/TreeModel/ExpressionNode.cs +++ b/src/AddIns/Debugger/Debugger.AddIn/TreeModel/ExpressionNode.cs @@ -143,7 +143,8 @@ namespace Debugger.AddIn.TreeModel } } - public ExpressionNode(IImage image, string name, Expression expression) + public ExpressionNode(TreeNode parent, IImage image, string name, Expression expression) + : base(parent) { this.IconImage = image; this.Name = name; @@ -189,24 +190,24 @@ namespace Debugger.AddIn.TreeModel } else if (val.Type.IsPrimitive || val.Type.FullName == typeof(string).FullName) { // Must be before IsClass } else if (val.Type.IsArray) { // Must be before IsClass if (val.ArrayLength > 0) - this.ChildNodes = Utils.LazyGetChildNodesOfArray(this.Expression, val.ArrayDimensions); + this.childNodes = Utils.LazyGetChildNodesOfArray(this, this.Expression, val.ArrayDimensions); } else if (val.Type.IsClass || val.Type.IsValueType) { if (val.Type.FullNameWithoutGenericArguments == typeof(List<>).FullName) { if ((int)val.GetMemberValue("_size").PrimitiveValue > 0) - this.ChildNodes = Utils.LazyGetItemsOfIList(this.expression); + this.childNodes = Utils.LazyGetItemsOfIList(this, this.expression); } else { - this.ChildNodes = Utils.LazyGetChildNodesOfObject(this.Expression, val.Type); + this.childNodes = Utils.LazyGetChildNodesOfObject(this, this.Expression, val.Type); } } else if (val.Type.IsPointer) { Value deRef = val.Dereference(); if (deRef != null) { - this.ChildNodes = new ExpressionNode [] { new ExpressionNode(this.IconImage, "*" + this.Name, this.Expression.AppendDereference()) }; + this.childNodes = new ExpressionNode [] { new ExpressionNode(this, this.IconImage, "*" + this.Name, this.Expression.AppendDereference()) }; } } if (DebuggingOptions.Instance.ICorDebugVisualizerEnabled) { TreeNode info = ICorDebug.GetDebugInfoRoot(val.AppDomain, val.CorValue); - this.ChildNodes = Utils.PrependNode(info, this.ChildNodes); + this.childNodes = Utils.PrependNode(info, this.ChildNodes); } // Do last since it may expire the object diff --git a/src/AddIns/Debugger/Debugger.AddIn/TreeModel/ICorDebug.cs b/src/AddIns/Debugger/Debugger.AddIn/TreeModel/ICorDebug.cs index cfd1a5dc56..abe6b6a0e8 100644 --- a/src/AddIns/Debugger/Debugger.AddIn/TreeModel/ICorDebug.cs +++ b/src/AddIns/Debugger/Debugger.AddIn/TreeModel/ICorDebug.cs @@ -15,56 +15,59 @@ namespace Debugger.AddIn.TreeModel { List children; - public InfoNode(string name, string text): this(name, text, null) + public InfoNode(TreeNode parent, string name, string text) + : this(parent, name, text, null) { } - public InfoNode(string name, string text, List children) + public InfoNode(TreeNode parent, string name, string text, Func> children) + : base(parent) { this.Name = name; this.Text = text; - this.ChildNodes = children; - this.children = children; + this.children = children(this); + } + + public override IEnumerable ChildNodes { + get { return children; } } public void AddChild(string name, string text) { if (children == null) { children = new List(); - this.ChildNodes = children; } - children.Add(new InfoNode(name, text)); + children.Add(new InfoNode(this, name, text)); } - public void AddChild(string name, string text, List subChildren) + public void AddChild(string name, string text, Func> subChildren) { if (children == null) { children = new List(); - this.ChildNodes = children; } - children.Add(new InfoNode(name, text, subChildren)); + children.Add(new InfoNode(this, name, text, p => subChildren(p))); } } public static InfoNode GetDebugInfoRoot(AppDomain appDomain, ICorDebugValue corValue) { - return new InfoNode("ICorDebug", "", GetDebugInfo(appDomain, corValue)); + return new InfoNode(null, "ICorDebug", "", p => GetDebugInfo(p, appDomain, corValue)); } - public static List GetDebugInfo(AppDomain appDomain, ICorDebugValue corValue) + public static List GetDebugInfo(TreeNode parent, AppDomain appDomain, ICorDebugValue corValue) { List items = new List(); if (corValue is ICorDebugValue) { - InfoNode info = new InfoNode("ICorDebugValue", ""); + InfoNode info = new InfoNode(parent, "ICorDebugValue", ""); info.AddChild("Address", corValue.GetAddress().ToString("X8")); info.AddChild("Type", ((CorElementType)corValue.GetTheType()).ToString()); info.AddChild("Size", corValue.GetSize().ToString()); items.Add(info); } if (corValue is ICorDebugValue2) { - InfoNode info = new InfoNode("ICorDebugValue2", ""); + InfoNode info = new InfoNode(parent, "ICorDebugValue2", ""); ICorDebugValue2 corValue2 = (ICorDebugValue2)corValue; string fullname; try { @@ -76,7 +79,7 @@ namespace Debugger.AddIn.TreeModel items.Add(info); } if (corValue is ICorDebugGenericValue) { - InfoNode info = new InfoNode("ICorDebugGenericValue", ""); + InfoNode info = new InfoNode(parent, "ICorDebugGenericValue", ""); try { byte[] bytes = ((ICorDebugGenericValue)corValue).GetRawValue(); for(int i = 0; i < bytes.Length; i += 8) { @@ -92,13 +95,13 @@ namespace Debugger.AddIn.TreeModel items.Add(info); } if (corValue is ICorDebugReferenceValue) { - InfoNode info = new InfoNode("ICorDebugReferenceValue", ""); + InfoNode info = new InfoNode(parent, "ICorDebugReferenceValue", ""); ICorDebugReferenceValue refValue = (ICorDebugReferenceValue)corValue; info.AddChild("IsNull", (refValue.IsNull() != 0).ToString()); if (refValue.IsNull() == 0) { info.AddChild("Value", refValue.GetValue().ToString("X8")); if (refValue.Dereference() != null) { - info.AddChild("Dereference", "", GetDebugInfo(appDomain, refValue.Dereference())); + info.AddChild("Dereference", "", p => GetDebugInfo(p, appDomain, refValue.Dereference())); } else { info.AddChild("Dereference", "N/A"); } @@ -106,44 +109,44 @@ namespace Debugger.AddIn.TreeModel items.Add(info); } if (corValue is ICorDebugHeapValue) { - InfoNode info = new InfoNode("ICorDebugHeapValue", ""); + InfoNode info = new InfoNode(parent, "ICorDebugHeapValue", ""); items.Add(info); } if (corValue is ICorDebugHeapValue2) { - InfoNode info = new InfoNode("ICorDebugHeapValue2", ""); + InfoNode info = new InfoNode(parent, "ICorDebugHeapValue2", ""); items.Add(info); } if (corValue is ICorDebugObjectValue) { - InfoNode info = new InfoNode("ICorDebugObjectValue", ""); + InfoNode info = new InfoNode(parent, "ICorDebugObjectValue", ""); ICorDebugObjectValue objValue = (ICorDebugObjectValue)corValue; info.AddChild("Class", objValue.GetClass().GetToken().ToString("X8")); info.AddChild("IsValueClass", (objValue.IsValueClass() != 0).ToString()); items.Add(info); } if (corValue is ICorDebugObjectValue2) { - InfoNode info = new InfoNode("ICorDebugObjectValue2", ""); + InfoNode info = new InfoNode(parent, "ICorDebugObjectValue2", ""); items.Add(info); } if (corValue is ICorDebugBoxValue) { - InfoNode info = new InfoNode("ICorDebugBoxValue", ""); + InfoNode info = new InfoNode(parent, "ICorDebugBoxValue", ""); ICorDebugBoxValue boxValue = (ICorDebugBoxValue)corValue; - info.AddChild("Object", "", GetDebugInfo(appDomain, boxValue.GetObject())); + info.AddChild("Object", "", p => GetDebugInfo(p, appDomain, boxValue.GetObject())); items.Add(info); } if (corValue is ICorDebugStringValue) { - InfoNode info = new InfoNode("ICorDebugStringValue", ""); + InfoNode info = new InfoNode(parent, "ICorDebugStringValue", ""); ICorDebugStringValue stringValue = (ICorDebugStringValue)corValue; info.AddChild("Length", stringValue.GetLength().ToString()); info.AddChild("String", stringValue.GetString()); items.Add(info); } if (corValue is ICorDebugArrayValue) { - InfoNode info = new InfoNode("ICorDebugArrayValue", ""); + InfoNode info = new InfoNode(parent, "ICorDebugArrayValue", ""); info.AddChild("...", "..."); items.Add(info); } if (corValue is ICorDebugHandleValue) { - InfoNode info = new InfoNode("ICorDebugHandleValue", ""); + InfoNode info = new InfoNode(parent, "ICorDebugHandleValue", ""); ICorDebugHandleValue handleValue = (ICorDebugHandleValue)corValue; info.AddChild("HandleType", handleValue.GetHandleType().ToString()); items.Add(info); diff --git a/src/AddIns/Debugger/Debugger.AddIn/TreeModel/IEnumerableNode.cs b/src/AddIns/Debugger/Debugger.AddIn/TreeModel/IEnumerableNode.cs index eb316a3f7f..35845151c9 100644 --- a/src/AddIns/Debugger/Debugger.AddIn/TreeModel/IEnumerableNode.cs +++ b/src/AddIns/Debugger/Debugger.AddIn/TreeModel/IEnumerableNode.cs @@ -17,7 +17,8 @@ namespace Debugger.AddIn.TreeModel Expression targetObject; Expression debugListExpression; - public IEnumerableNode(Expression targetObject, DebugType itemType) + public IEnumerableNode(TreeNode parent, Expression targetObject, DebugType itemType) + : base(parent) { this.targetObject = targetObject; @@ -25,7 +26,7 @@ namespace Debugger.AddIn.TreeModel this.Text = "Expanding will enumerate the IEnumerable"; DebugType debugListType; this.debugListExpression = DebuggerHelpers.CreateDebugListExpression(targetObject, itemType, out debugListType); - this.ChildNodes = Utils.LazyGetItemsOfIList(this.debugListExpression); + this.childNodes = Utils.LazyGetItemsOfIList(this, this.debugListExpression); } } } diff --git a/src/AddIns/Debugger/Debugger.AddIn/TreeModel/IListNode.cs b/src/AddIns/Debugger/Debugger.AddIn/TreeModel/IListNode.cs index 7a1b1b26ad..41d21d86ac 100644 --- a/src/AddIns/Debugger/Debugger.AddIn/TreeModel/IListNode.cs +++ b/src/AddIns/Debugger/Debugger.AddIn/TreeModel/IListNode.cs @@ -16,13 +16,14 @@ namespace Debugger.AddIn.TreeModel Expression targetList; int listCount; - public IListNode(Expression targetListObject) + public IListNode(TreeNode parent, Expression targetListObject) + : base(parent) { this.targetList = targetListObject; this.Name = "IList"; this.listCount = this.targetList.GetIListCount(); - this.ChildNodes = Utils.LazyGetItemsOfIList(this.targetList); + this.childNodes = Utils.LazyGetItemsOfIList(this, this.targetList); } public override bool HasChildNodes { diff --git a/src/AddIns/Debugger/Debugger.AddIn/TreeModel/SavedTreeNode.cs b/src/AddIns/Debugger/Debugger.AddIn/TreeModel/SavedTreeNode.cs index d81712624b..40a6e5bb5d 100644 --- a/src/AddIns/Debugger/Debugger.AddIn/TreeModel/SavedTreeNode.cs +++ b/src/AddIns/Debugger/Debugger.AddIn/TreeModel/SavedTreeNode.cs @@ -16,6 +16,7 @@ namespace Debugger.AddIn.TreeModel } public SavedTreeNode(IImage image, string fullname, string text) + : base(null) { base.IconImage = image; FullName = fullname; diff --git a/src/AddIns/Debugger/Debugger.AddIn/TreeModel/StackFrameNode.cs b/src/AddIns/Debugger/Debugger.AddIn/TreeModel/StackFrameNode.cs index 007ee3ad5c..176b2d0d26 100644 --- a/src/AddIns/Debugger/Debugger.AddIn/TreeModel/StackFrameNode.cs +++ b/src/AddIns/Debugger/Debugger.AddIn/TreeModel/StackFrameNode.cs @@ -20,11 +20,12 @@ namespace Debugger.AddIn.TreeModel } public StackFrameNode(StackFrame stackFrame) + : base(null) { this.stackFrame = stackFrame; this.Name = stackFrame.MethodInfo.Name; - this.ChildNodes = LazyGetChildNodes(); + this.childNodes = LazyGetChildNodes(); } IEnumerable LazyGetChildNodes() @@ -32,7 +33,7 @@ namespace Debugger.AddIn.TreeModel foreach(DebugParameterInfo par in stackFrame.MethodInfo.GetParameters()) { string imageName; var image = ExpressionNode.GetImageForParameter(out imageName); - var expression = new ExpressionNode(image, par.Name, par.GetExpression()); + var expression = new ExpressionNode(this, image, par.Name, par.GetExpression()); expression.ImageName = imageName; yield return expression; } @@ -40,7 +41,7 @@ namespace Debugger.AddIn.TreeModel foreach(DebugLocalVariableInfo locVar in stackFrame.MethodInfo.GetLocalVariables(this.StackFrame.IP)) { string imageName; var image = ExpressionNode.GetImageForLocalVariable(out imageName); - var expression = new ExpressionNode(image, locVar.Name, locVar.GetExpression()); + var expression = new ExpressionNode(this, image, locVar.Name, locVar.GetExpression()); expression.ImageName = imageName; yield return expression; } @@ -52,14 +53,14 @@ namespace Debugger.AddIn.TreeModel foreach (var localVar in debugger.debuggerDecompilerService.GetLocalVariables(typeToken, methodToken)) { string imageName; var image = ExpressionNode.GetImageForLocalVariable(out imageName); - var expression = new ExpressionNode(image, localVar, ExpressionEvaluator.ParseExpression(localVar, SupportedLanguage.CSharp)); + var expression = new ExpressionNode(this, image, localVar, ExpressionEvaluator.ParseExpression(localVar, SupportedLanguage.CSharp)); expression.ImageName = imageName; yield return expression; } } } if (stackFrame.Thread.CurrentException != null) { - yield return new ExpressionNode(null, "__exception", new IdentifierExpression("__exception")); + yield return new ExpressionNode(this, null, "__exception", new IdentifierExpression("__exception")); } } } diff --git a/src/AddIns/Debugger/Debugger.AddIn/TreeModel/TreeNode.cs b/src/AddIns/Debugger/Debugger.AddIn/TreeModel/TreeNode.cs index a02329c1b1..5d23b06ec8 100644 --- a/src/AddIns/Debugger/Debugger.AddIn/TreeModel/TreeNode.cs +++ b/src/AddIns/Debugger/Debugger.AddIn/TreeModel/TreeNode.cs @@ -15,7 +15,7 @@ namespace Debugger.AddIn.TreeModel { /// /// A node in the variable tree. - /// The node is imutable. + /// The node is immutable. /// public class TreeNode : ITreeNode { @@ -24,7 +24,7 @@ namespace Debugger.AddIn.TreeModel string imageName = string.Empty; string text = string.Empty; string type = string.Empty; - IEnumerable childNodes = null; + protected IEnumerable childNodes = null; /// /// The image displayed for this node. @@ -78,9 +78,10 @@ namespace Debugger.AddIn.TreeModel protected set { type = value; } } + public virtual TreeNode Parent { get; protected set; } + public virtual IEnumerable ChildNodes { get { return childNodes; } - protected set { childNodes = value; } } IEnumerable ITreeNode.ChildNodes { @@ -109,17 +110,19 @@ namespace Debugger.AddIn.TreeModel public bool IsPinned { get; set; } - public TreeNode() + public TreeNode(TreeNode parent) { + this.Parent = parent; } - public TreeNode(IImage iconImage, string name, string text, string type, IEnumerable childNodes) + public TreeNode(IImage iconImage, string name, string text, string type, TreeNode parent, Func> childNodes) + : this(parent) { this.iconImage = iconImage; this.name = name; this.text = text; this.type = type; - this.childNodes = childNodes; + this.childNodes = childNodes(this); } public int CompareTo(ITreeNode other) diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/AvalonEditDisplayBinding.cs b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/AvalonEditDisplayBinding.cs index ae23980420..983eb2c9c3 100644 --- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/AvalonEditDisplayBinding.cs +++ b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/AvalonEditDisplayBinding.cs @@ -3,13 +3,14 @@ using System; using System.IO; +using System.Linq; using System.Text; - using ICSharpCode.AvalonEdit.Highlighting; using ICSharpCode.AvalonEdit.Utils; using ICSharpCode.Core; using ICSharpCode.SharpDevelop; using ICSharpCode.SharpDevelop.Gui; +using ICSharpCode.SharpDevelop.Project; namespace ICSharpCode.AvalonEdit.AddIn { @@ -37,6 +38,19 @@ namespace ICSharpCode.AvalonEdit.AddIn { return new AvalonEditViewContent(file); } + + public bool IsPreferredBindingForFile(string fileName) + { + string extension = Path.GetExtension(fileName); + var fileFilter = ProjectService.GetFileFilters().FirstOrDefault(ff => ff.ContainsExtension(extension)); + + return fileFilter != null && fileFilter.MimeType.StartsWith("text/", StringComparison.OrdinalIgnoreCase); + } + + public double AutoDetectFileContent(string fileName, Stream fileContent, string detectedMimeType) + { + return detectedMimeType.StartsWith("text/") ? 0.5 : 0; + } } public class ChooseEncodingDisplayBinding : IDisplayBinding @@ -62,5 +76,15 @@ namespace ICSharpCode.AvalonEdit.AddIn return null; } } + + public bool IsPreferredBindingForFile(string fileName) + { + return false; + } + + public double AutoDetectFileContent(string fileName, Stream fileContent, string detectedMimeType) + { + return double.NegativeInfinity; + } } } diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/ChangeMarkerMargin.cs b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/ChangeMarkerMargin.cs index 7f2730df6a..8379c1ca13 100644 --- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/ChangeMarkerMargin.cs +++ b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/ChangeMarkerMargin.cs @@ -2,24 +2,18 @@ // This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; -using System.Collections.Generic; using System.Diagnostics; -using System.Linq; using System.Windows; using System.Windows.Controls; using System.Windows.Controls.Primitives; using System.Windows.Input; using System.Windows.Media; -using System.Windows.Threading; -using ICSharpCode.AvalonEdit.AddIn.Options; + using ICSharpCode.AvalonEdit.Document; using ICSharpCode.AvalonEdit.Editing; using ICSharpCode.AvalonEdit.Highlighting; using ICSharpCode.AvalonEdit.Rendering; -using ICSharpCode.SharpDevelop; using ICSharpCode.SharpDevelop.Editor; -using ICSharpCode.SharpDevelop.Editor.AvalonEdit; -using ICSharpCode.SharpDevelop.Widgets; namespace ICSharpCode.AvalonEdit.AddIn { @@ -54,11 +48,19 @@ namespace ICSharpCode.AvalonEdit.AddIn TextView textView = this.TextView; if (textView != null && textView.VisualLinesValid) { + var zeroLineInfo = changeWatcher.GetChange(0); + + Debug.Assert(zeroLineInfo.Change == ChangeType.None || zeroLineInfo.Change == ChangeType.Deleted); + foreach (VisualLine line in textView.VisualLines) { Rect rect = new Rect(0, line.VisualTop - textView.ScrollOffset.Y, 5, line.Height); LineChangeInfo info = changeWatcher.GetChange(line.FirstDocumentLine.LineNumber); + if (zeroLineInfo.Change == ChangeType.Deleted && line.FirstDocumentLine.LineNumber == 1 && info.Change != ChangeType.Unsaved) { + info.Change = ChangeType.Modified; + } + switch (info.Change) { case ChangeType.None: break; @@ -142,9 +144,31 @@ namespace ICSharpCode.AvalonEdit.AddIn TextEditor editor = this.TextView.Services.GetService(typeof(TextEditor)) as TextEditor; markerService = this.TextView.Services.GetService(typeof(ITextMarkerService)) as ITextMarkerService; + LineChangeInfo zeroLineInfo = changeWatcher.GetChange(0); + int offset, length; bool hasNewVersion = changeWatcher.GetNewVersionFromLine(line, out offset, out length); + if (line == 1 && zeroLineInfo.Change == ChangeType.Deleted) { + int zeroStartLine; bool zeroAdded; + startLine = 1; + string deletedText = changeWatcher.GetOldVersionFromLine(0, out zeroStartLine, out zeroAdded); + var docLine = editor.Document.GetLineByNumber(line); + string newLine = DocumentUtilitites.GetLineTerminator(changeWatcher.CurrentDocument, 1); + deletedText += newLine; + deletedText += editor.Document.GetText(docLine.Offset, docLine.Length); + if (oldText != null) + oldText = deletedText + newLine + oldText; + else + oldText = deletedText; + + if (!hasNewVersion) { + offset = 0; + length = docLine.Length; + hasNewVersion = true; + } + } + if (hasNewVersion) { if (marker != null) markerService.Remove(marker); @@ -158,6 +182,15 @@ namespace ICSharpCode.AvalonEdit.AddIn } if (oldText != null) { + LineChangeInfo currLineInfo = changeWatcher.GetChange(startLine); + + if (currLineInfo.Change == ChangeType.Deleted && !(line == 1 && zeroLineInfo.Change == ChangeType.Deleted)) { + var docLine = editor.Document.GetLineByNumber(startLine); + if (docLine.DelimiterLength == 0) + oldText = DocumentUtilitites.GetLineTerminator(changeWatcher.CurrentDocument, startLine) + oldText; + oldText = editor.Document.GetText(docLine.Offset, docLine.TotalLength) + oldText; + } + DiffControl differ = new DiffControl(); differ.editor.SyntaxHighlighting = editor.SyntaxHighlighting; differ.editor.HorizontalScrollBarVisibility = ScrollBarVisibility.Hidden; @@ -165,16 +198,6 @@ namespace ICSharpCode.AvalonEdit.AddIn differ.editor.Document.Text = oldText; differ.Background = Brushes.White; - // TODO : deletions on line 0 cannot be displayed. - - LineChangeInfo prevLineInfo = changeWatcher.GetChange(startLine - 1); - LineChangeInfo lineInfo = changeWatcher.GetChange(startLine); - - if (prevLineInfo.Change == ChangeType.Deleted) { - var docLine = editor.Document.GetLineByNumber(startLine - 1); - differ.editor.Document.Insert(0, editor.Document.GetText(docLine.Offset, docLine.TotalLength)); - } - if (oldText == string.Empty) { differ.editor.Visibility = Visibility.Collapsed; differ.copyButton.Visibility = Visibility.Collapsed; @@ -184,22 +207,13 @@ namespace ICSharpCode.AvalonEdit.AddIn var mainHighlighter = new DocumentHighlighter(baseDocument, differ.editor.SyntaxHighlighting.MainRuleSet); var popupHighlighter = differ.editor.TextArea.GetService(typeof(IHighlighter)) as DocumentHighlighter; - if (prevLineInfo.Change == ChangeType.Deleted) - popupHighlighter.InitialSpanStack = mainHighlighter.GetSpanStack(prevLineInfo.OldStartLineNumber); - else - popupHighlighter.InitialSpanStack = mainHighlighter.GetSpanStack(lineInfo.OldStartLineNumber); + popupHighlighter.InitialSpanStack = mainHighlighter.GetSpanStack(currLineInfo.OldStartLineNumber); } } differ.revertButton.Click += delegate { if (hasNewVersion) { - int delimiter = 0; - DocumentLine l = Document.GetLineByOffset(offset + length); - if (added) - delimiter = l.DelimiterLength; - if (length == 0) - oldText += DocumentUtilitites.GetLineTerminator(new AvalonEditDocumentAdapter(Document, null), l.LineNumber); - Document.Replace(offset, length + delimiter, oldText); + Document.Replace(offset, length, oldText); tooltip.IsOpen = false; } }; diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/CodeEditorView.cs b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/CodeEditorView.cs index 84fcc5a492..e9921205be 100755 --- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/CodeEditorView.cs +++ b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/CodeEditorView.cs @@ -14,10 +14,10 @@ using System.Windows.Controls.Primitives; using System.Windows.Documents; using System.Windows.Input; using System.Windows.Threading; - using ICSharpCode.AvalonEdit.AddIn.Options; using ICSharpCode.AvalonEdit.AddIn.Snippets; using ICSharpCode.AvalonEdit.Editing; +using ICSharpCode.AvalonEdit.Folding; using ICSharpCode.AvalonEdit.Highlighting; using ICSharpCode.AvalonEdit.Rendering; using ICSharpCode.NRefactory; @@ -239,14 +239,27 @@ namespace ICSharpCode.AvalonEdit.AddIn args.LogicalPosition = AvalonEditDocumentAdapter.ToLocation(pos.Value); } - TextMarkerService textMarkerService = this.Adapter.GetService(typeof(ITextMarkerService)) as TextMarkerService; - if (args.InDocument && textMarkerService != null) { - var markersAtOffset = textMarkerService.GetMarkersAtOffset(args.Editor.Document.PositionToOffset(args.LogicalPosition.Line, args.LogicalPosition.Column)); + if (args.InDocument) { + int offset = args.Editor.Document.PositionToOffset(args.LogicalPosition.Line, args.LogicalPosition.Column); - ITextMarker markerWithToolTip = markersAtOffset.FirstOrDefault(marker => marker.ToolTip != null); + FoldingManager foldings = this.Adapter.GetService(typeof(FoldingManager)) as FoldingManager; + if (foldings != null) { + var foldingsAtOffset = foldings.GetFoldingsContaining(offset); + FoldingSection collapsedSection = foldingsAtOffset.FirstOrDefault(section => section.IsFolded); + + if (collapsedSection != null) { + args.SetToolTip(collapsedSection.TooltipText); + } + } - if (markerWithToolTip != null) { - args.SetToolTip(markerWithToolTip.ToolTip); + TextMarkerService textMarkerService = this.Adapter.GetService(typeof(ITextMarkerService)) as TextMarkerService; + if (textMarkerService != null) { + var markersAtOffset = textMarkerService.GetMarkersAtOffset(offset); + ITextMarker markerWithToolTip = markersAtOffset.FirstOrDefault(marker => marker.ToolTip != null); + + if (markerWithToolTip != null) { + args.SetToolTip(markerWithToolTip.ToolTip); + } } } diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/DefaultChangeWatcher.cs b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/DefaultChangeWatcher.cs index b46890e08d..1898aa4f35 100644 --- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/DefaultChangeWatcher.cs +++ b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/DefaultChangeWatcher.cs @@ -6,14 +6,12 @@ using System.Collections.Generic; using System.ComponentModel; using System.IO; using System.Linq; -using System.Runtime.InteropServices; -using System.Text; + using ICSharpCode.AvalonEdit.AddIn.MyersDiff; using ICSharpCode.AvalonEdit.Document; using ICSharpCode.AvalonEdit.Utils; using ICSharpCode.SharpDevelop; using ICSharpCode.SharpDevelop.Editor; -using ICSharpCode.SharpDevelop.Editor.AvalonEdit; namespace ICSharpCode.AvalonEdit.AddIn { @@ -23,6 +21,8 @@ namespace ICSharpCode.AvalonEdit.AddIn IDocument document; TextDocument textDocument; IDocument baseDocument; + IDocumentVersionProvider usedProvider; + IDisposable watcher; public event EventHandler ChangeOccurred; @@ -47,24 +47,38 @@ namespace ICSharpCode.AvalonEdit.AddIn this.textDocument = (TextDocument)document.GetService(typeof(TextDocument)); this.changeList = new CompressingTreeList((x, y) => x.Equals(y)); - Stream baseFileStream = GetBaseVersion(); + InitializeBaseDocument(); - // TODO : update baseDocument on VCS actions + if (usedProvider != null) { + string fileName = ((ITextEditor)document.GetService(typeof(ITextEditor))).FileName; + watcher = usedProvider.WatchBaseVersionChanges(fileName, HandleBaseVersionChanges); + } + + SetupInitialFileState(false); + + this.textDocument.LineTrackers.Add(this); + this.textDocument.UndoStack.PropertyChanged += UndoStackPropertyChanged; + } + + void HandleBaseVersionChanges(object sender, EventArgs e) + { + ICSharpCode.Core.LoggingService.Info("HandleBaseVersionChanges"); + InitializeBaseDocument(); + SetupInitialFileState(true); + } + + void InitializeBaseDocument() + { + Stream baseFileStream = GetBaseVersion(); if (baseFileStream != null) { // ReadAll() is taking care of closing the stream baseDocument = DocumentUtilitites.LoadReadOnlyDocumentFromBuffer(new StringTextBuffer(ReadAll(baseFileStream))); } else { + // if the file is not under subversion, the document is the opened document if (baseDocument == null) { - // if the file is not under subversion, the document is the opened document - var doc = new TextDocument(textDocument.Text); - baseDocument = new AvalonEditDocumentAdapter(doc, null); + baseDocument = DocumentUtilitites.LoadReadOnlyDocumentFromBuffer(document.CreateSnapshot()); } } - - SetupInitialFileState(false); - - this.textDocument.LineTrackers.Add(this); - this.textDocument.UndoStack.PropertyChanged += UndoStackPropertyChanged; } LineChangeInfo TransformLineChangeInfo(LineChangeInfo info) @@ -81,7 +95,7 @@ namespace ICSharpCode.AvalonEdit.AddIn if (update) changeList.Transform(TransformLineChangeInfo); else - changeList.InsertRange(0, document.TotalNumberOfLines + 1, LineChangeInfo.Empty); + changeList.InsertRange(0, document.TotalNumberOfLines + 1, LineChangeInfo.EMPTY); } else { changeList.Clear(); @@ -92,25 +106,23 @@ namespace ICSharpCode.AvalonEdit.AddIn new DocumentSequence(document, hashes) ); - changeList.Add(LineChangeInfo.Empty); + changeList.Add(LineChangeInfo.EMPTY); int lastEndLine = 0; foreach (Edit edit in diff.GetEdits()) { int beginLine = edit.BeginB; int endLine = edit.EndB; - changeList.InsertRange(changeList.Count, beginLine - lastEndLine, LineChangeInfo.Empty); + changeList.InsertRange(changeList.Count, beginLine - lastEndLine, LineChangeInfo.EMPTY); - LineChangeInfo change = new LineChangeInfo(edit.EditType, edit.BeginA, edit.BeginB, edit.EndA, edit.EndB); if (endLine == beginLine) - changeList[changeList.Count - 1] = change; + changeList[changeList.Count - 1] = new LineChangeInfo(edit.EditType, edit.BeginA, edit.EndA); else - changeList.InsertRange(changeList.Count, endLine - beginLine, change); - + changeList.InsertRange(changeList.Count, endLine - beginLine, new LineChangeInfo(edit.EditType, edit.BeginA, edit.EndA)); lastEndLine = endLine; } - changeList.InsertRange(changeList.Count, textDocument.LineCount - lastEndLine, LineChangeInfo.Empty); + changeList.InsertRange(changeList.Count, textDocument.LineCount - lastEndLine, LineChangeInfo.EMPTY); } OnChangeOccurred(EventArgs.Empty); @@ -118,9 +130,11 @@ namespace ICSharpCode.AvalonEdit.AddIn string ReadAll(Stream stream) { - using (StreamReader reader = new StreamReader(stream)) { - return reader.ReadToEnd(); - } + var memory = new MemoryStream(); + stream.CopyTo(memory); + stream.Close(); + memory.Position = 0; + return FileReader.ReadFileContent(memory, ParserService.DefaultFileEncoding); } Stream GetBaseVersion() @@ -129,10 +143,12 @@ namespace ICSharpCode.AvalonEdit.AddIn foreach (IDocumentVersionProvider provider in VersioningServices.Instance.DocumentVersionProviders) { var result = provider.OpenBaseVersion(fileName); - if (result != null) + if (result != null) { + usedProvider = provider; return result; + } } - + return null; } @@ -158,7 +174,7 @@ namespace ICSharpCode.AvalonEdit.AddIn void ILineTracker.LineInserted(DocumentLine insertionPos, DocumentLine newLine) { int index = insertionPos.LineNumber; - var newLineInfo = new LineChangeInfo(ChangeType.Unsaved, index, index, newLine.LineNumber, newLine.LineNumber); + var newLineInfo = new LineChangeInfo(ChangeType.Unsaved, index, index); changeList[index] = newLineInfo; changeList.Insert(index + 1, newLineInfo); @@ -167,7 +183,7 @@ namespace ICSharpCode.AvalonEdit.AddIn void ILineTracker.RebuildDocument() { changeList.Clear(); - changeList.InsertRange(0, document.TotalNumberOfLines + 1, new LineChangeInfo(ChangeType.Unsaved, 1, 1, baseDocument.TotalNumberOfLines, document.TotalNumberOfLines)); + changeList.InsertRange(0, document.TotalNumberOfLines + 1, new LineChangeInfo(ChangeType.Unsaved, 1, baseDocument.TotalNumberOfLines)); } bool disposed = false; @@ -175,6 +191,8 @@ namespace ICSharpCode.AvalonEdit.AddIn public void Dispose() { if (!disposed) { + if (watcher != null) + watcher.Dispose(); this.textDocument.LineTrackers.Remove(this); this.textDocument.UndoStack.PropertyChanged -= UndoStackPropertyChanged; disposed = true; @@ -188,7 +206,7 @@ namespace ICSharpCode.AvalonEdit.AddIn added = info.Change == ChangeType.Added; if (info.Change != ChangeType.None && info.Change != ChangeType.Unsaved) { - newStartLine = info.NewStartLineNumber + 1; + newStartLine = CalculateNewStartLineNumber(lineNumber); if (info.Change == ChangeType.Added) return ""; @@ -196,23 +214,37 @@ namespace ICSharpCode.AvalonEdit.AddIn var startDocumentLine = baseDocument.GetLine(info.OldStartLineNumber + 1); var endLine = baseDocument.GetLine(info.OldEndLineNumber); - return baseDocument.GetText(startDocumentLine.Offset, endLine.EndOffset - startDocumentLine.Offset); + return TextUtilities.NormalizeNewLines(baseDocument.GetText(startDocumentLine.Offset, endLine.EndOffset - startDocumentLine.Offset), DocumentUtilitites.GetLineTerminator(document, newStartLine == 0 ? 1 : newStartLine)); } newStartLine = 0; return null; } + int CalculateNewStartLineNumber(int lineNumber) + { + return changeList.GetStartOfRun(lineNumber); + } + + int CalculateNewEndLineNumber(int lineNumber) + { + return changeList.GetEndOfRun(lineNumber) - 1; + } + public bool GetNewVersionFromLine(int lineNumber, out int offset, out int length) { LineChangeInfo info = changeList[lineNumber]; if (info.Change != ChangeType.None && info.Change != ChangeType.Unsaved) { - var startLine = document.GetLine(info.NewStartLineNumber + 1); - var endLine = document.GetLine(info.NewEndLineNumber); + var startLine = document.GetLine(CalculateNewStartLineNumber(lineNumber)); + var endLine = document.GetLine(CalculateNewEndLineNumber(lineNumber)); offset = startLine.Offset; length = endLine.EndOffset - startLine.Offset; + + if (info.Change == ChangeType.Added) + length += endLine.DelimiterLength; + return true; } diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/LineChangeInfo.cs b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/LineChangeInfo.cs index 99551b6755..cba099d4b6 100644 --- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/LineChangeInfo.cs +++ b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/LineChangeInfo.cs @@ -2,7 +2,6 @@ // This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; -using System.Collections.Generic; using ICSharpCode.SharpDevelop.Editor; namespace ICSharpCode.AvalonEdit.AddIn @@ -34,7 +33,7 @@ namespace ICSharpCode.AvalonEdit.AddIn public struct LineChangeInfo : IEquatable { - public static readonly LineChangeInfo Empty = new LineChangeInfo(ChangeType.None, -1, -1, -1, -1); + public static readonly LineChangeInfo EMPTY = new LineChangeInfo(ChangeType.None, 1, 1); ChangeType change; @@ -47,37 +46,19 @@ namespace ICSharpCode.AvalonEdit.AddIn public int OldStartLineNumber { get { return oldStartLineNumber; } - set { oldStartLineNumber = value; } - } - - int newStartLineNumber; - - public int NewStartLineNumber { - get { return newStartLineNumber; } - set { newStartLineNumber = value; } } int oldEndLineNumber; public int OldEndLineNumber { get { return oldEndLineNumber; } - set { oldEndLineNumber = value; } } - int newEndLineNumber; - - public int NewEndLineNumber { - get { return newEndLineNumber; } - set { newEndLineNumber = value; } - } - - public LineChangeInfo(ChangeType change, int oldStartLineNumber, int newStartLineNumber, int oldEndLineNumber, int newEndLineNumber) + public LineChangeInfo(ChangeType change, int oldStartLineNumber, int oldEndLineNumber) { this.change = change; this.oldStartLineNumber = oldStartLineNumber; - this.newStartLineNumber = newStartLineNumber; this.oldEndLineNumber = oldEndLineNumber; - this.newEndLineNumber = newEndLineNumber; } #region Equals and GetHashCode implementation @@ -88,11 +69,7 @@ namespace ICSharpCode.AvalonEdit.AddIn public bool Equals(LineChangeInfo other) { - return this.change == other.change && - this.oldEndLineNumber == other.oldEndLineNumber && - this.newStartLineNumber == other.newStartLineNumber && - this.oldStartLineNumber == other.oldStartLineNumber && - this.newEndLineNumber == other.newEndLineNumber; + return this.change == other.change && this.oldStartLineNumber == other.oldStartLineNumber && this.oldEndLineNumber == other.oldEndLineNumber; } public override int GetHashCode() @@ -101,9 +78,7 @@ namespace ICSharpCode.AvalonEdit.AddIn unchecked { hashCode += 1000000007 * change.GetHashCode(); hashCode += 1000000009 * oldStartLineNumber.GetHashCode(); - hashCode += 1000000021 * newStartLineNumber.GetHashCode(); - hashCode += 1000000033 * oldEndLineNumber.GetHashCode(); - hashCode += 1000000087 * newEndLineNumber.GetHashCode(); + hashCode += 1000000021 * oldEndLineNumber.GetHashCode(); } return hashCode; } @@ -118,5 +93,6 @@ namespace ICSharpCode.AvalonEdit.AddIn return !(lhs == rhs); } #endregion + } } diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Options/HighlightingOptions.xaml b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Options/HighlightingOptions.xaml index e7844a4d98..f8ab41dd0c 100644 --- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Options/HighlightingOptions.xaml +++ b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Options/HighlightingOptions.xaml @@ -16,17 +16,17 @@