Merge pull request #189 from dsyme/fix-188

fix 188 - Type replacement should apply to static parameter types

Author: dsyme

src/ProvidedTypes.fs

@@ -1060,7 +1060,7 @@ namespace ProviderImplementation.ProvidedTypes
         override __.GetCustomAttributes(_attributeType, _inherit) = emptyAttributes
         override this.IsDefined(_attributeType, _inherit) = notRequired this "IsDefined" propertyName
 
-    and  ProvidedEvent(isTgt: bool, eventName:string, attrs: EventAttributes, eventHandlerType:Type, isStatic: bool, adder: (unit -> MethodInfo), remover: (unit -> MethodInfo), customAttributesData) =
+    and ProvidedEvent(isTgt: bool, eventName:string, attrs: EventAttributes, eventHandlerType:Type, isStatic: bool, adder: (unit -> MethodInfo), remover: (unit -> MethodInfo), customAttributesData) =
         inherit EventInfo()
 
         let mutable declaringType : ProvidedTypeDefinition option = None  
@@ -8536,9 +8536,9 @@ namespace ProviderImplementation.ProvidedTypes
                      newT
                 | _ ->
                     let msg =
-                        if toTgt then sprintf "The design-time type '%O' utilized by a type provider was not found in the target reference assembly set '%A'. You may be referencing a profile which contains fewer types than those needed by the type provider you are using." t (getTargetAssemblies())
+                        if toTgt then sprintf "The design-time type '%O' utilized by a type provider was not found in the target reference assembly set '%A'. You may be referencing a profile which contains fewer types than those needed by the type provider you are using." t (getTargetAssemblies() |> Seq.toList)
                         elif getSourceAssemblies() |> Seq.length = 0 then sprintf "A failure occured while determining compilation references"
-                        else sprintf "The target type '%O' utilized by a type provider was not found in the design-time assembly set '%A'. Please report this problem to the project site for the type provider." t (getSourceAssemblies() |> Seq.toArray)
+                        else sprintf "The target type '%O' utilized by a type provider was not found in the design-time assembly set '%A'. Please report this problem to the project site for the type provider." t (getSourceAssemblies() |> Seq.toList)
                     failwith msg
 
 
@@ -8815,7 +8815,7 @@ namespace ProviderImplementation.ProvidedTypes
 
         and convStaticParameterDefToTgt (x: ProvidedStaticParameter) = 
             Debug.Assert (not x.BelongsToTargetModel, "unexpected target ProvidedStaticParameter")
-            ProvidedStaticParameter(x.Name, x.ParameterType,  ?parameterDefaultValue=x.ParameterDefaultValue) 
+            ProvidedStaticParameter(x.Name, convTypeToTgt x.ParameterType,  ?parameterDefaultValue=x.ParameterDefaultValue) 
 
         and convMemberDefToTgt declTyT (x: MemberInfo) = 
             let xT : MemberInfo = 

src/ProvidedTypesTesting.fs

@@ -720,11 +720,12 @@ module internal Targets =
               yield fsharpInstalledAssembliesPath fsharp "portable47"
           | "net45" ->
               yield sysInstalledAssembliesPath profile ++ "mscorlib.dll"
+              yield sysInstalledAssembliesPath profile ++ "System.Numerics.dll" 
               yield sysInstalledAssembliesPath profile ++ "System.Xml.dll" 
               yield sysInstalledAssembliesPath profile ++ "System.Core.dll"
               yield sysInstalledAssembliesPath profile ++ "System.Xml.Linq.dll"
               yield sysInstalledAssembliesPath profile ++ "System.dll" 
-          | _ -> failwith (sprintf "unimplemented  profile, fsharpVersion = %s, profile = %s" fsharp profile)
+          | _ -> failwith (sprintf "unimplemented profile, fsharpVersion = %s, profile = %s" fsharp profile)
           yield FSharpCoreRef fsharp profile
         ]
     let DotNet45FSharp31Refs() = FSharpRefs "3.1" "net45"

tests/BasicErasedProvisionTests.fs

@@ -18,7 +18,7 @@ open Xunit
 #nowarn "760" // IDisposable needs new
 
 [<TypeProvider>]
-type ErasingProvider (config : TypeProviderConfig) as this =
+type ErasingProvider (config : TypeProviderConfig, hasBigInt: bool) as this =
     inherit TypeProviderForNamespaces (config)
 
     let ns = "StaticProperty.Provided"
@@ -27,12 +27,13 @@ type ErasingProvider (config : TypeProviderConfig) as this =
     let createTypes () =
         let myType = ProvidedTypeDefinition(asm, ns, "MyType", Some typeof<obj>)
         let myStaticGetterProp = ProvidedProperty("MyStaticGetterProperty", typeof<string list>, isStatic = true, getterCode = (fun _args -> <@@ Set.ofList [ "Hello world" ] @@>))
+        let myStaticGetterProp2 = ProvidedProperty("MyStaticGetterProperty2", (if hasBigInt then typeof<bigint> else typeof<int>), isStatic = true, getterCode = (fun _args -> if hasBigInt then <@@ 34L @@> else <@@ 34 @@>))
         let myStaticSetterProp = ProvidedProperty("MyStaticSetterProperty", typeof<string list>, isStatic = true, getterCode = (fun _args -> <@@ Set.ofList [ "Hello world" ] @@>), setterCode = (fun _args -> <@@ () @@>))
         let myStaticMethod = ProvidedMethod("MyStaticMethod", [ ProvidedParameter("paramName",typeof<string list>) ], typeof<string list>, isStatic = true, invokeCode = (fun _args -> <@@ Set.ofList [ "Hello world" ] @@>))
         let myGetterProp = ProvidedProperty("MyGetterProperty", typeof<string list>, getterCode = (fun _args -> <@@ Set.ofList [ "Hello world" ] @@>))
         let mySetterProp = ProvidedProperty("MySetterProperty", typeof<string list>, getterCode = (fun _args -> <@@ Set.ofList [ "Hello world" ] @@>), setterCode = (fun _args -> <@@ () @@>))
         let myMethod = ProvidedMethod("MyMethod", [ ProvidedParameter("paramName",typeof<string list>) ], typeof<string list>, invokeCode = (fun _args -> <@@ Set.ofList [ "Hello world" ] @@>))
-        myType.AddMembers [myStaticGetterProp; myStaticSetterProp; myGetterProp; mySetterProp]
+        myType.AddMembers [myStaticGetterProp; myStaticGetterProp2; myStaticSetterProp; myGetterProp; mySetterProp]
         myType.AddMembers [myStaticMethod; myMethod ]
 
         [myType]
@@ -72,7 +73,7 @@ type ErasingProviderWithStaticParams (config : TypeProviderConfig) as this =
     let ns = "StaticProperty.Provided"
     let asm = Assembly.GetExecutingAssembly()
 
-    let createType (typeName, _n:int) =
+    let createType (typeName, _n:int, _dayOfWeekInt: int) =
         let myType = ProvidedTypeDefinition(asm, ns, typeName, Some typeof<obj>)
         let myProp = ProvidedProperty("MyGetterProperty", typeof<string list>, isStatic = true, getterCode = (fun _args -> <@@ Set.ofList [ "Hello world" ] @@>))
         myType.AddMember(myProp)
@@ -84,8 +85,8 @@ type ErasingProviderWithStaticParams (config : TypeProviderConfig) as this =
 
     do
         let myType = ProvidedTypeDefinition(asm, ns, "MyType", Some typeof<obj>)
-        let parameters = [ ProvidedStaticParameter("Count", typeof<int>) ]
-        myType.DefineStaticParameters(parameters, (fun typeName args -> createType(typeName, args.[0] :?> int)))
+        let parameters = [ ProvidedStaticParameter("Count", typeof<int>); ProvidedStaticParameter("Day", typeof<System.DayOfWeek>) ]
+        myType.DefineStaticParameters(parameters, (fun typeName args -> createType(typeName, (args.[0] :?> int), (args.[1] :?> int))))
 
         this.AddNamespace(ns, [myType])
 
@@ -97,15 +98,15 @@ let testCrossTargeting (refs: string list) provider args =
 
 [<Fact>]
 let ``ErasingProvider generates for .NET 4.5 F# 3.1 correctly``() : unit  = 
-    let res = testCrossTargeting (Targets.DotNet45FSharp31Refs()) (fun args -> new ErasingProvider(args)) [| |]
+    let res = testCrossTargeting (Targets.DotNet45FSharp31Refs()) (fun args -> new ErasingProvider(args, true)) [| |]
     Assert.False(res.Contains "[FSharp.Core, Version=3.259.3.1")
     Assert.True(res.Contains "[FSharp.Core, Version=4.3.1.0")
     Assert.False(res.Contains "[FSharp.Core, Version=4.4.0.0")
 
 [<Fact>]
 let ``ErasingProvider generates for .NET 4.5 F# 4.0 correctly``() : unit  = 
   if (try File.Exists (Targets.FSharpCore40Ref()) with _ -> false) then
