Merge pull request #13 from idubnori/upgrade-to-aspnetcore-2.2

Upgraded to .NET Core 2.2 and Electron.NET 0.0.11

Author: GregorBiswanger

ElectronNET-API-Demos/Controllers/ShortcutsController.cs

@@ -1,4 +1,5 @@
-using ElectronNET.API;
+using System.Threading.Tasks;
+using ElectronNET.API;
 using ElectronNET.API.Entities;
 using Microsoft.AspNetCore.Mvc;
 
@@ -21,7 +22,7 @@ public IActionResult Index()
                     await Electron.Dialog.ShowMessageBoxAsync(options);
                 });
 
-                Electron.App.WillQuit += () => Electron.GlobalShortcut.UnregisterAll();
+                Electron.App.WillQuit += arg => Task.Run(() => Electron.GlobalShortcut.UnregisterAll());
             }
 
             return View();

ElectronNET-API-Demos/ElectronNET-API-Demos.csproj

@@ -1,18 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ElectronNET.API" Version="0.0.6" />
-    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.0.0" />
-  </ItemGroup>
-  <ItemGroup>
-    <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0" />
-  </ItemGroup>
-  <ItemGroup>
-    <DotNetCliToolReference Include="ElectronNET.CLI" Version="*" />
+    <PackageReference Include="ElectronNET.API" Version="0.0.11" />
+    <PackageReference Include="Microsoft.AspNetCore.App" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.2.0" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.2.1" />
   </ItemGroup>
   <ItemGroup>
     <None Update="Assets\electron.ico">

ElectronNET-API-Demos/Program.cs

@@ -8,13 +8,12 @@ public class Program
     {
         public static void Main(string[] args)
         {
-            BuildWebHost(args).Run();
+            CreateWebHostBuilder(args).Build().Run();
         }
 
-        public static IWebHost BuildWebHost(string[] args) =>
+        public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
             WebHost.CreateDefaultBuilder(args)
                 .UseStartup<Startup>()
-                .UseElectron(args)
-                .Build();
+                .UseElectron(args);
     }
 }

README.md

@@ -14,11 +14,11 @@ This Demo-App based on the [Electron API Demos](https://github.com/electron/elec
 You'll need [Node.js (v.8.x)](https://nodejs.org) and [.NET Core SDK](https://www.microsoft.com/net/download/core) installed on your computer in order to start or build this app.
 
 ```bash
+$ dotnet tool install --global ElectronNET.CLI
 $ git clone https://github.com/ElectronNET/electron.net-api-demos.git
 $ cd electron.net-api-demos
 $ cd ElectronNET-API-Demos
-$ dotnet restore
-$ dotnet electronize start
+$ electronize start
 ```  
 
 **Enjoy!**