github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-22 22:34:27 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Small optimizing steps

Browse source
This commit is contained in:
Robin 2018-07-05 09:23:30 +02:00
commit 8288d290b6
62 changed files with 144 additions and 188 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/CommonProject.properties
View file

@ -2,7 +2,8 @@
<Project ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<Prefer32Bit>false</Prefer32Bit> <Prefer32Bit>false</Prefer32Bit>
<LangVersion>7.2</LangVersion> <LangVersion>latest</LangVersion>
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<NoWarn>1685</NoWarn> <NoWarn>1685</NoWarn>
@ -11,7 +12,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants> <DefineConstants>DEBUG;TRACE</DefineConstants>
<CheckForOverflowUnderflow>true</CheckForOverflowUnderflow> <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
<FileAlignment>4096</FileAlignment> <FileAlignment>4096</FileAlignment>
<DebugType>Full</DebugType> <DebugType>pdbonly</DebugType>
<PlatformTarget>x86</PlatformTarget> <PlatformTarget>x86</PlatformTarget>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies> <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
</PropertyGroup> </PropertyGroup>
@ -22,7 +23,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants> <DefineConstants>DEBUG;TRACE</DefineConstants>
<CheckForOverflowUnderflow>true</CheckForOverflowUnderflow> <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
<FileAlignment>4096</FileAlignment> <FileAlignment>4096</FileAlignment>
<DebugType>Full</DebugType> <DebugType>pdbonly</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget> <PlatformTarget>AnyCPU</PlatformTarget>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies> <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
</PropertyGroup> </PropertyGroup>

8
src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj
View file

@ -46,11 +46,11 @@
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL"> <Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath> <HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.68.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.68\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.68.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.68\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.54.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.54.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>

4
src/Greenshot.Addon.Box/packages.config
View file

@ -6,8 +6,8 @@
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net46" /> <package id="Caliburn.Micro" version="3.2.0" targetFramework="net46" />
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" /> <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" />
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" /> <package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
<package id="Dapplo.Addons" version="1.0.66" targetFramework="net461" /> <package id="Dapplo.Addons" version="1.0.68" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.66" targetFramework="net461" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.68" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.54" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro" version="1.0.54" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.54" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.54" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.54" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.54" targetFramework="net461" />

1
src/Greenshot.Addon.Confluence/ConfluenceAddonModule.cs
View file

@ -24,7 +24,6 @@
using Autofac; using Autofac;
using Dapplo.Addons; using Dapplo.Addons;
using Dapplo.CaliburnMicro.Configuration; using Dapplo.CaliburnMicro.Configuration;
using Dapplo.CaliburnMicro.Translations;
using Dapplo.Ini; using Dapplo.Ini;
using Dapplo.Language; using Dapplo.Language;
using Greenshot.Addon.Confluence.ViewModels; using Greenshot.Addon.Confluence.ViewModels;

27
src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj
View file

@ -2,7 +2,6 @@
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\CommonProject.properties" /> <Import Project="..\CommonProject.properties" />
<PropertyGroup> <PropertyGroup>
<NoWarn>1685</NoWarn>
<ProjectGuid>{C3052651-598A-44E2-AAB3-2E41311D50F9}</ProjectGuid> <ProjectGuid>{C3052651-598A-44E2-AAB3-2E41311D50F9}</ProjectGuid>
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
@ -14,9 +13,7 @@
<NoStdLib>False</NoStdLib> <NoStdLib>False</NoStdLib>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors> <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent> <TargetFrameworkProfile />
<TargetFrameworkProfile>
</TargetFrameworkProfile>
<FileUpgradeFlags> <FileUpgradeFlags>
</FileUpgradeFlags> </FileUpgradeFlags>
<UpgradeBackupLocation> <UpgradeBackupLocation>
@ -25,20 +22,6 @@
<NuGetPackageImportStamp> <NuGetPackageImportStamp>
</NuGetPackageImportStamp> </NuGetPackageImportStamp>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
<Prefer32Bit>false</Prefer32Bit>
<LangVersion>latest</LangVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
<Prefer32Bit>false</Prefer32Bit>
<LangVersion>latest</LangVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" /> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
<ItemGroup> <ItemGroup>
<Reference Include="Autofac, Version=4.8.1.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL"> <Reference Include="Autofac, Version=4.8.1.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
@ -65,11 +48,11 @@
<Reference Include="Costura, Version=3.1.0.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL"> <Reference Include="Costura, Version=3.1.0.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
<HintPath>..\packages\Costura.Fody.3.1.0\lib\net46\Costura.dll</HintPath> <HintPath>..\packages\Costura.Fody.3.1.0\lib\net46\Costura.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.68.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.68\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.68.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.68\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.54.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.54.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>

4
src/Greenshot.Addon.Confluence/packages.config
View file

