Skip to content

Commit

Permalink
Removed some unneeded dependencies. Fixed a bug which was due to a ch…
Browse files Browse the repository at this point in the history
…ange only used for testing.

[release]
  • Loading branch information
Lakritzator committed Mar 28, 2017
1 parent d8f4db6 commit 898e201
Show file tree
Hide file tree
Showing 21 changed files with 105 additions and 150 deletions.
4 changes: 2 additions & 2 deletions Application.Demo.Addon/Application.Demo.Addon.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@
<HintPath>..\packages\Caliburn.Micro.3.0.3\lib\net45\Caliburn.Micro.Platform.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Dapplo.Addons, Version=0.4.6.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.0.4.6\lib\net45\Dapplo.Addons.dll</HintPath>
<Reference Include="Dapplo.Addons, Version=0.4.7.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.0.4.7\lib\net45\Dapplo.Addons.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Dapplo.Ini, Version=0.5.17.0, Culture=neutral, processorArchitecture=MSIL">
Expand Down
17 changes: 8 additions & 9 deletions Application.Demo.Addon/packages.config
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>

<packages>
<package id="Caliburn.Micro" version="3.0.3" targetFramework="net452" />
<package id="Caliburn.Micro.Core" version="3.0.3" targetFramework="net452" />
<package id="Dapplo.Addons" version="0.4.6" targetFramework="net452" />
<package id="Dapplo.Ini" version="0.5.17" targetFramework="net452" />
<package id="Dapplo.InterfaceImpl" version="0.2.7" targetFramework="net452" />
<package id="Dapplo.Language" version="0.5.17" targetFramework="net452" />
<package id="Dapplo.Log" version="1.0.23" targetFramework="net452" />
<package id="Dapplo.Utils" version="1.0.132" targetFramework="net452" />
<package id="Caliburn.Micro" version="3.0.3" targetFramework="net452" />
<package id="Caliburn.Micro.Core" version="3.0.3" targetFramework="net452" />
<package id="Dapplo.Addons" version="0.4.7" targetFramework="net452" />
<package id="Dapplo.Ini" version="0.5.17" targetFramework="net452" />
<package id="Dapplo.InterfaceImpl" version="0.2.7" targetFramework="net452" />
<package id="Dapplo.Language" version="0.5.17" targetFramework="net452" />
<package id="Dapplo.Log" version="1.0.23" targetFramework="net452" />
<package id="Dapplo.Utils" version="1.0.132" targetFramework="net452" />
</packages>
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
<HintPath>..\packages\Caliburn.Micro.3.0.3\lib\net45\Caliburn.Micro.Platform.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Dapplo.Addons, Version=0.4.6.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.0.4.6\lib\net45\Dapplo.Addons.dll</HintPath>
<Reference Include="Dapplo.Addons, Version=0.4.7.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.0.4.7\lib\net45\Dapplo.Addons.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Dapplo.Ini, Version=0.5.17.0, Culture=neutral, processorArchitecture=MSIL">
Expand Down
27 changes: 13 additions & 14 deletions Application.Demo.MetroAddon/packages.config
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>

