Browse Source

Updated NuGet packages.

pull/4/head
Steven Kirk 12 years ago
parent
commit
9d8d9a59fa
  1. 2
      Perspex.Application/Perspex.Application.csproj
  2. 2
      Perspex.Application/packages.config
  3. 2
      Perspex.Base/Perspex.Base.csproj
  4. 2
      Perspex.Base/packages.config
  5. 4
      Perspex.Controls.UnitTests/Perspex.Controls.UnitTests.csproj
  6. 2
      Perspex.Controls.UnitTests/packages.config
  7. 2
      Perspex.Controls/Perspex.Controls.csproj
  8. 2
      Perspex.Controls/packages.config
  9. 4
      Perspex.Diagnostics/Perspex.Diagnostics.csproj
  10. 6
      Perspex.Diagnostics/packages.config
  11. 6
      Perspex.Direct2D1.RenderTests/Perspex.Direct2D1.RenderTests.csproj
  12. 4
      Perspex.Direct2D1.RenderTests/app.config
  13. 4
      Perspex.Direct2D1.RenderTests/packages.config
  14. 16
      Perspex.Direct2D1/Perspex.Direct2D1.csproj
  15. 4
      Perspex.Direct2D1/app.config
  16. 8
      Perspex.Direct2D1/packages.config
  17. 2
      Perspex.Input/Perspex.Input.csproj
  18. 2
      Perspex.Input/packages.config
  19. 2
      Perspex.Interactivity/Perspex.Interactivity.csproj
  20. 2
      Perspex.Interactivity/packages.config
  21. 2
      Perspex.Layout/Perspex.Layout.csproj
  22. 2
      Perspex.Layout/packages.config
  23. 4
      Perspex.SceneGraph.UnitTests/Perspex.SceneGraph.UnitTests.csproj
  24. 2
      Perspex.SceneGraph.UnitTests/packages.config
  25. 2
      Perspex.SceneGraph/Perspex.SceneGraph.csproj
  26. 2
      Perspex.SceneGraph/packages.config
  27. 2
      Perspex.Styling/Perspex.Styling.csproj
  28. 2
      Perspex.Styling/packages.config
  29. 2
      Perspex.Themes.Default/Perspex.Themes.Default.csproj
  30. 2
      Perspex.Themes.Default/packages.config
  31. 4
      Perspex.UnitTests/Perspex.UnitTests.csproj
  32. 2
      Perspex.UnitTests/packages.config
  33. 4
      Perspex.Windows/Perspex.Windows.csproj
  34. 2
      Perspex.Windows/packages.config
  35. 4
      TestApplication/App.config
  36. 4
      TestApplication/Program.cs
  37. 20
      TestApplication/TestApplication.csproj
  38. 12
      TestApplication/packages.config

2
Perspex.Application/Perspex.Application.csproj

@ -71,7 +71,7 @@
</ItemGroup>
<ItemGroup>
<Reference Include="Splat">
<HintPath>..\packages\Splat.1.5.0\lib\Portable-net45+win+wpa81+wp80\Splat.dll</HintPath>
<HintPath>..\packages\Splat.1.5.1\lib\Portable-net45+win+wpa81+wp80\Splat.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.Core">
<HintPath>..\packages\Rx-Core.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Core.dll</HintPath>

2
Perspex.Application/packages.config

@ -5,6 +5,6 @@
<package id="Rx-Linq" version="2.2.5" targetFramework="portable-net45+win" />
<package id="Rx-Main" version="2.2.5" targetFramework="portable-net45+win" />
<package id="Rx-PlatformServices" version="2.2.5" targetFramework="portable-net45+win" />
<package id="Splat" version="1.5.0" targetFramework="portable-net45+win" />
<package id="Splat" version="1.5.1" targetFramework="portable-net45+win" />
<package id="StyleCop.MSBuild" version="4.7.49.0" targetFramework="portable-net45+win" developmentDependency="true" />
</packages>

2
Perspex.Base/Perspex.Base.csproj