-    let res = testCrossTargeting (Targets.DotNet45FSharp40Refs()) (fun args -> new ErasingProvider(args)) [| |]
+    let res = testCrossTargeting (Targets.DotNet45FSharp40Refs()) (fun args -> new ErasingProvider(args, true)) [| |]
     Assert.False(res.Contains "[FSharp.Core, Version=3.259.3.1")
     Assert.False(res.Contains "[FSharp.Core, Version=4.3.1.0")
     Assert.True(res.Contains "[FSharp.Core, Version=4.4.0.0")
@@ -115,15 +116,15 @@ let ``ErasingProvider generates for .NET 4.5 F# 4.0 correctly``() : unit  =
 [<Fact>]
 let ``ErasingProvider generates for Portable Profile 259 F# 3.1 correctly``() : unit = 
   if Targets.hasPortable259Assemblies() then 
-    let res = testCrossTargeting (Targets.Portable259FSharp31Refs()) (fun args -> new ErasingProvider(args)) [| |]
+    let res = testCrossTargeting (Targets.Portable259FSharp31Refs()) (fun args -> new ErasingProvider(args, false)) [| |]
     Assert.True(res.Contains "[FSharp.Core, Version=3.259.3.1")
     Assert.False(res.Contains "[FSharp.Core, Version=4.3.1.0")
     Assert.False(res.Contains "[FSharp.Core, Version=4.4.4.0")
 
 [<Fact>]
 let ``ErasingProvider generates for Portable Profile 259 F# 4.0 correctly``() : unit = 
   if Targets.hasPortable259Assemblies() then 
-    let res = testCrossTargeting (Targets.Portable259FSharp40Refs()) (fun args -> new ErasingProvider(args)) [| |]
+    let res = testCrossTargeting (Targets.Portable259FSharp40Refs()) (fun args -> new ErasingProvider(args, false)) [| |]
     Assert.True(res.Contains "[FSharp.Core, Version=3.259.4.0")
     Assert.False(res.Contains "[FSharp.Core, Version=4.3.1.0")
     Assert.False(res.Contains "[FSharp.Core, Version=4.4.4.0")
@@ -132,15 +133,15 @@ let ``ErasingProvider generates for Portable Profile 259 F# 4.0 correctly``() :
 [<Fact>]
 let ``ErasingProvider generates for Portable Profile 7 F# 4.0 correctly``() : unit = 
   if Targets.hasPortable7Assemblies() then 
-    let res = testCrossTargeting (Targets.Portable7FSharp40Refs()) (fun args -> new ErasingProvider(args)) [| |]
+    let res = testCrossTargeting (Targets.Portable7FSharp40Refs()) (fun args -> new ErasingProvider(args, false)) [| |]
     Assert.True(res.Contains "[FSharp.Core, Version=3.7.4.0")
     Assert.False(res.Contains "[FSharp.Core, Version=4.3.1.0")
     Assert.False(res.Contains "[FSharp.Core, Version=4.4.4.0")
 
 [<Fact>]
 let ``ErasingProviderWithStaticParams generates for .NET 4.5 F# 4.0 correctly``() : unit = 
   if (try File.Exists (Targets.FSharpCore40Ref()) with _ -> false) then
-    let res = testCrossTargeting (Targets.DotNet45FSharp40Refs()) (fun args -> new ErasingProviderWithStaticParams(args)) [| box 3 |]
+    let res = testCrossTargeting (Targets.DotNet45FSharp40Refs()) (fun args -> new ErasingProviderWithStaticParams(args)) [| box 3; box 4 |]
     printfn "res = %s" res
     Assert.False(res.Contains "[FSharp.Core, Version=3.259.3.1")
     Assert.False(res.Contains "[FSharp.Core, Version=4.3.1.0")
@@ -151,7 +152,7 @@ let ``ErasingProviderWithStaticParams generates for .NET 4.5 F# 4.0 correctly``(
 [<Fact>]
 let ``ErasingProviderWithStaticParams generates for Portable Profile 7 F# 4.0 correctly``() : unit = 
   if Targets.hasPortable7Assemblies() then 
-    let res = testCrossTargeting (Targets.Portable7FSharp40Refs()) (fun args -> new ErasingProviderWithStaticParams(args)) [| box 3 |]
+    let res = testCrossTargeting (Targets.Portable7FSharp40Refs()) (fun args -> new ErasingProviderWithStaticParams(args)) [| box 3; box 4 |]
     printfn "res = %s" res
     Assert.True(res.Contains "[FSharp.Core, Version=3.7.4.0")
     Assert.False(res.Contains "[FSharp.Core, Version=4.3.1.0")