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

Merge branch 'develop' of https://github.com/greenshot/greenshot into develop

Browse source 
# Conflicts:
#	azure-pipelines.yml
#	src/Greenshot/Greenshot.csproj
This commit is contained in:
Robin Krom 2019-06-27 01:51:40 +02:00
commit b7812f5f32
5 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
NuGet.Config
View file

@ -2,6 +2,7 @@
<configuration> <configuration>
<packageSources> <packageSources>
<add key="nugetv3" value="https://api.nuget.org/v3/index.json" /> <add key="nugetv3" value="https://api.nuget.org/v3/index.json" />
<add key="uwpcommunitytoolkit" value="https://dotnet.myget.org/F/uwpcommunitytoolkit/api/v3/index.json" />
<add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" /> <add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
<add key="dotnet-windowsdesktop" value="https://dotnetfeed.blob.core.windows.net/dotnet-windowsdesktop/index.json" /> <add key="dotnet-windowsdesktop" value="https://dotnetfeed.blob.core.windows.net/dotnet-windowsdesktop/index.json" />
<add key="aspnet-aspnetcore" value="https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore/index.json" /> <add key="aspnet-aspnetcore" value="https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore/index.json" />

4
src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj
View file

@ -19,7 +19,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.18362.2002-preview" /> <PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.18362.2002-preview" />
<PackageReference Include="System.Runtime.WindowsRuntime" Version="4.6.0-preview4.19212.13" /> <TrimmerRootAssembly Include="Microsoft.Windows.SDK.Contracts" />
<PackageReference Include="Microsoft.Toolkit.Forms.UI.Controls" Version="6.0.0-preview4.1" /> <TrimmerRootAssembly Include="System.Runtime.WindowsRuntime" />
</ItemGroup> </ItemGroup>
</Project> </Project>

7
src/Greenshot.Addon.Win10/Win10AddonModule.cs
View file

@ -23,7 +23,6 @@ using Autofac;
using Dapplo.Addons; using Dapplo.Addons;
using Dapplo.Windows.Common; using Dapplo.Windows.Common;
using Greenshot.Addons.Components; using Greenshot.Addons.Components;
using Greenshot.Addons.Interfaces;
namespace Greenshot.Addon.Win10 namespace Greenshot.Addon.Win10
{ {
@ -49,15 +48,11 @@ namespace Greenshot.Addon.Win10
.As<IDestination>() .As<IDestination>()
.SingleInstance(); .SingleInstance();
builder
.RegisterType<Win10FormEnhancer>()
.As<IFormEnhancer>()
.SingleInstance();
builder builder
.RegisterType<Win10ShareDestination>() .RegisterType<Win10ShareDestination>()
.As<IDestination>() .As<IDestination>()
.SingleInstance(); .SingleInstance();
base.Load(builder); base.Load(builder);
} }
} }

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

@ -32,6 +32,7 @@
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="gong-wpf-dragdrop" Version="2.0.3" />
<PackageReference Include="MahApps.Metro.IconPacks" Version="3.0.0-alpha0146" /> <PackageReference Include="MahApps.Metro.IconPacks" Version="3.0.0-alpha0146" />
<PackageReference Include="Svg" Version="2.4.3" /> <PackageReference Include="Svg" Version="2.4.3" />
</ItemGroup> </ItemGroup>

4
src/Greenshot/Startup.cs
View file

@ -20,6 +20,7 @@
using System; using System;
using System.Diagnostics; using System.Diagnostics;
using System.Drawing; using System.Drawing;
using System.Globalization;
using System.Text; using System.Text;
using System.Windows; using System.Windows;
using System.Windows.Forms; using System.Windows.Forms;
@ -58,6 +59,9 @@ namespace Greenshot
[STAThread] [STAThread]
public static int Main(string[] arguments) public static int Main(string[] arguments)
{ {
// Workaround for https://github.com/dotnet/wpf/issues/684 & https://github.com/dotnet/wpf/issues/913
CultureInfo.CurrentUICulture = CultureInfo.GetCultureInfo("en-US");
// TODO: Set via build // TODO: Set via build
StringEncryptionTypeConverter.RgbIv = "dlgjowejgogkklwj"; StringEncryptionTypeConverter.RgbIv = "dlgjowejgogkklwj";
StringEncryptionTypeConverter.RgbKey = "lsjvkwhvwujkagfauguwcsjgu2wueuff"; StringEncryptionTypeConverter.RgbKey = "lsjvkwhvwujkagfauguwcsjgu2wueuff";