github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-07-16 10:03:44 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Upgraded to .NET Framework 4.7.2 due to netstandard 2.0 issues, any lower version would make the installer even bigger.

Browse source 
Fixed an issue that some destinations were not visible as they were exported wrong.
This commit is contained in:
Krom, Robertus 2020-02-24 11:47:23 +01:00
parent bc2e991a2d
commit 1751880581
15 changed files with 26 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Directory.Build.props
View file

@ -16,7 +16,8 @@
<PublishRepositoryUrl>true</PublishRepositoryUrl> <PublishRepositoryUrl>true</PublishRepositoryUrl>
<!-- Optional: Embed source files that are not tracked by the source control manager in the PDB --> <!-- Optional: Embed source files that are not tracked by the source control manager in the PDB -->
<EmbedUntrackedSources>true</EmbedUntrackedSources> <EmbedUntrackedSources>true</EmbedUntrackedSources>
<TargetFramework>net471</TargetFramework> <TargetFramework>net472</TargetFramework>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
</PropertyGroup> </PropertyGroup>
<!-- ILLinker and single file settings --> <!-- ILLinker and single file settings -->
@ -64,14 +65,14 @@
<Target Name="PostBuild" BeforeTargets="PostBuildEvent" Condition="'$(BuildingInsideVisualStudio)' == 'true' And $(MSBuildProjectName.Contains('Plugin')) And !$(MSBuildProjectName.Contains('Test')) And !$(MSBuildProjectName.Contains('Demo'))"> <Target Name="PostBuild" BeforeTargets="PostBuildEvent" Condition="'$(BuildingInsideVisualStudio)' == 'true' And $(MSBuildProjectName.Contains('Plugin')) And !$(MSBuildProjectName.Contains('Test')) And !$(MSBuildProjectName.Contains('Demo'))">
<Exec Command=" <Exec Command="
xcopy /q /y /d &quot;$(TargetDir)$(TargetName).*&quot; &quot;$(SolutionDir)$(SolutionName)\$(OutDir)&quot;&#xD;&#xA; xcopy /y /d &quot;$(TargetDir)$(TargetName).*&quot; &quot;$(SolutionDir)$(SolutionName)\$(OutDir)&quot;&#xD;&#xA;
xcopy /q /y /d &quot;$(TargetDir)*.dll&quot; &quot;$(SolutionDir)$(SolutionName)\$(OutDir)&quot;&#xD;&#xA; xcopy /y /d &quot;$(TargetDir)*.dll&quot; &quot;$(SolutionDir)$(SolutionName)\$(OutDir)&quot;&#xD;&#xA;
xcopy /q /y /d &quot;$(TargetDir)*.xml&quot; &quot;$(SolutionDir)$(SolutionName)\$(OutDir)&quot;&#xD;&#xA;&#xD;&#xA; xcopy /y /d &quot;$(TargetDir)*.xml&quot; &quot;$(SolutionDir)$(SolutionName)\$(OutDir)&quot;&#xD;&#xA;&#xD;&#xA;
IF EXIST &quot;$(TargetDir)Languages&quot; (&#xD;&#xA; IF EXIST &quot;$(TargetDir)Languages&quot; (&#xD;&#xA;
IF NOT EXIST &quot;$(SolutionDir)$(SolutionName)\$(OutDir)Languages&quot; (&#xD;&#xA; IF NOT EXIST &quot;$(SolutionDir)$(SolutionName)\$(OutDir)Languages&quot; (&#xD;&#xA;
mkdir &quot;$(SolutionDir)$(SolutionName)\$(OutDir)Languages&quot;&#xD;&#xA; mkdir &quot;$(SolutionDir)$(SolutionName)\$(OutDir)Languages&quot;&#xD;&#xA;
)&#xD;&#xA; )&#xD;&#xA;
xcopy /q /y /d &quot;$(TargetDir)Languages\*.xml&quot; &quot;$(SolutionDir)$(SolutionName)\$(OutDir)Languages&quot;&#xD;&#xA; xcopy /y /d &quot;$(TargetDir)Languages\*.xml&quot; &quot;$(SolutionDir)$(SolutionName)\$(OutDir)Languages&quot;&#xD;&#xA;
del &quot;$(SolutionDir)$(SolutionName)\$(OutDir)Languages\language-installer*.xml&quot;;&#xD;&#xA; del &quot;$(SolutionDir)$(SolutionName)\$(OutDir)Languages\language-installer*.xml&quot;;&#xD;&#xA;
del &quot;$(SolutionDir)$(SolutionName)\$(OutDir)Languages\language-website*.xml&quot;;&#xD;&#xA; del &quot;$(SolutionDir)$(SolutionName)\$(OutDir)Languages\language-website*.xml&quot;;&#xD;&#xA;
)" /> )" />