@ -55,7 +55,7 @@
</ItemGroup>
<ItemGroup>
<Reference Include="Splat">
<HintPath>..\packages\Splat.1.5.0\lib\Portable-net45+win+wpa81+wp80\Splat.dll</HintPath>
<HintPath>..\packages\Splat.1.5.1\lib\Portable-net45+win+wpa81+wp80\Splat.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.Core">
<HintPath>..\packages\Rx-Core.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Core.dll</HintPath>

2
Perspex.Base/packages.config

@ -5,6 +5,6 @@
<package id="Rx-Linq" version="2.2.5" targetFramework="portable-net45+win" />
<package id="Rx-Main" version="2.2.5" targetFramework="portable-net45+win" />
<package id="Rx-PlatformServices" version="2.2.5" targetFramework="portable-net45+win" />
<package id="Splat" version="1.5.0" targetFramework="portable-net45+win" />
<package id="Splat" version="1.5.1" targetFramework="portable-net45+win" />
<package id="StyleCop.MSBuild" version="4.7.49.0" targetFramework="portable-net45+win" developmentDependency="true" />
</packages>

4
Perspex.Controls.UnitTests/Perspex.Controls.UnitTests.csproj

@ -39,9 +39,9 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Moq.4.2.1409.1722\lib\net40\Moq.dll</HintPath>
</Reference>
<Reference Include="Splat, Version=1.5.0.0, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="Splat, Version=1.5.1.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Splat.1.5.0\lib\Net45\Splat.dll</HintPath>
<HintPath>..\packages\Splat.1.5.1\lib\Net45\Splat.dll</HintPath>
</Reference>
<Reference Include="System" />
</ItemGroup>

2
Perspex.Controls.UnitTests/packages.config

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Moq" version="4.2.1409.1722" targetFramework="net45" />
<package id="Splat" version="1.5.0" targetFramework="net45" />
<package id="Splat" version="1.5.1" targetFramework="net45" />
</packages>

2
Perspex.Controls/Perspex.Controls.csproj

@ -91,7 +91,7 @@
</ItemGroup>
<ItemGroup>
<Reference Include="Splat">
<HintPath>..\packages\Splat.1.5.0\lib\Portable-net45+win+wpa81+wp80\Splat.dll</HintPath>
<HintPath>..\packages\Splat.1.5.1\lib\Portable-net45+win+wpa81+wp80\Splat.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.Core">
<HintPath>..\packages\Rx-Core.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Core.dll</HintPath>

2
Perspex.Controls/packages.config

@ -5,6 +5,6 @@
<package id="Rx-Linq" version="2.2.5" targetFramework="portable-net45+win" />
<package id="Rx-Main" version="2.2.5" targetFramework="portable-net45+win" />
<package id="Rx-PlatformServices" version="2.2.5" targetFramework="portable-net45+win" />
<package id="Splat" version="1.5.0" targetFramework="portable-net45+win" />
<package id="Splat" version="1.5.1" targetFramework="portable-net45+win" />
<package id="StyleCop.MSBuild" version="4.7.49.0" targetFramework="portable-net45+win" developmentDependency="true" />
</packages>

4
Perspex.Diagnostics/Perspex.Diagnostics.csproj

@ -75,10 +75,10 @@
</ItemGroup>
<ItemGroup>
<Reference Include="ReactiveUI">
<HintPath>..\packages\reactiveui-core.6.0.7\lib\Portable-Net45+Win8+WP8+WPA81\ReactiveUI.dll</HintPath>
<HintPath>..\packages\reactiveui-core.6.2.1.1\lib\Portable-Net45+Win8+WP8+WPA81\ReactiveUI.dll</HintPath>
</Reference>
<Reference Include="Splat">
<HintPath>..\packages\Splat.1.5.0\lib\Portable-net45+win+wpa81+wp80\Splat.dll</HintPath>
<HintPath>..\packages\Splat.1.5.1\lib\Portable-net45+win+wpa81+wp80\Splat.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.Core">
<HintPath>..\packages\Rx-Core.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Core.dll</HintPath>

