diff --git a/Directory.Build.props b/Directory.Build.props index 4f289abe8..b1833a20e 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -16,7 +16,8 @@ true true - net471 + net472 + Off @@ -64,14 +65,14 @@ diff --git a/Greenshot/App.config b/Greenshot/App.config index f724aa5aa..61ebd6224 100644 --- a/Greenshot/App.config +++ b/Greenshot/App.config @@ -2,7 +2,7 @@ - + diff --git a/Greenshot/releases/innosetup/setup.iss b/Greenshot/releases/innosetup/setup.iss index 970d7e100..15bcb5f22 100644 --- a/Greenshot/releases/innosetup/setup.iss +++ b/Greenshot/releases/innosetup/setup.iss @@ -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; diff --git a/GreenshotBoxPlugin/BoxPlugin.cs b/GreenshotBoxPlugin/BoxPlugin.cs index de72db4a4..4848c4df2 100644 --- a/GreenshotBoxPlugin/BoxPlugin.cs +++ b/GreenshotBoxPlugin/BoxPlugin.cs @@ -62,7 +62,7 @@ namespace GreenshotBoxPlugin { // Register configuration (don't need the configuration itself) _config = IniConfig.GetIniSection(); _resources = new ComponentResourceManager(typeof(BoxPlugin)); - SimpleServiceProvider.Current.AddService(new BoxDestination(this)); + SimpleServiceProvider.Current.AddService(new BoxDestination(this)); _itemPlugInConfig = new ToolStripMenuItem { Image = (Image) _resources.GetObject("Box"), Text = Language.GetString("box", LangKey.Configure) diff --git a/GreenshotConfluencePlugin/ConfluencePlugin.cs b/GreenshotConfluencePlugin/ConfluencePlugin.cs index bb9fb5aa4..78680f24a 100644 --- a/GreenshotConfluencePlugin/ConfluencePlugin.cs +++ b/GreenshotConfluencePlugin/ConfluencePlugin.cs @@ -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(new ConfluenceDestination()); } return true; } diff --git a/GreenshotConfluencePlugin/GreenshotConfluencePlugin.csproj b/GreenshotConfluencePlugin/GreenshotConfluencePlugin.csproj index b969ea5ce..259eb96b2 100644 --- a/GreenshotConfluencePlugin/GreenshotConfluencePlugin.csproj +++ b/GreenshotConfluencePlugin/GreenshotConfluencePlugin.csproj @@ -3,7 +3,6 @@ GreenshotConfluencePlugin GreenshotConfluencePlugin - net471 diff --git a/GreenshotDropboxPlugin/DropboxPlugin.cs b/GreenshotDropboxPlugin/DropboxPlugin.cs index b25d20a2c..3ee7b73cc 100644 --- a/GreenshotDropboxPlugin/DropboxPlugin.cs +++ b/GreenshotDropboxPlugin/DropboxPlugin.cs @@ -62,7 +62,7 @@ namespace GreenshotDropboxPlugin { // Register configuration (don't need the configuration itself) _config = IniConfig.GetIniSection(); _resources = new ComponentResourceManager(typeof(DropboxPlugin)); - SimpleServiceProvider.Current.AddService(new DropboxDestination(this)); + SimpleServiceProvider.Current.AddService(new DropboxDestination(this)); _itemPlugInConfig = new ToolStripMenuItem { Text = Language.GetString("dropbox", LangKey.Configure), diff --git a/GreenshotFlickrPlugin/FlickrPlugin.cs b/GreenshotFlickrPlugin/FlickrPlugin.cs index 4e2514eb6..524c6ad68 100644 --- a/GreenshotFlickrPlugin/FlickrPlugin.cs +++ b/GreenshotFlickrPlugin/FlickrPlugin.cs @@ -73,7 +73,7 @@ namespace GreenshotFlickrPlugin Image = (Image) _resources.GetObject("flickr") }; _itemPlugInConfig.Click += ConfigMenuClick; - SimpleServiceProvider.Current.AddService(new FlickrDestination(this)); + SimpleServiceProvider.Current.AddService(new FlickrDestination(this)); PluginUtils.AddToContextMenu(_itemPlugInConfig); Language.LanguageChanged += OnLanguageChanged; return true; diff --git a/GreenshotJiraPlugin/JiraPlugin.cs b/GreenshotJiraPlugin/JiraPlugin.cs index 80fdce253..9448829c2 100644 --- a/GreenshotJiraPlugin/JiraPlugin.cs +++ b/GreenshotJiraPlugin/JiraPlugin.cs @@ -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(new JiraDestination()); // Make sure the log is enabled for the correct level. if (Log.IsDebugEnabled) diff --git a/GreenshotOCRPlugin/OCRPlugin.cs b/GreenshotOCRPlugin/OCRPlugin.cs index d43d84a45..96ad08135 100644 --- a/GreenshotOCRPlugin/OCRPlugin.cs +++ b/GreenshotOCRPlugin/OCRPlugin.cs @@ -74,7 +74,7 @@ namespace GreenshotOCRPlugin { return false; } // Provide the IDestination - SimpleServiceProvider.Current.AddService(new OCRDestination(this)); + SimpleServiceProvider.Current.AddService(new OCRDestination(this)); // Load configuration _config = IniConfig.GetIniSection(); diff --git a/GreenshotOfficePlugin/GreenshotOfficePlugin.csproj b/GreenshotOfficePlugin/GreenshotOfficePlugin.csproj index aea84a07e..2b6457adb 100644 --- a/GreenshotOfficePlugin/GreenshotOfficePlugin.csproj +++ b/GreenshotOfficePlugin/GreenshotOfficePlugin.csproj @@ -3,7 +3,6 @@ GreenshotOfficePlugin GreenshotOfficePlugin - net471 diff --git a/GreenshotPhotobucketPlugin/GreenshotPhotobucketPlugin.csproj b/GreenshotPhotobucketPlugin/GreenshotPhotobucketPlugin.csproj index f8ba2574c..bab11d46e 100644 --- a/GreenshotPhotobucketPlugin/GreenshotPhotobucketPlugin.csproj +++ b/GreenshotPhotobucketPlugin/GreenshotPhotobucketPlugin.csproj @@ -3,7 +3,6 @@ GreenshotPhotobucketPlugin GreenshotPhotobucketPlugin - net471 diff --git a/GreenshotPlugin/GreenshotPlugin.csproj b/GreenshotPlugin/GreenshotPlugin.csproj index 42b108e17..4c2f3dd84 100644 --- a/GreenshotPlugin/GreenshotPlugin.csproj +++ b/GreenshotPlugin/GreenshotPlugin.csproj @@ -4,7 +4,6 @@ GreenshotPlugin GreenshotPlugin true - net471 diff --git a/GreenshotWin10Plugin/GreenshotWin10Plugin.csproj b/GreenshotWin10Plugin/GreenshotWin10Plugin.csproj index 225968f64..4e6095274 100644 --- a/GreenshotWin10Plugin/GreenshotWin10Plugin.csproj +++ b/GreenshotWin10Plugin/GreenshotWin10Plugin.csproj @@ -3,7 +3,6 @@ GreenshotWin10Plugin GreenshotWin10Plugin - net471 diff --git a/GreenshotWin10Plugin/Win10ShareDestination.cs b/GreenshotWin10Plugin/Win10ShareDestination.cs index 97a354cfb..541268a94 100644 --- a/GreenshotWin10Plugin/Win10ShareDestination.cs +++ b/GreenshotWin10Plugin/Win10ShareDestination.cs @@ -73,9 +73,9 @@ namespace GreenshotWin10Plugin /// /// Share the screenshot with a windows app /// - /// - /// - /// + /// bool + /// ISurface + /// ICaptureDetails /// ExportInformation public override ExportInformation ExportCapture(bool manuallyInitiated, ISurface surface, ICaptureDetails captureDetails) {