<packages>
<package id="Caliburn.Micro" version="3.0.3" targetFramework="net452" />
<package id="Caliburn.Micro.Core" version="3.0.3" targetFramework="net452" />
<package id="Dapplo.Addons" version="0.4.6" targetFramework="net452" />
<package id="Dapplo.Ini" version="0.5.17" targetFramework="net452" />
<package id="Dapplo.InterfaceImpl" version="0.2.7" targetFramework="net452" />
<package id="Dapplo.Language" version="0.5.17" targetFramework="net452" />
<package id="Dapplo.Log" version="1.0.23" targetFramework="net452" />
<package id="Dapplo.Utils" version="1.0.132" targetFramework="net452" />
<package id="MahApps.Metro" version="1.4.3" targetFramework="net452" />
<package id="MahApps.Metro.IconPacks" version="1.7.1" targetFramework="net452" />
<package id="System.Reactive.Core" version="3.1.1" targetFramework="net45" />
<package id="System.Reactive.Interfaces" version="3.1.1" targetFramework="net45" />
<package id="System.Reactive.Linq" version="3.1.1" targetFramework="net45" />
<package id="Caliburn.Micro" version="3.0.3" targetFramework="net452" />
<package id="Caliburn.Micro.Core" version="3.0.3" targetFramework="net452" />
<package id="Dapplo.Addons" version="0.4.7" targetFramework="net452" />
<package id="Dapplo.Ini" version="0.5.17" targetFramework="net452" />
<package id="Dapplo.InterfaceImpl" version="0.2.7" targetFramework="net452" />
<package id="Dapplo.Language" version="0.5.17" targetFramework="net452" />
<package id="Dapplo.Log" version="1.0.23" targetFramework="net452" />
<package id="Dapplo.Utils" version="1.0.132" targetFramework="net452" />
<package id="MahApps.Metro" version="1.4.3" targetFramework="net452" />
<package id="MahApps.Metro.IconPacks" version="1.7.1" targetFramework="net452" />
<package id="System.Reactive.Core" version="3.1.1" targetFramework="net45" />
<package id="System.Reactive.Interfaces" version="3.1.1" targetFramework="net45" />
<package id="System.Reactive.Linq" version="3.1.1" targetFramework="net45" />
</packages>
4 changes: 2 additions & 2 deletions Application.Demo/Application.Demo.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@
<HintPath>..\packages\Caliburn.Micro.3.0.3\lib\net45\Caliburn.Micro.Platform.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Dapplo.Addons, Version=0.4.6.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.0.4.6\lib\net45\Dapplo.Addons.dll</HintPath>
<Reference Include="Dapplo.Addons, Version=0.4.7.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.0.4.7\lib\net45\Dapplo.Addons.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Dapplo.Ini, Version=0.5.17.0, Culture=neutral, processorArchitecture=MSIL">
Expand Down
29 changes: 14 additions & 15 deletions Application.Demo/packages.config
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>

<packages>
<package id="Caliburn.Micro" version="3.0.3" targetFramework="net452" />
<package id="Caliburn.Micro.Core" version="3.0.3" targetFramework="net452" />
<package id="Dapplo.Addons" version="0.4.6" targetFramework="net452" />
<package id="Dapplo.Ini" version="0.5.17" targetFramework="net452" />
<package id="Dapplo.InterfaceImpl" version="0.2.7" targetFramework="net452" />
<package id="Dapplo.Language" version="0.5.17" targetFramework="net452" />
<package id="Dapplo.Log" version="1.0.23" targetFramework="net452" />
<package id="Dapplo.Log.Loggers" version="1.0.23" targetFramework="net452" />
<package id="Dapplo.Utils" version="1.0.132" targetFramework="net452" />
<package id="Hardcodet.NotifyIcon.Wpf" version="1.0.8" targetFramework="net452" />
<package id="MahApps.Metro.IconPacks" version="1.7.1" targetFramework="net452" />
<package id="System.Reactive.Core" version="3.1.1" targetFramework="net452" />
<package id="System.Reactive.Interfaces" version="3.1.1" targetFramework="net452" />
<package id="System.Reactive.Linq" version="3.1.1" targetFramework="net452" />
<package id="Caliburn.Micro" version="3.0.3" targetFramework="net452" />
<package id="Caliburn.Micro.Core" version="3.0.3" targetFramework="net452" />
<package id="Dapplo.Addons" version="0.4.7" targetFramework="net452" />
<package id="Dapplo.Ini" version="0.5.17" targetFramework="net452" />
<package id="Dapplo.InterfaceImpl" version="0.2.7" targetFramework="net452" />
<package id="Dapplo.Language" version="0.5.17" targetFramework="net452" />
<package id="Dapplo.Log" version="1.0.23" targetFramework="net452" />
<package id="Dapplo.Log.Loggers" version="1.0.23" targetFramework="net452" />
<package id="Dapplo.Utils" version="1.0.132" targetFramework="net452" />
<package id="Hardcodet.NotifyIcon.Wpf" version="1.0.8" targetFramework="net452" />
<package id="MahApps.Metro.IconPacks" version="1.7.1" targetFramework="net452" />
<package id="System.Reactive.Core" version="3.1.1" targetFramework="net452" />
<package id="System.Reactive.Interfaces" version="3.1.1" targetFramework="net452" />
<package id="System.Reactive.Linq" version="3.1.1" targetFramework="net452" />
</packages>
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
<HintPath>..\packages\Caliburn.Micro.Core.3.0.3\lib\net45\Caliburn.Micro.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Dapplo.Addons, Version=0.4.6.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.0.4.6\lib\net45\Dapplo.Addons.dll</HintPath>
<Reference Include="Dapplo.Addons, Version=0.4.7.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.0.4.7\lib\net45\Dapplo.Addons.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Dapplo.Ini, Version=0.5.17.0, Culture=neutral, processorArchitecture=MSIL">
Expand Down
19 changes: 9 additions & 10 deletions Dapplo.CaliburnMicro.Configuration/packages.config
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>

