From cf2947dd946fa9d64eb3562a470ab41eaa52083d Mon Sep 17 00:00:00 2001
From: Ioannis G <jtgftw@gmail.com>
Date: Fri, 1 May 2020 17:40:12 +0300
Subject: [PATCH 01/19] remove unused includes in project files

---
 Flow.Launcher.Test/Flow.Launcher.Test.csproj                | 4 ----
 .../Flow.Launcher.Plugin.BrowserBookmark.csproj             | 4 ----
 .../Flow.Launcher.Plugin.Calculator.csproj                  | 1 -
 .../Flow.Launcher.Plugin.Color.csproj                       | 4 ----
 .../Flow.Launcher.Plugin.ControlPanel.csproj                | 4 ----
 .../Flow.Launcher.Plugin.Everything.csproj                  | 4 ----
 .../Flow.Launcher.Plugin.Folder.csproj                      | 4 ----
 .../Flow.Launcher.Plugin.PluginIndicator.csproj             | 6 +-----
 .../Flow.Launcher.Plugin.PluginManagement.csproj            | 4 ----
 .../Flow.Launcher.Plugin.Program.csproj                     | 5 +----
 .../Flow.Launcher.Plugin.Shell.csproj                       | 4 ----
 .../Flow.Launcher.Plugin.Sys.csproj                         | 1 -
 .../Flow.Launcher.Plugin.Url.csproj                         | 4 ----
 .../Flow.Launcher.Plugin.WebSearch.csproj                   | 4 ----
 Plugins/HelloWorldCSharp/HelloWorldCSharp.csproj            | 4 ----
 15 files changed, 2 insertions(+), 55 deletions(-)

diff --git a/Flow.Launcher.Test/Flow.Launcher.Test.csproj b/Flow.Launcher.Test/Flow.Launcher.Test.csproj
index 2dbf1a9d3c2..eb26fccf2a4 100644
--- a/Flow.Launcher.Test/Flow.Launcher.Test.csproj
+++ b/Flow.Launcher.Test/Flow.Launcher.Test.csproj
@@ -56,8 +56,4 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-  
 </Project>
\ No newline at end of file
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Flow.Launcher.Plugin.BrowserBookmark.csproj b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Flow.Launcher.Plugin.BrowserBookmark.csproj
index b59b114fee1..13daddf109b 100644
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Flow.Launcher.Plugin.BrowserBookmark.csproj
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Flow.Launcher.Plugin.BrowserBookmark.csproj
@@ -80,8 +80,4 @@
     <PackageReference Include="UnidecodeSharp" Version="1.0.0" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-
 </Project>
\ No newline at end of file
diff --git a/Plugins/Flow.Launcher.Plugin.Calculator/Flow.Launcher.Plugin.Calculator.csproj b/Plugins/Flow.Launcher.Plugin.Calculator/Flow.Launcher.Plugin.Calculator.csproj
index d0bc453835e..e7cae42aebe 100644
--- a/Plugins/Flow.Launcher.Plugin.Calculator/Flow.Launcher.Plugin.Calculator.csproj
+++ b/Plugins/Flow.Launcher.Plugin.Calculator/Flow.Launcher.Plugin.Calculator.csproj
@@ -99,7 +99,6 @@
   <ItemGroup>
     <Folder Include="Images\" />
     <Folder Include="ViewModels\" />
-    <Folder Include="Properties\" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Plugins/Flow.Launcher.Plugin.Color/Flow.Launcher.Plugin.Color.csproj b/Plugins/Flow.Launcher.Plugin.Color/Flow.Launcher.Plugin.Color.csproj
index fb03fda79b9..19f8fb98075 100644
--- a/Plugins/Flow.Launcher.Plugin.Color/Flow.Launcher.Plugin.Color.csproj
+++ b/Plugins/Flow.Launcher.Plugin.Color/Flow.Launcher.Plugin.Color.csproj
@@ -101,8 +101,4 @@
     <PackageReference Include="System.Runtime" Version="4.3.1" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-  
 </Project>
\ No newline at end of file
diff --git a/Plugins/Flow.Launcher.Plugin.ControlPanel/Flow.Launcher.Plugin.ControlPanel.csproj b/Plugins/Flow.Launcher.Plugin.ControlPanel/Flow.Launcher.Plugin.ControlPanel.csproj
index c75b7aa3806..d1c185c3633 100644
--- a/Plugins/Flow.Launcher.Plugin.ControlPanel/Flow.Launcher.Plugin.ControlPanel.csproj
+++ b/Plugins/Flow.Launcher.Plugin.ControlPanel/Flow.Launcher.Plugin.ControlPanel.csproj
@@ -101,8 +101,4 @@
     <PackageReference Include="System.Runtime" Version="4.3.1" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-  
 </Project>
\ No newline at end of file
diff --git a/Plugins/Flow.Launcher.Plugin.Everything/Flow.Launcher.Plugin.Everything.csproj b/Plugins/Flow.Launcher.Plugin.Everything/Flow.Launcher.Plugin.Everything.csproj
index 3fde34b5db8..41ad9007ca7 100644
--- a/Plugins/Flow.Launcher.Plugin.Everything/Flow.Launcher.Plugin.Everything.csproj
+++ b/Plugins/Flow.Launcher.Plugin.Everything/Flow.Launcher.Plugin.Everything.csproj
@@ -128,8 +128,4 @@
     <PackageReference Include="System.Runtime" Version="4.3.1" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-  
 </Project>
\ No newline at end of file
diff --git a/Plugins/Flow.Launcher.Plugin.Folder/Flow.Launcher.Plugin.Folder.csproj b/Plugins/Flow.Launcher.Plugin.Folder/Flow.Launcher.Plugin.Folder.csproj
index 67cc0294cf4..a05b5d49d88 100644
--- a/Plugins/Flow.Launcher.Plugin.Folder/Flow.Launcher.Plugin.Folder.csproj
+++ b/Plugins/Flow.Launcher.Plugin.Folder/Flow.Launcher.Plugin.Folder.csproj
@@ -104,8 +104,4 @@
     <PackageReference Include="System.Runtime" Version="4.3.1" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-
 </Project>