@ -7,8 +7,8 @@
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" /> <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" />
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" /> <package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
<package id="Costura.Fody" version="3.1.0" targetFramework="net46" /> <package id="Costura.Fody" version="3.1.0" targetFramework="net46" />
<package id="Dapplo.Addons" version="1.0.66" targetFramework="net461" /> <package id="Dapplo.Addons" version="1.0.68" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.66" targetFramework="net461" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.68" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.54" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro" version="1.0.54" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.54" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.54" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.54" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.54" targetFramework="net461" />

1
src/Greenshot.Addon.Dropbox/DropboxAddonModule.cs
View file

@ -24,7 +24,6 @@
using Autofac; using Autofac;
using Dapplo.Addons; using Dapplo.Addons;
using Dapplo.CaliburnMicro.Configuration; using Dapplo.CaliburnMicro.Configuration;
using Dapplo.CaliburnMicro.Translations;
using Dapplo.Ini; using Dapplo.Ini;
using Dapplo.Language; using Dapplo.Language;
using Greenshot.Addon.Dropbox.ViewModels; using Greenshot.Addon.Dropbox.ViewModels;

23
src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj
View file

@ -13,7 +13,6 @@
<NoStdLib>False</NoStdLib> <NoStdLib>False</NoStdLib>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors> <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<RunPostBuildEvent>Always</RunPostBuildEvent>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
<FileUpgradeFlags> <FileUpgradeFlags>
</FileUpgradeFlags> </FileUpgradeFlags>
@ -21,20 +20,6 @@
</UpgradeBackupLocation> </UpgradeBackupLocation>
<OldToolsVersion>3.5</OldToolsVersion> <OldToolsVersion>3.5</OldToolsVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
<Prefer32Bit>false</Prefer32Bit>
<LangVersion>latest</LangVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
<Prefer32Bit>false</Prefer32Bit>
<LangVersion>latest</LangVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" /> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
<ItemGroup> <ItemGroup>
<Reference Include="Autofac, Version=4.8.1.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL"> <Reference Include="Autofac, Version=4.8.1.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
@ -58,11 +43,11 @@
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL"> <Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath> <HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.68.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.68\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.68.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.68\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.54.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.54.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>

4
src/Greenshot.Addon.Dropbox/packages.config
View file

@ -6,8 +6,8 @@
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net46" /> <package id="Caliburn.Micro" version="3.2.0" targetFramework="net46" />
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" /> <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" />
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" /> <package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
<package id="Dapplo.Addons" version="1.0.66" targetFramework="net461" /> <package id="Dapplo.Addons" version="1.0.68" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.66" targetFramework="net461" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.68" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.54" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro" version="1.0.54" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.54" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.54" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.54" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.54" targetFramework="net461" />

8
src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj
View file

@ -61,11 +61,11 @@
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL"> <Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath> <HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.68.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.68\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.68.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.68\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.54.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.54.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>

4
src/Greenshot.Addon.ExternalCommand/packages.config
View file

@ -7,8 +7,8 @@
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" /> <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" />
<package id="CliWrap" version="1.8.5" targetFramework="net46" /> <package id="CliWrap" version="1.8.5" targetFramework="net46" />
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" /> <package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
<package id="Dapplo.Addons" version="1.0.66" targetFramework="net461" /> <package id="Dapplo.Addons" version="1.0.68" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.66" targetFramework="net461" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.68" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.54" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro" version="1.0.54" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.54" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.54" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.54" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.54" targetFramework="net461" />

1
src/Greenshot.Addon.Flickr/FlickrAddonModule.cs
View file

@ -24,7 +24,6 @@
using Autofac; using Autofac;
using Dapplo.Addons; using Dapplo.Addons;
using Dapplo.CaliburnMicro.Configuration; using Dapplo.CaliburnMicro.Configuration;
using Dapplo.CaliburnMicro.Translations;
using Dapplo.Ini; using Dapplo.Ini;
using Dapplo.Language; using Dapplo.Language;
using Greenshot.Addon.Flickr.ViewModels; using Greenshot.Addon.Flickr.ViewModels;

4
src/Greenshot.Addon.Flickr/FlickrDestination.cs
View file