<packages>
<package id="Caliburn.Micro.Core" version="3.0.3" targetFramework="net45" />
<package id="Dapplo.Addons" version="0.4.6" targetFramework="net45" />
<package id="Dapplo.Ini" version="0.5.17" targetFramework="net45" />
<package id="Dapplo.InterfaceImpl" version="0.2.7" targetFramework="net45" />
<package id="Dapplo.Log" version="1.0.23" targetFramework="net45" />
<package id="Dapplo.Utils" version="1.0.132" targetFramework="net45" />
<package id="System.Reactive.Core" version="3.1.1" targetFramework="net45" />
<package id="System.Reactive.Interfaces" version="3.1.1" targetFramework="net45" />
<package id="System.Reactive.Linq" version="3.1.1" targetFramework="net45" />
<package id="Caliburn.Micro.Core" version="3.0.3" targetFramework="net45" />
<package id="Dapplo.Addons" version="0.4.7" targetFramework="net45" />
<package id="Dapplo.Ini" version="0.5.17" targetFramework="net45" />
<package id="Dapplo.InterfaceImpl" version="0.2.7" targetFramework="net45" />
<package id="Dapplo.Log" version="1.0.23" targetFramework="net45" />
<package id="Dapplo.Utils" version="1.0.132" targetFramework="net45" />
<package id="System.Reactive.Core" version="3.1.1" targetFramework="net45" />
<package id="System.Reactive.Interfaces" version="3.1.1" targetFramework="net45" />
<package id="System.Reactive.Linq" version="3.1.1" targetFramework="net45" />
</packages>
12 changes: 4 additions & 8 deletions Dapplo.CaliburnMicro.Dapp/Dapplo.CaliburnMicro.Dapp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -44,16 +44,12 @@
<HintPath>..\packages\Caliburn.Micro.3.0.3\lib\net45\Caliburn.Micro.Platform.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Dapplo.Addons, Version=0.4.6.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.0.4.6\lib\net45\Dapplo.Addons.dll</HintPath>
<Reference Include="Dapplo.Addons, Version=0.4.7.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.0.4.7\lib\net45\Dapplo.Addons.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=0.4.6.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.0.4.6\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Dapplo.InterfaceImpl, Version=0.2.7.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.InterfaceImpl.0.2.7\lib\net45\Dapplo.InterfaceImpl.dll</HintPath>
<Reference Include="Dapplo.Addons.Bootstrapper, Version=0.4.7.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.Bootstrapper.0.4.7\lib\net45\Dapplo.Addons.Bootstrapper.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Dapplo.Log, Version=1.0.23.0, Culture=neutral, processorArchitecture=MSIL">
Expand Down
14 changes: 6 additions & 8 deletions Dapplo.CaliburnMicro.Dapp/packages.config
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>

