Fix netstandard1.6 & style mismatch with client

Author: zaaack

src/Fable.React/Fable.Helpers.React.fs

@@ -783,13 +783,21 @@ module ServerRenderingInternal =
         | ServerElementType.Component ->
             let tag = tag :?> System.Type
             let comp = System.Activator.CreateInstance(tag, props)
+#if NETSTANDARD1_6
+            let tag = tag.GetTypeInfo()
+#endif
             let childrenProp = tag.GetProperty(ChildrenName)
             childrenProp.SetValue(comp, children |> Seq.toArray)
             let render = tag.GetMethod("render")
             render.Invoke(comp, null) :?> ReactElement
 
     let createServerElementByFn = fun (f, props, children) ->
+#if NETSTANDARD1_6
+        let propsType' = props.GetType()
+        let propsType = propsType'.GetTypeInfo()
+#else
         let propsType = props.GetType()
+#endif
         let props =
             if propsType.GetProperty (ChildrenName) |> isNull then
                 props
@@ -801,6 +809,9 @@ module ServerRenderingInternal =
                         values.Add (children |> Seq.toArray)
                     else
                         values.Add (FSharpValue.GetRecordField(props, p))
+#if NETSTANDARD1_6
+                let propsType = propsType'
+#endif
                 FSharpValue.MakeRecord(propsType, values.ToArray()) :?> 'P
         f props
 

src/Fable.React/Fable.Helpers.ReactServer.fs

@@ -37,7 +37,7 @@ let private cssProp (html:StringBuilder) (key: string) (value: obj) =
   match value with
   | :? int as v -> addUnit html key (string v)
   | :? float as v -> addUnit html key (string v)
-  | _ -> html.Append value |> ignore
+  | _ -> escapeHtml html (value.ToString()) |> ignore
 
   html.Append ';' |> ignore
 
@@ -615,7 +615,8 @@ let private renderHtmlAttr (html:StringBuilder) (attr: HTMLAttr) =
 
     for cssProp in cssList do
       renderCssProp html cssProp
-
+    if not(List.isEmpty cssList) then
+      html.Remove (html.Length - 1, 1) |> ignore
     html.Append '"' |> ignore
 
   | HTMLAttr.Custom (key, value) -> strAttr html (key.ToLower()) (string value)

src/Fable.React/Fable.React.fsproj

@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Version>3.1.0</Version>
-    <TargetFramework>netstandard1.6</TargetFramework>
+    <TargetFrameworks>netstandard1.6;netstandard2.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Fable.Import.React.fs" />