From c9d53d2fc1ad270f8bc47941dbb5f1be1d9967b6 Mon Sep 17 00:00:00 2001
From: Robert Muehsig <robert.muehsig@codeinside.eu>
Date: Thu, 30 Aug 2018 21:54:42 +0200
Subject: [PATCH 1/3] draft

---
 ElectronNET.CLI/ElectronNET.CLI.csproj       | 7 ++++---
 ElectronNET.WebApp/ElectronNET.WebApp.csproj | 3 ---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/ElectronNET.CLI/ElectronNET.CLI.csproj b/ElectronNET.CLI/ElectronNET.CLI.csproj
index c594005..1af207f 100644
--- a/ElectronNET.CLI/ElectronNET.CLI.csproj
+++ b/ElectronNET.CLI/ElectronNET.CLI.csproj
@@ -1,9 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
-    <AssemblyName>dotnet-electronize</AssemblyName>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <AssemblyName>electronize</AssemblyName>
     
     <PackageType>DotnetCliTool</PackageType>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@@ -21,6 +21,7 @@ This package contains the dotnet tooling to electronize your application.</Descr
     <PackageTags>electron aspnetcore</PackageTags>
     <PackageReleaseNotes>Changelog: https://github.com/ElectronNET/Electron.NET/blob/master/Changelog.md</PackageReleaseNotes>
     <PackageIconUrl>https://raw.githubusercontent.com/ElectronNET/Electron.NET/master/assets/images/electron.net-logo-square.png</PackageIconUrl>
+    <PackAsTool>true</PackAsTool>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/ElectronNET.WebApp/ElectronNET.WebApp.csproj b/ElectronNET.WebApp/ElectronNET.WebApp.csproj
index d34e480..5706fb9 100644
--- a/ElectronNET.WebApp/ElectronNET.WebApp.csproj
+++ b/ElectronNET.WebApp/ElectronNET.WebApp.csproj
@@ -25,9 +25,6 @@
     <PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.0.0" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.0.0" />
   </ItemGroup>
-  <ItemGroup>
-    <DotNetCliToolReference Include="ElectronNET.CLI" Version="*" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ElectronNET.API\ElectronNET.API.csproj" />
   </ItemGroup>

From 1b7dc7c0c4821049cf68232dfa2a5b0fd9fe4440 Mon Sep 17 00:00:00 2001
From: Robert Muehsig <robert.muehsig@codeinside.eu>
Date: Mon, 3 Sep 2018 22:59:19 +0200
Subject: [PATCH 2/3] next try

---
 NuGet.config |  3 +--
 buildAll.cmd | 13 ++++++++-----
 buildAll.sh  | 13 +++++++++----
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 9eb1b6d..c1e1ed5 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -2,8 +2,7 @@
 <configuration>
 <packageSources>
     <clear />
-    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
     <add key="LocalDev" value="artifacts" />
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
 </packageSources>
-
 </configuration>
\ No newline at end of file
diff --git a/buildAll.cmd b/buildAll.cmd
index 3899395..b546cab 100755
--- a/buildAll.cmd
+++ b/buildAll.cmd
@@ -16,19 +16,22 @@ dotnet build
 
 echo "Invoke electronize build in WebApp Demo"
 
+echo "Install CLI"
+
+dotnet tool uninstall ElectronNET.CLI -g
+dotnet tool install ElectronNET.CLI -g
 
 echo "/target xxx (dev-build)"
-dotnet "../ElectronNET.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll" build /target custom win7-x86;win32 /dotnet-configuration Debug /electron-arch ia32  /electron-params "--prune=true "
-
+electronize build /target custom win7-x86;win32 /dotnet-configuration Debug /electron-arch ia32  /electron-params "--prune=true "
 
 echo "/target win (dev-build)"
-dotnet "../ElectronNET.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll" build /target win
+electronize build /target win
 
 echo "/target linux (dev-build)"
-dotnet "../ElectronNET.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll" build /target linux
+electronize build /target linux
 
 echo "/target custom win7-x86;win32 (dev-build)"
-dotnet "../ElectronNET.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll" build /target custom win7-x86;win32
+electronize build /target custom win7-x86;win32
 
 
 :: Be aware, that for non-electronnet-dev environments the correct 
diff --git a/buildAll.sh b/buildAll.sh
index 4141a10..20823ce 100755
--- a/buildAll.sh
+++ b/buildAll.sh
@@ -17,18 +17,23 @@ cd $dir/ElectronNET.WebApp
 dotnet restore
 dotnet build
 
+echo "Install CLI as dotnet tool"
+
+dotnet tool uninstall ElectronNET.CLI -g
+dotnet tool install ElectronNET.CLI -g
+
 echo "Invoke electronize build in WebApp Demo"
 echo "/target win (dev-build)"
-dotnet "$dir/ElectronNET.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll" build /target win
+electronize build /target win
 
 echo "/target linux (dev-build)"
-dotnet "$dir/ElectronNET.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll" build /target linux
+electronize build /target linux
 
 echo "/target osx (dev-build)"
-dotnet "$dir/ElectronNET.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll" build /target osx
+electronize build /target osx
 
 echo "/target custom win7-x86;win32 (dev-build)"
-dotnet "$dir/ElectronNET.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll" build /target custom "win7-x86;win32"
+electronize build /target custom "win7-x86;win32"
 
 # Be aware, that for non-electronnet-dev environments the correct 
 # invoke command would be dotnet electronize ...

From d50984a4650a39e22c7071afb72904ec1d1107e7 Mon Sep 17 00:00:00 2001
From: Robert Muehsig <robert.muehsig@codeinside.eu>
Date: Mon, 3 Sep 2018 23:13:02 +0200
Subject: [PATCH 3/3] path fix

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index e19b9ee..2aaf44d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,7 @@ language: csharp
 mono: none
 dotnet: 2.1.300
 before_script:
+  - export PATH="$PATH:/home/travis/.dotnet/tools"
   - npm install electron-packager --global
 script:
   - ./buildAll.sh