From 43557e5cf7dcc9c385638ff1a181ec03f9327a21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ha=CC=8Akan=20Edling?= <hakan@tidyui.com>
Date: Thu, 7 Jan 2021 13:12:35 +0100
Subject: [PATCH] Upgraded web projects to .NET 5. Added error handling to
 ImageGallerBlock, fixes #37

---
 src/web/mvc/MvcWeb.csproj                     | 34 +++++++++----------
 .../DisplayTemplates/ImageGalleryBlock.cshtml |  9 +++--
 .../DisplayTemplates/ImageGalleryBlock.cshtml |  9 +++--
 src/web/razor/RazorWeb.csproj                 | 34 +++++++++----------
 4 files changed, 46 insertions(+), 40 deletions(-)

diff --git a/src/web/mvc/MvcWeb.csproj b/src/web/mvc/MvcWeb.csproj
index f52400c..0e3b137 100644
--- a/src/web/mvc/MvcWeb.csproj
+++ b/src/web/mvc/MvcWeb.csproj
@@ -1,26 +1,26 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Piranha" Version="8.4.2" />
-    <PackageReference Include="Piranha.AspNetCore" Version="8.4.1" />
-    <PackageReference Condition="$(UseSQLite) != False" Include="Piranha.AspNetCore.Identity.SQLite" Version="8.4.0" />
-    <PackageReference Condition="$(UseSQLServer) == True" Include="Piranha.AspNetCore.Identity.SQLServer" Version="8.4.0" />
-    <PackageReference Condition="$(UseMySql) == True" Include="Piranha.AspNetCore.Identity.MySql" Version="8.4.0" />
-    <PackageReference Condition="$(UsePostgreSql) == True" Include="Piranha.AspNetCore.Identity.PostgreSql" Version="8.4.0" />
-    <PackageReference Include="Piranha.AttributeBuilder" Version="8.4.0" />
-    <PackageReference Condition="$(UseBlobStorage) == True" Include="Piranha.Azure.BlobStorage" Version="8.4.0" />
-    <PackageReference Condition="$(UseSQLite) != False" Include="Piranha.Data.EF.SQLite" Version="8.4.0" />
-    <PackageReference Condition="$(UseSQLServer) == True" Include="Piranha.Data.EF.SQLServer" Version="8.4.0" />
-    <PackageReference Condition="$(UseMySql) == True" Include="Piranha.Data.EF.MySql" Version="8.4.0" />
-    <PackageReference Condition="$(UsePostgreSql) == True" Include="Piranha.Data.EF.PostgreSql" Version="8.4.0" />
-    <PackageReference Include="Piranha.ImageSharp" Version="8.4.0" />
-    <PackageReference Condition="$(UseBlobStorage) != True" Include="Piranha.Local.FileStorage" Version="8.4.0" />
-    <PackageReference Include="Piranha.Manager" Version="8.4.1" />
-    <PackageReference Include="Piranha.Manager.TinyMCE" Version="8.4.0" />
+    <PackageReference Include="Piranha" Version="9.0.0-beta1" />
+    <PackageReference Include="Piranha.AspNetCore" Version="9.0.0-beta1" />
+    <PackageReference Condition="$(UseSQLite) != False" Include="Piranha.AspNetCore.Identity.SQLite" Version="9.0.0-beta1" />
+    <PackageReference Condition="$(UseSQLServer) == True" Include="Piranha.AspNetCore.Identity.SQLServer" Version="9.0.0-beta1" />
+    <PackageReference Condition="$(UseMySql) == True" Include="Piranha.AspNetCore.Identity.MySql" Version="9.0.0-beta1" />
+    <PackageReference Condition="$(UsePostgreSql) == True" Include="Piranha.AspNetCore.Identity.PostgreSql" Version="9.0.0-beta1" />
+    <PackageReference Include="Piranha.AttributeBuilder" Version="9.0.0-beta1" />
+    <PackageReference Condition="$(UseBlobStorage) == True" Include="Piranha.Azure.BlobStorage" Version="9.0.0-beta1" />
+    <PackageReference Condition="$(UseSQLite) != False" Include="Piranha.Data.EF.SQLite" Version="9.0.0-beta1" />
+    <PackageReference Condition="$(UseSQLServer) == True" Include="Piranha.Data.EF.SQLServer" Version="9.0.0-beta1" />
+    <PackageReference Condition="$(UseMySql) == True" Include="Piranha.Data.EF.MySql" Version="9.0.0-beta1" />
+    <PackageReference Condition="$(UsePostgreSql) == True" Include="Piranha.Data.EF.PostgreSql" Version="9.0.0-beta1" />
+    <PackageReference Include="Piranha.ImageSharp" Version="9.0.0-beta1" />
+    <PackageReference Condition="$(UseBlobStorage) != True" Include="Piranha.Local.FileStorage" Version="9.0.0-beta1" />
+    <PackageReference Include="Piranha.Manager" Version="9.0.0-beta1" />
+    <PackageReference Include="Piranha.Manager.TinyMCE" Version="9.0.0-beta1" />
   </ItemGroup>
 
 </Project>
