Merge pull request #2 from Microsoft/master

Merge branch 'master' into latkin-caller-info-attrs

BuildToolsVersion.txt

@@ -1 +1 @@
-1.0.25-prerelease-00317-01
+1.0.25-prerelease-00404-01

DotnetCLIVersion.txt

@@ -1 +1 @@
-1.0.0-beta-002173
+1.0.0-rc2-002665

build.cmd

@@ -410,7 +410,20 @@ if '%TEST_NET40_COREUNIT%' == '0' (
         )
     )
 )
-
+if '%TEST_CORECLR%' == '1' (
+    call RunTests.cmd %BUILD_CONFIG_LOWERCASE% coreunitcoreclr %TEST_TAGS% 
+    @if ERRORLEVEL 1 (
+        type testresults\CoreUnit_portable47_Error.log 
+        echo Error: 'RunTests.cmd %BUILD_CONFIG_LOWERCASE% coreunitcoreclr %TEST_TAGS%' failed 
+        goto :failed_tests
+    )
+    call RunTests.cmd %BUILD_CONFIG_LOWERCASE% fsharp coreclr
+    @if ERRORLEVEL 1 (
+        type testresults\CoreUnit_portable47_Error.log 
+        echo Error: 'RunTests.cmd %BUILD_CONFIG_LOWERCASE% coreunitcoreclr %TEST_TAGS%' failed 
+        goto :failed_tests
+    )
+)
 if '%TEST_VS%' == '1' (
     call RunTests.cmd %BUILD_CONFIG_LOWERCASE% ideunit %TEST_TAGS% 
     @if ERRORLEVEL 1 echo Error: 'RunTests.cmd %BUILD_CONFIG_LOWER% ideunit  %TEST_TAGS%' failed && goto :failed_tests

src/FSharpSource.targets

@@ -190,6 +190,7 @@
     <DefineConstants>$(DefineConstants);FX_ATLEAST_LINQ</DefineConstants>
     <DefineConstants>$(DefineConstants);FX_RESHAPED_GLOBALIZATION</DefineConstants>
     <DefineConstants>$(DefineConstants);FX_RESHAPED_REFLECTION</DefineConstants>
+    <DefineConstants>$(DefineConstants);FX_HAS_TYPECODE</DefineConstants>
     <DefineConstants Condition=" '$(FX_NO_LOADER)' != 'true' ">$(DefineConstants);FX_RESHAPED_REFLECTION_CORECLR</DefineConstants>
     <DefineConstants>$(DefineConstants);RESHAPED_MSBUILD</DefineConstants>
     <DefineConstants>$(DefineConstants);FX_NO_CONVERTER</DefineConstants>

src/absil/il.fs

@@ -3,7 +3,6 @@
 module internal Microsoft.FSharp.Compiler.AbstractIL.IL
 
 #nowarn "49"
-#nowarn "44" // This construct is deprecated. please use List.item
 #nowarn "343" // The type 'ILAssemblyRef' implements 'System.IComparable' explicitly but provides no corresponding override for 'Object.Equals'.
 #nowarn "346" // The struct, record or union type 'IlxExtensionType' has an explicit implementation of 'Object.Equals'. ...
 
@@ -348,7 +347,9 @@ module ILList =
     let inline isEmpty (x:ILList<_>) = x.Length <> 0
     let inline toArray (x:ILList<_>) =  x
     let inline ofArray (x:'T[]) =  x
-    let inline nth n (x:'T[]) =  x.[n]
+    [<System.Obsolete("please use IList.item")>]
+    let inline nth n (x:'T[]) = x.[n]
+    let inline item n (x:'T[]) = x.[n]
     let inline toList (x:ILList<_>) =  Array.toList x
     let inline ofList (x:'T list)  = Array.ofList x
     let inline lengthsEqAndForall2 f x1 x2 = Array.lengthsEqAndForall2 f x1 x2
@@ -372,7 +373,9 @@ module ILList =
     let inline ofArray (x:'T[]) =  List.ofArray x
     let inline iter f (x:'T list) =  List.iter f x
     let inline iteri f (x:'T list) =  List.iteri f x
-    let inline nth (x:'T list) n =  List.nth x n
+    [<System.Obsolete("please use IList.item")>]
+    let inline nth (x:'T list) n =  List.item n x
+    let inline item n (x:'T list) =  List.item n x
     let inline toList (x:ILList<_>) =  x
     let inline ofList (x:'T list)  = x
     let inline lengthsEqAndForall2 f x1 x2 = List.lengthsEqAndForall2 f x1 x2
@@ -395,7 +398,9 @@ module ILList =
     let inline iter f (x:ILList<'T>) =  ThreeList.iter f x
     let inline iteri f (x:ILList<'T>) =  ThreeList.iteri f x
     let inline toList (x:ILList<_>) =  ThreeList.toList x
+    [<System.Obsolete("please use IList.item")>]
     let inline nth (x:ILList<'T>) n =  ThreeList.nth x n
+    let inline item n (x:ILList<'T>) =  ThreeList.nth n x
     let inline ofList (x:'T list)  = ThreeList.ofList x
     let inline lengthsEqAndForall2 f x1 x2 = ThreeList.lengthsEqAndForall2 f x1 x2
     let inline init n f = ThreeList.init n f
@@ -3001,7 +3006,7 @@ and instILTypeAux numFree (inst:ILGenericArgs) typ =
         if v - numFree >= top then 
             ILType.TypeVar (uint16 (v - top)) 
         else 
-            ILList.nth inst (v - numFree)
+            ILList.item (v - numFree) inst
     | x -> x
 
 and instILGenericArgsAux numFree inst i = ILList.map (instILTypeAux numFree inst) i

src/absil/ilread.fs

@@ -8,7 +8,6 @@
 module internal Microsoft.FSharp.Compiler.AbstractIL.ILBinaryReader 
 
 #nowarn "42" // This construct is deprecated: it is only for use in the F# library
-#nowarn "44" // This construct is deprecated. please use List.item
 
 open System
 open System.IO
@@ -2040,8 +2039,8 @@ and sigptrGetTy ctxt numtypars bytes sigptr =
         let lobounds, sigptr = sigptrFold sigptrGetZInt32 numLoBounded bytes sigptr
         let shape = 
             let dim i =
-              (if i <  numLoBounded then Some (List.nth lobounds i) else None),
-              (if i <  numSized then Some (List.nth sizes i) else None)
+              (if i <  numLoBounded then Some (List.item i lobounds) else None),
+              (if i <  numSized then Some (List.item i sizes) else None)
             ILArrayShape (Array.toList (Array.init rank dim))
         mkILArrTy (typ, shape), sigptr
 

src/fsharp/FSComp.txt

@@ -977,7 +977,7 @@ lexUnexpectedChar,"Unexpected character '%s'"
 1153,lexInvalidFloat,"Invalid floating point number"
 1154,lexOusideDecimal,"This number is outside the allowable range for decimal literals"
 1155,lexOusideThirtyTwoBitFloat,"This number is outside the allowable range for 32-bit floats"
-1156,lexInvalidNumericLiteral,"This is not a valid numeric literal. Sample formats include 4, 0x4, 0b0100, 4L, 4UL, 4u, 4s, 4us, 4y, 4uy, 4.0, 4.0f, 4I."
+1156,lexInvalidNumericLiteral,"This is not a valid numeric literal. Valid numeric literals include 1, 0x1, 0b0001 (int), 1u (uint32), 1L (int64), 1UL (uint64), 1s (int16), 1y (sbyte), 1ui (byte), 1.0 (float), 1.0f (float32), 1.0m (decimal), 1I (BigInteger)."
 1157,lexInvalidByteLiteral,"This is not a valid byte literal"
 1158,lexInvalidCharLiteral,"This is not a valid character literal"
 1159,lexThisUnicodeOnlyInStringLiterals,"This Unicode encoding is only valid in string literals"

src/fsharp/FSharp.Build/Fsc.fs

@@ -354,7 +354,14 @@ type [<Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:Iden
         | null -> base.ExecuteTool(pathToTool, responseFileCommands, commandLineCommands)
         | _ ->
             let sources = sources|>Array.map(fun i->i.ItemSpec)
+#if FX_NO_CONVERTER
             let baseCallDelegate = new Func<int>(fun () -> fsc.BaseExecuteTool(pathToTool, responseFileCommands, commandLineCommands) )
+#else
+            let baseCall = fun (dummy : int) -> fsc.BaseExecuteTool(pathToTool, responseFileCommands, commandLineCommands)
+            // We are using a Converter<int,int> rather than a "unit->int" because it is too hard to
+            // figure out how to pass an F# function object via reflection.  
+            let baseCallDelegate = new System.Converter<int,int>(baseCall)
+#endif
             try 
                 let ret = 
                     (host.GetType()).InvokeMember("Compile", BindingFlags.Public ||| BindingFlags.NonPublic ||| BindingFlags.InvokeMethod ||| BindingFlags.Instance, null, host, 
@@ -368,7 +375,7 @@ type [<Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:Iden
             | e ->
                 System.Diagnostics.Debug.Assert(false, "HostObject received by Fsc task did not have a Compile method or the compile method threw an exception. "+(e.ToString()))
                 reraise()
- 
+
     override fsc.GenerateCommandLineCommands() =
         let builder = new FscCommandLineBuilder()
 

src/fsharp/FSharp.Build/project.json

@@ -1,20 +1,22 @@
 { 
-   "dependencies": { 
-     "Microsoft.Build": "0.1.0-preview-00022", 
-     "Microsoft.Build.Framework": "0.1.0-preview-00022", 
-     "Microsoft.Build.Tasks.Core": "0.1.0-preview-00022", 
-     "Microsoft.Build.Utilities.Core": "0.1.0-preview-00022", 
-     "Microsoft.NETCore.Platforms": "1.0.1-rc2-23911", 
-     "Microsoft.Win32.Registry": { 
-      "version": "4.0.0-rc2-23923", 
-      "exclude": "Compile" 
+    "dependencies": { 
+        "Microsoft.Build": "0.1.0-preview-00022", 
+        "Microsoft.Build.Framework": "0.1.0-preview-00022", 
+        "Microsoft.Build.Tasks.Core": "0.1.0-preview-00022", 
+        "Microsoft.Build.Utilities.Core": "0.1.0-preview-00022", 
+        "Microsoft.NETCore.Platforms": "1.0.1-rc2-24027", 
+        "Microsoft.Win32.Registry": { 
+             "version": "4.0.0-rc2-24027", 
+             "exclude": "Compile" 
+        }, 
+        "System.AppContext": "4.1.0-rc2-24027",
+        "System.Diagnostics.Tools": "4.0.1-rc2-24027",
+        "System.Reflection.Primitives": "4.0.1-rc2-24027",
+        "System.Resources.ResourceManager": "4.0.1-rc2-24027",
     }, 
-    "System.AppContext": "4.1.0-rc2-23911",
-    "System.Diagnostics.Tools": "4.0.1-rc2-23911",
-  }, 
-  "frameworks": { 
-    "dnxcore50": {
-        "imports": "portable-net45+win8"
+    "frameworks": { 
+        "dnxcore50": {
+            "imports": "portable-net45+win8",
+        } 
     } 
-  } 
 } 

src/fsharp/FSharp.Compiler.Interactive.Settings/project.json

@@ -1,11 +1,11 @@
 {
   "dependencies": {
-    "Microsoft.NETCore.Platforms": "1.0.1-rc2-23911",
-    "NETStandard.Library": "1.5.0-rc2-23911",
-    "System.Linq.Expressions": "4.0.11-rc2-23911",
-    "System.Reflection.TypeExtensions": "4.1.0-rc2-23911",
-    "System.Runtime.Loader": "4.0.0-rc2-23911",
-    "System.Threading.Thread": "4.0.0-rc2-23911",
+    "Microsoft.NETCore.Platforms": "1.0.1-rc2-24027",
+    "NETStandard.Library": "1.5.0-rc2-24027",
+    "System.Linq.Expressions": "4.0.11-rc2-24027",
+    "System.Reflection.TypeExtensions": "4.1.0-rc2-24027",
+    "System.Runtime.Loader": "4.0.0-rc2-24027",
+    "System.Threading.Thread": "4.0.0-rc2-24027",
   },
   "runtimes": {
     "win7-x86": { },

src/fsharp/FSharp.Compiler.Unittests/FSharp.Compiler.Unittests.fsproj

@@ -60,7 +60,6 @@
     <Compile Include="NunitHelpers.fs" />
     <Compile Include="CompilerTestHelpers.fs" />
     <Compile Include="ManglingNameOfProvidedTypes.fs" />
-    <Compile Include="RecursiveRecords.fs" />
     <Compile Include="HashIfExpression.fs" />
     <Compile Include="ProductVersion.fs" />
   </ItemGroup>

src/fsharp/FSharp.Compiler/project.json

@@ -1,25 +1,25 @@
 {
   "dependencies": {
-    "Microsoft.NETCore.Platforms": "1.0.1-rc2-23911",
-    "NETStandard.Library": "1.5.0-rc2-23911",
-    "System.Collections.Immutable":"1.2.0-rc2-23911",
-    "System.Diagnostics.Process": "4.1.0-rc2-23911",
-    "System.Diagnostics.TraceSource": "4.0.0-rc2-23911",
-    "System.Linq.Expressions": "4.0.11-rc2-23911",
-    "System.Linq.Queryable": "4.0.1-rc2-23911",
-    "System.Net.Requests": "4.0.11-rc2-23911",
-    "System.Reflection.Emit": "4.0.1-rc2-23911",
-    "System.Reflection.Emit.ILGeneration": "4.0.1-rc2-23911",
-    "System.Reflection.Metadata": "1.3.0-rc2-23911",
-    "System.Reflection.TypeExtensions": "4.1.0-rc2-23911",
-    "System.Runtime.InteropServices": "4.1.0-rc2-23911",
-    "System.Runtime.InteropServices.PInvoke": "4.0.0-rc2-23911",
-    "System.Runtime.Loader": "4.0.0-rc2-23911",
-    "System.Security.Cryptography.Algorithms": "4.1.0-rc2-23911",
-    "System.Security.Cryptography.Primitives": "4.0.0-rc2-23911",
-    "System.Threading.Tasks.Parallel": "4.0.1-rc2-23911",
-    "System.Threading.Thread": "4.0.0-rc2-23911",
-    "System.Threading.ThreadPool": "4.0.10-rc2-23911",
+    "Microsoft.NETCore.Platforms": "1.0.1-rc2-24027",
+    "NETStandard.Library": "1.5.0-rc2-24027",
+    "System.Collections.Immutable":"1.2.0-rc2-24027",
+    "System.Diagnostics.Process": "4.1.0-rc2-24027",
+    "System.Diagnostics.TraceSource": "4.0.0-rc2-24027",
+    "System.Linq.Expressions": "4.0.11-rc2-24027",
+    "System.Linq.Queryable": "4.0.1-rc2-24027",
+    "System.Net.Requests": "4.0.11-rc2-24027",
+    "System.Reflection.Emit": "4.0.1-rc2-24027",
+    "System.Reflection.Emit.ILGeneration": "4.0.1-rc2-24027",
+    "System.Reflection.Metadata": "1.3.0-rc2-24027",
+    "System.Reflection.TypeExtensions": "4.1.0-rc2-24027",
+    "System.Runtime.InteropServices": "4.1.0-rc2-24027",
+    "System.Runtime.InteropServices.PInvoke": "4.0.0-rc2-24027",
+    "System.Runtime.Loader": "4.0.0-rc2-24027",
+    "System.Security.Cryptography.Algorithms": "4.1.0-rc2-24027",
+    "System.Security.Cryptography.Primitives": "4.0.0-rc2-24027",
+    "System.Threading.Tasks.Parallel": "4.0.1-rc2-24027",
+    "System.Threading.Thread": "4.0.0-rc2-24027",
+    "System.Threading.ThreadPool": "4.0.10-rc2-24027",
     "Microsoft.DiaSymReader.PortablePdb": "1.0.0-rc-60301",
     "Microsoft.DiaSymReader": "1.0.7",
   },

src/fsharp/FSharp.Core.Unittests/project.json

@@ -1,15 +1,15 @@
 {
   "dependencies": {
-    "Microsoft.NETCore.Platforms": "1.0.1-rc2-23911",
-    "NETStandard.Library": "1.5.0-rc2-23911",
-    "System.Linq.Expressions": "4.0.11-rc2-23911",
-    "System.Linq.Queryable": "4.0.1-rc2-23911",
-    "System.Reflection.Emit": "4.0.1-rc2-23911",
-    "System.Runtime.Loader": "4.0.0-rc2-23911",
-    "System.Net.Requests": "4.0.11-rc2-23911",
-    "System.Threading.Tasks.Parallel": "4.0.1-rc2-23911",
-    "System.Threading.Thread": "4.0.0-rc2-23911",
-    "System.Threading.ThreadPool": "4.0.10-rc2-23911",
+    "Microsoft.NETCore.Platforms": "1.0.1-rc2-24027",
+    "NETStandard.Library": "1.5.0-rc2-24027",
+    "System.Linq.Expressions": "4.0.11-rc2-24027",
+    "System.Linq.Queryable": "4.0.1-rc2-24027",
+    "System.Reflection.Emit": "4.0.1-rc2-24027",
+    "System.Runtime.Loader": "4.0.0-rc2-24027",
+    "System.Net.Requests": "4.0.11-rc2-24027",
+    "System.Threading.Tasks.Parallel": "4.0.1-rc2-24027",
+    "System.Threading.Thread": "4.0.0-rc2-24027",
+    "System.Threading.ThreadPool": "4.0.10-rc2-24027",
   },
   "runtimes": {
     "win7-x86": { },

src/fsharp/FSharp.Core/control.fs

@@ -281,7 +281,6 @@ namespace Microsoft.FSharp.Control
     #nowarn "40"
     #nowarn "21"
     #nowarn "47"
-    #nowarn "44" // This construct is deprecated. 
     #nowarn "52" // The value has been copied to ensure the original is not mutated by this operation
     #nowarn "67" // This type test or downcast will always hold
     #nowarn "864" // IObservable.Subscribe

src/fsharp/FSharp.Core/control.fsi

@@ -91,8 +91,6 @@ namespace System.Threading
 
 namespace Microsoft.FSharp.Control
 
-    #nowarn "44" // This construct is deprecated. This method will be removed in the next version of F# and may no longer be used. Consider using Async.RunWithContinuations
-
     open System
     open Microsoft.FSharp.Core
     open Microsoft.FSharp.Core.Operators

src/fsharp/FSharp.Core/nativeptr.fs

@@ -2,7 +2,6 @@
 
 namespace Microsoft.FSharp.NativeInterop
 
-#nowarn "44";;
 open Microsoft.FSharp.Core
 open Microsoft.FSharp.Collections
 open Microsoft.FSharp.Core.LanguagePrimitives.IntrinsicOperators

src/fsharp/FSharp.Core/project.json

@@ -1,14 +1,14 @@
 {
   "dependencies": {
-    "Microsoft.NETCore.Platforms": "1.0.1-rc2-23911",
-    "NETStandard.Library": "1.5.0-rc2-23911",
-    "System.Linq.Expressions": "4.0.11-rc2-23911",
-    "System.Linq.Queryable": "4.0.1-rc2-23911",
-    "System.Reflection.TypeExtensions": "4.1.0-rc2-23911",
-    "System.Net.Requests": "4.0.11-rc2-23911",
-    "System.Threading.Tasks.Parallel": "4.0.1-rc2-23911",
-    "System.Threading.Thread": "4.0.0-rc2-23911",
-    "System.Threading.ThreadPool": "4.0.10-rc2-23911",
+    "Microsoft.NETCore.Platforms": "1.0.1-rc2-24027",
+    "NETStandard.Library": "1.5.0-rc2-24027",
+    "System.Linq.Expressions": "4.0.11-rc2-24027",
+    "System.Linq.Queryable": "4.0.1-rc2-24027",
+    "System.Reflection.TypeExtensions": "4.1.0-rc2-24027",
+    "System.Net.Requests": "4.0.11-rc2-24027",
+    "System.Threading.Tasks.Parallel": "4.0.1-rc2-24027",
+    "System.Threading.Thread": "4.0.0-rc2-24027",
+    "System.Threading.ThreadPool": "4.0.10-rc2-24027",
   },
   "runtimes": {
     "win7-x86": { },

src/fsharp/Fsc/project.json

@@ -1,9 +1,9 @@
 {
   "dependencies": {
-    "Microsoft.NETCore.Platforms": "1.0.1-rc2-23911",
-    "NETStandard.Library": "1.5.0-rc2-23911",
-    "System.Linq.Expressions": "4.0.11-rc2-23911",
-    "System.Reflection.Metadata": "1.3.0-rc2-23911",
+    "Microsoft.NETCore.Platforms": "1.0.1-rc2-24027",
+    "NETStandard.Library": "1.5.0-rc2-24027",
+    "System.Linq.Expressions": "4.0.11-rc2-24027",
+    "System.Reflection.Metadata": "1.3.0-rc2-24027",
   },
   "runtimes": {
     "win7-x86": { },

src/fsharp/IlxGen.fs

@@ -6,8 +6,6 @@
 
 module internal Microsoft.FSharp.Compiler.IlxGen
 
-#nowarn "44" // This construct is deprecated. please use List.item
-
 open System.IO
 open System.Collections.Generic
 open Internal.Utilities
@@ -2143,7 +2141,7 @@ and GenGetExnField cenv cgbuf eenv (e,ecref,fieldNum,m) sequel =
     let typ = GenExnType cenv.amap m cenv.g eenv.tyenv ecref
     CG.EmitInstrs cgbuf (pop 0) Push0 [ I_castclass typ];
 
-    let fld = List.nth (exnc.TrueInstanceFieldsAsList) fieldNum
+    let fld = List.item fieldNum exnc.TrueInstanceFieldsAsList
     let ftyp = GenType cenv.amap m cenv.g eenv.tyenv fld.FormalType
 
     let mspec = mkILNonGenericInstanceMethSpecInTy (typ,"get_" + fld.Name, [], ftyp)
@@ -2156,7 +2154,7 @@ and GenSetExnField cenv cgbuf eenv (e,ecref,fieldNum,e2,m) sequel =
     let exnc = stripExnEqns ecref
     let typ = GenExnType cenv.amap m cenv.g eenv.tyenv ecref
     CG.EmitInstrs cgbuf (pop 0) Push0 [ I_castclass typ ];
-    let fld = List.nth (exnc.TrueInstanceFieldsAsList) fieldNum
+    let fld = List.item fieldNum exnc.TrueInstanceFieldsAsList
     let ftyp = GenType cenv.amap m cenv.g eenv.tyenv fld.FormalType
     let ilFieldName = ComputeFieldName exnc fld
     GenExpr cenv cgbuf eenv SPSuppress e2 Continue;