diff --git a/Greenshot.sln b/Greenshot.sln index b76fba9a6..20f767cf9 100644 --- a/Greenshot.sln +++ b/Greenshot.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29728.190 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Greenshot", "Greenshot\Greenshot.csproj", "{CD642BF4-D815-4D67-A0B5-C69F0B8231AF}" EndProject @@ -193,4 +193,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {970967C0-60BE-4F70-9332-9ACC04B93A15} + EndGlobalSection EndGlobal diff --git a/Greenshot/Greenshot.csproj b/Greenshot/Greenshot.csproj index ef68e31b5..d51065ada 100644 --- a/Greenshot/Greenshot.csproj +++ b/Greenshot/Greenshot.csproj @@ -12,7 +12,7 @@ False 4 false - v2.0 + v4.7.1 greenshot.manifest @@ -21,14 +21,22 @@ + + false + + + false + + + false + + + false + + + true + - - ..\packages\LinqBridge.1.3.0\lib\net20\LinqBridge.dll - True - - - Lib\log4net.dll - @@ -400,7 +408,6 @@ Form - @@ -442,6 +449,14 @@ Always + + + 2.0.8 + + + 6.0.3 + + diff --git a/Greenshot/packages.config b/Greenshot/packages.config deleted file mode 100644 index 12343fb16..000000000 --- a/Greenshot/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/GreenshotBoxPlugin/GreenshotBoxPlugin.csproj b/GreenshotBoxPlugin/GreenshotBoxPlugin.csproj index 1df2862d1..6f806f200 100644 --- a/GreenshotBoxPlugin/GreenshotBoxPlugin.csproj +++ b/GreenshotBoxPlugin/GreenshotBoxPlugin.csproj @@ -6,7 +6,7 @@ Library GreenshotBoxPlugin GreenshotBoxPlugin - v3.5 + v4.7.1 Properties False False @@ -20,12 +20,23 @@ 3.5 + + false + + + false + + + false + + + false + + + true + - - False - ..\Greenshot\lib\log4net.dll - @@ -69,6 +80,11 @@ GreenshotPlugin + + + 2.0.8 + + if exist "$(ProjectDir)BoxCredentials.orig.cs" ( rename "$(ProjectDir)BoxCredentials.cs" "BoxCredentials.private.cs" diff --git a/GreenshotConfluencePlugin/GreenshotConfluencePlugin.csproj b/GreenshotConfluencePlugin/GreenshotConfluencePlugin.csproj index c531a3499..642ca4a3e 100644 --- a/GreenshotConfluencePlugin/GreenshotConfluencePlugin.csproj +++ b/GreenshotConfluencePlugin/GreenshotConfluencePlugin.csproj @@ -7,26 +7,38 @@ Library GreenshotConfluencePlugin GreenshotConfluencePlugin - v3.5 + v4.7.1 Properties False False 4 false OnBuildSuccess - Client + + 3.5 + + false + + + false + + + false + + + false + + + true + - - ..\Greenshot\Lib\log4net.dll - False - @@ -34,6 +46,7 @@ 3.5 + @@ -88,6 +101,9 @@ True Reference.map + + Reference.map + Never @@ -142,6 +158,11 @@ False + + + 2.0.8 + + mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)" copy "$(ProjectDir)bin\$(Configuration)\$(TargetFileName)" "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)\*.gsp" diff --git a/GreenshotConfluencePlugin/Web References/confluence/Reference.cs b/GreenshotConfluencePlugin/Web References/confluence/Reference.cs index c432337f4..4d3670ff2 100644 --- a/GreenshotConfluencePlugin/Web References/confluence/Reference.cs +++ b/GreenshotConfluencePlugin/Web References/confluence/Reference.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.34209 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -9,7 +9,7 @@ //------------------------------------------------------------------------------ // -// This source code was auto-generated by Microsoft.VSDesigner, Version 4.0.30319.34209. +// This source code was auto-generated by Microsoft.VSDesigner, Version 4.0.30319.42000. // #pragma warning disable 1591 @@ -23,7 +23,7 @@ namespace GreenshotConfluencePlugin.confluence { /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.34209")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] [System.Web.Services.WebServiceBindingAttribute(Name="confluenceservice-v1SoapBinding", Namespace="http://confluence/rpc/soap-axis/confluenceservice-v1")] @@ -505,7 +505,7 @@ namespace GreenshotConfluencePlugin.confluence { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.34234")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -578,7 +578,7 @@ namespace GreenshotConfluencePlugin.confluence { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.34234")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -716,7 +716,7 @@ namespace GreenshotConfluencePlugin.confluence { /// [System.Xml.Serialization.SoapIncludeAttribute(typeof(RemotePageSummary))] [System.Xml.Serialization.SoapIncludeAttribute(typeof(RemotePage))] - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.34234")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -789,7 +789,7 @@ namespace GreenshotConfluencePlugin.confluence { /// [System.Xml.Serialization.SoapIncludeAttribute(typeof(RemotePage))] - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.34234")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -810,7 +810,7 @@ namespace GreenshotConfluencePlugin.confluence { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.34234")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -934,7 +934,7 @@ namespace GreenshotConfluencePlugin.confluence { /// [System.Xml.Serialization.SoapIncludeAttribute(typeof(RemoteSpace))] - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.34234")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -995,7 +995,7 @@ namespace GreenshotConfluencePlugin.confluence { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.0.30319.34234")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")] [System.SerializableAttribute()] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] @@ -1042,11 +1042,11 @@ namespace GreenshotConfluencePlugin.confluence { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.34209")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")] public delegate void searchCompletedEventHandler(object sender, searchCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.34209")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class searchCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -1068,11 +1068,11 @@ namespace GreenshotConfluencePlugin.confluence { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.34209")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")] public delegate void getSpaceCompletedEventHandler(object sender, getSpaceCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.34209")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class getSpaceCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -1094,11 +1094,11 @@ namespace GreenshotConfluencePlugin.confluence { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.34209")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")] public delegate void getChildrenCompletedEventHandler(object sender, getChildrenCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.34209")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class getChildrenCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -1120,11 +1120,11 @@ namespace GreenshotConfluencePlugin.confluence { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.34209")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")] public delegate void loginCompletedEventHandler(object sender, loginCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.34209")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class loginCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -1146,11 +1146,11 @@ namespace GreenshotConfluencePlugin.confluence { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.34209")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")] public delegate void getPageCompletedEventHandler(object sender, getPageCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.34209")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class getPageCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -1172,11 +1172,11 @@ namespace GreenshotConfluencePlugin.confluence { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.34209")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")] public delegate void getPage1CompletedEventHandler(object sender, getPage1CompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.34209")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class getPage1CompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -1198,11 +1198,11 @@ namespace GreenshotConfluencePlugin.confluence { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.34209")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")] public delegate void logoutCompletedEventHandler(object sender, logoutCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.34209")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class logoutCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -1224,11 +1224,11 @@ namespace GreenshotConfluencePlugin.confluence { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.34209")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")] public delegate void addAttachmentCompletedEventHandler(object sender, addAttachmentCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.34209")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class addAttachmentCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -1250,11 +1250,11 @@ namespace GreenshotConfluencePlugin.confluence { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.34209")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")] public delegate void addAttachment1CompletedEventHandler(object sender, addAttachment1CompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.34209")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class addAttachment1CompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -1276,11 +1276,11 @@ namespace GreenshotConfluencePlugin.confluence { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.34209")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")] public delegate void getSpacesCompletedEventHandler(object sender, getSpacesCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.34209")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class getSpacesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { @@ -1302,11 +1302,11 @@ namespace GreenshotConfluencePlugin.confluence { } /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.34209")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")] public delegate void getPagesCompletedEventHandler(object sender, getPagesCompletedEventArgs e); /// - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.34209")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")] [System.Diagnostics.DebuggerStepThroughAttribute()] [System.ComponentModel.DesignerCategoryAttribute("code")] public partial class getPagesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs { diff --git a/GreenshotDropboxPlugin/GreenshotDropboxPlugin.csproj b/GreenshotDropboxPlugin/GreenshotDropboxPlugin.csproj index 7721478a4..952967dd1 100644 --- a/GreenshotDropboxPlugin/GreenshotDropboxPlugin.csproj +++ b/GreenshotDropboxPlugin/GreenshotDropboxPlugin.csproj @@ -6,7 +6,7 @@ Library GreenshotDropboxPlugin GreenshotDropboxPlugin - v2.0 + v4.7.1 Properties False False @@ -20,12 +20,23 @@ 3.5 + + false + + + false + + + false + + + false + + + true + - - False - ..\Greenshot\lib\log4net.dll - @@ -62,6 +73,11 @@ GreenshotPlugin + + + 2.0.8 + + if exist "$(ProjectDir)DropBoxCredentials.orig.cs" ( rename "$(ProjectDir)DropBoxCredentials.cs" "DropBoxCredentials.private.cs" diff --git a/GreenshotExternalCommandPlugin/GreenshotExternalCommandPlugin.csproj b/GreenshotExternalCommandPlugin/GreenshotExternalCommandPlugin.csproj index 8be1f0a81..cb9131304 100644 --- a/GreenshotExternalCommandPlugin/GreenshotExternalCommandPlugin.csproj +++ b/GreenshotExternalCommandPlugin/GreenshotExternalCommandPlugin.csproj @@ -6,7 +6,7 @@ Library GreenshotExternalCommandPlugin GreenshotExternalCommandPlugin - v2.0 + v4.7.1 Properties False False @@ -20,11 +20,23 @@ 3.5 + + false + + + false + + + false + + + false + + + true + - - ..\Greenshot\Lib\log4net.dll - @@ -55,12 +67,14 @@ - {5B924697-4DCD-4F98-85F1-105CB84B7341} + {5b924697-4dcd-4f98-85f1-105cb84b7341} GreenshotPlugin - + + 2.0.8 + mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)" diff --git a/GreenshotFlickrPlugin/GreenshotFlickrPlugin.csproj b/GreenshotFlickrPlugin/GreenshotFlickrPlugin.csproj index 69d67f146..74aef94c2 100644 --- a/GreenshotFlickrPlugin/GreenshotFlickrPlugin.csproj +++ b/GreenshotFlickrPlugin/GreenshotFlickrPlugin.csproj @@ -6,7 +6,7 @@ Library GreenshotFlickrPlugin GreenshotFlickrPlugin - v2.0 + v4.7.1 Properties False False @@ -20,12 +20,23 @@ + + false + + + false + + + false + + + false + + + true + - - False - ..\Greenshot\lib\log4net.dll - @@ -65,6 +76,11 @@ GreenshotPlugin + + + 2.0.8 + + if exist "$(ProjectDir)FlickrCredentials.orig.cs" ( rename "$(ProjectDir)FlickrCredentials.cs" "FlickrCredentials.private.cs" diff --git a/GreenshotImgurPlugin/GreenshotImgurPlugin.csproj b/GreenshotImgurPlugin/GreenshotImgurPlugin.csproj index 6e4f81932..9040234dd 100644 --- a/GreenshotImgurPlugin/GreenshotImgurPlugin.csproj +++ b/GreenshotImgurPlugin/GreenshotImgurPlugin.csproj @@ -6,7 +6,7 @@ Library GreenshotImgurPlugin GreenshotImgurPlugin - v2.0 + v4.7.1 Properties False False @@ -20,15 +20,23 @@ + + false + + + false + + + false + + + false + + + true + - - ..\packages\LinqBridge.1.3.0\lib\net20\LinqBridge.dll - True - - - ..\Greenshot\Lib\log4net.dll - @@ -74,7 +82,6 @@ ImgurPlugin.cs - @@ -82,6 +89,11 @@ GreenshotPlugin + + + 2.0.8 + + if exist "$(ProjectDir)ImgurCredentials.private.cs" ( diff --git a/GreenshotImgurPlugin/packages.config b/GreenshotImgurPlugin/packages.config deleted file mode 100644 index 6003a80e6..000000000 --- a/GreenshotImgurPlugin/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/GreenshotJiraPlugin/GreenshotJiraPlugin.csproj b/GreenshotJiraPlugin/GreenshotJiraPlugin.csproj index b29d53140..c02d68b99 100644 --- a/GreenshotJiraPlugin/GreenshotJiraPlugin.csproj +++ b/GreenshotJiraPlugin/GreenshotJiraPlugin.csproj @@ -6,7 +6,7 @@ Library GreenshotJiraPlugin GreenshotJiraPlugin - v4.5 + v4.7.1 Properties False False @@ -32,6 +32,9 @@ false + + true + @@ -46,9 +49,6 @@ ..\packages\Dapplo.Log.1.0.23\lib\net45\Dapplo.Log.dll True - - ..\Greenshot\Lib\log4net.dll - @@ -118,7 +118,6 @@ Always - JiraPlugin.cs @@ -133,6 +132,17 @@ Greenshot + + + 0.5.12 + + + 1.2.0 + + + 2.0.8 + + mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)" "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)\*.gsp" diff --git a/GreenshotJiraPlugin/packages.config b/GreenshotJiraPlugin/packages.config deleted file mode 100644 index 3562425cc..000000000 --- a/GreenshotJiraPlugin/packages.config +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/GreenshotOCRCommand/GreenshotOCRCommand.csproj b/GreenshotOCRCommand/GreenshotOCRCommand.csproj index b9645113d..919f92df3 100644 --- a/GreenshotOCRCommand/GreenshotOCRCommand.csproj +++ b/GreenshotOCRCommand/GreenshotOCRCommand.csproj @@ -10,7 +10,7 @@ Properties GreenshotOCRCommand GreenshotOCRCommand - v2.0 + v4.7.1 512 OnBuildSuccess False @@ -25,6 +25,7 @@ 3.5 + full @@ -34,6 +35,7 @@ prompt 4 true + false None @@ -43,10 +45,14 @@ prompt 4 false + false GreenshotOCRCommand.Program + + true + diff --git a/GreenshotOCRPlugin/GreenshotOCRPlugin.csproj b/GreenshotOCRPlugin/GreenshotOCRPlugin.csproj index 22257a2c1..8d4a1e065 100644 --- a/GreenshotOCRPlugin/GreenshotOCRPlugin.csproj +++ b/GreenshotOCRPlugin/GreenshotOCRPlugin.csproj @@ -6,7 +6,7 @@ Library GreenshotOCR GreenshotOCRPlugin - v2.0 + v4.7.1 Properties False False @@ -20,11 +20,23 @@ + + false + + + false + + + false + + + false + + + true + - - ..\Greenshot\Lib\log4net.dll - @@ -63,6 +75,11 @@ GreenshotPlugin + + + 2.0.8 + + mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)" copy "$(ProjectDir)bin\$(Configuration)\$(TargetFileName)" "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)\*.gsp" diff --git a/GreenshotOfficePlugin/Destinations/OneNoteDestination.cs b/GreenshotOfficePlugin/Destinations/OneNoteDestination.cs index e6b677596..6c31e5832 100644 --- a/GreenshotOfficePlugin/Destinations/OneNoteDestination.cs +++ b/GreenshotOfficePlugin/Destinations/OneNoteDestination.cs @@ -1,20 +1,20 @@ /* * Greenshot - a free and open source screenshot tool * Copyright (C) 2007-2016 Thomas Braun, Jens Klingen, Robin Krom - * + * * For more information see: http://getgreenshot.org/ * The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 1 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -43,9 +43,9 @@ namespace GreenshotOfficePlugin { exePath = null; } } - + public OneNoteDestination() { - + } public OneNoteDestination(OneNotePage page) { @@ -73,7 +73,7 @@ namespace GreenshotOfficePlugin { return 4; } } - + public override bool IsDynamic { get { return true; diff --git a/GreenshotOfficePlugin/GreenshotOfficePlugin.csproj b/GreenshotOfficePlugin/GreenshotOfficePlugin.csproj index 43f976544..10f7c9728 100644 --- a/GreenshotOfficePlugin/GreenshotOfficePlugin.csproj +++ b/GreenshotOfficePlugin/GreenshotOfficePlugin.csproj @@ -7,7 +7,7 @@ Library GreenshotOfficePlugin GreenshotOfficePlugin - v2.0 + v4.7.1 Properties OnBuildSuccess False @@ -44,10 +44,22 @@ False TRACE + + false + + + false + + + false + + + false + + + true + - - ..\Greenshot\Lib\log4net.dll - @@ -82,7 +94,11 @@ GreenshotPlugin - + + + 2.0.8 + + mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Plugins\$(ProjectName)" diff --git a/GreenshotPhotobucketPlugin/GreenshotPhotobucketPlugin.csproj b/GreenshotPhotobucketPlugin/GreenshotPhotobucketPlugin.csproj index 140a7d927..47b3c614e 100644 --- a/GreenshotPhotobucketPlugin/GreenshotPhotobucketPlugin.csproj +++ b/GreenshotPhotobucketPlugin/GreenshotPhotobucketPlugin.csproj @@ -6,7 +6,7 @@ Library GreenshotPhotobucketPlugin GreenshotPhotobucketPlugin - v2.0 + v4.7.1 Properties False False @@ -20,11 +20,23 @@ 3.5 + + false + + + false + + + false + + + false + + + true + - - ..\Greenshot\Lib\log4net.dll - @@ -72,6 +84,11 @@ GreenshotPlugin + + + 2.0.8 + + if exist "$(ProjectDir)PhotobucketCredentials.private.cs" ( diff --git a/GreenshotPicasaPlugin/GreenshotPicasaPlugin.csproj b/GreenshotPicasaPlugin/GreenshotPicasaPlugin.csproj index 5a7327910..7d5692d66 100644 --- a/GreenshotPicasaPlugin/GreenshotPicasaPlugin.csproj +++ b/GreenshotPicasaPlugin/GreenshotPicasaPlugin.csproj @@ -6,7 +6,7 @@ Library GreenshotPicasaPlugin GreenshotPicasaPlugin - v2.0 + v4.7.1 Properties False False @@ -20,12 +20,23 @@ + + false + + + false + + + false + + + false + + + true + - - False - ..\Greenshot\lib\log4net.dll - @@ -70,6 +81,11 @@ + + + 2.0.8 + + if exist "$(ProjectDir)PicasaCredentials.orig.cs" ( rename "$(ProjectDir)PicasaCredentials.cs" "PicasaCredentials.private.cs" diff --git a/GreenshotPlugin/GreenshotPlugin.csproj b/GreenshotPlugin/GreenshotPlugin.csproj index b70cffad7..aa506f1b9 100644 --- a/GreenshotPlugin/GreenshotPlugin.csproj +++ b/GreenshotPlugin/GreenshotPlugin.csproj @@ -6,7 +6,7 @@ Library GreenshotPlugin GreenshotPlugin - v2.0 + v4.7.1 Properties OnBuildSuccess True @@ -20,17 +20,25 @@ 3.5 + + false + + + false + + + false + + + false + + + true + - - ..\packages\LinqBridge.1.3.0\lib\net20\LinqBridge.dll - True - - - ..\Greenshot\Lib\log4net.dll - @@ -238,6 +246,8 @@ - + + 2.0.8 + \ No newline at end of file diff --git a/GreenshotPlugin/packages.config b/GreenshotPlugin/packages.config deleted file mode 100644 index 6003a80e6..000000000 --- a/GreenshotPlugin/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/GreenshotWin10Plugin/GreenshotWin10Plugin.csproj b/GreenshotWin10Plugin/GreenshotWin10Plugin.csproj index c2af2069e..8166eca94 100644 --- a/GreenshotWin10Plugin/GreenshotWin10Plugin.csproj +++ b/GreenshotWin10Plugin/GreenshotWin10Plugin.csproj @@ -10,10 +10,12 @@ Properties GreenshotWin10Plugin GreenshotWin10Plugin - v4.5 + v4.7.1 512 8.1 + + true @@ -32,6 +34,9 @@ prompt 4 + + true + @@ -56,25 +61,21 @@ - - False - ..\Greenshot\lib\log4net.dll - - - False - C:\Windows\Microsoft.NET\Framework\v4.0.30319\System.Runtime.WindowsRuntime.dll - global - - - C:\Program Files (x86)\Windows Kits\10\UnionMetadata\Windows.winmd - {5B924697-4DCD-4F98-85F1-105CB84B7341} GreenshotPlugin + + + 2.0.8 + + + 10.0.18362.2005 + +