6
Perspex.Diagnostics/packages.config

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="reactiveui" version="6.0.7" targetFramework="portable-net45+win" />
<package id="reactiveui-core" version="6.0.7" targetFramework="portable-net45+win" />
<package id="reactiveui" version="6.2.1.1" targetFramework="portable-net45+win" />
<package id="reactiveui-core" version="6.2.1.1" targetFramework="portable-net45+win" />
<package id="Rx-Core" version="2.2.5" targetFramework="portable-net45+win" />
<package id="Rx-Interfaces" version="2.2.5" targetFramework="portable-net45+win" />
<package id="Rx-Linq" version="2.2.5" targetFramework="portable-net45+win" />
<package id="Rx-Main" version="2.2.5" targetFramework="portable-net45+win" />
<package id="Rx-PlatformServices" version="2.2.5" targetFramework="portable-net45+win" />
<package id="Splat" version="1.5.0" targetFramework="portable-net45+win" />
<package id="Splat" version="1.5.1" targetFramework="portable-net45+win" />
</packages>

6
Perspex.Direct2D1.RenderTests/Perspex.Direct2D1.RenderTests.csproj

@ -37,11 +37,11 @@
<ItemGroup>
<Reference Include="Magick.NET-x86, Version=7.0.0.0, Culture=neutral, PublicKeyToken=2004825badfa91ec, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Magick.NET-Q16-x86.7.0.0.0004\lib\net40-client\Magick.NET-x86.dll</HintPath>
<HintPath>..\packages\Magick.NET-Q16-x86.7.0.0.0007\lib\net40-client\Magick.NET-x86.dll</HintPath>
</Reference>
<Reference Include="Splat, Version=1.5.0.0, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="Splat, Version=1.5.1.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Splat.1.5.0\lib\Net45\Splat.dll</HintPath>
<HintPath>..\packages\Splat.1.5.1\lib\Net45\Splat.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Drawing" />

4
Perspex.Direct2D1.RenderTests/app.config

@ -14,6 +14,10 @@
<assemblyIdentity name="System.Reactive.Linq" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.1.30214.0" newVersion="2.1.30214.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="SharpDX" publicKeyToken="b4dcf0f35e5521f1" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.6.3.0" newVersion="2.6.3.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

4
Perspex.Direct2D1.RenderTests/packages.config

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Magick.NET-Q16-x86" version="7.0.0.0004" targetFramework="net45" />
<package id="Splat" version="1.5.0" targetFramework="net45" />
<package id="Magick.NET-Q16-x86" version="7.0.0.0007" targetFramework="net45" />
<package id="Splat" version="1.5.1" targetFramework="net45" />
</packages>

16
Perspex.Direct2D1/Perspex.Direct2D1.csproj

@ -11,7 +11,7 @@
<AssemblyName>Perspex.Direct2D1</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<NuGetPackageImportStamp>4ce7db7c</NuGetPackageImportStamp>
<NuGetPackageImportStamp>3a241101</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@ -31,21 +31,21 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="SharpDX, Version=2.6.2.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
<Reference Include="SharpDX, Version=2.6.3.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>$(SharpDXPackageBinDir)\SharpDX.dll</HintPath>
</Reference>
<Reference Include="SharpDX.Direct2D1, Version=2.6.2.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
<Reference Include="SharpDX.Direct2D1, Version=2.6.3.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>$(SharpDXPackageBinDir)\SharpDX.Direct2D1.dll</HintPath>
</Reference>
<Reference Include="SharpDX.DXGI, Version=2.6.2.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
<Reference Include="SharpDX.DXGI, Version=2.6.3.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>$(SharpDXPackageBinDir)\SharpDX.DXGI.dll</HintPath>
</Reference>
<Reference Include="Splat, Version=1.5.0.0, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="Splat, Version=1.5.1.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Splat.1.5.0\lib\Net45\Splat.dll</HintPath>
<HintPath>..\packages\Splat.1.5.1\lib\Net45\Splat.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
@ -97,12 +97,12 @@
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\SharpDX.2.6.2\build\SharpDX.targets" Condition="Exists('..\packages\SharpDX.2.6.2\build\SharpDX.targets')" />
<Import Project="..\packages\SharpDX.2.6.3\build\SharpDX.targets" Condition="Exists('..\packages\SharpDX.2.6.3\build\SharpDX.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable 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\SharpDX.2.6.2\build\SharpDX.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SharpDX.2.6.2\build\SharpDX.targets'))" />
<Error Condition="!Exists('..\packages\SharpDX.2.6.3\build\SharpDX.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SharpDX.2.6.3\build\SharpDX.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.

