Permalink
Browse files

Added Json.NET nuget package.

Updated some old references to System.Windows.interactivity that do not get automatically updated when converting a project to WP 7.1.
Updated some RX dependencies that were referencing the 1.0 version.
Implemented some logger interfaces in some classes.
  • Loading branch information...
1 parent 3773f7b commit 6e8878d2930822020921243ebdf2b888a556163f @jlaanstra jlaanstra committed Mar 22, 2012
Showing with 49,334 additions and 275 deletions.
  1. +3 −2 ReactiveUI.Blend/ReactiveUI.Blend_WP7.csproj
  2. +11 −0 ReactiveUI.Blend/app.config
  3. +1 −0 ReactiveUI.Sample.WP7/ReactiveUI.Sample.WP7.csproj
  4. +11 −0 ReactiveUI.Sample.WP7/app.config
  5. +1 −1 ReactiveUI.Serialization/DictionaryStorageEngine.cs
  6. +1 −1 ReactiveUI.Serialization/NullStorageEngine.cs
  7. +5 −10 ReactiveUI.Serialization/ReactiveUI.Serialization_WP7.csproj
  8. +3 −3 ReactiveUI.Testing/ReactiveUI.Testing_WP7.csproj
  9. +2 −2 ReactiveUI.Xaml/ReactiveUI.Xaml_WP7.csproj
  10. +1 −1 ReactiveUI/MemoizingMRUCache.cs
  11. +3 −3 ReactiveUI/ReactiveUI_WP7.csproj
  12. +40 −252 ReactiveUI_WP7.sln
  13. BIN packages/Newtonsoft.Json.4.5.1/Newtonsoft.Json.4.5.1.nupkg
  14. BIN packages/Newtonsoft.Json.4.5.1/lib/net20/Newtonsoft.Json.dll
  15. BIN packages/Newtonsoft.Json.4.5.1/lib/net20/Newtonsoft.Json.pdb
  16. +7,938 −0 packages/Newtonsoft.Json.4.5.1/lib/net20/Newtonsoft.Json.xml
  17. BIN packages/Newtonsoft.Json.4.5.1/lib/net35/Newtonsoft.Json.dll
  18. BIN packages/Newtonsoft.Json.4.5.1/lib/net35/Newtonsoft.Json.pdb
  19. +7,069 −0 packages/Newtonsoft.Json.4.5.1/lib/net35/Newtonsoft.Json.xml
  20. BIN packages/Newtonsoft.Json.4.5.1/lib/net40/Newtonsoft.Json.dll
  21. BIN packages/Newtonsoft.Json.4.5.1/lib/net40/Newtonsoft.Json.pdb
  22. +7,320 −0 packages/Newtonsoft.Json.4.5.1/lib/net40/Newtonsoft.Json.xml
  23. BIN packages/Newtonsoft.Json.4.5.1/lib/sl3-wp/Newtonsoft.Json.dll
  24. BIN packages/Newtonsoft.Json.4.5.1/lib/sl3-wp/Newtonsoft.Json.pdb
  25. +6,661 −0 packages/Newtonsoft.Json.4.5.1/lib/sl3-wp/Newtonsoft.Json.xml
  26. BIN packages/Newtonsoft.Json.4.5.1/lib/sl4-windowsphone71/Newtonsoft.Json.dll
  27. BIN packages/Newtonsoft.Json.4.5.1/lib/sl4-windowsphone71/Newtonsoft.Json.pdb
  28. +6,661 −0 packages/Newtonsoft.Json.4.5.1/lib/sl4-windowsphone71/Newtonsoft.Json.xml
  29. BIN packages/Newtonsoft.Json.4.5.1/lib/sl4/Newtonsoft.Json.dll
  30. BIN packages/Newtonsoft.Json.4.5.1/lib/sl4/Newtonsoft.Json.pdb
  31. +6,691 −0 packages/Newtonsoft.Json.4.5.1/lib/sl4/Newtonsoft.Json.xml
  32. BIN packages/Newtonsoft.Json.4.5.1/lib/winrt45/Newtonsoft.Json.dll
  33. BIN packages/Newtonsoft.Json.4.5.1/lib/winrt45/Newtonsoft.Json.pdb
  34. +6,912 −0 packages/Newtonsoft.Json.4.5.1/lib/winrt45/Newtonsoft.Json.xml
