Implement using new ASP.NET Core SDK (#479)

Co-authored-by: Ivan Lieckens <[email protected]>

Packages.props

@@ -9,6 +9,7 @@
     <PlatformVersion>1.*</PlatformVersion>
     <SitecoreAspNetVersion>21.0.*</SitecoreAspNetVersion>
     <DotNetVersion>8.0.0</DotNetVersion>
+    <AspNetCoreSdkVersion>0.0.7</AspNetCoreSdkVersion>
   </PropertyGroup>
   <ItemGroup>
     <!-- Platform -->
@@ -20,9 +21,10 @@
 
     <!-- Rendering Host -->
     <PackageReference Update="Sitecore.Assemblies.SitecoreHeadlessServicesServer" Version="$(SitecoreAspNetVersion)" />
-    <PackageReference Update="Sitecore.LayoutService.Client" Version="$(SitecoreAspNetVersion)" />
-    <PackageReference Update="Sitecore.AspNet.RenderingEngine" Version="$(SitecoreAspNetVersion)" />
-    <PackageReference Update="Sitecore.AspNet.ExperienceEditor" Version="$(SitecoreAspNetVersion)" />
+
+    <PackageReference Update="Sitecore.AspNetCore.SDK.LayoutService.Client" Version="$(AspNetCoreSdkVersion)" />
+    <PackageReference Update="Sitecore.AspNetCore.SDK.RenderingEngine" Version="$(AspNetCoreSdkVersion)" />
+    <PackageReference Update="Sitecore.AspNetCore.SDK.ExperienceEditor" Version="$(AspNetCoreSdkVersion)" />
 
     <PackageReference Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(DotNetVersion)" />
     <PackageReference Update="Microsoft.Extensions.Http" Version="$(DotNetVersion)"/>

src/Feature/BasicContent/rendering/Extensions/RenderingEngineOptionsExtensions.cs

@@ -1,6 +1,6 @@
 using Mvp.Feature.BasicContent.Models;
-using Sitecore.AspNet.RenderingEngine.Configuration;
-using Sitecore.AspNet.RenderingEngine.Extensions;
+using Sitecore.AspNetCore.SDK.RenderingEngine.Configuration;
+using Sitecore.AspNetCore.SDK.RenderingEngine.Extensions;
 
 namespace Mvp.Feature.BasicContent.Extensions
 {

src/Feature/BasicContent/rendering/MVP.Feature.BasicContent.Rendering.csproj

@@ -5,11 +5,13 @@
     <AssemblyName>Mvp.Feature.BasicContent</AssemblyName>
     <RootNamespace>Mvp.Feature.BasicContent</RootNamespace>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Sitecore.LayoutService.Client" />
-    <PackageReference Include="Sitecore.AspNet.RenderingEngine" />
+
+    <PackageReference Include="Sitecore.AspNetCore.SDK.LayoutService.Client" />
+    <PackageReference Include="Sitecore.AspNetCore.SDK.RenderingEngine" />
   </ItemGroup>
 
 </Project>

src/Feature/BasicContent/rendering/Models/AnnouncementBar.cs

@@ -1,13 +1,10 @@
-using Sitecore.LayoutService.Client.Response.Model.Fields;
-using System;
-using System.Collections.Generic;
-using System.Text;
+using Sitecore.AspNetCore.SDK.LayoutService.Client.Response.Model.Fields;
 
 namespace Mvp.Feature.BasicContent.Models
 {
     public class AnnouncementBar
     {
-        public RichTextField AnnouncementText { get; set; }
-        public HyperLinkField AnnouncementLink { get; set; }
+        public RichTextField? AnnouncementText { get; set; }
+        public HyperLinkField? AnnouncementLink { get; set; }
     }
 }

src/Feature/BasicContent/rendering/Models/ContentList.cs

@@ -1,48 +1,46 @@
-using Sitecore.AspNet.RenderingEngine.Binding;
-using Sitecore.AspNet.RenderingEngine.Binding.Attributes;
-using Sitecore.LayoutService.Client.Response.Model.Fields;
+using Sitecore.AspNetCore.SDK.RenderingEngine.Binding.Attributes;
+using Sitecore.AspNetCore.SDK.LayoutService.Client.Response.Model.Fields;
 
 namespace Mvp.Feature.BasicContent.Models
 {
     public class ContentList
     {
         [SitecoreComponentField(Name = "ContentListTitle")]
-        public TextField Title { get; set; }
+        public TextField? Title { get; set; }
 
         [SitecoreComponentField(Name = "Selected Items")]
-        public ContentListItem[] Items { get; set; }
+        public ContentListItem[]? Items { get; set; }
 
-        [SitecoreComponentProperty()] 
-        public ItemLinkField ContentListType { get; set; }
+        [SitecoreComponentProperty] 
+        public ItemLinkField? ContentListType { get; set; }
 
         [SitecoreComponentField]
-        public NumberField ContentListLimit { get; set; }
+        public NumberField? ContentListLimit { get; set; }
     }
 
     public class ContentListItem
     {
-        public string Url { get; set; }
-        public string Name { get; set; }
-        public string Id { get; set; }
-        public string DisplayName { get; set; }
+        public string? Url { get; set; }
+        public string? Name { get; set; }
+        public string? Id { get; set; }
+        public string? DisplayName { get; set; }
 
         [SitecoreComponentField]
-
-        public ContentListItemFields Fields { get; set; }
+        public ContentListItemFields? Fields { get; set; }
     }
 
     public class ContentListItemFields
     {
         [SitecoreComponentField]
-        public TextField ItemTitle { get; set; }
+        public TextField? ItemTitle { get; set; }
 
         [SitecoreComponentField]
-        public TextField ItemSubtitle { get; set; }
+        public TextField? ItemSubtitle { get; set; }
 
         [SitecoreComponentField]
-        public TextField ItemText { get; set; }
+        public TextField? ItemText { get; set; }
 
         [SitecoreComponentField]
-        public HyperLinkField ItemLink { get; set; }
+        public HyperLinkField? ItemLink { get; set; }
     }
 }

src/Feature/BasicContent/rendering/Models/CtaContent.cs

@@ -1,15 +1,15 @@
-using Sitecore.LayoutService.Client.Response.Model.Fields;
-using System;
-using System.Collections.Generic;
-using System.Text;
+using Sitecore.AspNetCore.SDK.LayoutService.Client.Response.Model.Fields;
 
 namespace Mvp.Feature.BasicContent.Models
 {
     public class CtaContent
     {
-        public TextField CtaTitle { get; set; }
-        public RichTextField CtaText { get; set; }
-        public HyperLinkField CtaLink { get; set; }
-        public ImageField CtaImage{ get; set; }
+        public TextField? CtaTitle { get; set; }
+
+        public RichTextField? CtaText { get; set; }
+
+        public HyperLinkField? CtaLink { get; set; }
+
+        public ImageField? CtaImage{ get; set; }
     }
 }

src/Feature/BasicContent/rendering/Models/EmbedContent.cs

@@ -1,9 +1,9 @@
-using Sitecore.LayoutService.Client.Response.Model.Fields;
+using Sitecore.AspNetCore.SDK.LayoutService.Client.Response.Model.Fields;
 
 namespace Mvp.Feature.BasicContent.Models
 {
   public class EmbedContent
   {
-    public TextField EmbedCode { get; set; }
+    public TextField? EmbedCode { get; set; }
   }
 }

src/Feature/BasicContent/rendering/Models/HalfWidthBanner.cs

@@ -1,11 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Mvp.Feature.BasicContent.Models
+namespace Mvp.Feature.BasicContent.Models
 {
-    public class HalfWidthBanner : CtaContent
-    {
-
-    }
+    public class HalfWidthBanner : CtaContent;
 }

src/Feature/BasicContent/rendering/Models/HeroBase.cs

@@ -1,13 +1,17 @@
-using Sitecore.LayoutService.Client.Response.Model.Fields;
+using Sitecore.AspNetCore.SDK.LayoutService.Client.Response.Model.Fields;
 
 namespace Mvp.Feature.BasicContent.Models
 {
     public class HeroBase
     {
-        public TextField HeroTitle { get; set; }
-        public TextField HeroSubtitle { get; set; }
-        public TextField HeroDescription { get; set; }
-        public HyperLinkField HeroLink { get; set; }
-        public ImageField HeroImage { get; set; }
+        public TextField? HeroTitle { get; set; }
+
+        public TextField? HeroSubtitle { get; set; }
+
+        public TextField? HeroDescription { get; set; }
+
+        public HyperLinkField? HeroLink { get; set; }
+
+        public ImageField? HeroImage { get; set; }
     }
 }

src/Feature/BasicContent/rendering/Models/HeroBig.cs

@@ -1,6 +1,4 @@
 namespace Mvp.Feature.BasicContent.Models
 {
-    public class HeroBig : HeroBase
-    {
-    }
+    public class HeroBig : HeroBase;
 }

src/Feature/BasicContent/rendering/Models/HeroMedium.cs

@@ -1,6 +1,4 @@
 namespace Mvp.Feature.BasicContent.Models
 {
-    public class HeroMedium : HeroBase
-    {
-    }
+    public class HeroMedium : HeroBase;
 }

src/Feature/BasicContent/rendering/Models/HeroMediumWithLink.cs

@@ -1,6 +1,4 @@
 namespace Mvp.Feature.BasicContent.Models
 {
-    public class HeroMediumWithLink : HeroBase
-    {
-    }
+    public class HeroMediumWithLink : HeroBase;
 }

src/Feature/BasicContent/rendering/Models/ImageTeaser.cs

@@ -1,16 +1,15 @@
-using Sitecore.LayoutService.Client.Response.Model.Fields;
-using System;
-using System.Collections.Generic;
-using System.Text;
-
+using Sitecore.AspNetCore.SDK.LayoutService.Client.Response.Model.Fields;
 
 namespace Mvp.Feature.BasicContent.Models
 {
     public class ImageTeaser
     {
-        public TextField TeaserTitle { get; set; }
-        public RichTextField TeaserText { get; set; }
-        public HyperLinkField TeaserLink { get; set; }
-        public ImageField TeaserImage { get; set; }
+        public TextField? TeaserTitle { get; set; }
+
+        public RichTextField? TeaserText { get; set; }
+
+        public HyperLinkField? TeaserLink { get; set; }
+
+        public ImageField? TeaserImage { get; set; }
     }
 }

src/Feature/BasicContent/rendering/Models/RichTextContent.cs

@@ -1,12 +1,9 @@
-using Sitecore.LayoutService.Client.Response.Model.Fields;
-using System;
-using System.Collections.Generic;
-using System.Text;
+using Sitecore.AspNetCore.SDK.LayoutService.Client.Response.Model.Fields;
 
 namespace Mvp.Feature.BasicContent.Models
 {
     public class RichTextContent
     {
-        public RichTextField Content { get; set; }
+        public RichTextField? Content { get; set; }
     }
 }

src/Feature/BasicContent/rendering/Models/VideoTeaser.cs

@@ -1,16 +1,15 @@
-using Sitecore.LayoutService.Client.Response.Model.Fields;
-using System;
-using System.Collections.Generic;
-using System.Text;
-
+using Sitecore.AspNetCore.SDK.LayoutService.Client.Response.Model.Fields;
 
 namespace Mvp.Feature.BasicContent.Models
 {
     public class VideoTeaser
     {
-        public TextField TeaserTitle { get; set; }
-        public RichTextField TeaserText { get; set; }
-        public HyperLinkField TeaserLink { get; set; }
-        public TextField TeaserEmbed { get; set; }
+        public TextField? TeaserTitle { get; set; }
+
+        public RichTextField? TeaserText { get; set; }
+
+        public HyperLinkField? TeaserLink { get; set; }
+
+        public TextField? TeaserEmbed { get; set; }
     }
 }

src/Feature/BasicContent/rendering/Views/Shared/Components/SitecoreComponent/AnnouncementBar.cshtml

@@ -9,7 +9,7 @@
                         <p class="content"><sc-text asp-for="@Model.AnnouncementText" /></p>
                     </div>
                     <div class="col-auto cta-container">
-                        <sc-link asp-for="@Model.AnnouncementLink" data-module="cta-button" class="link-arrow" aria-label="@Model.AnnouncementLink.Value.Title">
+                        <sc-link asp-for="@Model.AnnouncementLink" data-module="cta-button" class="link-arrow" aria-label="@Model.AnnouncementLink?.Value.Title">
                             <img alt="Stay informed" src="images/icon-arrow.png?v=6372550647600000001203266326">
                         </sc-link>
                     </div>

src/Feature/BasicContent/rendering/Views/Shared/Components/SitecoreComponent/ContentList.cshtml

@@ -1,44 +1,32 @@
-@model Mvp.Feature.BasicContent.Models.ContentList
+@using Mvp.Feature.BasicContent.Models
+@model Mvp.Feature.BasicContent.Models.ContentList
 
 
-@if (!string.IsNullOrEmpty(Model.Title.Value))
+@if (!string.IsNullOrEmpty(Model.Title?.Value))
 {
     <div class="col-12 col-lg-12 text-center">
         <h2 asp-for="@Model.Title"></h2>
     </div>
 }
 
 @{
-    var fileName = string.Empty;
+    string fileName = string.Empty;
 
-    switch (Model.ContentListType.Id)
+    switch (Model.ContentListType?.Id)
     {
-        case var id when(id == new Guid("E58A021E-74D2-471E-9EBA-B09616350605")): // White blocks
+        case var id when id == new Guid("E58A021E-74D2-471E-9EBA-B09616350605"): // White blocks
             fileName = "_clFeatureBlock.cshtml";
             break;
-        case var id when(id == new Guid("92DD658A-76BE-437A-86E4-589DF627FBCC")): // MVP 3 columns
+        case var id when id == new Guid("92DD658A-76BE-437A-86E4-589DF627FBCC"): // MVP 3 columns
             fileName = "_clMvpYearBlockThreeColumn.cshtml";
             break;
-        case var id when(id == new Guid("F0027CB2-8725-48EA-B85D-EB83E5216E5A")): // MVP 4 columns
+        case var id when id == new Guid("F0027CB2-8725-48EA-B85D-EB83E5216E5A"): // MVP 4 columns
             fileName = "_clMvpYearBlockFourColumn.cshtml";
             break;
-        default:
-            break;
     }
 }
 
-@*@if (Model.ContentListLimit.Value > 0)
+@foreach (ContentListItem item in Model.Items ?? [])
 {
-
-    @foreach (var item in Model.Items.Take(Model.ContentListLimit.Value.Value as int))
-    {
-        @await Html.PartialAsync(fileName, item)
-    }
-}
-else
-{*@
-    @foreach (var item in Model.Items)
-    {
-        @await Html.PartialAsync(fileName, item)
-    }
-@*}*@
+    @await Html.PartialAsync(fileName, item)
+}

src/Feature/BasicContent/rendering/Views/Shared/Components/SitecoreComponent/EmbedContent.cshtml

@@ -1,5 +1,5 @@
 @model Mvp.Feature.BasicContent.Models.EmbedContent
 
 <div class="embed">
-    @Html.Raw(Model.EmbedCode.Value)
+    @Html.Raw(Model.EmbedCode?.Value)
 </div>

src/Feature/BasicContent/rendering/Views/Shared/Components/SitecoreComponent/HalfWidthBanner.cshtml

@@ -6,14 +6,14 @@
             <div class="col-12 col-md-8 offset-md-1 order-2 order-md-2 text">
                 <p class="eyebrow"></p>
                 <h2><sc-text asp-for="@Model.CtaTitle" /></h2>
-                @Html.Raw(@Model.CtaText.Value)
+                @Html.Raw(Model.CtaText?.Value)
 
-                <sc-link asp-for="@Model.CtaLink" data-module="cta-button" class="link-arrow" aria-label="@Model.CtaLink.Value.Title">
+                <sc-link asp-for="@Model.CtaLink" data-module="cta-button" class="link-arrow" aria-label="@Model.CtaLink?.Value.Title">
                     <img alt="Learn more" src="images/icon-arrow.png">
                 </sc-link>
             </div>
             <div class="col-12 col-md-3 order-1 order-md-1 image">
-                <img alt="@Model.CtaImage.Value.Alt" src="@Model.CtaImage.Value.Src" />
+                <img alt="@Model.CtaImage?.Value.Alt" src="@Model.CtaImage?.Value.Src" />
             </div>
         </div>
     </div>