.Net 8 update

ninianne98 · Apr 6, 2024 · e7e1bfa · e7e1bfa
1 parent d6cec7d
commit e7e1bfa
Show file tree

Hide file tree

Showing 16 changed files with 1,273 additions and 1,211 deletions.
diff --git a/CMSAdmin/CMSAdminCore.csproj b/CMSAdmin/CMSAdminCore.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 		<Nullable>enable</Nullable>
 		<OutputPath>bin\</OutputPath>
 		<ImplicitUsings>enable</ImplicitUsings>
@@ -16,32 +16,40 @@
 		<Copyright>2023</Copyright>
 		<ProductName>Carrot Cake CMS</ProductName>
 		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-		<Version>6.1.0.0</Version>
-		<VersionPrefix>6.1</VersionPrefix>
+		<Version>8.1.0.0</Version>
+		<VersionPrefix>8.1</VersionPrefix>
 		<VersionSuffix>$([System.DateTime]::UtcNow.ToString("yyMMdd")).$([System.DateTime]::UtcNow.ToString("HHmmss"))</VersionSuffix>
 		<AssemblyVersion>$(VersionPrefix).0.0</AssemblyVersion>
 		<FileVersion>$(VersionPrefix).$(VersionSuffix)</FileVersion>
 	</PropertyGroup>
 
 	<PropertyGroup>
 		<ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
+		<GenerateRuntimeConfigDevFile>true</GenerateRuntimeConfigDevFile>
 	</PropertyGroup>
 
 	<ItemGroup>
 		<PackageReference Include="MailKit" Version="4.4.0" />
-		<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="6.0.28" />
-		<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.28" />
-		<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="6.0.28" />
-		<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="6.0.28" />
+		<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="7.0.17" />
+		<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.17" />
+		<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="8.0.3" />
+		<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="8.0.3" />
 		<PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.0" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="7.0.17" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.17" />
-		<PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="6.0.28" />
-		<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="7.0.0" />
-		<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.16" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.17">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
+		<PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="8.0.3" />
+		<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="8.0.0" />
+		<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.2" />
 		<PackageReference Include="MimeKit" Version="4.4.0" />
-		<PackageReference Include="System.Collections.Immutable" Version="7.0.0" />
+		<PackageReference Include="System.Collections.Immutable" Version="8.0.0" />
+		<PackageReference Include="System.Net.Http.Json" Version="8.0.0" />
+		<PackageReference Include="System.Security.Cryptography.Pkcs" Version="8.0.0" GeneratePathProperty="true" />
+		<PackageReference Include="System.Text.Json" Version="8.0.3" />
 	</ItemGroup>
 
 	<PropertyGroup>
@@ -54,9 +62,13 @@
 		</ItemGroup>
 	</Target>
 
+	<Target Name="CopySystemSecurityCryptographyPkcs" AfterTargets="Build">
+		<Copy SourceFiles="$(PkgSystem_Security_Cryptography_Pkcs)\lib\net8.0\System.Security.Cryptography.Pkcs.dll" DestinationFolder="$(OutDir)" />
+	</Target>
+
 	<ItemGroup>
 		<Content Include="wwwroot\favicon.ico" />
-		
+
 		<Content Include="appsettings.Development.json">
 			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
 		</Content>
@@ -67,7 +79,7 @@
 			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
 		</Content>
 		<Content Include="Properties\C3ConfigSchema.json">
-			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+			<CopyToOutputDirectory>Never</CopyToOutputDirectory>
 		</Content>
 
 		<Content Include="TextContentProcessors.config">

diff --git a/CMSAdmin/Program.cs b/CMSAdmin/Program.cs
@@ -12,10 +12,10 @@
 * CarrotCake CMS (MVC Core)
 * http://www.carrotware.com/
 *
-* Copyright 2015, 2023, Samantha Copeland
+* Copyright 2015, 2023, 2024 Samantha Copeland
 * Dual licensed under the MIT or GPL Version 3 licenses.
 *
-* Date: June 2023
+* Date: June 2023, April 2024
 */
 
 var builder = WebApplication.CreateBuilder(args);

