Upgrade PLAY! Summit to Sitecore 10.4 (#548)

.env

@@ -12,7 +12,7 @@ RENDERING_HOST=www.edge.localhost
 # Sitecore Docker registry and platform version.
 # The ltsc2019-based images are used by default here. Development-only 1909 images are also available.
 SITECORE_DOCKER_REGISTRY=scr.sitecore.com/
-SITECORE_VERSION=10.3
+SITECORE_VERSION=10.4
 WINDOWSSERVERCORE_VERSION=ltsc2019
 NANOSERVER_VERSION=1809
 LEGACY_NANOSERVER_VERSION=1809

GitVersion.yml

@@ -6,6 +6,7 @@ major-version-bump-message: '\+semver:\s?(dotnotuse)'
 minor-version-bump-message: '\+semver:\s?(breaking|major)'
 patch-version-bump-message: '\+semver:\s?(feature|minor)'
 no-bump-message: '\+semver:\s?(none|skip)'
+next-version: 1040.0.0
 branches:
   develop:
     tag: beta

Website/Packages.props

@@ -6,7 +6,7 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <PlatformVersion>10.3.0-r*</PlatformVersion>
+    <PlatformVersion>10.4.0</PlatformVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Update="Sitecore.Kernel" Version="$(PlatformVersion)" />
@@ -19,5 +19,6 @@
     <PackageReference Update="Sitecore.Connector.CMP" Version="3.1.0" />
     <PackageReference Update="Sitecore.Services.GraphQL" Version="6.0.0" />
     <PackageReference Update="Sitecore.Services.GraphQL.EdgeSchema" Version="6.0.0" />
+    <PackageReference Update="HtmlAgilityPack" Version="1.4.9.5" />
   </ItemGroup>
 </Project>

Website/src/platform/Platform.csproj

@@ -57,6 +57,10 @@
     <Reference Include="System.Xml.Linq" />
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="HtmlAgilityPack">
+      <PrivateAssets>all</PrivateAssets>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </PackageReference>
     <PackageReference Include="Sitecore.Kernel">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>

docker-compose.override.yml

@@ -183,7 +183,7 @@ services:
       context: ./docker/build/id
       args:
         PARENT_IMAGE: ${SITECORE_DOCKER_REGISTRY}sxp/sitecore-id7:${SITECORE_VERSION}-${WINDOWSSERVERCORE_VERSION}
-        TOOLS_IMAGE: ${SITECORE_DOCKER_REGISTRY}tools/sitecore-docker-tools-assets:10.2-${SITECORE_ASSET_NANOSERVER_VERSION}
+        TOOLS_IMAGE: ${SITECORE_DOCKER_REGISTRY}tools/sitecore-docker-tools-assets:10.3-${SITECORE_ASSET_NANOSERVER_VERSION}
     volumes:
       - ${HOST_LICENSE_FOLDER}:c:\license
     environment:
@@ -203,13 +203,13 @@ services:
         PARENT_IMAGE: ${SITECORE_DOCKER_REGISTRY}sxp/sitecore-xm1-cm:${SITECORE_VERSION}-${WINDOWSSERVERCORE_VERSION}
         # DEMO TEAM CUSTOMIZATION - demo subfolder, custom tag
         SOLUTION_IMAGE: ${REGISTRY}demo/${COMPOSE_PROJECT_NAME}-solution:${SITECORE_VERSION}-${NANOSERVER_VERSION}-${DEMO_VERSION}
-        TOOLS_IMAGE: ${SITECORE_DOCKER_REGISTRY}tools/sitecore-docker-tools-assets:10.2-${SITECORE_ASSET_NANOSERVER_VERSION}
+        TOOLS_IMAGE: ${SITECORE_DOCKER_REGISTRY}tools/sitecore-docker-tools-assets:10.3-${SITECORE_ASSET_NANOSERVER_VERSION}
         # DEMO TEAM CUSTOMIZATION - Add modules
         MANAGEMENT_SERVICES_IMAGE: ${SITECORE_DOCKER_REGISTRY}sxp/modules/sitecore-management-services-xm1-assets:4.0.0-${SITECORE_ASSET_NANOSERVER_VERSION}
-        HEADLESS_SERVICES_IMAGE: ${SITECORE_DOCKER_REGISTRY}sxp/modules/sitecore-headless-services-xm1-assets:20.0.1-${LEGACY_NANOSERVER_VERSION}
+        HEADLESS_SERVICES_IMAGE: ${SITECORE_DOCKER_REGISTRY}sxp/modules/sitecore-headless-services-xm1-assets:22.0-${LEGACY_NANOSERVER_VERSION}
         SPE_ASSETS_IMAGE: ${SITECORE_DOCKER_REGISTRY}sxp/modules/sitecore-spe-assets:6.4-${SITECORE_ASSET_NANOSERVER_VERSION}
         CONTENTHUB_ASSETS_IMAGE: ${SITECORE_DOCKER_REGISTRY}sxp/modules/sitecore-chub-xm1-assets:4.0.0-${NANOSERVER_VERSION}
-        EXPERIENCE_EDGE_ASSETS_IMAGE: ${SITECORE_DOCKER_REGISTRY}sxp/modules/sitecore-experience-edge-connector-xm1-assets:20.0.0-${NANOSERVER_VERSION}
+        EXPERIENCE_EDGE_ASSETS_IMAGE: ${SITECORE_DOCKER_REGISTRY}sxp/modules/sitecore-experience-edge-connector-xm1-assets:21.0-${NANOSERVER_VERSION}
         # DEMO TEAM CUSTOMIZATION - Product Hotfixes
         DELTA_ASSET_IMAGE: ${SITECORE_DOCKER_REGISTRY}sxp-pre/sitecore-xm1-assets:10.3.1.009332.420-10.0.17763.4377-1809
     depends_on:

docker/build-and-push-images.yml

@@ -10,7 +10,7 @@ resources:
 
 variables:
   GitVersion.SemVer: ''
-  SITECORE_VERSION: '10.3'
+  SITECORE_VERSION: '10.4'
   GitVersion.PreReleaseLabel: ''
   tag: '$(GitVersion.SemVer)'
   additionalImageTags: ''
@@ -296,8 +296,8 @@ stages:
           inputs:
             targetType: "inline"
             script: |
-              Invoke-RestMethod -Uri "$(DEV_PORTAL_V2_UPDATE_DEFINITION)&definitionId=24" -Method POST -Body "{ tag: '$(GitVersion.SemVer)', revision: '$(GitVersion.Sha)' }" -ContentType "application/json"
-              Invoke-RestMethod -Uri "$(DEV_PORTAL_V2_UPDATE_DEFINITION)&definitionId=27" -Method POST -Body "{ tag: '$(GitVersion.SemVer)', revision: '$(GitVersion.Sha)' }" -ContentType "application/json"
+              Invoke-RestMethod -Uri "$(DEV_PORTAL_V2_UPDATE_DEFINITION)&definitionId=53" -Method POST -Body "{ tag: '$(GitVersion.SemVer)', revision: '$(GitVersion.Sha)' }" -ContentType "application/json"
+              Invoke-RestMethod -Uri "$(DEV_PORTAL_V2_UPDATE_DEFINITION)&definitionId=55" -Method POST -Body "{ tag: '$(GitVersion.SemVer)', revision: '$(GitVersion.Sha)' }" -ContentType "application/json"
 
 - stage: Update_DEV_Portal_Databases_Stable
   displayName: "Update 'stable' version in the DEV portal database"
@@ -321,8 +321,8 @@ stages:
           inputs:
             targetType: "inline"
             script: |
-              Invoke-RestMethod -Uri "$(DEV_PORTAL_V2_UPDATE_DEFINITION)&definitionId=25" -Method POST -Body "{ tag: '$(GitVersion.SemVer)', revision: '$(GitVersion.Sha)' }" -ContentType "application/json"
-              Invoke-RestMethod -Uri "$(DEV_PORTAL_V2_UPDATE_DEFINITION)&definitionId=26" -Method POST -Body "{ tag: '$(GitVersion.SemVer)', revision: '$(GitVersion.Sha)' }" -ContentType "application/json"
+              Invoke-RestMethod -Uri "$(DEV_PORTAL_V2_UPDATE_DEFINITION)&definitionId=54" -Method POST -Body "{ tag: '$(GitVersion.SemVer)', revision: '$(GitVersion.Sha)' }" -ContentType "application/json"
+              Invoke-RestMethod -Uri "$(DEV_PORTAL_V2_UPDATE_DEFINITION)&definitionId=56" -Method POST -Body "{ tag: '$(GitVersion.SemVer)', revision: '$(GitVersion.Sha)' }" -ContentType "application/json"
 
 - stage: Update_PROD_Portal_Database_Stable
   displayName: "Update 'stable' version in the PROD portal database"
@@ -346,8 +346,8 @@ stages:
           inputs:
             targetType: "inline"
             script: |
-              Invoke-RestMethod -Uri "$(PROD_PORTAL_V2_UPDATE_DEFINITION)&definitionId=12" -Method POST -Body "{ tag: '$(GitVersion.SemVer)', revision: '$(GitVersion.Sha)' }" -ContentType "application/json"
-              Invoke-RestMethod -Uri "$(PROD_PORTAL_V2_UPDATE_DEFINITION)&definitionId=13" -Method POST -Body "{ tag: '$(GitVersion.SemVer)', revision: '$(GitVersion.Sha)' }" -ContentType "application/json"
+              Invoke-RestMethod -Uri "$(PROD_PORTAL_V2_UPDATE_DEFINITION)&definitionId=30" -Method POST -Body "{ tag: '$(GitVersion.SemVer)', revision: '$(GitVersion.Sha)' }" -ContentType "application/json"
+              Invoke-RestMethod -Uri "$(PROD_PORTAL_V2_UPDATE_DEFINITION)&definitionId=31" -Method POST -Body "{ tag: '$(GitVersion.SemVer)', revision: '$(GitVersion.Sha)' }" -ContentType "application/json"
     - deployment: Update_Production_Database_Deployment
       displayName: "Update Production Database Deployment"
       environment: Production Portal Database

init-ci.ps1

@@ -16,7 +16,7 @@ Param (
   ,
   [Parameter(
     HelpMessage = "Sitecore version")]
-  [string]$SitecoreVersion = "10.3"
+  [string]$SitecoreVersion = "10.4"
   ,
   [Parameter(
     HelpMessage = "Internal Sitecore NuGet source")]

tv/pages/rooms/[id].tsx

@@ -1,7 +1,6 @@
 import { useContext, useEffect, useRef, useState } from 'react';
 import Router, { NextRouter, useRouter } from 'next/router';
 import { getSessionsByRoom } from '../../api/queries/getSessions';
-import { getRooms } from '../../api/queries/getRooms';
 import { Session } from '../../interfaces/session';
 import { Params } from '../../interfaces';
 import RoomDisplay from '../../components/RoomDisplay';
@@ -109,17 +108,13 @@ const RoomPage = (props: RoomProps) => {
 
 // This function gets called at build time
 export async function getStaticPaths() {
-  // Call an external API endpoint to get rooms
-  const { rooms } = await getRooms();
-
-  // Get the paths we want to pre-render based on rooms
-  const paths = rooms.map((room) => ({
-    params: { id: room.id },
-  }));
-
-  // We'll pre-render only these paths at build time.
-  // { fallback: false } means other routes should 404.
-  return { paths, fallback: false };
+  // Return empty paths because we don't want to generate anything on build
+  // { fallback: blocking } will server-render pages
+  // on-demand if the path doesn't exist.
+  return {
+    paths: [],
+    fallback: 'blocking',
+  };
 }
 
 // This also gets called at build time

tv/pages/venues/[id].tsx

@@ -2,7 +2,7 @@ import { Params } from '../../interfaces';
 import { VenueResult } from '../../interfaces/schema';
 import React from 'react';
 import Venue from '../../components/Venue';
-import { getVenueById, getVenues } from '../../api/queries/getVenues';
+import { getVenueById } from '../../api/queries/getVenues';
 
 type VenueProps = {
   venue: VenueResult;
@@ -17,13 +17,13 @@ const VenuePage = (props: VenueProps) => {
 };
 
 export async function getStaticPaths() {
-  const { venues } = await getVenues();
-
-  const paths = venues.map((venue) => ({
-    params: { id: venue.id },
-  }));
-
-  return { paths, fallback: false };
+  // Return empty paths because we don't want to generate anything on build
+  // { fallback: blocking } will server-render pages
+  // on-demand if the path doesn't exist.
+  return {
+    paths: [],
+    fallback: 'blocking',
+  };
 }
 
 // This also gets called at build time