@ -38,7 +38,6 @@ using Autofac.Features.OwnedInstances;
using Dapplo.Addons; using Dapplo.Addons;
using Dapplo.HttpExtensions; using Dapplo.HttpExtensions;
using Dapplo.HttpExtensions.Extensions; using Dapplo.HttpExtensions.Extensions;
using Dapplo.HttpExtensions.Listener;
using Dapplo.HttpExtensions.OAuth; using Dapplo.HttpExtensions.OAuth;
using Dapplo.Log; using Dapplo.Log;
using Dapplo.Windows.Clipboard; using Dapplo.Windows.Clipboard;
@ -112,8 +111,9 @@ namespace Greenshot.Addon.Flickr
{OAuth1Parameters.Token.EnumValueOf(), "{RequestToken}"}, {OAuth1Parameters.Token.EnumValueOf(), "{RequestToken}"},
{OAuth1Parameters.Callback.EnumValueOf(), "{RedirectUrl}"} {OAuth1Parameters.Callback.EnumValueOf(), "{RedirectUrl}"}
}), }),
// TODO: Remove this, use Greenshot redirect like with Imgur, doesn't work anyway
// Create a localhost redirect uri, prefer port 47336, but use the first free found // Create a localhost redirect uri, prefer port 47336, but use the first free found
RedirectUrl = new[] { 47336, 0 }.CreateLocalHostUri().AbsoluteUri, RedirectUrl = "http://localhost:47336",//new[] { 47336 }.CreateLocalHostUri().AbsoluteUri,
CheckVerifier = true CheckVerifier = true
}; };

8
src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj
View file

@ -58,11 +58,11 @@
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL"> <Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath> <HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.68.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.68\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.68.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.68\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.54.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.54.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>

4
src/Greenshot.Addon.Flickr/packages.config
View file

@ -6,8 +6,8 @@
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net46" /> <package id="Caliburn.Micro" version="3.2.0" targetFramework="net46" />
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" /> <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" />
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" /> <package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
<package id="Dapplo.Addons" version="1.0.66" targetFramework="net461" /> <package id="Dapplo.Addons" version="1.0.68" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.66" targetFramework="net461" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.68" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.54" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro" version="1.0.54" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.54" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.54" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.54" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.54" targetFramework="net461" />

1
src/Greenshot.Addon.GooglePhotos/GooglePhotosAddonModule.cs
View file

@ -24,7 +24,6 @@
using Autofac; using Autofac;
using Dapplo.Addons; using Dapplo.Addons;
using Dapplo.CaliburnMicro.Configuration; using Dapplo.CaliburnMicro.Configuration;
using Dapplo.CaliburnMicro.Translations;
using Dapplo.Ini; using Dapplo.Ini;
using Dapplo.Language; using Dapplo.Language;
using Greenshot.Addon.GooglePhotos.ViewModels; using Greenshot.Addon.GooglePhotos.ViewModels;

8
src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj
View file

@ -44,11 +44,11 @@
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL"> <Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath> <HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.68.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.68\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.68.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.68\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.54.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.54.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>

4
src/Greenshot.Addon.GooglePhotos/packages.config
View file

@ -6,8 +6,8 @@
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net46" /> <package id="Caliburn.Micro" version="3.2.0" targetFramework="net46" />
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" /> <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" />
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" /> <package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
<package id="Dapplo.Addons" version="1.0.66" targetFramework="net461" /> <package id="Dapplo.Addons" version="1.0.68" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.66" targetFramework="net461" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.68" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.54" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro" version="1.0.54" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.54" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.54" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.54" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.54" targetFramework="net461" />

8
src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj
View file

@ -63,11 +63,11 @@
<Reference Include="ControlzEx, Version=3.0.2.4, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="ControlzEx, Version=3.0.2.4, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll</HintPath> <HintPath>..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.68.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.68\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.68.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.68\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.54.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.54.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>

1
src/Greenshot.Addon.Imgur/ImgurAddonModule.cs
View file

@ -24,7 +24,6 @@
using Autofac; using Autofac;
using Dapplo.Addons; using Dapplo.Addons;
using Dapplo.CaliburnMicro.Configuration; using Dapplo.CaliburnMicro.Configuration;
using Dapplo.CaliburnMicro.Translations;
using Dapplo.Ini; using Dapplo.Ini;
using Dapplo.Language; using Dapplo.Language;
using Greenshot.Addon.Imgur.ViewModels; using Greenshot.Addon.Imgur.ViewModels;

4
src/Greenshot.Addon.Imgur/packages.config
View file

@ -7,8 +7,8 @@
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" /> <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" />
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" /> <package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
<package id="ControlzEx" version="3.0.2.4" targetFramework="net46" /> <package id="ControlzEx" version="3.0.2.4" targetFramework="net46" />
<package id="Dapplo.Addons" version="1.0.66" targetFramework="net461" /> <package id="Dapplo.Addons" version="1.0.68" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.66" targetFramework="net461" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.68" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.54" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro" version="1.0.54" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.54" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.54" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.54" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.54" targetFramework="net461" />

8
src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj
View file

@ -63,11 +63,11 @@
<Reference Include="Costura, Version=3.1.0.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL"> <Reference Include="Costura, Version=3.1.0.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
<HintPath>..\packages\Costura.Fody.3.1.0\lib\net46\Costura.dll</HintPath> <HintPath>..\packages\Costura.Fody.3.1.0\lib\net46\Costura.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.68.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.68\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.68.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.68\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.54.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.54.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>

