green ci + .net core 2.0 RTM

.gitignore

@@ -33,3 +33,4 @@ TestResult.xml
 fsautocomplete.zip
 fsautocomplete.suave.zip
 .dotnetsdk2_0/
+.dotnetsdk/

.travis.yml

@@ -8,14 +8,18 @@ script:
 
 matrix:
   include:
-    - mono: 4.8.0
-      dotnet: 1.0.1
+    - mono: 4.8.1
+      dotnet: 1.0.4
+    - mono: 5.2.0
+      dotnet: 1.0.4
+      env:
+        - FSAC_TESTSUITE_CROSSGEN_NETFX=1 #works on 5.0
     - mono: latest # => "stable release"
-      dotnet: 1.0.1
+      dotnet: 1.0.4
       env:
         - FSAC_TESTSUITE_CROSSGEN_NETFX=1 #works on 5.0
     - mono: weekly # => "latest commits"
-      dotnet: 1.0.1
+      dotnet: 1.0.4
       env:
         - FSAC_TESTSUITE_CROSSGEN_NETFX=1 #works on 5.0
 

appveyor.yml

@@ -1,6 +1,8 @@
-os:
-  - Windows Server 2012
+image:
   - Visual Studio 2015
+  - Visual Studio 2017
+
 build_script:
   - cmd: build.cmd Test
+
 test: off

build.fsx

@@ -54,8 +54,10 @@ let isTestSkipped fn =
   let file = Path.GetFileName(fn)
   let dir = Path.GetFileName(Path.GetDirectoryName(fn))
   match dir, file with
-  | "DotNetSdk2.0Crossgen", "Runner.fsx" ->
-    Some "fails, ref https://github.com/fsharp/FsAutoComplete/issues/179"
+  | "ProjectCache", "Runner.fsx" ->
+    match environVar "APPVEYOR" with
+    | "True" -> Some "fails, ref https://github.com/fsharp/FsAutoComplete/issues/198"
+    | _ -> None
   | "DotNetCoreCrossgenWithNetFx", "Runner.fsx"
   | "DotNetSdk2.0CrossgenWithNetFx", "Runner.fsx" ->
     match isWindows, environVar "FSAC_TESTSUITE_CROSSGEN_NETFX" with

src/FsAutoComplete.Core/FsAutoComplete.Core.fsproj

@@ -1,20 +1,21 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
-    <Name>FsAutoComplete.Core</Name>
-    <AssemblyName>FsAutoComplete.Core</AssemblyName>
-    <RootNamespace>FsAutoComplete.Core</RootNamespace>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>4e4786f3-4566-44e1-8787-91790007f0f6</ProjectGuid>
     <OutputType>Library</OutputType>
+    <RootNamespace>FsAutoComplete.Core</RootNamespace>
+    <AssemblyName>FsAutoComplete.Core</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <TargetFSharpCoreVersion>4.4.0.0</TargetFSharpCoreVersion>
+    <Name>FsAutoComplete.Core</Name>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
-    <DebugType>Full</DebugType>
+    <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <Tailcalls>false</Tailcalls>
     <OutputPath>bin\Debug\</OutputPath>
@@ -23,7 +24,7 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>PdbOnly</DebugType>
+    <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <Tailcalls>true</Tailcalls>
     <OutputPath>bin\Release\</OutputPath>
@@ -63,7 +64,9 @@
     <Compile Include="Commands.fs" />
     <None Include="paket.references" />
   </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
+  </PropertyGroup>
   <Choose>
     <When Condition="'$(VisualStudioVersion)' == '11.0'">
       <PropertyGroup Condition="Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')">

src/FsAutoComplete.Suave/FsAutoComplete.Suave.fsproj

@@ -22,7 +22,6 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <WarningLevel>3</WarningLevel>
     <PlatformTarget>AnyCPU</PlatformTarget>
-    <DocumentationFile>bin\Debug\FsAutoComplete.Suave.XML</DocumentationFile>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -33,7 +32,6 @@
     <DefineConstants>TRACE</DefineConstants>
     <WarningLevel>3</WarningLevel>
     <PlatformTarget>AnyCPU</PlatformTarget>
-    <DocumentationFile>bin\Release\FsAutoComplete.Suave.XML</DocumentationFile>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
@@ -79,13 +77,6 @@
       </PropertyGroup>
     </When>
   </Choose>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
   <Choose>
     <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5'">
       <ItemGroup>

