Merge branch 'develop'

giraffe-fsharp · May 24, 2021 · 313d7f1 · 313d7f1
2 parents fdba5cd + ff7b59d
commit 313d7f1
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 13 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,6 +1,11 @@
 Release Notes
 =============
 
+## 1.4.0
+
+- Added `slot` and `template` elements
+- Added .NET Standard 2.0 support for full framework support
+
 ## 1.3.0
 
 Upgraded to `net5.0` target framework.

diff --git a/src/Giraffe.ViewEngine/Engine.fs b/src/Giraffe.ViewEngine/Engine.fs
@@ -232,6 +232,10 @@ module HtmlElements =
     let menuitem   = voidTag "menuitem"
     let summary    = tag "summary"
 
+    // Web Components
+    let slot       = tag "slot"
+    let template   = tag "template"
+
     // Others
     let iframe    = tag "iframe"
 
@@ -634,14 +638,23 @@ module RenderView =
 
     [<RequireQualifiedAccess>]
     module AsBytes =
-        open System.Buffers
 
         let private outputAsBytes (sb : StringBuilder) =
-            let chars = ArrayPool<char>.Shared.Rent sb.Length
+            let chars = 
+                #if NETSTANDARD2_0
+                Array.create (sb.Length) Char.MinValue
+                #else
+                System.Buffers.ArrayPool<char>.Shared.Rent sb.Length
+                #endif
+
             sb.CopyTo(0, chars, 0, sb.Length)
             let result = Encoding.UTF8.GetBytes(chars, 0, sb.Length)
             StringBuilderPool.Release sb
-            ArrayPool<char>.Shared.Return chars
+
+            #if !NETSTANDARD2_0
+            System.Buffers.ArrayPool<char>.Shared.Return chars
+            #endif
+
             result
 
         let xmlNode (node : XmlNode) : byte[] =

diff --git a/src/Giraffe.ViewEngine/Giraffe.ViewEngine.fsproj b/src/Giraffe.ViewEngine/Giraffe.ViewEngine.fsproj
@@ -8,7 +8,7 @@
     <NeutralLanguage>en-GB</NeutralLanguage>
 
     <!-- Build settings -->
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFrameworks>net5.0;netstandard2.0</TargetFrameworks>
     <DebugType>portable</DebugType>
     <OutputType>Library</OutputType>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -46,5 +46,5 @@
     <Compile Include="StringBuilderPool.fs" />
     <Compile Include="Engine.fs" />
   </ItemGroup>
-
+  
 </Project>
diff --git a/tests/Giraffe.ViewEngine.Tests/Giraffe.ViewEngine.Tests.fsproj b/tests/Giraffe.ViewEngine.Tests/Giraffe.ViewEngine.Tests.fsproj
@@ -12,14 +12,14 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
-    <PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
-    <PackageReference Include="System.Net.Http" Version="4.3.4" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
-    <PackageReference Include="NSubstitute" Version="4.2.2" />
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="5.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.*" />
+    <PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.*" />
+    <PackageReference Include="System.Net.Http" Version="4.3.*" />
+    <PackageReference Include="xunit" Version="2.4.*" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.*" />
+    <PackageReference Include="NSubstitute" Version="4.2.*" />
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.*" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="5.0.*" />
   </ItemGroup>
 
   <ItemGroup>