1
src/Greenshot.Addon.Jira/JiraAddonModule.cs
View file

@ -24,7 +24,6 @@
using Autofac; using Autofac;
using Dapplo.Addons; using Dapplo.Addons;
using Dapplo.CaliburnMicro.Configuration; using Dapplo.CaliburnMicro.Configuration;
using Dapplo.CaliburnMicro.Translations;
using Dapplo.Ini; using Dapplo.Ini;
using Dapplo.Language; using Dapplo.Language;
using Greenshot.Addon.Jira.ViewModels; using Greenshot.Addon.Jira.ViewModels;

4
src/Greenshot.Addon.Jira/packages.config
View file

@ -7,8 +7,8 @@
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" /> <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" />
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" /> <package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
<package id="Costura.Fody" version="3.1.0" targetFramework="net46" developmentDependency="true" /> <package id="Costura.Fody" version="3.1.0" targetFramework="net46" developmentDependency="true" />
<package id="Dapplo.Addons" version="1.0.66" targetFramework="net461" /> <package id="Dapplo.Addons" version="1.0.68" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.66" targetFramework="net461" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.68" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.54" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro" version="1.0.54" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.54" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.54" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.54" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.54" targetFramework="net461" />

1
src/Greenshot.Addon.LegacyEditor/EditorAddonModule.cs
View file

@ -24,7 +24,6 @@
using Autofac; using Autofac;
using Dapplo.Addons; using Dapplo.Addons;
using Dapplo.CaliburnMicro.Configuration; using Dapplo.CaliburnMicro.Configuration;
using Dapplo.CaliburnMicro.Translations;
using Dapplo.Ini; using Dapplo.Ini;
using Dapplo.Language; using Dapplo.Language;
using Greenshot.Addon.LegacyEditor.Controls; using Greenshot.Addon.LegacyEditor.Controls;

8
src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj
View file

@ -43,11 +43,11 @@
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL"> <Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath> <HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.68.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.68\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.68.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.68\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.54.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.54.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>

4
src/Greenshot.Addon.LegacyEditor/packages.config
View file

@ -6,8 +6,8 @@
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net46" /> <package id="Caliburn.Micro" version="3.2.0" targetFramework="net46" />
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" /> <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" />
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" /> <package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
<package id="Dapplo.Addons" version="1.0.66" targetFramework="net461" /> <package id="Dapplo.Addons" version="1.0.68" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.66" targetFramework="net461" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.68" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.54" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro" version="1.0.54" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.54" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.54" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.54" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.54" targetFramework="net461" />

8
src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj
View file

@ -61,11 +61,11 @@
<Reference Include="ControlzEx, Version=3.0.2.4, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="ControlzEx, Version=3.0.2.4, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll</HintPath> <HintPath>..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.68.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.68\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.68.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.68\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.54.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.54.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>

1
src/Greenshot.Addon.Lutim/LutimAddonModule.cs
View file

@ -24,7 +24,6 @@
using Autofac; using Autofac;
using Dapplo.Addons; using Dapplo.Addons;
using Dapplo.CaliburnMicro.Configuration; using Dapplo.CaliburnMicro.Configuration;
using Dapplo.CaliburnMicro.Translations;
using Dapplo.Ini; using Dapplo.Ini;
using Dapplo.Language; using Dapplo.Language;
using Greenshot.Addon.Lutim.ViewModels; using Greenshot.Addon.Lutim.ViewModels;

4
src/Greenshot.Addon.Lutim/packages.config
View file

@ -7,8 +7,8 @@
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" /> <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" />
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" /> <package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
<package id="ControlzEx" version="3.0.2.4" targetFramework="net46" /> <package id="ControlzEx" version="3.0.2.4" targetFramework="net46" />
<package id="Dapplo.Addons" version="1.0.66" targetFramework="net461" /> <package id="Dapplo.Addons" version="1.0.68" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.66" targetFramework="net461" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.68" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.54" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro" version="1.0.54" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.54" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.54" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.54" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.54" targetFramework="net461" />

8
src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj
View file

@ -58,11 +58,11 @@
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL"> <Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath> <HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.68.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.68\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.68.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.68\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.54.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.54.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>

1
src/Greenshot.Addon.OCR/OcrAddonModule.cs
View file

@ -26,7 +26,6 @@ using System.IO;
using Autofac; using Autofac;
using Dapplo.Addons; using Dapplo.Addons;
using Dapplo.Addons.Bootstrapper.Resolving; using Dapplo.Addons.Bootstrapper.Resolving;
using Dapplo.CaliburnMicro.Translations;
using Dapplo.Ini; using Dapplo.Ini;
using Dapplo.Language; using Dapplo.Language;
using Greenshot.Addons.Components; using Greenshot.Addons.Components;

