build against 7.0 api

nosami · Mar 17, 2017 · 5effb28 · 5effb28
1 parent feecf07
commit 5effb28
Show file tree

Hide file tree

Showing 9 changed files with 364 additions and 283 deletions.
diff --git a/XSVim.Tests/Properties/AddinInfo.fs b/XSVim.Tests/Properties/AddinInfo.fs
diff --git a/XSVim.Tests/TestHelpers.fs b/XSVim.Tests/TestHelpers.fs
@@ -1,22 +1,37 @@
 namespace XSVim.Tests
 
 open System
-open System.Text
-open Mono.TextEditor
 open MonoDevelop.Ide.Editor.Extension
 open NUnit.Framework
 open XSVim
+open MonoDevelop.Core
+open MonoDevelop.Ide.Editor
+
+module FixtureSetup =
+    let firstRun = ref true
+
+    let initialiseMonoDevelop() =
+        if !firstRun then
+            firstRun := false
+            Environment.SetEnvironmentVariable ("MONO_ADDINS_REGISTRY", "/tmp")
+            //Environment.SetEnvironmentVariable ("XDG_CONFIG_HOME", "/tmp")
+            //MonoDevelop.FSharp.MDLanguageService.DisableVirtualFileSystem()
+            Runtime.Initialize (true)
+            MonoDevelop.Ide.DesktopService.Initialize()
+
+            //GuiUnit.TestRunner.ExitCode |> ignore // hack to get GuiUnit into the AppDomain
 
 [<AutoOpen>]
 module TestHelpers =
     let test (source:string) (keys:string) expected expectedMode =
-        let editor = new TextEditorData()
+        FixtureSetup.initialiseMonoDevelop()
+        let editor = TextEditorFactory.CreateNewEditor()
         let caret = source.IndexOf "$"
         editor.Text <- source.Replace("$", "")
-        editor.Caret.Offset <- caret
-        editor.Caret.UpdateCaretOffset()
+        editor.CaretOffset <- caret
+        //editor.Caret.UpdateCaretOffset()
         let plugin = new XSVim()
-        let state = { keys=[]; mode=NormalMode; visualStartOffset=0; findCharCommand=None; lastAction=[] }
+        let state = { keys=[]; mode=NormalMode; visualStartOffset=0; findCharCommand=None; lastAction=[]; clipboard="" }
         let newState =
             keys |> Seq.fold(fun state c ->
                 let descriptor = KeyDescriptor.FromGtk(Gdk.Key.a (* important? *), c, Gdk.ModifierType.None)

diff --git a/XSVim.Tests/XSVim.Tests.fsproj b/XSVim.Tests/XSVim.Tests.fsproj
@@ -3,11 +3,10 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{3C522649-67F6-4F65-9CC9-D5847768FE68}</ProjectGuid>
-    <ProjectTypeGuids>{86F6BF2A-E449-4B3E-813B-9ACC37E5545F};{F2A71F9B-5D33-465A-A702-920D77279786}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <RootNamespace>XSVim.Tests</RootNamespace>
     <AssemblyName>XSVim.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <TestRunnerCommand>..\..\monodevelop\main\build\bin\mdtool.exe</TestRunnerCommand>
     <TestRunnerArgs>run-md-tests</TestRunnerArgs>
   </PropertyGroup>
@@ -34,32 +33,44 @@
   <PropertyGroup Condition="'$(VisualStudioVersion)' == '10.0' OR '$(VisualStudioVersion)' == '11.0'">
     <FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath>
   </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.fs" />
-    <Compile Include="Properties\AddinInfo.fs" />
-    <Compile Include="TestHelpers.fs" />
-    <Compile Include="DeleteTests.fs" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Properties\Manifest.addin.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\XSVim\XSVim.fsproj">
       <Project>{9DB313D4-4CD1-455F-846F-42CD234DE626}</Project>
       <Name>XSVim</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <AddinReference Include="MonoDevelop.SourceEditor2" />
-  </ItemGroup>
-  <ItemGroup>
+    <Reference Include="MonoDevelop.SourceEditor">
+      <HintPath>..\lib\MonoDevelop.SourceEditor.dll</HintPath>
+    </Reference>
+    <Reference Include="MonoDevelop.Ide">
+      <HintPath>..\lib\MonoDevelop.Ide.dll</HintPath>
+    </Reference>
+    <Reference Include="MonoDevelop.Core">
+      <HintPath>..\lib\MonoDevelop.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="MonoDevelop.DesignerSupport">
+      <HintPath>..\lib\MonoDevelop.DesignerSupport.dll</HintPath>
+    </Reference>
+    <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
+      <Private>True</Private>
+    </Reference>
     <Reference Include="GuiUnit">
       <HintPath>..\lib\GuiUnit.exe</HintPath>
     </Reference>
+    <Reference Include="atk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <Reference Include="pango-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <Reference Include="Mono.Posix" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.fs" />
+    <EmbeddedResource Include="Properties\Manifest.addin.xml" />
+    <Compile Include="TestHelpers.fs" />
+    <Compile Include="DeleteTests.fs" />
   </ItemGroup>
   <Import Project="$(FSharpTargetsPath)" />
-  <Import Project="..\packages\MonoDevelop.Addins.0.3.3\build\net40\MonoDevelop.Addins.targets" Condition="Exists('..\packages\MonoDevelop.Addins.0.3.3\build\net40\MonoDevelop.Addins.targets')" />
-</Project>
+</Project>
diff --git a/XSVim.Tests/packages.config b/XSVim.Tests/packages.config
diff --git a/XSVim.sln b/XSVim.sln
@@ -3,6 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2012
 Project("{f2a71f9b-5d33-465a-a702-920d77279786}") = "XSVim", "XSVim\XSVim.fsproj", "{9DB313D4-4CD1-455F-846F-42CD234DE626}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{E0ACA694-13C8-4B99-9FC9-196E85272651}"
+	ProjectSection(SolutionItems) = preProject
+		addin-project.xml = addin-project.xml
+	EndProjectSection
+EndProject
 Project("{f2a71f9b-5d33-465a-a702-920d77279786}") = "XSVim.Tests", "XSVim.Tests\XSVim.Tests.fsproj", "{3C522649-67F6-4F65-9CC9-D5847768FE68}"
 EndProject
 Global

diff --git a/XSVim/Properties/AddinInfo.fs b/XSVim/Properties/AddinInfo.fs
@@ -3,7 +3,7 @@
 open System
 open Mono.Addins
 open Mono.Addins.Description
-
+open MonoDevelop
 [<assembly:Addin (
   "XSVim", 
   Namespace = "XSVim",
@@ -15,4 +15,7 @@ open Mono.Addins.Description
 [<assembly:AddinDescription ("Vim emulation layer for Xamarin Studio / Visual Studio for Mac.")>]
 [<assembly:AddinUrl ("https://github.com/nosami/XSVim")>]
 [<assembly:AddinAuthor ("jason")>]
+[<assembly:AddinDependency ("::MonoDevelop.Core", BuildInfo.Version)>]
+[<assembly:AddinDependency ("::MonoDevelop.Ide", BuildInfo.Version)>]
+[<assembly:AddinDependency ("::MonoDevelop.SourceEditor2", BuildInfo.Version)>]
 ()