pimhwang
/
SharpDevelop
mirror of https://github.com/icsharpcode/SharpDevelop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge branch 'reports' of github.com:icsharpcode/SharpDevelop into reports 

Conflicts:
	SharpDevelop.Tests.sln
pull/1/head
peterforstmeier 15 years ago
parent
188e4d14cb 39686a177a
commit
eafe6fbe4b
86 changed files with 951 additions and 306 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      .gitignore
  2. 254
      SharpDevelop.Tests.sln
  3. 63
      SharpDevelop.sln
  4. 57
      data/resources/StringResources.de.resx
  5. 15
      data/resources/StringResources.es-mx.resx
  6. 15
      data/resources/StringResources.es.resx
  7. 6
      data/resources/StringResources.fr.resx
  8. 6
      data/resources/StringResources.nl.resx
  9. 21
      data/resources/StringResources.pt-br.resx
  10. 6
      data/resources/StringResources.resx
  11. 4
      doc/ChangeLog.template.html
  12. 2
      src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/AddInHelper.cs
  13. 2
      src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/AddInHelper.cs
  14. 1
      src/AddIns/Debugger/Debugger.Tests/Tests/ExpressionEvaluator_Tests.cs
  15. 10
      src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Snippets/CodeSnippet.cs
  16. 28
      src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Snippets/SnippetManager.cs
  17. 13
      src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Snippets/SnippetOptionPanel.cs
  18. 112
      src/AddIns/Misc/Reports/SharpDevelop.Reports.sln
  19. 36
      src/AddIns/Misc/SharpRefactoring/Project/Src/ContextActions/AddUsing.cs
  20. 3
      src/AddIns/Misc/SharpRefactoring/Project/Src/Extensions.cs
  21. 10
      src/AddIns/Misc/SharpRefactoring/Project/Src/MenuItemFactories/ResolveExtensionMethod.cs
  22. 17
      src/AddIns/Misc/UsageDataCollector/UsageDataCollector.AddIn/AnalyticsMonitor.AppProperties.template
  23. 13
      src/AddIns/Misc/UsageDataCollector/UsageDataCollector.AddIn/AnalyticsMonitor.cs
  24. 6
      src/AddIns/Misc/UsageDataCollector/UsageDataCollector.AddIn/UsageDataCollector.AddIn.csproj
  25. 3
      src/AddIns/VersionControl/GitAddIn/GitAddIn.addin
  26. 2
      src/AddIns/VersionControl/GitAddIn/GitAddIn.csproj
  27. 17
      src/AddIns/VersionControl/GitAddIn/Src/Git.cs
  28. 6
      src/AddIns/VersionControl/GitAddIn/Src/GitGuiWrapper.cs
  29. 66
      src/AddIns/VersionControl/GitAddIn/Src/GitStatusCache.cs
  30. 10
      src/AddIns/VersionControl/GitAddIn/Src/RegisterEventsCommand.cs
  31. 0
      src/AddIns/VersionControl/SubversionAddIn/Configuration/AssemblyInfo.cs
  32. 0
      src/AddIns/VersionControl/SubversionAddIn/ICSharpCode.Svn.addin
  33. 0
      src/AddIns/VersionControl/SubversionAddIn/Resources/SubversionOptionsPanel.xfrm
  34. 0
      src/AddIns/VersionControl/SubversionAddIn/Src/AddInOptions.cs
  35. 0
      src/AddIns/VersionControl/SubversionAddIn/Src/Commands/AutostartCommands.cs
  36. 0
      src/AddIns/VersionControl/SubversionAddIn/Src/Commands/CheckoutCommands.cs
  37. 0
      src/AddIns/VersionControl/SubversionAddIn/Src/Commands/ProjectBrowserCommands.cs
  38. 0
      src/AddIns/VersionControl/SubversionAddIn/Src/Gui/HistoryViewDisplayBinding/HistoryView.cs
  39. 0
      src/AddIns/VersionControl/SubversionAddIn/Src/Gui/HistoryViewDisplayBinding/HistoryViewDisplayBinding.cs
  40. 0
      src/AddIns/VersionControl/SubversionAddIn/Src/Gui/HistoryViewDisplayBinding/HistoryViewPanel.cs
  41. 0
      src/AddIns/VersionControl/SubversionAddIn/Src/Gui/HistoryViewDisplayBinding/InfoPanel.Designer.cs
  42. 0
      src/AddIns/VersionControl/SubversionAddIn/Src/Gui/HistoryViewDisplayBinding/InfoPanel.cs
  43. 0
      src/AddIns/VersionControl/SubversionAddIn/Src/Gui/HistoryViewDisplayBinding/InfoPanel.resx
  44. 0
      src/AddIns/VersionControl/SubversionAddIn/Src/Gui/ProjectBrowserVisitor/OverlayIconManager.cs
  45. 0
      src/AddIns/VersionControl/SubversionAddIn/Src/Gui/SubversionOptionsPanel.cs
  46. 0
      src/AddIns/VersionControl/SubversionAddIn/Src/Gui/SvnGuiWrapper.cs
  47. 0
      src/AddIns/VersionControl/SubversionAddIn/Src/Gui/TortoiseSvnNotFoundForm.cs
  48. 0
      src/AddIns/VersionControl/SubversionAddIn/Src/SubversionStateCondition.cs
  49. 0
      src/AddIns/VersionControl/SubversionAddIn/Src/SvnClientWrapper.cs
  50. 0
      src/AddIns/VersionControl/SubversionAddIn/Src/SvnMessageView.cs
  51. 20
      src/AddIns/VersionControl/SubversionAddIn/SubversionAddIn.csproj
  52. 18
      src/Automated.proj
  53. 2
      src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/Boo.xshd
  54. 15
      src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/CSharp-Mode.xshd
  55. 4
      src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Xshd/V1Loader.cs
  56. 1
      src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/ICSharpCode.AvalonEdit.csproj
  57. 1
      src/Libraries/NRefactory/Project/NRefactory.csproj
  58. 3
      src/Libraries/NRefactory/Project/Src/PrettyPrinter/VBNet/VBNetOutputVisitor.cs
  59. 33
      src/Libraries/NRefactory/Test/Parser/GlobalScope/UsingDeclarationTests.cs
  60. 12
      src/Libraries/SharpTreeView/ICSharpCode.TreeView/Properties/AssemblyInfo.cs
  61. 7
      src/Main/Base/Project/Src/Gui/Dialogs/SharpDevelopAboutPanels.cs
  62. 2
      src/Main/Base/Project/Src/Gui/Dialogs/ToolNotFoundDialog.cs
  63. 4
      src/Main/Base/Project/Src/Gui/Pads/CompilerMessageView/MessageViewCategory.cs
  64. 12
      src/Main/Base/Project/Src/Gui/WorkbenchSingleton.cs
  65. 34
      src/Main/Base/Project/Src/Services/RefactoringService/ContextActions/EditorContext.cs
  66. 44
      src/Main/Base/Project/Src/Services/RefactoringService/RefactoringMenuBuilder.cs
  67. 6
      src/Main/Core/Project/ICSharpCode.Core.csproj
  68. 2
      src/Main/Core/Project/Src/AddInTree/AddIn/AddInReference.cs
  69. 41
      src/Main/Core/Project/Src/AddInTree/AddIn/ExtensionPath.cs
  70. 3
      src/Main/Core/Project/Src/AddInTree/AddInTree.cs
  71. 6
      src/Main/Core/Project/Src/AddInTree/AddInTreeNode.cs
  72. 60
      src/Main/Core/Test/AddInTreeTests/AddInTreeLoadingTests.cs
  73. 3
      src/Main/Core/Test/ICSharpCode.Core.Tests.csproj
  74. 8
      src/Main/GlobalAssemblyInfo.template
  75. 1
      src/Main/ICSharpCode.Core.WinForms/ICSharpCode.Core.WinForms.csproj
  76. 24
      src/Main/ICSharpCode.Core.WinForms/MessageService/IDialogMessageService.cs
  77. 2
      src/Main/ICSharpCode.Core.WinForms/MessageService/WinFormsMessageService.cs
  78. 1
      src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/ProjectContent/ParseInformation.cs
  79. 1
      src/Main/StartUp/Project/Dialogs/SplashScreen.cs
  80. 4
      src/Main/StartUp/Project/SharpDevelopMain.cs
  81. 1
      src/Main/StartUp/Project/StartUp.csproj
  82. 28
      src/Setup/Files.wxs
  83. 1
      src/Setup/Setup.wxs
  84. 3
      src/Tools/StringResourceTool/ResourceDatabase.cs
  85. 3
      src/Tools/Tools.build
  86. 42
      src/Tools/UpdateAssemblyInfo/Main.cs

1
.gitignore vendored
Unescape View File

@ -17,3 +17,4 @@ bin/ @@ -17,3 +17,4 @@ bin/
/src/Main/ICSharpCode.SharpDevelop.Sda/ICSharpCode.SharpDevelop.Sda.dll.config
/src/Main/StartUp/Project/SharpDevelop.exe.config
/src/Main/GlobalAssemblyInfo.cs
/src/AddIns/Misc/UsageDataCollector/UsageDataCollector.AddIn/AnalyticsMonitor.AppProperties.cs

254
SharpDevelop.Tests.sln
Unescape View File

