Bump version to 1.3.9

fable-compiler · Mar 1, 2018 · 1f787ff · 1f787ff
1 parent 28e2daa
commit 1f787ff
Show file tree

Hide file tree

Showing 9 changed files with 297 additions and 599 deletions.
diff --git a/build.fsx b/build.fsx
@@ -48,7 +48,7 @@ let project = "Fable"
 let gitOwner = "fable-compiler"
 let gitHome = "https://github.com/" + gitOwner
 
-let dotnetcliVersion = "2.1.4"
+let dotnetcliVersion = "2.1.300-preview1-008174"
 let mutable dotnetExePath = environVarOrDefault "DOTNET" "dotnet"
 
 let CWD = __SOURCE_DIRECTORY__

diff --git a/paket.lock b/paket.lock
diff --git a/src/dotnet/Fable.Compiler/FSharp2Fable.Util.fs b/src/dotnet/Fable.Compiler/FSharp2Fable.Util.fs
@@ -121,10 +121,10 @@ module Helpers =
         let typ = nonAbbreviatedType typ
         if typ.HasTypeDefinition then Some typ.TypeDefinition else None
 
-    // Sometimes accessing `EnclosingEntity` throws an error (e.g. compiler generated
+    // Sometimes accessing `DeclaringEntity` throws an error (e.g. compiler generated
     // methods as in #237) so this prevents uncaught exceptions
     let tryEnclosingEntity (meth: FSharpMemberOrFunctionOrValue) =
-        try meth.EnclosingEntity
+        try meth.DeclaringEntity
         with _ -> None
 
     let isModuleMember (meth: FSharpMemberOrFunctionOrValue) =
@@ -249,7 +249,7 @@ module Helpers =
 
     let getMemberKind (meth: FSharpMemberOrFunctionOrValue) =
         let ent = tryEnclosingEntity meth
-        // `.EnclosingEntity` only fails for compiler generated module members
+        // `.DeclaringEntity` only fails for compiler generated module members
         if ent.IsNone || (ent.Value.IsFSharpModule) then
             if meth.CurriedParameterGroups.Count = 0
                 && meth.GenericParameters.Count = 0
@@ -1187,7 +1187,7 @@ module Util =
         // the type and meth generic arguments, so this first folding is not necessary
         // let genArgs =
         //     if meth.IsModuleValueOrMember then
-        //         ([], meth.EnclosingEntity.GenericParameters, typArgs)
+        //         ([], meth.DeclaringEntity.GenericParameters, typArgs)
         //         |||> Seq.fold2 (fun acc genPar (ResolveGeneric ctx t) -> acc@[genPar.Name, t])
         //     else []
         ([], meth.GenericParameters, typArgs@methTypArgs)

diff --git a/src/dotnet/Fable.Compiler/Fable.Compiler.fsproj b/src/dotnet/Fable.Compiler/Fable.Compiler.fsproj
@@ -8,7 +8,7 @@
     <PackageIconUrl>https://raw.githubusercontent.com/fable-compiler/Fable/master/docs/img/fable_logo.png</PackageIconUrl>
     <PackageTags>fsharp;fable;javascript;f#;js</PackageTags>
     <Authors>Alfonso García-Caro Núñez</Authors>
-    <Version>1.3.8</Version>
+    <Version>1.3.9</Version>
     <TargetFramework>netstandard1.6</TargetFramework>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/dotnet/Fable.Compiler/RELEASE_NOTES.md b/src/dotnet/Fable.Compiler/RELEASE_NOTES.md
@@ -1,3 +1,7 @@
+### 1.3.9
+
+* Update FCS
+
 ### 1.3.8
 
 * See dotnet-fable 1.3.8 release notes

diff --git a/src/dotnet/dotnet-fable/Printers.fs b/src/dotnet/dotnet-fable/Printers.fs
@@ -44,7 +44,7 @@ let attribsOfSymbol (s:FSharpSymbol) =
             if v.IsValueType then yield "valuetype"
 
         | :? FSharpMemberOrFunctionOrValue as v ->
-            yield "owner: " + match v.EnclosingEntity with | Some e -> e.CompiledName | _ -> "<unknown>"
+            yield "owner: " + match v.DeclaringEntity with | Some e -> e.CompiledName | _ -> "<unknown>"
             if v.IsActivePattern then yield "active_pattern"
             if v.IsDispatchSlot then yield "dispatch_slot"
             if v.IsModuleValueOrMember && not v.IsMember then yield "val"

diff --git a/src/dotnet/dotnet-fable/RELEASE_NOTES.md b/src/dotnet/dotnet-fable/RELEASE_NOTES.md
@@ -1,3 +1,7 @@
+### 1.3.9
+
+* Update FCS
+
 ### 1.3.8
 
 * Remove empty intermediate functions (@vbfox)

diff --git a/src/dotnet/dotnet-fable/ToolsUtil.fs b/src/dotnet/dotnet-fable/ToolsUtil.fs
@@ -2,7 +2,7 @@ namespace Fable.CLI
 
 module Constants =
 
-  let [<Literal>] VERSION = "1.3.8"
+  let [<Literal>] VERSION = "1.3.9"
   let [<Literal>] DEFAULT_PORT = 61225
 
 /// These values must be only set by the Main method

diff --git a/src/dotnet/dotnet-fable/dotnet-fable.fsproj b/src/dotnet/dotnet-fable/dotnet-fable.fsproj
@@ -8,7 +8,7 @@
     <PackageIconUrl>https://raw.githubusercontent.com/fable-compiler/Fable/master/docs/img/fable_logo.png</PackageIconUrl>
     <PackageTags>fsharp;fable;javascript;f#;js</PackageTags>
     <Authors>Alfonso García-Caro Núñez</Authors>
-    <Version>1.3.8</Version>
+    <Version>1.3.9</Version>
     <OutputType>Exe</OutputType>
     <PackageType>DotnetCliTool</PackageType>
     <TargetFramework>netcoreapp2.0</TargetFramework>