github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-23 06:36:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Somehow there are some issues with adding package which have sub dependencies, they are not installed.

Browse source
This commit is contained in:
Robin 2018-09-29 21:01:17 +02:00
commit 52ff444819
9 changed files with 60 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/Greenshot.Addon.InternetExplorer/Greenshot.Addon.InternetExplorer.csproj
View file

@ -12,13 +12,14 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Dapplo.Ini"> <PackageReference Include="Dapplo.Ini">
<Version>0.5.31</Version> <Version>0.6.2</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Dapplo.Log" Version="1.3.11" />
<PackageReference Include="Dapplo.Windows"> <PackageReference Include="Dapplo.Windows">
<Version>0.5.112</Version> <Version>0.6.6</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Dapplo.Windows.Com"> <PackageReference Include="Dapplo.Windows.Com">
<Version>0.5.112</Version> <Version>0.6.6</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Unofficial.Microsoft.mshtml" Version="7.0.3300" /> <PackageReference Include="Unofficial.Microsoft.mshtml" Version="7.0.3300" />
</ItemGroup> </ItemGroup>

2
src/Greenshot.Addon.InternetExplorer/IECaptureHelper.cs
View file

@ -387,7 +387,7 @@ namespace Greenshot.Addon.InternetExplorer
{ {
if (windowToCapture == null) if (windowToCapture == null)
{ {
windowToCapture = InteropWindowQuery.GetActiveWindow(); windowToCapture = InteropWindowQuery.GetForegroundWindow();
} }
// Show backgroundform after retrieving the active window.. // Show backgroundform after retrieving the active window..
var backgroundForm = new BackgroundForm("Internet Explorer", "Please wait while the page in Internet Explorer is captured..."); var backgroundForm = new BackgroundForm("Internet Explorer", "Please wait while the page in Internet Explorer is captured...");

11
src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj
View file

@ -30,19 +30,20 @@
<Version>2.0.4</Version> <Version>2.0.4</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Dapplo.CaliburnMicro.Configuration"> <PackageReference Include="Dapplo.CaliburnMicro.Configuration">
<Version>1.0.75</Version> <Version>1.0.83</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Dapplo.CaliburnMicro.Translations"> <PackageReference Include="Dapplo.CaliburnMicro.Translations">
<Version>1.0.75</Version> <Version>1.0.83</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Dapplo.HttpExtensions"> <PackageReference Include="Dapplo.HttpExtensions">
<Version>0.8.46</Version> <Version>0.9.4</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Dapplo.Log" Version="1.3.11" />
<PackageReference Include="Dapplo.Windows.Clipboard"> <PackageReference Include="Dapplo.Windows.Clipboard">
<Version>0.5.112</Version> <Version>0.6.6</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Dapplo.Windows.Icons"> <PackageReference Include="Dapplo.Windows.Icons">
<Version>0.5.112</Version> <Version>0.6.6</Version>
</PackageReference> </PackageReference>
</ItemGroup> </ItemGroup>
</Project> </Project>

26
src/Greenshot.Addons/Greenshot.Addons.csproj
View file

@ -14,30 +14,41 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Autofac" Version="4.8.1" />
<PackageReference Include="Caliburn.Micro" Version="3.2.0" />
<PackageReference Include="CommonServiceLocator"> <PackageReference Include="CommonServiceLocator">
<Version>2.0.4</Version> <Version>2.0.4</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Dapplo.Addons" Version="1.1.3" />
<PackageReference Include="Dapplo.Addons.Config" Version="1.1.3" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration"> <PackageReference Include="Dapplo.CaliburnMicro.Configuration">
<Version>1.0.75</Version> <Version>1.0.83</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Dapplo.CaliburnMicro.Toasts"> <PackageReference Include="Dapplo.CaliburnMicro.Toasts">
<Version>1.0.75</Version> <Version>1.0.83</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Dapplo.CaliburnMicro.Translations"> <PackageReference Include="Dapplo.CaliburnMicro.Translations">
<Version>1.0.75</Version> <Version>1.0.83</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Dapplo.HttpExtensions.JsonNet"> <PackageReference Include="Dapplo.HttpExtensions.JsonNet">
<Version>0.8.46</Version> <Version>0.9.4</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Dapplo.HttpExtensions.OAuth"> <PackageReference Include="Dapplo.HttpExtensions.OAuth">
<Version>0.8.46</Version> <Version>0.9.4</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Dapplo.Ini" Version="0.6.2" />
<PackageReference Include="Dapplo.InterfaceImpl" Version="0.3.2" />
<PackageReference Include="Dapplo.Language" Version="0.6.2" />
<PackageReference Include="Dapplo.Log" Version="1.3.11" />
<PackageReference Include="Dapplo.Utils" Version="1.1.3" />
<PackageReference Include="Dapplo.Windows.Clipboard"> <PackageReference Include="Dapplo.Windows.Clipboard">
<Version>0.5.112</Version> <Version>0.6.6</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Dapplo.Windows.Icons"> <PackageReference Include="Dapplo.Windows.Icons">
<Version>0.5.112</Version> <Version>0.6.6</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Dapplo.Windows.Kernel32" Version="0.6.6" />
<PackageReference Include="Dapplo.Windows.Messages" Version="0.6.6" />
<PackageReference Include="MahApps.Metro.IconPacks"> <PackageReference Include="MahApps.Metro.IconPacks">
<Version>2.3.0</Version> <Version>2.3.0</Version>
</PackageReference> </PackageReference>
@ -45,6 +56,7 @@
<Version>2.3.0</Version> <Version>2.3.0</Version>
</PackageReference> </PackageReference>
<PackageReference Include="System.ComponentModel.Composition" Version="4.5.0" /> <PackageReference Include="System.ComponentModel.Composition" Version="4.5.0" />
<PackageReference Include="System.Reactive" Version="4.1.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

7
src/Greenshot.Core/Greenshot.Core.csproj
View file

@ -11,9 +11,14 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Dapplo.Log" Version="1.3.11" />
<PackageReference Include="Dapplo.Windows" Version="0.6.6" />
<PackageReference Include="Dapplo.Windows.DesktopWindowsManager" Version="0.6.6" />
<PackageReference Include="Dapplo.Windows.Gdi32" Version="0.6.6" />
<PackageReference Include="Dapplo.Windows.Icons"> <PackageReference Include="Dapplo.Windows.Icons">
<Version>0.5.112</Version> <Version>0.6.6</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Dapplo.Windows.User32" Version="0.6.6" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
src/Greenshot.Core/Sources/DwmWindowSource.cs
View file

@ -43,7 +43,7 @@ namespace Greenshot.Core.Sources
public DwmWindowSource(ICaptureConfiguration captureConfiguration, Func<IInteropWindow> retrieveWindowFunc = null) public DwmWindowSource(ICaptureConfiguration captureConfiguration, Func<IInteropWindow> retrieveWindowFunc = null)
{ {
_captureConfiguration = captureConfiguration; _captureConfiguration = captureConfiguration;
_retrieveWindowFunc = retrieveWindowFunc ?? InteropWindowQuery.GetActiveWindow; _retrieveWindowFunc = retrieveWindowFunc ?? InteropWindowQuery.GetForegroundWindow;
} }
public ValueTask<ICaptureElement<BitmapSource>> Import(CancellationToken cancellationToken = default) public ValueTask<ICaptureElement<BitmapSource>> Import(CancellationToken cancellationToken = default)

5
src/Greenshot.Gfx/Greenshot.Gfx.csproj
View file

@ -15,8 +15,11 @@
<Version>2.0.4</Version> <Version>2.0.4</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Dapplo.CaliburnMicro.Translations"> <PackageReference Include="Dapplo.CaliburnMicro.Translations">
<Version>1.0.75</Version> <Version>1.0.83</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Dapplo.Log" Version="1.3.11" />
<PackageReference Include="Dapplo.Windows.Common" Version="0.6.6" />
<PackageReference Include="Dapplo.Windows.Dpi" Version="0.6.6" />
<PackageReference Include="Svg"> <PackageReference Include="Svg">
<Version>2.3.0</Version> <Version>2.3.0</Version>
</PackageReference> </PackageReference>

29
src/Greenshot/Greenshot.csproj
View file

@ -29,41 +29,45 @@
<PackageReference Include="CommonServiceLocator"> <PackageReference Include="CommonServiceLocator">
<Version>2.0.4</Version> <Version>2.0.4</Version>
</PackageReference> </PackageReference>
<PackageReference Include="ControlzEx" Version="3.0.2.4" />
<PackageReference Include="Dapplo.Addons.Bootstrapper" Version="1.1.3" />
<PackageReference Include="Dapplo.Addons.Config"> <PackageReference Include="Dapplo.Addons.Config">
<Version>1.0.79</Version> <Version>1.1.3</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Dapplo.CaliburnMicro.Configuration"> <PackageReference Include="Dapplo.CaliburnMicro.Configuration">
<Version>1.0.75</Version> <Version>1.0.83</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Dapplo.CaliburnMicro.Metro"> <PackageReference Include="Dapplo.CaliburnMicro.Metro">
<Version>1.0.75</Version> <Version>1.0.83</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Dapplo.CaliburnMicro.Toasts"> <PackageReference Include="Dapplo.CaliburnMicro.Toasts">
<Version>1.0.75</Version> <Version>1.0.83</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Dapplo.CaliburnMicro.Translations"> <PackageReference Include="Dapplo.CaliburnMicro.Translations">
<Version>1.0.75</Version> <Version>1.0.83</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Dapplo.HttpExtensions.JsonNet"> <PackageReference Include="Dapplo.HttpExtensions.JsonNet">
<Version>0.8.46</Version> <Version>0.9.4</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Dapplo.HttpExtensions.OAuth"> <PackageReference Include="Dapplo.HttpExtensions.OAuth">
<Version>0.8.46</Version> <Version>0.9.4</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Dapplo.Log" Version="1.3.11" />
<PackageReference Include="Dapplo.Log.LogFile"> <PackageReference Include="Dapplo.Log.LogFile">
<Version>1.2.1</Version> <Version>1.3.11</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Dapplo.Log.Loggers"> <PackageReference Include="Dapplo.Log.Loggers">
<Version>1.2.1</Version> <Version>1.3.11</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Dapplo.Windows.Clipboard"> <PackageReference Include="Dapplo.Windows.Clipboard">
<Version>0.5.112</Version> <Version>0.6.6</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Dapplo.Windows.Icons"> <PackageReference Include="Dapplo.Windows.Icons">
<Version>0.5.112</Version> <Version>0.6.6</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Dapplo.Windows.Input" Version="0.6.6" />
<PackageReference Include="Dapplo.Windows.Multimedia"> <PackageReference Include="Dapplo.Windows.Multimedia">
<Version>0.5.112</Version> <Version>0.6.6</Version>
</PackageReference> </PackageReference>
<PackageReference Include="gong-wpf-dragdrop"> <PackageReference Include="gong-wpf-dragdrop">
<Version>1.1.0</Version> <Version>1.1.0</Version>
@ -113,6 +117,7 @@
<PackageReference Include="System.Runtime.Extensions"> <PackageReference Include="System.Runtime.Extensions">
<Version>4.3.0</Version> <Version>4.3.0</Version>
</PackageReference> </PackageReference>
<PackageReference Include="ToastNotifications" Version="2.3.4" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

4
src/Greenshot/Helpers/CaptureHelper.cs
View file

@ -678,7 +678,7 @@ namespace Greenshot.Helpers
} }
else else
{ {
SelectedCaptureWindow = InteropWindowQuery.GetActiveWindow(); SelectedCaptureWindow = InteropWindowQuery.GetForegroundWindow();
if (SelectedCaptureWindow != null) if (SelectedCaptureWindow != null)
{ {
if (Log.IsDebugEnabled()) if (Log.IsDebugEnabled())
@ -997,7 +997,7 @@ namespace Greenshot.Helpers
private void SetDpi() private void SetDpi()
{ {
// Workaround for proble with DPI retrieval, the FromHwnd activates the window... // Workaround for proble with DPI retrieval, the FromHwnd activates the window...
var previouslyActiveWindow = InteropWindowQuery.GetActiveWindow(); var previouslyActiveWindow = InteropWindowQuery.GetForegroundWindow();
// Workaround for changed DPI settings in Windows 7 // Workaround for changed DPI settings in Windows 7
using (var graphics = Graphics.FromHwnd(MainForm.Instance.Handle)) using (var graphics = Graphics.FromHwnd(MainForm.Instance.Handle))
{ {