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

Dependency updates

Browse source
This commit is contained in:
Robin Krom 2021-10-04 20:38:45 +02:00
commit a7c3b8579b
No known key found for this signature in database
GPG key ID: BCC01364F1371490
8 changed files with 26 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Directory.Build.props
View file

@ -47,7 +47,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.4.205"> <PackageReference Include="Nerdbank.GitVersioning" Version="3.4.240">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference> </PackageReference>

5
src/Greenshot.Base/Core/CoreConfiguration.cs
View file

@ -559,11 +559,6 @@ namespace Greenshot.Base.Core
{ {
ExcludeDestinations.Remove("OneNote"); ExcludeDestinations.Remove("OneNote");
} }
else
{
// TODO: Remove with the release
ExcludeDestinations.Remove("OneNote");
}
} }
if (OutputDestinations == null) if (OutputDestinations == null)

6
src/Greenshot.Base/Greenshot.Base.csproj
View file

@ -5,10 +5,10 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="1.0.10" /> <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="1.0.11" />
<PackageReference Include="HtmlAgilityPack" Version="1.11.33" /> <PackageReference Include="HtmlAgilityPack" Version="1.11.37" />
<PackageReference Include="log4net" version="2.0.12" /> <PackageReference Include="log4net" version="2.0.12" />
<PackageReference Include="Svg" Version="3.2.3" /> <PackageReference Include="Svg" Version="3.3.0" />
<Reference Include="Accessibility" /> <Reference Include="Accessibility" />
<Reference Include="CustomMarshalers" /> <Reference Include="CustomMarshalers" />
</ItemGroup> </ItemGroup>

2
src/Greenshot.Base/IniFile/IniConfig.cs
View file