4
Perspex.Direct2D1/app.config

@ -14,6 +14,10 @@
<assemblyIdentity name="System.Reactive.Linq" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.1.30214.0" newVersion="2.1.30214.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="SharpDX" publicKeyToken="b4dcf0f35e5521f1" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.6.3.0" newVersion="2.6.3.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

8
Perspex.Direct2D1/packages.config

@ -3,8 +3,8 @@
<package id="Rx-Core" version="2.2.5" targetFramework="net45" />
<package id="Rx-Interfaces" version="2.2.5" targetFramework="net45" />
<package id="Rx-PlatformServices" version="2.2.5" targetFramework="net45" />
<package id="SharpDX" version="2.6.2" targetFramework="net45" />
<package id="SharpDX.Direct2D1" version="2.6.2" targetFramework="net45" />
<package id="SharpDX.DXGI" version="2.6.2" targetFramework="net45" />
<package id="Splat" version="1.5.0" targetFramework="net45" />
<package id="SharpDX" version="2.6.3" targetFramework="net45" />
<package id="SharpDX.Direct2D1" version="2.6.3" targetFramework="net45" />
<package id="SharpDX.DXGI" version="2.6.3" targetFramework="net45" />
<package id="Splat" version="1.5.1" targetFramework="net45" />
</packages>

2
Perspex.Input/Perspex.Input.csproj

@ -77,7 +77,7 @@
</ItemGroup>
<ItemGroup>
<Reference Include="Splat">
<HintPath>..\packages\Splat.1.5.0\lib\Portable-net45+win+wpa81+wp80\Splat.dll</HintPath>
<HintPath>..\packages\Splat.1.5.1\lib\Portable-net45+win+wpa81+wp80\Splat.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.Core">
<HintPath>..\packages\Rx-Core.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Core.dll</HintPath>

2
Perspex.Input/packages.config

@ -5,6 +5,6 @@
<package id="Rx-Linq" version="2.2.5" targetFramework="portable-net45+win" />
<package id="Rx-Main" version="2.2.5" targetFramework="portable-net45+win" />
<package id="Rx-PlatformServices" version="2.2.5" targetFramework="portable-net45+win" />
<package id="Splat" version="1.5.0" targetFramework="portable-net45+win" />
<package id="Splat" version="1.5.1" targetFramework="portable-net45+win" />
<package id="StyleCop.MSBuild" version="4.7.49.0" targetFramework="portable-net45+win" developmentDependency="true" />
</packages>

2
Perspex.Interactivity/Perspex.Interactivity.csproj

@ -57,7 +57,7 @@
</ItemGroup>
<ItemGroup>
<Reference Include="Splat">
<HintPath>..\packages\Splat.1.5.0\lib\Portable-net45+win+wpa81+wp80\Splat.dll</HintPath>
<HintPath>..\packages\Splat.1.5.1\lib\Portable-net45+win+wpa81+wp80\Splat.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.Core">
<HintPath>..\packages\Rx-Core.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Core.dll</HintPath>

2
Perspex.Interactivity/packages.config

@ -5,6 +5,6 @@
<package id="Rx-Linq" version="2.2.5" targetFramework="portable-net45+win" />
<package id="Rx-Main" version="2.2.5" targetFramework="portable-net45+win" />
<package id="Rx-PlatformServices" version="2.2.5" targetFramework="portable-net45+win" />
<package id="Splat" version="1.5.0" targetFramework="portable-net45+win" />
<package id="Splat" version="1.5.1" targetFramework="portable-net45+win" />
<package id="StyleCop.MSBuild" version="4.7.49.0" targetFramework="portable-net45+win" developmentDependency="true" />
</packages>

