updated peachpie Sdk

iolevel · Feb 18, 2020 · f8ec28d · f8ec28d
1 parent 333db0c
commit f8ec28d
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 13 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <PropertyGroup>
+  </PropertyGroup>
+
+</Project>
diff --git a/global.json b/global.json
@@ -0,0 +1,5 @@
+{
+    "msbuild-sdks": {
+        "Peachpie.NET.Sdk": "0.9.800"
+    }
+}
diff --git a/mediawiki b/mediawiki
diff --git a/server/Program.cs b/server/Program.cs
@@ -4,7 +4,6 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Rewrite;
 using Microsoft.Extensions.DependencyInjection;
-using Peachpie.Web;
 
 namespace Website.Server
 {
@@ -14,10 +13,9 @@ static void Main(string[] args)
         {
             var root = System.IO.Directory.GetCurrentDirectory() + "/mediawiki";
 
-            var host = new WebHostBuilder()
-                .UseKestrel()
-                .UseUrls("http://*:5004/")
+            var host = WebHost.CreateDefaultBuilder(args)
                 .UseStartup<Startup>()
+                .UseUrls("http://*:5004/")
                 .UseWebRoot(root)
                 .UseContentRoot(root)
                 .Build();

diff --git a/server/server.csproj b/server/server.csproj
@@ -1,17 +1,15 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <!-- $(PeachpieVersion) property from the current Peachpie.NET.Sdk -->
+  <Import Project="Version.props" Sdk="Peachpie.NET.Sdk" Condition=" '$(PeachpieVersion)'=='' " />
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.0.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Session" Version="2.0.1" />
-    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Rewrite" Version="2.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="2.0.0" />
-    <PackageReference Include="Peachpie.NETCore.Web" Version="0.9.0-CI00853" />
+    <PackageReference Include="Peachpie.AspNetCore.Web" Version="$(PeachpieVersion)" />
   </ItemGroup>
 
   <ItemGroup>