4
src/Greenshot.Addon.OCR/packages.config
View file

@ -6,8 +6,8 @@
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net46" /> <package id="Caliburn.Micro" version="3.2.0" targetFramework="net46" />
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" /> <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" />
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" /> <package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
<package id="Dapplo.Addons" version="1.0.66" targetFramework="net461" /> <package id="Dapplo.Addons" version="1.0.68" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.66" targetFramework="net461" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.68" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.54" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro" version="1.0.54" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.54" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.54" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.54" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.54" targetFramework="net461" />

8
src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj
View file

@ -45,11 +45,11 @@
<Reference Include="Costura, Version=3.1.0.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL"> <Reference Include="Costura, Version=3.1.0.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
<HintPath>..\packages\Costura.Fody.3.1.0\lib\net46\Costura.dll</HintPath> <HintPath>..\packages\Costura.Fody.3.1.0\lib\net46\Costura.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.68.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.68\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.68.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.68\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.54.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.54.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>

1
src/Greenshot.Addon.Office/OfficeAddonModule.cs
View file

@ -24,7 +24,6 @@
using Autofac; using Autofac;
using Dapplo.Addons; using Dapplo.Addons;
using Dapplo.CaliburnMicro.Configuration; using Dapplo.CaliburnMicro.Configuration;
using Dapplo.CaliburnMicro.Translations;
using Dapplo.Ini; using Dapplo.Ini;
using Dapplo.Language; using Dapplo.Language;
using Greenshot.Addon.Office.Destinations; using Greenshot.Addon.Office.Destinations;

4
src/Greenshot.Addon.Office/packages.config
View file

@ -7,8 +7,8 @@
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" /> <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" />
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" /> <package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
<package id="Costura.Fody" version="3.1.0" targetFramework="net46" developmentDependency="true" /> <package id="Costura.Fody" version="3.1.0" targetFramework="net46" developmentDependency="true" />
<package id="Dapplo.Addons" version="1.0.66" targetFramework="net461" /> <package id="Dapplo.Addons" version="1.0.68" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.66" targetFramework="net461" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.68" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.54" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro" version="1.0.54" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.54" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.54" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.54" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.54" targetFramework="net461" />

8
src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj
View file

@ -57,11 +57,11 @@
<Reference Include="ControlzEx, Version=3.0.2.4, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="ControlzEx, Version=3.0.2.4, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll</HintPath> <HintPath>..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.68.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.68\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.68.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.68\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.54.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.54.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>

1
src/Greenshot.Addon.OneDrive/OneDriveAddonModule.cs
View file

@ -24,7 +24,6 @@
using Autofac; using Autofac;
using Dapplo.Addons; using Dapplo.Addons;
using Dapplo.CaliburnMicro.Configuration; using Dapplo.CaliburnMicro.Configuration;
using Dapplo.CaliburnMicro.Translations;
using Dapplo.Ini; using Dapplo.Ini;
using Dapplo.Language; using Dapplo.Language;
using Greenshot.Addon.OneDrive.ViewModels; using Greenshot.Addon.OneDrive.ViewModels;

4
src/Greenshot.Addon.OneDrive/packages.config
View file

@ -7,8 +7,8 @@
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" /> <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" />
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" /> <package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
<package id="ControlzEx" version="3.0.2.4" targetFramework="net46" /> <package id="ControlzEx" version="3.0.2.4" targetFramework="net46" />
<package id="Dapplo.Addons" version="1.0.66" targetFramework="net461" /> <package id="Dapplo.Addons" version="1.0.68" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.66" targetFramework="net461" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.68" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.54" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro" version="1.0.54" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.54" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.54" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.54" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.54" targetFramework="net461" />

8
src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj
View file

@ -58,11 +58,11 @@
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL"> <Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath> <HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.68.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.68\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.68.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.68\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.54.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.54.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>

1
src/Greenshot.Addon.Photobucket/PhotobucketAddonModule.cs
View file

@ -24,7 +24,6 @@
using Autofac; using Autofac;
using Dapplo.Addons; using Dapplo.Addons;
using Dapplo.CaliburnMicro.Configuration; using Dapplo.CaliburnMicro.Configuration;
using Dapplo.CaliburnMicro.Translations;
using Dapplo.Ini; using Dapplo.Ini;
using Dapplo.Language; using Dapplo.Language;
using Greenshot.Addon.Photobucket.ViewModels; using Greenshot.Addon.Photobucket.ViewModels;

4
src/Greenshot.Addon.Photobucket/packages.config
View file