2
Perspex.Layout/Perspex.Layout.csproj

@ -55,7 +55,7 @@
</ItemGroup>
<ItemGroup>
<Reference Include="Splat">
<HintPath>..\packages\Splat.1.5.0\lib\Portable-net45+win+wpa81+wp80\Splat.dll</HintPath>
<HintPath>..\packages\Splat.1.5.1\lib\Portable-net45+win+wpa81+wp80\Splat.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.Core">
<HintPath>..\packages\Rx-Core.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Core.dll</HintPath>

2
Perspex.Layout/packages.config

@ -5,6 +5,6 @@
<package id="Rx-Linq" version="2.2.5" targetFramework="portable-net45+win" />
<package id="Rx-Main" version="2.2.5" targetFramework="portable-net45+win" />
<package id="Rx-PlatformServices" version="2.2.5" targetFramework="portable-net45+win" />
<package id="Splat" version="1.5.0" targetFramework="portable-net45+win" />
<package id="Splat" version="1.5.1" targetFramework="portable-net45+win" />
<package id="StyleCop.MSBuild" version="4.7.49.0" targetFramework="portable-net45+win" developmentDependency="true" />
</packages>

4
Perspex.SceneGraph.UnitTests/Perspex.SceneGraph.UnitTests.csproj

@ -35,9 +35,9 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Splat, Version=1.5.0.0, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="Splat, Version=1.5.1.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Splat.1.5.0\lib\Net45\Splat.dll</HintPath>
<HintPath>..\packages\Splat.1.5.1\lib\Net45\Splat.dll</HintPath>
</Reference>
<Reference Include="System" />
</ItemGroup>

2
Perspex.SceneGraph.UnitTests/packages.config

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Splat" version="1.5.0" targetFramework="net45" />
<package id="Splat" version="1.5.1" targetFramework="net45" />
</packages>

2
Perspex.SceneGraph/Perspex.SceneGraph.csproj

@ -86,7 +86,7 @@
</ItemGroup>
<ItemGroup>
<Reference Include="Splat">
<HintPath>..\packages\Splat.1.5.0\lib\Portable-net45+win+wpa81+wp80\Splat.dll</HintPath>
<HintPath>..\packages\Splat.1.5.1\lib\Portable-net45+win+wpa81+wp80\Splat.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.Core">
<HintPath>..\packages\Rx-Core.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Core.dll</HintPath>

2
Perspex.SceneGraph/packages.config

@ -5,6 +5,6 @@
<package id="Rx-Linq" version="2.2.5" targetFramework="portable-net45+win" />
<package id="Rx-Main" version="2.2.5" targetFramework="portable-net45+win" />
<package id="Rx-PlatformServices" version="2.2.5" targetFramework="portable-net45+win" />
<package id="Splat" version="1.5.0" targetFramework="portable-net45+win" />
<package id="Splat" version="1.5.1" targetFramework="portable-net45+win" />
<package id="StyleCop.MSBuild" version="4.7.49.0" targetFramework="portable-net45+win" developmentDependency="true" />
</packages>

2
Perspex.Styling/Perspex.Styling.csproj

@ -54,7 +54,7 @@
</ItemGroup>
<ItemGroup>
<Reference Include="Splat">
<HintPath>..\packages\Splat.1.5.0\lib\Portable-net45+win+wpa81+wp80\Splat.dll</HintPath>
<HintPath>..\packages\Splat.1.5.1\lib\Portable-net45+win+wpa81+wp80\Splat.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.Core">
<HintPath>..\packages\Rx-Core.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Core.dll</HintPath>

2
Perspex.Styling/packages.config