\ No newline at end of file
diff --git a/Plugins/Flow.Launcher.Plugin.PluginIndicator/Flow.Launcher.Plugin.PluginIndicator.csproj b/Plugins/Flow.Launcher.Plugin.PluginIndicator/Flow.Launcher.Plugin.PluginIndicator.csproj
index a29c720f145..48639156e69 100644
--- a/Plugins/Flow.Launcher.Plugin.PluginIndicator/Flow.Launcher.Plugin.PluginIndicator.csproj
+++ b/Plugins/Flow.Launcher.Plugin.PluginIndicator/Flow.Launcher.Plugin.PluginIndicator.csproj
@@ -101,9 +101,5 @@
     <PackageReference Include="JetBrains.Annotations" Version="2019.1.3" />
     <PackageReference Include="System.Runtime" Version="4.3.1" />
   </ItemGroup>
-  
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-  
+
 </Project>
\ No newline at end of file
diff --git a/Plugins/Flow.Launcher.Plugin.PluginManagement/Flow.Launcher.Plugin.PluginManagement.csproj b/Plugins/Flow.Launcher.Plugin.PluginManagement/Flow.Launcher.Plugin.PluginManagement.csproj
index aa180cca4d2..49451d5ba84 100644
--- a/Plugins/Flow.Launcher.Plugin.PluginManagement/Flow.Launcher.Plugin.PluginManagement.csproj
+++ b/Plugins/Flow.Launcher.Plugin.PluginManagement/Flow.Launcher.Plugin.PluginManagement.csproj
@@ -103,8 +103,4 @@
     <PackageReference Include="System.Runtime" Version="4.3.1" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-  
 </Project>
\ No newline at end of file
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Flow.Launcher.Plugin.Program.csproj b/Plugins/Flow.Launcher.Plugin.Program/Flow.Launcher.Plugin.Program.csproj
index 6208881d4e3..331566f90d1 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Flow.Launcher.Plugin.Program.csproj
+++ b/Plugins/Flow.Launcher.Plugin.Program/Flow.Launcher.Plugin.Program.csproj
@@ -113,8 +113,5 @@
     <PackageReference Include="NLog" Version="4.7.0" />
     <PackageReference Include="System.Runtime" Version="4.3.1" />
   </ItemGroup>
-  
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
+
 </Project>
\ No newline at end of file
diff --git a/Plugins/Flow.Launcher.Plugin.Shell/Flow.Launcher.Plugin.Shell.csproj b/Plugins/Flow.Launcher.Plugin.Shell/Flow.Launcher.Plugin.Shell.csproj
index b50295ccdc8..ad1dd079ebd 100644
--- a/Plugins/Flow.Launcher.Plugin.Shell/Flow.Launcher.Plugin.Shell.csproj
+++ b/Plugins/Flow.Launcher.Plugin.Shell/Flow.Launcher.Plugin.Shell.csproj
@@ -99,8 +99,4 @@
     <PackageReference Include="System.Runtime" Version="4.3.1" />
   </ItemGroup>
   
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-
 </Project>
\ No newline at end of file
diff --git a/Plugins/Flow.Launcher.Plugin.Sys/Flow.Launcher.Plugin.Sys.csproj b/Plugins/Flow.Launcher.Plugin.Sys/Flow.Launcher.Plugin.Sys.csproj
index 80ed0e56b3d..b63654b7c22 100644
--- a/Plugins/Flow.Launcher.Plugin.Sys/Flow.Launcher.Plugin.Sys.csproj
+++ b/Plugins/Flow.Launcher.Plugin.Sys/Flow.Launcher.Plugin.Sys.csproj
@@ -124,7 +124,6 @@
   
   <ItemGroup>
     <Folder Include="Images\Images\" />
-    <Folder Include="Properties\" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Plugins/Flow.Launcher.Plugin.Url/Flow.Launcher.Plugin.Url.csproj b/Plugins/Flow.Launcher.Plugin.Url/Flow.Launcher.Plugin.Url.csproj
index 6bc8154af36..75fa52290e9 100644
--- a/Plugins/Flow.Launcher.Plugin.Url/Flow.Launcher.Plugin.Url.csproj
+++ b/Plugins/Flow.Launcher.Plugin.Url/Flow.Launcher.Plugin.Url.csproj
@@ -93,9 +93,5 @@
     <PackageReference Include="JetBrains.Annotations" Version="2019.1.3" />
     <PackageReference Include="System.Runtime" Version="4.3.1" />
   </ItemGroup>
-  
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/Plugins/Flow.Launcher.Plugin.WebSearch/Flow.Launcher.Plugin.WebSearch.csproj b/Plugins/Flow.Launcher.Plugin.WebSearch/Flow.Launcher.Plugin.WebSearch.csproj
index d159e9bc070..c2449a49e5b 100644
--- a/Plugins/Flow.Launcher.Plugin.WebSearch/Flow.Launcher.Plugin.WebSearch.csproj
+++ b/Plugins/Flow.Launcher.Plugin.WebSearch/Flow.Launcher.Plugin.WebSearch.csproj
@@ -151,8 +151,4 @@
     <ProjectReference Include="..\..\Flow.Launcher.Plugin\Flow.Launcher.Plugin.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
-
 </Project>
\ No newline at end of file
diff --git a/Plugins/HelloWorldCSharp/HelloWorldCSharp.csproj b/Plugins/HelloWorldCSharp/HelloWorldCSharp.csproj
index 8f1867db550..2e2ab78b5e9 100644
--- a/Plugins/HelloWorldCSharp/HelloWorldCSharp.csproj
+++ b/Plugins/HelloWorldCSharp/HelloWorldCSharp.csproj
@@ -51,9 +51,5 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
-  
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
 
 </Project>
