diff --git a/Doc/app.ico b/Doc/app.ico
index 38c401c8c..362c8747f 100644
Binary files a/Doc/app.ico and b/Doc/app.ico differ
diff --git a/Doc/app.png b/Doc/app.png
index 8c9ca7971..ba17c1a66 100644
Binary files a/Doc/app.png and b/Doc/app.png differ
diff --git a/Doc/app.psd b/Doc/app.psd
deleted file mode 100644
index 833fd6529..000000000
Binary files a/Doc/app.psd and /dev/null differ
diff --git a/Doc/app_error.png b/Doc/app_error.png
index 5106d6e8a..4c035da0c 100644
Binary files a/Doc/app_error.png and b/Doc/app_error.png differ
diff --git a/Doc/app_error.psd b/Doc/app_error.psd
deleted file mode 100644
index 174e9cb62..000000000
Binary files a/Doc/app_error.psd and /dev/null differ
diff --git a/Flow.Launcher.Core/Flow.Launcher.Core.csproj b/Flow.Launcher.Core/Flow.Launcher.Core.csproj
index fa3f10fa7..87c390d34 100644
--- a/Flow.Launcher.Core/Flow.Launcher.Core.csproj
+++ b/Flow.Launcher.Core/Flow.Launcher.Core.csproj
@@ -57,10 +57,7 @@
-
- all
- runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
diff --git a/Flow.Launcher.Core/Plugin/PluginsLoader.cs b/Flow.Launcher.Core/Plugin/PluginsLoader.cs
index 35486e794..513d85c96 100644
--- a/Flow.Launcher.Core/Plugin/PluginsLoader.cs
+++ b/Flow.Launcher.Core/Plugin/PluginsLoader.cs
@@ -1,11 +1,12 @@
-using System;
+using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Reflection;
using System.Runtime.Loader;
+using System.Threading.Tasks;
+using System.Windows.Forms;
using Flow.Launcher.Infrastructure;
-using Flow.Launcher.Infrastructure.Exception;
using Flow.Launcher.Infrastructure.Logger;
using Flow.Launcher.Infrastructure.UserSettings;
using Flow.Launcher.Plugin;
@@ -29,6 +30,8 @@ namespace Flow.Launcher.Core.Plugin
public static IEnumerable DotNetPlugins(List source)
{
+ var erroredPlugins = new List();
+
var plugins = new List();
var metadatas = source.Where(o => AllowedLanguage.IsDotNet(o.Language));
@@ -50,20 +53,34 @@ namespace Flow.Launcher.Core.Plugin
}
catch (Exception e)
{
- Log.Exception($"|PluginsLoader.DotNetPlugins|Couldn't load assembly for {metadata.Name}", e);
+ erroredPlugins.Add(metadata.Name);
+
+ Log.Exception($"|PluginsLoader.DotNetPlugins|Couldn't load assembly for the plugin: {metadata.Name}", e);
return;
}
- var types = assembly.GetTypes();
+
Type type;
try
{
+ var types = assembly.GetTypes();
+
type = types.First(o => o.IsClass && !o.IsAbstract && o.GetInterfaces().Contains(typeof(IPlugin)));
}
catch (InvalidOperationException e)
{
- Log.Exception($"|PluginsLoader.DotNetPlugins|Can't find class implement IPlugin for <{metadata.Name}>", e);
+ erroredPlugins.Add(metadata.Name);
+
+ Log.Exception($"|PluginsLoader.DotNetPlugins|Can't find the required IPlugin interface for the plugin: <{metadata.Name}>", e);
return;
}
+ catch (ReflectionTypeLoadException e)
+ {
+ erroredPlugins.Add(metadata.Name);
+
+ Log.Exception($"|PluginsLoader.DotNetPlugins|The GetTypes method was unable to load assembly types for the plugin: <{metadata.Name}>", e);
+ return;
+ }
+
IPlugin plugin;
try
{
@@ -71,7 +88,9 @@ namespace Flow.Launcher.Core.Plugin
}
catch (Exception e)
{
- Log.Exception($"|PluginsLoader.DotNetPlugins|Can't create instance for <{metadata.Name}>", e);
+ erroredPlugins.Add(metadata.Name);
+
+ Log.Exception($"|PluginsLoader.DotNetPlugins|The following plugin has errored and can not be loaded: <{metadata.Name}>", e);
return;
}
#endif
@@ -85,6 +104,26 @@ namespace Flow.Launcher.Core.Plugin
metadata.InitTime += milliseconds;
}
+
+ if (erroredPlugins.Count > 0)
+ {
+ var errorPluginString = "";
+
+ var errorMessage = "The following "
+ + (erroredPlugins.Count > 1 ? "plugins have " : "plugin has ")
+ + "errored and cannot be loaded:";
+
+ erroredPlugins.ForEach(x => errorPluginString += x + Environment.NewLine);
+
+ Task.Run(() =>
+ {
+ MessageBox.Show($"{errorMessage}{Environment.NewLine}{Environment.NewLine}" +
+ $"{errorPluginString}{Environment.NewLine}{Environment.NewLine}" +
+ $"Please refer to the logs for more information","",
+ MessageBoxButtons.OK, MessageBoxIcon.Warning);
+ });
+ }
+
return plugins;
}
diff --git a/Flow.Launcher.CrashReporter/Images/app_error.png b/Flow.Launcher.CrashReporter/Images/app_error.png
index 5106d6e8a..4c035da0c 100644
Binary files a/Flow.Launcher.CrashReporter/Images/app_error.png and b/Flow.Launcher.CrashReporter/Images/app_error.png differ
diff --git a/Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj b/Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj
index 82fbb31d5..ff4700e94 100644
--- a/Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj
+++ b/Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj
@@ -1,4 +1,4 @@
-
+
netcoreapp3.1
@@ -12,7 +12,26 @@
false
false
-
+
+
+ 1.0.0
+ 1.0.0-beta3
+ 1.0.0
+ 1.0.0
+ Flow.Launcher.Plugin
+ Flow-Launcher
+ MIT
+ https://github.com/Flow-Launcher/Flow.Launcher
+ Reference this library if you want to develop a Flow Launcher plugin
+ flowlauncher
+ true
+ true
+
+
+
+ true
+
+
true
full
@@ -26,7 +45,7 @@
- pdbonly
+ embedded
true
..\Output\Release\
TRACE
@@ -37,28 +56,15 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
- all
- runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
diff --git a/Flow.Launcher.Test/Flow.Launcher.Test.csproj b/Flow.Launcher.Test/Flow.Launcher.Test.csproj
index e5ca36289..e970c47b9 100644
--- a/Flow.Launcher.Test/Flow.Launcher.Test.csproj
+++ b/Flow.Launcher.Test/Flow.Launcher.Test.csproj
@@ -57,8 +57,4 @@
-
-
-
-
\ No newline at end of file
diff --git a/Flow.Launcher.sln b/Flow.Launcher.sln
index c242932ea..5bdbc3270 100644
--- a/Flow.Launcher.sln
+++ b/Flow.Launcher.sln
@@ -64,7 +64,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/Flow.Launcher/Flow.Launcher.csproj b/Flow.Launcher/Flow.Launcher.csproj
index b8eb79370..987a685ac 100644
--- a/Flow.Launcher/Flow.Launcher.csproj
+++ b/Flow.Launcher/Flow.Launcher.csproj
@@ -54,6 +54,22 @@
+
+
+ MSBuild:Compile
+ Designer
+ PreserveNewest
+
+
+
+
+
+ MSBuild:Compile
+ Designer
+ PreserveNewest
+
+
+
@@ -66,10 +82,7 @@
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
- all
- runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
diff --git a/Flow.Launcher/Images/app.png b/Flow.Launcher/Images/app.png
index 8c9ca7971..ba17c1a66 100644
Binary files a/Flow.Launcher/Images/app.png and b/Flow.Launcher/Images/app.png differ
diff --git a/Flow.Launcher/Images/app_error.png b/Flow.Launcher/Images/app_error.png
index 5106d6e8a..4c035da0c 100644
Binary files a/Flow.Launcher/Images/app_error.png and b/Flow.Launcher/Images/app_error.png differ
diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index a292599b5..1b69c1b90 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -68,6 +68,9 @@
Add
Please select an item
Are you sure you want to delete {0} plugin hotkey?
+ Query window shadow effect
+ Shadow effect has a substantial usage of GPU.
+ Not recommended if you computer performance is limited.
HTTP Proxy
diff --git a/Flow.Launcher/Resources/app.ico b/Flow.Launcher/Resources/app.ico
index 38c401c8c..362c8747f 100644
Binary files a/Flow.Launcher/Resources/app.ico and b/Flow.Launcher/Resources/app.ico differ
diff --git a/Flow.Launcher/ResultListBox.xaml b/Flow.Launcher/ResultListBox.xaml
index 7f9fd95e3..a8560c263 100644
--- a/Flow.Launcher/ResultListBox.xaml
+++ b/Flow.Launcher/ResultListBox.xaml
@@ -41,7 +41,7 @@
-
@@ -91,7 +91,7 @@
Value="True">
-
+
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index fde804f2b..1708a5172 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -227,12 +227,12 @@
-
+
-
-
diff --git a/Flow.Launcher/app.png b/Flow.Launcher/app.png
index 8c9ca7971..5b75521c8 100644
Binary files a/Flow.Launcher/app.png and b/Flow.Launcher/app.png differ
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 b59b114fe..13daddf10 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 @@
-
-
-
-
\ No newline at end of file
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Languages/en.xaml
index 075f3b039..3beccb5e7 100644
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Languages/en.xaml
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Languages/en.xaml
@@ -6,4 +6,10 @@
Browser Bookmarks
Search your browser bookmarks
+
+ Open bookmarks in:
+ New window
+ New tab
+ Set browser from path:
+ Choose
\ No newline at end of file
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml
index 900d51a1c..0aea8f04e 100644
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml
@@ -18,15 +18,22 @@
-
-
-
+
+
+
-
+
-
+
\ 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 d0bc45383..e7cae42ae 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 @@
-
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 fb03fda79..19f8fb980 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 @@
-
-
-
-
\ 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 c75b7aa38..d1c185c36 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 @@
-
-
-
-
\ 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 3fde34b5d..41ad9007c 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 @@
-
-
-
-
\ 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 67cc0294c..a05b5d49d 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 @@
-
-
-
-
\ 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 a29c720f1..48639156e 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 @@
-
-
-
-
-
+
\ 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 aa180cca4..49451d5ba 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 @@
-
-
-
-
\ 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 6208881d4..331566f90 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 @@
-
-
-
-
+
\ 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 b50295ccd..ad1dd079e 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 @@
-
-
-
-
\ 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 80ed0e56b..b63654b7c 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 @@
-
diff --git a/Plugins/Flow.Launcher.Plugin.Sys/Images/app.png b/Plugins/Flow.Launcher.Plugin.Sys/Images/app.png
index 8c9ca7971..ba17c1a66 100644
Binary files a/Plugins/Flow.Launcher.Plugin.Sys/Images/app.png and b/Plugins/Flow.Launcher.Plugin.Sys/Images/app.png differ
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 6bc8154af..75fa52290 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 @@
-
-
-
-
\ 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 d159e9bc0..c2449a49e 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 @@
-
-
-
-
\ No newline at end of file
diff --git a/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml b/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml
index e5ada7483..81f2d739b 100644
--- a/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml
+++ b/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml
@@ -75,7 +75,7 @@
Content="{DynamicResource flowlauncher_plugin_websearch_delete}" />
-
diff --git a/Plugins/HelloWorldCSharp/HelloWorldCSharp.csproj b/Plugins/HelloWorldCSharp/HelloWorldCSharp.csproj
index 8f1867db5..2e2ab78b5 100644
--- a/Plugins/HelloWorldCSharp/HelloWorldCSharp.csproj
+++ b/Plugins/HelloWorldCSharp/HelloWorldCSharp.csproj
@@ -51,9 +51,5 @@
PreserveNewest
-
-
-
-
\ No newline at end of file
diff --git a/Plugins/HelloWorldCSharp/Images/app.png b/Plugins/HelloWorldCSharp/Images/app.png
index 8c9ca7971..ba17c1a66 100644
Binary files a/Plugins/HelloWorldCSharp/Images/app.png and b/Plugins/HelloWorldCSharp/Images/app.png differ
diff --git a/Plugins/HelloWorldFSharp/Images/app.png b/Plugins/HelloWorldFSharp/Images/app.png
index 8c9ca7971..ba17c1a66 100644
Binary files a/Plugins/HelloWorldFSharp/Images/app.png and b/Plugins/HelloWorldFSharp/Images/app.png differ
diff --git a/Plugins/HelloWorldPython/Images/app.png b/Plugins/HelloWorldPython/Images/app.png
index 8c9ca7971..ba17c1a66 100644
Binary files a/Plugins/HelloWorldPython/Images/app.png and b/Plugins/HelloWorldPython/Images/app.png differ
diff --git a/README.md b/README.md
index 02baf9a9c..387e98b6f 100644
--- a/README.md
+++ b/README.md
@@ -12,6 +12,7 @@ Flow Launcher. Dedicated to make your workflow flow more seamlessly. Aimed at be
Remember to star it, flow will love you more :)
## Features
+
- Search everything from applications, folders, bookmarks, YouTube, Twitter and more. All from the comfort of your keyboard without ever touching the mouse.
- Run batch and PowerShell commands as Administrator or a different user.
diff --git a/Scripts/flowlauncher.nuspec b/Scripts/flowlauncher.nuspec
index cfac20b06..a4831f4db 100644
--- a/Scripts/flowlauncher.nuspec
+++ b/Scripts/flowlauncher.nuspec
@@ -11,6 +11,6 @@
Flow Launcher - a launcher for windows
-
+
diff --git a/Scripts/flowlauncher.plugin.nuspec b/Scripts/flowlauncher.plugin.nuspec
deleted file mode 100644
index 68b60a29f..000000000
--- a/Scripts/flowlauncher.plugin.nuspec
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
- Flow.Launcher.Plugin
- $version$
- qianlifeng, Jeremy Wu
- https://github.com/Flow-Launcher/Flow.Launcher/blob/master/LICENSE
- https://github.com/Flow-Launcher/Flow.Launcher
- false
- Reference this library if you want to develop a Flow Launcher plugin
- flowlauncher
-
-
-
-
-
diff --git a/Scripts/post_build.ps1 b/Scripts/post_build.ps1
index 14faf82b1..648b50b15 100644
--- a/Scripts/post_build.ps1
+++ b/Scripts/post_build.ps1
@@ -1,15 +1,15 @@
param(
[string]$config = "Release",
[string]$solution,
- [string]$targetpath
+ [string]$targetpath
)
Write-Host "Config: $config"
function Build-Version {
- if ([string]::IsNullOrEmpty($env:APPVEYOR_BUILD_VERSION)) {
- $v = (Get-Command ${TargetPath}).FileVersionInfo.FileVersion
- } else {
- $v = $env:APPVEYOR_BUILD_VERSION
+ if ([string]::IsNullOrEmpty($env:flowVersion)) {
+ $v = (Get-Command ${TargetPath}).FileVersionInfo.FileVersion
+ } else {
+ $v = $env:flowVersion
}
Write-Host "Build Version: $v"
@@ -35,7 +35,6 @@ function Copy-Resources ($path, $config) {
$project = "$path\Flow.Launcher"
$output = "$path\Output"
$target = "$output\$config"
- Copy-Item -Recurse -Force $project\Themes\* $target\Themes\
Copy-Item -Recurse -Force $project\Images\* $target\Images\
Copy-Item -Recurse -Force $path\Plugins\HelloWorldPython $target\Plugins\HelloWorldPython
Copy-Item -Recurse -Force $path\JsonRPC $target\JsonRPC
@@ -57,28 +56,13 @@ function Validate-Directory ($output) {
New-Item $output -ItemType Directory -Force
}
-function Pack-Nuget ($path, $version, $output) {
- Write-Host "Begin build nuget library"
-
- $spec = "$path\Scripts\flowlauncher.plugin.nuspec"
- Write-Host "nuspec path: $spec"
- Write-Host "Output path: $output"
-
- Nuget pack $spec -Version $version -OutputDirectory $output
-
- Write-Host "End build nuget library"
-}
-
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-v$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 +72,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"
@@ -107,7 +93,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
@@ -133,7 +119,7 @@ function Main {
if(IsDotNetCoreAppSelfContainedPublishEvent) {
FixPublishLastWriteDateTimeError $p
- }
+ }
Delete-Unused $p $config
$o = "$p\Output\Packages"
@@ -144,7 +130,6 @@ function Main {
$isInCI = $env:APPVEYOR
if ($isInCI) {
- Pack-Nuget $p $v $o
Zip-Release $p $v $o
}
diff --git a/appveyor.yml b/appveyor.yml
index a676731b9..e476bd3b1 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,31 +1,32 @@
-version: 1.3.{build}
-image: Visual Studio 2017
-configuration: Release
-platform: Any CPU
+version: '0.9.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: AssemblyInfo.*
- assembly_version: '{version}'
- assembly_file_version: '{version}'
- assembly_informational_version: '{version}'
+ file: SolutionAssemblyInfo.cs
+ assembly_version: $(flowVersion)
+ assembly_file_version: $(flowVersion)
+ assembly_informational_version: $(flowVersion)
+
+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\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\Flow-Launcher-*.zip'
+ name: Zip
+- path: 'Output\Release\Flow.Launcher.Plugin.*.nupkg'
+ name: Plugin nupkg
\ No newline at end of file