Also make sure net7 still works

patrickdemooij9 · Jan 8, 2024 · 820e7ae · 820e7ae
1 parent c9f16b4
commit 820e7ae
Show file tree

Hide file tree

Showing 18 changed files with 24 additions and 21 deletions.
diff --git a/.github/workflows/AllPackages.yml b/.github/workflows/AllPackages.yml
@@ -18,7 +18,7 @@ jobs:
     - name: Set up .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: '7.0.103'
+        dotnet-version: '8.x.x'
         include-prerelease: true
 
     - name: Restore dependencies

diff --git a/src/SeoToolkit.Umbraco.Common.Core/SeoToolkit.Umbraco.Common.Core.csproj b/src/SeoToolkit.Umbraco.Common.Core/SeoToolkit.Umbraco.Common.Core.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
     <Product>SeoToolkit Common Core</Product>
     <PackageId>SeoToolkit.Umbraco.Common.Core</PackageId>
     <Nullable>enable</Nullable>

diff --git a/src/SeoToolkit.Umbraco.Common/SeoToolkit.Umbraco.Common.csproj b/src/SeoToolkit.Umbraco.Common/SeoToolkit.Umbraco.Common.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 	<PropertyGroup>
-		<TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
 		<ContentTargetFolders>.</ContentTargetFolders>
 		<Product>SeoToolkit Common</Product>
 		<PackageId>SeoToolkit.Umbraco.Common</PackageId>
@@ -14,7 +14,8 @@
 		<PackageIconUrl>https://raw.githubusercontent.com/patrickdemooij9/SeoToolkit.Umbraco/main/package/SeoToolkitIcon.png</PackageIconUrl>
 		<Version>3.4.0</Version>
 		<StaticWebAssetBasePath>App_Plugins/SeoToolkit</StaticWebAssetBasePath>
-	</PropertyGroup>
+
+</PropertyGroup>
 
 	<ItemGroup>
 		<PackageReference Include="Umbraco.Cms.Web.Website" Version="[11.0.0,13.999)" />

diff --git a/src/SeoToolkit.Umbraco.Core/SeoToolkit.Umbraco.Core.csproj b/src/SeoToolkit.Umbraco.Core/SeoToolkit.Umbraco.Core.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
     <Product>SeoToolkit Core</Product>
     <PackageId>SeoToolkit.Umbraco.Core</PackageId>
     <Title>SeoToolkit Core</Title>

diff --git a/src/SeoToolkit.Umbraco.MetaFields.Core/SeoToolkit.Umbraco.MetaFields.Core.csproj b/src/SeoToolkit.Umbraco.MetaFields.Core/SeoToolkit.Umbraco.MetaFields.Core.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
     <Product>SeoToolkit MetaFields Core</Product>
     <PackageId>SeoToolkit.Umbraco.MetaFields.Core</PackageId>
     <Title>SeoToolkit MetaFields Core</Title>

diff --git a/src/SeoToolkit.Umbraco.MetaFields/SeoToolkit.Umbraco.MetaFields.csproj b/src/SeoToolkit.Umbraco.MetaFields/SeoToolkit.Umbraco.MetaFields.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
 	<PropertyGroup>
-		<TargetFramework>net8.0</TargetFramework>
+		<TargetFrameworks>net7.0;net8.0</TargetFrameworks>
 		<ContentTargetFolders>.</ContentTargetFolders>
 		<Product>SeoToolkit MetaFields</Product>
 		<PackageId>SeoToolkit.Umbraco.MetaFields</PackageId>

diff --git a/src/SeoToolkit.Umbraco.Redirects.Core/SeoToolkit.Umbraco.Redirects.Core.csproj b/src/SeoToolkit.Umbraco.Redirects.Core/SeoToolkit.Umbraco.Redirects.Core.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
     <Product>SeoToolkit Redirects Core</Product>
     <PackageId>SeoToolkit.Umbraco.Redirects.Core</PackageId>
     <Title>SeoToolkit Redirects Core</Title>

diff --git a/src/SeoToolkit.Umbraco.Redirects/SeoToolkit.Umbraco.Redirects.csproj b/src/SeoToolkit.Umbraco.Redirects/SeoToolkit.Umbraco.Redirects.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
 	<PropertyGroup>
-		<TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
 		<ContentTargetFolders>.</ContentTargetFolders>
 		<Product>SeoToolkit Redirects</Product>
 		<PackageId>SeoToolkit.Umbraco.Redirects</PackageId>

diff --git a/src/SeoToolkit.Umbraco.RobotsTxt.Core/SeoToolkit.Umbraco.RobotsTxt.Core.csproj b/src/SeoToolkit.Umbraco.RobotsTxt.Core/SeoToolkit.Umbraco.RobotsTxt.Core.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
     <Product>SeoToolkit Robots.txt Core</Product>
     <PackageId>SeoToolkit.Umbraco.RobotsTxt.Core</PackageId>
     <Title>SeoToolkit Robots.txt Core</Title>

diff --git a/src/SeoToolkit.Umbraco.RobotsTxt/SeoToolkit.Umbraco.RobotsTxt.csproj b/src/SeoToolkit.Umbraco.RobotsTxt/SeoToolkit.Umbraco.RobotsTxt.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
 	<PropertyGroup>
