mirror of
https://github.com/greenshot/greenshot
synced 2025-08-22 22:34:27 -07:00
Updated dotnet core 3.1 to 3.1.2, updated dependencies to fix an issue with selection windows when virtual desktops are used.
This commit is contained in:
parent
4d751691f9
commit
73af1afd1f
12 changed files with 27 additions and 30 deletions
|
@ -15,10 +15,10 @@ steps:
|
|||
- task: NuGetToolInstaller@1
|
||||
|
||||
- task: UseDotNet@2
|
||||
displayName: 'Use .NET Core sdk 3.1'
|
||||
displayName: 'Use .NET Core sdk 3.1.2'
|
||||
inputs:
|
||||
packageType: sdk
|
||||
version: 3.1.100
|
||||
version: 3.1.102
|
||||
|
||||
- task: NuGetCommand@2
|
||||
displayName: NuGet restore
|
||||
|
|
|
@ -21,6 +21,7 @@ using System.IO;
|
|||
using System.Text.RegularExpressions;
|
||||
using System.Threading.Tasks;
|
||||
using CliWrap;
|
||||
using CliWrap.Buffered;
|
||||
using Dapplo.Windows.Clipboard;
|
||||
using Greenshot.Addon.ExternalCommand.Configuration;
|
||||
using Greenshot.Addon.ExternalCommand.Entities;
|
||||
|
@ -76,11 +77,9 @@ namespace Greenshot.Addon.ExternalCommand
|
|||
|
||||
var fullPath = captureDetails.Filename ?? surface.SaveNamedTmpFile(CoreConfiguration, _externalCommandConfiguration);
|
||||
|
||||
var cli = new Cli(_externalCommandDefinition.Command);
|
||||
var arguments = string.Format(_externalCommandDefinition.Arguments, fullPath);
|
||||
// Execute
|
||||
cli.SetArguments(arguments);
|
||||
var output = await cli.ExecuteAsync().ConfigureAwait(true);
|
||||
var output = await Cli.Wrap(_externalCommandDefinition.Command)
|
||||
.WithArguments(string.Format(_externalCommandDefinition.Arguments, fullPath))
|
||||
.ExecuteBufferedAsync().Task.ConfigureAwait(false);
|
||||
|
||||
if (_externalCommandDefinition.CommandBehavior.HasFlag(CommandBehaviors.ParseOutputForUris))
|
||||
{
|
||||
|
|
|
@ -19,6 +19,6 @@
|
|||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="CliWrap" Version="2.5.0" />
|
||||
<PackageReference Include="CliWrap" Version="3.0.0" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Dapplo.Windows.Com" Version="0.11.14" />
|
||||
<PackageReference Include="Dapplo.Windows.Com" Version="0.11.15" />
|
||||
<PackageReference Include="Unofficial.Microsoft.mshtml" Version="7.0.3300" />
|
||||
</ItemGroup>
|
||||
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Dapplo.Jira" Version="0.9.8" />
|
||||
<PackageReference Include="DynamicData" Version="6.14.3" />
|
||||
<PackageReference Include="Dapplo.Jira" Version="0.9.19" />
|
||||
<PackageReference Include="DynamicData" Version="6.14.8" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
|
@ -16,19 +16,18 @@
|
|||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="2.1.7" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Metro" Version="2.1.7" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Toasts" Version="2.1.7" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="2.1.7" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="2.1.10" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Metro" Version="2.1.10" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Toasts" Version="2.1.10" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="2.1.10" />
|
||||
<PackageReference Include="Dapplo.HttpExtensions" Version="0.10.9" />
|
||||
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.10.9" />
|
||||
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.10.9" />
|
||||
<PackageReference Include="Dapplo.Windows" Version="0.11.14" />
|
||||
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.11.14" />
|
||||
<PackageReference Include="Dapplo.Windows.Dpi" Version="0.11.14" />
|
||||
<PackageReference Include="Dapplo.Windows.Icons" Version="0.11.14" />
|
||||
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.11.15" />
|
||||
<PackageReference Include="Dapplo.Windows.Dpi" Version="0.11.15" />
|
||||
<PackageReference Include="Dapplo.Windows.Icons" Version="0.11.15" />
|
||||
<PackageReference Include="gong-wpf-dragdrop" Version="2.2.0" />
|
||||
<PackageReference Include="MahApps.Metro.IconPacks" Version="3.2.0" />
|
||||
<PackageReference Include="MahApps.Metro.IconPacks" Version="3.3.0" />
|
||||
<PackageReference Include="Svg" Version="3.0.102" />
|
||||
</ItemGroup>
|
||||
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Dapplo.Windows.Icons" Version="0.11.14" />
|
||||
<PackageReference Include="Dapplo.Windows.Icons" Version="0.11.15" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
@ -8,8 +8,7 @@
|
|||
<ItemGroup>
|
||||
<PackageReference Include="Dapplo.Addons" Version="1.3.3" />
|
||||
<PackageReference Include="Dapplo.Log" Version="1.3.26" />
|
||||
<PackageReference Include="Dapplo.Windows" Version="0.11.14" />
|
||||
<PackageReference Include="Dapplo.Windows.Dpi" Version="0.11.14" />
|
||||
<PackageReference Include="Dapplo.Windows.Dpi" Version="0.11.15" />
|
||||
<PackageReference Include="Svg" Version="3.0.102" />
|
||||
<PackageReference Include="System.Memory" Version="4.5.3" />
|
||||
</ItemGroup>
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
<ItemGroup>
|
||||
<PackageReference Include="BenchmarkDotNet" Version="0.12.0" />
|
||||
<PackageReference Include="CommandLineParser" Version="2.7.82" />
|
||||
<PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="3.1.1" />
|
||||
<PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="3.1.2" />
|
||||
<PackageReference Include="SharpAvi" Version="2.1.2" />
|
||||
<PackageReference Include="System.Memory" Version="4.5.3" />
|
||||
</ItemGroup>
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
<PackageReference Include="BenchmarkDotNet" Version="0.12.0" />
|
||||
<PackageReference Include="CommandLineParser" Version="2.7.82" />
|
||||
<PackageReference Include="Dapplo.Log.XUnit" Version="1.3.26" />
|
||||
<PackageReference Include="Dapplo.Windows" Version="0.11.14" />
|
||||
<PackageReference Include="Dapplo.Windows" Version="0.11.15" />
|
||||
<PackageReference Include="xunit" Version="2.4.1" />
|
||||
<PackageReference Include="xunit.abstractions" Version="2.0.3" />
|
||||
<PackageReference Include="xunit.analyzers" Version="0.10.0" />
|
||||
|
|
|
@ -35,15 +35,15 @@
|
|||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="CommandLineParser" Version="2.7.82" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Dapp" Version="2.1.7" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Dapp" Version="2.1.10" />
|
||||
<PackageReference Include="Dapplo.Log.LogFile" Version="1.3.26" />
|
||||
<PackageReference Include="Dapplo.Log.Loggers" Version="1.3.26" />
|
||||
<PackageReference Include="Dapplo.Windows.Multimedia" Version="0.11.14" />
|
||||
<PackageReference Include="Dapplo.Windows.Multimedia" Version="0.11.15" />
|
||||
<PackageReference Include="gong-wpf-dragdrop" Version="2.2.0" />
|
||||
<PackageReference Include="sqlite-net-pcl" Version="1.6.292" />
|
||||
<PackageReference Include="Svg" Version="3.0.102" />
|
||||
<PackageReference Include="Microsoft.AppCenter.Analytics" Version="2.6.4" />
|
||||
<PackageReference Include="Microsoft.AppCenter.Crashes" Version="2.6.4" />
|
||||
<PackageReference Include="Microsoft.AppCenter.Analytics" Version="3.0.0" />
|
||||
<PackageReference Include="Microsoft.AppCenter.Crashes" Version="3.0.0" />
|
||||
<TrimmerRootAssembly Include="System.Diagnostics.Debug" />
|
||||
</ItemGroup>
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"sdk": {
|
||||
"version": "3.1.100"
|
||||
"version": "3.1.102"
|
||||
}
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue