V7 (#650)

* Use v7 branch for preview

* Use preview branch for ASTViewer

Directory.Build.props

@@ -14,7 +14,7 @@
         <OtherFlags>$(OtherFlags) --test:GraphBasedChecking --test:ParallelOptimization --test:ParallelIlxGen</OtherFlags>
         <!-- Override these values to point to your local fantomas repository -->
         <FantomasMainRepository>$(MSBuildThisFileDirectory).deps\fantomas</FantomasMainRepository>
-        <FantomasPreviewRepository>$(MSBuildThisFileDirectory).deps\main</FantomasPreviewRepository>
+        <FantomasPreviewRepository>$(MSBuildThisFileDirectory).deps\v7.0</FantomasPreviewRepository>
         <RollForward>LatestMajor</RollForward>
         <UseArtifactsOutput>true</UseArtifactsOutput>
         <SatelliteResourceLanguages>en</SatelliteResourceLanguages>

build.fsx

@@ -18,7 +18,7 @@ let fantomasV5Port = 11009
 let fantomasV6Port = 13042
 let pwd = __SOURCE_DIRECTORY__
 let fantomasDepDir = pwd </> ".deps" </> "fantomas"
-let previewBranch = "main"
+let previewBranch = "v7.0"
 let previewDepDir = pwd </> ".deps" </> previewBranch
 let clientDir = pwd </> "src" </> "client"
 let serverDir = __SOURCE_DIRECTORY__ </> "src" </> "server"

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.200",
+    "version": "8.0.400",
     "rollForward": "latestPatch"
   }
 }

src/server/ASTViewer/ASTViewer.fsproj

@@ -24,7 +24,7 @@
     <Compile Include="Program.fs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(FantomasMainRepository)\src\Fantomas.Core\Fantomas.Core.fsproj" />
+    <ProjectReference Include="$(FantomasPreviewRepository)\src\Fantomas.Core\Fantomas.Core.fsproj" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="FSharp.Core" Version="6.0.6" />

src/server/FantomasOnlineV6/packages.lock.json

@@ -25,12 +25,12 @@
       },
       "Fantomas.Core": {
         "type": "Direct",
-        "requested": "[6.3.0, )",
-        "resolved": "6.3.0",
-        "contentHash": "sJW/mzDBdwybxZ9K6Tqv35r8d3310l8Srp3slZXJRa4g9tzszGBf6qFrSVVSFjG/PM5ksPXrM/z8ROEhQFpMfw==",
+        "requested": "[6.3.13, )",
+        "resolved": "6.3.13",
+        "contentHash": "e4zv4Mi7puclS4mX8MYhit5v60wGwb8a88Vtw9CUw1EVU8PFTyIkDp8VBMMtVz/K04jr1PF1PEeABN9uxX+V9A==",
         "dependencies": {
           "FSharp.Core": "6.0.1",
-          "Fantomas.FCS": "6.3.0"
+          "Fantomas.FCS": "6.3.13"
         }
       },
       "FSharp.Core": {
@@ -79,8 +79,8 @@
       },
       "Fantomas.FCS": {
         "type": "Transitive",
-        "resolved": "6.3.0",
-        "contentHash": "opGfH46BBIyo4WYTp5lFdbRL6UNNeAbjasbHc6bJ6W6rz71p8qGa7lPhBL/XgNA4CrX1ax8e/91nsnQYBoIpdg==",
+        "resolved": "6.3.13",
+        "contentHash": "o6bw1G2reLhm7svw0wxgJJSO6hQToMVTQBhQowjE1uPksV/CwjVN1Sf/pRbBvXUA/RXq/jT8sd903oWpWy7EQA==",
         "dependencies": {
           "FSharp.Core": "6.0.1",
           "System.Collections.Immutable": "7.0.0",