Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/monodevelop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid KarlasĖŒ <david.karlas@microsoft.com>2019-10-09 11:19:27 +0300
committerAaron Bockover <abock@microsoft.com>2019-10-09 19:33:30 +0300
commit733065026ba6a69a9d9ec33b7e285d94a5e1ed28 (patch)
treef8a990b4d5d46d24aed700c7c53cbfbd9afa7c24 /main/src/addins/MonoDevelop.TextEditor
parentbd2723c5307028adc184418555aa1146aefaf793 (diff)
Integrate DiffPreview
Diffstat (limited to 'main/src/addins/MonoDevelop.TextEditor')
-rw-r--r--main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/MonoDevelop.TextEditor.Cocoa.csproj4
-rw-r--r--main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/Properties/MonoDevelop.TextEditor.Cocoa.addin.xml2
2 files changed, 6 insertions, 0 deletions
diff --git a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/MonoDevelop.TextEditor.Cocoa.csproj b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/MonoDevelop.TextEditor.Cocoa.csproj
index d431330ebf..83e0c80f53 100644
--- a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/MonoDevelop.TextEditor.Cocoa.csproj
+++ b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/MonoDevelop.TextEditor.Cocoa.csproj
@@ -68,6 +68,8 @@
<ProjectReference Include="$(VSEditorCoreDirectory)src\Editor\Text\Impl\DragDrop\DragDropImpl.csproj" Private="True" />
<ProjectReference Include="$(VSEditorCoreDirectory)src\Editor\Text\Impl\ChangeTagger\ChangeTagger.csproj" Private="True" />
<ProjectReference Include="$(VSEditorCoreDirectory)src\TextMate\Core\Core.csproj" Private="True" />
+ <ProjectReference Include="$(VSEditorCoreDirectory)src\Editor\Text\Impl\DifferenceViewer\DifferenceViewerImpl.csproj" Private="True" />
+ <ProjectReference Include="$(VSEditorCoreDirectory)src\Editor\Text\Impl\DifferenceBuffer\DifferenceBufferImpl.csproj" Private="True" />
<Reference Include="MonoDevelop.DesignerSupport">
<HintPath>..\..\..\..\build\AddIns\MonoDevelop.DesignerSupport\MonoDevelop.DesignerSupport.dll</HintPath>
<Private>False</Private>
@@ -102,6 +104,8 @@
<IncludeCopyLocal Include="Microsoft.VisualStudio.Logic.Text.UrlTagger.Implementation.dll" />
<IncludeCopyLocal Include="Microsoft.VisualStudio.UI.Text.Cocoa.DragDrop.Implementation.dll" />
<IncludeCopyLocal Include="Microsoft.VisualStudio.Logic.Text.ChangeTagger.Implementation.dll" />
+ <IncludeCopyLocal Include="Microsoft.VisualStudio.Text.DifferenceBuffer.Implementation.dll" />
+ <IncludeCopyLocal Include="Microsoft.VisualStudio.Text.DifferenceViewer.Implementation.dll" />
<IncludeCopyLocal Include="Microsoft.VisualStudio.TextMate.Core.dll" />
</ItemGroup>
<ItemGroup>
diff --git a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/Properties/MonoDevelop.TextEditor.Cocoa.addin.xml b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/Properties/MonoDevelop.TextEditor.Cocoa.addin.xml
index 4815cb2516..195cecc12b 100644
--- a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/Properties/MonoDevelop.TextEditor.Cocoa.addin.xml
+++ b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/Properties/MonoDevelop.TextEditor.Cocoa.addin.xml
@@ -50,6 +50,8 @@
<Assembly file="Microsoft.VisualStudio.UI.Text.Cocoa.DragDrop.Implementation.dll" />
<Assembly file="Microsoft.VisualStudio.Logic.Text.ChangeTagger.Implementation.dll" />
<Assembly file="Microsoft.VisualStudio.Logic.Text.TaskTagger.Implementation.dll" />
+ <Assembly file="Microsoft.VisualStudio.Text.DifferenceBuffer.Implementation.dll" />
+ <Assembly file="Microsoft.VisualStudio.Text.DifferenceViewer.Implementation.dll" />
<Assembly file="MonoDevelop.TextEditor.Cocoa.dll" />
<!-- These are coming from vs-editor-api (no Cocoa dependency) -->
<Assembly file="../../../bin/Microsoft.VisualStudio.CoreUtilityImplementation.dll" />