Merge branch 'master' into dev/AutoUpdate

ElectronNET.WebApp/Controllers/TrayController.cs

@@ -1,11 +1,21 @@
-using Microsoft.AspNetCore.Mvc;
+using System.IO;
+using Microsoft.AspNetCore.Mvc;
 using ElectronNET.API;
 using ElectronNET.API.Entities;
+using Microsoft.AspNetCore.Hosting;
 
 namespace ElectronNET.WebApp.Controllers
 {
     public class TrayController : Controller
     {
+        private readonly IHostingEnvironment _env;
+
+        public TrayController(IHostingEnvironment env)
+        {
+            _env = env;
+        }
+
+
         public IActionResult Index()
         {
             if (HybridSupport.IsElectronActive)
@@ -21,7 +31,7 @@ namespace ElectronNET.WebApp.Controllers
                             Click = () => Electron.Tray.Destroy()
                         };
 
-                        Electron.Tray.Show("/Assets/electron_32x32.png", menu);
+                        Electron.Tray.Show(Path.Combine(_env.ContentRootPath, "Assets/electron_32x32.png"), menu);
                         Electron.Tray.SetToolTip("Electron Demo in the tray.");
                     }
                     else

ElectronNET.WebApp/ElectronNET.WebApp.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
     <RuntimeIdentifiers>win-x64</RuntimeIdentifiers>
     <TypeScriptToolsVersion>3.1</TypeScriptToolsVersion>
   </PropertyGroup>
@@ -11,7 +11,6 @@
     <Content Remove="Views\Windows\HandleErrorCrashes.cshtml" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Assets\" />
     <Folder Include="wwwroot\assets\" />
   </ItemGroup>
   <ItemGroup>

ElectronNET.WebApp/Properties/launchSettings.json

@@ -28,6 +28,6 @@
         "ASPNETCORE_ENVIRONMENT": "Development"
       },
       "applicationUrl": "http://localhost:50395/"
-    },
+    }
   }
 }