Update fsharp aspnet libraries (#4315)

frameworks/FSharp/giraffe/giraffe-stripped.dockerfile

@@ -1,9 +1,9 @@
-FROM microsoft/dotnet:2.1-sdk-stretch AS build
+FROM microsoft/dotnet:2.2-sdk AS build
 WORKDIR /app
 COPY src/App .
 RUN dotnet publish -c Release -o out
 
-FROM microsoft/dotnet:2.1-aspnetcore-runtime AS runtime
+FROM microsoft/dotnet:2.2-aspnetcore-runtime AS runtime
 ENV ASPNETCORE_URLS http://+:8080
 ENV COMPlus_ReadyToRun 0
 WORKDIR /app

frameworks/FSharp/giraffe/giraffe-utf8direct.dockerfile

@@ -1,9 +1,9 @@
-FROM microsoft/dotnet:2.1-sdk-stretch AS build
+FROM microsoft/dotnet:2.2-sdk AS build
 WORKDIR /app
 COPY src/App .
 RUN dotnet publish -c Release -o out
 
-FROM microsoft/dotnet:2.1-aspnetcore-runtime AS runtime
+FROM microsoft/dotnet:2.2-aspnetcore-runtime AS runtime
 ENV ASPNETCORE_URLS http://+:8080
 ENV COMPlus_ReadyToRun 0
 WORKDIR /app

frameworks/FSharp/giraffe/giraffe-utf8json.dockerfile

@@ -1,9 +1,9 @@
-FROM microsoft/dotnet:2.1-sdk-stretch AS build
+FROM microsoft/dotnet:2.2-sdk AS build
 WORKDIR /app
 COPY src/App .
 RUN dotnet publish -c Release -o out
 
-FROM microsoft/dotnet:2.1-aspnetcore-runtime AS runtime
+FROM microsoft/dotnet:2.2-aspnetcore-runtime AS runtime
 ENV ASPNETCORE_URLS http://+:8080
 ENV COMPlus_ReadyToRun 0
 WORKDIR /app

frameworks/FSharp/giraffe/giraffe.dockerfile

@@ -1,9 +1,9 @@
-FROM microsoft/dotnet:2.1-sdk-stretch AS build
+FROM microsoft/dotnet:2.2-sdk AS build
 WORKDIR /app
 COPY src/App .
 RUN dotnet publish -c Release -o out
 
-FROM microsoft/dotnet:2.1-aspnetcore-runtime AS runtime
+FROM microsoft/dotnet:2.2-aspnetcore-runtime AS runtime
 ENV ASPNETCORE_URLS http://+:8080
 ENV COMPlus_ReadyToRun 0
 WORKDIR /app

frameworks/FSharp/giraffe/src/App/App.fsproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
     <DebugType>portable</DebugType>
     <AssemblyName>App</AssemblyName>
     <OutputType>Exe</OutputType>
@@ -10,11 +10,11 @@
 
   <ItemGroup>
     <PackageReference Include="Dapper" Version="1.50.5" />
-    <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.1.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.1.2" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.1.1" />
-    <PackageReference Include="Giraffe" Version="2.0.0" />
-    <PackageReference Include="Npgsql" Version="4.0.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.2.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.2.0" />
+    <PackageReference Include="Giraffe" Version="3.5.0" />
+    <PackageReference Include="Npgsql" Version="4.0.4" />
     <PackageReference Include="Utf8Json" Version="1.3.7" />
   </ItemGroup>
 

frameworks/FSharp/giraffe/src/App/StatefullRendering.fs

@@ -61,8 +61,7 @@ module rec StetefullRendering =
 
     let rec private writeHtmlNode (target: StreamWriter) (node : XmlNode)  =
         match node with
-        | EncodedText text -> target |> add' (WebUtility.HtmlEncode text)
-        | RawText text -> target |> add' text
+        | Text text -> target |> add' text
         | ParentNode (e, nodes) -> writeParentNode target e nodes
         | VoidElement (n, attrs) -> writeStartElement target n attrs
     

frameworks/FSharp/zebra/src/App/App.fsproj

@@ -9,12 +9,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Primitives" Version="2.1.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.1.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.1.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.1.0" />
+    <PackageReference Include="Microsoft.Extensions.Primitives" Version="2.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.2.0" />
     <PackageReference Include="Dapper" Version="1.50.5" />
-    <PackageReference Include="Npgsql" Version="4.0.0" />
+    <PackageReference Include="Npgsql" Version="4.0.4" />
     <PackageReference Include="Utf8Json" Version="1.3.7" />
   </ItemGroup>
 

frameworks/FSharp/zebra/zebra-simple.dockerfile

@@ -1,9 +1,9 @@
-FROM microsoft/dotnet:2.1-sdk-stretch AS build
+FROM microsoft/dotnet:2.2-sdk AS build
 WORKDIR /app
 COPY src/App .
 RUN dotnet publish -c Release -o out
 
-FROM microsoft/dotnet:2.1-aspnetcore-runtime AS runtime
+FROM microsoft/dotnet:2.2-aspnetcore-runtime AS runtime
 ENV ASPNETCORE_URLS http://+:8080
 ENV COMPlus_ReadyToRun 0
 WORKDIR /app

frameworks/FSharp/zebra/zebra.dockerfile

@@ -1,9 +1,9 @@
-FROM microsoft/dotnet:2.1-sdk-stretch AS build
+FROM microsoft/dotnet:2.2-sdk AS build
 WORKDIR /app
 COPY src/App .
 RUN dotnet publish -c Release -o out
 
-FROM microsoft/dotnet:2.1-aspnetcore-runtime AS runtime
+FROM microsoft/dotnet:2.2-aspnetcore-runtime AS runtime
 ENV ASPNETCORE_URLS http://+:8080
 ENV COMPlus_ReadyToRun 0
 WORKDIR /app