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 @@ - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj b/Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj index 82fbb31d51b..c353fd48308 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,24 @@ false false - + + + 1.0.0 + 1.0.0-beta1 + 1.0.0 + 1.0.0 + Flow.Launcher.Plugin + true + snupkg + 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 full @@ -52,13 +69,11 @@ + - - 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 2dbf1a9d3c2..eb26fccf2a4 100644 --- a/Flow.Launcher.Test/Flow.Launcher.Test.csproj +++ b/Flow.Launcher.Test/Flow.Launcher.Test.csproj @@ -56,8 +56,4 @@ - - - - \ No newline at end of file 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/Flow.Launcher/Flow.Launcher.csproj b/Flow.Launcher/Flow.Launcher.csproj index 65b0e8ef42b..970bc8e37f6 100644 --- a/Flow.Launcher/Flow.Launcher.csproj +++ b/Flow.Launcher/Flow.Launcher.csproj @@ -74,10 +74,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - + 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 @@ - - - - \ 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 @@ - 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 @@ - - - - \ 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 @@ - - - - \ 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 @@ - - - - \ 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 @@ - - - - \ 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 @@ - - - - - + \ 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 @@ - - - - \ 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 @@ - - - - + \ 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 @@ - - - - \ 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 @@ - 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 @@ - - - - \ 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 @@ - - - - \ 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 @@ PreserveNewest - - - - \ No newline at end of file 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 @@ Flow Launcher - a launcher for windows - + 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 @@ - - - - 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 14faf82b1fe..624f4f50254 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" @@ -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 } diff --git a/appveyor.yml b/appveyor.yml index a676731b962..02027f83e36 100644 --- 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 \ No newline at end of file +- 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 \ No newline at end of file