@ -1,7 +1,11 @@ @@ -1,7 +1,11 @@

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
<<<<<<< HEAD
# SharpDevelop 4.0.0.6474
=======
# SharpDevelop 4.0.0.6315
>>>>>>> 39686a177a553c82e97f61ca9d015b34e55a99fd
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Main", "Main", "{256F5C28-532C-44C0-8AB8-D8EC5E492E01}"
ProjectSection(SolutionItems) = postProject
EndProjectSection
@ -221,73 +225,117 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceEditor", "src\AddIn @@ -221,73 +225,117 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceEditor", "src\AddIn
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AvalonEdit.AddIn", "src\AddIns\DisplayBindings\AvalonEdit.AddIn\AvalonEdit.AddIn.csproj", "{0162E499-42D0-409B-AA25-EED21F75336B}"
<<<<<<< HEAD
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}"
=======
>>>>>>> 39686a177a553c82e97f61ca9d015b34e55a99fd
ProjectSection(ProjectDependencies) = postProject
{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
EndProjectSection
EndProject
<<<<<<< HEAD
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}") = "XmlEditor", "src\AddIns\DisplayBindings\XmlEditor\Project\XmlEditor.csproj", "{DCA2703D-250A-463E-A68A-07ED105AE6BD}"
>>>>>>> 39686a177a553c82e97f61ca9d015b34e55a99fd
ProjectSection(ProjectDependencies) = postProject
{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
EndProjectSection
EndProject
<<<<<<< HEAD
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}") = "FormsDesigner", "src\AddIns\DisplayBindings\FormsDesigner\Project\FormsDesigner.csproj", "{7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57}"
>>>>>>> 39686a177a553c82e97f61ca9d015b34e55a99fd
ProjectSection(ProjectDependencies) = postProject
{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
EndProjectSection
EndProject
<<<<<<< HEAD
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}") = "Diagrams", "src\AddIns\DisplayBindings\ClassDiagram\DiagramRouter\Diagrams.csproj", "{0991423A-DBF6-4C89-B365-A1DF1EB32E42}"
=======
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}"
>>>>>>> 39686a177a553c82e97f61ca9d015b34e55a99fd
ProjectSection(ProjectDependencies) = postProject
{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
EndProjectSection
EndProject
<<<<<<< HEAD
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Data", "Data", "{C7F29FC2-1B03-4CDD-9E30-400F4765FF04}"
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}") = "ClassDiagramAddin", "src\AddIns\DisplayBindings\ClassDiagram\ClassDiagramAddin\ClassDiagramAddin.csproj", "{5A1354DF-4989-4BB4-BC6B-D627C2E9FA13}"
>>>>>>> 39686a177a553c82e97f61ca9d015b34e55a99fd
ProjectSection(ProjectDependencies) = postProject
{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
EndProjectSection
EndProject
<<<<<<< HEAD
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}") = "Diagrams", "src\AddIns\DisplayBindings\ClassDiagram\DiagramRouter\Diagrams.csproj", "{0991423A-DBF6-4C89-B365-A1DF1EB32E42}"
>>>>>>> 39686a177a553c82e97f61ca9d015b34e55a99fd
ProjectSection(ProjectDependencies) = postProject
{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
EndProjectSection
EndProject
<<<<<<< HEAD
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.Data.EDMDesigner.Core", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.EDMDesigner.Core\ICSharpCode.Data.EDMDesigner.Core.csproj", "{5C70D6AB-0A33-43F9-B8B5-54558C35BBB1}"
=======
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Data", "Data", "{C7F29FC2-1B03-4CDD-9E30-400F4765FF04}"
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}"
>>>>>>> 39686a177a553c82e97f61ca9d015b34e55a99fd
ProjectSection(ProjectDependencies) = postProject
{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
EndProjectSection
EndProject
<<<<<<< HEAD
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}") = "ICSharpCode.Data.Core", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.Core\ICSharpCode.Data.Core.csproj", "{B7823AE9-4B43-4859-8796-2EBDC116FBB8}"
>>>>>>> 39686a177a553c82e97f61ca9d015b34e55a99fd
ProjectSection(ProjectDependencies) = postProject
{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
EndProjectSection
EndProject
<<<<<<< HEAD
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}") = "ICSharpCode.Data.Core.UI", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.Core.UI\ICSharpCode.Data.Core.UI.csproj", "{BAD94D6E-4159-4CB6-B991-486F412D9BB6}"
>>>>>>> 39686a177a553c82e97f61ca9d015b34e55a99fd
ProjectSection(ProjectDependencies) = postProject
{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
EndProjectSection
EndProject
<<<<<<< HEAD
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Misc", "Misc", "{F3662720-9EA2-4591-BBC6-97361DCE50A9}"
ProjectSection(SolutionItems) = postProject
EndProjectSection
@ -297,45 +345,97 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UsageDataCollector", "Usage @@ -297,45 +345,97 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UsageDataCollector", "Usage
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}") = "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}") = "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}"
>>>>>>> 39686a177a553c82e97f61ca9d015b34e55a99fd
ProjectSection(ProjectDependencies) = postProject
{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
EndProjectSection
EndProject
<<<<<<< HEAD
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.Data.SQLServer", "src\AddIns\DisplayBindings\Data\ICSharpCode.Data.SQLServer\ICSharpCode.Data.SQLServer.csproj", "{AFE34868-AFA1-4E1C-9450-47AB4BE329D5}"
>>>>>>> 39686a177a553c82e97f61ca9d015b34e55a99fd
ProjectSection(ProjectDependencies) = postProject
{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
EndProjectSection
EndProject
<<<<<<< HEAD
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SearchAndReplace.Tests", "src\AddIns\Misc\SearchAndReplace\Test\SearchAndReplace.Tests.csproj", "{A569DCC1-C608-45FD-B770-4F79335EF154}"
=======
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Misc", "Misc", "{F3662720-9EA2-4591-BBC6-97361DCE50A9}"
ProjectSection(SolutionItems) = postProject
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.AddIn", "src\AddIns\Misc\UsageDataCollector\UsageDataCollector.AddIn\UsageDataCollector.AddIn.csproj", "{0008FCE9-9EB4-4E2E-979B-553278E5BBA6}"
>>>>>>> 39686a177a553c82e97f61ca9d015b34e55a99fd
ProjectSection(ProjectDependencies) = postProject
{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
EndProjectSection
EndProject
<<<<<<< HEAD
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceToolkit.Tests", "src\AddIns\Misc\ResourceToolkit\Test\ResourceToolkit.Tests.csproj", "{DD9AE6A5-2B9D-443A-BC71-38BE578C36BD}"
=======
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UsageDataCollector", "src\AddIns\Misc\UsageDataCollector\UsageDataCollector\UsageDataCollector.csproj", "{6B1CFE35-DA17-4DEB-9C6E-227E5E251DA0}"
>>>>>>> 39686a177a553c82e97f61ca9d015b34e55a99fd
ProjectSection(ProjectDependencies) = postProject
{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
EndProjectSection
EndProject
<<<<<<< HEAD
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SubversionAddIn", "src\AddIns\Misc\SubversionAddIn\Project\SubversionAddIn.csproj", "{17F4D7E0-6933-4C2E-8714-FD7E98D625D5}"
=======
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SearchAndReplace.Tests", "src\AddIns\Misc\SearchAndReplace\Test\SearchAndReplace.Tests.csproj", "{A569DCC1-C608-45FD-B770-4F79335EF154}"
>>>>>>> 39686a177a553c82e97f61ca9d015b34e55a99fd
ProjectSection(ProjectDependencies) = postProject
{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
EndProjectSection
EndProject
<<<<<<< HEAD
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}") = "ResourceToolkit.Tests", "src\AddIns\Misc\ResourceToolkit\Test\ResourceToolkit.Tests.csproj", "{DD9AE6A5-2B9D-443A-BC71-38BE578C36BD}"
>>>>>>> 39686a177a553c82e97f61ca9d015b34e55a99fd
ProjectSection(ProjectDependencies) = postProject
{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
EndProjectSection
EndProject
<<<<<<< HEAD
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}") = "ResourceToolkit", "src\AddIns\Misc\ResourceToolkit\Project\ResourceToolkit.csproj", "{461606BD-E824-4D0A-8CBA-01810B1F5E02}"
>>>>>>> 39686a177a553c82e97f61ca9d015b34e55a99fd
ProjectSection(ProjectDependencies) = postProject
{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
EndProjectSection
EndProject
<<<<<<< HEAD
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}") = "RegExpTk", "src\AddIns\Misc\RegExpTk\Project\RegExpTk.csproj", "{64A3E5E6-90BF-47F6-94DF-68C94B62C817}"
>>>>>>> 39686a177a553c82e97f61ca9d015b34e55a99fd
ProjectSection(ProjectDependencies) = postProject
{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
EndProjectSection
EndProject
<<<<<<< HEAD
=======
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
>>>>>>> 39686a177a553c82e97f61ca9d015b34e55a99fd
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}
@ -465,6 +565,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PythonBinding.Tests", "src\ @@ -465,6 +565,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PythonBinding.Tests", "src\
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Boo", "Boo", "{97B3B514-AB0E-4FE1-89DE-8A945F5112AE}"
ProjectSection(SolutionItems) = postProject
<<<<<<< HEAD
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactoryToBooConverter.Tests", "src\AddIns\BackendBindings\Boo\NRefactoryToBooConverter\Test\NRefactoryToBooConverter.Tests.csproj", "{C9DE556D-325C-4544-B29F-16A9EB7C9830}"
=======
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactoryToBooConverter.Tests", "src\AddIns\BackendBindings\Boo\NRefactoryToBooConverter\Test\NRefactoryToBooConverter.Tests.csproj", "{C9DE556D-325C-4544-B29F-16A9EB7C9830}"
@ -473,82 +578,163 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactoryToBooConverter.Te @@ -473,82 +578,163 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactoryToBooConverter.Te
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactoryToBooConverter", "src\AddIns\BackendBindings\Boo\NRefactoryToBooConverter\Project\NRefactoryToBooConverter.csproj", "{DBCF20A1-BA13-4582-BFA9-74DE4D987B73}"
>>>>>>> 39686a177a553c82e97f61ca9d015b34e55a99fd
ProjectSection(ProjectDependencies) = postProject
{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
EndProjectSection
EndProject
<<<<<<< HEAD
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}") = "BooBinding", "src\AddIns\BackendBindings\Boo\BooBinding\Project\BooBinding.csproj", "{4AC2D5F1-F671-480C-A075-6BF62B3721B2}"
>>>>>>> 39686a177a553c82e97f61ca9d015b34e55a99fd
ProjectSection(ProjectDependencies) = postProject
{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
EndProjectSection
EndProject
<<<<<<< HEAD
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}") = "BooBinding.Tests", "src\AddIns\BackendBindings\Boo\BooBinding\Test\BooBinding.Tests.csproj", "{6FA16499-896F-4C02-BB43-1AF5C6C7C713}"
>>>>>>> 39686a177a553c82e97f61ca9d015b34e55a99fd
ProjectSection(ProjectDependencies) = postProject
{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
EndProjectSection
EndProject
<<<<<<< HEAD
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}") = "VBNetBinding.Tests", "src\AddIns\BackendBindings\VBNetBinding\Test\VBNetBinding.Tests.csproj", "{50A89267-A28B-4DF3-8E62-912E005143B8}"
>>>>>>> 39686a177a553c82e97f61ca9d015b34e55a99fd
ProjectSection(ProjectDependencies) = postProject
{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
EndProjectSection
EndProject
<<<<<<< HEAD
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}") = "CSharpBinding.Tests", "src\AddIns\BackendBindings\CSharpBinding\Tests\CSharpBinding.Tests.csproj", "{52006F3F-3156-45DE-89D8-C4813694FBA4}"
>>>>>>> 39686a177a553c82e97f61ca9d015b34e55a99fd
ProjectSection(ProjectDependencies) = postProject
{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
EndProjectSection
EndProject
<<<<<<< HEAD
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}") = "CppBinding", "src\AddIns\BackendBindings\CppBinding\CppBinding\CppBinding.csproj", "{70966F84-74C9-4067-A379-0C674A929233}"
>>>>>>> 39686a177a553c82e97f61ca9d015b34e55a99fd
ProjectSection(ProjectDependencies) = postProject
{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
EndProjectSection
EndProject
<<<<<<< HEAD
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CppBinding", "src\AddIns\BackendBindings\CppBinding\CppBinding\CppBinding.csproj", "{70966F84-74C9-4067-A379-0C674A929233}"
=======
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Ruby", "Ruby", "{C7288E72-FFBE-48CD-84B4-6CBF95A7195A}"
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}"
>>>>>>> 39686a177a553c82e97f61ca9d015b34e55a99fd
ProjectSection(ProjectDependencies) = postProject
{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
EndProjectSection
EndProject
<<<<<<< HEAD
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Ruby", "Ruby", "{C7288E72-FFBE-48CD-84B4-6CBF95A7195A}"
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}") = "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("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Profiler", "Profiler", "{C4035C32-026F-4158-AF15-113EA1EF1960}"
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}"
>>>>>>> 39686a177a553c82e97f61ca9d015b34e55a99fd
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
<<<<<<< HEAD
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}") = "Profiler.X64Converter", "src\AddIns\Analysis\Profiler\X64Converter\Profiler.X64Converter.csproj", "{FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6}"
>>>>>>> 39686a177a553c82e97f61ca9d015b34e55a99fd
ProjectSection(ProjectDependencies) = postProject
{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
EndProjectSection
EndProject
<<<<<<< HEAD
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Profiler", "Profiler", "{C4035C32-026F-4158-AF15-113EA1EF1960}"
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}") = "Profiler.Controller", "src\AddIns\Analysis\Profiler\Controller\Profiler.Controller.csproj", "{72FFB35A-C9E2-4A31-B4FA-E3E3E28DED5F}"
>>>>>>> 39686a177a553c82e97f61ca9d015b34e55a99fd
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
<<<<<<< HEAD
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}") = "Profiler.Controls", "src\AddIns\Analysis\Profiler\Frontend\Controls\Profiler.Controls.csproj", "{BDA49550-5ED1-4C6B-B648-657B2CACD8E0}"
>>>>>>> 39686a177a553c82e97f61ca9d015b34e55a99fd
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
<<<<<<< HEAD
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}") = "Profiler.AddIn", "src\AddIns\Analysis\Profiler\Frontend\AddIn\Profiler.AddIn.csproj", "{D294A12D-4B38-4F25-9AA6-3D4A6CE26E7B}"
>>>>>>> 39686a177a553c82e97f61ca9d015b34e55a99fd
ProjectSection(ProjectDependencies) = postProject
{FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} = {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6}
{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
{FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6} = {FE88FE17-D9FB-4FCC-9A35-6BFFB6B26CC6}
EndProjectSection
EndProject
<<<<<<< HEAD
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Profiler.Controls", "src\AddIns\Analysis\Profiler\Frontend\Controls\Profiler.Controls.csproj", "{BDA49550-5ED1-4C6B-B648-657B2CACD8E0}"
=======
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Reports", "Reports", "{8789D7FF-B36C-4187-B57D-55ED64623272}"
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}"
>>>>>>> 39686a177a553c82e97f61ca9d015b34e55a99fd
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
<<<<<<< HEAD
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}") = "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}"
>>>>>>> 39686a177a553c82e97f61ca9d015b34e55a99fd
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
<<<<<<< HEAD
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Reports", "Reports", "{8789D7FF-B36C-4187-B57D-55ED64623272}"
ProjectSection(SolutionItems) = postProject
EndProjectSection
@ -556,21 +742,41 @@ EndProject @@ -556,21 +742,41 @@ 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}") = "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}") = "ICSharpCode.Reports.Addin.Test", "src\AddIns\Misc\Reports\ICSharpCode.Reports.Addin\Test\ICSharpCode.Reports.Addin.Test.csproj", "{2B232C7E-CFB6-4B73-A1B8-134A8A2ED4F7}"
>>>>>>> 39686a177a553c82e97f61ca9d015b34e55a99fd
ProjectSection(ProjectDependencies) = postProject
{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
EndProjectSection
EndProject
<<<<<<< HEAD
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}") = "ICSharpCode.Reports.Addin", "src\AddIns\Misc\Reports\ICSharpCode.Reports.Addin\ICSharpCode.Reports.Addin.csproj", "{35D002D7-C78B-44FB-92AA-104BEB431678}"
=======
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}") = "SubversionAddIn", "src\AddIns\VersionControl\SubversionAddIn\SubversionAddIn.csproj", "{17F4D7E0-6933-4C2E-8714-FD7E98D625D5}"
>>>>>>> 39686a177a553c82e97f61ca9d015b34e55a99fd
ProjectSection(ProjectDependencies) = postProject
{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
EndProjectSection
EndProject
<<<<<<< HEAD
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}") = "GitAddIn", "src\AddIns\VersionControl\GitAddIn\GitAddIn.csproj", "{83F15BA7-8478-4664-81BB-A82F146D88B3}"
>>>>>>> 39686a177a553c82e97f61ca9d015b34e55a99fd
ProjectSection(ProjectDependencies) = postProject
{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
EndProjectSection
@ -717,10 +923,6 @@ Global @@ -717,10 +923,6 @@ Global
{461606BD-E824-4D0A-8CBA-01810B1F5E02}.Debug|Any CPU.Build.0 = Debug|Any CPU
{461606BD-E824-4D0A-8CBA-01810B1F5E02}.Release|Any CPU.ActiveCfg = Release|Any CPU
{461606BD-E824-4D0A-8CBA-01810B1F5E02}.Release|Any CPU.Build.0 = Release|Any CPU
{17F4D7E0-6933-4C2E-8714-FD7E98D625D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{17F4D7E0-6933-4C2E-8714-FD7E98D625D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{17F4D7E0-6933-4C2E-8714-FD7E98D625D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{17F4D7E0-6933-4C2E-8714-FD7E98D625D5}.Release|Any CPU.Build.0 = Release|Any CPU
{0991423A-DBF6-4C89-B365-A1DF1EB32E42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0991423A-DBF6-4C89-B365-A1DF1EB32E42}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0991423A-DBF6-4C89-B365-A1DF1EB32E42}.Release|Any CPU.ActiveCfg = Release|Any CPU
@ -1137,6 +1339,38 @@ Global @@ -1137,6 +1339,38 @@ Global
{2B232C7E-CFB6-4B73-A1B8-134A8A2ED4F7}.Release|x86.ActiveCfg = Release|Any CPU
{2B232C7E-CFB6-4B73-A1B8-134A8A2ED4F7}.Release|Debug.Build.0 = Release|Any CPU
{2B232C7E-CFB6-4B73-A1B8-134A8A2ED4F7}.Release|Debug.ActiveCfg = Release|Any CPU
{17F4D7E0-6933-4C2E-8714-FD7E98D625D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{17F4D7E0-6933-4C2E-8714-FD7E98D625D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{17F4D7E0-6933-4C2E-8714-FD7E98D625D5}.Debug|Win32.Build.0 = Debug|Any CPU
{17F4D7E0-6933-4C2E-8714-FD7E98D625D5}.Debug|Win32.ActiveCfg = Debug|Any CPU
{17F4D7E0-6933-4C2E-8714-FD7E98D625D5}.Debug|x86.Build.0 = Debug|Any CPU
{17F4D7E0-6933-4C2E-8714-FD7E98D625D5}.Debug|x86.ActiveCfg = Debug|Any CPU
{17F4D7E0-6933-4C2E-8714-FD7E98D625D5}.Debug|Debug.Build.0 = Debug|Any CPU
{17F4D7E0-6933-4C2E-8714-FD7E98D625D5}.Debug|Debug.ActiveCfg = Debug|Any CPU
{17F4D7E0-6933-4C2E-8714-FD7E98D625D5}.Release|Any CPU.Build.0 = Release|Any CPU
{17F4D7E0-6933-4C2E-8714-FD7E98D625D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{17F4D7E0-6933-4C2E-8714-FD7E98D625D5}.Release|Win32.Build.0 = Release|Any CPU
{17F4D7E0-6933-4C2E-8714-FD7E98D625D5}.Release|Win32.ActiveCfg = Release|Any CPU
{17F4D7E0-6933-4C2E-8714-FD7E98D625D5}.Release|x86.Build.0 = Release|Any CPU
{17F4D7E0-6933-4C2E-8714-FD7E98D625D5}.Release|x86.ActiveCfg = Release|Any CPU
{17F4D7E0-6933-4C2E-8714-FD7E98D625D5}.Release|Debug.Build.0 = Release|Any CPU
{17F4D7E0-6933-4C2E-8714-FD7E98D625D5}.Release|Debug.ActiveCfg = Release|Any CPU
{83F15BA7-8478-4664-81BB-A82F146D88B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{83F15BA7-8478-4664-81BB-A82F146D88B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{83F15BA7-8478-4664-81BB-A82F146D88B3}.Debug|Win32.Build.0 = Debug|Any CPU
{83F15BA7-8478-4664-81BB-A82F146D88B3}.Debug|Win32.ActiveCfg = Debug|Any CPU
{83F15BA7-8478-4664-81BB-A82F146D88B3}.Debug|x86.Build.0 = Debug|Any CPU
{83F15BA7-8478-4664-81BB-A82F146D88B3}.Debug|x86.ActiveCfg = Debug|Any CPU
{83F15BA7-8478-4664-81BB-A82F146D88B3}.Debug|Debug.Build.0 = Debug|Any CPU
{83F15BA7-8478-4664-81BB-A82F146D88B3}.Debug|Debug.ActiveCfg = Debug|Any CPU
{83F15BA7-8478-4664-81BB-A82F146D88B3}.Release|Any CPU.Build.0 = Release|Any CPU
{83F15BA7-8478-4664-81BB-A82F146D88B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{83F15BA7-8478-4664-81BB-A82F146D88B3}.Release|Win32.Build.0 = Release|Any CPU
{83F15BA7-8478-4664-81BB-A82F146D88B3}.Release|Win32.ActiveCfg = Release|Any CPU
{83F15BA7-8478-4664-81BB-A82F146D88B3}.Release|x86.Build.0 = Release|Any CPU
{83F15BA7-8478-4664-81BB-A82F146D88B3}.Release|x86.ActiveCfg = Release|Any CPU
{83F15BA7-8478-4664-81BB-A82F146D88B3}.Release|Debug.Build.0 = Release|Any CPU
{83F15BA7-8478-4664-81BB-A82F146D88B3}.Release|Debug.ActiveCfg = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@ -1165,6 +1399,10 @@ Global @@ -1165,6 +1399,10 @@ Global
{870115DD-960A-4406-A6B9-600BCDC36A03} = {E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865}
{B22522AA-B5BF-4A58-AC6D-D4B45805521F} = {E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865}
{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195} = {E5A0F4D8-37FD-4A30-BEB0-4409DC4E0865}
<<<<<<< HEAD
=======
{F208FF4F-E5D8-41D5-A7C7-B463976F156E} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
>>>>>>> 39686a177a553c82e97f61ca9d015b34e55a99fd
{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}
@ -1217,7 +1455,10 @@ Global @@ -1217,7 +1455,10 @@ Global
{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}
<<<<<<< HEAD
{17F4D7E0-6933-4C2E-8714-FD7E98D625D5} = {F3662720-9EA2-4591-BBC6-97361DCE50A9}
=======
>>>>>>> 39686a177a553c82e97f61ca9d015b34e55a99fd
{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}
@ -1259,5 +1500,10 @@ Global @@ -1259,5 +1500,10 @@ Global
{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}
<<<<<<< HEAD
=======
{83F15BA7-8478-4664-81BB-A82F146D88B3} = {F208FF4F-E5D8-41D5-A7C7-B463976F156E}
{17F4D7E0-6933-4C2E-8714-FD7E98D625D5} = {F208FF4F-E5D8-41D5-A7C7-B463976F156E}
>>>>>>> 39686a177a553c82e97f61ca9d015b34e55a99fd
EndGlobalSection
EndGlobal

63
SharpDevelop.sln
Unescape View File

@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
# SharpDevelop 4.0.0.6209
# SharpDevelop 4.0.0.6315
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Main", "Main", "{256F5C28-532C-44C0-8AB8-D8EC5E492E01}"
ProjectSection(SolutionItems) = postProject
EndProjectSection
@ -85,6 +85,20 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AddIns", "AddIns", "{393278 @@ -85,6 +85,20 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AddIns", "AddIns", "{393278
ProjectSection(SolutionItems) = postProject
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Version Control", "Version Control", "{6E3D4DBA-DBF9-4035-8F7E-1403975B21EA}"
ProjectSection(SolutionItems) = postProject
EndProjectSection
EndProject
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}") = "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("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Analysis", "Analysis", "{F355E45F-F54F-4B42-8916-9A633A392789}"
ProjectSection(SolutionItems) = postProject
EndProjectSection
@ -252,11 +266,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UsageDataCollector", "src\A @@ -252,11 +266,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UsageDataCollector", "src\A
{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SubversionAddIn", "src\AddIns\Misc\SubversionAddIn\Project\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}") = "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}
@ -582,10 +591,6 @@ Global @@ -582,10 +591,6 @@ Global
{461606BD-E824-4D0A-8CBA-01810B1F5E02}.Debug|Any CPU.Build.0 = Debug|Any CPU
{461606BD-E824-4D0A-8CBA-01810B1F5E02}.Release|Any CPU.ActiveCfg = Release|Any CPU
{461606BD-E824-4D0A-8CBA-01810B1F5E02}.Release|Any CPU.Build.0 = Release|Any CPU
{17F4D7E0-6933-4C2E-8714-FD7E98D625D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{17F4D7E0-6933-4C2E-8714-FD7E98D625D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{17F4D7E0-6933-4C2E-8714-FD7E98D625D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{17F4D7E0-6933-4C2E-8714-FD7E98D625D5}.Release|Any CPU.Build.0 = Release|Any CPU
{0991423A-DBF6-4C89-B365-A1DF1EB32E42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0991423A-DBF6-4C89-B365-A1DF1EB32E42}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0991423A-DBF6-4C89-B365-A1DF1EB32E42}.Release|Any CPU.ActiveCfg = Release|Any CPU
@ -775,7 +780,7 @@ Global @@ -775,7 +780,7 @@ Global
{80F76D10-0B44-4D55-B4BD-DAEB5464090C}.Release|x86.Build.0 = Release|x86
{80F76D10-0B44-4D55-B4BD-DAEB5464090C}.Release|x86.ActiveCfg = Release|x86
{76DD1CC0-0D86-44A1-9BD6-D91F79807BC3}.Debug|Any CPU.Build.0 = Debug|Debug
{76DD1CC0-0D86-44A1-9BD6-D91F79807BC3}.Debug|Any CPU.ActiveCfg = Debug|Debug
{76DD1CC0-0D86-44A1-9BD6-D91F79807BC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{76DD1CC0-0D86-44A1-9BD6-D91F79807BC3}.Debug|Win32.Build.0 = Debug|Debug
{76DD1CC0-0D86-44A1-9BD6-D91F79807BC3}.Debug|Win32.ActiveCfg = Debug|Debug
{76DD1CC0-0D86-44A1-9BD6-D91F79807BC3}.Debug|x86.Build.0 = Debug|x86
@ -854,6 +859,38 @@ Global @@ -854,6 +859,38 @@ Global
{35D002D7-C78B-44FB-92AA-104BEB431678}.Release|x86.ActiveCfg = Release|Any CPU
{35D002D7-C78B-44FB-92AA-104BEB431678}.Release|Debug.Build.0 = Release|Any CPU
{35D002D7-C78B-44FB-92AA-104BEB431678}.Release|Debug.ActiveCfg = Release|Any CPU
{17F4D7E0-6933-4C2E-8714-FD7E98D625D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{17F4D7E0-6933-4C2E-8714-FD7E98D625D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{17F4D7E0-6933-4C2E-8714-FD7E98D625D5}.Debug|Win32.Build.0 = Debug|Any CPU
{17F4D7E0-6933-4C2E-8714-FD7E98D625D5}.Debug|Win32.ActiveCfg = Debug|Any CPU
{17F4D7E0-6933-4C2E-8714-FD7E98D625D5}.Debug|x86.Build.0 = Debug|Any CPU
{17F4D7E0-6933-4C2E-8714-FD7E98D625D5}.Debug|x86.ActiveCfg = Debug|Any CPU
{17F4D7E0-6933-4C2E-8714-FD7E98D625D5}.Debug|Debug.Build.0 = Debug|Any CPU
{17F4D7E0-6933-4C2E-8714-FD7E98D625D5}.Debug|Debug.ActiveCfg = Debug|Any CPU
{17F4D7E0-6933-4C2E-8714-FD7E98D625D5}.Release|Any CPU.Build.0 = Release|Any CPU
{17F4D7E0-6933-4C2E-8714-FD7E98D625D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{17F4D7E0-6933-4C2E-8714-FD7E98D625D5}.Release|Win32.Build.0 = Release|Any CPU
{17F4D7E0-6933-4C2E-8714-FD7E98D625D5}.Release|Win32.ActiveCfg = Release|Any CPU
{17F4D7E0-6933-4C2E-8714-FD7E98D625D5}.Release|x86.Build.0 = Release|Any CPU
{17F4D7E0-6933-4C2E-8714-FD7E98D625D5}.Release|x86.ActiveCfg = Release|Any CPU
{17F4D7E0-6933-4C2E-8714-FD7E98D625D5}.Release|Debug.Build.0 = Release|Any CPU
{17F4D7E0-6933-4C2E-8714-FD7E98D625D5}.Release|Debug.ActiveCfg = Release|Any CPU
{83F15BA7-8478-4664-81BB-A82F146D88B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{83F15BA7-8478-4664-81BB-A82F146D88B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{83F15BA7-8478-4664-81BB-A82F146D88B3}.Debug|Win32.Build.0 = Debug|Any CPU
{83F15BA7-8478-4664-81BB-A82F146D88B3}.Debug|Win32.ActiveCfg = Debug|Any CPU
{83F15BA7-8478-4664-81BB-A82F146D88B3}.Debug|x86.Build.0 = Debug|Any CPU
{83F15BA7-8478-4664-81BB-A82F146D88B3}.Debug|x86.ActiveCfg = Debug|Any CPU
{83F15BA7-8478-4664-81BB-A82F146D88B3}.Debug|Debug.Build.0 = Debug|Any CPU
{83F15BA7-8478-4664-81BB-A82F146D88B3}.Debug|Debug.ActiveCfg = Debug|Any CPU
{83F15BA7-8478-4664-81BB-A82F146D88B3}.Release|Any CPU.Build.0 = Release|Any CPU
{83F15BA7-8478-4664-81BB-A82F146D88B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{83F15BA7-8478-4664-81BB-A82F146D88B3}.Release|Win32.Build.0 = Release|Any CPU
{83F15BA7-8478-4664-81BB-A82F146D88B3}.Release|Win32.ActiveCfg = Release|Any CPU
{83F15BA7-8478-4664-81BB-A82F146D88B3}.Release|x86.Build.0 = Release|Any CPU
{83F15BA7-8478-4664-81BB-A82F146D88B3}.Release|x86.ActiveCfg = Release|Any CPU
{83F15BA7-8478-4664-81BB-A82F146D88B3}.Release|Debug.Build.0 = Release|Any CPU
{83F15BA7-8478-4664-81BB-A82F146D88B3}.Release|Debug.ActiveCfg = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@ -882,6 +919,9 @@ Global @@ -882,6 +919,9 @@ Global
{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}
{6E3D4DBA-DBF9-4035-8F7E-1403975B21EA} = {39327899-ED91-4F7F-988C-4FE4E17C014D}
{83F15BA7-8478-4664-81BB-A82F146D88B3} = {6E3D4DBA-DBF9-4035-8F7E-1403975B21EA}
{17F4D7E0-6933-4C2E-8714-FD7E98D625D5} = {6E3D4DBA-DBF9-4035-8F7E-1403975B21EA}
{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}
@ -922,7 +962,6 @@ Global @@ -922,7 +962,6 @@ Global
{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}
{17F4D7E0-6933-4C2E-8714-FD7E98D625D5} = {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}

57
data/resources/StringResources.de.resx
Unescape View File

@ -524,6 +524,9 @@ Installieren Sie das .NET Framework SDK.</value> @@ -524,6 +524,9 @@ Installieren Sie das .NET Framework SDK.</value>
<data name="AddIns.Profiler.Options.General.DataCollection.SizeOfStorageDescription" xml:space="preserve">
<value>Größe des temporären Zwischenspeichers:</value>
</data>
<data name="AddIns.Profiler.Options.General.DataCollection.TrackEvents" xml:space="preserve">
<value>Ereignisse aufzeichnen</value>
</data>
<data name="AddIns.Profiler.Options.General.Title" xml:space="preserve">
<value>Allgemein</value>
</data>
@ -4264,6 +4267,9 @@ Alle Änderungen werden verworfen!</value> @@ -4264,6 +4267,9 @@ Alle Änderungen werden verworfen!</value>
<data name="ICSharpCode.SharpDevelop.Commands.SaveFileAs.FileSavedCaption" xml:space="preserve">
<value>Datei gespeichert</value>
</data>
<data name="ICSharpCode.SharpDevelop.Commands.TabStrip.NavigateToFileInProjectBrowser" xml:space="preserve">
<value>Datei im Projektexplorer markieren</value>
</data>
<data name="ICSharpCode.SharpDevelop.Commands.VBConvertProjectToCSharp" xml:space="preserve">
<value>Von VB.NET nach C#</value>
</data>
@ -4852,6 +4858,9 @@ In "Optionen-&gt;Visueller Stil" kann die Sprachumgebung neu eingestellt werden. @@ -4852,6 +4858,9 @@ In "Optionen-&gt;Visueller Stil" kann die Sprachumgebung neu eingestellt werden.
<data name="ICSharpCode.UnitTesting.TestMenu" xml:space="preserve">
<value>&amp;Test</value>
</data>
<data name="ICSharpCode.UnitTesting.TestRunnerNotFoundMessageFormat" xml:space="preserve">
<value>Die Unit Tests können nicht ausgeführt werden. Die Datei {0} kann nicht gefunden werden.</value>
</data>
<data name="ICSharpCode.WixBinding.AddCompilerExtensionsDialog.Title" xml:space="preserve">
<value>Erweiterungen hinzufügen</value>
</data>
@ -5081,6 +5090,36 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension< @@ -5081,6 +5090,36 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension<
<data name="ICSharpCode.WixBinding.WixVisualStudioExtensionTitle" xml:space="preserve">
<value>Visual Studio-Erweiterung</value>
</data>
<data name="ICSharpCode.WPFDesigner.ContextMenu.Copy" xml:space="preserve">
<value>Kopieren</value>
</data>
<data name="ICSharpCode.WPFDesigner.ContextMenu.Cut" xml:space="preserve">
<value>Ausschneiden</value>
</data>
<data name="ICSharpCode.WPFDesigner.ContextMenu.Outline" xml:space="preserve">
<value>Gliederung</value>
</data>
<data name="ICSharpCode.WPFDesigner.ContextMenu.Paste" xml:space="preserve">
<value>Einfügen</value>
</data>
<data name="ICSharpCode.WPFDesigner.ContextMenu.Properties" xml:space="preserve">
<value>Eigenschaften</value>
</data>
<data name="ICSharpCode.WPFDesigner.ContextMenu.Redo" xml:space="preserve">
<value>Wiederherstellen</value>
</data>
<data name="ICSharpCode.WPFDesigner.ContextMenu.Remove" xml:space="preserve">
<value>Entfernen</value>
</data>
<data name="ICSharpCode.WPFDesigner.ContextMenu.Tools" xml:space="preserve">
<value>Tools</value>
</data>
<data name="ICSharpCode.WPFDesigner.ContextMenu.Undo" xml:space="preserve">
<value>Rückgängig</value>
</data>
<data name="ICSharpCode.WPFDesigner.ContextMenu.ViewXAML" xml:space="preserve">
<value>XAML zeigen</value>
</data>
<data name="ICSharpCode.XmlEditor.AddAttributeDialog.CustomAttributeLabel" xml:space="preserve">
<value>Benutzerdefiniert:</value>
</data>
@ -5900,6 +5939,9 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension< @@ -5900,6 +5939,9 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension<
<data name="ProjectComponent.ContextMenu.Clean" xml:space="preserve">
<value>Säuber&amp;n</value>
</data>
<data name="ProjectComponent.ContextMenu.CollapseAll" xml:space="preserve">
<value>Alles einklappen</value>
</data>
<data name="ProjectComponent.ContextMenu.Delete.Question" xml:space="preserve">
<value>Soll '${FileName}' dauerhaft gelöscht werden?</value>
</data>
@ -6282,6 +6324,9 @@ Bitte einen anderen verwenden.</value> @@ -6282,6 +6324,9 @@ Bitte einen anderen verwenden.</value>
<data name="SharpDevelop.HexEditor.StreamAdded" xml:space="preserve">
<value>Stream hinzugefügt!</value>
</data>
<data name="SharpDevelop.Refactoring.BaseClassesOf" xml:space="preserve">
<value>Basisklassen von ${Name}</value>
</data>
<data name="SharpDevelop.Refactoring.CannotPerformOperationBecauseOfSyntaxErrors" xml:space="preserve">
<value>Die Operation kann nicht ausgeführt werden, weil Ihr Sourcecode Fehler enthält:</value>
</data>
@ -6321,9 +6366,15 @@ Bitte einen anderen verwenden.</value> @@ -6321,9 +6366,15 @@ Bitte einen anderen verwenden.</value>
<data name="SharpDevelop.Refactoring.ExtractInterfaceCommand" xml:space="preserve">
<value>Schnittstelle extrahieren</value>
</data>
<data name="SharpDevelop.Refactoring.FindBaseClassesCommand" xml:space="preserve">
<value>Finde Basisklassen</value>
</data>
<data name="SharpDevelop.Refactoring.FindDerivedClassesCommand" xml:space="preserve">
<value>Abgeleitete Typen finden</value>
</data>
<data name="SharpDevelop.Refactoring.FindDerivedClassesOrOverridesCommand" xml:space="preserve">
<value>Finde abgeleitete Symbole</value>
</data>
<data name="SharpDevelop.Refactoring.FindingReferences" xml:space="preserve">
<value>Suche Referenzen...</value>
</data>
@ -7226,6 +7277,12 @@ SharpDevelop 2 kompiliert Ressourcendateien anders: der Ressourcenname ist nicht @@ -7226,6 +7277,12 @@ SharpDevelop 2 kompiliert Ressourcendateien anders: der Ressourcenname ist nicht
<data name="Templates.Project.SharpDevelopMacro.Name" xml:space="preserve">
<value>"Extras"-Menüeintrag</value>
</data>
<data name="Templates.Project.SilverlightApplication.Description" xml:space="preserve">
<value>Ein Projekt für eine Silverlight Anwendung.</value>
</data>
<data name="Templates.Project.SilverlightApplication.Name" xml:space="preserve">
<value>Silverlight Anwendung</value>
</data>
<data name="Templates.Project.SysTrayIcon.Description" xml:space="preserve">
<value>Ein Projekt, das eine Anwendung mit einem NotifyIcon erstellt (Benachrichtigungssymbol auf der Taskleiste)</value>
</data>

15
data/resources/StringResources.es-mx.resx
Unescape View File

@ -4258,6 +4258,9 @@ Por favor configure la ubicación del archivo ejecutable de NAnt en las opciones @@ -4258,6 +4258,9 @@ Por favor configure la ubicación del archivo ejecutable de NAnt en las opciones
<data name="ICSharpCode.SharpDevelop.Commands.SaveFileAs.FileSavedCaption" xml:space="preserve">
<value>Archivo Guardado</value>
</data>
<data name="ICSharpCode.SharpDevelop.Commands.TabStrip.NavigateToFileInProjectBrowser" xml:space="preserve">
<value>Navegar al archivo en el explorador de proyectos.</value>
</data>
<data name="ICSharpCode.SharpDevelop.Commands.VBConvertProjectToCSharp" xml:space="preserve">
<value>De VB.NET a C#</value>
</data>
@ -4844,6 +4847,9 @@ Vaya a 'Opciones-&gt;Estilo Visual' y cambie el lenguaje del ambiente.</value> @@ -4844,6 +4847,9 @@ Vaya a 'Opciones-&gt;Estilo Visual' y cambie el lenguaje del ambiente.</value>
<data name="ICSharpCode.UnitTesting.TestMenu" xml:space="preserve">
<value>&amp;Pruebas</value>
</data>
<data name="ICSharpCode.UnitTesting.TestRunnerNotFoundMessageFormat" xml:space="preserve">
<value>No se pudieron ejecutar los test de unidad. El archivo '{0}' no se pudo encontrar.</value>
</data>
<data name="ICSharpCode.WixBinding.AddCompilerExtensionsDialog.Title" xml:space="preserve">
<value>Agregar Extensiones</value>
</data>
@ -5922,6 +5928,9 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension< @@ -5922,6 +5928,9 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension<
<data name="ProjectComponent.ContextMenu.Clean" xml:space="preserve">
<value>Li&amp;mpiar</value>
</data>
<data name="ProjectComponent.ContextMenu.CollapseAll" xml:space="preserve">
<value>Colapsar todo.</value>
</data>
<data name="ProjectComponent.ContextMenu.Delete.Question" xml:space="preserve">
<value>¿Eliminar '${FileName}' permanentemente?</value>
</data>
@ -7254,6 +7263,12 @@ Los archivos de recursos han sido renombrados/movidos convenientemente.</value> @@ -7254,6 +7263,12 @@ Los archivos de recursos han sido renombrados/movidos convenientemente.</value>
<data name="Templates.Project.SharpDevelopMacro.Name" xml:space="preserve">
<value>Entrada para el menú Herramientas</value>
</data>
<data name="Templates.Project.SilverlightApplication.Description" xml:space="preserve">
<value>Un proyecto que crea una aplicación SilverLight.</value>
</data>
<data name="Templates.Project.SilverlightApplication.Name" xml:space="preserve">
<value>Aplicación SilverLight.</value>
</data>
<data name="Templates.Project.SysTrayIcon.Description" xml:space="preserve">
<value>Un proyecto que crea una aplicación con un icono en la bandeja del sistema.</value>
</data>

15
data/resources/StringResources.es.resx
Unescape View File

@ -4260,6 +4260,9 @@ Se perderán todos los cambios.</value> @@ -4260,6 +4260,9 @@ Se perderán todos los cambios.</value>
<data name="ICSharpCode.SharpDevelop.Commands.SaveFileAs.FileSavedCaption" xml:space="preserve">
<value>Archivo Guardado</value>
</data>
<data name="ICSharpCode.SharpDevelop.Commands.TabStrip.NavigateToFileInProjectBrowser" xml:space="preserve">
<value>Navegar al archivo en el explorador de proyectos.</value>
</data>
<data name="ICSharpCode.SharpDevelop.Commands.VBConvertProjectToCSharp" xml:space="preserve">
<value>De VB.NET a C#</value>
</data>
@ -4847,6 +4850,9 @@ Vaya a 'Opciones-&gt;Estilo Visual' y cambie el lenguaje del ambiente.</value> @@ -4847,6 +4850,9 @@ Vaya a 'Opciones-&gt;Estilo Visual' y cambie el lenguaje del ambiente.</value>
<data name="ICSharpCode.UnitTesting.TestMenu" xml:space="preserve">
<value>&amp;Pruebas</value>
</data>
<data name="ICSharpCode.UnitTesting.TestRunnerNotFoundMessageFormat" xml:space="preserve">
<value>No se pudieron ejecutar los test de unidad. El archivo '{0}' no se pudo encontrar.</value>
</data>
<data name="ICSharpCode.WixBinding.AddCompilerExtensionsDialog.Title" xml:space="preserve">
<value>Agregar Extensiones</value>
</data>
@ -5925,6 +5931,9 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension< @@ -5925,6 +5931,9 @@ Microsoft.Tools.WindowsInstallerXml.Extensions.NetFxCompiler, WixNetFxExtension<
<data name="ProjectComponent.ContextMenu.Clean" xml:space="preserve">
<value>Li&amp;mpiar</value>
</data>
<data name="ProjectComponent.ContextMenu.CollapseAll" xml:space="preserve">
<value>Colapsar todo.</value>
</data>
<data name="ProjectComponent.ContextMenu.Delete.Question" xml:space="preserve">
<value>¿Eliminar '${FileName}' permanentemente?</value>
</data>
@ -7258,6 +7267,12 @@ Los archivos de recursos han sido renombrados o cambiados de ubicación de acuer @@ -7258,6 +7267,12 @@ Los archivos de recursos han sido renombrados o cambiados de ubicación de acuer
<data name="Templates.Project.SharpDevelopMacro.Name" xml:space="preserve">
<value>Entrada para menú Herramientas</value>
</data>
<data name="Templates.Project.SilverlightApplication.Description" xml:space="preserve">
<value>Un proyecto que crea una aplicación SilverLight.</value>
</data>
<data name="Templates.Project.SilverlightApplication.Name" xml:space="preserve">
<value>Aplicación SilverLight.</value>
</data>
<data name="Templates.Project.SysTrayIcon.Description" xml:space="preserve">
<value>Un proyecto que crea una aplicación con un icono en la bandeja del sistema.</value>
</data>

6
data/resources/StringResources.fr.resx
Unescape View File

@ -523,6 +523,9 @@ Téléchargez un AddIn depuis l'Internet, cliquez ensuite sur 'Installer un AddI @@ -523,6 +523,9 @@ Téléchargez un AddIn depuis l'Internet, cliquez ensuite sur 'Installer un AddI
<data name="AddIns.Profiler.Options.General.DataCollection.SizeOfStorageDescription" xml:space="preserve">
<value>Taille du fichier de stockage temporaire:</value>
</data>
<data name="AddIns.Profiler.Options.General.DataCollection.TrackEvents" xml:space="preserve">
<value>Suivi d'événements</value>
</data>
<data name="AddIns.Profiler.Options.General.Title" xml:space="preserve">
<value>Général</value>
</data>
@ -4843,6 +4846,9 @@ Allez dans 'Outils/Options-&gt;Style Visuel pour changer l'ambiance actuelle.</v @@ -4843,6 +4846,9 @@ Allez dans 'Outils/Options-&gt;Style Visuel pour changer l'ambiance actuelle.</v
<data name="ICSharpCode.UnitTesting.TestMenu" xml:space="preserve">
<value>&amp;Test</value>
</data>
<data name="ICSharpCode.UnitTesting.TestRunnerNotFoundMessageFormat" xml:space="preserve">
<value>Impossible de lancer les tests unitaires, fichier {0} introuvable.</value>
</data>
<data name="ICSharpCode.WixBinding.AddCompilerExtensionsDialog.Title" xml:space="preserve">
<value>Ajouter des extensions</value>
</data>

6
data/resources/StringResources.nl.resx
Unescape View File

@ -523,6 +523,9 @@ Om het help systeem te verkrijgen dient u de .NET Framework SDK te installeren.< @@ -523,6 +523,9 @@ Om het help systeem te verkrijgen dient u de .NET Framework SDK te installeren.<
<data name="AddIns.Profiler.Options.General.DataCollection.SizeOfStorageDescription" xml:space="preserve">
<value>Grootte van tijdelijke opslag bestanden</value>
</data>
<data name="AddIns.Profiler.Options.General.DataCollection.TrackEvents" xml:space="preserve">
<value>Volg gebeurtenissen</value>
</data>
<data name="AddIns.Profiler.Options.General.Title" xml:space="preserve">
<value>Algemeen</value>
</data>
@ -4844,6 +4847,9 @@ Ga naar 'Opties-&gt;Vormgeving' en wijzig de momentele taal ambience.</value> @@ -4844,6 +4847,9 @@ Ga naar 'Opties-&gt;Vormgeving' en wijzig de momentele taal ambience.</value>
<data name="ICSharpCode.UnitTesting.TestMenu" xml:space="preserve">
<value>&amp;Testen</value>
</data>
<data name="ICSharpCode.UnitTesting.TestRunnerNotFoundMessageFormat" xml:space="preserve">
<value>Unittesten kunnen niet uitgevoerd omdat het bestand '{0}' niet gevonden wordt.</value>
</data>
<data name="ICSharpCode.WixBinding.AddCompilerExtensionsDialog.Title" xml:space="preserve">
<value>Extensies toevoegen</value>
</data>

21
data/resources/StringResources.pt-br.resx
Unescape View File

@ -237,6 +237,9 @@ @@ -237,6 +237,9 @@
<data name="AddIns.HelpViewer.DisplayContentsCommand" xml:space="preserve">
<value>Mostra Conteudo</value>
</data>
<data name="AddIns.HelpViewer.DisplaySearchCommand" xml:space="preserve">
<value>Pesquisar</value>
</data>
<data name="AddIns.HelpViewer.HelpLibraryRootTitle" xml:space="preserve">
<value>Biblioteca de ajuda</value>
</data>
@ -252,6 +255,15 @@ @@ -252,6 +255,15 @@
<data name="AddIns.HelpViewer.OfflineFeatureRequestMsg" xml:space="preserve">
<value>Você solicitou um recurso desconectado, no modo de ajuda conectado. Você tem que mudar o modo para utilizar esta funcionalidade.</value>
</data>
<data name="AddIns.HelpViewer.SearchDoSearchButton" xml:space="preserve">
<value>Pesquisar</value>
</data>
<data name="AddIns.HelpViewer.SearchLookForLabel" xml:space="preserve">
<value>Procurar por:</value>
</data>
<data name="AddIns.HelpViewer.SearchPadTitle" xml:space="preserve">
<value>Pesquisar</value>
</data>
<data name="AddIns.HelpViewer.ShowErrorHelpTitle" xml:space="preserve">
<value>Mostra Ajuda</value>
</data>
@ -511,6 +523,9 @@ Voce precisa instalar o .Net Framework SDK para acessar o sistema de ajuda.</val @@ -511,6 +523,9 @@ Voce precisa instalar o .Net Framework SDK para acessar o sistema de ajuda.</val
<data name="AddIns.Profiler.Options.General.DataCollection.SizeOfStorageDescription" xml:space="preserve">
<value>Tamanho do arquivo temporario de armazenamento:</value>
</data>
<data name="AddIns.Profiler.Options.General.DataCollection.TrackEvents" xml:space="preserve">
<value>Registrar eventos</value>
</data>
<data name="AddIns.Profiler.Options.General.Title" xml:space="preserve">
<value>Geral</value>
</data>
@ -673,6 +688,12 @@ Voce precisa instalar o .Net Framework SDK para acessar o sistema de ajuda.</val @@ -673,6 +688,12 @@ Voce precisa instalar o .Net Framework SDK para acessar o sistema de ajuda.</val
<data name="AddIns.SharpRefactoring.InsertCtor.VariableLabel" xml:space="preserve">
<value>Variavel</value>
</data>
<data name="AddIns.SharpRefactoring.IntroduceMethod" xml:space="preserve">
<value>Introduzir método {0} em {1}</value>
</data>
<data name="AddIns.SourceAnalysis.CheckWithStyleCop" xml:space="preserve">
<value>Verificar com StyleCop</value>
</data>
<data name="AddIns.Subversion.AddToIgnoreList" xml:space="preserve">
<value>Adicionar a lista ignore.</value>
</data>

6
data/resources/StringResources.resx
Unescape View File

@ -232,6 +232,9 @@ Download an AddIn from the Internet, then click 'Install AddIn' and choose the d @@ -232,6 +232,9 @@ Download an AddIn from the Internet, then click 'Install AddIn' and choose the d
<data name="AddIns.ClassDiagram.ShowClassDiagram" xml:space="preserve">
<value>Show Class Diagram</value>
</data>
<data name="AddIns.Git.TortoiseGitRequired" xml:space="preserve">
<value>TortoiseGit needs to be installed to execute this action.</value>
</data>
<data name="AddIns.HelpViewer.ContentsPadTitle" xml:space="preserve">
<value>Contents</value>
</data>
@ -525,6 +528,9 @@ You need to install the .NET Framework SDK to get the help system.</value> @@ -525,6 +528,9 @@ You need to install the .NET Framework SDK to get the help system.</value>
<data name="AddIns.Profiler.Options.General.DataCollection.SizeOfStorageDescription" xml:space="preserve">
<value>Size of temporary storage file:</value>
</data>
<data name="AddIns.Profiler.Options.General.DataCollection.TrackEvents" xml:space="preserve">
<value>Trace events</value>
</data>
<data name="AddIns.Profiler.Options.General.Title" xml:space="preserve">
<value>General</value>
</data>

4
doc/ChangeLog.template.html
Unescape View File

@ -8,10 +8,10 @@ @@ -8,10 +8,10 @@
<ul>
<li>Update IronRuby to version 1.1</li>
<li>Update NUnit to version 2.5.7</li>
<li>Added <a href="http://git-scm.com/">Git</a> AddIn</li>
</ul>
</p>
<!-- Don't show these entries on 3.x branch
<p>
SharpDevelop 4.0 Beta 2 [4.0.0.6361] (08/01/2010)
<ul>
@ -50,7 +50,7 @@ @@ -50,7 +50,7 @@
<li>Custom unit test runners and IronPython unit test support</li>
<li>Compiling w/out installed SDK</li>
</ul>
</p>-->
</p>
<p>
SharpDevelop 3.2 [3.2.0.5777] (05/08/2010)

2
src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/AddInHelper.cs
Unescape View File

@ -33,7 +33,7 @@ namespace PythonBinding.Tests.Utils @@ -33,7 +33,7 @@ namespace PythonBinding.Tests.Utils
/// <summary>
/// Gets the codon with the specified name.
/// </summary>
public static Codon GetCodon(List<Codon> codons, string name)
public static Codon GetCodon(IEnumerable<Codon> codons, string name)
{
foreach (Codon codon in codons) {
if (codon.Id == name) {

2
src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/AddInHelper.cs
Unescape View File

@ -33,7 +33,7 @@ namespace RubyBinding.Tests.Utils @@ -33,7 +33,7 @@ namespace RubyBinding.Tests.Utils
/// <summary>
/// Gets the codon with the specified name.
/// </summary>
public static Codon GetCodon(List<Codon> codons, string name)
public static Codon GetCodon(IEnumerable<Codon> codons, string name)
{
foreach (Codon codon in codons) {
if (codon.Id == name) {

1
src/AddIns/Debugger/Debugger.Tests/Tests/ExpressionEvaluator_Tests.cs
Unescape View File

@ -205,6 +205,7 @@ namespace Debugger.Tests { @@ -205,6 +205,7 @@ namespace Debugger.Tests {
";
[NUnit.Framework.Test]
[NUnit.Framework.Ignore("Test fails randomly (race condition)")]
public void ExpressionEvaluator_Tests()
{
StartTest();

10
src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Snippets/CodeSnippet.cs
Unescape View File

@ -25,7 +25,7 @@ namespace ICSharpCode.AvalonEdit.AddIn.Snippets @@ -25,7 +25,7 @@ namespace ICSharpCode.AvalonEdit.AddIn.Snippets
/// </summary>
public class CodeSnippet : INotifyPropertyChanged, IEquatable<CodeSnippet>
{
string name, description, text, keyword;
string name = string.Empty, description = string.Empty, text = string.Empty, keyword = string.Empty;
public CodeSnippet()
{
@ -43,7 +43,7 @@ namespace ICSharpCode.AvalonEdit.AddIn.Snippets @@ -43,7 +43,7 @@ namespace ICSharpCode.AvalonEdit.AddIn.Snippets
get { return name; }
set {
if (name != value) {
name = value;
name = value ?? string.Empty;
OnPropertyChanged("Name");
}
}
@ -53,7 +53,7 @@ namespace ICSharpCode.AvalonEdit.AddIn.Snippets @@ -53,7 +53,7 @@ namespace ICSharpCode.AvalonEdit.AddIn.Snippets
get { return text; }
set {
if (text != value) {
text = value;
text = value ?? string.Empty;
OnPropertyChanged("Text");
}
}
@ -63,7 +63,7 @@ namespace ICSharpCode.AvalonEdit.AddIn.Snippets @@ -63,7 +63,7 @@ namespace ICSharpCode.AvalonEdit.AddIn.Snippets
get { return description; }
set {
if (description != value) {
description = value;
description = value ?? string.Empty;
OnPropertyChanged("Description");
}
}
@ -81,7 +81,7 @@ namespace ICSharpCode.AvalonEdit.AddIn.Snippets @@ -81,7 +81,7 @@ namespace ICSharpCode.AvalonEdit.AddIn.Snippets
get { return keyword; }
set {
if (keyword != value) {
keyword = value;
keyword = value ?? string.Empty;
OnPropertyChanged("Keyword");
}
}

28
src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Snippets/SnippetManager.cs
Unescape View File

@ -304,43 +304,39 @@ End Property${Caret}", @@ -304,43 +304,39 @@ End Property${Caret}",
var merged = group.Snippets.Concat(
defaultGroup.Snippets.Except(
group.Snippets,
new PredicateComparer<CodeSnippet>((x, y) => x.Name == y.Name, x => x.Name.GetHashCode())
).Select(s => new CodeSnippet(s))
new ByMemberComparer<CodeSnippet, string>(s => s.Name)
).Select(s => new CodeSnippet(s)) // clone snippets so that defaultGroup is not modified
).OrderBy(s => s.Name).ToList();
group.Snippets.Clear();
group.Snippets.AddRange(merged);
}
}
foreach (var group in defaultSnippets.Except(savedSnippets, new PredicateComparer<CodeSnippetGroup>(
(x, y) => x.Extensions == y.Extensions,
x => x.Extensions.GetHashCode()
))) {
foreach (var group in defaultSnippets.Except(savedSnippets, new ByMemberComparer<CodeSnippetGroup, string>(g => g.Extensions))) {
savedSnippets.Add(group);
}
return savedSnippets;
}
class PredicateComparer<T> : IEqualityComparer<T>
sealed class ByMemberComparer<TObject, TMember> : IEqualityComparer<TObject>
{
Func<T, T, bool> equalsFunc;
Func<T, int> getHashCodeFunc;
readonly Func<TObject, TMember> selector;
readonly IEqualityComparer<TMember> memberComparer = EqualityComparer<TMember>.Default;
public PredicateComparer(Func<T, T, bool> equalsFunc, Func<T, int> getHashCodeFunc)
public ByMemberComparer(Func<TObject, TMember> selector)
{
this.equalsFunc = equalsFunc;
this.getHashCodeFunc = getHashCodeFunc;
this.selector = selector;
}
public bool Equals(T x, T y)
public bool Equals(TObject x, TObject y)
{
return equalsFunc(x, y);
return memberComparer.Equals(selector(x), selector(y));
}
public int GetHashCode(T obj)
public int GetHashCode(TObject obj)
{
return getHashCodeFunc(obj);
return memberComparer.GetHashCode(selector(obj));
}
}

13
src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Snippets/SnippetOptionPanel.cs
Unescape View File

@ -49,6 +49,13 @@ namespace ICSharpCode.AvalonEdit.AddIn.Snippets @@ -49,6 +49,13 @@ namespace ICSharpCode.AvalonEdit.AddIn.Snippets
public bool SaveOptions()
{
CodeSnippet emptySnippet = new CodeSnippet();
foreach (CodeSnippetGroup g in groups) {
for (int i = 0; i < g.Snippets.Count; i++) {
if (emptySnippet.Equals(g.Snippets[i]))
g.Snippets.RemoveAt(i--);
}
}
SnippetManager.Instance.SaveGroups(groups);
return true;
}
@ -56,9 +63,9 @@ namespace ICSharpCode.AvalonEdit.AddIn.Snippets @@ -56,9 +63,9 @@ namespace ICSharpCode.AvalonEdit.AddIn.Snippets
void AddGroupButton_Click(object sender, RoutedEventArgs e)
{
string result = MessageService.ShowInputBox(
"${res:Dialog.Options.CodeTemplate.AddGroupLabel}",
"${res:Dialog.Options.CodeTemplate.EditGroupDialog.Text}",
"");
"${res:Dialog.Options.CodeTemplate.AddGroupLabel}",
"${res:Dialog.Options.CodeTemplate.EditGroupDialog.Text}",
"");
if (!string.IsNullOrEmpty(result)) {
CodeSnippetGroup g = new CodeSnippetGroup();
g.Extensions = result;

112
src/AddIns/Misc/Reports/SharpDevelop.Reports.sln
Unescape View File

@ -1,29 +1,27 @@ @@ -1,29 +1,27 @@

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
# SharpDevelop 4.0.0.5779
# SharpDevelop 4.0.0.6315
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SharpDevelop", "SharpDevelop", "{256F5C28-532C-44C0-8AB8-D8EC5E492E01}"
ProjectSection(SolutionItems) = postProject
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core", "..\..\..\Main\Core\Project\ICSharpCode.Core.csproj", "{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core.Presentation", "..\..\..\Main\ICSharpCode.Core.Presentation\ICSharpCode.Core.Presentation.csproj", "{7E4A7172-7FF5-48D0-B719-7CD959DD1AC9}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.AvalonEdit", "..\..\..\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}") = "ICSharpCode.Core.WinForms", "..\..\..\Main\ICSharpCode.Core.WinForms\ICSharpCode.Core.WinForms.csproj", "{857CA1A3-FC88-4BE0-AB6A-D1EE772AB288}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactory", "..\..\..\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}") = "ICSharpCode.SharpDevelop.Dom", "..\..\..\Main\ICSharpCode.SharpDevelop.Dom\Project\ICSharpCode.SharpDevelop.Dom.csproj", "{924EE450-603D-49C1-A8E5-4AFAA31CE6F3}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartUp", "..\..\..\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.Sda", "..\..\..\Main\ICSharpCode.SharpDevelop.Sda\ICSharpCode.SharpDevelop.Sda.csproj", "{80318B5F-A25D-45AB-8A95-EF31D2370A4C}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Widgets", "..\..\..\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
@ -33,55 +31,52 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop", @@ -33,55 +31,52 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop",
{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Widgets", "..\..\..\Main\ICSharpCode.SharpDevelop.Widgets\Project\ICSharpCode.SharpDevelop.Widgets.csproj", "{8035765F-D51F-4A0C-A746-2FD100E19419}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Sda", "..\..\..\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}") = "StartUp", "..\..\..\Main\StartUp\Project\StartUp.csproj", "{1152B71B-3C05-4598-B20D-823B5D40559E}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Dom", "..\..\..\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}") = "NRefactory", "..\..\..\Libraries\NRefactory\Project\NRefactory.csproj", "{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core.WinForms", "..\..\..\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}") = "AvalonDock", "..\..\..\Libraries\AvalonDock\AvalonDock.csproj", "{2FF700C2-A38A-48BD-A637-8CAFD4FE6237}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.AvalonEdit", "..\..\..\Libraries\AvalonEdit\ICSharpCode.AvalonEdit\ICSharpCode.AvalonEdit.csproj", "{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core.Presentation", "..\..\..\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.TextEditor", "..\..\..\Libraries\ICSharpCode.TextEditor\Project\ICSharpCode.TextEditor.csproj", "{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}"
ProjectSection(ProjectDependencies) = postProject
{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}
EndProjectSection
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core", "..\..\..\Main\Core\Project\ICSharpCode.Core.csproj", "{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AvalonDock", "..\..\..\Libraries\AvalonDock\AvalonDock\AvalonDock.csproj", "{87E61430-4243-45F2-B74E-0A4C096CEBF3}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Reports", "Reports", "{F3DAFD3D-361A-4CCE-BA52-39401D4A78FC}"
ProjectSection(SolutionItems) = postProject
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Reports.Addin.Test", "ICSharpCode.Reports.Addin\Test\ICSharpCode.Reports.Addin.Test.csproj", "{2B232C7E-CFB6-4B73-A1B8-134A8A2ED4F7}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Reports.Core", "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}") = "ICSharpCode.Reports.Core.Test", "ICSharpCode.Reports.Core\Test\ICSharpCode.Reports.Core.Test\ICSharpCode.Reports.Core.Test.csproj", "{E16B73CA-3603-47EE-915E-6F8B2A07304B}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Irony", "Irony\Irony.csproj", "{D81F5C91-D7DB-46E5-BC99-49488FB6814C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Reports.Addin", "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}") = "ICSharpCode.Reports.Addin", "ICSharpCode.Reports.Addin\ICSharpCode.Reports.Addin.csproj", "{35D002D7-C78B-44FB-92AA-104BEB431678}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Reports.Core.Test", "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}") = "Irony", "Irony\Irony.csproj", "{D81F5C91-D7DB-46E5-BC99-49488FB6814C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Reports.Core", "ICSharpCode.Reports.Core\ICSharpCode.Reports.Core.csproj", "{4B2239FF-8FD6-431D-9D22-1B8049BA6917}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Reports.Addin.Test", "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
@ -90,32 +85,32 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Data", "Data", "{C7F29FC2-1 @@ -90,32 +85,32 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Data", "Data", "{C7F29FC2-1
ProjectSection(SolutionItems) = postProject
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.SQLServer", "..\..\DisplayBindings\Data\ICSharpCode.Data.SQLServer\ICSharpCode.Data.SQLServer.csproj", "{AFE34868-AFA1-4E1C-9450-47AB4BE329D5}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.Addin", "..\..\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}") = "ICSharpCode.Data.EDMDesigner.Core.UI", "..\..\DisplayBindings\Data\ICSharpCode.Data.EDMDesigner.Core.UI\ICSharpCode.Data.EDMDesigner.Core.UI.csproj", "{EEF5E054-4192-4A57-8FBF-E860D808A51D}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.Core", "..\..\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}") = "ICSharpCode.Data.EDMDesigner.Core", "..\..\DisplayBindings\Data\ICSharpCode.Data.EDMDesigner.Core\ICSharpCode.Data.EDMDesigner.Core.csproj", "{5C70D6AB-0A33-43F9-B8B5-54558C35BBB1}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.Core.UI", "..\..\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.Data.Core.UI", "..\..\DisplayBindings\Data\ICSharpCode.Data.Core.UI\ICSharpCode.Data.Core.UI.csproj", "{BAD94D6E-4159-4CB6-B991-486F412D9BB6}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.EDMDesigner.Core", "..\..\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}") = "ICSharpCode.Data.Core", "..\..\DisplayBindings\Data\ICSharpCode.Data.Core\ICSharpCode.Data.Core.csproj", "{B7823AE9-4B43-4859-8796-2EBDC116FBB8}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.EDMDesigner.Core.UI", "..\..\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}") = "ICSharpCode.Data.Addin", "..\..\DisplayBindings\Data\ICSharpCode.Data.Addin\ICSharpCode.Data.Addin.csproj", "{A9F12710-24E4-46D4-832C-6ECB395B9EAD}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Data.SQLServer", "..\..\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
@ -164,18 +159,10 @@ Global @@ -164,18 +159,10 @@ Global
{1152B71B-3C05-4598-B20D-823B5D40559E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1152B71B-3C05-4598-B20D-823B5D40559E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1152B71B-3C05-4598-B20D-823B5D40559E}.Release|Any CPU.Build.0 = Release|Any CPU
{2FF700C2-A38A-48BD-A637-8CAFD4FE6237}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2FF700C2-A38A-48BD-A637-8CAFD4FE6237}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2FF700C2-A38A-48BD-A637-8CAFD4FE6237}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2FF700C2-A38A-48BD-A637-8CAFD4FE6237}.Release|Any CPU.Build.0 = Release|Any CPU
{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}.Release|Any CPU.Build.0 = Release|Any CPU
{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}.Release|Any CPU.Build.0 = Release|Any CPU
{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{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
@ -268,33 +255,44 @@ Global @@ -268,33 +255,44 @@ Global
{2B232C7E-CFB6-4B73-A1B8-134A8A2ED4F7}.Release|Win32.ActiveCfg = Release|Any CPU
{2B232C7E-CFB6-4B73-A1B8-134A8A2ED4F7}.Release|x86.Build.0 = Release|Any CPU
{2B232C7E-CFB6-4B73-A1B8-134A8A2ED4F7}.Release|x86.ActiveCfg = Release|Any CPU
{87E61430-4243-45F2-B74E-0A4C096CEBF3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{87E61430-4243-45F2-B74E-0A4C096CEBF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{87E61430-4243-45F2-B74E-0A4C096CEBF3}.Debug|Win32.Build.0 = Debug|Any CPU
{87E61430-4243-45F2-B74E-0A4C096CEBF3}.Debug|Win32.ActiveCfg = Debug|Any CPU
{87E61430-4243-45F2-B74E-0A4C096CEBF3}.Debug|x86.Build.0 = Debug|Any CPU
{87E61430-4243-45F2-B74E-0A4C096CEBF3}.Debug|x86.ActiveCfg = Debug|Any CPU
{87E61430-4243-45F2-B74E-0A4C096CEBF3}.Release|Any CPU.Build.0 = Release|Any CPU
{87E61430-4243-45F2-B74E-0A4C096CEBF3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{87E61430-4243-45F2-B74E-0A4C096CEBF3}.Release|Win32.Build.0 = Release|Any CPU
{87E61430-4243-45F2-B74E-0A4C096CEBF3}.Release|Win32.ActiveCfg = Release|Any CPU
{87E61430-4243-45F2-B74E-0A4C096CEBF3}.Release|x86.Build.0 = Release|Any CPU
{87E61430-4243-45F2-B74E-0A4C096CEBF3}.Release|x86.ActiveCfg = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
{2FF700C2-A38A-48BD-A637-8CAFD4FE6237} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
{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}
{87E61430-4243-45F2-B74E-0A4C096CEBF3} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
{4B2239FF-8FD6-431D-9D22-1B8049BA6917} = {F3DAFD3D-361A-4CCE-BA52-39401D4A78FC}
{D81F5C91-D7DB-46E5-BC99-49488FB6814C} = {F3DAFD3D-361A-4CCE-BA52-39401D4A78FC}
{35D002D7-C78B-44FB-92AA-104BEB431678} = {F3DAFD3D-361A-4CCE-BA52-39401D4A78FC}
{E16B73CA-3603-47EE-915E-6F8B2A07304B} = {F3DAFD3D-361A-4CCE-BA52-39401D4A78FC}
{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}
{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1} = {256F5C28-532C-44C0-8AB8-D8EC5E492E01}
{2B232C7E-CFB6-4B73-A1B8-134A8A2ED4F7} = {F3DAFD3D-361A-4CCE-BA52-39401D4A78FC}
{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}
{E16B73CA-3603-47EE-915E-6F8B2A07304B} = {F3DAFD3D-361A-4CCE-BA52-39401D4A78FC}
{35D002D7-C78B-44FB-92AA-104BEB431678} = {F3DAFD3D-361A-4CCE-BA52-39401D4A78FC}
{D81F5C91-D7DB-46E5-BC99-49488FB6814C} = {F3DAFD3D-361A-4CCE-BA52-39401D4A78FC}
{4B2239FF-8FD6-431D-9D22-1B8049BA6917} = {F3DAFD3D-361A-4CCE-BA52-39401D4A78FC}
{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}
EndGlobalSection
EndGlobal

36
src/AddIns/Misc/SharpRefactoring/Project/Src/ContextActions/AddUsing.cs
Unescape View File

@ -21,50 +21,41 @@ namespace SharpRefactoring.ContextActions @@ -21,50 +21,41 @@ namespace SharpRefactoring.ContextActions
public class AddUsingProvider : ContextActionsProvider
{
public override IEnumerable<IContextAction> GetAvailableActions(EditorContext context)
{
foreach (var contextAction in GetAddUsingContextActions(context.CurrentSymbol, context.Editor, context.CurrentExpression.Context)) {
yield return contextAction;
}
}
IEnumerable<IContextAction> GetAddUsingContextActions(ResolveResult symbol, ITextEditor editor, ExpressionContext exprContext)
{
// class
foreach (var addUsingAction in RefactoringService.GetAddUsingActions(symbol,editor)) {
foreach (var addUsingAction in RefactoringService.GetAddUsingActions(context.CurrentSymbol, context.Editor)) {
yield return addUsingAction;
}
// extension method
if (exprContext != ExpressionContext.Attribute) {
foreach (var addUsingAction in GetAddUsingExtensionMethodActions(symbol, editor)) {
if (context.CurrentExpression.Context != ExpressionContext.Attribute) {
foreach (var addUsingAction in GetAddUsingExtensionMethodActions(context)) {
yield return addUsingAction;
}
}
// attribute
if (exprContext == ExpressionContext.Attribute) {
foreach (var addUsingAction in GetAddUsingAttributeActions(symbol, editor)) {
if (context.CurrentExpression.Context == ExpressionContext.Attribute) {
foreach (var addUsingAction in GetAddUsingAttributeActions(context)) {
yield return addUsingAction;
}
}
}
#region Extension method
IEnumerable<IContextAction> GetAddUsingExtensionMethodActions(ResolveResult symbol, ITextEditor editor)
IEnumerable<IContextAction> GetAddUsingExtensionMethodActions(EditorContext context)
{
if (!(symbol is UnknownMethodResolveResult))
UnknownMethodResolveResult rr = context.CurrentSymbol as UnknownMethodResolveResult;
if (rr == null)
yield break;
UnknownMethodResolveResult rr = symbol as UnknownMethodResolveResult;
List<IClass> results = new List<IClass>();
IProjectContent pc = rr.CallingClass.ProjectContent;
IProjectContent pc = context.ProjectContent;
SearchAllExtensionMethodsWithName(results, pc, rr.CallName);
foreach (IProjectContent content in pc.ReferencedContents)
SearchAllExtensionMethodsWithName(results, content, rr.CallName);
if (!results.Any())
yield break;
foreach (IClass c in results) {
yield return new RefactoringService.AddUsingAction(rr.CallingClass.CompilationUnit, editor, c.Namespace);
yield return new RefactoringService.AddUsingAction(context.CurrentParseInformation.CompilationUnit, context.Editor, c.Namespace);
}
}
@ -79,14 +70,15 @@ namespace SharpRefactoring.ContextActions @@ -79,14 +70,15 @@ namespace SharpRefactoring.ContextActions
#endregion
#region Attribute
IEnumerable<IContextAction> GetAddUsingAttributeActions(ResolveResult symbol, ITextEditor editor)
IEnumerable<IContextAction> GetAddUsingAttributeActions(EditorContext context)
{
ResolveResult symbol = context.CurrentSymbol;
if (!(symbol is UnknownIdentifierResolveResult || symbol is UnknownMethodResolveResult))
yield break;
List<IClass> results = new List<IClass>();
ParseInformation info = ParserService.GetParseInformation(editor.FileName);
ParseInformation info = context.CurrentParseInformation;
if (info == null || info.CompilationUnit == null || info.CompilationUnit.ProjectContent == null)
yield break;
ICompilationUnit unit = info.CompilationUnit;
@ -103,7 +95,7 @@ namespace SharpRefactoring.ContextActions @@ -103,7 +95,7 @@ namespace SharpRefactoring.ContextActions
}
foreach (IClass c in results) {
yield return new RefactoringService.AddUsingAction(unit, editor, c.Namespace);
yield return new RefactoringService.AddUsingAction(unit, context.Editor, c.Namespace);
}
}

3
src/AddIns/Misc/SharpRefactoring/Project/Src/Extensions.cs
Unescape View File

@ -52,7 +52,8 @@ namespace SharpRefactoring @@ -52,7 +52,8 @@ namespace SharpRefactoring
{
if (rt == null)
return false;
return IsUserCode(rt.GetUnderlyingClass());
IClass c = rt.GetUnderlyingClass();
return c != null && IsUserCode(c);
}
public static bool IsUserCode(this IClass c)

10
src/AddIns/Misc/SharpRefactoring/Project/Src/MenuItemFactories/ResolveExtensionMethod.cs
Unescape View File

@ -28,6 +28,8 @@ namespace SharpRefactoring @@ -28,6 +28,8 @@ namespace SharpRefactoring
return null;
if (!(context.ResolveResult is UnknownMethodResolveResult))
return null;
if (context.ProjectContent == null)
return null;
UnknownMethodResolveResult rr = context.ResolveResult as UnknownMethodResolveResult;
@ -38,11 +40,9 @@ namespace SharpRefactoring @@ -38,11 +40,9 @@ namespace SharpRefactoring
List<IClass> results = new List<IClass>();
IProjectContent pc = rr.CallingClass.ProjectContent;
SearchAllExtensionMethodsWithName(results, pc, rr.CallName);
SearchAllExtensionMethodsWithName(results, context.ProjectContent, rr.CallName);
foreach (IProjectContent content in pc.ReferencedContents)
foreach (IProjectContent content in context.ProjectContent.ReferencedContents)
SearchAllExtensionMethodsWithName(results, content, rr.CallName);
if (!results.Any())
@ -55,7 +55,7 @@ namespace SharpRefactoring @@ -55,7 +55,7 @@ namespace SharpRefactoring
subItem.Icon = ClassBrowserIconService.Namespace.CreateImage();
item.Items.Add(subItem);
subItem.Click += delegate {
NamespaceRefactoringService.AddUsingDeclaration(rr.CallingClass.CompilationUnit, context.Editor.Document, newNamespace, true);
NamespaceRefactoringService.AddUsingDeclaration(context.CompilationUnit, context.Editor.Document, newNamespace, true);
ParserService.BeginParse(context.Editor.FileName, context.Editor.Document);
};
}

17
src/AddIns/Misc/UsageDataCollector/UsageDataCollector.AddIn/AnalyticsMonitor.AppProperties.template
Unescape View File

@ -0,0 +1,17 @@ @@ -0,0 +1,17 @@
// <file>
// <copyright see="prj:///doc/copyright.txt"/>
// <license see="prj:///doc/license.txt"/>
// <author name="Daniel Grunwald"/>
// <version>$Revision$</version>
// </file>
using System;
namespace ICSharpCode.UsageDataCollector
{
partial class AnalyticsMonitor
{
const string BranchName = "$INSERTBRANCHNAME$";
const string CommitHash = "$INSERTCOMMITHASH$";
}
}

13
src/AddIns/Misc/UsageDataCollector/UsageDataCollector.AddIn/AnalyticsMonitor.cs
Unescape View File

@ -22,7 +22,7 @@ namespace ICSharpCode.UsageDataCollector @@ -22,7 +22,7 @@ namespace ICSharpCode.UsageDataCollector
/// <summary>
/// Main singleton class of the analytics. This class is thread-safe.
/// </summary>
public sealed class AnalyticsMonitor : IAnalyticsMonitor
public sealed partial class AnalyticsMonitor : IAnalyticsMonitor
{
const string UploadUrl = "http://usagedatacollector.sharpdevelop.net/upload/UploadUsageData.svc";
const string ProductName = "sharpdevelop";
@ -120,10 +120,12 @@ namespace ICSharpCode.UsageDataCollector @@ -120,10 +120,12 @@ namespace ICSharpCode.UsageDataCollector
static IEnumerable<UsageDataEnvironmentProperty> GetAppProperties()
{
List<UsageDataEnvironmentProperty> properties = new List<UsageDataEnvironmentProperty> {
new UsageDataEnvironmentProperty { Name = "appVersion", Value = RevisionClass.FullVersion },
new UsageDataEnvironmentProperty { Name = "appVersion", Value = RevisionClass.Major + "." + RevisionClass.Minor + "." + RevisionClass.Build + "." + RevisionClass.Revision },
new UsageDataEnvironmentProperty { Name = "language", Value = ResourceService.Language },
new UsageDataEnvironmentProperty { Name = "culture", Value = CultureInfo.CurrentCulture.Name },
new UsageDataEnvironmentProperty { Name = "userAddInCount", Value = AddInTree.AddIns.Where(a => !a.IsPreinstalled).Count().ToString() }
new UsageDataEnvironmentProperty { Name = "userAddInCount", Value = AddInTree.AddIns.Where(a => !a.IsPreinstalled).Count().ToString() },
new UsageDataEnvironmentProperty { Name = "branch", Value = BranchName },
new UsageDataEnvironmentProperty { Name = "commit", Value = CommitHash }
};
string PROCESSOR_ARCHITECTURE = Environment.GetEnvironmentVariable("PROCESSOR_ARCHITEW6432");
if (string.IsNullOrEmpty(PROCESSOR_ARCHITECTURE)) {
@ -132,11 +134,6 @@ namespace ICSharpCode.UsageDataCollector @@ -132,11 +134,6 @@ namespace ICSharpCode.UsageDataCollector
if (!string.IsNullOrEmpty(PROCESSOR_ARCHITECTURE)) {
properties.Add(new UsageDataEnvironmentProperty { Name = "architecture", Value = PROCESSOR_ARCHITECTURE });
}
#pragma warning disable 0162
if (RevisionClass.BranchName != null) {
properties.Add(new UsageDataEnvironmentProperty { Name = "branch", Value = RevisionClass.BranchName });
}
#pragma warning restore 0162
#if DEBUG
properties.Add(new UsageDataEnvironmentProperty { Name = "debug", Value = "true" });
#endif

6
src/AddIns/Misc/UsageDataCollector/UsageDataCollector.AddIn/UsageDataCollector.AddIn.csproj
Unescape View File

@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<OutputType>Library</OutputType>
<RootNamespace>UsageDataCollector.AddIn</RootNamespace>
<RootNamespace>ICSharpCode.UsageDataCollector</RootNamespace>
<AssemblyName>UsageDataCollector.AddIn</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<OutputPath>..\..\..\..\..\AddIns\Misc\UsageDataCollector\</OutputPath>
@ -56,6 +56,9 @@ @@ -56,6 +56,9 @@
<Compile Include="..\..\..\..\Main\GlobalAssemblyInfo.cs">
<Link>GlobalAssemblyInfo.cs</Link>
</Compile>
<Compile Include="AnalyticsMonitor.AppProperties.cs">
<DependentUpon>AnalyticsMonitor.AppProperties.template</DependentUpon>
</Compile>
<Compile Include="AnalyticsMonitor.cs" />
<Compile Include="CollectedDataView.xaml.cs" />
<Compile Include="OptionPage.xaml.cs" />
@ -67,6 +70,7 @@ @@ -67,6 +70,7 @@
<Page Include="StartPageMessage.xaml" />
</ItemGroup>
<ItemGroup>
<None Include="AnalyticsMonitor.AppProperties.template" />
<None Include="UsageDataCollector.addin">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>

3
src/AddIns/VersionControl/GitAddIn/GitAddIn.addin
Unescape View File

@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
<AddIn name = "GitAddIn"
author = "Daniel Grunwald"
description = "Git Binding">
description = "Git Binding"
addInManagerHidden = "preinstalled">
<Manifest>
<Identity name="ICSharpCode.GitAddIn" version="@GitAddIn.dll"/>

2
src/AddIns/VersionControl/GitAddIn/GitAddIn.csproj
Unescape View File

@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
<OutputType>Library</OutputType>
<RootNamespace>ICSharpCode.GitAddIn</RootNamespace>
<AssemblyName>GitAddIn</AssemblyName>
<OutputPath>..\..\..\..\AddIns\AddIns\VersionControl\</OutputPath>
<OutputPath>..\..\..\..\AddIns\VersionControl\</OutputPath>
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>
<NoStdLib>False</NoStdLib>
<WarningLevel>4</WarningLevel>

17
src/AddIns/VersionControl/GitAddIn/Src/Git.cs
Unescape View File

@ -44,7 +44,7 @@ namespace ICSharpCode.GitAddIn @@ -44,7 +44,7 @@ namespace ICSharpCode.GitAddIn
}
if (!Directory.Exists(fileName))
fileName = Path.GetDirectoryName(fileName);
DirectoryInfo info = new DirectoryInfo(Path.GetDirectoryName(fileName));
DirectoryInfo info = new DirectoryInfo(fileName);
while (info != null) {
if (Directory.Exists(Path.Combine(info.FullName, ".git")))
return info.FullName;
@ -61,6 +61,17 @@ namespace ICSharpCode.GitAddIn @@ -61,6 +61,17 @@ namespace ICSharpCode.GitAddIn
RunGit(wcRoot, "add " + AdaptFileName(wcRoot, fileName), callback);
}
public static void Remove(string fileName, bool indexOnly, Action<int> callback)
{
string wcRoot = FindWorkingCopyRoot(fileName);
if (wcRoot == null)
return;
if (indexOnly)
RunGit(wcRoot, "rm --cached " + AdaptFileName(wcRoot, fileName), callback);
else
RunGit(wcRoot, "rm " + AdaptFileName(wcRoot, fileName), callback);
}
public static string AdaptFileName(string wcRoot, string fileName)
{
return '"' + AdaptFileNameNoQuotes(wcRoot, fileName) + '"';
@ -74,7 +85,7 @@ namespace ICSharpCode.GitAddIn @@ -74,7 +85,7 @@ namespace ICSharpCode.GitAddIn
public static void RunGit(string workingDir, string arguments, Action<int> finished)
{
GitMessageView.AppendLine("$ git " + arguments);
GitMessageView.AppendLine(workingDir + "> git " + arguments);
ProcessRunner runner = new ProcessRunner();
runner.WorkingDirectory = workingDir;
runner.LogStandardOutputAndError = false;
@ -121,6 +132,6 @@ namespace ICSharpCode.GitAddIn @@ -121,6 +132,6 @@ namespace ICSharpCode.GitAddIn
}
}
}
*/
*/
}
}

6
src/AddIns/VersionControl/GitAddIn/Src/GitGuiWrapper.cs
Unescape View File

@ -8,8 +8,8 @@ @@ -8,8 +8,8 @@
using System;
using System.Diagnostics;
using System.Text;
using ICSharpCode.Core;
using ICSharpCode.SharpDevelop.Gui;
using Microsoft.Win32;
namespace ICSharpCode.GitAddIn
@ -48,7 +48,9 @@ namespace ICSharpCode.GitAddIn @@ -48,7 +48,9 @@ namespace ICSharpCode.GitAddIn
{
string path = GetPathFromRegistry("ProcPath");
if (path == null) {
MessageService.ShowError("Could not find TortoiseGit.");
using (var dlg = new ToolNotFoundDialog("${res:AddIns.Git.TortoiseGitRequired}", "http://code.google.com/p/tortoisegit/")) {
dlg.ShowDialog(WorkbenchSingleton.MainWin32Window);
}
} else {
try {
StringBuilder arguments = new StringBuilder();

66
src/AddIns/VersionControl/GitAddIn/Src/GitStatusCache.cs
Unescape View File

@ -82,46 +82,70 @@ namespace ICSharpCode.GitAddIn @@ -82,46 +82,70 @@ namespace ICSharpCode.GitAddIn
runner.WorkingDirectory = wcRoot;
runner.LogStandardOutputAndError = false;
runner.OutputLineReceived += delegate(object sender, LineReceivedEventArgs e) {
if (string.IsNullOrEmpty(e.Line))
return;
statusSet.AddEntry(e.Line, GitStatus.OK);
if (!string.IsNullOrEmpty(e.Line)) {
statusSet.AddEntry(e.Line, GitStatus.OK);
}
};
string command = "git ls-files";
bool hasErrors = false;
runner.ErrorLineReceived += delegate(object sender, LineReceivedEventArgs e) {
if (!hasErrors) {
hasErrors = true;
GitMessageView.AppendLine(runner.WorkingDirectory + "> " + command);
}
GitMessageView.AppendLine(e.Line);
};
runner.Start("cmd", "/c git ls-files");
runner.Start("cmd", "/c " + command);
runner.WaitForExit();
}
static void GitGetStatus(string wcRoot, GitStatusSet statusSet)
{
string command = "git status --porcelain --untracked-files=no";
bool hasErrors = false;
ProcessRunner runner = new ProcessRunner();
runner.WorkingDirectory = wcRoot;
runner.LogStandardOutputAndError = false;
runner.OutputLineReceived += delegate(object sender, LineReceivedEventArgs e) {
if (string.IsNullOrEmpty(e.Line))
return;
Match m = statusParseRegex.Match(e.Line);
if (m.Success) {
statusSet.AddEntry(m.Groups[2].Value, StatusFromText(m.Groups[1].Value));
if (!string.IsNullOrEmpty(e.Line)) {
Match m = statusParseRegex.Match(e.Line);
if (m.Success) {
statusSet.AddEntry(m.Groups[2].Value, StatusFromText(m.Groups[1].Value));
} else {
if (!hasErrors) {
hasErrors = true;
GitMessageView.AppendLine(runner.WorkingDirectory + "> " + command);
}
GitMessageView.AppendLine("unknown output: " + e.Line);
}
}
};
runner.Start("cmd", "/c git status -a --untracked-files=no");
runner.ErrorLineReceived += delegate(object sender, LineReceivedEventArgs e) {
if (!hasErrors) {
hasErrors = true;
GitMessageView.AppendLine(runner.WorkingDirectory + "> " + command);
}
GitMessageView.AppendLine(e.Line);
};
runner.Start("cmd", "/c " + command);
runner.WaitForExit();
}
static GitStatus StatusFromText(string text)
{
switch (text) {
case "deleted":
return GitStatus.Deleted;
case "modified":
return GitStatus.Modified;
case "new file":
return GitStatus.Added;
default:
throw new NotSupportedException();
}
if (text.Contains("A"))
return GitStatus.Added;
else if (text.Contains("D"))
return GitStatus.Deleted;
else if (text.Contains("M"))
return GitStatus.Modified;
else
return GitStatus.None;
}
static readonly Regex statusParseRegex = new Regex(@"#\s+(deleted|modified|new file):\s+(\S.*)$");
static readonly Regex statusParseRegex = new Regex(@"^([DMA ][DMA ])\s(\S.*)$");
}
public class GitStatusSet

10
src/AddIns/VersionControl/GitAddIn/Src/RegisterEventsCommand.cs
Unescape View File

@ -30,10 +30,16 @@ namespace ICSharpCode.GitAddIn @@ -30,10 +30,16 @@ namespace ICSharpCode.GitAddIn
public override void Run()
{
FileService.FileCreated += (sender, args) => {
Git.Add(args.FileName,
Git.Add(args.FileName,
exitcode => WorkbenchSingleton.SafeThreadAsyncCall(ClearStatusCacheAndEnqueueFile, args.FileName)
);
};
FileService.FileRemoved += (sender, args) => {
if (GitStatusCache.GetFileStatus(args.FileName) == GitStatus.Added) {
Git.Remove(args.FileName, true,
exitcode => WorkbenchSingleton.SafeThreadAsyncCall(ClearStatusCacheAndEnqueueFile, args.FileName));
}
};
FileUtility.FileSaved += (sender, e) => {
ClearStatusCacheAndEnqueueFile(e.FileName);
};
@ -67,7 +73,7 @@ namespace ICSharpCode.GitAddIn @@ -67,7 +73,7 @@ namespace ICSharpCode.GitAddIn
if (pad == null) return;
FileNode node = pad.ProjectBrowserControl.FindFileNode(fileName);
if (node == null) return;
OverlayIconManager.EnqueueParents(node);
OverlayIconManager.EnqueueParents(node);
}
}
}

0
src/AddIns/Misc/SubversionAddIn/Project/Configuration/AssemblyInfo.cs → src/AddIns/VersionControl/SubversionAddIn/Configuration/AssemblyInfo.cs
Unescape View File

0
src/AddIns/Misc/SubversionAddIn/Project/ICSharpCode.Svn.addin → src/AddIns/VersionControl/SubversionAddIn/ICSharpCode.Svn.addin
Unescape View File

0
src/AddIns/Misc/SubversionAddIn/Project/Resources/SubversionOptionsPanel.xfrm → src/AddIns/VersionControl/SubversionAddIn/Resources/SubversionOptionsPanel.xfrm
Unescape View File

0
src/AddIns/Misc/SubversionAddIn/Project/Src/AddInOptions.cs → src/AddIns/VersionControl/SubversionAddIn/Src/AddInOptions.cs
Unescape View File

0
src/AddIns/Misc/SubversionAddIn/Project/Src/Commands/AutostartCommands.cs → src/AddIns/VersionControl/SubversionAddIn/Src/Commands/AutostartCommands.cs
Unescape View File

0
src/AddIns/Misc/SubversionAddIn/Project/Src/Commands/CheckoutCommands.cs → src/AddIns/VersionControl/SubversionAddIn/Src/Commands/CheckoutCommands.cs
Unescape View File

0
src/AddIns/Misc/SubversionAddIn/Project/Src/Commands/ProjectBrowserCommands.cs → src/AddIns/VersionControl/SubversionAddIn/Src/Commands/ProjectBrowserCommands.cs
Unescape View File

0
src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/HistoryViewDisplayBinding/HistoryView.cs → src/AddIns/VersionControl/SubversionAddIn/Src/Gui/HistoryViewDisplayBinding/HistoryView.cs
Unescape View File

0
src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/HistoryViewDisplayBinding/HistoryViewDisplayBinding.cs → src/AddIns/VersionControl/SubversionAddIn/Src/Gui/HistoryViewDisplayBinding/HistoryViewDisplayBinding.cs
Unescape View File

0
src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/HistoryViewDisplayBinding/HistoryViewPanel.cs → src/AddIns/VersionControl/SubversionAddIn/Src/Gui/HistoryViewDisplayBinding/HistoryViewPanel.cs
Unescape View File

0
src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/HistoryViewDisplayBinding/InfoPanel.Designer.cs → src/AddIns/VersionControl/SubversionAddIn/Src/Gui/HistoryViewDisplayBinding/InfoPanel.Designer.cs generated
Unescape View File

0
src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/HistoryViewDisplayBinding/InfoPanel.cs → src/AddIns/VersionControl/SubversionAddIn/Src/Gui/HistoryViewDisplayBinding/InfoPanel.cs
Unescape View File

0
src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/HistoryViewDisplayBinding/InfoPanel.resx → src/AddIns/VersionControl/SubversionAddIn/Src/Gui/HistoryViewDisplayBinding/InfoPanel.resx
Unescape View File

0
src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/ProjectBrowserVisitor/OverlayIconManager.cs → src/AddIns/VersionControl/SubversionAddIn/Src/Gui/ProjectBrowserVisitor/OverlayIconManager.cs
Unescape View File

0
src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/SubversionOptionsPanel.cs → src/AddIns/VersionControl/SubversionAddIn/Src/Gui/SubversionOptionsPanel.cs
Unescape View File

0
src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/SvnGuiWrapper.cs → src/AddIns/VersionControl/SubversionAddIn/Src/Gui/SvnGuiWrapper.cs
Unescape View File

0
src/AddIns/Misc/SubversionAddIn/Project/Src/Gui/TortoiseSvnNotFoundForm.cs → src/AddIns/VersionControl/SubversionAddIn/Src/Gui/TortoiseSvnNotFoundForm.cs
Unescape View File

0
src/AddIns/Misc/SubversionAddIn/Project/Src/SubversionStateCondition.cs → src/AddIns/VersionControl/SubversionAddIn/Src/SubversionStateCondition.cs
Unescape View File

0
src/AddIns/Misc/SubversionAddIn/Project/Src/SvnClientWrapper.cs → src/AddIns/VersionControl/SubversionAddIn/Src/SvnClientWrapper.cs
Unescape View File

0
src/AddIns/Misc/SubversionAddIn/Project/Src/SvnMessageView.cs → src/AddIns/VersionControl/SubversionAddIn/Src/SvnMessageView.cs
Unescape View File

20
src/AddIns/Misc/SubversionAddIn/Project/SubversionAddIn.csproj → src/AddIns/VersionControl/SubversionAddIn/SubversionAddIn.csproj
Unescape View File

@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
<NoStdLib>False</NoStdLib>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<OutputPath>..\..\..\..\..\AddIns\Misc\SubversionAddIn\</OutputPath>
<OutputPath>..\..\..\..\AddIns\VersionControl\SubversionAddIn\</OutputPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@ -41,10 +41,10 @@ @@ -41,10 +41,10 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="SharpSvn">
<HintPath>..\..\..\..\Libraries\SharpSvn\SharpSvn.dll</HintPath>
<HintPath>..\..\..\Libraries\SharpSvn\SharpSvn.dll</HintPath>
</Reference>
<Reference Include="SharpSvn.UI">
<HintPath>..\..\..\..\Libraries\SharpSvn\SharpSvn.UI.dll</HintPath>
<HintPath>..\..\..\Libraries\SharpSvn\SharpSvn.UI.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
@ -54,6 +54,9 @@ @@ -54,6 +54,9 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\..\Main\GlobalAssemblyInfo.cs">
<Link>Configuration\GlobalAssemblyInfo.cs</Link>
</Compile>
<None Include="ICSharpCode.Svn.addin">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
@ -79,9 +82,6 @@ @@ -79,9 +82,6 @@
<Compile Include="Src\Gui\TortoiseSvnNotFoundForm.cs" />
<Compile Include="Src\Commands\CheckoutCommands.cs" />
<Compile Include="Src\SubversionStateCondition.cs" />
<Compile Include="..\..\..\..\Main\GlobalAssemblyInfo.cs">
<Link>Configuration\GlobalAssemblyInfo.cs</Link>
</Compile>
<Compile Include="Src\SvnClientWrapper.cs" />
<Compile Include="Src\SvnMessageView.cs" />
<EmbeddedResource Include="Src\Gui\HistoryViewDisplayBinding\InfoPanel.resx">
@ -89,22 +89,22 @@ @@ -89,22 +89,22 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\Main\Base\Project\ICSharpCode.SharpDevelop.csproj">
<ProjectReference Include="..\..\..\Main\Base\Project\ICSharpCode.SharpDevelop.csproj">
<Project>{2748AD25-9C63-4E12-877B-4DCE96FBED54}</Project>
<Name>ICSharpCode.SharpDevelop</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\..\..\Main\Core\Project\ICSharpCode.Core.csproj">
<ProjectReference Include="..\..\..\Main\Core\Project\ICSharpCode.Core.csproj">
<Project>{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}</Project>
<Name>ICSharpCode.Core</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\..\..\Main\ICSharpCode.Core.WinForms\ICSharpCode.Core.WinForms.csproj">
<ProjectReference Include="..\..\..\Main\ICSharpCode.Core.WinForms\ICSharpCode.Core.WinForms.csproj">
<Project>{857CA1A3-FC88-4BE0-AB6A-D1EE772AB288}</Project>
<Name>ICSharpCode.Core.WinForms</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\..\..\Main\ICSharpCode.SharpDevelop.Dom\Project\ICSharpCode.SharpDevelop.Dom.csproj">
<ProjectReference Include="..\..\..\Main\ICSharpCode.SharpDevelop.Dom\Project\ICSharpCode.SharpDevelop.Dom.csproj">
<Project>{924EE450-603D-49C1-A8E5-4AFAA31CE6F3}</Project>
<Name>ICSharpCode.SharpDevelop.Dom</Name>
<Private>False</Private>

18
src/Automated.proj
Unescape View File

@ -27,6 +27,7 @@ @@ -27,6 +27,7 @@
<BuildProperties>$(BuildProperties) &quot;/p:SharpDevelopBinPath=$(SharpDevelopBin)&quot;</BuildProperties>
<BuildProperties>$(BuildProperties) &quot;/p:BooBinPath=$(SharpDevelopSrc)\AddIns\BackendBindings\Boo\RequiredLibraries&quot;</BuildProperties>
<BuildProperties>$(BuildProperties) &quot;/p:FSharpBuildTasksPath=$(SharpDevelopSrc)\AddIns\BackendBindings\FSharp\RequiredLibraries&quot;</BuildProperties>
<BuildProperties>$(BuildProperties) &quot;/p:BranchName=$(BranchName)&quot;</BuildProperties>
<BuildProperties>$(BuildProperties) $(AdditionalBuildProperties)</BuildProperties>
</PropertyGroup>
@ -50,12 +51,13 @@ @@ -50,12 +51,13 @@
<CallTarget Targets="clean2"/>
<CallTarget Targets="zipsource"/>
<CallTarget Targets="addnote" Condition=" '$(IsOfficialBuildServer)' == 'True' "/>
</Target>
<Target Name="build">
<MSBuild Projects="$(SharpDevelopSrc)\Tools\Tools.build"
Targets="PrepareRelease"
Properties="Configuration=Release"/>
Properties="Configuration=Release;BranchName=$(BranchName)"/>
<!-- read content of REVISION into $(BuildNumber) -->
<XmlRead XPath="/versionInfo/version"
@ -142,4 +144,18 @@ @@ -142,4 +144,18 @@
WorkingDirectory="$(ProjectDir)"
ZipFileName="$(ArtefactsOutputDir)\$(ArtefactPrefix)$(BuildNumber)_Source.zip"/>
</Target>
<Target Name="addnote">
<XmlRead XPath="/versionInfo/version"
XmlFileName="$(ProjectDir)\REVISION">
<Output TaskParameter="Value" PropertyName="BuildNumber" />
</XmlRead>
<XmlRead XPath="/versionInfo/branchName"
XmlFileName="$(ProjectDir)\REVISION">
<Output TaskParameter="Value" PropertyName="BranchName" />
</XmlRead>
<Exec WorkingDirectory="$(ProjectDir)" Command='git fetch origin refs/notes/build:refs/notes/build -f' />
<Exec WorkingDirectory="$(ProjectDir)" Command='git notes --ref build add -m "Build $(BuildNumber) on $(BranchName) successful"' IgnoreExitCode="True" />
<Exec WorkingDirectory="$(ProjectDir)" Command='git push git@github.com:icsharpcode/SharpDevelop.git refs/notes/build:refs/notes/build' />
</Target>
</Project>

2
src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/Boo.xshd
Unescape View File

@ -192,7 +192,7 @@ @@ -192,7 +192,7 @@
<Word>of</Word>
</Keywords>
<Rule foreground="MidnightBlue">[\d\w_]+(?=(\s*\())</Rule>
<Rule foreground="DarkBlue">\b0[xX][0-9a-fA-F]+|\b(\d+(\.[0-9]+)?|\.[0-9]+)([eE][+-]?[0-9]+)?</Rule>
<Rule foreground="DarkBlue">\b0[xX][0-9a-fA-F]+|(\b\d+(\.[0-9]+)?|\.[0-9]+)([eE][+-]?[0-9]+)?</Rule>
</RuleSet>
<RuleSet name="comments set">
<!-- allows nested /**/ comments, coloring them Green/Teal alternately -->

15
src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Resources/CSharp-Mode.xshd
Unescape View File

@ -102,8 +102,9 @@ @@ -102,8 +102,9 @@
</RuleSet>
</Span>
<Rule color="Punctuation">
[?,.;()\[\]{}+\-/%*&lt;&gt;^+~!|&amp;]+
<!-- don't highlight "@int" as keyword -->
<Rule>
@[\w\d_]+
</Rule>
<Keywords fontWeight="bold" foreground="Black">
@ -268,11 +269,15 @@ @@ -268,11 +269,15 @@
<!-- Digits -->
<Rule color="NumberLiteral">
\b0[xX][0-9a-fA-F]+ # hex number
| \b
( \d+(\.[0-9]+)? #number with optional floating point
| \.[0-9]+ #or just starting with floating point
|
( \b\d+(\.[0-9]+)? #number with optional floating point
| \.[0-9]+ #or just starting with floating point
)
([eE][+-]?[0-9]+)? # optional exponent
</Rule>
<Rule color="Punctuation">
[?,.;()\[\]{}+\-/%*&lt;&gt;^+~!|&amp;]+
</Rule>
</RuleSet>
</SyntaxDefinition>

4
src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/Xshd/V1Loader.cs
Unescape View File

@ -69,8 +69,8 @@ namespace ICSharpCode.AvalonEdit.Highlighting.Xshd @@ -69,8 +69,8 @@ namespace ICSharpCode.AvalonEdit.Highlighting.Xshd
ColorReference = GetColorReference(syntaxDefinition["Digits"]),
RegexType = XshdRegexType.IgnorePatternWhitespace,
Regex = @"\b0[xX][0-9a-fA-F]+"
+ @"|\b"
+ @"(\d+(" + floatingPoint + ")?"
+ @"|"
+ @"(\b\d+(" + floatingPoint + ")?"
+ @"|" + floatingPoint + ")"
+ optionalExponent
});

1
src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/ICSharpCode.AvalonEdit.csproj
Unescape View File

@ -22,6 +22,7 @@ @@ -22,6 +22,7 @@
<CodeAnalysisRules>-Microsoft.Design#CA1020;-Microsoft.Design#CA1033;-Microsoft.Performance#CA1805;-Microsoft.Performance#CA1810</CodeAnalysisRules>
<OutputPath>..\..\..\..\bin\</OutputPath>
<DocumentationFile>..\..\..\..\bin\ICSharpCode.AvalonEdit.xml</DocumentationFile>
<NoWarn>1607</NoWarn>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<DebugSymbols>true</DebugSymbols>

1
src/Libraries/NRefactory/Project/NRefactory.csproj
Unescape View File

@ -169,7 +169,6 @@ @@ -169,7 +169,6 @@
<Folder Include="Src\Parser\Frames" />
<Content Include="Src\Parser\Frames\Scanner.frame" />
<Content Include="Src\Parser\Frames\SharpCoco.exe" />
<Content Include="Src\Parser\Frames\trace.txt" />
<Folder Include="Src\Parser\VBNet" />
<None Include="Src\Parser\VBNet\VBNET.ATG">
<CopyToOutputDirectory>Never</CopyToOutputDirectory>

3
src/Libraries/NRefactory/Project/Src/PrettyPrinter/VBNet/VBNetOutputVisitor.cs
Unescape View File

@ -2781,7 +2781,8 @@ namespace ICSharpCode.NRefactory.PrettyPrinter @@ -2781,7 +2781,8 @@ namespace ICSharpCode.NRefactory.PrettyPrinter
outputFormatter.PrintToken(Tokens.Optional);
outputFormatter.Space();
}
if ((modifier & ParameterModifiers.Ref) == ParameterModifiers.Ref) {
if ((modifier & ParameterModifiers.Ref) == ParameterModifiers.Ref
|| (modifier & ParameterModifiers.Out) == ParameterModifiers.Out) {
outputFormatter.PrintToken(Tokens.ByRef);
outputFormatter.Space();
}

33
src/Libraries/NRefactory/Test/Parser/GlobalScope/UsingDeclarationTests.cs
Unescape View File

@ -94,6 +94,39 @@ namespace ICSharpCode.NRefactory.Tests.Ast @@ -94,6 +94,39 @@ namespace ICSharpCode.NRefactory.Tests.Ast
Assert.AreEqual("", parser.Errors.ErrorOutput);
CheckAliases(parser.CompilationUnit);
}
[Test]
public void CSharpUsingWithAliasing()
{
string program = "using global::System;\n" +
"using myAlias=global::My.Name.Space;\n" +
"using a::b.c;\n";
IParser parser = ParserFactory.CreateParser(SupportedLanguage.CSharp, new StringReader(program));
parser.Parse();
Assert.AreEqual("", parser.Errors.ErrorOutput);
CompilationUnit u = parser.CompilationUnit;
Assert.AreEqual(3, u.Children.Count);
Assert.IsTrue(u.Children[0] is UsingDeclaration);
UsingDeclaration ud = (UsingDeclaration)u.Children[0];
Assert.AreEqual(1, ud.Usings.Count);
Assert.IsFalse(((Using)ud.Usings[0]).IsAlias);
Assert.AreEqual("System", ud.Usings[0].Name);
Assert.IsTrue(u.Children[1] is UsingDeclaration);
ud = (UsingDeclaration)u.Children[1];
Assert.AreEqual(1, ud.Usings.Count);
Assert.IsTrue(((Using)ud.Usings[0]).IsAlias);
Assert.AreEqual("myAlias", ud.Usings[0].Name);
Assert.AreEqual("My.Name.Space", ud.Usings[0].Alias.Type);
Assert.IsTrue(u.Children[2] is UsingDeclaration);
ud = (UsingDeclaration)u.Children[2];
Assert.AreEqual(1, ud.Usings.Count);
Assert.IsFalse(((Using)ud.Usings[0]).IsAlias);
Assert.AreEqual("a.b.c", ud.Usings[0].Name);
}
#endregion
#region VB.NET

12
src/Libraries/SharpTreeView/ICSharpCode.TreeView/Properties/AssemblyInfo.cs
Unescape View File

@ -34,18 +34,6 @@ using System.Windows.Markup; @@ -34,18 +34,6 @@ using System.Windows.Markup;
)]
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: XmlnsPrefix("http://icsharpcode.net/sharpdevelop/treeview", "treeview")]
[assembly: XmlnsDefinition("http://icsharpcode.net/sharpdevelop/treeview", "ICSharpCode.TreeView")]

7
src/Main/Base/Project/Src/Gui/Dialogs/SharpDevelopAboutPanels.cs
Unescape View File

@ -101,8 +101,11 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -101,8 +101,11 @@ namespace ICSharpCode.SharpDevelop.Gui
public static string GetVersionInformationString()
{
string str = "";
Version v = typeof(AboutSharpDevelopTabPage).Assembly.GetName().Version;
str += "SharpDevelop Version : " + v.ToString() + Environment.NewLine;
object[] attr = typeof(AboutSharpDevelopTabPage).Assembly.GetCustomAttributes(typeof(AssemblyInformationalVersionAttribute), false);
if (attr.Length == 1) {
AssemblyInformationalVersionAttribute aiva = (AssemblyInformationalVersionAttribute)attr[0];
str += "SharpDevelop Version : " + aiva.InformationalVersion + Environment.NewLine;
}
str += ".NET Version : " + Environment.Version.ToString() + Environment.NewLine;
str += "OS Version : " + Environment.OSVersion.ToString() + Environment.NewLine;
string cultureName = null;

2
src/Main/Base/Project/Src/Gui/Dialogs/ToolNotFoundDialog.cs
Unescape View File

@ -23,7 +23,7 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -23,7 +23,7 @@ namespace ICSharpCode.SharpDevelop.Gui
/// <param name="description">The description text</param>
/// <param name="linkTarget">The link target (with leading http://)</param>
/// <param name="icon">32x32 icon to display next to the description. May be null.</param>
public ToolNotFoundDialog(string description, string linkTarget, Image icon)
public ToolNotFoundDialog(string description, string linkTarget, Image icon = null)
{
// The InitializeComponent() call is required for Windows Forms designer support.
InitializeComponent();

4
src/Main/Base/Project/Src/Gui/Pads/CompilerMessageView/MessageViewCategory.cs
Unescape View File

@ -20,8 +20,8 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -20,8 +20,8 @@ namespace ICSharpCode.SharpDevelop.Gui
/// <summary>
/// Creates a new MessageViewCategory with the specified category
/// and adds it to the CompilerMessageView pad.
/// This method is thread-safe and works correctly even if called multiple times for the same
/// thread; only one messageViewCategory will be created.
/// This method is thread-safe and works correctly even if called concurrently for the same
/// category; only one messageViewCategory will be created.
/// </summary>
public static void Create(ref MessageViewCategory messageViewCategory, string category)
{

12
src/Main/Base/Project/Src/Gui/WorkbenchSingleton.cs
Unescape View File

@ -57,7 +57,7 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -57,7 +57,7 @@ namespace ICSharpCode.SharpDevelop.Gui
}
}
public static IStatusBarService StatusBar {
public static IStatusBarService StatusBar {
get {
return workbench != null ? workbench.StatusBar : null;
}
@ -77,10 +77,12 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -77,10 +77,12 @@ namespace ICSharpCode.SharpDevelop.Gui
Project.CustomToolsService.Initialize();
Project.BuildModifiedProjectsOnlyService.Initialize();
var messageService = (WinFormsMessageService)Core.Services.ServiceManager.Instance.MessageService;
messageService.DialogOwner = workbench.MainWin32Window;
Debug.Assert(messageService.DialogOwner != null);
messageService.DialogSynchronizeInvoke = workbench.SynchronizingObject;
var messageService = Core.Services.ServiceManager.Instance.MessageService as IDialogMessageService;
if (messageService != null) {
messageService.DialogOwner = workbench.MainWin32Window;
Debug.Assert(messageService.DialogOwner != null);
messageService.DialogSynchronizeInvoke = workbench.SynchronizingObject;
}
workbench.Initialize();
workbench.SetMemento(PropertyService.Get(workbenchMemento, new Properties()));

34
src/Main/Base/Project/Src/Services/RefactoringService/ContextActions/EditorContext.cs
Unescape View File

@ -38,6 +38,20 @@ namespace ICSharpCode.SharpDevelop.Refactoring @@ -38,6 +38,20 @@ namespace ICSharpCode.SharpDevelop.Refactoring
/// </summary>
public ResolveResult CurrentSymbol { get; private set; }
/// <summary>
/// Language independent.
/// </summary>
public ParseInformation CurrentParseInformation { get; private set; }
public IProjectContent ProjectContent {
get {
if (CurrentParseInformation != null)
return CurrentParseInformation.CompilationUnit.ProjectContent;
else
return null;
}
}
public IDocumentLine CurrentLine { get; private set; }
/// <summary>
/// Only available for C# and VB.
@ -70,6 +84,7 @@ namespace ICSharpCode.SharpDevelop.Refactoring @@ -70,6 +84,7 @@ namespace ICSharpCode.SharpDevelop.Refactoring
this.CurrentExpression = GetExpressionAtCaret(editor);
this.CurrentSymbol = ResolveExpression(CurrentExpression, editor, CaretLine, CaretColumn);
this.CurrentParseInformation = ParserService.GetExistingParseInformation(editor.FileName);
this.CurrentLine = editor.Document.GetLine(CaretLine);
this.CurrentLineAST = GetCurrentLineAst(this.CurrentLine, editor);
@ -202,12 +217,12 @@ namespace ICSharpCode.SharpDevelop.Refactoring @@ -202,12 +217,12 @@ namespace ICSharpCode.SharpDevelop.Refactoring
var snippetParser = GetSnippetParser(editor);
if (snippetParser == null)
return null;
try {
//try {
return snippetParser.Parse(currentLine.Text);
}
catch {
return null;
}
//}
//catch {
// return null;
//}
}
SnippetParser GetSnippetParser(ITextEditor editor)
@ -233,13 +248,12 @@ namespace ICSharpCode.SharpDevelop.Refactoring @@ -233,13 +248,12 @@ namespace ICSharpCode.SharpDevelop.Refactoring
INode GetCurrentMemberAST(ITextEditor editor)
{
try {
//try {
var resolver = GetInitializedNRefactoryResolver(editor, this.CaretLine, this.CaretColumn);
return resolver.ParseCurrentMember(editor.Document.Text);
}
catch {
return null;
}
//} catch {
// return null;
//}
}
NRefactoryResolver GetInitializedNRefactoryResolver(ITextEditor editor, int caretLine, int caretColumn)

44
src/Main/Base/Project/Src/Services/RefactoringService/RefactoringMenuBuilder.cs
Unescape View File

@ -34,10 +34,25 @@ namespace ICSharpCode.SharpDevelop.Refactoring @@ -34,10 +34,25 @@ namespace ICSharpCode.SharpDevelop.Refactoring
{
public class RefactoringMenuContext
{
public ITextEditor Editor;
public ExpressionResult ExpressionResult;
public ResolveResult ResolveResult;
public bool IsDefinition;
public readonly ITextEditor Editor;
public readonly ExpressionResult ExpressionResult;
public readonly ResolveResult ResolveResult;
public readonly bool IsDefinition;
/// <remarks>Can be null.</remarks>
public readonly IProjectContent ProjectContent;
public readonly ICompilationUnit CompilationUnit;
public RefactoringMenuContext(ITextEditor editor, ExpressionResult expressionResult,
ResolveResult resolveResult, bool isDefinition,
IProjectContent projectContent, ICompilationUnit compilationUnit)
{
this.Editor = editor;
this.ExpressionResult = expressionResult;
this.ResolveResult = resolveResult;
this.IsDefinition = isDefinition;
this.ProjectContent = projectContent;
this.CompilationUnit = compilationUnit;
}
}
public interface IRefactoringMenuItemFactory
@ -79,13 +94,8 @@ namespace ICSharpCode.SharpDevelop.Refactoring @@ -79,13 +94,8 @@ namespace ICSharpCode.SharpDevelop.Refactoring
void AddTopLevelItems(List<object> resultItems, ITextEditor textEditor, ExpressionResult expressionResult, List<string> definitions, bool addAsSubmenu)
{
// Insert items at this position to get the outermost expression first, followed by the inner expressions (if any).
int insertIndex = resultItems.Count;
int insertIndex = resultItems.Count;
ResolveResult rr = ResolveExpressionAtCaret(textEditor, expressionResult);
RefactoringMenuContext context = new RefactoringMenuContext {
Editor = textEditor,
ResolveResult = rr,
ExpressionResult = expressionResult
};
MenuItem item = null;
if (rr is MethodGroupResolveResult) {
@ -106,8 +116,12 @@ namespace ICSharpCode.SharpDevelop.Refactoring @@ -106,8 +116,12 @@ namespace ICSharpCode.SharpDevelop.Refactoring
} else if (rr is TypeResolveResult) {
item = MakeItem(definitions, ((TypeResolveResult)rr).ResolvedClass);
} else if (rr is LocalResolveResult) {
int caretLine = textEditor.Caret.Line;
context.IsDefinition = caretLine == ((LocalResolveResult)rr).VariableDefinitionRegion.BeginLine;
bool isDefinition = textEditor.Caret.Line == ((LocalResolveResult)rr).VariableDefinitionRegion.BeginLine;
ParseInformation pi = ParserService.GetParseInformation(textEditor.FileName);
IProjectContent pc = null;
if (pi != null)
pc = pi.CompilationUnit.ProjectContent;
RefactoringMenuContext context = new RefactoringMenuContext(textEditor, expressionResult, rr, isDefinition, pc, pi.CompilationUnit);
item = MakeItem((LocalResolveResult)rr, context);
insertIndex = 0; // Insert local variable menu item at the topmost position.
}
@ -173,9 +187,9 @@ namespace ICSharpCode.SharpDevelop.Refactoring @@ -173,9 +187,9 @@ namespace ICSharpCode.SharpDevelop.Refactoring
{
Debug.Assert(local == context.ResolveResult);
MenuItem item = MakeItemWithGoToDefinition(local.VariableName,
local.IsParameter ? ClassBrowserIconService.Parameter : ClassBrowserIconService.LocalVariable,
local.CallingClass.CompilationUnit,
context.IsDefinition ? DomRegion.Empty : local.VariableDefinitionRegion);
local.IsParameter ? ClassBrowserIconService.Parameter : ClassBrowserIconService.LocalVariable,
local.CallingClass.CompilationUnit,
context.IsDefinition ? DomRegion.Empty : local.VariableDefinitionRegion);
string treePath = "/SharpDevelop/ViewContent/DefaultTextEditor/Refactoring/";
treePath += local.IsParameter ? "Parameter" : "LocalVariable";
if (context.IsDefinition) treePath += "Definition";

6
src/Main/Core/Project/ICSharpCode.Core.csproj
Unescape View File

@ -137,11 +137,9 @@ @@ -137,11 +137,9 @@
</Content>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PreBuildEvent>..\src\Tools\UpdateAssemblyInfo\bin\Debug\UpdateAssemblyInfo.exe</PreBuildEvent>
</PropertyGroup>
<Target Name="BeforeBuild">
<MSBuild Projects="$(MSBuildProjectDirectory)\..\..\..\Tools\UpdateAssemblyInfo\UpdateAssemblyInfo.csproj" Targets="Build" Properties="Configuration=Debug"/>
<Exec WorkingDirectory="$(MSBuildProjectDirectory)\..\..\..\Tools\UpdateAssemblyInfo\bin\Debug" Command="UpdateAssemblyInfo.exe" />
<Exec WorkingDirectory="$(MSBuildProjectDirectory)\..\..\..\Tools\UpdateAssemblyInfo\bin\Debug" Command="UpdateAssemblyInfo.exe --branchname $(BranchName)" Timeout = "60000" Condition = " '$(BranchName)' != '' " />
<Exec WorkingDirectory="$(MSBuildProjectDirectory)\..\..\..\Tools\UpdateAssemblyInfo\bin\Debug" Command="UpdateAssemblyInfo.exe" Timeout = "60000" Condition = " '$(BranchName)' == '' " />
</Target>
</Project>

2
src/Main/Core/Project/Src/AddInTree/AddIn/AddInReference.cs
Unescape View File

@ -112,7 +112,7 @@ namespace ICSharpCode.Core @@ -112,7 +112,7 @@ namespace ICSharpCode.Core
if (version.StartsWith("@")) {
if (version == "@SharpDevelopCoreVersion") {
if (entryVersion == null)
entryVersion = new Version(RevisionClass.FullVersion);
entryVersion = new Version(RevisionClass.Major + "." + RevisionClass.Minor + "." + RevisionClass.Build + "." + RevisionClass.Revision);
return entryVersion;
}
if (hintPath != null) {

41
src/Main/Core/Project/Src/AddInTree/AddIn/ExtensionPath.cs
Unescape View File

@ -7,19 +7,20 @@ @@ -7,19 +7,20 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Xml;
namespace ICSharpCode.Core
{
/// <summary>
/// Description of Path.
/// Represents all contributions to a Path in a single .addin file.
/// </summary>
public class ExtensionPath
{
string name;
AddIn addIn;
List<Codon> codons = new List<Codon>();
string name;
AddIn addIn;
List<List<Codon>> codons = new List<List<Codon>>();
public AddIn AddIn {
get {
return addIn;
@ -31,27 +32,45 @@ namespace ICSharpCode.Core @@ -31,27 +32,45 @@ namespace ICSharpCode.Core
return name;
}
}
public List<Codon> Codons {
public IEnumerable<Codon> Codons {
get {
return codons;
return
from list in codons
from c in list
select c;
}
}
/// <summary>
/// Gets the codons separated by the groups they were created in.
/// i.e. if two addins add the codons to the same path they will be in diffrent group.
/// if the same addin adds the codon in diffrent path elements they will be in diffrent groups.
/// </summary>
public IEnumerable<IEnumerable<Codon>> GroupedCodons {
get {
return codons.AsReadOnly();
}
}
public ExtensionPath(string name, AddIn addIn)
{
this.addIn = addIn;
this.name = name;
}
public static void SetUp(ExtensionPath extensionPath, XmlReader reader, string endElement)
{
Stack<ICondition> conditionStack = new Stack<ICondition>();
List<Codon> innerCodons = new List<Codon>();
while (reader.Read()) {
switch (reader.NodeType) {
case XmlNodeType.EndElement:
if (reader.LocalName == "Condition" || reader.LocalName == "ComplexCondition") {
conditionStack.Pop();
} else if (reader.LocalName == endElement) {
if (innerCodons.Count > 0)
extensionPath.codons.Add(innerCodons);
return;
}
break;
@ -63,7 +82,7 @@ namespace ICSharpCode.Core @@ -63,7 +82,7 @@ namespace ICSharpCode.Core
conditionStack.Push(Condition.ReadComplexCondition(reader));
} else {
Codon newCodon = new Codon(extensionPath.AddIn, elementName, Properties.ReadFromAttributes(reader), conditionStack.ToArray());
extensionPath.codons.Add(newCodon);
innerCodons.Add(newCodon);
if (!reader.IsEmptyElement) {
ExtensionPath subPath = extensionPath.AddIn.GetExtensionPath(extensionPath.Name + "/" + newCodon.Id);
//foreach (ICondition condition in extensionPath.conditionStack) {
@ -78,6 +97,8 @@ namespace ICSharpCode.Core @@ -78,6 +97,8 @@ namespace ICSharpCode.Core
break;
}
}
if (innerCodons.Count > 0)
extensionPath.codons.Add(innerCodons);
}
}
}

3
src/Main/Core/Project/Src/AddInTree/AddInTree.cs
Unescape View File

@ -223,7 +223,8 @@ namespace ICSharpCode.Core @@ -223,7 +223,8 @@ namespace ICSharpCode.Core
static void AddExtensionPath(ExtensionPath path)
{
AddInTreeNode treePath = CreatePath(rootNode, path.Name);
treePath.AddCodons(path.Codons);
foreach (IEnumerable<Codon> innerCodons in path.GroupedCodons)
treePath.AddCodons(innerCodons);
}
/// <summary>

6
src/Main/Core/Project/Src/AddInTree/AddInTreeNode.cs
Unescape View File

@ -20,7 +20,7 @@ namespace ICSharpCode.Core @@ -20,7 +20,7 @@ namespace ICSharpCode.Core
readonly object lockObj = new object();
Dictionary<string, AddInTreeNode> childNodes = new Dictionary<string, AddInTreeNode>();
ReadOnlyCollection<Codon> codons;
List<ICollection<Codon>> codonInput;
List<IEnumerable<Codon>> codonInput;
/// <summary>
/// A dictionary containing the child paths.
@ -31,13 +31,13 @@ namespace ICSharpCode.Core @@ -31,13 +31,13 @@ namespace ICSharpCode.Core
}
}
public void AddCodons(ICollection<Codon> newCodons)
public void AddCodons(IEnumerable<Codon> newCodons)
{
if (newCodons == null)
throw new ArgumentNullException("newCodons");
lock (lockObj) {
if (codonInput == null) {
codonInput = new List<ICollection<Codon>>();
codonInput = new List<IEnumerable<Codon>>();
if (codons != null)
codonInput.Add(codons);
}

60
src/Main/Core/Test/AddInTreeTests/AddInTreeLoadingTests.cs
Unescape View File

@ -6,7 +6,9 @@ @@ -6,7 +6,9 @@
// </file>
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using NUnit.Framework;
namespace ICSharpCode.Core.Tests.AddInTreeTests.Tests
@ -133,11 +135,13 @@ namespace ICSharpCode.Core.Tests.AddInTreeTests.Tests @@ -133,11 +135,13 @@ namespace ICSharpCode.Core.Tests.AddInTreeTests.Tests
AddIn addIn = AddIn.Load(new StringReader(addInText));
Assert.AreEqual(1, addIn.Paths.Count);
Assert.IsNotNull(addIn.Paths["/Path1"]);
Assert.AreEqual(1, addIn.Paths["/Path1"].Codons.Count);
Assert.AreEqual("Simple", addIn.Paths["/Path1"].Codons[0].Name);
Assert.AreEqual("Simple", addIn.Paths["/Path1"].Codons[0].Id);
Assert.AreEqual("a", addIn.Paths["/Path1"].Codons[0].Properties["attr"]);
Assert.AreEqual("b", addIn.Paths["/Path1"].Codons[0].Properties["attr2"]);
List<Codon> codons = addIn.Paths["/Path1"].Codons.ToList();
Assert.AreEqual(1, codons.Count);
Assert.AreEqual("Simple", codons[0].Name);
Assert.AreEqual("Simple", codons[0].Id);
Assert.AreEqual("a", codons[0].Properties["attr"]);
Assert.AreEqual("b", codons[0].Properties["attr2"]);
}
[Test]
@ -154,14 +158,16 @@ namespace ICSharpCode.Core.Tests.AddInTreeTests.Tests @@ -154,14 +158,16 @@ namespace ICSharpCode.Core.Tests.AddInTreeTests.Tests
AddIn addIn = AddIn.Load(new StringReader(addInText));
Assert.AreEqual(2, addIn.Paths.Count);
Assert.IsNotNull(addIn.Paths["/Path1"]);
Assert.AreEqual(1, addIn.Paths["/Path1"].Codons.Count);
Assert.AreEqual("Sub", addIn.Paths["/Path1"].Codons[0].Name);
Assert.AreEqual("Path2", addIn.Paths["/Path1"].Codons[0].Id);
List<Codon> codons1 = addIn.Paths["/Path1"].Codons.ToList();
Assert.AreEqual(1, codons1.Count);
Assert.AreEqual("Sub", codons1[0].Name);
Assert.AreEqual("Path2", codons1[0].Id);
Assert.IsNotNull(addIn.Paths["/Path1/Path2"]);
Assert.AreEqual(1, addIn.Paths["/Path1/Path2"].Codons.Count);
Assert.AreEqual("Codon2", addIn.Paths["/Path1/Path2"].Codons[0].Name);
Assert.AreEqual("Sub2", addIn.Paths["/Path1/Path2"].Codons[0].Id);
List<Codon> codons2 = addIn.Paths["/Path1/Path2"].Codons.ToList();
Assert.AreEqual(1, codons2.Count);
Assert.AreEqual("Codon2", codons2[0].Name);
Assert.AreEqual("Sub2", codons2[0].Id);
}
[Test]
@ -180,16 +186,18 @@ namespace ICSharpCode.Core.Tests.AddInTreeTests.Tests @@ -180,16 +186,18 @@ namespace ICSharpCode.Core.Tests.AddInTreeTests.Tests
AddIn addIn = AddIn.Load(new StringReader(addInText));
Assert.AreEqual(2, addIn.Paths.Count);
Assert.IsNotNull(addIn.Paths["/Path1"]);
Assert.AreEqual(1, addIn.Paths["/Path1"].Codons.Count);
Assert.AreEqual("Sub", addIn.Paths["/Path1"].Codons[0].Name);
Assert.AreEqual("Path2", addIn.Paths["/Path1"].Codons[0].Id);
Assert.AreEqual(1, addIn.Paths["/Path1"].Codons[0].Conditions.Length);
List<Codon> codons1 = addIn.Paths["/Path1"].Codons.ToList();
Assert.AreEqual(1, codons1.Count);
Assert.AreEqual("Sub", codons1[0].Name);
Assert.AreEqual("Path2", codons1[0].Id);
Assert.AreEqual(1, codons1[0].Conditions.Length);
Assert.IsNotNull(addIn.Paths["/Path1/Path2"]);
Assert.AreEqual(1, addIn.Paths["/Path1/Path2"].Codons.Count);
Assert.AreEqual("Codon2", addIn.Paths["/Path1/Path2"].Codons[0].Name);
Assert.AreEqual("Sub2", addIn.Paths["/Path1/Path2"].Codons[0].Id);
Assert.AreEqual(0, addIn.Paths["/Path1/Path2"].Codons[0].Conditions.Length);
List<Codon> codons2 = addIn.Paths["/Path1/Path2"].Codons.ToList();
Assert.AreEqual(1, codons2.Count);
Assert.AreEqual("Codon2", codons2[0].Name);
Assert.AreEqual("Sub2", codons2[0].Id);
Assert.AreEqual(0, codons2[0].Conditions.Length);
}
[Test]
@ -207,8 +215,7 @@ namespace ICSharpCode.Core.Tests.AddInTreeTests.Tests @@ -207,8 +215,7 @@ namespace ICSharpCode.Core.Tests.AddInTreeTests.Tests
Assert.AreEqual(1, addIn.Paths.Count, "Paths != 1");
ExtensionPath path = addIn.Paths["/Path1"];
Assert.IsNotNull(path);
Assert.AreEqual(1, path.Codons.Count);
Codon codon = path.Codons[0];
Codon codon = path.Codons.Single();
Assert.AreEqual("Simple", codon.Name);
Assert.AreEqual("Simple", codon.Id);
Assert.AreEqual("a", codon["attr"]);
@ -244,8 +251,8 @@ namespace ICSharpCode.Core.Tests.AddInTreeTests.Tests @@ -244,8 +251,8 @@ namespace ICSharpCode.Core.Tests.AddInTreeTests.Tests
ExtensionPath path = addIn.Paths["/Path1"];
Assert.IsNotNull(path);
Assert.AreEqual(3, path.Codons.Count);
Codon codon = path.Codons[0];
Assert.AreEqual(3, path.Codons.Count());
Codon codon = path.Codons.ElementAt(0);
Assert.AreEqual("Simple", codon.Name);
Assert.AreEqual("Simple", codon.Id);
Assert.AreEqual("a", codon["attr"]);
@ -265,7 +272,7 @@ namespace ICSharpCode.Core.Tests.AddInTreeTests.Tests @@ -265,7 +272,7 @@ namespace ICSharpCode.Core.Tests.AddInTreeTests.Tests
Assert.AreEqual("1", condition["string"]);
Assert.AreEqual("2", condition["equal"]);
codon = path.Codons[1];
codon = path.Codons.ElementAt(1);
Assert.AreEqual(1, codon.Conditions.Length);
condition = codon.Conditions[0] as Condition;
Assert.IsNotNull(condition);
@ -273,7 +280,7 @@ namespace ICSharpCode.Core.Tests.AddInTreeTests.Tests @@ -273,7 +280,7 @@ namespace ICSharpCode.Core.Tests.AddInTreeTests.Tests
Assert.AreEqual("a", condition["string"]);
Assert.AreEqual("b", condition["equal"]);
codon = path.Codons[2];
codon = path.Codons.ElementAt(2);
Assert.AreEqual(0, codon.Conditions.Length);
}
@ -301,8 +308,7 @@ namespace ICSharpCode.Core.Tests.AddInTreeTests.Tests @@ -301,8 +308,7 @@ namespace ICSharpCode.Core.Tests.AddInTreeTests.Tests
Assert.AreEqual(1, addIn.Paths.Count);
ExtensionPath path = addIn.Paths["/Path1"];
Assert.IsNotNull(path);
Assert.AreEqual(1, path.Codons.Count);
Codon codon = path.Codons[0];
Codon codon = path.Codons.Single();
Assert.AreEqual("Simple", codon.Name);
Assert.AreEqual("Simple", codon.Id);
Assert.AreEqual("a", codon["attr"]);

3
src/Main/Core/Test/ICSharpCode.Core.Tests.csproj
Unescape View File

@ -39,6 +39,9 @@ @@ -39,6 +39,9 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />

8
src/Main/GlobalAssemblyInfo.template
Unescape View File

@ -21,7 +21,8 @@ using System.Reflection; @@ -21,7 +21,8 @@ using System.Reflection;
[assembly: AssemblyCompany("ic#code")]
[assembly: AssemblyProduct("SharpDevelop")]
[assembly: AssemblyCopyright("2000-$INSERTYEAR$ AlphaSierraPapa for the SharpDevelop Team")]
[assembly: AssemblyVersion(RevisionClass.FullVersion)]
[assembly: AssemblyVersion(RevisionClass.Major + "." + RevisionClass.Minor + "." + RevisionClass.Build + "." + RevisionClass.Revision)]
[assembly: AssemblyInformationalVersion(RevisionClass.FullVersion + "-$INSERTSHORTCOMMITHASH$")]
[assembly: NeutralResourcesLanguage("en-US")]
internal static class RevisionClass
@ -31,8 +32,5 @@ internal static class RevisionClass @@ -31,8 +32,5 @@ internal static class RevisionClass
public const string Build = "0";
public const string Revision = "$INSERTREVISION$";
public const string MainVersion = Major + "." + Minor;
public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision;
public const string BranchName = "reports";
public const string FullVersion = Major + "." + Minor + "." + Build + ".$INSERTREVISION$$INSERTBRANCHPOSTFIX$";
}

1
src/Main/ICSharpCode.Core.WinForms/ICSharpCode.Core.WinForms.csproj
Unescape View File

@ -59,6 +59,7 @@ @@ -59,6 +59,7 @@
<Compile Include="Menu\MenuSeparator.cs" />
<Compile Include="Menu\MenuService.cs" />
<Compile Include="MessageService\CustomDialog.cs" />
<Compile Include="MessageService\IDialogMessageService.cs" />
<Compile Include="MessageService\InputBox.cs" />
<Compile Include="MessageService\SaveErrorChooseDialog.cs" />
<Compile Include="MessageService\SaveErrorInformDialog.cs" />

24
src/Main/ICSharpCode.Core.WinForms/MessageService/IDialogMessageService.cs
Unescape View File

@ -0,0 +1,24 @@ @@ -0,0 +1,24 @@
// <file>
// <copyright see="prj:///doc/copyright.txt"/>
// <license see="prj:///doc/license.txt"/>
// <author name="Daniel Grunwald"/>
// <version>$Revision$</version>
// </file>
using System;
using System.ComponentModel;
using System.Windows.Forms;
using ICSharpCode.Core.Services;
namespace ICSharpCode.Core.WinForms
{
/// <summary>
/// Message service that sets an owner for dialog boxes.
/// </summary>
public interface IDialogMessageService : IMessageService
{
IWin32Window DialogOwner { set; get; }
ISynchronizeInvoke DialogSynchronizeInvoke { set; get; }
}
}

2
src/Main/ICSharpCode.Core.WinForms/MessageService/WinFormsMessageService.cs
Unescape View File

@ -18,7 +18,7 @@ namespace ICSharpCode.Core.WinForms @@ -18,7 +18,7 @@ namespace ICSharpCode.Core.WinForms
/// All text displayed using the MessageService is passed to the
/// <see cref="StringParser"/> to replace ${res} markers.
/// </summary>
public class WinFormsMessageService : IMessageService
public class WinFormsMessageService : IDialogMessageService
{
/// <summary>
/// Gets/Sets the form used as owner for shown message boxes.

1
src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/ProjectContent/ParseInformation.cs
Unescape View File

@ -19,6 +19,7 @@ namespace ICSharpCode.SharpDevelop.Dom @@ -19,6 +19,7 @@ namespace ICSharpCode.SharpDevelop.Dom
/// <summary>
/// Gets the compilation unit.
/// This property never returns null.
/// </summary>
public ICompilationUnit CompilationUnit {
get { return unit; }

1
src/Main/StartUp/Project/Dialogs/SplashScreen.cs
Unescape View File

@ -31,7 +31,6 @@ namespace ICSharpCode.SharpDevelop @@ -31,7 +31,6 @@ namespace ICSharpCode.SharpDevelop
public SplashScreenForm()
{
const string versionText = "SharpDevelop"
+ (RevisionClass.BranchName != null ? "-" + RevisionClass.BranchName : "")
+ " " + RevisionClass.FullVersion
#if DEBUG
+ " (debug)"

4
src/Main/StartUp/Project/SharpDevelopMain.cs
Unescape View File

@ -158,14 +158,14 @@ namespace ICSharpCode.SharpDevelop @@ -158,14 +158,14 @@ namespace ICSharpCode.SharpDevelop
string configDirectory = ConfigurationManager.AppSettings["settingsPath"];
if (String.IsNullOrEmpty(configDirectory)) {
startup.ConfigDirectory = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
"ICSharpCode/SharpDevelop" + RevisionClass.MainVersion);
"ICSharpCode/SharpDevelop" + RevisionClass.Major + "." + RevisionClass.Minor);
} else {
startup.ConfigDirectory = Path.Combine(Path.GetDirectoryName(exe.Location), configDirectory);
}
startup.DomPersistencePath = ConfigurationManager.AppSettings["domPersistencePath"];
if (string.IsNullOrEmpty(startup.DomPersistencePath)) {
startup.DomPersistencePath = Path.Combine(Path.GetTempPath(), "SharpDevelop" + RevisionClass.MainVersion);
startup.DomPersistencePath = Path.Combine(Path.GetTempPath(), "SharpDevelop" + RevisionClass.Major + "." + RevisionClass.Minor);
#if DEBUG
startup.DomPersistencePath = Path.Combine(startup.DomPersistencePath, "Debug");
#endif

1
src/Main/StartUp/Project/StartUp.csproj
Unescape View File

@ -72,6 +72,7 @@ @@ -72,6 +72,7 @@
</None>
<Compile Include="..\..\GlobalAssemblyInfo.cs">
<Link>Configuration\GlobalAssemblyInfo.cs</Link>
<DependentUpon>GlobalAssemblyInfo.template</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>

28
src/Setup/Files.wxs
Unescape View File

@ -1408,17 +1408,6 @@ @@ -1408,17 +1408,6 @@
<File Source="..\..\AddIns\Misc\StartPage\StartPage.addin" Id="StartPage.addin" Name="StartPage.addin" />
</Component>
</Directory>
<Directory Id="SubversionAddInFolder" Name="SubversionAddIn">
<Component Guid="C9B1D523-5674-4398-9073-20F57B45DD46" Id="SubversionAddInDll" DiskId="1">
<File Source="..\..\AddIns\Misc\SubversionAddin\SubversionAddIn.dll" Id="SubversionAddIn.dll" Name="SubversionAddIn.dll" Assembly=".net" AssemblyApplication="SubversionAddIn.dll" AssemblyManifest="SubversionAddIn.dll" KeyPath="yes" />
<File Source="..\..\AddIns\Misc\SubversionAddin\ICSharpCode.Svn.addin" Id="ICSharpCode.Svn.addin" Name="ICSharpCode.Svn.addin" />
<File Source="..\..\AddIns\Misc\SubversionAddin\SharpSvn.dll" Name="SharpSvn.dll" Id="SharpSvn.dll" />
<File Source="..\..\AddIns\Misc\SubversionAddin\SharpSvn.UI.dll" Name="SharpSvn.UI.dll" Id="SharpSvn.UI.dll" />
<File Source="..\..\AddIns\Misc\SubversionAddin\SharpPlink-Win32.svnExe" Name="SharpPlink-Win32.svnExe" Id="SharpPlink_Win32.svnExe" />
<File Source="..\..\AddIns\Misc\SubversionAddin\SharpSvn-DB44-20-Win32.dll" Name="SharpSvn-DB44-20-Win32.dll" Id="SharpSvn_DB44_20_Win32.dll" />
<File Source="..\..\AddIns\Misc\SubversionAddin\SharpSvn-SASL21-23-Win32.dll" Name="SharpSvn-SASL21-23-Win32.dll" Id="SharpSvn_SASL21_23_Win32.dll" />
</Component>
</Directory>
<Directory Id="SearchAndReplace" Name="SearchAndReplace">
<Component Guid="A76D4EB6-0EBB-49D7-9528-2FA87C983703" Id="SearchAndReplaceFiles" DiskId="1">
<File Source="..\..\AddIns\Misc\SearchAndReplace\SearchAndReplace.addin" Id="SearchAndReplace.addin" Name="SearchAndReplace.addin" />
@ -1499,6 +1488,23 @@ @@ -1499,6 +1488,23 @@
</Component>
</Directory>
</Directory>
<Directory Id="VersionControlAddInsFolder" Name="VersionControl">
<Directory Id="SubversionAddInFolder" Name="SubversionAddIn">
<Component Guid="C9B1D523-5674-4398-9073-20F57B45DD46" Id="SubversionAddInDll" DiskId="1">
<File Source="..\..\AddIns\VersionControl\SubversionAddin\SubversionAddIn.dll" Id="SubversionAddIn.dll" Name="SubversionAddIn.dll" Assembly=".net" AssemblyApplication="SubversionAddIn.dll" AssemblyManifest="SubversionAddIn.dll" KeyPath="yes" />
<File Source="..\..\AddIns\VersionControl\SubversionAddin\ICSharpCode.Svn.addin" Id="ICSharpCode.Svn.addin" Name="ICSharpCode.Svn.addin" />
<File Source="..\..\AddIns\VersionControl\SubversionAddin\SharpSvn.dll" Name="SharpSvn.dll" Id="SharpSvn.dll" />
<File Source="..\..\AddIns\VersionControl\SubversionAddin\SharpSvn.UI.dll" Name="SharpSvn.UI.dll" Id="SharpSvn.UI.dll" />
<File Source="..\..\AddIns\VersionControl\SubversionAddin\SharpPlink-Win32.svnExe" Name="SharpPlink-Win32.svnExe" Id="SharpPlink_Win32.svnExe" />
<File Source="..\..\AddIns\VersionControl\SubversionAddin\SharpSvn-DB44-20-Win32.dll" Name="SharpSvn-DB44-20-Win32.dll" Id="SharpSvn_DB44_20_Win32.dll" />
<File Source="..\..\AddIns\VersionControl\SubversionAddin\SharpSvn-SASL21-23-Win32.dll" Name="SharpSvn-SASL21-23-Win32.dll" Id="SharpSvn_SASL21_23_Win32.dll" />
</Component>
</Directory>
<Component Id="GitAddInDll" Guid="4AB2E967-7267-42F7-AED1-AB64809F0BC1" DiskId="1">
<File Id="GitAddIn.dll" Name="GitAddIn.dll" Source="..\..\AddIns\VersionControl\GitAddIn.dll" KeyPath="yes" />
<File Id="GitAddIn.addin" Name="GitAddIn.addin" Source="..\..\AddIns\VersionControl\GitAddIn.addin" />
</Component>
</Directory>
</Directory>
<Component Guid="542E5AE1-286C-4CE6-8800-F3AFBB24531D" Id="SharpDevelopWebsiteShortcut" DiskId="1">
<!--

1
src/Setup/Setup.wxs
Unescape View File

@ -374,6 +374,7 @@ @@ -374,6 +374,7 @@
<ComponentRef Id="StartPageAddInFiles"/>
<ComponentRef Id="SubversionAddInDll"/>
<ComponentRef Id="GitAddInDll"/>
<ComponentRef Id="UnitTestingAddInFiles"/>
<ComponentRef Id="SyntaxModesFiles"/>
<ComponentRef Id="SharpDevelopWebsiteShortcut"/>

3
src/Tools/StringResourceTool/ResourceDatabase.cs
Unescape View File

@ -73,7 +73,8 @@ namespace StringResourceTool @@ -73,7 +73,8 @@ namespace StringResourceTool
{
using (ResXResourceWriter writer = new ResXResourceWriter(filename)) {
foreach (ResourceEntry entry in Entries.Values.OrderBy(e => e.Key, StringComparer.OrdinalIgnoreCase)) {
writer.AddResource(entry.Key, entry.Value);
string normalizedValue = entry.Value.Replace("\r", "").Replace("\n", Environment.NewLine);
writer.AddResource(entry.Key, normalizedValue);
}
}
}

3
src/Tools/Tools.build
Unescape View File

@ -55,7 +55,8 @@ @@ -55,7 +55,8 @@
<Target Name="PrepareRelease">
<!--<MSBuild Projects="@(PrepareReleaseProject)" Targets="Build"/>-->
<MSBuild Projects="UpdateAssemblyInfo\UpdateAssemblyInfo.csproj" Targets="Build" Properties="Configuration=Debug"/>
<Exec Command="UpdateAssemblyInfo.exe --REVISION" WorkingDirectory = "UpdateAssemblyInfo\bin\Debug" Timeout = "60000" IgnoreExitCode = "false"/>
<Exec Command="UpdateAssemblyInfo.exe --REVISION --branchname $(BranchName)" WorkingDirectory = "UpdateAssemblyInfo\bin\Debug" Timeout = "60000" Condition = " '$(BranchName)' != '' "/>
<Exec Command="UpdateAssemblyInfo.exe --REVISION" WorkingDirectory = "UpdateAssemblyInfo\bin\Debug" Timeout = "60000" Condition = " '$(BranchName)' == '' "/>
</Target>
<ItemGroup>

42
src/Tools/UpdateAssemblyInfo/Main.cs
Unescape View File

@ -47,6 +47,10 @@ namespace UpdateAssemblyInfo @@ -47,6 +47,10 @@ namespace UpdateAssemblyInfo
Input = "doc/ChangeLog.template.html",
Output = "doc/ChangeLog.html"
},
new TemplateFile {
Input = "src/AddIns/Misc/UsageDataCollector/UsageDataCollector.AddIn/AnalyticsMonitor.AppProperties.template",
Output = "src/AddIns/Misc/UsageDataCollector/UsageDataCollector.AddIn/AnalyticsMonitor.AppProperties.cs"
}
};
class TemplateFile
@ -80,13 +84,18 @@ namespace UpdateAssemblyInfo @@ -80,13 +84,18 @@ namespace UpdateAssemblyInfo
return 2;
}
RetrieveRevisionNumber();
for (int i = 0; i < args.Length; i++) {
if (args[i] == "--branchname" && i + 1 < args.Length && !string.IsNullOrEmpty(args[i+1]))
gitBranchName = args[i + 1];
}
UpdateFiles();
if (args.Contains("--REVISION")) {
var doc = new XDocument(new XElement(
"versionInfo",
new XElement("version", fullVersionNumber),
new XElement("revision", revisionNumber),
new XElement("commitHash", gitCommitHash)
new XElement("commitHash", gitCommitHash),
new XElement("branchName", gitBranchName)
));
doc.Save("REVISION");
}
@ -108,8 +117,12 @@ namespace UpdateAssemblyInfo @@ -108,8 +117,12 @@ namespace UpdateAssemblyInfo
content = content.Replace("$INSERTVERSION$", fullVersionNumber);
content = content.Replace("$INSERTREVISION$", revisionNumber);
content = content.Replace("$INSERTCOMMITHASH$", gitCommitHash);
content = content.Replace("$INSERTSHORTCOMMITHASH$", gitCommitHash.Substring(0, 8));
content = content.Replace("$INSERTDATE$", DateTime.Now.ToString("MM/dd/yyyy", CultureInfo.InvariantCulture));
content = content.Replace("$INSERTYEAR$", DateTime.Now.Year.ToString());
content = content.Replace("$INSERTBRANCHNAME$", gitBranchName);
bool isDefaultBranch = string.IsNullOrEmpty(gitBranchName) || gitBranchName == "master" || char.IsDigit(gitBranchName, 0);
content = content.Replace("$INSERTBRANCHPOSTFIX$", isDefaultBranch ? "" : ("-" + gitBranchName));
if (File.Exists(file.Output)) {
using (StreamReader r = new StreamReader(file.Output)) {
if (r.ReadToEnd() == content) {
@ -173,12 +186,14 @@ namespace UpdateAssemblyInfo @@ -173,12 +186,14 @@ namespace UpdateAssemblyInfo
static string revisionNumber;
static string fullVersionNumber;
static string gitCommitHash;
static string gitBranchName;
static void RetrieveRevisionNumber()
{
if (revisionNumber == null) {
if (Directory.Exists(".git")) {
ReadRevisionNumberFromGit();
ReadBranchNameFromGit();
} else {
Console.WriteLine("There's no git working copy in " + Path.GetFullPath("."));
}
@ -192,7 +207,7 @@ namespace UpdateAssemblyInfo @@ -192,7 +207,7 @@ namespace UpdateAssemblyInfo
static void ReadRevisionNumberFromGit()
{
ProcessStartInfo info = new ProcessStartInfo("cmd", "/c git rev-list --first-parent " + BaseCommit + "..HEAD");
ProcessStartInfo info = new ProcessStartInfo("cmd", "/c git rev-list " + BaseCommit + "..HEAD");
string path = Environment.GetEnvironmentVariable("PATH");
path += ";" + Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), "git\\bin");
info.EnvironmentVariables["PATH"] = path;
@ -215,12 +230,35 @@ namespace UpdateAssemblyInfo @@ -215,12 +230,35 @@ namespace UpdateAssemblyInfo
}
}
static void ReadBranchNameFromGit()
{
ProcessStartInfo info = new ProcessStartInfo("cmd", "/c git branch");
string path = Environment.GetEnvironmentVariable("PATH");
path += ";" + Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), "git\\bin");
info.EnvironmentVariables["PATH"] = path;
info.RedirectStandardOutput = true;
info.UseShellExecute = false;
using (Process p = Process.Start(info)) {
string line;
gitBranchName = "(no branch)";
while ((line = p.StandardOutput.ReadLine()) != null) {
if (line.StartsWith("* ", StringComparison.Ordinal)) {
gitBranchName = line.Substring(2);
}
}
p.WaitForExit();
if (p.ExitCode != 0)
throw new Exception("git-branch exit code was " + p.ExitCode);
}
}
static void ReadRevisionFromFile()
{
try {
XDocument doc = XDocument.Load("REVISION");
revisionNumber = (string)doc.Root.Element("revision");
gitCommitHash = (string)doc.Root.Element("commitHash");
gitBranchName = (string)doc.Root.Element("branchName");
} catch (Exception e) {
Console.WriteLine(e.Message);
Console.WriteLine();

Write Preview
Loading…
Cancel
Save