2
Greenshot/App.config
View file

@ -2,7 +2,7 @@
<configuration> <configuration>
<!--<system.windows.forms jitDebugging="true" />--> <!--<system.windows.forms jitDebugging="true" />-->
<startup> <startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
</startup> </startup>
<runtime> <runtime>
<loadFromRemoteSources enabled="true" /> <loadFromRemoteSources enabled="true" />

9
Greenshot/releases/innosetup/setup.iss
View file

@ -1,7 +1,7 @@
#define ExeName "Greenshot" #define ExeName "Greenshot"
#define Version GetEnv('BuildVersionSimple') #define Version GetEnv('BuildVersionSimple')
#define FileVersion GetEnv('AssemblyInformationalVersion') #define FileVersion GetEnv('AssemblyInformationalVersion')
#define ReleaseDir "..\..\bin\Release\net471" #define ReleaseDir "..\..\bin\Release\net472"
; Include the scripts to install .NET Framework ; Include the scripts to install .NET Framework
; See http://www.codeproject.com/KB/install/dotnetfx_innosetup_instal.aspx ; See http://www.codeproject.com/KB/install/dotnetfx_innosetup_instal.aspx
@ -19,6 +19,12 @@ Source: {#ReleaseDir}\Greenshot.exe; DestDir: {app}; Components: greenshot; Flag
Source: {#ReleaseDir}\GreenshotPlugin.dll; DestDir: {app}; Components: greenshot; Flags: overwritereadonly ignoreversion replacesameversion Source: {#ReleaseDir}\GreenshotPlugin.dll; DestDir: {app}; Components: greenshot; Flags: overwritereadonly ignoreversion replacesameversion
Source: {#ReleaseDir}\Greenshot.exe.config; DestDir: {app}; Components: greenshot; Flags: overwritereadonly ignoreversion replacesameversion Source: {#ReleaseDir}\Greenshot.exe.config; DestDir: {app}; Components: greenshot; Flags: overwritereadonly ignoreversion replacesameversion
Source: {#ReleaseDir}\log4net.dll; DestDir: {app}; Components: greenshot; Flags: overwritereadonly ignoreversion replacesameversion Source: {#ReleaseDir}\log4net.dll; DestDir: {app}; Components: greenshot; Flags: overwritereadonly ignoreversion replacesameversion
Source: {#ReleaseDir}\Dapplo.Http*.dll; DestDir: {app}; Components: greenshot; Flags: overwritereadonly ignoreversion replacesameversion
Source: {#ReleaseDir}\Dapplo.Log.dll; DestDir: {app}; Components: greenshot; Flags: overwritereadonly ignoreversion replacesameversion
Source: {#ReleaseDir}\Svg.dll; DestDir: {app}; Components: greenshot; Flags: overwritereadonly ignoreversion replacesameversion
Source: {#ReleaseDir}\Fizzler.dll; DestDir: {app}; Components: greenshot; Flags: overwritereadonly ignoreversion replacesameversion
Source: {#ReleaseDir}\Newtonsoft.Json.dll; DestDir: {app}; Components: greenshot; Flags: overwritereadonly ignoreversion replacesameversion
Source: {#ReleaseDir}\zxing*.dll; DestDir: {app}; Components: greenshot; Flags: overwritereadonly ignoreversion replacesameversion
Source: ..\..\log4net.xml; DestDir: {app}; Components: greenshot; Flags: overwritereadonly ignoreversion Source: ..\..\log4net.xml; DestDir: {app}; Components: greenshot; Flags: overwritereadonly ignoreversion
Source: {#ReleaseDir}\checksum.SHA256; DestDir: {app}; Components: greenshot; Flags: overwritereadonly ignoreversion replacesameversion Source: {#ReleaseDir}\checksum.SHA256; DestDir: {app}; Components: greenshot; Flags: overwritereadonly ignoreversion replacesameversion
;Source: ..\greenshot-defaults.ini; DestDir: {app}; Flags: overwritereadonly ignoreversion replacesameversion ;Source: ..\greenshot-defaults.ini; DestDir: {app}; Flags: overwritereadonly ignoreversion replacesameversion
@ -79,6 +85,7 @@ Source: ..\..\..\GreenshotOCRCommand\bin\Release\net471\GreenshotOCRCommand.exe;
Source: ..\..\..\GreenshotOCRCommand\bin\Release\net471\GreenshotOCRCommand.exe.config; DestDir: {app}\Plugins\GreenshotOCRPlugin; Components: plugins\ocr; Flags: overwritereadonly recursesubdirs ignoreversion replacesameversion; Source: ..\..\..\GreenshotOCRCommand\bin\Release\net471\GreenshotOCRCommand.exe.config; DestDir: {app}\Plugins\GreenshotOCRPlugin; Components: plugins\ocr; Flags: overwritereadonly recursesubdirs ignoreversion replacesameversion;
;JIRA Plugin ;JIRA Plugin
Source: {#ReleaseDir}\GreenshotJiraPlugin.dll; DestDir: {app}\Plugins\GreenshotJiraPlugin; Components: plugins\jira; Flags: overwritereadonly recursesubdirs ignoreversion replacesameversion; Source: {#ReleaseDir}\GreenshotJiraPlugin.dll; DestDir: {app}\Plugins\GreenshotJiraPlugin; Components: plugins\jira; Flags: overwritereadonly recursesubdirs ignoreversion replacesameversion;
Source: {#ReleaseDir}\Dapplo.Jira.dll; DestDir: {app}\Plugins\GreenshotJiraPlugin; Components: plugins\jira; Flags: overwritereadonly recursesubdirs ignoreversion replacesameversion;
Source: {#ReleaseDir}\Languages\language_jira*.xml; DestDir: {app}\Languages\Plugins\GreenshotJiraPlugin; Components: plugins\jira; Flags: overwritereadonly ignoreversion replacesameversion; Source: {#ReleaseDir}\Languages\language_jira*.xml; DestDir: {app}\Languages\Plugins\GreenshotJiraPlugin; Components: plugins\jira; Flags: overwritereadonly ignoreversion replacesameversion;
;Imgur Plugin ;Imgur Plugin
Source: {#ReleaseDir}\GreenshotImgurPlugin.dll; DestDir: {app}\Plugins\GreenshotImgurPlugin; Components: plugins\imgur; Flags: overwritereadonly recursesubdirs ignoreversion replacesameversion; Source: {#ReleaseDir}\GreenshotImgurPlugin.dll; DestDir: {app}\Plugins\GreenshotImgurPlugin; Components: plugins\imgur; Flags: overwritereadonly recursesubdirs ignoreversion replacesameversion;

2
GreenshotBoxPlugin/BoxPlugin.cs
View file

@ -62,7 +62,7 @@ namespace GreenshotBoxPlugin {
// Register configuration (don't need the configuration itself) // Register configuration (don't need the configuration itself)
_config = IniConfig.GetIniSection<BoxConfiguration>(); _config = IniConfig.GetIniSection<BoxConfiguration>();
_resources = new ComponentResourceManager(typeof(BoxPlugin)); _resources = new ComponentResourceManager(typeof(BoxPlugin));
SimpleServiceProvider.Current.AddService(new BoxDestination(this)); SimpleServiceProvider.Current.AddService<IDestination>(new BoxDestination(this));
_itemPlugInConfig = new ToolStripMenuItem { _itemPlugInConfig = new ToolStripMenuItem {
Image = (Image) _resources.GetObject("Box"), Image = (Image) _resources.GetObject("Box"),
Text = Language.GetString("box", LangKey.Configure) Text = Language.GetString("box", LangKey.Configure)

3
GreenshotConfluencePlugin/ConfluencePlugin.cs
View file

@ -24,6 +24,7 @@ using GreenshotPlugin.Core;
using System; using System;
using System.Windows; using System.Windows;
using GreenshotPlugin.IniFile; using GreenshotPlugin.IniFile;
using GreenshotPlugin.Interfaces;
using GreenshotPlugin.Interfaces.Plugin; using GreenshotPlugin.Interfaces.Plugin;
using TranslationByMarkupExtension; using TranslationByMarkupExtension;
@ -96,7 +97,7 @@ namespace GreenshotConfluencePlugin {
} }
if (ConfluenceDestination.IsInitialized) if (ConfluenceDestination.IsInitialized)
{ {
SimpleServiceProvider.Current.AddService(new ConfluenceDestination()); SimpleServiceProvider.Current.AddService<IDestination>(new ConfluenceDestination());
} }
return true; return true;
} }

1
GreenshotConfluencePlugin/GreenshotConfluencePlugin.csproj
View file

@ -3,7 +3,6 @@
<PropertyGroup> <PropertyGroup>
<RootNamespace>GreenshotConfluencePlugin</RootNamespace> <RootNamespace>GreenshotConfluencePlugin</RootNamespace>
<AssemblyName>GreenshotConfluencePlugin</AssemblyName> <AssemblyName>GreenshotConfluencePlugin</AssemblyName>
<TargetFramework>net471</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

2
GreenshotDropboxPlugin/DropboxPlugin.cs
View file

@ -62,7 +62,7 @@ namespace GreenshotDropboxPlugin {
// Register configuration (don't need the configuration itself) // Register configuration (don't need the configuration itself)
_config = IniConfig.GetIniSection<DropboxPluginConfiguration>(); _config = IniConfig.GetIniSection<DropboxPluginConfiguration>();
_resources = new ComponentResourceManager(typeof(DropboxPlugin)); _resources = new ComponentResourceManager(typeof(DropboxPlugin));
SimpleServiceProvider.Current.AddService(new DropboxDestination(this)); SimpleServiceProvider.Current.AddService<IDestination>(new DropboxDestination(this));
_itemPlugInConfig = new ToolStripMenuItem _itemPlugInConfig = new ToolStripMenuItem
{ {
Text = Language.GetString("dropbox", LangKey.Configure), Text = Language.GetString("dropbox", LangKey.Configure),

2
GreenshotFlickrPlugin/FlickrPlugin.cs
View file

@ -73,7 +73,7 @@ namespace GreenshotFlickrPlugin
Image = (Image) _resources.GetObject("flickr") Image = (Image) _resources.GetObject("flickr")
}; };
_itemPlugInConfig.Click += ConfigMenuClick; _itemPlugInConfig.Click += ConfigMenuClick;
SimpleServiceProvider.Current.AddService(new FlickrDestination(this)); SimpleServiceProvider.Current.AddService<IDestination>(new FlickrDestination(this));
PluginUtils.AddToContextMenu(_itemPlugInConfig); PluginUtils.AddToContextMenu(_itemPlugInConfig);
Language.LanguageChanged += OnLanguageChanged; Language.LanguageChanged += OnLanguageChanged;
return true; return true;

3
GreenshotJiraPlugin/JiraPlugin.cs
View file

@ -26,6 +26,7 @@ using Dapplo.Log;
using GreenshotJiraPlugin.Forms; using GreenshotJiraPlugin.Forms;
using GreenshotPlugin.Core; using GreenshotPlugin.Core;
using GreenshotPlugin.IniFile; using GreenshotPlugin.IniFile;
using GreenshotPlugin.Interfaces;
using GreenshotPlugin.Interfaces.Plugin; using GreenshotPlugin.Interfaces.Plugin;
using log4net; using log4net;
@ -62,7 +63,7 @@ namespace GreenshotJiraPlugin {
// Provide the JiraConnector // Provide the JiraConnector
SimpleServiceProvider.Current.AddService(new JiraConnector()); SimpleServiceProvider.Current.AddService(new JiraConnector());
// Provide the IDestination // Provide the IDestination
SimpleServiceProvider.Current.AddService(new JiraDestination()); SimpleServiceProvider.Current.AddService<IDestination>(new JiraDestination());
// Make sure the log is enabled for the correct level. // Make sure the log is enabled for the correct level.
if (Log.IsDebugEnabled) if (Log.IsDebugEnabled)

2
GreenshotOCRPlugin/OCRPlugin.cs
View file

@ -74,7 +74,7 @@ namespace GreenshotOCRPlugin {
return false; return false;
} }
// Provide the IDestination // Provide the IDestination
SimpleServiceProvider.Current.AddService(new OCRDestination(this)); SimpleServiceProvider.Current.AddService<IDestination>(new OCRDestination(this));
// Load configuration // Load configuration
_config = IniConfig.GetIniSection<OCRConfiguration>(); _config = IniConfig.GetIniSection<OCRConfiguration>();

1
GreenshotOfficePlugin/GreenshotOfficePlugin.csproj
View file

@ -3,7 +3,6 @@
<PropertyGroup> <PropertyGroup>
<RootNamespace>GreenshotOfficePlugin</RootNamespace> <RootNamespace>GreenshotOfficePlugin</RootNamespace>
<AssemblyName>GreenshotOfficePlugin</AssemblyName> <AssemblyName>GreenshotOfficePlugin</AssemblyName>
<TargetFramework>net471</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

1
GreenshotPhotobucketPlugin/GreenshotPhotobucketPlugin.csproj
View file

@ -3,7 +3,6 @@
<PropertyGroup> <PropertyGroup>
<RootNamespace>GreenshotPhotobucketPlugin</RootNamespace> <RootNamespace>GreenshotPhotobucketPlugin</RootNamespace>
<AssemblyName>GreenshotPhotobucketPlugin</AssemblyName> <AssemblyName>GreenshotPhotobucketPlugin</AssemblyName>
<TargetFramework>net471</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

1
GreenshotPlugin/GreenshotPlugin.csproj
View file

@ -4,7 +4,6 @@
<RootNamespace>GreenshotPlugin</RootNamespace> <RootNamespace>GreenshotPlugin</RootNamespace>
<AssemblyName>GreenshotPlugin</AssemblyName> <AssemblyName>GreenshotPlugin</AssemblyName>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TargetFramework>net471</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

1
GreenshotWin10Plugin/GreenshotWin10Plugin.csproj
View file

@ -3,7 +3,6 @@
<PropertyGroup> <PropertyGroup>
<RootNamespace>GreenshotWin10Plugin</RootNamespace> <RootNamespace>GreenshotWin10Plugin</RootNamespace>
<AssemblyName>GreenshotWin10Plugin</AssemblyName> <AssemblyName>GreenshotWin10Plugin</AssemblyName>
<TargetFramework>net471</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

6
GreenshotWin10Plugin/Win10ShareDestination.cs
View file

@ -73,9 +73,9 @@ namespace GreenshotWin10Plugin
/// <summary> /// <summary>
/// Share the screenshot with a windows app /// Share the screenshot with a windows app
/// </summary> /// </summary>
/// <param name="manuallyInitiated"></param> /// <param name="manuallyInitiated">bool</param>
/// <param name="surface"></param> /// <param name="surface">ISurface</param>
/// <param name="captureDetails"></param> /// <param name="captureDetails">ICaptureDetails</param>
/// <returns>ExportInformation</returns> /// <returns>ExportInformation</returns>
public override ExportInformation ExportCapture(bool manuallyInitiated, ISurface surface, ICaptureDetails captureDetails) public override ExportInformation ExportCapture(bool manuallyInitiated, ISurface surface, ICaptureDetails captureDetails)
{ {