-		<TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
 		<ContentTargetFolders>.</ContentTargetFolders>
 		<Product>SeoToolkit Robots.txt</Product>
 		<PackageId>SeoToolkit.Umbraco.RobotsTxt</PackageId>

diff --git a/src/SeoToolkit.Umbraco.ScriptManager.Core/SeoToolkit.Umbraco.ScriptManager.Core.csproj b/src/SeoToolkit.Umbraco.ScriptManager.Core/SeoToolkit.Umbraco.ScriptManager.Core.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
     <Product>SeoToolkit Script Manager Core</Product>
     <PackageId>SeoToolkit.Umbraco.ScriptManager.Core</PackageId>
     <Title>SeoToolkit Script Manager Core</Title>

diff --git a/src/SeoToolkit.Umbraco.ScriptManager/SeoToolkit.Umbraco.ScriptManager.csproj b/src/SeoToolkit.Umbraco.ScriptManager/SeoToolkit.Umbraco.ScriptManager.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
 	<PropertyGroup>
-		<TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
 		<ContentTargetFolders>.</ContentTargetFolders>
 		<Product>SeoToolkit Script Manager</Product>
 		<PackageId>SeoToolkit.Umbraco.ScriptManager</PackageId>

diff --git a/src/SeoToolkit.Umbraco.Site/appsettings.json b/src/SeoToolkit.Umbraco.Site/appsettings.json
@@ -11,7 +11,7 @@
     }
   },
   "ConnectionStrings": {
-    "umbracoDbDSN": "Server=localhost;Database=uSeoToolkitV11;Integrated Security=true"
+    "umbracoDbDSN": "Server=localhost;Database=SeoToolkit13;Integrated Security=true;TrustServerCertificate=True"
   },
   "Umbraco": {
     "CMS": {

diff --git a/src/SeoToolkit.Umbraco.SiteAudit.Core/SeoToolkit.Umbraco.SiteAudit.Core.csproj b/src/SeoToolkit.Umbraco.SiteAudit.Core/SeoToolkit.Umbraco.SiteAudit.Core.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
     <ContentTargetFolders>.</ContentTargetFolders>
     <Product>SeoToolkit SiteAudit Core</Product>
     <PackageId>SeoToolkit.Umbraco.SiteAudit.Core</PackageId>

diff --git a/src/SeoToolkit.Umbraco.SiteAudit/SeoToolkit.Umbraco.SiteAudit.csproj b/src/SeoToolkit.Umbraco.SiteAudit/SeoToolkit.Umbraco.SiteAudit.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 	<PropertyGroup>
-		<TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
 		<ContentTargetFolders>.</ContentTargetFolders>
 		<Product>SeoToolkit SiteAudit</Product>
 		<PackageId>SeoToolkit.Umbraco.SiteAudit</PackageId>

diff --git a/src/SeoToolkit.Umbraco.Sitemap.Core/SeoToolkit.Umbraco.Sitemap.Core.csproj b/src/SeoToolkit.Umbraco.Sitemap.Core/SeoToolkit.Umbraco.Sitemap.Core.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
     <Product>SeoToolkit Sitemap Core</Product>
     <PackageId>SeoToolkit.Umbraco.Sitemap.Core</PackageId>
     <Title>SeoToolkit Sitemap Core</Title>
@@ -13,7 +13,8 @@
     <RepositoryUrl>https://github.com/patrickdemooij9/SeoToolkit.Umbraco</RepositoryUrl>
     <PackageIconUrl>https://raw.githubusercontent.com/patrickdemooij9/SeoToolkit.Umbraco/main/package/SeoToolkitIcon.png</PackageIconUrl>
     <Version>3.4.0</Version>
-	</PropertyGroup>
+
+</PropertyGroup>
 
 	<ItemGroup>
 	  <PackageReference Include="Umbraco.Cms.Web.BackOffice" Version="[11.0.0,13.999)" />

diff --git a/src/SeoToolkit.Umbraco.Sitemap/SeoToolkit.Umbraco.Sitemap.csproj b/src/SeoToolkit.Umbraco.Sitemap/SeoToolkit.Umbraco.Sitemap.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
 	<PropertyGroup>
-		<TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
 		<ContentTargetFolders>.</ContentTargetFolders>
 		<Product>SeoToolkit Sitemap</Product>
 		<PackageId>SeoToolkit.Umbraco.Sitemap</PackageId>

diff --git a/src/SeoToolkit.Umbraco/SeoToolkit.Umbraco.csproj b/src/SeoToolkit.Umbraco/SeoToolkit.Umbraco.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
 	<PropertyGroup>
-		<TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
 		<ContentTargetFolders>.</ContentTargetFolders>
 		<Product>SeoToolkit</Product>
 		<PackageId>SeoToolkit.Umbraco</PackageId>
@@ -15,7 +15,8 @@
 		<PackageIconUrl>https://raw.githubusercontent.com/patrickdemooij9/SeoToolkit.Umbraco/main/package/SeoToolkitIcon.png</PackageIconUrl>
 		<Version>3.4.0</Version>
 		<StaticWebAssetBasePath>App_Plugins/SeoToolkit</StaticWebAssetBasePath>
-	</PropertyGroup>
+
+</PropertyGroup>
 
 	<ItemGroup>
 		<ProjectReference Include="..\SeoToolkit.Umbraco.Common\SeoToolkit.Umbraco.Common.csproj" />