diff options
author | Kirill Osenkov <github@osenkov.com> | 2019-04-24 00:43:44 +0300 |
---|---|---|
committer | Kirill Osenkov <github@osenkov.com> | 2019-04-25 00:05:45 +0300 |
commit | 1a8cf3569cd8c7e8c2ef98fe8c937a969c5395a0 (patch) | |
tree | 27b79f025948cc689fa3ba3c821990ebe7b5d73b /main/src/addins/MonoDevelop.TextEditor | |
parent | 85aeed9d94711fb4d1b73b571f1a86b9144429bf (diff) |
Fix Windows build.
Move editor implementations from Ide.addin.xml to Cocoa.addin.xml.
Diffstat (limited to 'main/src/addins/MonoDevelop.TextEditor')
4 files changed, 58 insertions, 10 deletions
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 79c7d8e99f..f9367678a9 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 @@ -1,16 +1,40 @@ <ExtensionModel> <Runtime> - <Import assembly="Microsoft.VisualStudio.UI.Controls.macOS.dll" /> - <Import assembly="Microsoft.VisualStudio.Text.Find.Implementation.dll" /> + <Import assembly="../../../bin/Microsoft.VisualStudio.CoreUtilityImplementation.dll" /> + <Import assembly="../../../bin/Microsoft.VisualStudio.Language.Implementation.dll" /> + <Import assembly="../../../bin/Microsoft.VisualStudio.Language.Utilities.dll" /> + <Import assembly="../../../bin/Microsoft.VisualStudio.Logic.Text.BufferUndoManager.Implementation.dll" /> + <Import assembly="../../../bin/Microsoft.VisualStudio.Logic.Text.Classification.Aggregator.Implementation.dll" /> + <Import assembly="../../../bin/Microsoft.VisualStudio.Logic.Text.Classification.LookUp.Implementation.dll" /> + <Import assembly="../../../bin/Microsoft.VisualStudio.Logic.Text.Find.Implementation.dll" /> + <Import assembly="../../../bin/Microsoft.VisualStudio.Logic.Text.Navigation.Implementation.dll" /> + <Import assembly="../../../bin/Microsoft.VisualStudio.Logic.Text.Tagging.Aggregator.Implementation.dll" /> + <Import assembly="../../../bin/Microsoft.VisualStudio.Text.BraceCompletion.Implementation.dll" /> + <Import assembly="../../../bin/Microsoft.VisualStudio.Text.Data.Utilities.dll" /> + <Import assembly="../../../bin/Microsoft.VisualStudio.Text.Differencing.Implementation.dll" /> + <Import assembly="../../../bin/Microsoft.VisualStudio.Text.EditorOptions.Implementation.dll" /> <Import assembly="../../../bin/Microsoft.VisualStudio.Text.Extras.dll" /> + <Import assembly="../../../bin/Microsoft.VisualStudio.Text.Implementation.StandaloneUndo.dll" /> + <Import assembly="../../../bin/Microsoft.VisualStudio.Text.Logic.Utilities.dll" /> + <Import assembly="../../../bin/Microsoft.VisualStudio.Text.Model.Implementation.dll" /> + <Import assembly="../../../bin/Microsoft.VisualStudio.Text.MultiCaret.Implementation.dll" /> + <Import assembly="../../../bin/Microsoft.VisualStudio.Text.Outlining.Implementation.dll" /> + <Import assembly="../../../bin/Microsoft.VisualStudio.Text.PatternMatching.Implementation.dll" /> <Import assembly="../../../bin/Microsoft.VisualStudio.Text.UI.Cocoa.dll" /> + <Import assembly="../../../bin/Microsoft.VisualStudio.Text.UI.Utilities.dll" /> + <Import assembly="../../../bin/Microsoft.VisualStudio.UI.Text.Commanding.Implementation.dll" /> + <Import assembly="../../../bin/Microsoft.VisualStudio.UI.Text.EditorOperations.Implementation.dll" /> + <Import assembly="../../../bin/Microsoft.VisualStudio.UI.Text.EditorPrimitives.Implementation.dll" /> + <Import assembly="Microsoft.VisualStudio.Text.Find.Implementation.dll" /> + <Import assembly="Microsoft.VisualStudio.UI.Controls.macOS.dll" /> </Runtime> + <!-- These are coming from vs-editor-api (no Cocoa dependency) --> <Extension path="/MonoDevelop/Ide/Composition"> <Assembly file="Microsoft.CodeAnalysis.EditorFeatures.Cocoa.dll" /> <Assembly file="Microsoft.VisualStudio.Language.StandardClassification.Implementation.dll" /> <Assembly file="Microsoft.VisualStudio.Logic.Text.Navigation.NavigationProviders.dll" /> - <Assembly file="Microsoft.VisualStudio.Text.Find.Implementation.dll" /> <Assembly file="Microsoft.VisualStudio.Logic.Text.UrlTagger.Implementation.dll" /> + <Assembly file="Microsoft.VisualStudio.Text.Find.Implementation.dll" /> <Assembly file="Microsoft.VisualStudio.Text.Formatting.RtfBuilderService.Implementation.dll" /> <Assembly file="Microsoft.VisualStudio.Text.Structure.dll" /> <Assembly file="Microsoft.VisualStudio.UI.Text.AdornmentLibrary.ToolTip.Implementation.dll" /> @@ -22,6 +46,33 @@ <Assembly file="Microsoft.VisualStudio.UI.Text.Wpf.GlyphMargin.Implementation.dll" /> <Assembly file="MonoDevelop.TextEditor.Cocoa.dll" /> </Extension> + <!-- these are coming from vs-editor-core (Cocoa implementations) --> + <Extension path="/MonoDevelop/Ide/Composition"> + <Assembly file="Microsoft.VisualStudio.CoreUtilityImplementation.dll" /> + <Assembly file="Microsoft.VisualStudio.Language.Implementation.dll" /> + <Assembly file="Microsoft.VisualStudio.Language.Utilities.dll" /> + <Assembly file="Microsoft.VisualStudio.Logic.Text.BufferUndoManager.Implementation.dll" /> + <Assembly file="Microsoft.VisualStudio.Logic.Text.Classification.Aggregator.Implementation.dll" /> + <Assembly file="Microsoft.VisualStudio.Logic.Text.Classification.LookUp.Implementation.dll" /> + <Assembly file="Microsoft.VisualStudio.Logic.Text.Find.Implementation.dll" /> + <Assembly file="Microsoft.VisualStudio.Logic.Text.Navigation.Implementation.dll" /> + <Assembly file="Microsoft.VisualStudio.Logic.Text.Tagging.Aggregator.Implementation.dll" /> + <Assembly file="Microsoft.VisualStudio.Text.BraceCompletion.Implementation.dll" /> + <Assembly file="Microsoft.VisualStudio.Text.Data.Utilities.dll" /> + <Assembly file="Microsoft.VisualStudio.Text.Differencing.Implementation.dll" /> + <Assembly file="Microsoft.VisualStudio.Text.EditorOptions.Implementation.dll" /> + <Assembly file="Microsoft.VisualStudio.Text.Extras.dll" /> + <Assembly file="Microsoft.VisualStudio.Text.Implementation.StandaloneUndo.dll" /> + <Assembly file="Microsoft.VisualStudio.Text.Logic.Utilities.dll" /> + <Assembly file="Microsoft.VisualStudio.Text.Model.Implementation.dll" /> + <Assembly file="Microsoft.VisualStudio.Text.MultiCaret.Implementation.dll" /> + <Assembly file="Microsoft.VisualStudio.Text.Outlining.Implementation.dll" /> + <Assembly file="Microsoft.VisualStudio.Text.PatternMatching.Implementation.dll" /> + <Assembly file="Microsoft.VisualStudio.Text.UI.Utilities.dll" /> + <Assembly file="Microsoft.VisualStudio.UI.Text.Commanding.Implementation.dll" /> + <Assembly file="Microsoft.VisualStudio.UI.Text.EditorOperations.Implementation.dll" /> + <Assembly file="Microsoft.VisualStudio.UI.Text.EditorPrimitives.Implementation.dll" /> + </Extension> <Extension path="/MonoDevelop/Core/StockIcons"> <StockIcon stockid="vs-find-replace-search" resource="vs-find-replace-search-16.png" size="Menu" imageid="{6114fe54-2a4a-4354-aabb-d2b8fad160a5}#1" /> <StockIcon stockid="vs-find-replace-close" resource="vs-find-replace-close-16.png" size="Menu" imageid="{6114fe54-2a4a-4354-aabb-d2b8fad160a5}#2" /> diff --git a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Wpf/MonoDevelop.TextEditor.Wpf.csproj b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Wpf/MonoDevelop.TextEditor.Wpf.csproj index 5f48cde664..5824ff02ac 100644 --- a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Wpf/MonoDevelop.TextEditor.Wpf.csproj +++ b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Wpf/MonoDevelop.TextEditor.Wpf.csproj @@ -19,9 +19,8 @@ <PackageReference Include="Microsoft.VisualStudio.Language" Version="$(NuGetVersionVSEditor)" PrivateAssets="all" ExcludeAssets="runtime" /> <PackageReference Include="Microsoft.VisualStudio.Language.Intellisense" Version="$(NuGetVersionVSEditor)" PrivateAssets="all" ExcludeAssets="runtime" /> <ProjectReference Include="..\MonoDevelop.TextEditor\MonoDevelop.TextEditor.csproj" Private="False" /> + <ProjectReference Include="..\..\..\..\external\vs-editor-api\src\Editor\Text\Def\Extras\Extras.csproj" /> <ProjectReference Include="..\..\..\..\external\xwt\Xwt\Xwt.csproj" Private="False" /> - <ProjectReference Include="..\..\..\..\external\vs-editor-core\src\Editor\Text\Impl\Find\Find.csproj" /> - <ProjectReference Include="..\..\..\..\external\vs-editor-core\src\Editor\Text\Def\InfoBar\InfoBar.csproj" /> <Reference Include="PresentationCore" /> <Reference Include="PresentationFramework" /> <Reference Include="WindowsBase" /> @@ -30,8 +29,7 @@ </ItemGroup> <ItemGroup> <IncludeCopyLocal Include="DiagnosticMargin.dll" /> - <IncludeCopyLocal Include="Microsoft.VisualStudio.Text.Find.Implementation.dll" /> - <IncludeCopyLocal Include="Microsoft.VisualStudio.Text.InfoBar.dll" /> + <IncludeCopyLocal Include="Microsoft.VisualStudio.Text.Extras.dll" /> </ItemGroup> <ItemGroup> <Page Include="**\*.xaml"> diff --git a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Wpf/Properties/MonoDevelop.TextEditor.Wpf.addin.xml b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Wpf/Properties/MonoDevelop.TextEditor.Wpf.addin.xml index fddacd38b3..8048c10499 100644 --- a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Wpf/Properties/MonoDevelop.TextEditor.Wpf.addin.xml +++ b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Wpf/Properties/MonoDevelop.TextEditor.Wpf.addin.xml @@ -3,14 +3,13 @@ <Import assembly="MonoDevelop.TextEditor.Wpf.dll"/> <Import assembly="../../../bin/Microsoft.VisualStudio.Language.NavigateTo.Interfaces.dll" /> <Import assembly="../../../bin/Microsoft.VisualStudio.Text.Internal.dll" /> + <Import assembly="Microsoft.VisualStudio.Text.Extras.dll" /> </Runtime> <Extension path="/MonoDevelop/Ide/Composition"> <Assembly file="../../../bin/Microsoft.CodeAnalysis.EditorFeatures.Wpf.dll"/> <Assembly file="../../../bin/Microsoft.VisualStudio.Platform.VSEditor.dll"/> <Assembly file="../../../bin/Microsoft.VisualStudio.Text.UI.Wpf.dll"/> <Assembly file="MonoDevelop.TextEditor.Wpf.dll"/> - <Assembly file="Microsoft.VisualStudio.Text.Find.Implementation.dll"/> - <Assembly file="Microsoft.VisualStudio.Text.InfoBar.dll"/> <Assembly file="DiagnosticMargin.dll"/> </Extension> <Extension path = "/MonoDevelop/TextEditor/CommandMapping"> diff --git a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/TextViewImports.cs b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/TextViewImports.cs index 265bf93dd8..76f50ceea0 100644 --- a/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/TextViewImports.cs +++ b/main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor/TextViewImports.cs @@ -69,7 +69,7 @@ namespace MonoDevelop.TextEditor [Import] internal IEditorFormatMapService EditorFormatMapService { get; set; } - [Import] + [Import(AllowDefault = true)] internal IFindPresenterFactory FindPresenterFactory { get; set; } [Import(AllowDefault = true)] |