Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

V7 #650

Merged
merged 2 commits into from
Sep 16, 2024
Merged

V7 #650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da3169e
Use v7 branch for preview
nojaf Sep 16, 2024
4f1693e
Use preview branch for ASTViewer
nojaf Sep 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion build.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "8.0.200",
"version": "8.0.400",
"rollForward": "latestPatch"
}
}
2 changes: 1 addition & 1 deletion src/server/ASTViewer/ASTViewer.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
12 changes: 6 additions & 6 deletions src/server/FantomasOnlineV6/packages.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down Expand Up @@ -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",
Expand Down