aspnetcore 3.1, wpdotnet 1.0.0-beta935

updated packages

.vscode/launch.json

@@ -7,9 +7,9 @@
             "request": "launch",
             "preLaunchTask": "build",
             // If you have changed target frameworks, make sure to update the program path.
-            "program": "${workspaceFolder}/app/bin/Debug/netcoreapp3.0/app.dll",
+            "program": "${workspaceFolder}/app/bin/Debug/netcoreapp3.1/app.dll",
             "args": [],
-            "cwd": "${workspaceFolder}/app/bin/Debug/netcoreapp3.0/",
+            "cwd": "${workspaceFolder}/app/bin/Debug/netcoreapp3.1/",
             "console": "internalConsole",
             "env": {
                 "ASPNETCORE_ENVIRONMENT": "Development"
@@ -31,9 +31,9 @@
             "request": "launch",
             "preLaunchTask": "build",
             // If you have changed target frameworks, make sure to update the program path.
-            "program": "${workspaceFolder}/app/bin/Debug/netcoreapp3.0/app.dll",
+            "program": "${workspaceFolder}/app/bin/Debug/netcoreapp3.1/app.dll",
             "args": [],
-            "cwd": "${workspaceFolder}/app/bin/Debug/netcoreapp3.0/",
+            "cwd": "${workspaceFolder}/app/bin/Debug/netcoreapp3.1/",
             "console": "internalConsole",
             "env": {
                 "ASPNETCORE_ENVIRONMENT": "Development"

Directory.Build.props

@@ -5,6 +5,6 @@
 
     <!-- global properties -->
     <PropertyGroup>
-        <WpDotNetVersion>1.0.0-beta930</WpDotNetVersion>
+        <WpDotNetVersion>1.0.0-beta935</WpDotNetVersion>
     </PropertyGroup>
 </Project>

MyContent/MyContent.msbuildproj

@@ -1,23 +1,6 @@
-<Project Sdk="Peachpie.NET.Sdk">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>0e51d101-0992-4aa6-a134-26ea3f2e3935</ProjectGuid>
-  </PropertyGroup>
+<Project Sdk="Peachpied.WordPress.Build.Plugin">
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-    <Version>0.1.0-test</Version>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <WpContentTarget></WpContentTarget>
     <PhpRelativePath>wp-content/</PhpRelativePath>
   </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="**/*.php" Exclude="obj/**;bin/**;**/tests/**;**/test/**;**/cli/**;**/composer-php52/**" />
-    <Content Include="**" Exclude="obj/**;bin/**;*.msbuildproj" CopyToOutputDirectory="PreserveNewest">
-      <PackagePath>contentFiles/any/netcoreapp3.0/wordpress/$(PhpRelativePath)</PackagePath>
-      <PackageCopyToOutput>true</PackageCopyToOutput>
-      <Link>wordpress\$(PhpRelativePath)%(RecursiveDir)%(Filename)%(Extension)</Link>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="PeachPied.WordPress" Version="$(WpDotNetVersion)" />
-  </ItemGroup>
 </Project>

app/Plugins/DashboardPlugin.cs

@@ -1,8 +1,7 @@
 using Microsoft.AspNetCore.Mvc.ViewEngines;
 using Pchp.Core;
 using Peachpie.AspNetCore.Mvc;
-using Peachpie.AspNetCore.Web;
-using PeachPied.WordPress.Sdk;
+using PeachPied.WordPress.Standard;
 
 namespace PeachPied.Demo.Plugins
 {

app/Plugins/Provider.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Composition;
 using Microsoft.AspNetCore.Mvc.ViewEngines;
 using Pchp.Core;
-using PeachPied.WordPress.Sdk;
+using PeachPied.WordPress.Standard;
 
 namespace PeachPied.Demo.Plugins
 {

app/Plugins/ShortcodePlugin.cs

@@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Mvc.ViewEngines;
 using Pchp.Core;
 using Peachpie.AspNetCore.Mvc;
 using Peachpie.AspNetCore.Web;
-using PeachPied.WordPress.Sdk;
+using PeachPied.WordPress.Standard;
 
 namespace PeachPied.Demo.Plugins
 {

app/Program.cs

@@ -7,7 +7,6 @@ using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using PeachPied.Demo.Plugins;
 using PeachPied.WordPress.AspNetCore;
-using PeachPied.WordPress.Sdk;
 
 namespace PeachPied.Demo
 {
@@ -33,6 +32,10 @@ namespace PeachPied.Demo
         {
             services.AddMvc();
             services.AddResponseCompression();
+            services.AddWordPress(options =>
+            {
+                //
+            });
         }
 
         public void Configure(IApplicationBuilder app, IHostEnvironment env, IConfiguration configuration)

app/app.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

global.json

@@ -1,5 +1,6 @@
 {
     "msbuild-sdks": {
-        "Peachpie.NET.Sdk": "0.9.930"
+        "Peachpie.NET.Sdk": "0.9.930",
+        "Peachpied.WordPress.Build.Plugin": "1.0.0-beta935"
     }
 }