rc-006: net50, peachpie 1.1

iolevel · Oct 3, 2022 · c54a718 · c54a718
1 parent b650606
commit c54a718
Show file tree

Hide file tree

Showing 21 changed files with 26 additions and 26 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -6,7 +6,7 @@
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "build",
-            "program": "${workspaceFolder}/app/bin/Debug/net6.0/app.dll",
+            "program": "${workspaceFolder}/app/bin/Debug/net50/app.dll",
             "args": [],
             "cwd": "${workspaceFolder}/app",
             "console": "internalConsole",
@@ -17,7 +17,7 @@
             "internalConsoleOptions": "openOnSessionStart",
             "justMyCode": false,
             "symbolOptions": {
-                // "searchPaths": ["C:\\Users\\jmise\\Projects\\peachpie\\src\\Peachpie.Library\\bin\\Debug\\netstandard2.0"],
+                // "searchPaths": ["C:\\Users\\jmise\\Projects\\peachpie\\src\\Peachpie.Library\\bin\\Debug\\net50"],
                 "searchMicrosoftSymbolServer": false
             }
         },

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -10,7 +10,7 @@
     <!-- common version -->
     <VersionFileContent>$([System.IO.File]::ReadAllText($(MSBuildThisFileDirectory)wordpress/wp-includes/version.php) )</VersionFileContent>
     <VersionPrefix Condition=" '$(VersionPrefix)'=='' ">$([System.Text.RegularExpressions.Regex]::Match($(VersionFileContent), "\$wp_version\s*=\s*'([0-9\.]+)';").Groups.get_Item(1) )</VersionPrefix>
-    <VersionSuffix Condition=" '$(VersionSuffix)'=='' ">rc-005</VersionSuffix>
+    <VersionSuffix Condition=" '$(VersionSuffix)'=='' ">rc-006</VersionSuffix>
     <!--PeachpieVersion> specified in global.json </PeachpieVersion-->
 
     <!-- metadata generation -->

diff --git a/PeachPied.WordPress.AspNetCore/Internal/WpResponseCaching.cs b/PeachPied.WordPress.AspNetCore/Internal/WpResponseCaching.cs
@@ -5,7 +5,6 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.ResponseCaching.Internal;
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Primitives;

diff --git a/...Internal/WpResponseCachingKeyProvider .cs → .../Internal/WpResponseCachingKeyProvider.cs b/...Internal/WpResponseCachingKeyProvider .cs → .../Internal/WpResponseCachingKeyProvider.cs
@@ -3,7 +3,6 @@
 using System.Linq;
 using System.Text;
 using Microsoft.AspNetCore.ResponseCaching;
-using Microsoft.AspNetCore.ResponseCaching.Internal;
 using Microsoft.Extensions.ObjectPool;
 using Microsoft.Extensions.Options;
 using Microsoft.Extensions.Primitives;

diff --git a/PeachPied.WordPress.AspNetCore/Internal/WpResponseCachingPolicyProvider.cs b/PeachPied.WordPress.AspNetCore/Internal/WpResponseCachingPolicyProvider.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.ResponseCaching.Internal;
 using Microsoft.Extensions.Primitives;
 using Microsoft.Net.Http.Headers;
 using PeachPied.WordPress.Standard;

diff --git a/PeachPied.WordPress.AspNetCore/PeachPied.WordPress.AspNetCore.csproj b/PeachPied.WordPress.AspNetCore/PeachPied.WordPress.AspNetCore.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net50</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.
@@ -20,12 +20,13 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Rewrite" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.ResponseCaching" Version="2.2.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="2.2.4" />
-    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.1.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="2.2.0" />
     <PackageReference Include="NuGet.Protocol.Core.v3" Version="4.2.0" />
     <PackageReference Include="Peachpie.AspNetCore.Web" Version="$(PeachpieVersion)" />

diff --git a/PeachPied.WordPress.AspNetCore/RequestDelegateExtension.cs b/PeachPied.WordPress.AspNetCore/RequestDelegateExtension.cs
@@ -13,6 +13,7 @@
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.FileProviders;
+using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Options;
 using Pchp.Core;
 using Peachpie.AspNetCore.Web;
