github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-19 21:13:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed build, made Box API V2 work with .NET3.5 unfortunately this means people with .NET 2.0 can't use the box plugin anymore.

Browse source
This commit is contained in:
RKrom 2013-12-11 17:33:08 +01:00
commit ba0c9d0010
5 changed files with 15 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Greenshot/releases/appinfo.ini.template
View file

@ -1,6 +1,6 @@
[Format]
Type=PortableApps.comFormat
Version=2.0
Version=@GITVERSION@
[Details]
Name=Greenshot Portable
@ -8,7 +8,7 @@ AppID=Greenshot_for_PortableApps
Publisher=Greenshot
Homepage=getgreenshot.org
Category=Graphics & Pictures
Description=The great Greenshot tool
Description=Greenshot tool
Language=Multilingual
Trademarks=
InstallType=
@ -21,15 +21,15 @@ CommercialUse=true
EULAVersion=true
[Version]
PackageVersion=1.1.6.$WCREV$
DisplayVersion=1.1.6.$WCREV$
PackageVersion=@GITDETAILVERSION@
DisplayVersion=@GITVERSION@
[SpecialPaths]
Plugins=NONE
[Dependencies]
UsesJava=false
UsesDotNetVersion=2.0
UsesDotNetVersion=4.5
[Control]
Icons=1

2
Greenshot/releases/innosetup/setup.iss.template
View file

@ -306,7 +306,7 @@ Name: "plugins\imgur"; Description: {cm:imgur}; Types: default full custom; Flag
Name: "plugins\confluence"; Description: {cm:confluence}; Types: full custom; Flags: disablenouninstallwarning; Check: hasDotNet35FullOrHigher()
Name: "plugins\externalcommand"; Description: {cm:externalcommand}; Types: default full custom; Flags: disablenouninstallwarning
;Name: "plugins\networkimport"; Description: "Network Import Plugin"; Types: full
Name: "plugins\box"; Description: "Box Plugin"; Types: full custom; Flags: disablenouninstallwarning
Name: "plugins\box"; Description: "Box Plugin"; Types: full custom; Flags: disablenouninstallwarning; Check: hasDotNet35FullOrHigher()
Name: "plugins\dropbox"; Description: "Dropbox Plugin"; Types: full custom; Flags: disablenouninstallwarning
Name: "plugins\flickr"; Description: "Flickr Plugin"; Types: full custom; Flags: disablenouninstallwarning
Name: "plugins\picasa"; Description: "Picasa Plugin"; Types: full custom; Flags: disablenouninstallwarning

18
GreenshotBoxPlugin/BoxUtils.cs
View file

@ -216,23 +216,5 @@ namespace GreenshotBoxPlugin {
return (T)deserializer.ReadObject(stream);
}
}
/// <summary>
/// Helper method to parse JSON to object
/// </summary>
/// <typeparam name="T"></typeparam>
/// <param name="jsonString"></param>
/// <returns></returns>
public static T DeserializeWithDirectory<T>(string jsonString) {
DataContractJsonSerializerSettings settings = new DataContractJsonSerializerSettings();
settings.UseSimpleDictionaryFormat = true;
var deserializer = new DataContractJsonSerializer(typeof(T), settings);
using (MemoryStream stream = new MemoryStream()) {
byte[] content = Encoding.UTF8.GetBytes(jsonString);
stream.Write(content, 0, content.Length);
stream.Seek(0, SeekOrigin.Begin);
return (T)deserializer.ReadObject(stream);
}
}
}
}

3
GreenshotBoxPlugin/GreenshotBoxPlugin.csproj
View file

@ -6,7 +6,7 @@
<OutputType>Library</OutputType>
<RootNamespace>GreenshotBoxPlugin</RootNamespace>
<AssemblyName>GreenshotBoxPlugin</AssemblyName>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<AppDesignerFolder>Properties</AppDesignerFolder>
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>
<NoStdLib>False</NoStdLib>
@ -26,6 +26,7 @@
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
<Reference Include="System.ServiceModel.Web" />
</ItemGroup>
<ItemGroup>
<Compile Include="BoxConfiguration.cs" />

16
build.ps1
View file

@ -150,7 +150,6 @@ Function PackagePortable {
@( "$sourcebase\checksum.MD5",
"$sourcebase\Greenshot.exe.config",
"$sourcebase\GreenshotPlugin.dll",
"$sourcebase\GreenshotEditor.dll",
"$destbase\additional_files\*.txt" ) | foreach { Copy-Item $_ "$destbase\portabletmp\App\Greenshot\" }
Copy-Item -Path "$sourcebase\Languages\help-en-US.html" -Destination "$destbase\portabletmp\help.html"
@ -210,7 +209,6 @@ Function PackageZip {
"$sourcebase\Greenshot.exe",
"$sourcebase\Greenshot.exe.config",
"$sourcebase\GreenshotPlugin.dll",
"$sourcebase\GreenshotEditor.dll",
"$destbase\additional_files\*.txt" ) | foreach { Copy-Item $_ "$destinstaller\" }
$zipOutput = "$(get-location)\zip"
@ -264,8 +262,8 @@ WaitForKey
# SIG # Begin signature block
# MIIEtAYJKoZIhvcNAQcCoIIEpTCCBKECAQExCzAJBgUrDgMCGgUAMGkGCisGAQQB
# gjcCAQSgWzBZMDQGCisGAQQBgjcCAR4wJgIDAQAABBAfzDtgWUsITrck0sYpfvNR
# AgEAAgEAAgEAAgEAAgEAMCEwCQYFKw4DAhoFAAQUrj4gCFRpu7VRoh4bzyfOF1yt
# w+6gggK+MIICujCCAaagAwIBAgIQyoRJHMJDVbNFmmfObt+Y4DAJBgUrDgMCHQUA
# AgEAAgEAAgEAAgEAAgEAMCEwCQYFKw4DAhoFAAQUlmS1LJgo97UtV5POMlFuE9iS
# yWegggK+MIICujCCAaagAwIBAgIQyoRJHMJDVbNFmmfObt+Y4DAJBgUrDgMCHQUA
# MCwxKjAoBgNVBAMTIVBvd2VyU2hlbGwgTG9jYWwgQ2VydGlmaWNhdGUgUm9vdDAe
# Fw0xMzExMjYxOTMxMTVaFw0zOTEyMzEyMzU5NTlaMBoxGDAWBgNVBAMTD1Bvd2Vy
# U2hlbGwgVXNlcjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0SEsL7kNLoYA
@ -283,9 +281,9 @@ WaitForKey
# QDAsMSowKAYDVQQDEyFQb3dlclNoZWxsIExvY2FsIENlcnRpZmljYXRlIFJvb3QC
# EMqESRzCQ1WzRZpnzm7fmOAwCQYFKw4DAhoFAKB4MBgGCisGAQQBgjcCAQwxCjAI
# oAKAAKECgAAwGQYJKoZIhvcNAQkDMQwGCisGAQQBgjcCAQQwHAYKKwYBBAGCNwIB
# CzEOMAwGCisGAQQBgjcCARUwIwYJKoZIhvcNAQkEMRYEFH5N3rkoNAqfwfm9+NWz
# e956GSjEMA0GCSqGSIb3DQEBAQUABIGAnNDXqL2r7NpwSzqCO8ceO9mhf1b3hlG7
# OaavA85n73okZ/+V0xrCh9no3HZGOiQop8ER+QqKcOaoePwMkEySt2lhBkCB8hyr
# kH3qaJdksld5E/m1LXm/b0A/6dmDahcn1LMDKndisayPup43K2SNCv4iewnp6hhB
# uI1p0ciFDRc=
# CzEOMAwGCisGAQQBgjcCARUwIwYJKoZIhvcNAQkEMRYEFPy89grwAkqkUfIWJQR1
# N5zo3qVVMA0GCSqGSIb3DQEBAQUABIGAsOLH02OKRs6Sq8JtHFX2BzwE79LnqP5h
# 106pDkybKDKsI/dX9VXsKFwxiScAOueKWWL+QAnb3kDp6Ozd4m1XTACjKZ2UVwKI
# UmXZQP8nUzbtgmafwgrJngZ24gRON5dVO4RayeXXUu9tWiQg9F6kzo5linh6K0iC
# Z+9uQPBDOYs=
# SIG # End signature block