Switched TargetFrameworks with net471 first, this should allow us to use the designer.

This commit is contained in:
Robin 2018-11-27 21:38:31 +01:00
commit fc5bf534aa
24 changed files with 24 additions and 23 deletions

View file

@ -3,7 +3,7 @@
<PropertyGroup>
<RootNamespace>Greenshot.Addon.Box</RootNamespace>
<AssemblyName>Greenshot.Addon.Box</AssemblyName>
<TargetFrameworks>netcoreapp3.0;net471</TargetFrameworks>
<TargetFrameworks>net471;netcoreapp3.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>

View file

@ -3,7 +3,7 @@
<PropertyGroup>
<RootNamespace>Greenshot.Addon.Confluence</RootNamespace>
<AssemblyName>Greenshot.Addon.Confluence</AssemblyName>
<TargetFrameworks>netcoreapp3.0;net471</TargetFrameworks>
<TargetFrameworks>net471;netcoreapp3.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>

View file

@ -3,7 +3,7 @@
<PropertyGroup>
<RootNamespace>Greenshot.Addon.Dropbox</RootNamespace>
<AssemblyName>Greenshot.Addon.Dropbox</AssemblyName>
<TargetFrameworks>netcoreapp3.0;net471</TargetFrameworks>
<TargetFrameworks>net471;netcoreapp3.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>

View file

@ -3,7 +3,7 @@
<PropertyGroup>
<RootNamespace>Greenshot.Addon.ExternalCommand</RootNamespace>
<AssemblyName>Greenshot.Addon.ExternalCommand</AssemblyName>
<TargetFrameworks>netcoreapp3.0;net471</TargetFrameworks>
<TargetFrameworks>net471;netcoreapp3.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>

View file

@ -3,7 +3,7 @@
<PropertyGroup>
<RootNamespace>Greenshot.Addon.Flickr</RootNamespace>
<AssemblyName>Greenshot.Addon.Flickr</AssemblyName>
<TargetFrameworks>netcoreapp3.0;net471</TargetFrameworks>
<TargetFrameworks>net471;netcoreapp3.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>

View file

@ -3,7 +3,7 @@
<PropertyGroup>
<RootNamespace>Greenshot.Addon.GooglePhotos</RootNamespace>
<AssemblyName>Greenshot.Addon.GooglePhotos</AssemblyName>
<TargetFrameworks>netcoreapp3.0;net471</TargetFrameworks>
<TargetFrameworks>net471;netcoreapp3.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>

View file

@ -3,7 +3,7 @@
<PropertyGroup>
<RootNamespace>Greenshot.Addon.Imgur</RootNamespace>
<AssemblyName>Greenshot.Addon.Imgur</AssemblyName>
<TargetFrameworks>netcoreapp3.0;net471</TargetFrameworks>
<TargetFrameworks>net471;netcoreapp3.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>

View file

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<TargetFrameworks>netcoreapp3.0;net471</TargetFrameworks>
<TargetFrameworks>net471;netcoreapp3.0</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>

View file

@ -3,7 +3,7 @@
<PropertyGroup>
<RootNamespace>Greenshot.Addon.LegacyEditor</RootNamespace>
<AssemblyName>Greenshot.Addon.LegacyEditor</AssemblyName>
<TargetFrameworks>netcoreapp3.0;net471</TargetFrameworks>
<TargetFrameworks>net471;netcoreapp3.0</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>

View file

@ -3,7 +3,7 @@
<PropertyGroup>
<RootNamespace>Greenshot.Addon.Lutim</RootNamespace>
<AssemblyName>Greenshot.Addon.Lutim</AssemblyName>
<TargetFrameworks>netcoreapp3.0;net471</TargetFrameworks>
<TargetFrameworks>net471;netcoreapp3.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>

View file

