net6.0

Author: jakubmisek

.vscode/launch.json

@@ -1,6 +1,21 @@
 {
     "version": "0.2.0",
     "configurations": [
+        {
+            "name": "Launch built-in server",
+            "type": "php",
+            "request": "launch",
+            "runtimeArgs": [
+                "-S",
+                "localhost:5004",
+                "-t",
+                "wordpress"
+            ],
+            "port": 9003,
+            "serverReadyAction": {
+                "action": "openExternally"
+            }
+        },
         {
             "name": ".NET Core Launch (console)",
             "type": "coreclr",
@@ -14,12 +29,7 @@
                 "ASPNETCORE_ENVIRONMENT": "Development"
             },
             "stopAtEntry": false,
-            "internalConsoleOptions": "openOnSessionStart",
-            "justMyCode": false,
-            "symbolOptions": {
-                // "searchPaths": ["C:\\Users\\jmise\\Projects\\peachpie\\src\\Peachpie.Library\\bin\\Debug\\net5.0"],
-                "searchMicrosoftSymbolServer": false
-            }
+            "internalConsoleOptions": "openOnSessionStart"
         },
         {
             "name": ".NET Core Attach",

PeachPied.WordPress.AspNetCore/PeachPied.WordPress.AspNetCore.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Title>WordPress for ASP.NET Core</Title>
     <Description>
       The whole of WordPress, compiled, packed and provided as an ASP.NET Core package. Does not require PHP, becomes a part of ASP.NET Core application.

PeachPied.WordPress.Build.Plugin/PeachPied.WordPress.Build.Plugin.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net5.0</TargetFrameworks>
+    <TargetFrameworks>net6.0</TargetFrameworks>
     <!--TargetFrameworks Condition=" '$(MSBuildRuntimeType)'!='Core' ">$(TargetFrameworks);net472</TargetFrameworks-->
     <BuildOutputTargetFolder>build\</BuildOutputTargetFolder>
     <EnableDefaultNoneItems>true</EnableDefaultNoneItems>

PeachPied.WordPress.Build.Plugin/build/PeachPied.WordPress.Build.Plugin.props

@@ -7,7 +7,7 @@
 
   <PropertyGroup>    
     <OutputType>library</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Configuration Condition=" '$(Configuration)'=='' ">Debug</Configuration>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <IsPackable>true</IsPackable>

PeachPied.WordPress.Build.Plugin/build/PeachPied.WordPress.Build.Plugin.targets

@@ -20,7 +20,7 @@
 
   <PropertyGroup Condition=" '$(BuildPluginTaskAssembly)'=='' ">
     <BuildPluginTaskAssembly Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)netstandard2.0\PeachPied.WordPress.Build.Plugin.dll</BuildPluginTaskAssembly>
-    <BuildPluginTaskAssembly Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)net5.0\PeachPied.WordPress.Build.Plugin.dll</BuildPluginTaskAssembly>
+    <BuildPluginTaskAssembly Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)net6.0\PeachPied.WordPress.Build.Plugin.dll</BuildPluginTaskAssembly>
   </PropertyGroup>
 
   <UsingTask AssemblyFile="$(BuildPluginTaskAssembly)" TaskName="WpPluginTask" />
@@ -85,7 +85,7 @@
 
     <!-- include plugin files as contentFiles -->
     <Content Update="**" CopyToOutputDirectory="PreserveNewest">
-      <PackagePath>contentFiles/any/net5.0/wordpress/$(PhpRelativePath)</PackagePath>
+      <PackagePath>contentFiles/any/net6.0/wordpress/$(PhpRelativePath)</PackagePath>
       <PackageCopyToOutput>true</PackageCopyToOutput>
       <Link>wordpress\$(PhpRelativePath)%(RecursiveDir)%(Filename)%(Extension)</Link>
     </Content>

PeachPied.WordPress.Standard/PeachPied.WordPress.Standard.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Description>
       The API for integrating .NET plugins and to bridge between C# and WordPress PHP code.
     </Description>

plugins/PeachPied.WordPress.DotNet/PeachPied.WordPress.DotNet.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

plugins/PeachPied.WordPress.HotPlug/PeachPied.WordPress.HotPlug.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

plugins/PeachPied.WordPress.NuGetPlugins/PeachPied.WordPress.NuGetPlugins.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Description>
       A plugin for WpDotNet replacing WordPress dashboard's plugins and themes catalog with NuGet packages.
 

plugins/PhpPlugin.Build.targets

@@ -17,7 +17,7 @@
   <!-- copy the task dll into temp dir (TODO: AppDomain and shadow copy) -->
   <PropertyGroup>
     <BuildPluginFramework Condition=" '$(MSBuildRuntimeType)'!='Core' ">net472</BuildPluginFramework>
-    <BuildPluginFramework Condition=" '$(BuildPluginFramework)'=='' ">net5.0</BuildPluginFramework>
+    <BuildPluginFramework Condition=" '$(BuildPluginFramework)'=='' ">net6.0</BuildPluginFramework>
     <BuildPluginTaskAssembly>$(MSBuildThisFileDirectory)../$(BuildPlugin)/bin/$(Configuration)/$(BuildPluginFramework)/publish/$(BuildPlugin).dll</BuildPluginTaskAssembly>
     <BuildPluginTaskAssemblyOriginal>$(BuildPluginTaskAssembly)</BuildPluginTaskAssemblyOriginal>
     <_BuildPluginTmp>$([System.IO.Path]::GetTempPath())PhpPlugin.Build/$([System.Guid]::NewGuid())/</_BuildPluginTmp>

wordpress/PeachPied.WordPress.msbuildproj

@@ -3,7 +3,7 @@
     <ProjectGuid>0e51d101-0992-4aa6-a134-26ea3f2e3934</ProjectGuid>
   </PropertyGroup>
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <NoWarn>PHP0125,PHP5011,PHP6002,PHP5018,PHP5026,PHP6006</NoWarn>
     <Copyright>WordPress</Copyright>
     <Description>
@@ -42,7 +42,7 @@
       ##wp-content/plugins/**/*.php;
       wp-content/plugins/akismet/**;
       wp-content/plugins/*.php;
-      wp-content/themes/**/*.php;
+      ##wp-content/themes/**/*.php;
       *.php;
       *.msbuildproj;*.msbuildproj.user;
       " CopyToOutputDirectory="PreserveNewest">