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:
-rw-r--r--main/Main.sln19
-rw-r--r--main/msbuild/ReferencesVSEditor.Mac.props1
-rw-r--r--main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/MonoDevelop.TextEditor.Cocoa.csproj3
-rw-r--r--main/src/addins/MonoDevelop.TextEditor/MonoDevelop.TextEditor.Cocoa/Properties/MonoDevelop.TextEditor.Cocoa.addin.xml1
4 files changed, 23 insertions, 1 deletions
diff --git a/main/Main.sln b/main/Main.sln
index 3544c02347..469368ab29 100644
--- a/main/Main.sln
+++ b/main/Main.sln
@@ -473,6 +473,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StructureImpl", "external\v
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "RoslynIntegration", "external\vs-editor-core\src\RoslynIntegration\RoslynIntegration.shproj", "{A10C6E18-A872-4D43-9BB2-2B28C70C7BF7}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NavigationProvidersImpl", "external\vs-editor-core\src\Editor\Text\Impl\NavigationProviders\NavigationProvidersImpl.csproj", "{3E8ABAB5-CE9A-484E-B82B-73B89EA2E51A}"
+EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
external\vs-editor-core\src\Editor\Text\Impl\BaseViewImpl\BaseViewImpl.projitems*{47d57f5a-0693-4768-a970-5491d4f5574c}*SharedItemsImports = 13
@@ -2722,6 +2724,22 @@ Global
{6C7ADE4D-2544-581E-918B-659243920781}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
{6C7ADE4D-2544-581E-918B-659243920781}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
{6C7ADE4D-2544-581E-918B-659243920781}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
+ {3E8ABAB5-CE9A-484E-B82B-73B89EA2E51A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {3E8ABAB5-CE9A-484E-B82B-73B89EA2E51A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {3E8ABAB5-CE9A-484E-B82B-73B89EA2E51A}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
+ {3E8ABAB5-CE9A-484E-B82B-73B89EA2E51A}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
+ {3E8ABAB5-CE9A-484E-B82B-73B89EA2E51A}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
+ {3E8ABAB5-CE9A-484E-B82B-73B89EA2E51A}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
+ {3E8ABAB5-CE9A-484E-B82B-73B89EA2E51A}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
+ {3E8ABAB5-CE9A-484E-B82B-73B89EA2E51A}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
+ {3E8ABAB5-CE9A-484E-B82B-73B89EA2E51A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {3E8ABAB5-CE9A-484E-B82B-73B89EA2E51A}.Release|Any CPU.Build.0 = Release|Any CPU
+ {3E8ABAB5-CE9A-484E-B82B-73B89EA2E51A}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
+ {3E8ABAB5-CE9A-484E-B82B-73B89EA2E51A}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
+ {3E8ABAB5-CE9A-484E-B82B-73B89EA2E51A}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
+ {3E8ABAB5-CE9A-484E-B82B-73B89EA2E51A}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
+ {3E8ABAB5-CE9A-484E-B82B-73B89EA2E51A}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
+ {3E8ABAB5-CE9A-484E-B82B-73B89EA2E51A}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -2941,6 +2959,7 @@ Global
{EDC59664-4D54-473E-82E6-BB83FBD1C254} = {32539734-6484-4451-9EF3-61610CA25BBF}
{6C7ADE4D-2544-581E-918B-659243920781} = {32539734-6484-4451-9EF3-61610CA25BBF}
{A10C6E18-A872-4D43-9BB2-2B28C70C7BF7} = {5A92B792-BF17-4748-B29E-34C99B2E8722}
+ {3E8ABAB5-CE9A-484E-B82B-73B89EA2E51A} = {32539734-6484-4451-9EF3-61610CA25BBF}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {856CF524-E2A7-4DB0-B80F-8F1B080A2E25}
diff --git a/main/msbuild/ReferencesVSEditor.Mac.props b/main/msbuild/ReferencesVSEditor.Mac.props
index 334c05d65b..a017d2f878 100644
--- a/main/msbuild/ReferencesVSEditor.Mac.props
+++ b/main/msbuild/ReferencesVSEditor.Mac.props
@@ -36,6 +36,7 @@
<IncludeCopyLocal Include="Microsoft.VisualStudio.Text.BraceCompletion.Implementation.dll" />
<IncludeCopyLocal Include="Microsoft.VisualStudio.Logic.Text.Tagging.Aggregator.Implementation.dll" />
<IncludeCopyLocal Include="Microsoft.VisualStudio.Logic.Text.Navigation.Implementation.dll" />
+ <IncludeCopyLocal Include="Microsoft.VisualStudio.Logic.Text.Navigation.NavigationProviders.dll" />
<IncludeCopyLocal Include="Microsoft.VisualStudio.Logic.Text.Find.Implementation.dll" />
<IncludeCopyLocal Include="Microsoft.VisualStudio.Logic.Text.Classification.LookUp.Implementation.dll" />
<IncludeCopyLocal Include="Microsoft.VisualStudio.Logic.Text.Classification.Aggregator.Implementation.dll" />
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 fbbc826fc4..56c2430705 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
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\..\..\MonoDevelop.props" />
<Import Project="$(ReferencesVSEditor)" />
<Import Project="$(ReferencesGtk)" />
@@ -30,6 +30,7 @@
<ProjectReference Include="..\..\..\..\external\vs-editor-core\src\Editor\Text\Impl\EditorOptions\EditorOptionsImpl.csproj" />
<ProjectReference Include="..\..\..\..\external\vs-editor-core\src\Editor\Text\Impl\EditorPrimitives\EditorPrimitivesImpl.csproj" />
<ProjectReference Include="..\..\..\..\external\vs-editor-core\src\Editor\Text\Impl\Navigation\NavigationImpl.csproj" />
+ <ProjectReference Include="..\..\..\..\external\vs-editor-core\src\Editor\Text\Impl\NavigationProviders\NavigationProvidersImpl.csproj" />
<ProjectReference Include="..\..\..\..\external\vs-editor-core\src\Editor\Text\Impl\Outlining\Outlining.csproj" />
<ProjectReference Include="..\..\..\..\external\vs-editor-core\src\Editor\Text\Impl\RTF\RtfBuilderServiceImpl.csproj" />
<ProjectReference Include="..\..\..\..\external\vs-editor-core\src\Editor\Text\Impl\StandaloneUndo\StandaloneUndoImpl.csproj" />
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 594df6d915..da3782b29c 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
@@ -13,6 +13,7 @@
<Assembly file="../../../bin/Microsoft.VisualStudio.Logic.Text.Classification.LookUp.Implementation.dll" />
<Assembly file="../../../bin/Microsoft.VisualStudio.Logic.Text.Find.Implementation.dll" />
<Assembly file="../../../bin/Microsoft.VisualStudio.Logic.Text.Navigation.Implementation.dll" />
+ <Assembly file="../../../bin/Microsoft.VisualStudio.Logic.Text.Navigation.NavigationProviders.dll" />
<Assembly file="../../../bin/Microsoft.VisualStudio.Logic.Text.Tagging.Aggregator.Implementation.dll" />
<Assembly file="../../../bin/Microsoft.VisualStudio.Text.BraceCompletion.Implementation.dll" />
<Assembly file="../../../bin/Microsoft.VisualStudio.Text.Differencing.Implementation.dll" />