@ -3,7 +3,7 @@
<PropertyGroup>
<RootNamespace>Greenshot.Addon.OCR</RootNamespace>
<AssemblyName>Greenshot.Addon.OCR</AssemblyName>
<TargetFrameworks>netcoreapp3.0;net471</TargetFrameworks>
<TargetFrameworks>net471;netcoreapp3.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>

View file

@ -3,7 +3,7 @@
<PropertyGroup>
<RootNamespace>Greenshot.Addon.Office</RootNamespace>
<AssemblyName>Greenshot.Addon.Office</AssemblyName>
<TargetFrameworks>netcoreapp3.0;net471</TargetFrameworks>
<TargetFrameworks>net471;netcoreapp3.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>

View file

@ -3,7 +3,7 @@
<PropertyGroup>
<RootNamespace>Greenshot.Addon.OneDrive</RootNamespace>
<AssemblyName>Greenshot.Addon.OneDrive</AssemblyName>
<TargetFrameworks>netcoreapp3.0;net471</TargetFrameworks>
<TargetFrameworks>net471;netcoreapp3.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>

View file

@ -3,7 +3,7 @@
<PropertyGroup>
<RootNamespace>Greenshot.Addon.Photobucket</RootNamespace>
<AssemblyName>Greenshot.Addon.Photobucket</AssemblyName>
<TargetFrameworks>netcoreapp3.0;net471</TargetFrameworks>
<TargetFrameworks>net471;netcoreapp3.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>

View file

@ -3,7 +3,7 @@
<PropertyGroup>
<RootNamespace>Greenshot.Addon.Tfs</RootNamespace>
<AssemblyName>Greenshot.Addon.Tfs</AssemblyName>
<TargetFrameworks>netcoreapp3.0;net471</TargetFrameworks>
<TargetFrameworks>net471;netcoreapp3.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>

View file

@ -3,7 +3,7 @@
<PropertyGroup>
<RootNamespace>Greenshot.Addon.Win10</RootNamespace>
<AssemblyName>Greenshot.Addon.Win10</AssemblyName>
<TargetFrameworks>netcoreapp3.0;net471</TargetFrameworks>
<TargetFrameworks>net471;netcoreapp3.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>

View file

@ -216,6 +216,7 @@ namespace Greenshot.Addon.Win10
}
// Signal that the stream is ready
streamedFileDataRequest.Dispose();
// Signal that the action is ready, bitmap was exported
shareInfo.ShareTask.TrySetResult(true);
}
catch (Exception)

View file

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<TargetFrameworks>netcoreapp3.0;net471</TargetFrameworks>
<TargetFrameworks>net471;netcoreapp3.0</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>

View file

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<TargetFrameworks>netcoreapp3.0;net471</TargetFrameworks>
<TargetFrameworks>net471;netcoreapp3.0</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>

View file

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<TargetFrameworks>netcoreapp3.0;net471</TargetFrameworks>
<TargetFrameworks>net471;netcoreapp3.0</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>

View file

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<TargetFrameworks>netcoreapp3.0;net471</TargetFrameworks>
<TargetFrameworks>net471;netcoreapp3.0</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>

View file

@ -4,7 +4,7 @@
<RootNamespace>Greenshot.PerformanceTests</RootNamespace>
<AssemblyName>Greenshot.PerformanceTests</AssemblyName>
<OutputType>Exe</OutputType>
<TargetFrameworks>netcoreapp3.0;net471</TargetFrameworks>
<TargetFrameworks>net471;netcoreapp3.0</TargetFrameworks>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
</PropertyGroup>

View file

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<TargetFrameworks>netcoreapp3.0;net471</TargetFrameworks>
<TargetFrameworks>net471;netcoreapp3.0</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>

View file

@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFrameworks>netcoreapp3.0;net471</TargetFrameworks>
<TargetFrameworks>net471;netcoreapp3.0</TargetFrameworks>
<LangVersion>latest</LangVersion>
<ApplicationIcon>icons\applicationIcon\icon.ico</ApplicationIcon>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>