From 07be7e2beaab8b4e9ce97f910fe62c9f8cc9f3ff Mon Sep 17 00:00:00 2001 From: Ioannis G Date: Fri, 1 May 2020 12:42:32 +0300 Subject: [PATCH 1/5] bump PropertyChanged.Fody to 3.2.8 This outdated dependency causes `dotnet build`, `dotnet pack` etc to fail --- Flow.Launcher.Core/Flow.Launcher.Core.csproj | 2 +- Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj | 4 ++-- Flow.Launcher/Flow.Launcher.csproj | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Flow.Launcher.Core/Flow.Launcher.Core.csproj b/Flow.Launcher.Core/Flow.Launcher.Core.csproj index d5fc55da8..5b471cabd 100644 --- a/Flow.Launcher.Core/Flow.Launcher.Core.csproj +++ b/Flow.Launcher.Core/Flow.Launcher.Core.csproj @@ -55,7 +55,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 0c6df2b59..82fbb31d5 100644 --- a/Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj +++ b/Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj @@ -1,4 +1,4 @@ - + netcoreapp3.1 @@ -55,7 +55,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Flow.Launcher/Flow.Launcher.csproj b/Flow.Launcher/Flow.Launcher.csproj index 4baeb69e4..f2f6afbd1 100644 --- a/Flow.Launcher/Flow.Launcher.csproj +++ b/Flow.Launcher/Flow.Launcher.csproj @@ -64,7 +64,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive From 1dcaf62e2700419014c5e1cebd8c9763fb0da4b1 Mon Sep 17 00:00:00 2001 From: Ioannis G Date: Sat, 2 May 2020 14:13:20 +0300 Subject: [PATCH 2/5] add dependency to FSharp.Core ensure there are no runtime errors when FSharp.Core cannot be located: * add reference to FSharp.Core 4.7.1 in Flow.Launcher.Core * update FSharp.Core to 4.7.1 in HelloWorldFSharp --- Flow.Launcher.Core/Flow.Launcher.Core.csproj | 1 + Plugins/HelloWorldFSharp/HelloWorldFSharp.fsproj | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/Flow.Launcher.Core/Flow.Launcher.Core.csproj b/Flow.Launcher.Core/Flow.Launcher.Core.csproj index 5b471cabd..cd939e401 100644 --- a/Flow.Launcher.Core/Flow.Launcher.Core.csproj +++ b/Flow.Launcher.Core/Flow.Launcher.Core.csproj @@ -52,6 +52,7 @@ + diff --git a/Plugins/HelloWorldFSharp/HelloWorldFSharp.fsproj b/Plugins/HelloWorldFSharp/HelloWorldFSharp.fsproj index 79f28e7cb..d688ab6a9 100644 --- a/Plugins/HelloWorldFSharp/HelloWorldFSharp.fsproj +++ b/Plugins/HelloWorldFSharp/HelloWorldFSharp.fsproj @@ -29,4 +29,8 @@ + + + + \ No newline at end of file From 6db1f908c3f7b58414192e48d871f52607ef018d Mon Sep 17 00:00:00 2001 From: Ioannis G Date: Sat, 2 May 2020 14:23:33 +0300 Subject: [PATCH 3/5] update dependencies in Flow.Launcher.Test * Microsoft.CodeCoverage 16.4.0 -> 16.6.1 * Microsoft.NET.Test.Sdk 16.4.0 -> 16.6.1 * Microsoft.TestPlatform.ObjectModel 16.4.0 -> 16.6.1 * Microsoft.TestPlatform.TestHost 16.4.0 -> 16.6.1 * Moq 4.13.1 -> 4.14.1 * NUnit3TestAdapter 3.15.1 -> 3.16.1 --- Flow.Launcher.Test/Flow.Launcher.Test.csproj | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Flow.Launcher.Test/Flow.Launcher.Test.csproj b/Flow.Launcher.Test/Flow.Launcher.Test.csproj index 2f54813e1..daeeb6bdd 100644 --- a/Flow.Launcher.Test/Flow.Launcher.Test.csproj +++ b/Flow.Launcher.Test/Flow.Launcher.Test.csproj @@ -46,10 +46,13 @@ - + - - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + From 0cedc8b8f240dd309d875bd80f38267ea3819aae Mon Sep 17 00:00:00 2001 From: Ioannis G Date: Sat, 2 May 2020 14:28:33 +0300 Subject: [PATCH 4/5] bump NLog dependency in Program plugin from 4.7.0-rc1 to 4.7.0 --- .../Flow.Launcher.Plugin.Program.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 4bc5ba8cd..6208881d4 100644 --- a/Plugins/Flow.Launcher.Plugin.Program/Flow.Launcher.Plugin.Program.csproj +++ b/Plugins/Flow.Launcher.Plugin.Program/Flow.Launcher.Plugin.Program.csproj @@ -110,7 +110,7 @@ - + From ef95913abad64b6d69b9550f994ad7eebf542c40 Mon Sep 17 00:00:00 2001 From: Ioannis G Date: Sat, 2 May 2020 19:52:41 +0300 Subject: [PATCH 5/5] update projects with SatelliteResourceLanguages Without this property set, the output folder is populated with multiple culture-specific versions of `Fsharp.Core.resources.dll` --- Flow.Launcher.Core/Flow.Launcher.Core.csproj | 1 + Flow.Launcher.Test/Flow.Launcher.Test.csproj | 1 + Flow.Launcher/Flow.Launcher.csproj | 3 ++- .../Flow.Launcher.Plugin.WebSearch.csproj | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Flow.Launcher.Core/Flow.Launcher.Core.csproj b/Flow.Launcher.Core/Flow.Launcher.Core.csproj index cd939e401..fa3f10fa7 100644 --- a/Flow.Launcher.Core/Flow.Launcher.Core.csproj +++ b/Flow.Launcher.Core/Flow.Launcher.Core.csproj @@ -11,6 +11,7 @@ false false false + en diff --git a/Flow.Launcher.Test/Flow.Launcher.Test.csproj b/Flow.Launcher.Test/Flow.Launcher.Test.csproj index daeeb6bdd..2dbf1a9d3 100644 --- a/Flow.Launcher.Test/Flow.Launcher.Test.csproj +++ b/Flow.Launcher.Test/Flow.Launcher.Test.csproj @@ -10,6 +10,7 @@ false + en diff --git a/Flow.Launcher/Flow.Launcher.csproj b/Flow.Launcher/Flow.Launcher.csproj index f2f6afbd1..7049d9c4d 100644 --- a/Flow.Launcher/Flow.Launcher.csproj +++ b/Flow.Launcher/Flow.Launcher.csproj @@ -1,4 +1,4 @@ - + WinExe @@ -11,6 +11,7 @@ false false false + en 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 21695ffcf..d159e9bc0 100644 --- a/Plugins/Flow.Launcher.Plugin.WebSearch/Flow.Launcher.Plugin.WebSearch.csproj +++ b/Plugins/Flow.Launcher.Plugin.WebSearch/Flow.Launcher.Plugin.WebSearch.csproj @@ -8,6 +8,7 @@ Flow.Launcher.Plugin.WebSearch false false + en