diff --git a/src/web/mvc/Views/Cms/DisplayTemplates/ImageGalleryBlock.cshtml b/src/web/mvc/Views/Cms/DisplayTemplates/ImageGalleryBlock.cshtml
index 077dc4b..aaae643 100644
--- a/src/web/mvc/Views/Cms/DisplayTemplates/ImageGalleryBlock.cshtml
+++ b/src/web/mvc/Views/Cms/DisplayTemplates/ImageGalleryBlock.cshtml
@@ -2,19 +2,22 @@
 @using Piranha.Extend.Blocks
 @{
     var unique = "gallery-" + Guid.NewGuid().ToString();
+    var images = Model.Items
+        .Where(i => i.GetType() == typeof(ImageBlock) && ((ImageBlock)i).Body.HasValue)
+        .ToList();
 }
 
 <div id="@unique" class="carousel slide gallery-block" data-ride="carousel">
     <ol class="carousel-indicators">
-        @for (var n = 0; n < Model.Items.Count; n++)
+        @for (var n = 0; n < images.Count; n++)
         {
             <li data-target="#@unique" data-slide-to="@n" class="@(n == 0 ? "active" : "")"></li>
         }
     </ol>
     <div class="carousel-inner">
-        @foreach (var item in Model.Items)
+        @foreach (var item in images)
         {
-            <div class="carousel-item @(item == Model.Items.First() ? "active" : "")">
+            <div class="carousel-item @(item == images.First() ? "active" : "")">
                 <img src="@Url.Content(WebApp.Media.ResizeImage(((ImageBlock)item).Body.Media, 1100, 450))" class="d-block w-100">
             </div>
         }
diff --git a/src/web/razor/Pages/DisplayTemplates/ImageGalleryBlock.cshtml b/src/web/razor/Pages/DisplayTemplates/ImageGalleryBlock.cshtml
index 077dc4b..aaae643 100644
--- a/src/web/razor/Pages/DisplayTemplates/ImageGalleryBlock.cshtml
+++ b/src/web/razor/Pages/DisplayTemplates/ImageGalleryBlock.cshtml
@@ -2,19 +2,22 @@
 @using Piranha.Extend.Blocks
 @{
     var unique = "gallery-" + Guid.NewGuid().ToString();
+    var images = Model.Items
+        .Where(i => i.GetType() == typeof(ImageBlock) && ((ImageBlock)i).Body.HasValue)
+        .ToList();
 }
 
 <div id="@unique" class="carousel slide gallery-block" data-ride="carousel">
     <ol class="carousel-indicators">
-        @for (var n = 0; n < Model.Items.Count; n++)
+        @for (var n = 0; n < images.Count; n++)
         {
             <li data-target="#@unique" data-slide-to="@n" class="@(n == 0 ? "active" : "")"></li>
         }
     </ol>
     <div class="carousel-inner">
-        @foreach (var item in Model.Items)
+        @foreach (var item in images)
         {
-            <div class="carousel-item @(item == Model.Items.First() ? "active" : "")">
+            <div class="carousel-item @(item == images.First() ? "active" : "")">
                 <img src="@Url.Content(WebApp.Media.ResizeImage(((ImageBlock)item).Body.Media, 1100, 450))" class="d-block w-100">
             </div>
         }