@@ -45,7 +45,7 @@
<Reference Include="Microsoft.Expression.Interactions, Version=3.7.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
<Reference Include="Microsoft.Reactive.Testing, Version=2.0.20304.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
<Reference Include="NLog">
- <HintPath>..\packages\NLog.2.0.0.2000\lib\sl3-wp\NLog.dll</HintPath>
+ <HintPath>..\packages\NLog.2.0.0.2000\lib\sl4-windowsphone71\NLog.dll</HintPath>
</Reference>
<Reference Include="System.Observable" />
<Reference Include="System.Reactive.Core, Version=2.0.20304.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
@@ -56,7 +56,7 @@
<Reference Include="System.Windows" />
<Reference Include="system" />
<Reference Include="System.Core" />
- <Reference Include="System.Windows.Interactivity, Version=3.7.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+ <Reference Include="System.Windows.Interactivity, Version=3.8.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
<Reference Include="System.Xml" />
<Reference Include="System.Net" />
</ItemGroup>
@@ -77,6 +77,7 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
+ <None Include="app.config" />
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight for Phone\$(TargetFrameworkVersion)\Microsoft.Silverlight.$(TargetFrameworkProfile).Overrides.targets" />
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+ <runtime>
+ <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+ <dependentAssembly>
+ <assemblyIdentity name="System.Windows.Interactivity" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-3.8.5.0" newVersion="3.8.5.0" />
+ </dependentAssembly>
+ </assemblyBinding>
+ </runtime>
+</configuration>
@@ -89,6 +89,7 @@
</Page>
</ItemGroup>
<ItemGroup>
+ <None Include="app.config" />
<None Include="Properties\AppManifest.xml" />
<None Include="Properties\WMAppManifest.xml" />
<None Include="Service References\MicrosoftTranslatorService\configuration91.svcinfo" />
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+ <runtime>
+ <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+ <dependentAssembly>
+ <assemblyIdentity name="System.Windows.Interactivity" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-3.8.5.0" newVersion="3.8.5.0" />
+ </dependentAssembly>
+ </assemblyBinding>
+ </runtime>
+</configuration>
@@ -26,7 +26,7 @@ internal class DSESerializedObjects
/// This engine is only suited to very small production use-cases, as you
/// will almost certainly run out of memory with large collections.
/// </summary>
- public class DictionaryStorageEngine : IStorageEngine
+ public class DictionaryStorageEngine : IStorageEngine, IEnableLogger
{
readonly string _backingStorePath;
Dictionary<Guid, byte[]> _allItems;
@@ -7,7 +7,7 @@ namespace ReactiveUI.Serialization
/// NullStorageEngine is a test implementation of IStorageEngine that
/// always returns zero results
/// </summary>
- public class NullStorageEngine : IStorageEngine
+ public class NullStorageEngine : IStorageEngine, IEnableLogger
{
public T Load<T>(Guid ContentHash) where T : ISerializableItem
{
@@ -66,21 +66,16 @@
<DocumentationFile>Bin\Release\WP7\ReactiveUI.Serialization_WP7.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Newtonsoft.Json.WindowsPhone">
- <HintPath>..\ext\WP7\Newtonsoft.Json.WindowsPhone.dll</HintPath>
+ <Reference Include="Newtonsoft.Json">
+ <HintPath>..\packages\Newtonsoft.Json.4.5.1\lib\sl4-windowsphone71\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="NLog">
<HintPath>..\packages\NLog.2.0.0.2000\lib\sl3-wp\NLog.dll</HintPath>
</Reference>
<Reference Include="System.Observable" />
- <Reference Include="System.Reactive">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\ext\WP7\System.Reactive.dll</HintPath>
- </Reference>
- <Reference Include="System.Reactive.Windows.Threading">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\ext\WP7\System.Reactive.Windows.Threading.dll</HintPath>
- </Reference>
+ <Reference Include="System.Reactive.Core, Version=2.0.20304.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+ <Reference Include="System.Reactive.Interfaces, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+ <Reference Include="System.Reactive.Linq, Version=2.0.20304.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Windows" />
<Reference Include="system" />
@@ -67,8 +67,8 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.Reactive.Testing, Version=2.0.20304.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
- <Reference Include="NLog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
- <HintPath>..\packages\NLog.2.0.0.2000\lib\sl3-wp\NLog.dll</HintPath>
+ <Reference Include="NLog">
+ <HintPath>..\packages\NLog.2.0.0.2000\lib\sl4-windowsphone71\NLog.dll</HintPath>
</Reference>
<Reference Include="System.Observable" />
<Reference Include="System.Reactive.Core, Version=2.0.20304.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
@@ -80,7 +80,7 @@
<Reference Include="System.Windows" />
<Reference Include="system" />
<Reference Include="System.Core" />
- <Reference Include="System.Windows.Interactivity, Version=3.7.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+ <Reference Include="System.Windows.Interactivity, Version=3.8.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
<Reference Include="System.Xml" />
<Reference Include="System.Net" />
</ItemGroup>
@@ -67,7 +67,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="NLog">
- <HintPath>..\packages\NLog.2.0.0.2000\lib\sl3-wp\NLog.dll</HintPath>
+ <HintPath>..\packages\NLog.2.0.0.2000\lib\sl4-windowsphone71\NLog.dll</HintPath>
</Reference>
<Reference Include="System.Observable" />
<Reference Include="System.Reactive.Core, Version=2.0.20304.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
@@ -78,7 +78,7 @@
<Reference Include="System.Windows" />
<Reference Include="system" />
<Reference Include="System.Core" />
- <Reference Include="System.Windows.Interactivity, Version=3.7.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+ <Reference Include="System.Windows.Interactivity, Version=3.8.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
<Reference Include="System.Xml" />
<Reference Include="System.Net" />
</ItemGroup>
@@ -17,7 +17,7 @@ namespace ReactiveUI
/// <typeparam name="TParam">The type of the parameter to the calculation function.</typeparam>
/// <typeparam name="TVal">The type of the value returned by the calculation
/// function.</typeparam>
- public class MemoizingMRUCache<TParam, TVal>
+ public class MemoizingMRUCache<TParam, TVal> : IEnableLogger
{
private readonly Func<TParam, object, TVal> calculationFunction;
private readonly Action<TVal> releaseFunction;
@@ -66,8 +66,8 @@
<DocumentationFile>Bin\Release\WP7\ReactiveUI_WP7.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
- <Reference Include="NLog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
- <HintPath>..\packages\NLog.2.0.0.2000\lib\sl3-wp\NLog.dll</HintPath>
+ <Reference Include="NLog">
+ <HintPath>..\packages\NLog.2.0.0.2000\lib\sl4-windowsphone71\NLog.dll</HintPath>
</Reference>
<Reference Include="System.Observable" />
<Reference Include="System.Reactive.Core, Version=2.0.20304.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
@@ -78,7 +78,7 @@
<Reference Include="System.Windows" />
<Reference Include="system" />
<Reference Include="System.Core" />
- <Reference Include="System.Windows.Interactivity, Version=3.7.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+ <Reference Include="System.Windows.Interactivity, Version=3.8.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
<Reference Include="System.Xml" />
<Reference Include="System.Net" />
</ItemGroup>
Oops, something went wrong.

0 comments on commit 6e8878d

Please sign in to comment.