src/FsAutoComplete/FsAutoComplete.fsproj

@@ -1,66 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B6AB4EF3-8F60-41A1-AB0C-851A6DEB169E}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <RootNamespace>FsAutoComplete</RootNamespace>
     <AssemblyName>fsautocomplete</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
-    <Name>FSharp.InteractiveAutocomplete</Name>
-    <UsePartialTypes>False</UsePartialTypes>
     <TargetFSharpCoreVersion>4.4.0.0</TargetFSharpCoreVersion>
-    <MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
-    <TargetFrameworkProfile />
+    <Name>FSharp.InteractiveAutocomplete</Name>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>True</DebugSymbols>
+    <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
-    <Optimize>False</Optimize>
-    <Tailcalls>False</Tailcalls>
-    <OutputPath>bin\Debug</OutputPath>
+    <Optimize>false</Optimize>
+    <Tailcalls>false</Tailcalls>
+    <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <WarningLevel>3</WarningLevel>
-    <DocumentationFile>bin\Debug\fsautocomplete.xml</DocumentationFile>
     <OtherFlags>--warnon:1182</OtherFlags>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
-    <Optimize>True</Optimize>
-    <Tailcalls>True</Tailcalls>
-    <OutputPath>bin\Release</OutputPath>
+    <Optimize>true</Optimize>
+    <Tailcalls>true</Tailcalls>
+    <OutputPath>bin\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <WarningLevel>3</WarningLevel>
-    <DocumentationFile>bin\Release\fsautocomplete.xml</DocumentationFile>
-    <DebugSymbols>False</DebugSymbols>
-  </PropertyGroup>
-  <PropertyGroup>
-    <FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(VisualStudioVersion)' == '10.0' OR '$(VisualStudioVersion)' == '11.0'">
-    <FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath>
   </PropertyGroup>
-  <Import Project="$(FSharpTargetsPath)" Condition="Exists('$(FSharpTargetsPath)')" />
-  <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5'">
-      <PropertyGroup>
-        <__paket__FSharp_Compiler_Service_ProjectCracker_targets>net45\FSharp.Compiler.Service.ProjectCracker</__paket__FSharp_Compiler_Service_ProjectCracker_targets>
-      </PropertyGroup>
-    </When>
-  </Choose>
-  <!--
-  <PropertyGroup>
-    <FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(VisualStudioVersion)' == '10.0' OR '$(VisualStudioVersion)' == '11.0'">
-    <FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath>
-  </PropertyGroup>
-  <Import Project="$(FSharpTargetsPath)" Condition="Exists('$(FSharpTargetsPath)')" />
-  -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.fs" />
     <Compile Include="Debug.fs" />
@@ -74,8 +44,9 @@
   <ItemGroup>
     <Reference Include="mscorlib" />
     <Reference Include="System" />
-    <Reference Include="System.Xml" />
+    <Reference Include="System.Core" />
     <Reference Include="System.Numerics" />
+    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\FsAutoComplete.Core\FsAutoComplete.Core.fsproj">
@@ -84,6 +55,29 @@
       <Private>True</Private>
     </ProjectReference>
   </ItemGroup>
+  <PropertyGroup>
+    <MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
+  </PropertyGroup>
+  <Choose>
+    <When Condition="'$(VisualStudioVersion)' == '11.0'">
+      <PropertyGroup Condition="Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')">
+        <FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath>
+      </PropertyGroup>
+    </When>
+    <Otherwise>
+      <PropertyGroup Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets')">
+        <FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+  <Import Project="$(FSharpTargetsPath)" />
+  <Choose>
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5'">
+      <PropertyGroup>
+        <__paket__FSharp_Compiler_Service_ProjectCracker_targets>net45\FSharp.Compiler.Service.ProjectCracker</__paket__FSharp_Compiler_Service_ProjectCracker_targets>
+      </PropertyGroup>
+    </When>
+  </Choose>
   <Choose>
     <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5'">
       <ItemGroup>
@@ -173,15 +167,6 @@
       </ItemGroup>
     </When>
   </Choose>
-  <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5'">
-      <ItemGroup>
-        <Reference Include="System.Core">
-          <Paket>True</Paket>
-        </Reference>
-      </ItemGroup>
-    </When>
-  </Choose>
   <Choose>
     <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5'">
       <ItemGroup>

src/FsAutoComplete/paket.references

@@ -1,3 +1,4 @@
 FSharp.Compiler.Service
