Small optimizing steps

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

View file

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

View file

@ -46,11 +46,11 @@
<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>
</Reference>
<Reference Include="Dapplo.Addons, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll</HintPath>
<Reference Include="Dapplo.Addons, Version=1.0.68.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.68\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.68.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.68\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<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>

View file

@ -6,8 +6,8 @@
<package id="Caliburn.Micro" 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="Dapplo.Addons" version="1.0.66" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.66" targetFramework="net461" />
<package id="Dapplo.Addons" version="1.0.68" 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.Configuration" version="1.0.54" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.54" targetFramework="net461" />

View file

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

View file

@ -2,7 +2,6 @@
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\CommonProject.properties" />
<PropertyGroup>
<NoWarn>1685</NoWarn>
<ProjectGuid>{C3052651-598A-44E2-AAB3-2E41311D50F9}</ProjectGuid>
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<OutputType>Library</OutputType>
@ -14,9 +13,7 @@
<NoStdLib>False</NoStdLib>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
<TargetFrameworkProfile />
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
@ -25,20 +22,6 @@
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</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" />
<ItemGroup>
<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">
<HintPath>..\packages\Costura.Fody.3.1.0\lib\net46\Costura.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Addons, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll</HintPath>
<Reference Include="Dapplo.Addons, Version=1.0.68.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.68\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.68.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.68\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<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>

View file

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

View file

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

View file

@ -13,7 +13,6 @@
<NoStdLib>False</NoStdLib>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<RunPostBuildEvent>Always</RunPostBuildEvent>
<TargetFrameworkProfile />
<FileUpgradeFlags>
</FileUpgradeFlags>
@ -21,20 +20,6 @@
</UpgradeBackupLocation>
<OldToolsVersion>3.5</OldToolsVersion>
</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" />
<ItemGroup>
<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">
<HintPath>..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Addons, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll</HintPath>
<Reference Include="Dapplo.Addons, Version=1.0.68.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.68\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.68.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.68\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<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>

View file

@ -6,8 +6,8 @@
<package id="Caliburn.Micro" 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="Dapplo.Addons" version="1.0.66" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.66" targetFramework="net461" />
<package id="Dapplo.Addons" version="1.0.68" 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.Configuration" version="1.0.54" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.54" targetFramework="net461" />

View file

@ -61,11 +61,11 @@
<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>
</Reference>
<Reference Include="Dapplo.Addons, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll</HintPath>
<Reference Include="Dapplo.Addons, Version=1.0.68.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.68\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.68.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.68\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<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>

View file

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

View file

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

View file

@ -38,7 +38,6 @@ using Autofac.Features.OwnedInstances;
using Dapplo.Addons;
using Dapplo.HttpExtensions;
using Dapplo.HttpExtensions.Extensions;
using Dapplo.HttpExtensions.Listener;
using Dapplo.HttpExtensions.OAuth;
using Dapplo.Log;
using Dapplo.Windows.Clipboard;
@ -112,8 +111,9 @@ namespace Greenshot.Addon.Flickr
{OAuth1Parameters.Token.EnumValueOf(), "{RequestToken}"},
{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
RedirectUrl = new[] { 47336, 0 }.CreateLocalHostUri().AbsoluteUri,
RedirectUrl = "http://localhost:47336",//new[] { 47336 }.CreateLocalHostUri().AbsoluteUri,
CheckVerifier = true
};

View file

@ -58,11 +58,11 @@
<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>
</Reference>
<Reference Include="Dapplo.Addons, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll</HintPath>
<Reference Include="Dapplo.Addons, Version=1.0.68.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.68\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.68.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.68\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<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>

View file

@ -6,8 +6,8 @@
<package id="Caliburn.Micro" 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="Dapplo.Addons" version="1.0.66" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.66" targetFramework="net461" />
<package id="Dapplo.Addons" version="1.0.68" 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.Configuration" version="1.0.54" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.54" targetFramework="net461" />

View file

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

View file

@ -44,11 +44,11 @@
<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>
</Reference>
<Reference Include="Dapplo.Addons, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll</HintPath>
<Reference Include="Dapplo.Addons, Version=1.0.68.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.68\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.68.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.68\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<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>

View file

@ -6,8 +6,8 @@
<package id="Caliburn.Micro" 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="Dapplo.Addons" version="1.0.66" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.66" targetFramework="net461" />
<package id="Dapplo.Addons" version="1.0.68" 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.Configuration" version="1.0.54" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.54" targetFramework="net461" />

View file

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

View file

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

View file

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

View file

@ -63,11 +63,11 @@
<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>
</Reference>
<Reference Include="Dapplo.Addons, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll</HintPath>
<Reference Include="Dapplo.Addons, Version=1.0.68.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.68\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.68.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.68\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<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>

View file

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

View file

@ -7,8 +7,8 @@
<package id="Caliburn.Micro.Core" version="3.2.0" 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="Dapplo.Addons" version="1.0.66" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.66" targetFramework="net461" />
<package id="Dapplo.Addons" version="1.0.68" 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.Configuration" version="1.0.54" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.54" targetFramework="net461" />

View file

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

View file

