Skip to content

Commit 49a19ce

Browse files
committed
Bumped FSharp.Formatting locally
1 parent b64308a commit 49a19ce

File tree

3 files changed

+25
-22
lines changed

3 files changed

+25
-22
lines changed

fcs/docsrc/tools/generate.fsx

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#r "paket: groupref generate //"
77
#load "./.fake/generate.fsx/intellisense.fsx"
88

9+
910
// Binaries that have XML documentation (in a corresponding generated XML file)
1011
let referenceBinaries = [ "FSharp.Compiler.Service.dll" ]
1112
// Web site location for the generated documentation
@@ -39,7 +40,7 @@ let content = __SOURCE_DIRECTORY__ @@ "../content"
3940
let output = __SOURCE_DIRECTORY__ @@ "../../../docs"
4041
let files = __SOURCE_DIRECTORY__ @@ "../files"
4142
let templates = __SOURCE_DIRECTORY__ @@ "templates"
42-
let formatting = @"C:\Users\nojaf\.nuget\packages\fsharp.formatting\4.0.0-alpha02" // "__SOURCE_DIRECTORY__ @@ "../../packages/FSharp.Formatting/"
43+
let formatting = @"C:\Users\nojaf\.nuget\packages\fsharp.formatting\4.0.0-alpha03" // "__SOURCE_DIRECTORY__ @@ "../../packages/FSharp.Formatting/"
4344
let docTemplate = formatting @@ "templates/docpage.cshtml"
4445

4546
// Where to look for *.csproj templates (in this order)
@@ -76,13 +77,13 @@ let buildReference () =
7677
clr @@ "Microsoft.CSharp.dll"
7778
clr @@ "System.Linq.dll"
7879
clr @@ "System.dll"
79-
bin @@ "System.Reflection.Metadata.dll"
80+
clr @@ "System.Reflection.Metadata.dll"
8081
clr @@ "System.Numerics.dll"
81-
bin @@ "System.Collections.Immutable.dll"
82+
clr @@ "System.Collections.Immutable.dll"
8283
clr @@ "System.IO.dll"
8384
clr @@ "mscorlib.dll"
8485
fsfmt @@ "FSharp.MetadataFormat.dll"
85-
fsfmt @@ "RazorEngine.dll"
86+
fsfmt @@ "RazorEngine.NetCore.dll"
8687
bin @@ "FSharp.Core.dll"
8788
bin @@ "FSharp.Compiler.Service.dll"
8889
] )
@@ -96,7 +97,7 @@ let buildDocumentation () =
9697
layoutRoots = layoutRoots, generateAnchors = true, processRecursive=false )
9798

9899
// Generate
99-
copyFiles()
100+
// copyFiles()
100101
buildDocumentation()
101102
buildReference()
102103

fcs/paket.dependencies

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ nuget Fake.DotNet.Paket
1818
group generate
1919

2020
source https://api.nuget.org/v3/index.json
21+
source C:\Users\nojaf\Projects\FSharp.Formatting\artifacts
2122

2223
storage: none
2324
framework: netstandard2.0
@@ -26,5 +27,5 @@ nuget FSharp.Core
2627
nuget Fake.Core
2728
nuget Fake.IO.FileSystem
2829
nuget Fake.Core.Trace
29-
nuget FSharp.Literate 4.0.0-alpha02
30-
nuget FSharp.Formatting 4.0.0-alpha02
30+
nuget FSharp.Literate 4.0.0-alpha03
31+
nuget FSharp.Formatting 4.0.0-alpha03

