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

Fixing a Windows 10 issue, using the Microsoft.Windows.SDK.Contracts package, this should make it possible to build on Azure too.

Browse source
This commit is contained in:
Robin Krom 2019-03-19 12:36:00 +01:00
commit 1766ed6ab1
6 changed files with 11 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop"> <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup> <PropertyGroup>
<RootNamespace>Greenshot.Addon.Win10</RootNamespace> <RootNamespace>Greenshot.Addon.Win10</RootNamespace>
@ -12,19 +12,7 @@
</None> </None>
</ItemGroup> </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'"> <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="Microsoft.VisualBasic" />
<Reference Include="PresentationCore" /> <Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" /> <Reference Include="PresentationFramework" />
@ -56,7 +44,8 @@
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.21" /> <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.21" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.21" /> <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.21" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.17" /> <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.17" />
<PackageReference Include="System.Runtime.WindowsRuntime" Version="4.6.0-preview.19073.11" /> <PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.17763.144-preview" />
<PackageReference Include="Microsoft.Toolkit.Forms.UI.Controls" Version="6.0.0-preview1" /> <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> </ItemGroup>
</Project> </Project>

1
src/Greenshot.Addon.Win10/Win10FormEnhancer.cs
View file

@ -44,7 +44,6 @@ namespace Greenshot.Addon.Win10
{ {
return; return;
} }
return;
// InkCanvas // InkCanvas
inkCanvasHost = new WindowsXamlHost inkCanvasHost = new WindowsXamlHost
{ {

2
src/Greenshot.Addons/Resources/GreenshotResources.cs
View file

@ -104,7 +104,7 @@ namespace Greenshot.Addons.Resources
{ {
if (name.EndsWith(".Image")) if (name.EndsWith(".Image"))
{ {
name = name + ".png"; name += ".png";
} }
using (var imageStream = _resourceProvider.ResourceAsStream((type ?? GetType()).Assembly, "Resources", name)) using (var imageStream = _resourceProvider.ResourceAsStream((type ?? GetType()).Assembly, "Resources", name))

2
src/Greenshot/App.config
View file

@ -4,7 +4,7 @@
<startup> <startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
</startup> </startup>
<runtime> <runtime>
<loadFromRemoteSources enabled="true" /> <loadFromRemoteSources enabled="true" />
<relativeBindForResources enabled="true" /> <relativeBindForResources enabled="true" />
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">

6
src/Greenshot/Greenshot.csproj
View file

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop"> <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup> <PropertyGroup>
<OutputType>WinExe</OutputType> <OutputType>WinExe</OutputType>
@ -9,7 +9,8 @@
<ApplicationManifest>greenshot.manifest</ApplicationManifest> <ApplicationManifest>greenshot.manifest</ApplicationManifest>
<AssemblyTitle>Greenshot</AssemblyTitle> <AssemblyTitle>Greenshot</AssemblyTitle>
<AssemblyName>Greenshot</AssemblyName> <AssemblyName>Greenshot</AssemblyName>
<RuntimeIdentifiers>win-x86</RuntimeIdentifiers> <RuntimeIdentifiers>win-x64</RuntimeIdentifiers>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
@ -101,6 +102,7 @@
<PackageReference Include="Svg" Version="2.4.2" /> <PackageReference Include="Svg" Version="2.4.2" />
<PackageReference Include="System.Runtime" Version="4.3.1" /> <PackageReference Include="System.Runtime" Version="4.3.1" />
<PackageReference Include="System.Runtime.Extensions" 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>
<ItemGroup> <ItemGroup>

2
src/Greenshot/Startup.cs
View file

@ -68,7 +68,7 @@ namespace Greenshot
//LogSettings.ExceptionToStacktrace = exception => exception.ToStringDemystified(); //LogSettings.ExceptionToStacktrace = exception => exception.ToStringDemystified();
#if DEBUG #if DEBUG
// Initialize a debug logger for Dapplo packages // Initialize a debug logger for Dapplo packages
LogSettings.RegisterDefaultLogger<DebugLogger>(LogLevels.Verbose); LogSettings.RegisterDefaultLogger<DebugLogger>(LogLevels.Debug);
#endif #endif
var applicationConfig = ApplicationConfigBuilder var applicationConfig = ApplicationConfigBuilder
.Create() .Create()