@ -5,6 +5,6 @@
<package id="Rx-Linq" version="2.2.5" targetFramework="portable-net45+win" />
<package id="Rx-Main" version="2.2.5" targetFramework="portable-net45+win" />
<package id="Rx-PlatformServices" version="2.2.5" targetFramework="portable-net45+win" />
<package id="Splat" version="1.5.0" targetFramework="portable-net45+win" />
<package id="Splat" version="1.5.1" targetFramework="portable-net45+win" />
<package id="StyleCop.MSBuild" version="4.7.49.0" targetFramework="portable-net45+win" developmentDependency="true" />
</packages>

2
Perspex.Themes.Default/Perspex.Themes.Default.csproj

@ -83,7 +83,7 @@
</ItemGroup>
<ItemGroup>
<Reference Include="Splat">
<HintPath>..\packages\Splat.1.5.0\lib\Portable-net45+win+wpa81+wp80\Splat.dll</HintPath>
<HintPath>..\packages\Splat.1.5.1\lib\Portable-net45+win+wpa81+wp80\Splat.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.Core">
<HintPath>..\packages\Rx-Core.2.2.5\lib\portable-windows8+net45+wp8\System.Reactive.Core.dll</HintPath>

2
Perspex.Themes.Default/packages.config

@ -5,6 +5,6 @@
<package id="Rx-Linq" version="2.2.5" targetFramework="portable-net45+win" />
<package id="Rx-Main" version="2.2.5" targetFramework="portable-net45+win" />
<package id="Rx-PlatformServices" version="2.2.5" targetFramework="portable-net45+win" />
<package id="Splat" version="1.5.0" targetFramework="portable-net45+win" />
<package id="Splat" version="1.5.1" targetFramework="portable-net45+win" />
<package id="StyleCop.MSBuild" version="4.7.49.0" targetFramework="portable-net45+win" developmentDependency="true" />
</packages>

4
Perspex.UnitTests/Perspex.UnitTests.csproj

@ -39,9 +39,9 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Moq.4.2.1409.1722\lib\net40\Moq.dll</HintPath>
</Reference>
<Reference Include="Splat, Version=1.5.0.0, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="Splat, Version=1.5.1.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Splat.1.5.0\lib\Net45\Splat.dll</HintPath>
<HintPath>..\packages\Splat.1.5.1\lib\Net45\Splat.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Reactive.Core, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

2
Perspex.UnitTests/packages.config

@ -4,5 +4,5 @@
<package id="Rx-Core" version="2.2.5" targetFramework="net45" />
<package id="Rx-Interfaces" version="2.2.5" targetFramework="net45" />
<package id="Rx-Linq" version="2.2.5" targetFramework="net45" />
<package id="Splat" version="1.5.0" targetFramework="net45" />
<package id="Splat" version="1.5.1" targetFramework="net45" />
</packages>

4
Perspex.Windows/Perspex.Windows.csproj

@ -30,9 +30,9 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Splat, Version=1.5.0.0, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="Splat, Version=1.5.1.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Splat.1.5.0\lib\Net45\Splat.dll</HintPath>
<HintPath>..\packages\Splat.1.5.1\lib\Net45\Splat.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />

2
Perspex.Windows/packages.config

@ -5,6 +5,6 @@
<package id="Rx-Linq" version="2.2.5" targetFramework="net45" />
<package id="Rx-Main" version="2.2.5" targetFramework="net45" />
<package id="Rx-PlatformServices" version="2.2.5" targetFramework="net45" />
<package id="Splat" version="1.5.0" targetFramework="net45" />
<package id="Splat" version="1.5.1" targetFramework="net45" />
<package id="StyleCop.MSBuild" version="4.7.49.0" targetFramework="net45" />
</packages>

4
TestApplication/App.config

@ -17,6 +17,10 @@
<assemblyIdentity name="System.Reactive.Linq" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.2.5.0" newVersion="2.2.5.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="SharpDX" publicKeyToken="b4dcf0f35e5521f1" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.6.3.0" newVersion="2.6.3.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

4
TestApplication/Program.cs