diff --git a/src/web/razor/RazorWeb.csproj b/src/web/razor/RazorWeb.csproj
index f52400c..0e3b137 100644
--- a/src/web/razor/RazorWeb.csproj
+++ b/src/web/razor/RazorWeb.csproj
@@ -1,26 +1,26 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Piranha" Version="8.4.2" />
-    <PackageReference Include="Piranha.AspNetCore" Version="8.4.1" />
-    <PackageReference Condition="$(UseSQLite) != False" Include="Piranha.AspNetCore.Identity.SQLite" Version="8.4.0" />
-    <PackageReference Condition="$(UseSQLServer) == True" Include="Piranha.AspNetCore.Identity.SQLServer" Version="8.4.0" />
-    <PackageReference Condition="$(UseMySql) == True" Include="Piranha.AspNetCore.Identity.MySql" Version="8.4.0" />
-    <PackageReference Condition="$(UsePostgreSql) == True" Include="Piranha.AspNetCore.Identity.PostgreSql" Version="8.4.0" />
-    <PackageReference Include="Piranha.AttributeBuilder" Version="8.4.0" />
-    <PackageReference Condition="$(UseBlobStorage) == True" Include="Piranha.Azure.BlobStorage" Version="8.4.0" />
-    <PackageReference Condition="$(UseSQLite) != False" Include="Piranha.Data.EF.SQLite" Version="8.4.0" />
-    <PackageReference Condition="$(UseSQLServer) == True" Include="Piranha.Data.EF.SQLServer" Version="8.4.0" />
-    <PackageReference Condition="$(UseMySql) == True" Include="Piranha.Data.EF.MySql" Version="8.4.0" />
-    <PackageReference Condition="$(UsePostgreSql) == True" Include="Piranha.Data.EF.PostgreSql" Version="8.4.0" />
-    <PackageReference Include="Piranha.ImageSharp" Version="8.4.0" />
-    <PackageReference Condition="$(UseBlobStorage) != True" Include="Piranha.Local.FileStorage" Version="8.4.0" />
-    <PackageReference Include="Piranha.Manager" Version="8.4.1" />
-    <PackageReference Include="Piranha.Manager.TinyMCE" Version="8.4.0" />
+    <PackageReference Include="Piranha" Version="9.0.0-beta1" />
+    <PackageReference Include="Piranha.AspNetCore" Version="9.0.0-beta1" />
+    <PackageReference Condition="$(UseSQLite) != False" Include="Piranha.AspNetCore.Identity.SQLite" Version="9.0.0-beta1" />
+    <PackageReference Condition="$(UseSQLServer) == True" Include="Piranha.AspNetCore.Identity.SQLServer" Version="9.0.0-beta1" />
+    <PackageReference Condition="$(UseMySql) == True" Include="Piranha.AspNetCore.Identity.MySql" Version="9.0.0-beta1" />
+    <PackageReference Condition="$(UsePostgreSql) == True" Include="Piranha.AspNetCore.Identity.PostgreSql" Version="9.0.0-beta1" />
+    <PackageReference Include="Piranha.AttributeBuilder" Version="9.0.0-beta1" />
+    <PackageReference Condition="$(UseBlobStorage) == True" Include="Piranha.Azure.BlobStorage" Version="9.0.0-beta1" />
+    <PackageReference Condition="$(UseSQLite) != False" Include="Piranha.Data.EF.SQLite" Version="9.0.0-beta1" />
+    <PackageReference Condition="$(UseSQLServer) == True" Include="Piranha.Data.EF.SQLServer" Version="9.0.0-beta1" />
+    <PackageReference Condition="$(UseMySql) == True" Include="Piranha.Data.EF.MySql" Version="9.0.0-beta1" />
+    <PackageReference Condition="$(UsePostgreSql) == True" Include="Piranha.Data.EF.PostgreSql" Version="9.0.0-beta1" />
+    <PackageReference Include="Piranha.ImageSharp" Version="9.0.0-beta1" />
+    <PackageReference Condition="$(UseBlobStorage) != True" Include="Piranha.Local.FileStorage" Version="9.0.0-beta1" />
+    <PackageReference Include="Piranha.Manager" Version="9.0.0-beta1" />
+    <PackageReference Include="Piranha.Manager.TinyMCE" Version="9.0.0-beta1" />
   </ItemGroup>
 
 </Project>