From 1766ed6ab16da11984939f57097fd065e5a2ea9c Mon Sep 17 00:00:00 2001
From: Robin Krom <robin.krom@gmail.com>
Date: Tue, 19 Mar 2019 12:36:00 +0100
Subject: [PATCH] Fixing a Windows 10 issue, using the
 Microsoft.Windows.SDK.Contracts package, this should make it possible to
 build on Azure too.

---
 .../Greenshot.Addon.Win10.csproj              | 19 ++++---------------
 .../Win10FormEnhancer.cs                      |  1 -
 .../Resources/GreenshotResources.cs           |  2 +-
 src/Greenshot/App.config                      |  2 +-
 src/Greenshot/Greenshot.csproj                |  6 ++++--
 src/Greenshot/Startup.cs                      |  2 +-
 6 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj b/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj
index b62215dfd..e9d1b3c18 100644
--- a/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj
+++ b/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
   <PropertyGroup>
     <RootNamespace>Greenshot.Addon.Win10</RootNamespace>
@@ -12,19 +12,7 @@
     </None>
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
-    <Reference Include="Windows">
-      <HintPath>C:\Program Files (x86)\Windows Kits\10\UnionMetadata\10.0.17763.0\Windows.winmd</HintPath>
-      <IsWinMDFile>true</IsWinMDFile>
-    </Reference>
-  </ItemGroup>
-  
   <ItemGroup Condition="'$(TargetFramework)' == 'net472'">
-    <!-- Light up Windows 10 features -->
-    <Reference Include="Windows">
-      <HintPath>C:\Program Files (x86)\Windows Kits\10\UnionMetadata\10.0.17763.0\Windows.winmd</HintPath>
-      <IsWinMDFile>true</IsWinMDFile>
-    </Reference>
     <Reference Include="Microsoft.VisualBasic" />
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
@@ -56,7 +44,8 @@
     <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.21" />
     <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.21" />
     <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.17" />
-    <PackageReference Include="System.Runtime.WindowsRuntime" Version="4.6.0-preview.19073.11" />
-    <PackageReference Include="Microsoft.Toolkit.Forms.UI.Controls" Version="6.0.0-preview1" />
+    <PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.17763.144-preview" />
+	<PackageReference Include="System.Runtime.WindowsRuntime" Version="4.6.0-preview3.19128.7" />
+    <PackageReference Include="Microsoft.Toolkit.Forms.UI.Controls" Version="6.0.0-preview3" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Greenshot.Addon.Win10/Win10FormEnhancer.cs b/src/Greenshot.Addon.Win10/Win10FormEnhancer.cs
index aef9fb15d..f4e25651d 100644
--- a/src/Greenshot.Addon.Win10/Win10FormEnhancer.cs
+++ b/src/Greenshot.Addon.Win10/Win10FormEnhancer.cs
@@ -44,7 +44,6 @@ namespace Greenshot.Addon.Win10
             {
                 return;
             }
-            return;
             // InkCanvas
             inkCanvasHost = new WindowsXamlHost
             {
diff --git a/src/Greenshot.Addons/Resources/GreenshotResources.cs b/src/Greenshot.Addons/Resources/GreenshotResources.cs
index 6ac41ef40..b33ae26e4 100644
--- a/src/Greenshot.Addons/Resources/GreenshotResources.cs
+++ b/src/Greenshot.Addons/Resources/GreenshotResources.cs
@@ -104,7 +104,7 @@ namespace Greenshot.Addons.Resources
 	    {
 	        if (name.EndsWith(".Image"))
 	        {
-	            name = name + ".png";
+	            name += ".png";
 
 	        }
 	        using (var imageStream = _resourceProvider.ResourceAsStream((type ?? GetType()).Assembly, "Resources",  name))
diff --git a/src/Greenshot/App.config b/src/Greenshot/App.config
index 1345cf5df..1e9d63bac 100644
--- a/src/Greenshot/App.config
+++ b/src/Greenshot/App.config
@@ -4,7 +4,7 @@
 	<startup>
 		<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
 	</startup>
-	<runtime>
+	<runtime>    
 		<loadFromRemoteSources enabled="true" />
 	  <relativeBindForResources enabled="true" />
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
diff --git a/src/Greenshot/Greenshot.csproj b/src/Greenshot/Greenshot.csproj
index 5769a4702..f2693da73 100644
--- a/src/Greenshot/Greenshot.csproj
+++ b/src/Greenshot/Greenshot.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
@@ -9,7 +9,8 @@
     <ApplicationManifest>greenshot.manifest</ApplicationManifest>
     <AssemblyTitle>Greenshot</AssemblyTitle>
     <AssemblyName>Greenshot</AssemblyName>
-	<RuntimeIdentifiers>win-x86</RuntimeIdentifiers>
+	<RuntimeIdentifiers>win-x64</RuntimeIdentifiers>
+	<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
 
     <ItemGroup>
@@ -101,6 +102,7 @@
     <PackageReference Include="Svg" Version="2.4.2" />
     <PackageReference Include="System.Runtime" Version="4.3.1" />
     <PackageReference Include="System.Runtime.Extensions" Version="4.3.1" />
+    <PackageReference Include="System.Runtime.WindowsRuntime" Version="4.6.0-preview3.19128.7" />
   </ItemGroup>
   
   <ItemGroup>
diff --git a/src/Greenshot/Startup.cs b/src/Greenshot/Startup.cs
index 4003b3f47..d460130dc 100644
--- a/src/Greenshot/Startup.cs
+++ b/src/Greenshot/Startup.cs
@@ -68,7 +68,7 @@ namespace Greenshot
             //LogSettings.ExceptionToStacktrace = exception => exception.ToStringDemystified();
 #if DEBUG
             // Initialize a debug logger for Dapplo packages
-            LogSettings.RegisterDefaultLogger<DebugLogger>(LogLevels.Verbose);
+            LogSettings.RegisterDefaultLogger<DebugLogger>(LogLevels.Debug);
 #endif
             var applicationConfig = ApplicationConfigBuilder
                 .Create()