diff --git a/CMSAdmin/global.json b/CMSAdmin/global.json
@@ -1,6 +1,6 @@
 {
 	"sdk": {
-		"version": "6.0.20",
+		"version": "8.0.2",
 		"rollForward": "latestMinor",
 		"allowPrerelease": false
 	}

diff --git a/CMSComponents/CMSComponents.csproj b/CMSComponents/CMSComponents.csproj
@@ -1,75 +1,75 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
-		<Nullable>enable</Nullable>
-		<ImplicitUsings>enable</ImplicitUsings>
-		<OutputType>Library</OutputType>
-		<NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile>
-		<SatelliteResourceLanguages>en</SatelliteResourceLanguages>
-		<RootNamespace>Carrotware.CMS.UI.Components</RootNamespace>
-		<AssemblyName>Carrotware.CMS.UI.Components</AssemblyName>
-	</PropertyGroup>
-
-	<PropertyGroup>
-		<Authors>Carrotware</Authors>
-		<Company>Carrotware</Company>
-		<Copyright>2023</Copyright>
-		<ProductName>Carrot Cake CMS</ProductName>
-		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-		<Version>6.1.0.0</Version>
-		<VersionPrefix>6.1</VersionPrefix>
-		<VersionSuffix>$([System.DateTime]::UtcNow.ToString("yyMMdd")).$([System.DateTime]::UtcNow.ToString("HHmmss"))</VersionSuffix>
-		<AssemblyVersion>$(VersionPrefix).0.0</AssemblyVersion>
-		<FileVersion>$(VersionPrefix).$(VersionSuffix)</FileVersion>
-	</PropertyGroup>
-
-	<ItemGroup>
-		<Content Remove="compilerconfig.json" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<None Remove="adminHelp.js" />
-	</ItemGroup>
-
-
-	<ItemGroup>
-		<EmbeddedResource Include="adminHelp.js" />
-		<EmbeddedResource Include="feed.png" />
-		<EmbeddedResource Include="_WidgetWrapper.cshtml" />
-		<EmbeddedResource Include="TopMenu.txt" />
-	</ItemGroup>
-	<ItemGroup>
-		<ProjectReference Include="..\CMSCore\CMSCore.csproj" />
-		<ProjectReference Include="..\CMSInterfaces\CMSInterfaces.csproj" />
-		<ProjectReference Include="..\CMSSecurity\CMSSecurity.csproj" />
-		<ProjectReference Include="..\WebComponents\WebComponents.csproj" />
-	</ItemGroup>
-	<ItemGroup>
-		<EmbeddedResource Include="_TextZone.cshtml" />
-		<EmbeddedResource Include="_WidgetZone.cshtml" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="6.0.28" />
-		<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="6.0.28" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.17" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.17" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.17" />
-		<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.16" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<Folder Include="Properties\" />
-	</ItemGroup>
-	<ItemGroup>
-		<None Include="compilerconfig.json" />
-	</ItemGroup>
-	<ItemGroup>
-		<Content Update="appsettings.json">
-			<CopyToOutputDirectory>Never</CopyToOutputDirectory>
-		</Content>
-	</ItemGroup>
-	<Target Name="PreBuild" BeforeTargets="PreBuildEvent">
-		<Exec Command="xcopy &quot;$(ProjectDir)\skins\*.min.css&quot; &quot;$(SolutionDir)\CMSAdmin\wwwroot\Assets\Admin\skins\&quot; /F/R/Y/I/S/C&#xD;&#xA;xcopy &quot;$(ProjectDir)\editor\*.min.css&quot; &quot;$(SolutionDir)\CMSAdmin\wwwroot\Assets\Admin\editor\&quot; /F/R/Y/I/S/C&#xD;&#xA;" />
-	</Target>
+<Project Sdk="Microsoft.NET.Sdk.Web">
+	<PropertyGroup>
+		<TargetFramework>net8.0</TargetFramework>
+		<Nullable>enable</Nullable>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<OutputType>Library</OutputType>
+		<NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile>
+		<SatelliteResourceLanguages>en</SatelliteResourceLanguages>
+		<RootNamespace>Carrotware.CMS.UI.Components</RootNamespace>
+		<AssemblyName>Carrotware.CMS.UI.Components</AssemblyName>
+	</PropertyGroup>
+
+	<PropertyGroup>
+		<Authors>Carrotware</Authors>
+		<Company>Carrotware</Company>
+		<Copyright>2023</Copyright>
+		<ProductName>Carrot Cake CMS</ProductName>
+		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
+		<Version>8.1.0.0</Version>
+		<VersionPrefix>8.1</VersionPrefix>
+		<VersionSuffix>$([System.DateTime]::UtcNow.ToString("yyMMdd")).$([System.DateTime]::UtcNow.ToString("HHmmss"))</VersionSuffix>
+		<AssemblyVersion>$(VersionPrefix).0.0</AssemblyVersion>
+		<FileVersion>$(VersionPrefix).$(VersionSuffix)</FileVersion>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<Content Remove="compilerconfig.json" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<None Remove="adminHelp.js" />
+	</ItemGroup>
+
+
+	<ItemGroup>
+		<EmbeddedResource Include="adminHelp.js" />
+		<EmbeddedResource Include="feed.png" />
+		<EmbeddedResource Include="_WidgetWrapper.cshtml" />
+		<EmbeddedResource Include="TopMenu.txt" />
+	</ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\CMSCore\CMSCore.csproj" />
+		<ProjectReference Include="..\CMSInterfaces\CMSInterfaces.csproj" />
+		<ProjectReference Include="..\CMSSecurity\CMSSecurity.csproj" />
+		<ProjectReference Include="..\WebComponents\WebComponents.csproj" />
+	</ItemGroup>
+	<ItemGroup>
+		<EmbeddedResource Include="_TextZone.cshtml" />
+		<EmbeddedResource Include="_WidgetZone.cshtml" />
+	</ItemGroup>
+
+	<ItemGroup>
+
+		<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="8.0.3" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.17" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.17" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.17" />
+		<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.2" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<Folder Include="Properties\" />
+	</ItemGroup>
+	<ItemGroup>
+		<None Include="compilerconfig.json" />
+	</ItemGroup>
+	<ItemGroup>
+		<Content Update="appsettings.json">
+			<CopyToOutputDirectory>Never</CopyToOutputDirectory>
+		</Content>
+	</ItemGroup>
+	<Target Name="PreBuild" BeforeTargets="PreBuildEvent">
+		<Exec Command="xcopy &quot;$(ProjectDir)\skins\*.min.css&quot; &quot;$(SolutionDir)\CMSAdmin\wwwroot\Assets\Admin\skins\&quot; /F/R/Y/I/S/C&#xD;&#xA;xcopy &quot;$(ProjectDir)\editor\*.min.css&quot; &quot;$(SolutionDir)\CMSAdmin\wwwroot\Assets\Admin\editor\&quot; /F/R/Y/I/S/C&#xD;&#xA;" />
+	</Target>
 </Project>
diff --git a/CMSCore/CMSCore.csproj b/CMSCore/CMSCore.csproj
@@ -1,68 +1,68 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
-		<Nullable>enable</Nullable>
-		<ImplicitUsings>enable</ImplicitUsings>
-		<OutputType>Library</OutputType>
-		<NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile>
-		<SatelliteResourceLanguages>en</SatelliteResourceLanguages>
-		<RootNamespace>Carrotware.CMS.Core</RootNamespace>
-		<AssemblyName>Carrotware.CMS.Core</AssemblyName>
-	</PropertyGroup>
-
-	<PropertyGroup>
-		<Authors>Carrotware</Authors>
-		<Company>Carrotware</Company>
-		<Copyright>2023</Copyright>
-		<ProductName>Carrot Cake CMS</ProductName>
-		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-		<Version>6.1.0.0</Version>
-		<VersionPrefix>6.1</VersionPrefix>
-		<VersionSuffix>$([System.DateTime]::UtcNow.ToString("yyMMdd")).$([System.DateTime]::UtcNow.ToString("HHmmss"))</VersionSuffix>
-		<AssemblyVersion>$(VersionPrefix).0.0</AssemblyVersion>
-		<FileVersion>$(VersionPrefix).$(VersionSuffix)</FileVersion>
-	</PropertyGroup>
-
-
-	<ItemGroup>
-		<Reference Update="System.Core">
-			<RequiredTargetFramework>3.5</RequiredTargetFramework>
-		</Reference>
-		<Reference Update="System.Xml.Linq">
-			<RequiredTargetFramework>3.5</RequiredTargetFramework>
-		</Reference>
-	</ItemGroup>
-
-	<ItemGroup>
-		<ProjectReference Include="..\CarrotCMSData\CMSData.csproj" />
-		<ProjectReference Include="..\CMSInterfaces\CMSInterfaces.csproj" />
-		<ProjectReference Include="..\CMSSecurity\CMSSecurity.csproj" />
-		<ProjectReference Include="..\WebComponents\WebComponents.csproj" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<EmbeddedResource Include="Security\EmailForgotPassMsg.txt" />
-		<EmbeddedResource Include="SiteContent\Default.htm" />
-		<EmbeddedResource Include="SiteContent\ErrorFormat.htm" />
-		<EmbeddedResource Include="SiteContent\FirstPage.txt" />
-		<EmbeddedResource Include="SiteContent\Mock\sample1.png" />
-		<EmbeddedResource Include="SiteContent\Mock\sample2.png" />
-		<EmbeddedResource Include="SiteContent\Mock\sample3.png" />
-		<EmbeddedResource Include="SiteContent\Mock\sample4.png" />
-		<EmbeddedResource Include="SiteContent\Mock\SampleContent1.txt" />
-		<EmbeddedResource Include="SiteContent\Mock\SampleContent2.txt" />
-		<EmbeddedResource Include="SiteContent\Mock\SampleContent3.txt" />
-	</ItemGroup>
-	<ItemGroup>
-		<PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.0" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.17" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.17" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.17" />
-		<PackageReference Include="System.ServiceModel.Federation" Version="6.2.0" />
-		<PackageReference Include="System.ServiceModel.Syndication" Version="6.0.0" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<Folder Include="Properties\" />
-	</ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk.Web">
+	<PropertyGroup>
+		<TargetFramework>net8.0</TargetFramework>
+		<Nullable>enable</Nullable>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<OutputType>Library</OutputType>
+		<NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile>
+		<SatelliteResourceLanguages>en</SatelliteResourceLanguages>
+		<RootNamespace>Carrotware.CMS.Core</RootNamespace>
+		<AssemblyName>Carrotware.CMS.Core</AssemblyName>
+	</PropertyGroup>
+
+	<PropertyGroup>
+		<Authors>Carrotware</Authors>
+		<Company>Carrotware</Company>
+		<Copyright>2023</Copyright>
+		<ProductName>Carrot Cake CMS</ProductName>
+		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
+		<Version>8.1.0.0</Version>
+		<VersionPrefix>8.1</VersionPrefix>
+		<VersionSuffix>$([System.DateTime]::UtcNow.ToString("yyMMdd")).$([System.DateTime]::UtcNow.ToString("HHmmss"))</VersionSuffix>
+		<AssemblyVersion>$(VersionPrefix).0.0</AssemblyVersion>
+		<FileVersion>$(VersionPrefix).$(VersionSuffix)</FileVersion>
+	</PropertyGroup>
+
+
+	<ItemGroup>
+		<Reference Update="System.Core">
+			<RequiredTargetFramework>3.5</RequiredTargetFramework>
+		</Reference>
+		<Reference Update="System.Xml.Linq">
+			<RequiredTargetFramework>3.5</RequiredTargetFramework>
+		</Reference>
+	</ItemGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\CarrotCMSData\CMSData.csproj" />
+		<ProjectReference Include="..\CMSInterfaces\CMSInterfaces.csproj" />
+		<ProjectReference Include="..\CMSSecurity\CMSSecurity.csproj" />
+		<ProjectReference Include="..\WebComponents\WebComponents.csproj" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<EmbeddedResource Include="Security\EmailForgotPassMsg.txt" />
+		<EmbeddedResource Include="SiteContent\Default.htm" />
+		<EmbeddedResource Include="SiteContent\ErrorFormat.htm" />
+		<EmbeddedResource Include="SiteContent\FirstPage.txt" />
+		<EmbeddedResource Include="SiteContent\Mock\sample1.png" />
+		<EmbeddedResource Include="SiteContent\Mock\sample2.png" />
+		<EmbeddedResource Include="SiteContent\Mock\sample3.png" />
+		<EmbeddedResource Include="SiteContent\Mock\sample4.png" />
+		<EmbeddedResource Include="SiteContent\Mock\SampleContent1.txt" />
+		<EmbeddedResource Include="SiteContent\Mock\SampleContent2.txt" />
+		<EmbeddedResource Include="SiteContent\Mock\SampleContent3.txt" />
+	</ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.0" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.17" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.17" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.17" />
+		<PackageReference Include="System.ServiceModel.Federation" Version="8.0.0" />
+		<PackageReference Include="System.ServiceModel.Syndication" Version="8.0.0" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<Folder Include="Properties\" />
+	</ItemGroup>
 </Project>