@@ -313,7 +314,7 @@ private static IApplicationBuilder InstallWordPress(this IApplicationBuilder app
             WpStandard.DB_USER = options.DbUser;
 
             //
-            var env = app.ApplicationServices.GetService<IHostingEnvironment>();
+            var env = app.ApplicationServices.GetService<IWebHostEnvironment>();
             WpStandard.WP_DEBUG = options.Debug || env.IsDevelopment();
 
             // handling php files:

diff --git a/PeachPied.WordPress.Build.Plugin/PeachPied.WordPress.Build.Plugin.csproj b/PeachPied.WordPress.Build.Plugin/PeachPied.WordPress.Build.Plugin.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netcoreapp2.1</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(MSBuildRuntimeType)'!='Core' ">$(TargetFrameworks);net472</TargetFrameworks>
+    <TargetFrameworks>net50</TargetFrameworks>
+    <!--TargetFrameworks Condition=" '$(MSBuildRuntimeType)'!='Core' ">$(TargetFrameworks);net472</TargetFrameworks-->
     <BuildOutputTargetFolder>build\</BuildOutputTargetFolder>
     <EnableDefaultNoneItems>true</EnableDefaultNoneItems>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>

diff --git a/PeachPied.WordPress.Build.Plugin/build/PeachPied.WordPress.Build.Plugin.props b/PeachPied.WordPress.Build.Plugin/build/PeachPied.WordPress.Build.Plugin.props
@@ -7,7 +7,7 @@
 
   <PropertyGroup>    
     <OutputType>library</OutputType>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net50</TargetFramework>
     <Configuration Condition=" '$(Configuration)'=='' ">Debug</Configuration>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <IsPackable>true</IsPackable>

diff --git a/PeachPied.WordPress.Build.Plugin/build/PeachPied.WordPress.Build.Plugin.targets b/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)netcoreapp2.1\PeachPied.WordPress.Build.Plugin.dll</BuildPluginTaskAssembly>
+    <BuildPluginTaskAssembly Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)net50\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/netcoreapp3.0/wordpress/$(PhpRelativePath)</PackagePath>
+      <PackagePath>contentFiles/any/net5.0/wordpress/$(PhpRelativePath)</PackagePath>
       <PackageCopyToOutput>true</PackageCopyToOutput>
       <Link>wordpress\$(PhpRelativePath)%(RecursiveDir)%(Filename)%(Extension)</Link>
     </Content>

diff --git a/PeachPied.WordPress.Build.Plugin/build/Sdk.Common.props b/PeachPied.WordPress.Build.Plugin/build/Sdk.Common.props
@@ -1,7 +1,7 @@
 <!-- This file has been generated. -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-<Import Project="Sdk.props" Sdk="Peachpie.NET.Sdk" Version="1.0.23" />
+<Import Project="Sdk.props" Sdk="Peachpie.NET.Sdk" Version="1.1.0" />
 <PropertyGroup>
-<WpDotNetVersion Condition=" '$(WpDotNetVersion)'=='' ">6.0.1-rc-005</WpDotNetVersion>
+<WpDotNetVersion Condition=" '$(WpDotNetVersion)'=='' ">6.0.1-rc-006</WpDotNetVersion>
 </PropertyGroup>
 </Project>
diff --git a/PeachPied.WordPress.Build.Plugin/build/Sdk.Common.targets b/PeachPied.WordPress.Build.Plugin/build/Sdk.Common.targets
@@ -1,4 +1,4 @@
 <!-- This file has been generated. -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-<Import Project="Sdk.targets" Sdk="Peachpie.NET.Sdk" Version="1.0.23" />
+<Import Project="Sdk.targets" Sdk="Peachpie.NET.Sdk" Version="1.1.0" />
 </Project>
diff --git a/PeachPied.WordPress.Standard/PeachPied.WordPress.Standard.csproj b/PeachPied.WordPress.Standard/PeachPied.WordPress.Standard.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net50</TargetFramework>
     <Description>
       The API for integrating .NET plugins and to bridge between C# and WordPress PHP code.
     </Description>

diff --git a/app/app.csproj b/app/app.csproj
@@ -2,7 +2,8 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net50</TargetFramework>
+    <ServerGarbageCollection>false</ServerGarbageCollection>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/global.json b/global.json
@@ -1,5 +1,5 @@
 {
     "msbuild-sdks": {
-        "Peachpie.NET.Sdk": "1.0.23"
+        "Peachpie.NET.Sdk": "1.1.0"
     }
 }
diff --git a/plugins/PeachPied.WordPress.DotNet/PeachPied.WordPress.DotNet.csproj b/plugins/PeachPied.WordPress.DotNet/PeachPied.WordPress.DotNet.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net50</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/plugins/PeachPied.WordPress.HotPlug/PeachPied.WordPress.HotPlug.csproj b/plugins/PeachPied.WordPress.HotPlug/PeachPied.WordPress.HotPlug.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net50</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/plugins/PeachPied.WordPress.NuGetPlugins/PeachPied.WordPress.NuGetPlugins.csproj b/plugins/PeachPied.WordPress.NuGetPlugins/PeachPied.WordPress.NuGetPlugins.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>net50</TargetFramework>
     <Description>
       A plugin for WpDotNet replacing WordPress dashboard's plugins and themes catalog with NuGet packages.
 

diff --git a/plugins/PhpPlugin.Build.targets b/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)'=='' ">netcoreapp2.1</BuildPluginFramework>
+    <BuildPluginFramework Condition=" '$(BuildPluginFramework)'=='' ">net50</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>

diff --git a/tests/Build.Plugin.Tests/Build.Plugin.Tests.csproj b/tests/Build.Plugin.Tests/Build.Plugin.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net50</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>

diff --git a/wordpress/PeachPied.WordPress.msbuildproj b/wordpress/PeachPied.WordPress.msbuildproj
@@ -3,7 +3,7 @@
     <ProjectGuid>0e51d101-0992-4aa6-a134-26ea3f2e3934</ProjectGuid>
   </PropertyGroup>
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <NoWarn>PHP0125,PHP5011,PHP6002,PHP5018,PHP5026,PHP6006</NoWarn>
     <Copyright>WordPress</Copyright>
     <Description>