Skip to content

Flatten SiteContentType and bump EPiServer.CMS to 13.0.2 #67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bjuris merged 2 commits into from
May 19, 2026
Merged

Flatten SiteContentType and bump EPiServer.CMS to 13.0.2 #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15807ce
Update dependencies
bjuris May 19, 2026
934ce73
Flatten SiteContentType to use ContentType
bjuris May 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions templates/Alloy.Mvc/Alloy.Mvc.1.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="EPiServer.CMS" Version="13.0.0" />
<PackageReference Include="EPiServer.Cms.UI.AspNetIdentity" Version="13.0.0" />
<PackageReference Include="EPiServer.CMS" Version="13.0.2" />
<PackageReference Include="EPiServer.Cms.UI.AspNetIdentity" Version="13.0.2" />
<PackageReference Include="Wangkanai.Detection" Version="8.7.0" />
</ItemGroup>

Expand Down
4 changes: 3 additions & 1 deletion templates/Alloy.Mvc/Models/Blocks/ButtonBlock.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ namespace Alloy.Mvc._1.Models.Blocks;
/// <summary>
/// Used to insert a link which is styled as a button
/// </summary>
[SiteContentType(GUID = "426CF12F-1F01-4EA0-922F-0778314DDAF0")]
[ContentType(
GUID = "426CF12F-1F01-4EA0-922F-0778314DDAF0",
GroupName = Globals.GroupNames.Default)]
[SiteImageUrl]
public class ButtonBlock : SiteBlockData
{
Expand Down
4 changes: 3 additions & 1 deletion templates/Alloy.Mvc/Models/Blocks/ContactBlock.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ namespace Alloy.Mvc._1.Models.Blocks;
/// Used to present contact information with a call-to-action link
/// </summary>
/// <remarks>Actual contact details are retrieved from a contact page specified using the ContactPageLink property</remarks>
[SiteContentType(GUID = "7E932EAF-6BC2-4753-902A-8670EDC5F363")]
[ContentType(
GUID = "7E932EAF-6BC2-4753-902A-8670EDC5F363",
GroupName = Globals.GroupNames.Default)]
[SiteImageUrl]
public class ContactBlock : SiteBlockData
{
Expand Down
2 changes: 1 addition & 1 deletion templates/Alloy.Mvc/Models/Blocks/EditorialBlock.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ namespace Alloy.Mvc._1.Models.Blocks;
/// <summary>
/// Used to insert editorial content edited using a rich-text editor
/// </summary>
[SiteContentType(
[ContentType(
GUID = "67F617A4-2175-4360-975E-75EDF2B924A7",
GroupName = SystemTabNames.Content)]
[SiteImageUrl]
Expand Down
2 changes: 1 addition & 1 deletion templates/Alloy.Mvc/Models/Blocks/JumbotronBlock.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ namespace Alloy.Mvc._1.Models.Blocks;
/// <summary>
/// Used for a primary message on a page, commonly used on start pages and landing pages
/// </summary>
[SiteContentType(
[ContentType(
GroupName = Globals.GroupNames.Specialized,
GUID = "9FD1C860-7183-4122-8CD4-FF4C55E096F9")]
[SiteImageUrl]
Expand Down
4 changes: 3 additions & 1 deletion templates/Alloy.Mvc/Models/Blocks/PageListBlock.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ namespace Alloy.Mvc._1.Models.Blocks;
/// <summary>
/// Used to insert a list of pages, for example a news list
/// </summary>
[SiteContentType(GUID = "30685434-33DE-42AF-88A7-3126B936AEAD")]
[ContentType(
GUID = "30685434-33DE-42AF-88A7-3126B936AEAD",
GroupName = Globals.GroupNames.Default)]
[SiteImageUrl]
public class PageListBlock : SiteBlockData
{
Expand Down
3 changes: 2 additions & 1 deletion templates/Alloy.Mvc/Models/Blocks/SiteLogotypeBlock.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@ namespace Alloy.Mvc._1.Models.Blocks;
/// <summary>
/// Used to provide a composite property on the start page to set site logotype settings
/// </summary>
[SiteContentType(
[ContentType(
GUID = "09854019-91A5-4B93-8623-17F038346001",
GroupName = Globals.GroupNames.Default,
AvailableInEditMode = false)] // Should not be created and added to content areas by editors, the SiteLogotypeBlock is only used as a property type
[SiteImageUrl]
public class SiteLogotypeBlock : SiteBlockData
Expand Down
4 changes: 3 additions & 1 deletion templates/Alloy.Mvc/Models/Blocks/TeaserBlock.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ namespace Alloy.Mvc._1.Models.Blocks;
/// <summary>
/// Used to provide a stylized entry point to a page on the site
/// </summary>
[SiteContentType(GUID = "EB67A99A-E239-41B8-9C59-20EAA5936047")] // BEST PRACTICE TIP: Always assign a GUID explicitly when creating a new block type
[ContentType(
GUID = "EB67A99A-E239-41B8-9C59-20EAA5936047",
GroupName = Globals.GroupNames.Default)]
[SiteImageUrl] // Use site's default thumbnail
public class TeaserBlock : SiteBlockData
{
Expand Down
2 changes: 1 addition & 1 deletion templates/Alloy.Mvc/Models/Pages/ArticlePage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ namespace Alloy.Mvc._1.Models.Pages;
/// <summary>
/// Used primarily for publishing news articles on the website
/// </summary>
[SiteContentType(
[ContentType(
GroupName = Globals.GroupNames.News,
GUID = "AEECADF2-3E89-4117-ADEB-F8D43565D2F4")]
[SiteImageUrl(Globals.StaticGraphicsFolderPath + "page-type-thumbnail-article.png")]
Expand Down
2 changes: 1 addition & 1 deletion templates/Alloy.Mvc/Models/Pages/ContactPage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ namespace Alloy.Mvc._1.Models.Pages;
/// <summary>
/// Represents contact details for a contact person
/// </summary>
[SiteContentType(
[ContentType(
GUID = "F8D47655-7B50-4319-8646-3369BA9AF05B",
GroupName = Globals.GroupNames.Specialized)]
[SiteImageUrl(Globals.StaticGraphicsFolderPath + "page-type-thumbnail-contact.png")]
Expand Down
2 changes: 1 addition & 1 deletion templates/Alloy.Mvc/Models/Pages/ContainerPage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ namespace Alloy.Mvc._1.Models.Pages;
/// <summary>
/// Used to logically group pages in the page tree
/// </summary>
[SiteContentType(
[ContentType(
GUID = "D178950C-D20E-4A46-90BD-5338B2424745",
GroupName = Globals.GroupNames.Specialized)]
[SiteImageUrl]
Expand Down
2 changes: 1 addition & 1 deletion templates/Alloy.Mvc/Models/Pages/LandingPage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ namespace Alloy.Mvc._1.Models.Pages;
/// <summary>
/// Used for campaign or landing pages, commonly used for pages linked in online advertising such as AdWords
/// </summary>
[SiteContentType(
[ContentType(
GUID = "DBED4258-8213-48DB-A11F-99C034172A54",
GroupName = Globals.GroupNames.Specialized)]
[SiteImageUrl]
Expand Down
4 changes: 3 additions & 1 deletion templates/Alloy.Mvc/Models/Pages/NewsPage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ namespace Alloy.Mvc._1.Models.Pages;
/// <summary>
/// Presents a news section including a list of the most recent articles on the site
/// </summary>
[SiteContentType(GUID = "638D8271-5CA3-4C72-BABC-3E8779233263")]
[ContentType(
GUID = "638D8271-5CA3-4C72-BABC-3E8779233263",
GroupName = Globals.GroupNames.Default)]
[SiteImageUrl]
public class NewsPage : StandardPage
{
Expand Down
2 changes: 1 addition & 1 deletion templates/Alloy.Mvc/Models/Pages/ProductPage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ namespace Alloy.Mvc._1.Models.Pages;
/// <summary>
/// Used to present a single product
/// </summary>
[SiteContentType(
[ContentType(
GUID = "17583DCD-3C11-49DD-A66D-0DEF0DD601FC",
GroupName = Globals.GroupNames.Products)]
[SiteImageUrl(Globals.StaticGraphicsFolderPath + "page-type-thumbnail-product.png")]
Expand Down
2 changes: 1 addition & 1 deletion templates/Alloy.Mvc/Models/Pages/SearchPage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ namespace Alloy.Mvc._1.Models.Pages;
/// <summary>
/// Used to provide on-site search
/// </summary>
[SiteContentType(
[ContentType(
GUID = "AAC25733-1D21-4F82-B031-11E626C91E30",
GroupName = Globals.GroupNames.Specialized)]
[SiteImageUrl]
Expand Down
4 changes: 3 additions & 1 deletion templates/Alloy.Mvc/Models/Pages/StandardPage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ namespace Alloy.Mvc._1.Models.Pages;
/// <summary>
/// Used for the pages mainly consisting of manually created content such as text, images, and blocks
/// </summary>
[SiteContentType(GUID = "9CCC8A41-5C8C-4BE0-8E73-520FF3DE8267")]
[ContentType(
GUID = "9CCC8A41-5C8C-4BE0-8E73-520FF3DE8267",
GroupName = Globals.GroupNames.Default)]
[SiteImageUrl(Globals.StaticGraphicsFolderPath + "page-type-thumbnail-standard.png")]
public class StandardPage : SitePageData
{
Expand Down
12 changes: 0 additions & 12 deletions templates/Alloy.Mvc/Models/SiteContentType.cs
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions templates/Cms.Empty/Cms.Empty.1.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="EPiServer.CMS" Version="13.0.0" />
<PackageReference Include="EPiServer.Cms.UI.AspNetIdentity" Version="13.0.0" />
<PackageReference Include="EPiServer.CMS" Version="13.0.2" />
<PackageReference Include="EPiServer.Cms.UI.AspNetIdentity" Version="13.0.2" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion templates/Cms.Item/Cms.Item.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="EPiServer.CMS" Version="13.0.0" />
<PackageReference Include="EPiServer.CMS" Version="13.0.2" />
</ItemGroup>
</Project>
Loading