@ -137,7 +137,7 @@ namespace Greenshot.Base.IniFile
{ {
AssemblyProductAttribute[] assemblyProductAttributes = AssemblyProductAttribute[] assemblyProductAttributes =
Assembly.GetEntryAssembly().GetCustomAttributes(typeof(AssemblyProductAttribute), false) as AssemblyProductAttribute[]; Assembly.GetEntryAssembly().GetCustomAttributes(typeof(AssemblyProductAttribute), false) as AssemblyProductAttribute[];
if (assemblyProductAttributes != null && assemblyProductAttributes.Length > 0) if (assemblyProductAttributes is { Length: > 0 })
{ {
string productName = assemblyProductAttributes[0].Product; string productName = assemblyProductAttributes[0].Product;
Log.InfoFormat("Using ProductName {0}", productName); Log.InfoFormat("Using ProductName {0}", productName);

2
src/Greenshot.Plugin.Win10/Greenshot.Plugin.Win10.csproj
View file

@ -6,7 +6,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Toolkit.Uwp.Notifications" version="7.0.2" /> <PackageReference Include="Microsoft.Toolkit.Uwp.Notifications" version="7.1.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Greenshot.Base\Greenshot.Base.csproj" /> <ProjectReference Include="..\Greenshot.Base\Greenshot.Base.csproj" />

4
src/Greenshot/Forms/MainForm.Designer.cs generated
View file

@ -223,7 +223,7 @@ namespace Greenshot.Forms {
this.contextmenu_help.Image = ((System.Drawing.Image)(resources.GetObject("contextmenu_help.Image"))); this.contextmenu_help.Image = ((System.Drawing.Image)(resources.GetObject("contextmenu_help.Image")));
this.contextmenu_help.Name = "contextmenu_help"; this.contextmenu_help.Name = "contextmenu_help";
this.contextmenu_help.Size = new System.Drawing.Size(170, 22); this.contextmenu_help.Size = new System.Drawing.Size(170, 22);
this.contextmenu_help.Click += new System.EventHandler(this.Contextmenu_helpClick); this.contextmenu_help.Click += new System.EventHandler(this.Contextmenu_HelpClick);
// //
// contextmenu_donate // contextmenu_donate
// //
@ -248,7 +248,7 @@ namespace Greenshot.Forms {
this.contextmenu_exit.Image = ((System.Drawing.Image)(resources.GetObject("contextmenu_exit.Image"))); this.contextmenu_exit.Image = ((System.Drawing.Image)(resources.GetObject("contextmenu_exit.Image")));
this.contextmenu_exit.Name = "contextmenu_exit"; this.contextmenu_exit.Name = "contextmenu_exit";
this.contextmenu_exit.Size = new System.Drawing.Size(170, 22); this.contextmenu_exit.Size = new System.Drawing.Size(170, 22);
this.contextmenu_exit.Click += new System.EventHandler(this.Contextmenu_exitClick); this.contextmenu_exit.Click += new System.EventHandler(this.Contextmenu_ExitClick);
// //
// notifyIcon // notifyIcon
// //

22
src/Greenshot/Forms/MainForm.cs
View file

@ -1122,12 +1122,18 @@ namespace Greenshot.Forms
Rectangle allScreensBounds = WindowCapture.GetScreenBounds(); Rectangle allScreensBounds = WindowCapture.GetScreenBounds();
var captureScreenItem = new ToolStripMenuItem(Language.GetString(LangKey.contextmenu_capturefullscreen_all)); var captureScreenItem = new ToolStripMenuItem(Language.GetString(LangKey.contextmenu_capturefullscreen_all));
captureScreenItem.Click += delegate { BeginInvoke((MethodInvoker) delegate { CaptureHelper.CaptureFullscreen(false, ScreenCaptureMode.FullScreen); }); }; captureScreenItem.Click += delegate {
BeginInvoke((MethodInvoker) delegate {
CaptureHelper.CaptureFullscreen(false, ScreenCaptureMode.FullScreen);
});
};
captureScreenMenuItem.DropDownItems.Add(captureScreenItem); captureScreenMenuItem.DropDownItems.Add(captureScreenItem);
foreach (Screen screen in Screen.AllScreens) foreach (Screen screen in Screen.AllScreens)
{ {
Screen screenToCapture = screen; Screen screenToCapture = screen;
string deviceAlignment = string.Empty; string deviceAlignment = screenToCapture.DeviceName;
if (screen.Bounds.Top == allScreensBounds.Top && screen.Bounds.Bottom != allScreensBounds.Bottom) if (screen.Bounds.Top == allScreensBounds.Top && screen.Bounds.Bottom != allScreensBounds.Bottom)
{ {
deviceAlignment += " " + Language.GetString(LangKey.contextmenu_capturefullscreen_top); deviceAlignment += " " + Language.GetString(LangKey.contextmenu_capturefullscreen_top);
@ -1147,7 +1153,13 @@ namespace Greenshot.Forms
} }
captureScreenItem = new ToolStripMenuItem(deviceAlignment); captureScreenItem = new ToolStripMenuItem(deviceAlignment);
captureScreenItem.Click += delegate { BeginInvoke((MethodInvoker) delegate { CaptureHelper.CaptureRegion(false, screenToCapture.Bounds); }); }; captureScreenItem.Click += delegate
{
BeginInvoke((MethodInvoker) delegate
{
CaptureHelper.CaptureRegion(false, screenToCapture.Bounds);
});
};
captureScreenMenuItem.DropDownItems.Add(captureScreenItem); captureScreenMenuItem.DropDownItems.Add(captureScreenItem);
} }
} }
@ -1426,7 +1438,7 @@ namespace Greenshot.Forms
/// </summary> /// </summary>
/// <param name="sender"></param> /// <param name="sender"></param>
/// <param name="e"></param> /// <param name="e"></param>
private void Contextmenu_helpClick(object sender, EventArgs e) private void Contextmenu_HelpClick(object sender, EventArgs e)
{ {
HelpFileLoader.LoadHelp(); HelpFileLoader.LoadHelp();
} }
@ -1436,7 +1448,7 @@ namespace Greenshot.Forms
/// </summary> /// </summary>
/// <param name="sender"></param> /// <param name="sender"></param>
/// <param name="e"></param> /// <param name="e"></param>
private void Contextmenu_exitClick(object sender, EventArgs e) private void Contextmenu_ExitClick(object sender, EventArgs e)
{ {
Exit(); Exit();
} }

2
src/Greenshot/Greenshot.csproj
View file

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