From 3defbfd6bcf23fa604cce8b7e81aaab7b2a6dfa0 Mon Sep 17 00:00:00 2001 From: Johan Petersson Date: Tue, 14 Nov 2023 20:37:23 +0100 Subject: [PATCH 01/11] Updates to .NET8 Also updates dependencies. --- Directory.Build.props | 4 ++-- README.md | 4 ++-- global.json | 2 +- templates/Alloy.Mvc/Alloy.Mvc.1.csproj | 6 +++--- templates/Alloy.Mvc/README.md | 4 ++-- templates/Cms.Empty/Cms.Empty.1.csproj | 4 ++-- templates/Cms.Empty/README.md | 4 ++-- templates/Cms.Item/Cms.Item.csproj | 4 ++-- templates/Commerce.Empty/Commerce.Empty.1.csproj | 6 +++--- templates/Commerce.Empty/README.md | 4 ++-- 10 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index bcb0a68..808352e 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,7 +1,7 @@ - net6.0 - 9.0 + net8.0 + 12.0 enable true false diff --git a/README.md b/README.md index 8c8fa95..d1be500 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Continuous integration](https://github.com/episerver/content-templates/actions/workflows/ci.yml/badge.svg)](https://github.com/episerver/content-templates/actions/workflows/ci.yml) -This repository contains templates for Optimizely Digital Experience Cloud to be used with `dotnet new` and Visual Studio 2022. +This repository contains templates for Optimizely Digital Experience Cloud to be used with `dotnet new` and Visual Studio 17.8.0+. The templates in this repository are distributed as a NuGet package available from [NuGet.org](https://www.nuget.org/packages/EPiServer.Templates/) and can be installed using the `dotnet new` command. @@ -10,7 +10,7 @@ The templates in this repository are distributed as a NuGet package available fr $ dotnet new -i EPiServer.Templates ``` -Once installed, these templates will also be available in Visual Studio 2022. +Once installed, these templates will also be available in Visual Studio 17.8.0+. Note that Visual Studio currently only supports *Project Templates* and not *Item Templates*. To generate code based on the template simply execute the following. diff --git a/global.json b/global.json index 2250794..6dd7372 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "6.0.100", + "version": "8.0.100", "runtime": "clr", "architecture": "x86", "rollForward": "minor" diff --git a/templates/Alloy.Mvc/Alloy.Mvc.1.csproj b/templates/Alloy.Mvc/Alloy.Mvc.1.csproj index 5977af0..d603be1 100644 --- a/templates/Alloy.Mvc/Alloy.Mvc.1.csproj +++ b/templates/Alloy.Mvc/Alloy.Mvc.1.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0 disable enable @@ -13,8 +13,8 @@ - - + + diff --git a/templates/Alloy.Mvc/README.md b/templates/Alloy.Mvc/README.md index db4a370..3edda89 100644 --- a/templates/Alloy.Mvc/README.md +++ b/templates/Alloy.Mvc/README.md @@ -9,7 +9,7 @@ Chose one of the following options to get started. ### Windows Prerequisities -- .NET SDK 6+ +- .NET SDK 8+ - SQL Server 2016 Express LocalDB (or later) ```bash @@ -38,7 +38,7 @@ $ docker-compose up ### Any OS with external database server Prerequisities -- .NET SDK 6+ +- .NET SDK 8+ - SQL Server 2016 (or later) on a external server, e.g. Azure SQL Create an empty database on the external database server and update the connection string accordingly. diff --git a/templates/Cms.Empty/Cms.Empty.1.csproj b/templates/Cms.Empty/Cms.Empty.1.csproj index e140543..8c9a13e 100644 --- a/templates/Cms.Empty/Cms.Empty.1.csproj +++ b/templates/Cms.Empty/Cms.Empty.1.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0 enable enable @@ -13,7 +13,7 @@ - + diff --git a/templates/Cms.Empty/README.md b/templates/Cms.Empty/README.md index f8b59de..f7cc266 100644 --- a/templates/Cms.Empty/README.md +++ b/templates/Cms.Empty/README.md @@ -7,7 +7,7 @@ Chose one of the following options to get started. ### Windows Prerequisities -- .NET SDK 6+ +- .NET SDK 8+ - SQL Server 2016 Express LocalDB (or later) ```bash @@ -36,7 +36,7 @@ $ docker-compose up ### Any OS with external database server Prerequisities -- .NET SDK 6+ +- .NET SDK 8+ - SQL Server 2016 (or later) on a external server, e.g. Azure SQL Create an empty database on the external database server and update the connection string accordingly. diff --git a/templates/Cms.Item/Cms.Item.csproj b/templates/Cms.Item/Cms.Item.csproj index 6db71a4..11a485e 100644 --- a/templates/Cms.Item/Cms.Item.csproj +++ b/templates/Cms.Item/Cms.Item.csproj @@ -1,11 +1,11 @@ - net6.0 + net8.0 MyApp.Namespace warnings - + diff --git a/templates/Commerce.Empty/Commerce.Empty.1.csproj b/templates/Commerce.Empty/Commerce.Empty.1.csproj index dc35bae..c60358c 100644 --- a/templates/Commerce.Empty/Commerce.Empty.1.csproj +++ b/templates/Commerce.Empty/Commerce.Empty.1.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0 enable enable @@ -13,8 +13,8 @@ - - + + diff --git a/templates/Commerce.Empty/README.md b/templates/Commerce.Empty/README.md index 234b93a..ede5c34 100644 --- a/templates/Commerce.Empty/README.md +++ b/templates/Commerce.Empty/README.md @@ -7,7 +7,7 @@ Chose one of the following options to get started. ### Windows Prerequisities -- .NET SDK 6+ +- .NET SDK 8+ - SQL Server 2016 Express LocalDB (or later) ```bash @@ -36,7 +36,7 @@ $ docker-compose up ### Any OS with external database server Prerequisities -- .NET SDK 6+ +- .NET SDK 8+ - SQL Server 2016 (or later) on a external server, e.g. Azure SQL Create two empty databases on the external database server and update the connection strings accordingly. From 5c6470786d5174240a0d9437ed2db761ada33b69 Mon Sep 17 00:00:00 2001 From: Johan Petersson Date: Tue, 14 Nov 2023 20:37:33 +0100 Subject: [PATCH 02/11] Fixes footer --- templates/Alloy.Mvc/Views/Shared/Footer.cshtml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/Alloy.Mvc/Views/Shared/Footer.cshtml b/templates/Alloy.Mvc/Views/Shared/Footer.cshtml index dd17d10..46e4c70 100644 --- a/templates/Alloy.Mvc/Views/Shared/Footer.cshtml +++ b/templates/Alloy.Mvc/Views/Shared/Footer.cshtml @@ -5,19 +5,19 @@

@Html.Translate("/footer/products")

-
+

@Html.Translate("/footer/company")

-
+

@Html.Translate("/footer/news")

-
+

@Html.Translate("/footer/customerzone")

-
+