fcs/paket.lock

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -804,22 +804,17 @@ NUGET
804804
System.Runtime.Loader (>= 4.0)
805805
System.Security.Cryptography.Algorithms (>= 4.3)
806806
FSharp.Core (4.7)
807-
FSharp.Formatting (4.0.0-alpha02)
808-
FSharp.Compiler.Service (>= 33.0)
809-
FSharp.Literate (4.0.0-alpha02)
810-
FSharp.Compiler.Service (>= 33.0)
811-
FSharp.Core (>= 4.7)
812807
Microsoft.NETCore.Platforms (3.0)
813808
Microsoft.NETCore.Targets (3.0)
814809
Microsoft.Win32.Primitives (4.3)
815810
Microsoft.NETCore.Platforms (>= 1.1)
816811
Microsoft.NETCore.Targets (>= 1.1)
817812
System.Runtime (>= 4.3)
818-
Microsoft.Win32.Registry (4.6)
813+
Microsoft.Win32.Registry (4.7)
819814
System.Buffers (>= 4.5)
820815
System.Memory (>= 4.5.3)
821-
System.Security.AccessControl (>= 4.6)
822-
System.Security.Principal.Windows (>= 4.6)
816+
System.Security.AccessControl (>= 4.7)
817+
System.Security.Principal.Windows (>= 4.7)
823818
runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3)
824819
runtime.debian.9-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3)
825820
runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl (4.3.3)
@@ -980,16 +975,16 @@ NUGET
980975
System.IO (>= 4.3)
981976
System.Reflection.Primitives (>= 4.3)
982977
System.Runtime (>= 4.3)
983-
System.Reflection.Emit (4.6)
984-
System.Reflection.Emit.ILGeneration (>= 4.6)
985-
System.Reflection.Emit.ILGeneration (4.6)
978+
System.Reflection.Emit (4.7)
979+
System.Reflection.Emit.ILGeneration (>= 4.7)
980+
System.Reflection.Emit.ILGeneration (4.7)
986981
System.Reflection.Metadata (1.7)
987982
System.Collections.Immutable (>= 1.6)
988983
System.Reflection.Primitives (4.3)
989984
Microsoft.NETCore.Platforms (>= 1.1)
990985
Microsoft.NETCore.Targets (>= 1.1)
991986
System.Runtime (>= 4.3)
992-
System.Reflection.TypeExtensions (4.6)
987+
System.Reflection.TypeExtensions (4.7)
993988
System.Resources.ResourceManager (4.3)
994989
Microsoft.NETCore.Platforms (>= 1.1)
995990
Microsoft.NETCore.Targets (>= 1.1)
@@ -1024,8 +1019,8 @@ NUGET
10241019
System.Resources.ResourceManager (>= 4.3)
10251020
System.Runtime (>= 4.3)
10261021
System.Runtime.Extensions (>= 4.3)
1027-
System.Security.AccessControl (4.6)
1028-
System.Security.Principal.Windows (>= 4.6)
1022+
System.Security.AccessControl (4.7)
1023+
System.Security.Principal.Windows (>= 4.7)
10291024
System.Security.Cryptography.Algorithms (4.3.1)
10301025
Microsoft.NETCore.Platforms (>= 1.1)
10311026
runtime.native.System.Security.Cryptography.Apple (>= 4.3.1)
@@ -1062,7 +1057,7 @@ NUGET
10621057
System.Runtime (>= 4.3)
10631058
System.Threading (>= 4.3)
10641059
System.Threading.Tasks (>= 4.3)
1065-
System.Security.Principal.Windows (4.6)
1060+
System.Security.Principal.Windows (4.7)
10661061
System.Text.Encoding (4.3)
10671062
Microsoft.NETCore.Platforms (>= 1.1)
10681063
Microsoft.NETCore.Targets (>= 1.1)
@@ -1089,3 +1084,9 @@ NUGET
10891084
System.Threading.ThreadPool (4.3)
10901085
System.Runtime (>= 4.3)
10911086
System.Runtime.Handles (>= 4.3)
1087+
remote: C:\Users\nojaf\Projects\FSharp.Formatting\artifacts
1088+
FSharp.Formatting (4.0.0-alpha03)
1089+
FSharp.Compiler.Service (>= 34.0.1)
1090+
FSharp.Literate (4.0.0-alpha03)
1091+
FSharp.Compiler.Service (>= 34.0.1)
1092+
FSharp.Core (>= 4.7)

0 commit comments

Comments
 (0)