<packages>
<package id="Caliburn.Micro" version="3.0.3" targetFramework="net45" />
<package id="Caliburn.Micro.Core" version="3.0.3" targetFramework="net45" />
<package id="Dapplo.Addons" version="0.4.6" targetFramework="net45" />
<package id="Dapplo.Addons.Bootstrapper" version="0.4.6" targetFramework="net45" />
<package id="Dapplo.InterfaceImpl" version="0.2.7" targetFramework="net45" />
<package id="Dapplo.Log" version="1.0.23" targetFramework="net45" />
<package id="Dapplo.Utils" version="1.0.132" targetFramework="net45" />
<package id="Caliburn.Micro" version="3.0.3" targetFramework="net45" />
<package id="Caliburn.Micro.Core" version="3.0.3" targetFramework="net45" />
<package id="Dapplo.Addons" version="0.4.7" targetFramework="net45" />
<package id="Dapplo.Addons.Bootstrapper" version="0.4.7" targetFramework="net45" />
<package id="Dapplo.Log" version="1.0.23" targetFramework="net45" />
<package id="Dapplo.Utils" version="1.0.132" targetFramework="net45" />
</packages>
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@
<HintPath>..\packages\Caliburn.Micro.3.0.3\lib\net45\Caliburn.Micro.Platform.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Dapplo.Addons, Version=0.4.6.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.0.4.6\lib\net45\Dapplo.Addons.dll</HintPath>
<Reference Include="Dapplo.Addons, Version=0.4.7.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.0.4.7\lib\net45\Dapplo.Addons.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Dapplo.InterfaceImpl, Version=0.2.7.0, Culture=neutral, processorArchitecture=MSIL">
Expand Down
1 change: 0 additions & 1 deletion Dapplo.CaliburnMicro.NotifyIconWpf/Views/TrayIconView.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
</Style>
<Style TargetType="{x:Type MenuItem}" BasedOn="{StaticResource {x:Type MenuItem}}">
<Setter Property="Tag" Value="{Binding}" />
<Setter Property="Height" Value="40" />
<Setter Property="IsEnabled" Value="{Binding IsEnabled}" />
<Setter Property="Visibility" Value="{Binding IsVisible, Converter={StaticResource BooleanToVisibility} }" />
<Setter Property="Icon" Value="{Binding Icon}" />
Expand Down
15 changes: 7 additions & 8 deletions Dapplo.CaliburnMicro.NotifyIconWpf/packages.config
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>

<packages>
<package id="Caliburn.Micro" version="3.0.3" targetFramework="net45" />
<package id="Caliburn.Micro.Core" version="3.0.3" targetFramework="net45" />
<package id="Dapplo.Addons" version="0.4.6" targetFramework="net45" />
<package id="Dapplo.InterfaceImpl" version="0.2.7" targetFramework="net45" />
<package id="Dapplo.Log" version="1.0.23" targetFramework="net45" />
<package id="Dapplo.Utils" version="1.0.132" targetFramework="net45" />
<package id="Hardcodet.NotifyIcon.Wpf" version="1.0.8" targetFramework="net45" />
<package id="Caliburn.Micro" version="3.0.3" targetFramework="net45" />
<package id="Caliburn.Micro.Core" version="3.0.3" targetFramework="net45" />
<package id="Dapplo.Addons" version="0.4.7" targetFramework="net45" />
<package id="Dapplo.InterfaceImpl" version="0.2.7" targetFramework="net45" />
<package id="Dapplo.Log" version="1.0.23" targetFramework="net45" />
<package id="Dapplo.Utils" version="1.0.132" targetFramework="net45" />
<package id="Hardcodet.NotifyIcon.Wpf" version="1.0.8" targetFramework="net45" />
</packages>
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,8 @@
<HintPath>..\packages\Caliburn.Micro.Core.3.0.3\lib\net45\Caliburn.Micro.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Dapplo.Addons, Version=0.4.6.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.0.4.6\lib\net45\Dapplo.Addons.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Dapplo.InterfaceImpl, Version=0.2.7.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.InterfaceImpl.0.2.7\lib\net45\Dapplo.InterfaceImpl.dll</HintPath>
<Reference Include="Dapplo.Addons, Version=0.4.7.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.0.4.7\lib\net45\Dapplo.Addons.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Dapplo.Log, Version=1.0.23.0, Culture=neutral, processorArchitecture=MSIL">
Expand Down
16 changes: 7 additions & 9 deletions Dapplo.CaliburnMicro.Security/packages.config
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>

