Merge branch 'dev' into add_handling_typereflectionerror

2026-03-11 08:54:32 +00:00 · 2020-05-21 17:20:38 +03:00 · 2020-05-21 17:20:38 +03:00 · ba163974bb
commit ba163974bb
parent 3a472a34e4 e475d2f691
23 changed files with 67 additions and 139 deletions
--- 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>
--- 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>
@ -12,7 +12,24 @@
    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
  </PropertyGroup>
-  
+
+  <PropertyGroup>
+    <Version>1.0.0</Version>
+    <PackageVersion>1.0.0-beta1</PackageVersion>
+    <AssemblyVersion>1.0.0</AssemblyVersion>
+    <FileVersion>1.0.0</FileVersion>
+    <PackageId>Flow.Launcher.Plugin</PackageId>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    <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>
+    <PackageTags>flowlauncher</PackageTags>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+  </PropertyGroup>
+
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <DebugSymbols>true</DebugSymbols>
    <DebugType>full</DebugType>
@ -52,13 +69,11 @@
  </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" />
-    <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>

--- 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>
--- 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}"
--- a/Flow.Launcher/Flow.Launcher.csproj
+++ b/Flow.Launcher/Flow.Launcher.csproj
@ -74,10 +74,7 @@
      <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>
-    </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" />
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- a/Scripts/flowlauncher.plugin.nuspec
+++ b/Scripts/flowlauncher.plugin.nuspec
@ -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>
--- 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"
@ -57,28 +57,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 +73,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 +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
@ -133,7 +120,7 @@ function Main {
        
        if(IsDotNetCoreAppSelfContainedPublishEvent) {
            FixPublishLastWriteDateTimeError $p
-		}
+        }
        
        Delete-Unused $p $config
        $o = "$p\Output\Packages"
@ -144,7 +131,6 @@ function Main {
    
        $isInCI = $env:APPVEYOR
        if ($isInCI) {
-            Pack-Nuget $p $v $o
            Zip-Release $p $v $o
        }

--- a/appveyor.yml
+++ b/appveyor.yml
@ -1,31 +1,34 @@
-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
+- 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'
+  name: Plugin snupkg