mirror of
https://github.com/greenshot/greenshot
synced 2025-07-16 10:03:44 -07:00
Upgraded to .NET Framework 4.7.2 due to netstandard 2.0 issues, any lower version would make the installer even bigger.
Fixed an issue that some destinations were not visible as they were exported wrong.
This commit is contained in:
Krom, Robertus
parent
bc2e991a2d
commit
1751880581
15 changed files with 26 additions and 21 deletions
|
|
@ -16,7 +16,8 @@
|
|||
<PublishRepositoryUrl>true</PublishRepositoryUrl>
|
||||
<!-- Optional: Embed source files that are not tracked by the source control manager in the PDB -->
|
||||
<EmbedUntrackedSources>true</EmbedUntrackedSources>
|
||||
<TargetFramework>net471</TargetFramework>
|
||||
<TargetFramework>net472</TargetFramework>
|
||||
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
|
||||
</PropertyGroup>
|
||||
|
||||
<!-- 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'))">
|
||||
<Exec Command="
|
||||
xcopy /q /y /d "$(TargetDir)$(TargetName).*" "$(SolutionDir)$(SolutionName)\$(OutDir)"

|
||||
xcopy /q /y /d "$(TargetDir)*.dll" "$(SolutionDir)$(SolutionName)\$(OutDir)"

|
||||
xcopy /q /y /d "$(TargetDir)*.xml" "$(SolutionDir)$(SolutionName)\$(OutDir)"


|
||||
xcopy /y /d "$(TargetDir)$(TargetName).*" "$(SolutionDir)$(SolutionName)\$(OutDir)"

|
||||
xcopy /y /d "$(TargetDir)*.dll" "$(SolutionDir)$(SolutionName)\$(OutDir)"

|
||||
xcopy /y /d "$(TargetDir)*.xml" "$(SolutionDir)$(SolutionName)\$(OutDir)"