@ -6,8 +6,8 @@
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net46" /> <package id="Caliburn.Micro" version="3.2.0" targetFramework="net46" />
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" /> <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" />
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" /> <package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
<package id="Dapplo.Addons" version="1.0.66" targetFramework="net461" /> <package id="Dapplo.Addons" version="1.0.68" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.66" targetFramework="net461" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.68" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.54" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro" version="1.0.54" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.54" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.54" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.54" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.54" targetFramework="net461" />

8
src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj
View file

@ -57,11 +57,11 @@
<Reference Include="ControlzEx, Version=3.0.2.4, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="ControlzEx, Version=3.0.2.4, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll</HintPath> <HintPath>..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.68.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.68\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.68.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.68\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.54.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.54.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>

1
src/Greenshot.Addon.Tfs/TfsAddonModule.cs
View file

@ -24,7 +24,6 @@
using Autofac; using Autofac;
using Dapplo.Addons; using Dapplo.Addons;
using Dapplo.CaliburnMicro.Configuration; using Dapplo.CaliburnMicro.Configuration;
using Dapplo.CaliburnMicro.Translations;
using Dapplo.Ini; using Dapplo.Ini;
using Dapplo.Language; using Dapplo.Language;
using Greenshot.Addon.Tfs.ViewModels; using Greenshot.Addon.Tfs.ViewModels;

4
src/Greenshot.Addon.Tfs/packages.config
View file

@ -7,8 +7,8 @@
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" /> <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" />
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" /> <package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
<package id="ControlzEx" version="3.0.2.4" targetFramework="net46" /> <package id="ControlzEx" version="3.0.2.4" targetFramework="net46" />
<package id="Dapplo.Addons" version="1.0.66" targetFramework="net461" /> <package id="Dapplo.Addons" version="1.0.68" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.66" targetFramework="net461" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.68" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.54" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro" version="1.0.54" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.54" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.54" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.54" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.54" targetFramework="net461" />

8
src/Greenshot.Addons/Greenshot.Addons.csproj
View file

@ -41,11 +41,11 @@
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath> <HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
</Reference> </Reference>
<Reference Include="CustomMarshalers" /> <Reference Include="CustomMarshalers" />
<Reference Include="Dapplo.Addons, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.68.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.68\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.68.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.68\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.54.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.54.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>

4
src/Greenshot.Addons/packages.config
View file

@ -6,8 +6,8 @@
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net46" /> <package id="Caliburn.Micro" version="3.2.0" targetFramework="net46" />
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" /> <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" />
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" /> <package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
<package id="Dapplo.Addons" version="1.0.66" targetFramework="net461" /> <package id="Dapplo.Addons" version="1.0.68" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.66" targetFramework="net461" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.68" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.54" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro" version="1.0.54" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.54" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.54" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.54" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.54" targetFramework="net461" />

8
src/Greenshot.Gfx/Greenshot.Gfx.csproj
View file

@ -37,11 +37,11 @@
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL"> <Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath> <HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.68.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.68\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.68.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.68\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.54.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.54.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>

4
src/Greenshot.Gfx/packages.config
View file

@ -6,8 +6,8 @@
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net46" /> <package id="Caliburn.Micro" version="3.2.0" targetFramework="net46" />
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" /> <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net46" />
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" /> <package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
<package id="Dapplo.Addons" version="1.0.66" targetFramework="net461" /> <package id="Dapplo.Addons" version="1.0.68" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.66" targetFramework="net461" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.68" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.54" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro" version="1.0.54" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.54" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Translations" version="1.0.54" targetFramework="net461" />
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net46" /> <package id="Dapplo.Ini" version="0.5.28" targetFramework="net46" />

8
src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj
View file

@ -43,11 +43,11 @@
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL"> <Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath> <HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.68.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.68\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.68.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.68\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.54.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.54.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>

4
src/Greenshot.PerformanceTests/packages.config
View file

@ -9,8 +9,8 @@
<package id="Caliburn.Micro" version="3.2.0" targetFramework="net461" /> <package id="Caliburn.Micro" version="3.2.0" targetFramework="net461" />
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net461" /> <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net461" />
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net461" /> <package id="CommonServiceLocator" version="2.0.3" targetFramework="net461" />
<package id="Dapplo.Addons" version="1.0.66" targetFramework="net461" /> <package id="Dapplo.Addons" version="1.0.68" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.66" targetFramework="net461" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.68" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.54" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro" version="1.0.54" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.54" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Translations" version="1.0.54" targetFramework="net461" />
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net461" /> <package id="Dapplo.Ini" version="0.5.28" targetFramework="net461" />

8
src/Greenshot.Tests/Greenshot.Tests.csproj
View file

@ -72,11 +72,11 @@
<Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL"> <Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath> <HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.68.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.68\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.68.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.68\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.54.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.54.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>

4
src/Greenshot.Tests/packages.config
View file

