Updated dependencies, which needed some small changes.

[release]
dapplo · May 4, 2017 · d229af4 · d229af4
1 parent 62b2fdd
commit d229af4
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 13 deletions.
diff --git a/Application.Demo/Application.Demo.csproj b/Application.Demo/Application.Demo.csproj
@@ -308,12 +308,12 @@ foreach (var item in filesToCleanup)
   <Target Name="CleanReferenceCopyLocalPaths" AfterTargets="AfterBuild;NonWinFodyTarget" Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
     <CosturaCleanup Config="FodyWeavers.xml" Files="@(ReferenceCopyLocalPaths->'$(OutDir)%(DestinationSubDirectory)%(Filename)%(Extension)')" />
   </Target>
-  <Import Project="..\packages\Fody.2.0.6\build\dotnet\Fody.targets" Condition="Exists('..\packages\Fody.2.0.6\build\dotnet\Fody.targets')" />
+  <Import Project="..\packages\Fody.2.0.7\build\dotnet\Fody.targets" Condition="Exists('..\packages\Fody.2.0.7\build\dotnet\Fody.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Fody.2.0.6\build\dotnet\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.2.0.6\build\dotnet\Fody.targets'))" />
+    <Error Condition="!Exists('..\packages\Fody.2.0.7\build\dotnet\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.2.0.7\build\dotnet\Fody.targets'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/Application.Demo/packages.config b/Application.Demo/packages.config
@@ -10,7 +10,7 @@
   <package id="Dapplo.Log" version="1.0.29" targetFramework="net452" />
   <package id="Dapplo.Log.Loggers" version="1.0.29" targetFramework="net452" />
   <package id="Dapplo.Utils" version="1.0.132" targetFramework="net452" />
-  <package id="Fody" version="2.0.6" targetFramework="net452" developmentDependency="true" />
+  <package id="Fody" version="2.0.7" targetFramework="net452" developmentDependency="true" />
   <package id="Hardcodet.NotifyIcon.Wpf" version="1.0.8" targetFramework="net452" />
   <package id="MahApps.Metro" version="1.5.0" targetFramework="net452" />
   <package id="MahApps.Metro.IconPacks" version="1.9.0" targetFramework="net452" />

diff --git a/Dapplo.CaliburnMicro/Dapplo.CaliburnMicro.csproj b/Dapplo.CaliburnMicro/Dapplo.CaliburnMicro.csproj
@@ -55,16 +55,36 @@
       <HintPath>..\packages\Dapplo.Log.1.0.29\lib\net45\Dapplo.Log.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Dapplo.Windows, Version=0.4.13.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Dapplo.Windows.0.4.13\lib\net45\Dapplo.Windows.dll</HintPath>
+    <Reference Include="Dapplo.Windows, Version=0.4.16.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Dapplo.Windows.0.4.16\lib\net45\Dapplo.Windows.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Dapplo.Windows.Dpi, Version=0.4.13.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Dapplo.Windows.Dpi.0.4.13\lib\net45\Dapplo.Windows.Dpi.dll</HintPath>
+    <Reference Include="Dapplo.Windows.Common, Version=0.4.16.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Dapplo.Windows.Common.0.4.16\lib\net45\Dapplo.Windows.Common.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Dapplo.Windows.Messages, Version=0.4.13.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Dapplo.Windows.Messages.0.4.13\lib\net45\Dapplo.Windows.Messages.dll</HintPath>
+    <Reference Include="Dapplo.Windows.DesktopWindowsManager, Version=0.4.16.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Dapplo.Windows.DesktopWindowsManager.0.4.16\lib\net45\Dapplo.Windows.DesktopWindowsManager.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Dapplo.Windows.Dpi, Version=0.4.16.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Dapplo.Windows.Dpi.0.4.16\lib\net45\Dapplo.Windows.Dpi.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Dapplo.Windows.Gdi, Version=0.4.16.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Dapplo.Windows.Gdi.0.4.16\lib\net45\Dapplo.Windows.Gdi.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Dapplo.Windows.Input, Version=0.4.16.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Dapplo.Windows.Input.0.4.16\lib\net45\Dapplo.Windows.Input.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Dapplo.Windows.Messages, Version=0.4.16.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Dapplo.Windows.Messages.0.4.16\lib\net45\Dapplo.Windows.Messages.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Dapplo.Windows.User32, Version=0.4.16.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Dapplo.Windows.User32.0.4.16\lib\net45\Dapplo.Windows.User32.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="PresentationCore" />

diff --git a/Dapplo.CaliburnMicro/DapploWindowManager.cs b/Dapplo.CaliburnMicro/DapploWindowManager.cs
@@ -25,7 +25,7 @@
 using System.Windows;
 using Caliburn.Micro;
 using Dapplo.CaliburnMicro.Behaviors;
-using Dapplo.Windows.Dpi;
+using Dapplo.Windows.Dpi.Wpf;
 
 #endregion
 

diff --git a/Dapplo.CaliburnMicro/packages.config b/Dapplo.CaliburnMicro/packages.config
@@ -4,9 +4,14 @@
   <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.29" targetFramework="net45" />
-  <package id="Dapplo.Windows" version="0.4.13" targetFramework="net45" />
-  <package id="Dapplo.Windows.Dpi" version="0.4.13" targetFramework="net45" />
-  <package id="Dapplo.Windows.Messages" version="0.4.13" targetFramework="net45" />
+  <package id="Dapplo.Windows" version="0.4.16" targetFramework="net45" />
+  <package id="Dapplo.Windows.Common" version="0.4.16" targetFramework="net45" />
+  <package id="Dapplo.Windows.DesktopWindowsManager" version="0.4.16" targetFramework="net45" />
+  <package id="Dapplo.Windows.Dpi" version="0.4.16" targetFramework="net45" />
+  <package id="Dapplo.Windows.Gdi" version="0.4.16" targetFramework="net45" />
+  <package id="Dapplo.Windows.Input" version="0.4.16" targetFramework="net45" />
+  <package id="Dapplo.Windows.Messages" version="0.4.16" targetFramework="net45" />
+  <package id="Dapplo.Windows.User32" version="0.4.16" 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" />