<packages>
<package id="Caliburn.Micro.Core" version="3.0.3" targetFramework="net45" />
<package id="Dapplo.Addons" version="0.4.6" targetFramework="net45" />
<package id="Dapplo.InterfaceImpl" version="0.2.7" targetFramework="net45" />
<package id="Dapplo.Log" version="1.0.23" targetFramework="net45" />
<package id="Dapplo.Utils" version="1.0.132" targetFramework="net45" />
<package id="System.Reactive.Core" version="3.1.1" targetFramework="net45" />
<package id="System.Reactive.Interfaces" version="3.1.1" targetFramework="net45" />
<package id="System.Reactive.Linq" version="3.1.1" targetFramework="net45" />
<package id="Caliburn.Micro.Core" version="3.0.3" targetFramework="net45" />
<package id="Dapplo.Addons" version="0.4.7" targetFramework="net45" />
<package id="Dapplo.Log" version="1.0.23" targetFramework="net45" />
<package id="Dapplo.Utils" version="1.0.132" targetFramework="net45" />
<package id="System.Reactive.Core" version="3.1.1" targetFramework="net45" />
<package id="System.Reactive.Interfaces" version="3.1.1" targetFramework="net45" />
<package id="System.Reactive.Linq" version="3.1.1" targetFramework="net45" />
</packages>
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
<DocumentationFile>bin\Release\Dapplo.CaliburnMicro.Translations.XML</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="Dapplo.Addons, Version=0.4.6.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.0.4.6\lib\net45\Dapplo.Addons.dll</HintPath>
<Reference Include="Dapplo.Addons, Version=0.4.7.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapplo.Addons.0.4.7\lib\net45\Dapplo.Addons.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Dapplo.InterfaceImpl, Version=0.2.7.0, Culture=neutral, processorArchitecture=MSIL">
Expand Down
17 changes: 8 additions & 9 deletions Dapplo.CaliburnMicro.Translations/packages.config
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>

<packages>
<package id="Dapplo.Addons" version="0.4.6" targetFramework="net45" />
<package id="Dapplo.InterfaceImpl" version="0.2.7" targetFramework="net45" />
<package id="Dapplo.Language" version="0.5.17" targetFramework="net45" />
<package id="Dapplo.Log" version="1.0.23" targetFramework="net45" />
<package id="Dapplo.Utils" version="1.0.132" targetFramework="net45" />
<package id="System.Reactive.Core" version="3.1.1" targetFramework="net45" />
<package id="System.Reactive.Interfaces" version="3.1.1" targetFramework="net45" />
<package id="System.Reactive.Linq" version="3.1.1" targetFramework="net45" />
<package id="Dapplo.Addons" version="0.4.7" targetFramework="net45" />
<package id="Dapplo.InterfaceImpl" version="0.2.7" targetFramework="net45" />
<package id="Dapplo.Language" version="0.5.17" targetFramework="net45" />
<package id="Dapplo.Log" version="1.0.23" targetFramework="net45" />
<package id="Dapplo.Utils" version="1.0.132" targetFramework="net45" />
<package id="System.Reactive.Core" version="3.1.1" targetFramework="net45" />
<package id="System.Reactive.Interfaces" version="3.1.1" targetFramework="net45" />
<package id="System.Reactive.Linq" version="3.1.1" targetFramework="net45" />
</packages>
Loading

0 comments on commit 898e201

Please sign in to comment.