@ -10,8 +10,8 @@
<package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net461" /> <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net461" />
<package id="CommandLineParser" version="2.2.1" targetFramework="net461" /> <package id="CommandLineParser" version="2.2.1" targetFramework="net461" />
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net461" /> <package id="CommonServiceLocator" version="2.0.3" targetFramework="net461" />
<package id="Dapplo.Addons" version="1.0.66" targetFramework="net461" /> <package id="Dapplo.Addons" version="1.0.68" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.66" targetFramework="net461" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.68" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.54" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro" version="1.0.54" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Translations" version="1.0.54" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Translations" version="1.0.54" targetFramework="net461" />
<package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net461" /> <package id="Dapplo.HttpExtensions" version="0.8.43" targetFramework="net461" />

5
src/Greenshot/App.config
View file

@ -1,12 +1,13 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<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.6.1" />
</startup> </startup>
<runtime> <runtime>
<loadFromRemoteSources enabled="true" /> <loadFromRemoteSources enabled="true" />
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <relativeBindForResources enabled="true" />
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<probing privatePath="Addons" /> <probing privatePath="Addons" />
<probing privatePath="App\Greenshot" /> <probing privatePath="App\Greenshot" />
<dependentAssembly> <dependentAssembly>

1
src/Greenshot/Components/HotkeyHandler.cs
View file

@ -27,7 +27,6 @@ using System.Linq;
using System.Text; using System.Text;
using System.Windows.Forms; using System.Windows.Forms;
using Dapplo.Addons; using Dapplo.Addons;
using Dapplo.CaliburnMicro;
using Dapplo.Log; using Dapplo.Log;
using Dapplo.Windows.Common; using Dapplo.Windows.Common;
using Greenshot.Addons; using Greenshot.Addons;

1
src/Greenshot/Components/MainFormStartup.cs
View file

@ -27,7 +27,6 @@ using System.Linq;
using System.Windows.Forms; using System.Windows.Forms;
using Autofac.Features.OwnedInstances; using Autofac.Features.OwnedInstances;
using Dapplo.Addons; using Dapplo.Addons;
using Dapplo.CaliburnMicro;
using Dapplo.Log; using Dapplo.Log;
using Greenshot.Addons.Components; using Greenshot.Addons.Components;
using Greenshot.Addons.Core; using Greenshot.Addons.Core;

1
src/Greenshot/Forms/MainForm.cs
View file

@ -46,7 +46,6 @@ using Dapplo.Windows.App;
using Dapplo.Windows.Clipboard; using Dapplo.Windows.Clipboard;
using Dapplo.Windows.Common.Structs; using Dapplo.Windows.Common.Structs;
using Dapplo.Windows.DesktopWindowsManager; using Dapplo.Windows.DesktopWindowsManager;
using Dapplo.Windows.Dpi.Enums;
using Dapplo.Windows.Dpi.Forms; using Dapplo.Windows.Dpi.Forms;
using Dapplo.Windows.Kernel32; using Dapplo.Windows.Kernel32;
using Greenshot.Addons; using Greenshot.Addons;

19
src/Greenshot/Greenshot.csproj
View file

@ -9,6 +9,7 @@
<AssemblyName>Greenshot</AssemblyName> <AssemblyName>Greenshot</AssemblyName>
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent> <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
<ApplicationIcon>icons\applicationIcon\icon.ico</ApplicationIcon> <ApplicationIcon>icons\applicationIcon\icon.ico</ApplicationIcon>
<AppDesignerFolder>Properties</AppDesignerFolder>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks> <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
<NoStdLib>False</NoStdLib> <NoStdLib>False</NoStdLib>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
@ -55,14 +56,14 @@
<Reference Include="Costura, Version=3.1.0.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL"> <Reference Include="Costura, Version=3.1.0.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
<HintPath>..\packages\Costura.Fody.3.1.0\lib\net46\Costura.dll</HintPath> <HintPath>..\packages\Costura.Fody.3.1.0\lib\net46\Costura.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons, Version=1.0.68.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.1.0.68\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.68.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.68\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.Addons.Config, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.Addons.Config, Version=1.0.68.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Config.1.0.66\lib\net46\Dapplo.Addons.Config.dll</HintPath> <HintPath>..\packages\Dapplo.Addons.Config.1.0.68\lib\net46\Dapplo.Addons.Config.dll</HintPath>
</Reference> </Reference>
<Reference Include="Dapplo.CaliburnMicro, Version=1.0.54.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Dapplo.CaliburnMicro, Version=1.0.54.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll</HintPath> <HintPath>..\packages\Dapplo.CaliburnMicro.1.0.54\lib\net46\Dapplo.CaliburnMicro.dll</HintPath>
@ -203,7 +204,7 @@
<Reference Include="WindowsFormsIntegration" /> <Reference Include="WindowsFormsIntegration" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Components\AuthenticationProvider.cs" /> <Compile Include="Components\AuthenticationProvider.cs" />
<Compile Include="Components\CommandlineParser.cs" /> <Compile Include="Components\CommandlineParser.cs" />
<Compile Include="Components\MainFormStartup.cs" /> <Compile Include="Components\MainFormStartup.cs" />
@ -473,7 +474,9 @@
</None> </None>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="FodyWeavers.xml" /> <None Include="FodyWeavers.xml">
<SubType>Designer</SubType>
</None>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Page Include="Ui\Configuration\Views\ClipboardDestinationConfigView.xaml"> <Page Include="Ui\Configuration\Views\ClipboardDestinationConfigView.xaml">