@ -43,11 +43,11 @@
<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>
</Reference>
<Reference Include="Dapplo.Addons, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll</HintPath>
<Reference Include="Dapplo.Addons, Version=1.0.68.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.68\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.68.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.68\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<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>

View file

@ -6,8 +6,8 @@
<package id="Caliburn.Micro" 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="Dapplo.Addons" version="1.0.66" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.66" targetFramework="net461" />
<package id="Dapplo.Addons" version="1.0.68" 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.Configuration" version="1.0.54" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.54" targetFramework="net461" />

View file

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

View file

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

View file

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

View file

@ -58,11 +58,11 @@
<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>
</Reference>
<Reference Include="Dapplo.Addons, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll</HintPath>
<Reference Include="Dapplo.Addons, Version=1.0.68.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.68\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.68.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.68\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<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>

View file

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

View file

@ -6,8 +6,8 @@
<package id="Caliburn.Micro" 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="Dapplo.Addons" version="1.0.66" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.66" targetFramework="net461" />
<package id="Dapplo.Addons" version="1.0.68" 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.Configuration" version="1.0.54" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.54" targetFramework="net461" />

View file

@ -45,11 +45,11 @@
<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>
</Reference>
<Reference Include="Dapplo.Addons, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll</HintPath>
<Reference Include="Dapplo.Addons, Version=1.0.68.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.68\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.68.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.68\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<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>

View file

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

View file

@ -7,8 +7,8 @@
<package id="Caliburn.Micro.Core" version="3.2.0" 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="Dapplo.Addons" version="1.0.66" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.66" targetFramework="net461" />
<package id="Dapplo.Addons" version="1.0.68" 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.Configuration" version="1.0.54" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.54" targetFramework="net461" />

View file

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

View file

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

View file

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

View file

@ -58,11 +58,11 @@
<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>
</Reference>
<Reference Include="Dapplo.Addons, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll</HintPath>
<Reference Include="Dapplo.Addons, Version=1.0.68.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.68\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.68.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.68\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<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>

View file

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

View file

@ -6,8 +6,8 @@
<package id="Caliburn.Micro" 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="Dapplo.Addons" version="1.0.66" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.66" targetFramework="net461" />
<package id="Dapplo.Addons" version="1.0.68" 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.Configuration" version="1.0.54" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.54" targetFramework="net461" />

View file

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

View file

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

View file

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

View file

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

View file

@ -6,8 +6,8 @@
<package id="Caliburn.Micro" 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="Dapplo.Addons" version="1.0.66" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.66" targetFramework="net461" />
<package id="Dapplo.Addons" version="1.0.68" 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.Configuration" version="1.0.54" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.54" targetFramework="net461" />

View file

@ -37,11 +37,11 @@
<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>
</Reference>
<Reference Include="Dapplo.Addons, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll</HintPath>
<Reference Include="Dapplo.Addons, Version=1.0.68.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.68\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.68.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.68\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<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>

View file

@ -6,8 +6,8 @@
<package id="Caliburn.Micro" 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="Dapplo.Addons" version="1.0.66" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.66" targetFramework="net461" />
<package id="Dapplo.Addons" version="1.0.68" 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.Translations" version="1.0.54" targetFramework="net461" />
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net46" />

View file

@ -43,11 +43,11 @@
<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>
</Reference>
<Reference Include="Dapplo.Addons, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll</HintPath>
<Reference Include="Dapplo.Addons, Version=1.0.68.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.68\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.68.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.68\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<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>

View file

@ -9,8 +9,8 @@
<package id="Caliburn.Micro" 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="Dapplo.Addons" version="1.0.66" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.66" targetFramework="net461" />
<package id="Dapplo.Addons" version="1.0.68" 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.Translations" version="1.0.54" targetFramework="net461" />
<package id="Dapplo.Ini" version="0.5.28" targetFramework="net461" />

View file

@ -72,11 +72,11 @@
<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>
</Reference>
<Reference Include="Dapplo.Addons, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.66\lib\net46\Dapplo.Addons.dll</HintPath>
<Reference Include="Dapplo.Addons, Version=1.0.68.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.1.0.68\lib\net46\Dapplo.Addons.dll</HintPath>
</Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.66.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.66\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=1.0.68.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.1.0.68\lib\net46\Dapplo.Addons.Bootstrapper.dll</HintPath>
</Reference>
<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>

View file

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

View file

@ -1,12 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<system.windows.forms jitDebugging="true" />
<!--<system.windows.forms jitDebugging="true" />-->
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
</startup>
<runtime>
<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="App\Greenshot" />
<dependentAssembly>

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -10,9 +10,9 @@
<package id="CommonServiceLocator" version="2.0.3" 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="Dapplo.Addons" version="1.0.66" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.66" targetFramework="net461" />
<package id="Dapplo.Addons.Config" version="1.0.66" targetFramework="net461" />
<package id="Dapplo.Addons" version="1.0.68" targetFramework="net461" />
<package id="Dapplo.Addons.Bootstrapper" version="1.0.68" 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.Configuration" version="1.0.54" targetFramework="net461" />
<package id="Dapplo.CaliburnMicro.Dapp" version="1.0.54" targetFramework="net461" />