v11.0.0 release update

Author: Jeavon

Umbraco.Docs.Samples.Web/CustomIndexing/ProductIndex.cs

@@ -13,7 +13,7 @@ public ProductIndex(
             ILoggerFactory loggerFactory,
             string name,
             IOptionsMonitor<LuceneDirectoryIndexOptions> indexOptions,
-            IHostingEnvironment hostingEnvironment,
+            Cms.Core.Hosting.IHostingEnvironment hostingEnvironment,
             IRuntimeState runtimeState) : base(loggerFactory,
             name,
             indexOptions,

Umbraco.Docs.Samples.Web/Umbraco.Docs.Samples.Web.csproj

@@ -6,8 +6,8 @@
 
     <ItemGroup>
         <PackageReference Include="NWebsec.AspNetCore.Middleware" Version="3.0.0" />
-        <PackageReference Include="Umbraco.Cms" Version="11.0.0-rc3" />
-        <PackageReference Include="Umbraco.TheStarterKit" Version="10.0.0" />
+        <PackageReference Include="Umbraco.Cms" Version="11.0.0" />
+        <PackageReference Include="Umbraco.TheStarterKit" Version="11.0.0" />
     </ItemGroup>
 
     <!-- Force Windows to use ICU. Otherwise Windows 10 2019H1+ will do it, but older Windows 10 and most, if not all, Windows Server editions will run NLS -->
@@ -58,5 +58,6 @@
     <PropertyGroup>
         <RazorCompileOnBuild>true</RazorCompileOnBuild>
         <RazorCompileOnPublish>true</RazorCompileOnPublish>
+        <ImplicitUsings>enable</ImplicitUsings>
     </PropertyGroup>
 </Project>

Umbraco.Docs.Samples.Web/Views/Partials/blockgrid/area.cshtml

@@ -0,0 +1,10 @@
+@using Umbraco.Extensions
+@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<Umbraco.Cms.Core.Models.Blocks.BlockGridArea>
+
+<div class="umb-block-grid__area"
+     data-area-col-span="@Model.ColumnSpan"
+     data-area-row-span="@Model.RowSpan"
+     data-area-alias="@Model.Alias"
+     style="--umb-block-grid--grid-columns: @Model.ColumnSpan;--umb-block-grid--area-column-span: @Model.ColumnSpan; --umb-block-grid--area-row-span: @Model.RowSpan;">
+    @await Html.GetBlockGridItemsHtmlAsync(Model)
+</div>

Umbraco.Docs.Samples.Web/Views/Partials/blockgrid/areas.cshtml

@@ -8,12 +8,6 @@
      style="--umb-block-grid--area-grid-columns: @(Model.AreaGridColumns?.ToString() ?? Model.GridColumns?.ToString() ?? "12");">
     @foreach (var area in Model.Areas)
     {
-        <div class="umb-block-grid__area"
-         data-area-col-span="@area.ColumnSpan"
-         data-area-row-span="@area.RowSpan"
-         data-area-alias="@area.Alias"
-         style="--umb-block-grid--grid-columns: @area.ColumnSpan;--umb-block-grid--area-column-span: @area.ColumnSpan; --umb-block-grid--area-row-span: @area.RowSpan;">
-            @await Html.GetBlockGridItemsHtmlAsync(area)
-        </div>
+        @await Html.GetBlockGridItemAreaHtmlAsync(area)
     }
 </div>

Umbraco.Docs.Samples.Web/Views/Partials/blockgrid/items.cshtml

@@ -7,17 +7,14 @@
 <div class="umb-block-grid__layout-container">
     @foreach (var item in Model)
     {
-        bool attrForceLeft = item.ForceLeft;
-        bool attrForceRight = item.ForceRight;
+        
         <div
             class="umb-block-grid__layout-item"
             data-content-element-type-alias="@item.Content.ContentType.Alias"
             data-content-element-type-key="@item.Content.ContentType.Key"
             data-element-udi="@item.ContentUdi"
             data-col-span="@item.ColumnSpan"
             data-row-span="@item.RowSpan"
-            @(attrForceLeft ? "data-force-left" : null)
-            @(attrForceRight ? "data-force-right" : null)
             style=" --umb-block-grid--item-column-span: @item.ColumnSpan; --umb-block-grid--item-row-span: @item.RowSpan; ">
             @{
                 var partialViewName = "blockgrid/Components/" + item.Content.ContentType.Alias;

Umbraco.Docs.Samples.Web/Views/Partials/blocklist/default.cshtml

@@ -1,13 +1,13 @@
 @inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<Umbraco.Cms.Core.Models.Blocks.BlockListModel>
 @{
-    if (!Model.Any()) { return; }
+    if (Model?.Any() != true) { return; }
 }
 <div class="umb-block-list">
     @foreach (var block in Model)
     {
         if (block?.ContentUdi == null) { continue; }
         var data = block.Content;
 
-        @await Html.PartialAsync("BlockList/Components/" + data.ContentType.Alias, block)
+        @await Html.PartialAsync("blocklist/Components/" + data.ContentType.Alias, block)
     }
 </div>

Umbraco.Docs.Samples.Web/Views/Partials/grid/bootstrap3-fluid.cshtml

@@ -7,7 +7,7 @@
     Razor helpers located at the bottom of this file
 *@
 
-@if (Model != null && Model.GetType() == typeof(JObject) && Model.sections != null)
+@if (Model is JObject && Model?.sections is not null)
 {
     var oneColumn = ((System.Collections.ICollection)Model.sections).Count == 1;
 
@@ -55,7 +55,7 @@
                         <div @RenderElementAttributes(area)>
                             @foreach (var control in area.controls)
                             {
-                                if (control != null && control.editor != null && control.editor.view != null)
+                                if (control?.editor?.view != null)
                                 {
                                     <text>@await Html.PartialAsync("grid/editors/base", (object)control)</text>
                                 }

Umbraco.Docs.Samples.Web/Views/Partials/grid/bootstrap3.cshtml

@@ -3,9 +3,9 @@
 @using Newtonsoft.Json.Linq
 @inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<dynamic>
 
-@if (Model != null && Model.GetType() == typeof(JObject) && Model.sections != null)
+@if (Model is JObject && Model?.sections is not null)
 {
-    var oneColumn = ((System.Collections.ICollection)Model.sections).Count == 1;
+  var oneColumn = ((System.Collections.ICollection)Model.sections).Count == 1;
 
     <div class="umb-grid">
         @if (oneColumn)
@@ -56,7 +56,7 @@
                         <div @RenderElementAttributes(area)>
                             @foreach (var control in area.controls)
                             {
-                                if (control != null && control.editor != null && control.editor.view != null)
+                                if (control?.editor?.view != null)
                                 {
                                     <text>@await Html.PartialAsync("grid/editors/base", (object)control)</text>
                                 }

Umbraco.Docs.Samples.Web/Views/Partials/grid/editors/base.cshtml

@@ -3,7 +3,7 @@
 @try
 {
     string editor = EditorView(Model);
-    <text>@await Html.PartialAsync(editor, (object)Model)</text>
+    <text>@await Html.PartialAsync(editor, Model as object)</text>
 }
 catch (Exception ex)
 {
@@ -15,7 +15,7 @@ catch (Exception ex)
     public static string EditorView(dynamic contentItem)
     {
         string view = contentItem.editor.render != null ? contentItem.editor.render.ToString() : contentItem.editor.view.ToString();
-        view = view.ToLower().Replace(".html", ".cshtml");
+        view = view.Replace(".html", ".cshtml");
 
         if (!view.Contains("/"))
         {

Umbraco.Docs.Samples.Web/Views/Partials/grid/editors/embed.cshtml

@@ -1,10 +1,11 @@
-@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<dynamic>
+@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<dynamic>
 
-@{
-    string embedValue = Convert.ToString(Model.value);
-    embedValue = embedValue.DetectIsJson() ? Model.value.preview : Model.value;
-}
+@if (Model is not null)
+{
+  string embedValue = Convert.ToString(Model.value);
+  embedValue = embedValue.DetectIsJson() ? Model.value.preview : Model.value;
 
-<div class="video-wrapper">
-	@Html.Raw(embedValue)
-</div>
+  <div class="video-wrapper">
+    @Html.Raw(embedValue)
+  </div>
+}

Umbraco.Docs.Samples.Web/Views/Partials/grid/editors/macro.cshtml

@@ -1,6 +1,6 @@
 @inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<dynamic>
 
-@if (Model.value != null)
+@if (Model?.value is not null)
 {
     string macroAlias = Model.value.macroAlias.ToString();
     var parameters = new Dictionary<string,object>();

Umbraco.Docs.Samples.Web/Views/Partials/grid/editors/media.cshtml

@@ -2,7 +2,8 @@
 @using Umbraco.Cms.Core.Media
 @using Umbraco.Cms.Core.PropertyEditors.ValueConverters
 @inject IImageUrlGenerator ImageUrlGenerator
-@if (Model.value != null)
+
+@if (Model?.value is not null)
 {
     var url = Model.value.image;
 

Umbraco.Docs.Samples.Web/Views/Partials/grid/editors/rte.cshtml

@@ -5,7 +5,7 @@
 @inject HtmlImageSourceParser HtmlImageSourceParser;
 
 @{
-    var value = HtmlLocalLinkParser.EnsureInternalLinks(Model.value.ToString());
+    var value = HtmlLocalLinkParser.EnsureInternalLinks(Model?.value.ToString());
     value = HtmlUrlParser.EnsureUrls(value);
     value = HtmlImageSourceParser.EnsureImageSources(value);
 }

Umbraco.Docs.Samples.Web/Views/Partials/grid/editors/textstring.cshtml

@@ -1,10 +1,9 @@
-@using System.Web
 @model dynamic
 
-@if (Model.editor.config.markup != null)
+@if (Model?.editor.config.markup is not null)
 {
     string markup = Model.editor.config.markup.ToString();
-    markup = markup.Replace("#value#", Html.ReplaceLineBreaks(HttpUtility.HtmlEncode((string)Model.value.ToString())).ToString());
+    markup = markup.Replace("#value#", Html.ReplaceLineBreaks((string)Model.value.ToString()).ToString());
 
     if (Model.editor.config.style != null)
     {
@@ -18,6 +17,6 @@
 else
 {
     <text>
-        <div style="@Model.editor.config.style">@Model.value</div>
+        <div style="@Model?.editor.config.style">@Model?.value</div>
     </text>
 }