0
src/Greenshot/AssemblyInfo.cs → src/Greenshot/Properties/AssemblyInfo.cs
View file

3
src/Greenshot/Startup.cs
View file

@ -66,7 +66,7 @@ namespace Greenshot
//LogSettings.ExceptionToStacktrace = exception => exception.ToStringDemystified(); //LogSettings.ExceptionToStacktrace = exception => exception.ToStringDemystified();
#if DEBUG #if DEBUG
// Initialize a debug logger for Dapplo packages // Initialize a debug logger for Dapplo packages
LogSettings.RegisterDefaultLogger<DebugLogger>(LogLevels.Verbose); LogSettings.RegisterDefaultLogger<DebugLogger>(LogLevels.Debug);
#endif #endif
var applicationConfig = ApplicationConfigBuilder var applicationConfig = ApplicationConfigBuilder
.Create() .Create()
@ -74,6 +74,7 @@ namespace Greenshot
.WithMutex("F48E86D3-E34C-4DB7-8F8F-9A0EA55F0D08") .WithMutex("F48E86D3-E34C-4DB7-8F8F-9A0EA55F0D08")
.WithConfigSupport() .WithConfigSupport()
.WithCaliburnMicro() .WithCaliburnMicro()
.WithoutCopyOfEmbeddedAssemblies()
.WithAssemblyPatterns("Greenshot.Addon*") .WithAssemblyPatterns("Greenshot.Addon*")
.BuildApplicationConfig(); .BuildApplicationConfig();

10
src/Greenshot/greenshot.manifest
View file

@ -3,11 +3,11 @@
<!-- Make sure windows Vista and above treat Greenshot as "DPI Aware" <!-- Make sure windows Vista and above treat Greenshot as "DPI Aware"
See: http://msdn.microsoft.com/en-us/library/ms633543.aspx --> See: http://msdn.microsoft.com/en-us/library/ms633543.aspx -->
<asmv3:application> <asmv3:application>
<asmv3:windowsSettings> <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">
<winset:dpiAware>True/PM</winset:dpiAware> <dpiAware>True/PM</dpiAware>
</asmv3:windowsSettings> <dpiAwareness>PerMonitorV2,permonitor</dpiAwareness>
<asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2011/WindowsSettings">
<disableWindowFiltering>true</disableWindowFiltering> <disableWindowFiltering>true</disableWindowFiltering>
<printerDriverIsolation>true</printerDriverIsolation>
</asmv3:windowsSettings> </asmv3:windowsSettings>
</asmv3:application> </asmv3:application>
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"> <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
@ -20,8 +20,6 @@
<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/> <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
<!-- Windows 7 --> <!-- Windows 7 -->
<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/> <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
<!-- Windows Vista -->
<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
</application> </application>
</compatibility> </compatibility>
<!-- Set UAC level to "asInvoker" and disable registry virtualization --> <!-- Set UAC level to "asInvoker" and disable registry virtualization -->

6
src/Greenshot/packages.config
View file

@ -10,9 +10,9 @@
<package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" /> <package id="CommonServiceLocator" version="2.0.3" targetFramework="net46" />
<package id="ControlzEx" version="3.0.2.4" targetFramework="net46" /> <package id="ControlzEx" version="3.0.2.4" targetFramework="net46" />
<package id="Costura.Fody" version="3.1.0" targetFramework="net46" developmentDependency="true" /> <package id="Costura.Fody" version="3.1.0" targetFramework="net46" developmentDependency="true" />
<package id="Dapplo.Addons" version="1.0.66" targetFramework="net461" /> <package id="Dapplo.Addons" version="1.0.68" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.66" targetFramework="net461" /> <package id="Dapplo.Addons.Bootstrapper" version="1.0.68" targetFramework="net461" />
<package id="Dapplo.Addons.Config" version="1.0.66" targetFramework="net461" /> <package id="Dapplo.Addons.Config" version="1.0.68" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro" version="1.0.54" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro" version="1.0.54" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Configuration" version="1.0.54" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Configuration" version="1.0.54" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.54" targetFramework="net461" /> <package id="Dapplo.CaliburnMicro.Dapp" version="1.0.54" targetFramework="net461" />