v11 build/infra changes

Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
 	<PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
 		<Authors>Nathan Woulfe</Authors>
     <Copyright>Copyright © Nathan Woulfe $([System.DateTime]::Today.ToString('yyyy'))</Copyright>
     <PackageIcon>icon.png</PackageIcon>

Preflight.Site/Preflight.Site.csproj

@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>
-    <Content Remove="C:\Users\natha\source\repos\Preflight-10\icon.png" />
+    <Content Remove="C:\Users\natha\source\repos\Preflight-11\icon.png" />
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="clean" Version="2.1.6" />
-    <PackageReference Include="Umbraco.Cms" Version="10.3.2" />
+    <PackageReference Include="Umbraco.Cms" Version="[11.0.0, 12)" />
   </ItemGroup>
 
   <ItemGroup>

Preflight.Site/Views/BlockGridContent.cshtml

@@ -0,0 +1,6 @@
+@using Umbraco.Cms.Web.Common.PublishedModels;
+@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<ContentModels.BlockGridContent>
+@using ContentModels = Umbraco.Cms.Web.Common.PublishedModels;
+@{
+	Layout = null;
+}

Preflight.Site/Views/Partials/blockgrid/Components/umbBlockGridDemoHeadlineBlock.cshtml

@@ -0,0 +1,4 @@
+@using Umbraco.Extensions
+@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<Umbraco.Cms.Core.Models.Blocks.BlockGridItem>
+
+<h2 style="padding: 20px">@Model.Content.Value("headline")</h2>

Preflight.Site/Views/Partials/blockgrid/Components/umbBlockGridDemoImageBlock.cshtml

@@ -0,0 +1,12 @@
+@using Umbraco.Extensions
+@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<Umbraco.Cms.Core.Models.Blocks.BlockGridItem>
+
+@{
+    var typedMediaPickerSingle = Model.Content.Value<Umbraco.Cms.Core.Models.MediaWithCrops>("image");
+    if (typedMediaPickerSingle != null)
+    {
+        <img src="@typedMediaPickerSingle.MediaUrl()" style="object-fit:cover; width:100%; height:100%;"/>
+    } else {
+        <p>Missing image</p>
+    }
+}

Preflight.Site/Views/Partials/blockgrid/Components/umbBlockGridDemoRichTextBlock.cshtml

@@ -0,0 +1,6 @@
+@using Umbraco.Extensions
+@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<Umbraco.Cms.Core.Models.Blocks.BlockGridItem>
+
+<div style="padding: 20px">
+@Model.Content.Value("richText")
+</div>

Preflight.Site/Views/Partials/blockgrid/Components/umbBlockGridDemoTwoColumnLayoutBlock.cshtml

@@ -0,0 +1,6 @@
+@using Umbraco.Extensions
+@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<Umbraco.Cms.Core.Models.Blocks.BlockGridItem>
+
+<div>
+    @await Html.GetBlockGridItemAreasHtmlAsync(Model)
+</div>

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "6.0.402",
+    "version": "7.0.100",
     "rollForward": "latestFeature"
   }
 }

src/Preflight/Backoffice/gulp/config.outputPath.js

@@ -1 +1 @@
-export const outputPath = '../obj/Debug/net6.0/clientassets'
+export const outputPath = '../obj/Debug/net7.0/clientassets'

src/Preflight/Preflight.csproj

@@ -12,8 +12,8 @@
 
   <ItemGroup>
     <PackageReference Include="System.Collections.Specialized" Version="4.3.0" />
-    <PackageReference Include="Umbraco.Cms.Web.Website" Version="[10.0.0, 11)" />
-    <PackageReference Include="Umbraco.Cms.Web.BackOffice" Version="[10.0.0, 11)" />
+    <PackageReference Include="Umbraco.Cms.Web.Website" Version="[11.0.0, 12)" />
+    <PackageReference Include="Umbraco.Cms.Web.BackOffice" Version="[11.0.0, 12)" />
   </ItemGroup>
 
   <Import Project="build\Microsoft.AspNetCore.ClientAssets.targets" />

src/Preflight/build/Microsoft.AspNetCore.ClientAssets.targets

@@ -52,7 +52,7 @@
       <FileWrites Include="@(_ClientAssetsBuildOutput)" />
       <FileWrites Include="$(IntermediateOutputPath)clientassetsbuild.complete.txt" />
 
-      <Content Condition="'$(TargetFramework)' != 'net6.0'" Include="@(_ClientAssetsBuildOutput)" Link="wwwroot\%(_ClientAssetsBuildOutput.RecursiveDir)\%(_ClientAssetsBuildOutput.FileName)%(_ClientAssetsBuildOutput.Extension)" />
+      <Content Condition="'$(TargetFramework)' != 'net7.0'" Include="@(_ClientAssetsBuildOutput)" Link="wwwroot\%(_ClientAssetsBuildOutput.RecursiveDir)\%(_ClientAssetsBuildOutput.FileName)%(_ClientAssetsBuildOutput.Extension)" />
     </ItemGroup>
 
     <!--
@@ -62,7 +62,7 @@
             release we will address this by aligning DiscoverStaticWebAssets behavior with DefineStaticWebAssets to follow the same heuristics for determining the content root.
         -->
 
-    <DefineStaticWebAssets Condition="'$(TargetFramework)' == 'net6.0'" CandidateAssets="@(_ClientAssetsBuildOutput)" SourceId="$(PackageId)" SourceType="Computed" ContentRoot="$(_ClientAssetsOutputFullPath)" BasePath="$(StaticWebAssetBasePath)">
+    <DefineStaticWebAssets Condition="'$(TargetFramework)' == 'net7.0'" CandidateAssets="@(_ClientAssetsBuildOutput)" SourceId="$(PackageId)" SourceType="Computed" ContentRoot="$(_ClientAssetsOutputFullPath)" BasePath="$(StaticWebAssetBasePath)">
       <Output TaskParameter="Assets" ItemName="StaticWebAsset" />
     </DefineStaticWebAssets>
   </Target>