|
||||
IF EXIST "$(TargetDir)Languages" (

|
||||
IF NOT EXIST "$(SolutionDir)$(SolutionName)\$(OutDir)Languages" (

|
||||
mkdir "$(SolutionDir)$(SolutionName)\$(OutDir)Languages"

|
||||
)

|
||||
xcopy /q /y /d "$(TargetDir)Languages\*.xml" "$(SolutionDir)$(SolutionName)\$(OutDir)Languages"

|
||||
xcopy /y /d "$(TargetDir)Languages\*.xml" "$(SolutionDir)$(SolutionName)\$(OutDir)Languages"

|
||||
del "$(SolutionDir)$(SolutionName)\$(OutDir)Languages\language-installer*.xml";

|
||||
del "$(SolutionDir)$(SolutionName)\$(OutDir)Languages\language-website*.xml";

|
||||
)" />
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
<configuration>
|
||||
<!--<system.windows.forms jitDebugging="true" />-->
|
||||
<startup>
|
||||
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
|
||||
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
|
||||
</startup>
|
||||
<runtime>
|
||||
<loadFromRemoteSources enabled="true" />
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#define ExeName "Greenshot"
|
||||
#define Version GetEnv('BuildVersionSimple')
|
||||
#define FileVersion GetEnv('AssemblyInformationalVersion')
|
||||
#define ReleaseDir "..\..\bin\Release\net471"
|
||||
#define ReleaseDir "..\..\bin\Release\net472"
|
||||
|
||||
; Include the scripts to install .NET Framework
|
||||
; 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}\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}\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: {#ReleaseDir}\checksum.SHA256; DestDir: {app}; Components: greenshot; 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;
|
||||
;JIRA Plugin
|
||||
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;
|
||||
;Imgur Plugin
|
||||
Source: {#ReleaseDir}\GreenshotImgurPlugin.dll; DestDir: {app}\Plugins\GreenshotImgurPlugin; Components: plugins\imgur; Flags: overwritereadonly recursesubdirs ignoreversion replacesameversion;
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ namespace GreenshotBoxPlugin {
|
|||
// Register configuration (don't need the configuration itself)
|
||||
_config = IniConfig.GetIniSection<BoxConfiguration>();
|
||||
_resources = new ComponentResourceManager(typeof(BoxPlugin));
|
||||
SimpleServiceProvider.Current.AddService(new BoxDestination(this));
|
||||
SimpleServiceProvider.Current.AddService<IDestination>(new BoxDestination(this));
|
||||
_itemPlugInConfig = new ToolStripMenuItem {
|
||||
Image = (Image) _resources.GetObject("Box"),
|
||||
Text = Language.GetString("box", LangKey.Configure)
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@ using GreenshotPlugin.Core;
|
|||
using System;
|
||||
using System.Windows;
|
||||
using GreenshotPlugin.IniFile;
|
||||
using GreenshotPlugin.Interfaces;
|
||||
using GreenshotPlugin.Interfaces.Plugin;
|
||||
using TranslationByMarkupExtension;
|
||||
|
||||
|
|
@ -96,7 +97,7 @@ namespace GreenshotConfluencePlugin {
|
|||
}
|
||||
if (ConfluenceDestination.IsInitialized)
|
||||
{
|
||||
SimpleServiceProvider.Current.AddService(new ConfluenceDestination());
|
||||
SimpleServiceProvider.Current.AddService<IDestination>(new ConfluenceDestination());
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
<PropertyGroup>
|
||||
<RootNamespace>GreenshotConfluencePlugin</RootNamespace>
|
||||
<AssemblyName>GreenshotConfluencePlugin</AssemblyName>
|
||||
<TargetFramework>net471</TargetFramework>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ namespace GreenshotDropboxPlugin {
|
|||
// Register configuration (don't need the configuration itself)
|
||||
_config = IniConfig.GetIniSection<DropboxPluginConfiguration>();
|
||||
_resources = new ComponentResourceManager(typeof(DropboxPlugin));
|
||||
SimpleServiceProvider.Current.AddService(new DropboxDestination(this));
|
||||
SimpleServiceProvider.Current.AddService<IDestination>(new DropboxDestination(this));
|
||||
_itemPlugInConfig = new ToolStripMenuItem
|
||||
{
|
||||
Text = Language.GetString("dropbox", LangKey.Configure),
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@ namespace GreenshotFlickrPlugin
|
|||
Image = (Image) _resources.GetObject("flickr")
|
||||
};
|
||||
_itemPlugInConfig.Click += ConfigMenuClick;
|
||||
SimpleServiceProvider.Current.AddService(new FlickrDestination(this));
|
||||
SimpleServiceProvider.Current.AddService<IDestination>(new FlickrDestination(this));
|
||||
PluginUtils.AddToContextMenu(_itemPlugInConfig);
|
||||
Language.LanguageChanged += OnLanguageChanged;
|
||||
return true;
|
||||
|
|
|
|||
|
|
@ -26,6 +26,7 @@ using Dapplo.Log;
|
|||
using GreenshotJiraPlugin.Forms;
|
||||
using GreenshotPlugin.Core;
|
||||
using GreenshotPlugin.IniFile;
|
||||
using GreenshotPlugin.Interfaces;
|
||||
using GreenshotPlugin.Interfaces.Plugin;
|
||||
using log4net;
|
||||
|
||||
|
|
@ -62,7 +63,7 @@ namespace GreenshotJiraPlugin {
|
|||
// Provide the JiraConnector
|
||||
SimpleServiceProvider.Current.AddService(new JiraConnector());
|
||||
// Provide the IDestination
|
||||
SimpleServiceProvider.Current.AddService(new JiraDestination());
|
||||
SimpleServiceProvider.Current.AddService<IDestination>(new JiraDestination());
|
||||
|
||||
// Make sure the log is enabled for the correct level.
|
||||
if (Log.IsDebugEnabled)
|
||||
|
|
|
|||
|
|
@ -74,7 +74,7 @@ namespace GreenshotOCRPlugin {
|
|||
return false;
|
||||
}
|
||||
// Provide the IDestination
|
||||
SimpleServiceProvider.Current.AddService(new OCRDestination(this));
|
||||
SimpleServiceProvider.Current.AddService<IDestination>(new OCRDestination(this));
|
||||
// Load configuration
|
||||
_config = IniConfig.GetIniSection<OCRConfiguration>();
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
<PropertyGroup>
|
||||
<RootNamespace>GreenshotOfficePlugin</RootNamespace>
|
||||
<AssemblyName>GreenshotOfficePlugin</AssemblyName>
|
||||
<TargetFramework>net471</TargetFramework>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
<PropertyGroup>
|
||||
<RootNamespace>GreenshotPhotobucketPlugin</RootNamespace>
|
||||
<AssemblyName>GreenshotPhotobucketPlugin</AssemblyName>
|
||||
<TargetFramework>net471</TargetFramework>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@
|
|||
<RootNamespace>GreenshotPlugin</RootNamespace>
|
||||
<AssemblyName>GreenshotPlugin</AssemblyName>
|
||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
||||
<TargetFramework>net471</TargetFramework>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
<PropertyGroup>
|
||||
<RootNamespace>GreenshotWin10Plugin</RootNamespace>
|
||||
<AssemblyName>GreenshotWin10Plugin</AssemblyName>
|
||||
<TargetFramework>net471</TargetFramework>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
|||
|
|
@ -73,9 +73,9 @@ namespace GreenshotWin10Plugin
|
|||
/// <summary>
|
||||
/// Share the screenshot with a windows app
|
||||
/// </summary>
|
||||
/// <param name="manuallyInitiated"></param>
|
||||
/// <param name="surface"></param>
|
||||
/// <param name="captureDetails"></param>
|
||||
/// <param name="manuallyInitiated">bool</param>
|
||||
/// <param name="surface">ISurface</param>
|
||||
/// <param name="captureDetails">ICaptureDetails</param>
|
||||
/// <returns>ExportInformation</returns>
|
||||
public override ExportInformation ExportCapture(bool manuallyInitiated, ISurface surface, ICaptureDetails captureDetails)
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue