Skip to content

Commit 1f787ff

Browse files
Bump version to 1.3.9
1 parent 28e2daa commit 1f787ff

File tree

9 files changed

+297
-599
lines changed

9 files changed

+297
-599
lines changed

build.fsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ let project = "Fable"
4848
let gitOwner = "fable-compiler"
4949
let gitHome = "https://github.com/" + gitOwner
5050

51-
let dotnetcliVersion = "2.1.4"
51+
let dotnetcliVersion = "2.1.300-preview1-008174"
5252
let mutable dotnetExePath = environVarOrDefault "DOTNET" "dotnet"
5353

5454
let CWD = __SOURCE_DIRECTORY__

paket.lock

Lines changed: 280 additions & 590 deletions
Large diffs are not rendered by default.

src/dotnet/Fable.Compiler/FSharp2Fable.Util.fs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,10 +121,10 @@ module Helpers =
121121
let typ = nonAbbreviatedType typ
122122
if typ.HasTypeDefinition then Some typ.TypeDefinition else None
123123

124-
// Sometimes accessing `EnclosingEntity` throws an error (e.g. compiler generated
124+
// Sometimes accessing `DeclaringEntity` throws an error (e.g. compiler generated
125125
// methods as in #237) so this prevents uncaught exceptions
126126
let tryEnclosingEntity (meth: FSharpMemberOrFunctionOrValue) =
127-
try meth.EnclosingEntity
127+
try meth.DeclaringEntity
128128
with _ -> None
129129

130130
let isModuleMember (meth: FSharpMemberOrFunctionOrValue) =
@@ -249,7 +249,7 @@ module Helpers =
249249

250250
let getMemberKind (meth: FSharpMemberOrFunctionOrValue) =
251251
let ent = tryEnclosingEntity meth
252-
// `.EnclosingEntity` only fails for compiler generated module members
252+
// `.DeclaringEntity` only fails for compiler generated module members
253253
if ent.IsNone || (ent.Value.IsFSharpModule) then
254254
if meth.CurriedParameterGroups.Count = 0
255255
&& meth.GenericParameters.Count = 0
@@ -1187,7 +1187,7 @@ module Util =
11871187
// the type and meth generic arguments, so this first folding is not necessary
11881188
// let genArgs =
11891189
// if meth.IsModuleValueOrMember then
1190-
// ([], meth.EnclosingEntity.GenericParameters, typArgs)
1190+
// ([], meth.DeclaringEntity.GenericParameters, typArgs)
11911191
// |||> Seq.fold2 (fun acc genPar (ResolveGeneric ctx t) -> acc@[genPar.Name, t])
11921192
// else []
11931193
([], meth.GenericParameters, typArgs@methTypArgs)

src/dotnet/Fable.Compiler/Fable.Compiler.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<PackageIconUrl>https://raw.githubusercontent.com/fable-compiler/Fable/master/docs/img/fable_logo.png</PackageIconUrl>
99
<PackageTags>fsharp;fable;javascript;f#;js</PackageTags>
1010
<Authors>Alfonso García-Caro Núñez</Authors>
11-
<Version>1.3.8</Version>
11+
<Version>1.3.9</Version>
1212
<TargetFramework>netstandard1.6</TargetFramework>
1313
</PropertyGroup>
1414
<ItemGroup>

src/dotnet/Fable.Compiler/RELEASE_NOTES.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
### 1.3.9
2+
3+
* Update FCS
4+
15
### 1.3.8
26

37
* See dotnet-fable 1.3.8 release notes

src/dotnet/dotnet-fable/Printers.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ let attribsOfSymbol (s:FSharpSymbol) =
4444
if v.IsValueType then yield "valuetype"
4545

4646
| :? FSharpMemberOrFunctionOrValue as v ->
47-
yield "owner: " + match v.EnclosingEntity with | Some e -> e.CompiledName | _ -> "<unknown>"
47+
yield "owner: " + match v.DeclaringEntity with | Some e -> e.CompiledName | _ -> "<unknown>"
4848
if v.IsActivePattern then yield "active_pattern"
4949
if v.IsDispatchSlot then yield "dispatch_slot"
5050
if v.IsModuleValueOrMember && not v.IsMember then yield "val"

src/dotnet/dotnet-fable/RELEASE_NOTES.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
### 1.3.9
2+
3+
* Update FCS
4+
15
### 1.3.8
26

37
* Remove empty intermediate functions (@vbfox)

src/dotnet/dotnet-fable/ToolsUtil.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ namespace Fable.CLI
22

33
module Constants =
44

5-
let [<Literal>] VERSION = "1.3.8"
5+
let [<Literal>] VERSION = "1.3.9"
66
let [<Literal>] DEFAULT_PORT = 61225
77

88
/// These values must be only set by the Main method

src/dotnet/dotnet-fable/dotnet-fable.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<PackageIconUrl>https://raw.githubusercontent.com/fable-compiler/Fable/master/docs/img/fable_logo.png</PackageIconUrl>
99
<PackageTags>fsharp;fable;javascript;f#;js</PackageTags>
1010
<Authors>Alfonso García-Caro Núñez</Authors>
11-
<Version>1.3.8</Version>
11+
<Version>1.3.9</Version>
1212
<OutputType>Exe</OutputType>
1313
<PackageType>DotnetCliTool</PackageType>
1414
<TargetFramework>netcoreapp2.0</TargetFramework>

0 commit comments

Comments
 (0)