github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-22 14:24:43 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'remotes/origin/release/1.3' into feature/imgur_via_greenshotweb

Browse source
This commit is contained in:
Robin Krom 2021-01-08 22:32:27 +01:00
commit 903fdc1a8a
6 changed files with 42 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Directory.Build.props
View file

@ -8,7 +8,7 @@
<PackageProjectUrl>https://github.com/greenshot/greenshot</PackageProjectUrl> <PackageProjectUrl>https://github.com/greenshot/greenshot</PackageProjectUrl>
<PackageLicenseUrl>https://www.gnu.org/licenses/gpl.html</PackageLicenseUrl> <PackageLicenseUrl>https://www.gnu.org/licenses/gpl.html</PackageLicenseUrl>
<PackageLicenseExpression>GPL</PackageLicenseExpression> <PackageLicenseExpression>GPL</PackageLicenseExpression>
<LangVersion>latest</LangVersion> <LangVersion>9</LangVersion>
<UseWPF>true</UseWPF> <UseWPF>true</UseWPF>
<UseWindowsForms>true</UseWindowsForms> <UseWindowsForms>true</UseWindowsForms>
<RuntimeIdentifiers>win10-x64;win10-x86;win-x64;win-x86</RuntimeIdentifiers> <RuntimeIdentifiers>win10-x64;win10-x86;win-x64;win-x86</RuntimeIdentifiers>
@ -56,7 +56,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup Condition="!$(MSBuildProjectName.Contains('Tests')) And $(MSBuildProjectName.StartsWith('Greenshot'))"> <ItemGroup Condition="!$(MSBuildProjectName.Contains('Tests')) And $(MSBuildProjectName.StartsWith('Greenshot'))">
<PackageReference Include="Nerdbank.GitVersioning" Version="3.1.91"> <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference> </PackageReference>
@ -102,7 +102,7 @@
</Tokens> </Tokens>
</ItemGroup> </ItemGroup>
<ItemGroup Condition="Exists('$(ProjectDir)$(ProjectName).Credentials.template')"> <ItemGroup>
<PackageReference Include="MSBuildTasks" Version="1.5.0.235" GeneratePathProperty="true"/> <PackageReference Include="MSBuildTasks" Version="1.5.0.235" GeneratePathProperty="true"/>
</ItemGroup> </ItemGroup>

2
Greenshot/Greenshot.csproj
View file

@ -17,7 +17,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Tools.InnoSetup" version="6.0.5" GeneratePathProperty="true" /> <PackageReference Include="Tools.InnoSetup" version="6.1.2" GeneratePathProperty="true" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

3
GreenshotJiraPlugin/GreenshotJiraPlugin.csproj
View file

@ -12,6 +12,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\GreenshotPlugin\GreenshotPlugin.csproj" /> <ProjectReference Include="..\GreenshotPlugin\GreenshotPlugin.csproj" />
<PackageReference Include="Dapplo.Jira" version="0.9.28" /> <PackageReference Include="Dapplo.Jira" version="1.1.21" />
<PackageReference Include="Dapplo.Jira.SvgWinForms" Version="1.1.21" />
</ItemGroup> </ItemGroup>
</Project> </Project>

4
GreenshotJiraPlugin/JiraConnector.cs
View file

@ -29,8 +29,8 @@ using System.Windows.Forms;
using Dapplo.HttpExtensions; using Dapplo.HttpExtensions;
using Dapplo.HttpExtensions.Extensions; using Dapplo.HttpExtensions.Extensions;
using Dapplo.Jira; using Dapplo.Jira;
using Dapplo.Jira.Converters;
using Dapplo.Jira.Entities; using Dapplo.Jira.Entities;
using Dapplo.Jira.SvgWinForms.Converters;
using GreenshotPlugin.Core; using GreenshotPlugin.Core;
using GreenshotPlugin.IniFile; using GreenshotPlugin.IniFile;
@ -241,7 +241,7 @@ namespace GreenshotJiraPlugin {
/// <param name="body">text</param> /// <param name="body">text</param>
/// <param name="visibility">the visibility role</param> /// <param name="visibility">the visibility role</param>
/// <param name="cancellationToken">CancellationToken</param> /// <param name="cancellationToken">CancellationToken</param>
public async Task AddCommentAsync(string issueKey, string body, string visibility = null, CancellationToken cancellationToken = default) public async Task AddCommentAsync(string issueKey, string body, Visibility visibility = null, CancellationToken cancellationToken = default)
{ {
await CheckCredentialsAsync(cancellationToken); await CheckCredentialsAsync(cancellationToken);
await _jiraClient.Issue.AddCommentAsync(issueKey, body, visibility, cancellationToken).ConfigureAwait(false); await _jiraClient.Issue.AddCommentAsync(issueKey, body, visibility, cancellationToken).ConfigureAwait(false);

11
GreenshotPlugin/Core/ImageHelper.cs
View file

@ -1374,6 +1374,10 @@ namespace GreenshotPlugin.Core {
// Make sure both images have the same resolution // Make sure both images have the same resolution
newImage.SetResolution(sourceImage.HorizontalResolution, sourceImage.VerticalResolution); newImage.SetResolution(sourceImage.HorizontalResolution, sourceImage.VerticalResolution);
} }
// In WINE someone getting the PropertyItems doesn't work
try
{
// Clone property items (EXIF information etc) // Clone property items (EXIF information etc)
foreach (var propertyItem in sourceImage.PropertyItems) foreach (var propertyItem in sourceImage.PropertyItems)
{ {
@ -1381,11 +1385,16 @@ namespace GreenshotPlugin.Core {
{ {
newImage.SetPropertyItem(propertyItem); newImage.SetPropertyItem(propertyItem);
} }
catch (Exception innerEx)
{
Log.Warn("Problem cloning a propertyItem.", innerEx);
}
}
}
catch (Exception ex) catch (Exception ex)
{ {
Log.Warn("Problem cloning a propertyItem.", ex); Log.Warn("Problem cloning a propertyItem.", ex);
} }
}
return newImage; return newImage;
} }

2
GreenshotPlugin/GreenshotPlugin.csproj
View file

@ -14,7 +14,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="1.0.3" /> <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="1.0.3" />
<PackageReference Include="log4net" version="2.0.8" /> <PackageReference Include="log4net" version="2.0.12" />
<PackageReference Include="Svg" Version="3.1.1" /> <PackageReference Include="Svg" Version="3.1.1" />
<Reference Include="Accessibility" /> <Reference Include="Accessibility" />
<Reference Include="CustomMarshalers" /> <Reference Include="CustomMarshalers" />