\ No newline at end of file

From 85d2b3f5228dc1e56bf592b647230362142b5ffd Mon Sep 17 00:00:00 2001
From: Ioannis G <jtgftw@gmail.com>
Date: Fri, 1 May 2020 18:31:28 +0300
Subject: [PATCH 02/19] update appveyor.yml

---
 appveyor.yml | 30 ++++++++++++------------------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index a676731b962..6b600f33b47 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,31 +1,25 @@
-version: 1.3.{build}
-image: Visual Studio 2017
+version: 1.0.{build}
+image: Visual Studio 2019
 configuration: Release
 platform: Any CPU
 assembly_info:
   patch: true
-  file: AssemblyInfo.*
+  file: SolutionAssemblyInfo.cs
   assembly_version: '{version}'
   assembly_file_version: '{version}'
   assembly_informational_version: '{version}'
+dotnet_csproj:
+  patch: true
+  file: 'Flow.*\*.csproj'
+  version: '{version}'
+  package_version: '{version}'
+  assembly_version: '{version}'
+  file_version: '{version}'
+  informational_version: '{version}'
 before_build:
 - ps: nuget restore
 build:
   project: Flow.Launcher.sln
 after_test:
 artifacts:
-- path: 'Output\Packages\Flow.Launcher-*.zip'
-  name: zipped_binary
-- path: 'Output\Packages\Flow.Launcher.Plugin.*.nupkg'
-  name: nuget_package
-- path: 'Output\Packages\Flow.Launcher-*.*'
-  name: installer
-- path: 'Output\Packages\RELEASES'
-  name: installer
-deploy:
-  provider: NuGet
-  api_key:
-    secure: yybUOFgBuGVpbmOVZxsurC8OpkClzt9dR+/54WpMWcq6b6oyMatciaelRPnXsjRn
-  artifact: nuget_package
-  on:
-    branch: api
\ No newline at end of file
+- path: 'Output\Packages\*'
\ No newline at end of file

From fed56d26ad84ec4554f7a8eba1b0cb6b41137827 Mon Sep 17 00:00:00 2001
From: Ioannis G <jtgftw@gmail.com>
Date: Fri, 1 May 2020 22:24:28 +0300
Subject: [PATCH 03/19] update the post build script

* use dotnet pack for the plugin project
* refactor Zip-Release and Pack-Squirrel-Installer functions
* remove reference to NuGet.CommandLine - no longer needed
---
 Flow.Launcher/Flow.Launcher.csproj |  4 ----
 Scripts/flowlauncher.nuspec        |  2 +-
 Scripts/post_build.ps1             | 27 +++++++++++++--------------
 3 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/Flow.Launcher/Flow.Launcher.csproj b/Flow.Launcher/Flow.Launcher.csproj
index 7049d9c4d10..679cf22a322 100644
--- a/Flow.Launcher/Flow.Launcher.csproj
+++ b/Flow.Launcher/Flow.Launcher.csproj
@@ -61,10 +61,6 @@
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="NHotkey.Wpf" Version="1.2.1" />
     <PackageReference Include="NLog.Web.AspNetCore" Version="4.9.0" />
-    <PackageReference Include="NuGet.CommandLine" Version="5.4.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
     <PackageReference Include="PropertyChanged.Fody" Version="3.2.8">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/Scripts/flowlauncher.nuspec b/Scripts/flowlauncher.nuspec
index cfac20b061a..a4831f4db6b 100644
--- a/Scripts/flowlauncher.nuspec
+++ b/Scripts/flowlauncher.nuspec
@@ -11,6 +11,6 @@
     <description>Flow Launcher - a launcher for windows</description>
   </metadata>
   <files>
-    <file src="**\*.*" target="lib\net45\" exclude="Flow.Launcher.vshost.exe;Flow.Launcher.vshost.exe.config;Flow.Launcher.vshost.exe.manifest;*.nupkg;Setup.exe;RELEASES"/>
+    <file src="**\*.*" target="lib\netcoreapp3.1\" exclude="Flow.Launcher.vshost.exe;Flow.Launcher.vshost.exe.config;Flow.Launcher.vshost.exe.manifest;*.nupkg;Setup.exe;RELEASES"/>
   </files>
 </package>
diff --git a/Scripts/post_build.ps1 b/Scripts/post_build.ps1
index 14faf82b1fe..e411b49bec0 100644
--- a/Scripts/post_build.ps1
+++ b/Scripts/post_build.ps1
@@ -57,14 +57,15 @@ function Validate-Directory ($output) {
     New-Item $output -ItemType Directory -Force
 }
 
-function Pack-Nuget ($path, $version, $output) {
+function Pack-Plugin ($path, $output) {
     Write-Host "Begin build nuget library"
 
-    $spec = "$path\Scripts\flowlauncher.plugin.nuspec"
-    Write-Host "nuspec path: $spec"
+    $project = "$path\Flow.Launcher.Plugin\Flow.Launcher.Plugin.csproj"
+
+    Write-Host "Packing: $project"
     Write-Host "Output path: $output"
 
-    Nuget pack $spec -Version $version -OutputDirectory $output
+    dotnet pack $project --include-symbols --configuration Release --output $output
 
     Write-Host "End build nuget library"
 }
@@ -72,13 +73,10 @@ function Pack-Nuget ($path, $version, $output) {
 function Zip-Release ($path, $version, $output) {
     Write-Host "Begin zip release"
 
-    $input = "$path\Output\Release"
-    Write-Host "Input path:  $input"
-    $file = "$output\Flow.Launcher-$version.zip"
-    Write-Host "Filename: $file"
+    $content = "$path\Output\Release\*"
+    $zipFile = "$output\Flow.Launcher-$version.zip"
 
-    [Reflection.Assembly]::LoadWithPartialName("System.IO.Compression.FileSystem")
-    [System.IO.Compression.ZipFile]::CreateFromDirectory($input, $file)
+    Compress-Archive -Force -Path $content -DestinationPath $zipFile
 
     Write-Host "End zip release"
 }
@@ -88,10 +86,12 @@ function Pack-Squirrel-Installer ($path, $version, $output) {
     Write-Host "Begin pack squirrel installer"
 
     $spec = "$path\Scripts\flowlauncher.nuspec"
-    Write-Host "nuspec path: $spec"
     $input = "$path\Output\Release"
+
+    Write-Host "Packing: $spec"
     Write-Host "Input path:  $input"
-    Nuget pack $spec -Version $version -Properties Configuration=Release -BasePath $input -OutputDirectory  $output
+    # TODO: can we use dotnet pack here?
+    nuget pack $spec -Version $version -BasePath $input -OutputDirectory $output -Properties Configuration=Release
 
     $nupkg = "$output\FlowLauncher.$version.nupkg"
     Write-Host "nupkg path: $nupkg"
@@ -139,12 +139,11 @@ function Main {
         $o = "$p\Output\Packages"
         Validate-Directory $o
         # making version static as multiple versions can exist in the nuget folder and in the case a breaking change is introduced.
-        New-Alias Nuget $env:USERPROFILE\.nuget\packages\NuGet.CommandLine\5.4.0\tools\NuGet.exe -Force
         Pack-Squirrel-Installer $p $v $o
     
         $isInCI = $env:APPVEYOR
         if ($isInCI) {
-            Pack-Nuget $p $v $o
+            Pack-Plugin $p $o
             Zip-Release $p $v $o
         }
 

From 6ef4c04b97e2a627530b22199f77746e96231475 Mon Sep 17 00:00:00 2001
From: Ioannis G <jtgftw@gmail.com>
Date: Fri, 1 May 2020 22:34:40 +0300
Subject: [PATCH 04/19] add package details to Flow.Launcher.Plugin.csproj

---
 Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj b/Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj
index 82fbb31d51b..e8f5769b4c6 100644
--- a/Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj
+++ b/Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj
@@ -12,7 +12,21 @@
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
-  
+
+  <PropertyGroup>
+    <Version>1.0.0</Version>
+    <PackageVersion>1.0.0</PackageVersion>
+    <AssemblyVersion>1.0.0</AssemblyVersion>
+    <FileVersion>1.0.0</FileVersion>
+    <PackageId>Flow.Launcher.Plugin</PackageId>
+    <IncludeSymbols>true</IncludeSymbols>
+    <Authors>qianlifeng, Jeremy Wu</Authors>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <RepositoryUrl>https://github.com/Flow-Launcher/Flow.Launcher</RepositoryUrl>
+    <PackageDescription>Reference this library if you want to develop a Flow Launcher plugin</PackageDescription>
+    <PackageTags>flowlauncher</PackageTags>
+  </PropertyGroup>
+
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>

From 2d6dd979213aef1353ad88f680c188769992fb70 Mon Sep 17 00:00:00 2001
From: Ioannis G <jtgftw@gmail.com>
Date: Mon, 4 May 2020 14:33:11 +0300
Subject: [PATCH 05/19] pack Plugin project on Release builds

also use the new format for package symbols (snupkg)
---
 Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj b/Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj
index e8f5769b4c6..13a4652c6d8 100644
--- a/Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj
+++ b/Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
@@ -20,11 +20,13 @@
     <FileVersion>1.0.0</FileVersion>
     <PackageId>Flow.Launcher.Plugin</PackageId>
     <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     <Authors>qianlifeng, Jeremy Wu</Authors>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <RepositoryUrl>https://github.com/Flow-Launcher/Flow.Launcher</RepositoryUrl>
     <PackageDescription>Reference this library if you want to develop a Flow Launcher plugin</PackageDescription>
     <PackageTags>flowlauncher</PackageTags>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

From f57fdfbc50d869f04d58ba3e5991f84acc58068d Mon Sep 17 00:00:00 2001
From: Ioannis G <jtgftw@gmail.com>
Date: Mon, 4 May 2020 14:37:26 +0300
Subject: [PATCH 06/19] appveyor: update path to Plugin artifacts

and remove the pack step from the post-build script (no longer needed)
---
 Scripts/post_build.ps1 | 14 --------------
 appveyor.yml           |  6 +++++-
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/Scripts/post_build.ps1 b/Scripts/post_build.ps1
index e411b49bec0..5d9a0baf658 100644
--- a/Scripts/post_build.ps1
+++ b/Scripts/post_build.ps1
@@ -57,19 +57,6 @@ function Validate-Directory ($output) {
     New-Item $output -ItemType Directory -Force
 }
 
-function Pack-Plugin ($path, $output) {
-    Write-Host "Begin build nuget library"
-
-    $project = "$path\Flow.Launcher.Plugin\Flow.Launcher.Plugin.csproj"
-
-    Write-Host "Packing: $project"
-    Write-Host "Output path: $output"
-
-    dotnet pack $project --include-symbols --configuration Release --output $output
-
-    Write-Host "End build nuget library"
-}
-
 function Zip-Release ($path, $version, $output) {
     Write-Host "Begin zip release"
 
@@ -143,7 +130,6 @@ function Main {
     
         $isInCI = $env:APPVEYOR
         if ($isInCI) {
-            Pack-Plugin $p $o
             Zip-Release $p $v $o
         }
 
diff --git a/appveyor.yml b/appveyor.yml
index 6b600f33b47..55bd2ed6b4a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -22,4 +22,8 @@ build:
   project: Flow.Launcher.sln
 after_test:
 artifacts:
-- path: 'Output\Packages\*'
\ No newline at end of file
+- path: 'Output\Packages\*'
+- path: 'Output\Release\Flow.Launcher.Plugin.*.nupkg'
+  name: Plugin nupkg
+- path: 'Output\Release\Flow.Launcher.Plugin.*.snupkg'
+  name: Plugin snupkg
\ No newline at end of file

From 53bc0f2cba6e2e30cff7c5366fe4cf08394cdc8d Mon Sep 17 00:00:00 2001
From: Ioannis G <jtgftw@gmail.com>
Date: Mon, 4 May 2020 14:56:35 +0300
Subject: [PATCH 07/19] plugin: set Authors to the nuget org name

---
 Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj b/Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj
index 13a4652c6d8..7c026eba4e9 100644
--- a/Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj
+++ b/Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj
@@ -21,7 +21,7 @@
     <PackageId>Flow.Launcher.Plugin</PackageId>
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    <Authors>qianlifeng, Jeremy Wu</Authors>
+    <Authors>flow-launcher</Authors>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <RepositoryUrl>https://github.com/Flow-Launcher/Flow.Launcher</RepositoryUrl>
     <PackageDescription>Reference this library if you want to develop a Flow Launcher plugin</PackageDescription>

From 9737d2fc70c5ecec579260880c632a075719f008 Mon Sep 17 00:00:00 2001
From: Ioannis G <jtgftw@gmail.com>
Date: Mon, 4 May 2020 15:14:47 +0300
Subject: [PATCH 08/19] delete nuspec file for the plugin project

no longer needed
---
 Flow.Launcher.sln                  |  1 -
 Scripts/flowlauncher.plugin.nuspec | 16 ----------------
 2 files changed, 17 deletions(-)
 delete mode 100644 Scripts/flowlauncher.plugin.nuspec

diff --git a/Flow.Launcher.sln b/Flow.Launcher.sln
index 2827cf585a8..f668b27646b 100644
--- a/Flow.Launcher.sln
+++ b/Flow.Launcher.sln
@@ -63,7 +63,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		README.md = README.md
 		SolutionAssemblyInfo.cs = SolutionAssemblyInfo.cs
 		Scripts\flowlauncher.nuspec = Scripts\flowlauncher.nuspec
-		Scripts\flowlauncher.plugin.nuspec = Scripts\flowlauncher.plugin.nuspec
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HelloWorldCSharp", "Plugins\HelloWorldCSharp\HelloWorldCSharp.csproj", "{03FFA443-5F50-48D5-8869-F3DF316803AA}"
diff --git a/Scripts/flowlauncher.plugin.nuspec b/Scripts/flowlauncher.plugin.nuspec
deleted file mode 100644
index 68b60a29fe2..00000000000
--- a/Scripts/flowlauncher.plugin.nuspec
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<package>
-  <metadata>
-    <id>Flow.Launcher.Plugin</id>
-    <version>$version$</version>
-    <authors>qianlifeng, Jeremy Wu</authors>
-    <licenseUrl>https://github.com/Flow-Launcher/Flow.Launcher/blob/master/LICENSE</licenseUrl>
-    <projectUrl>https://github.com/Flow-Launcher/Flow.Launcher</projectUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>Reference this library if you want to develop a Flow Launcher plugin</description>
-    <tags>flowlauncher</tags>
-  </metadata>
-  <files>
-      <file src="..\Output\Release\Flow.Launcher.Plugin.dll" target="lib\net452" />
-  </files>
-</package>

From 658b9d721bae4cf1f4d8edf7bd5883c93d5dc34c Mon Sep 17 00:00:00 2001
From: Ioannis G <jtgftw@gmail.com>
Date: Tue, 5 May 2020 13:13:17 +0300
Subject: [PATCH 09/19] plugin: add SourceLink support

---
 Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj b/Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj
index 7c026eba4e9..04444c7b895 100644
--- a/Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj
+++ b/Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj
@@ -27,6 +27,7 @@
     <PackageDescription>Reference this library if you want to develop a Flow Launcher plugin</PackageDescription>
     <PackageTags>flowlauncher</PackageTags>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -68,6 +69,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
     <PackageReference Include="JetBrains.Annotations" Version="2019.1.3" />
     <PackageReference Include="Mono.Cecil" Version="0.11.2" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />

From b63521bff3548040f55b225e4231bf512ddc782e Mon Sep 17 00:00:00 2001
From: Ioannis G <jtgftw@gmail.com>
Date: Fri, 8 May 2020 23:07:05 +0300
Subject: [PATCH 10/19] update appveyor.yml

* make the file easier to read
* minimal build output verbosity
* skip commits that edit markdown files
---
 appveyor.yml | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 55bd2ed6b4a..d1ce37bb945 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,13 +1,12 @@
 version: 1.0.{build}
-image: Visual Studio 2019
-configuration: Release
-platform: Any CPU
+
 assembly_info:
   patch: true
   file: SolutionAssemblyInfo.cs
   assembly_version: '{version}'
   assembly_file_version: '{version}'
   assembly_informational_version: '{version}'
+
 dotnet_csproj:
   patch: true
   file: 'Flow.*\*.csproj'
@@ -16,11 +15,20 @@ dotnet_csproj:
   assembly_version: '{version}'
   file_version: '{version}'
   informational_version: '{version}'
+
+skip_commits:
+  files:
+    - '*.md'
+
+image: Visual Studio 2019
+platform: Any CPU
+configuration: Release
 before_build:
 - ps: nuget restore
 build:
   project: Flow.Launcher.sln
-after_test:
+  verbosity: minimal
+
 artifacts:
 - path: 'Output\Packages\*'
 - path: 'Output\Release\Flow.Launcher.Plugin.*.nupkg'

From 12bcb6bb89a6bee006eedc80981f78d512a1b407 Mon Sep 17 00:00:00 2001
From: Ioannis G <jtgftw@gmail.com>
Date: Sat, 9 May 2020 00:15:54 +0300
Subject: [PATCH 11/19] appveyor: updating naming of artifacts

---
 Scripts/flowlauncher.nuspec | 2 +-
 Scripts/post_build.ps1      | 6 +++---
 appveyor.yml                | 9 ++++++++-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/Scripts/flowlauncher.nuspec b/Scripts/flowlauncher.nuspec
index a4831f4db6b..ec953399cbe 100644
--- a/Scripts/flowlauncher.nuspec
+++ b/Scripts/flowlauncher.nuspec
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package>
   <metadata>
-    <id>FlowLauncher</id>
+    <id>Flow-Launcher</id>
     <title>Flow Launcher</title>
     <version>$version$</version>
     <authors>happlebao, Jeremy Wu</authors>
diff --git a/Scripts/post_build.ps1 b/Scripts/post_build.ps1
index 5d9a0baf658..36cda54e6a6 100644
--- a/Scripts/post_build.ps1
+++ b/Scripts/post_build.ps1
@@ -61,7 +61,7 @@ function Zip-Release ($path, $version, $output) {
     Write-Host "Begin zip release"
 
     $content = "$path\Output\Release\*"
-    $zipFile = "$output\Flow.Launcher-$version.zip"
+    $zipFile = "$output\Flow-Launcher-v$version.zip"
 
     Compress-Archive -Force -Path $content -DestinationPath $zipFile
 
@@ -80,7 +80,7 @@ function Pack-Squirrel-Installer ($path, $version, $output) {
     # TODO: can we use dotnet pack here?
     nuget pack $spec -Version $version -BasePath $input -OutputDirectory $output -Properties Configuration=Release
 
-    $nupkg = "$output\FlowLauncher.$version.nupkg"
+    $nupkg = "$output\Flow-Launcher.$version.nupkg"
     Write-Host "nupkg path: $nupkg"
     $icon = "$path\Flow.Launcher\Resources\app.ico"
     Write-Host "icon: $icon"
@@ -94,7 +94,7 @@ function Pack-Squirrel-Installer ($path, $version, $output) {
     Move-Item $temp\* $output -Force
     Remove-Item $temp
     
-    $file = "$output\Flow Launcher-$version.exe"
+    $file = "$output\Flow-Launcher-v$version.exe"
     Write-Host "Filename: $file"
 
     Move-Item "$output\Setup.exe" $file -Force
diff --git a/appveyor.yml b/appveyor.yml
index d1ce37bb945..dc98a7a2064 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -30,7 +30,14 @@ build:
   verbosity: minimal
 
 artifacts:
-- path: 'Output\Packages\*'
+- path: 'Output\Packages\*.exe'
+  name: Setup File
+- path: 'Output\Packages\*.nupkg'
+  name: Squirrel nupkg
+- path: 'Output\Packages\RELEASES'
+  name: Squirrel RELEASES
+- path: 'Output\Packages\Flow-Launcher-*.zip'
+  name: Zip
 - path: 'Output\Release\Flow.Launcher.Plugin.*.nupkg'
   name: Plugin nupkg
 - path: 'Output\Release\Flow.Launcher.Plugin.*.snupkg'

From 76e71368ad3c9c1ada7c9eaa5391efa035eeb73a Mon Sep 17 00:00:00 2001
From: Ioannis G <jtgftw@gmail.com>
Date: Sat, 9 May 2020 00:19:17 +0300
Subject: [PATCH 12/19] appveyor: update versioning

---
 Scripts/post_build.ps1 |  4 ++--
 appveyor.yml           | 24 ++++++++++++++----------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/Scripts/post_build.ps1 b/Scripts/post_build.ps1
index 36cda54e6a6..d5cb947b4ed 100644
--- a/Scripts/post_build.ps1
+++ b/Scripts/post_build.ps1
@@ -6,10 +6,10 @@ param(
 Write-Host "Config: $config"
 
 function Build-Version {
-	if ([string]::IsNullOrEmpty($env:APPVEYOR_BUILD_VERSION)) {
+	if ([string]::IsNullOrEmpty($env:flowVersion)) {
 		$v = (Get-Command ${TargetPath}).FileVersionInfo.FileVersion
 	} else {
-        $v = $env:APPVEYOR_BUILD_VERSION
+        $v = $env:flowVersion
     }
 
     Write-Host "Build Version: $v"
diff --git a/appveyor.yml b/appveyor.yml
index dc98a7a2064..243e3ed2c3c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,20 +1,24 @@
-version: 1.0.{build}
+version: '1.0.0.{build}'
+
+init:
+- ps: |
+      $version = new-object System.Version $env:APPVEYOR_BUILD_VERSION
+      $env:flowVersion = "{0}.{1}.{2}" -f $version.Major, $version.Minor, $version.Build
 
 assembly_info:
   patch: true
   file: SolutionAssemblyInfo.cs
-  assembly_version: '{version}'
-  assembly_file_version: '{version}'
-  assembly_informational_version: '{version}'
-
+  assembly_version: $(flowVersion)
+  assembly_file_version: $(flowVersion)
+  assembly_informational_version: $(flowVersion)
 dotnet_csproj:
   patch: true
   file: 'Flow.*\*.csproj'
-  version: '{version}'
-  package_version: '{version}'
-  assembly_version: '{version}'
-  file_version: '{version}'
-  informational_version: '{version}'
+  version: $(flowVersion)
+  package_version: $(flowVersion)
+  assembly_version: $(flowVersion)
+  file_version: $(flowVersion)
+  informational_version: $(flowVersion)
 
 skip_commits:
   files:

From 5ed5d52733540c59e163f4dd2197cb7b344a25d9 Mon Sep 17 00:00:00 2001
From: Ioannis G <jtgftw@gmail.com>
Date: Mon, 11 May 2020 19:49:39 +0300
Subject: [PATCH 13/19] post-build script: remove leftover comment

also convert indentation to spaces
---
 Scripts/post_build.ps1 | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/Scripts/post_build.ps1 b/Scripts/post_build.ps1
index d5cb947b4ed..2aa6a1e8738 100644
--- a/Scripts/post_build.ps1
+++ b/Scripts/post_build.ps1
@@ -1,14 +1,14 @@
 param(
     [string]$config = "Release", 
     [string]$solution,
-	[string]$targetpath
+    [string]$targetpath
 )
 Write-Host "Config: $config"
 
 function Build-Version {
-	if ([string]::IsNullOrEmpty($env:flowVersion)) {
-		$v = (Get-Command ${TargetPath}).FileVersionInfo.FileVersion
-	} else {
+    if ([string]::IsNullOrEmpty($env:flowVersion)) {
+        $v = (Get-Command ${TargetPath}).FileVersionInfo.FileVersion
+    } else {
         $v = $env:flowVersion
     }
 
@@ -120,12 +120,11 @@ function Main {
         
         if(IsDotNetCoreAppSelfContainedPublishEvent) {
             FixPublishLastWriteDateTimeError $p
-		}
+        }
         
         Delete-Unused $p $config
         $o = "$p\Output\Packages"
         Validate-Directory $o
-        # making version static as multiple versions can exist in the nuget folder and in the case a breaking change is introduced.
         Pack-Squirrel-Installer $p $v $o
     
         $isInCI = $env:APPVEYOR

From 595d8d33c4e226ef596f1affc043e1244ee226db Mon Sep 17 00:00:00 2001
From: Ioannis G <jtgftw@gmail.com>
Date: Wed, 13 May 2020 01:33:36 +0300
Subject: [PATCH 14/19] update package properties

---
 Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj | 4 ++--
 Scripts/flowlauncher.nuspec                      | 2 +-
 Scripts/post_build.ps1                           | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj b/Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj
index 04444c7b895..7965f75c6e6 100644
--- a/Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj
+++ b/Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
@@ -21,7 +21,7 @@
     <PackageId>Flow.Launcher.Plugin</PackageId>
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    <Authors>flow-launcher</Authors>
+    <Authors>Flow-Launcher</Authors>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <RepositoryUrl>https://github.com/Flow-Launcher/Flow.Launcher</RepositoryUrl>
     <PackageDescription>Reference this library if you want to develop a Flow Launcher plugin</PackageDescription>
diff --git a/Scripts/flowlauncher.nuspec b/Scripts/flowlauncher.nuspec
index ec953399cbe..a4831f4db6b 100644
--- a/Scripts/flowlauncher.nuspec
+++ b/Scripts/flowlauncher.nuspec
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package>
   <metadata>
-    <id>Flow-Launcher</id>
+    <id>FlowLauncher</id>
     <title>Flow Launcher</title>
     <version>$version$</version>
     <authors>happlebao, Jeremy Wu</authors>
diff --git a/Scripts/post_build.ps1 b/Scripts/post_build.ps1
index 2aa6a1e8738..16f27476fb9 100644
--- a/Scripts/post_build.ps1
+++ b/Scripts/post_build.ps1
@@ -80,7 +80,7 @@ function Pack-Squirrel-Installer ($path, $version, $output) {
     # TODO: can we use dotnet pack here?
     nuget pack $spec -Version $version -BasePath $input -OutputDirectory $output -Properties Configuration=Release
 
-    $nupkg = "$output\Flow-Launcher.$version.nupkg"
+    $nupkg = "$output\FlowLauncher.$version.nupkg"
     Write-Host "nupkg path: $nupkg"
     $icon = "$path\Flow.Launcher\Resources\app.ico"
     Write-Host "icon: $icon"

From 04b48eb6163825a778c83231fd6f8fe54dbf5101 Mon Sep 17 00:00:00 2001
From: Ioannis G <jtgftw@gmail.com>
Date: Thu, 21 May 2020 03:08:02 +0300
Subject: [PATCH 15/19] downgrade PropertyChanged.Fody to 2.5.13

This is the latest version of the package that copies itself to the
build output. Downgrading fixes runtime errors.
---
 Flow.Launcher.Core/Flow.Launcher.Core.csproj     | 5 +----
 Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj | 5 +----
 Flow.Launcher/Flow.Launcher.csproj               | 5 +----
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/Flow.Launcher.Core/Flow.Launcher.Core.csproj b/Flow.Launcher.Core/Flow.Launcher.Core.csproj
index fa3f10fa7b7..87c390d3414 100644
--- a/Flow.Launcher.Core/Flow.Launcher.Core.csproj
+++ b/Flow.Launcher.Core/Flow.Launcher.Core.csproj
@@ -57,10 +57,7 @@
     <PackageReference Include="JetBrains.Annotations" Version="2019.1.3" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="squirrel.windows" Version="1.5.2" />
-    <PackageReference Include="PropertyChanged.Fody" Version="3.2.8">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
+    <PackageReference Include="PropertyChanged.Fody" Version="2.5.13" />
     <PackageReference Include="SharpZipLib" Version="1.2.0" />
     <PackageReference Include="System.Runtime" Version="4.3.1" />
   </ItemGroup>
diff --git a/Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj b/Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj
index 7965f75c6e6..8a2e45565f5 100644
--- a/Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj
+++ b/Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj
@@ -73,10 +73,7 @@
     <PackageReference Include="JetBrains.Annotations" Version="2019.1.3" />
     <PackageReference Include="Mono.Cecil" Version="0.11.2" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="PropertyChanged.Fody" Version="3.2.8">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
+    <PackageReference Include="PropertyChanged.Fody" Version="2.5.13" />
     <PackageReference Include="System.Runtime" Version="4.3.1" />
   </ItemGroup>
 
diff --git a/Flow.Launcher/Flow.Launcher.csproj b/Flow.Launcher/Flow.Launcher.csproj
index 679cf22a322..b63a204e76f 100644
--- a/Flow.Launcher/Flow.Launcher.csproj
+++ b/Flow.Launcher/Flow.Launcher.csproj
@@ -61,10 +61,7 @@
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="NHotkey.Wpf" Version="1.2.1" />
     <PackageReference Include="NLog.Web.AspNetCore" Version="4.9.0" />
-    <PackageReference Include="PropertyChanged.Fody" Version="3.2.8">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
+    <PackageReference Include="PropertyChanged.Fody" Version="2.5.13" />
     <PackageReference Include="System.Data.SQLite" Version="1.0.112" />
     <PackageReference Include="System.Data.SQLite.Core" Version="1.0.112" />
     <PackageReference Include="System.Runtime" Version="4.3.1" />

From 63478933568396d39809722d804d73d67ba1a797 Mon Sep 17 00:00:00 2001
From: Ioannis G <jtgftw@gmail.com>
Date: Thu, 21 May 2020 03:10:05 +0300
Subject: [PATCH 16/19] appveyor: ignore squirrel artifacts

The squirrel artifats produced (nupkg, RELEASES and exe) are not ready
for deployment as they depend on the .net core runtime being installed.
We remove them temporarily from the build artifacts to avoid confusion,
until this issue has been addressed.
---
 appveyor.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 243e3ed2c3c..fb13b0796a3 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -34,12 +34,6 @@ build:
   verbosity: minimal
 
 artifacts:
-- path: 'Output\Packages\*.exe'
-  name: Setup File
-- path: 'Output\Packages\*.nupkg'
-  name: Squirrel nupkg
-- path: 'Output\Packages\RELEASES'
-  name: Squirrel RELEASES
 - path: 'Output\Packages\Flow-Launcher-*.zip'
   name: Zip
 - path: 'Output\Release\Flow.Launcher.Plugin.*.nupkg'

From 408fabd5563888d5153ce05daae4ef62657af793 Mon Sep 17 00:00:00 2001
From: Ioannis G <jtgftw@gmail.com>
Date: Thu, 21 May 2020 03:16:47 +0300
Subject: [PATCH 17/19] update project versions

---
 Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj | 4 ++--
 appveyor.yml                                     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj b/Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj
index 8a2e45565f5..c353fd48308 100644
--- a/Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj
+++ b/Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
@@ -15,7 +15,7 @@
 
   <PropertyGroup>
     <Version>1.0.0</Version>
-    <PackageVersion>1.0.0</PackageVersion>
+    <PackageVersion>1.0.0-beta1</PackageVersion>
     <AssemblyVersion>1.0.0</AssemblyVersion>
     <FileVersion>1.0.0</FileVersion>
     <PackageId>Flow.Launcher.Plugin</PackageId>
diff --git a/appveyor.yml b/appveyor.yml
index fb13b0796a3..cd0e27918f4 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-version: '1.0.0.{build}'
+version: '0.9.0.{build}'
 
 init:
 - ps: |

From 945c124b3182e244ae2e12d8f52c6a0c116ab19f Mon Sep 17 00:00:00 2001
From: Ioannis G <jtgftw@gmail.com>
Date: Thu, 21 May 2020 03:32:55 +0300
Subject: [PATCH 18/19] appveyor: do not patch csproj files

The way the project files are currently configured, this setting
resulted in only the Plugin project being patched. Consequently, the
version of the Plugin project was wrong in the built package.
---
 appveyor.yml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index cd0e27918f4..02027f83e36 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -11,14 +11,6 @@ assembly_info:
   assembly_version: $(flowVersion)
   assembly_file_version: $(flowVersion)
   assembly_informational_version: $(flowVersion)
-dotnet_csproj:
-  patch: true
-  file: 'Flow.*\*.csproj'
-  version: $(flowVersion)
-  package_version: $(flowVersion)
-  assembly_version: $(flowVersion)
-  file_version: $(flowVersion)
-  informational_version: $(flowVersion)
 
 skip_commits:
   files:

From f98eee6058ed26b4cdfd0420c0aab263c4e57e89 Mon Sep 17 00:00:00 2001
From: Jeremy Wu <jeremy24wu@gmail.com>
Date: Thu, 21 May 2020 13:31:24 +1000
Subject: [PATCH 19/19] Fix nuget commandline reference

---
 Flow.Launcher/Flow.Launcher.csproj | 4 ++++
 Scripts/post_build.ps1             | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/Flow.Launcher/Flow.Launcher.csproj b/Flow.Launcher/Flow.Launcher.csproj
index 568b6d481d0..970bc8e37f6 100644
--- a/Flow.Launcher/Flow.Launcher.csproj
+++ b/Flow.Launcher/Flow.Launcher.csproj
@@ -70,6 +70,10 @@
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="NHotkey.Wpf" Version="1.2.1" />
     <PackageReference Include="NLog.Web.AspNetCore" Version="4.9.0" />
+    <PackageReference Include="NuGet.CommandLine" Version="5.4.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="PropertyChanged.Fody" Version="2.5.13" />
     <PackageReference Include="System.Data.SQLite" Version="1.0.112" />
     <PackageReference Include="System.Data.SQLite.Core" Version="1.0.112" />
diff --git a/Scripts/post_build.ps1 b/Scripts/post_build.ps1
index 16f27476fb9..624f4f50254 100644
--- a/Scripts/post_build.ps1
+++ b/Scripts/post_build.ps1
@@ -125,6 +125,8 @@ function Main {
         Delete-Unused $p $config
         $o = "$p\Output\Packages"
         Validate-Directory $o
+        # making version static as multiple versions can exist in the nuget folder and in the case a breaking change is introduced.
+        New-Alias Nuget $env:USERPROFILE\.nuget\packages\NuGet.CommandLine\5.4.0\tools\NuGet.exe -Force
         Pack-Squirrel-Installer $p $v $o
     
         $isInCI = $env:APPVEYOR