@ -84,8 +84,8 @@ namespace TestApplication
static void Main(string[] args)
{
LogManager.Enable(new TestLogger());
LogManager.Instance.LogLayoutMessages = true;
//LogManager.Enable(new TestLogger());
//LogManager.Instance.LogLayoutMessages = true;
App application = new App
{

20
TestApplication/TestApplication.csproj

@ -11,7 +11,7 @@
<AssemblyName>TestApplication</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<NuGetPackageImportStamp>3b082b72</NuGetPackageImportStamp>
<NuGetPackageImportStamp>caf18def</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
@ -36,25 +36,25 @@
<StartupObject />
</PropertyGroup>
<ItemGroup>
<Reference Include="ReactiveUI, Version=6.0.7.0, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="ReactiveUI, Version=6.2.1.1, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\reactiveui-core.6.0.7\lib\Net45\ReactiveUI.dll</HintPath>
<HintPath>..\packages\reactiveui-core.6.2.1.1\lib\Net45\ReactiveUI.dll</HintPath>
</Reference>
<Reference Include="SharpDX, Version=2.6.2.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
<Reference Include="SharpDX, Version=2.6.3.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>$(SharpDXPackageBinDir)\SharpDX.dll</HintPath>
</Reference>
<Reference Include="SharpDX.Direct2D1, Version=2.6.2.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
<Reference Include="SharpDX.Direct2D1, Version=2.6.3.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>$(SharpDXPackageBinDir)\SharpDX.Direct2D1.dll</HintPath>
</Reference>
<Reference Include="SharpDX.DXGI, Version=2.6.2.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
<Reference Include="SharpDX.DXGI, Version=2.6.3.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>$(SharpDXPackageBinDir)\SharpDX.DXGI.dll</HintPath>
</Reference>
<Reference Include="Splat, Version=1.5.0.0, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="Splat, Version=1.5.1.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Splat.1.5.0\lib\Net45\Splat.dll</HintPath>
<HintPath>..\packages\Splat.1.5.1\lib\Net45\Splat.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
@ -151,12 +151,12 @@
</Content>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\SharpDX.2.6.2\build\SharpDX.targets" Condition="Exists('..\packages\SharpDX.2.6.2\build\SharpDX.targets')" />
<Import Project="..\packages\SharpDX.2.6.3\build\SharpDX.targets" Condition="Exists('..\packages\SharpDX.2.6.3\build\SharpDX.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable 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\SharpDX.2.6.2\build\SharpDX.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SharpDX.2.6.2\build\SharpDX.targets'))" />
<Error Condition="!Exists('..\packages\SharpDX.2.6.3\build\SharpDX.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SharpDX.2.6.3\build\SharpDX.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.

12
TestApplication/packages.config

@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="reactiveui" version="6.0.7" targetFramework="net45" />
<package id="reactiveui-core" version="6.0.7" targetFramework="net45" />
<package id="reactiveui" version="6.2.1.1" targetFramework="net45" />
<package id="reactiveui-core" version="6.2.1.1" targetFramework="net45" />
<package id="Rx-Core" version="2.2.5" targetFramework="net45" />
<package id="Rx-Interfaces" version="2.2.5" targetFramework="net45" />
<package id="Rx-Linq" version="2.2.5" targetFramework="net45" />
<package id="Rx-Main" version="2.2.5" targetFramework="net45" />
<package id="Rx-PlatformServices" version="2.2.5" targetFramework="net45" />
<package id="Rx-XAML" version="2.2.5" targetFramework="net45" />
<package id="SharpDX" version="2.6.2" targetFramework="net45" />
<package id="SharpDX.Direct2D1" version="2.6.2" targetFramework="net45" />
<package id="SharpDX.DXGI" version="2.6.2" targetFramework="net45" />
<package id="Splat" version="1.5.0" targetFramework="net45" />
<package id="SharpDX" version="2.6.3" targetFramework="net45" />
<package id="SharpDX.Direct2D1" version="2.6.3" targetFramework="net45" />
<package id="SharpDX.DXGI" version="2.6.3" targetFramework="net45" />
<package id="Splat" version="1.5.1" targetFramework="net45" />
</packages>
Loading…
Cancel
Save