+FSharp.Compiler.Service.ProjectCracker
 NDesk.Options
 Newtonsoft.Json

test/FsAutoComplete.IntegrationTests/DotNetCore/AppAndLibRunner.fsx

@@ -7,12 +7,17 @@ Environment.CurrentDirectory <- __SOURCE_DIRECTORY__
 let outputJson = "appandlib.json"
 File.Delete outputJson
 
-runProcess __SOURCE_DIRECTORY__ "dotnet" "--info" |> ignore
+let doIt () =
+  let sdkDir = DotnetCli.sdk1Dir ()
 
-match runProcessCaptureOut __SOURCE_DIRECTORY__ "dotnet" "restore sample1/c1" with
-| NonExitCodeResult data ->
+  use _sdk1 = DotnetCli.useSdk sdkDir
+
+  runProcess __SOURCE_DIRECTORY__ "dotnet" "--info" |> ignore
+
+  match runProcessCaptureOut __SOURCE_DIRECTORY__ "dotnet" "restore sample1/c1" with
+  | NonExitCodeResult data ->
     data |> processResultLog "failed 'dotnet restore sample1/c1'" |> writeNormalizedOutput outputJson
-| _ ->
+  | _ ->
     let p = new FsAutoCompleteWrapper()
 
     p.project "sample1/c1/c1.fsproj"
@@ -21,3 +26,5 @@ match runProcessCaptureOut __SOURCE_DIRECTORY__ "dotnet" "restore sample1/c1" wi
     p.send "quit\n"
     p.finalOutput ()
     |> writeNormalizedOutput outputJson
+
+doIt ()

test/FsAutoComplete.IntegrationTests/DotNetCore/NotRestoredRunner.fsx

@@ -7,17 +7,24 @@ Environment.CurrentDirectory <- __SOURCE_DIRECTORY__
 let outputJson = "notrestored.json"
 File.Delete outputJson
 
-runProcess __SOURCE_DIRECTORY__ "dotnet" "--info" |> ignore
+let doIt () =
+  let sdkDir = DotnetCli.sdk1Dir ()
 
-[ for c in ["c1";"l1"] do
+  use _sdk1 = DotnetCli.useSdk sdkDir
+
+  runProcess __SOURCE_DIRECTORY__ "dotnet" "--info" |> ignore
+
+  [ for c in ["c1";"l1"] do
     for outDir in ["obj";"bin"] do
       yield System.IO.Path.Combine("sample1", c, outDir) ]
-|> List.iter deleteDir
+  |> List.iter deleteDir
+
+  let p = new FsAutoCompleteWrapper()
 
-let p = new FsAutoCompleteWrapper()
+  p.project "sample1/c1/c1.fsproj"
 
-p.project "sample1/c1/c1.fsproj"
+  p.send "quit\n"
+  p.finalOutput ()
+  |> writeNormalizedOutput outputJson
 
-p.send "quit\n"
-p.finalOutput ()
-|> writeNormalizedOutput outputJson
+doIt ()

test/FsAutoComplete.IntegrationTests/DotNetCoreCrossgen/Runner.fsx

@@ -7,6 +7,10 @@ Environment.CurrentDirectory <- __SOURCE_DIRECTORY__
 File.Delete "output.json"
 
 let doIt () =
+  let sdkDir = DotnetCli.sdk1Dir ()
+
+  use _sdk1 = DotnetCli.useSdk sdkDir
+
   runProcess __SOURCE_DIRECTORY__ "dotnet" "--info" |> ignore
 
   match runProcessCaptureOut __SOURCE_DIRECTORY__ "dotnet" "restore sample1/c1" with

test/FsAutoComplete.IntegrationTests/DotNetCoreCrossgenWithNetFx/Runner.fsx

@@ -7,6 +7,10 @@ Environment.CurrentDirectory <- __SOURCE_DIRECTORY__
 File.Delete "output.json"
 
 let doIt () =
+  let sdkDir = DotnetCli.sdk1Dir ()
+
+  use _sdk1 = DotnetCli.useSdk sdkDir
+
   runProcess __SOURCE_DIRECTORY__ "dotnet" "--info" |> ignore
 
   use _withNetFxLib = DotnetCli.withNetFxBclAvaiable "4.6.1"
@@ -24,5 +28,4 @@ let doIt () =
     p.finalOutput ()
     |> writeNormalizedOutput "output.json"
 
-
 doIt ()