Fix All The Build Errors

reactiveui · Mar 14, 2012 · 91d6a52 · 91d6a52
1 parent 628010f
commit 91d6a52
Show file tree

Hide file tree

Showing 39 changed files with 157 additions and 65 deletions.
diff --git a/PerfConsoleRunner/PerfConsoleRunner.csproj b/PerfConsoleRunner/PerfConsoleRunner.csproj
@@ -35,6 +35,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="NLog">
+      <HintPath>..\packages\NLog.2.0.0.2000\lib\net40\NLog.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -78,6 +81,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
+    <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

diff --git a/PerfConsoleRunner/packages.config b/PerfConsoleRunner/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="NLog" version="2.0.0.2000" />
+</packages>
diff --git a/ReactiveUI.Blend/ReactiveUI.Blend.csproj b/ReactiveUI.Blend/ReactiveUI.Blend.csproj
@@ -42,6 +42,9 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Expression.Interactions, Version=4.0.0.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\net40\NLog.dll</HintPath>
+    </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="System" />
@@ -85,4 +88,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
diff --git a/ReactiveUI.Blend/ReactiveUI.Blend_WP7.csproj b/ReactiveUI.Blend/ReactiveUI.Blend_WP7.csproj
@@ -43,6 +43,9 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Expression.Interactions, Version=3.7.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+    <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>
@@ -75,6 +78,9 @@
       <Name>ReactiveUI_WP7</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight for Phone\$(TargetFrameworkVersion)\Microsoft.Silverlight.$(TargetFrameworkProfile).Overrides.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight for Phone\$(TargetFrameworkVersion)\Microsoft.Silverlight.CSharp.targets" />
   <ProjectExtensions />
@@ -85,4 +91,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
diff --git a/ReactiveUI.Blend/packages.config b/ReactiveUI.Blend/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="NLog" version="2.0.0.2000" />
+</packages>
diff --git a/ReactiveUI.Routing.Tests/ReactiveUI.Routing.Tests.csproj b/ReactiveUI.Routing.Tests/ReactiveUI.Routing.Tests.csproj
@@ -34,6 +34,9 @@
     <Reference Include="Microsoft.Reactive.Testing">
       <HintPath>..\ext\Microsoft.Reactive.Testing.dll</HintPath>
     </Reference>
+    <Reference Include="NLog">
+      <HintPath>..\packages\NLog.2.0.0.2000\lib\net40\NLog.dll</HintPath>
+    </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="System" />
@@ -80,6 +83,9 @@
       <Name>ReactiveUI</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- 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/ReactiveUI.Routing.Tests/RoutingState.cs b/ReactiveUI.Routing.Tests/RoutingState.cs
@@ -7,7 +7,7 @@
 
 namespace ReactiveUI.Routing.Tests
 {
-    public class TestViewModel : ModelBase, IRoutableViewModel
+    public class TestViewModel : ReactiveObject, IRoutableViewModel
     {
         string _SomeProp;
         public string SomeProp {
@@ -27,26 +27,6 @@ public IScreen HostScreen
 
     public class RoutingStateTests
     {
-        [Fact]
-        public void RoutingStateSerializableRoundTripTest()
-        {
-            var engine = new DictionaryStorageEngine();
-
-            using(var _ = engine.AsPrimaryEngine()) {
-                var input = new TestViewModel() {SomeProp = "Foo"};
-                var fixture = new RoutingState();
-                fixture.NavigationStack.Add(input);
-
-                RxStorage.Engine.CreateSyncPoint(fixture);
-
-                var output = RxStorage.Engine.Load<RoutingState>(fixture.ContentHash);
-
-                Assert.True(output.NavigationStack.Count == 1);
-                Assert.True(output.NavigationStack[0].ContentHash == input.ContentHash);
-                Assert.Equal(input.SomeProp, ((TestViewModel) output.NavigationStack[0]).SomeProp);
-            }
-        }
-
         [Fact]
         public void NavigationPushPopTest()
         {
@@ -57,36 +37,11 @@ public void NavigationPushPopTest()
             fixture.NavigateForward.Execute(input);
 
             Assert.Equal(1, fixture.NavigationStack.Count);
-            Assert.Equal(input.ContentHash, fixture.NavigationStack[0].ContentHash);
             Assert.True(fixture.NavigateBack.CanExecute(null));
 
             fixture.NavigateBack.Execute(null);
 
             Assert.Equal(0, fixture.NavigationStack.Count);
         }
-
-        [Fact]
-        public void NavigationPushPopSerializationTest()
-        {
-            var engine = new DictionaryStorageEngine();
-
-            using (var _ = engine.AsPrimaryEngine()) {
-                var input = new TestViewModel() {SomeProp = "Foo"};
-                var fixture = new RoutingState();
-                fixture.NavigateForward.Execute(input);
-
-                RxStorage.Engine.CreateSyncPoint(fixture);
-
-                var output = RxStorage.Engine.GetLatestRootObject<RoutingState>();
-
-                Assert.True(output.NavigateBack.CanExecute(null));
-
-                output.NavigateBack.Execute(null);
-                RxStorage.Engine.CreateSyncPoint(output);
-                output = RxStorage.Engine.GetLatestRootObject<RoutingState>();
-
-                Assert.False(output.NavigateBack.CanExecute(null));
-            }
-        }
     }
 }
diff --git a/ReactiveUI.Routing.Tests/packages.config b/ReactiveUI.Routing.Tests/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="NLog" version="2.0.0.2000" />
+</packages>
diff --git a/ReactiveUI.Routing/ReactiveUI.Routing.csproj b/ReactiveUI.Routing/ReactiveUI.Routing.csproj
@@ -36,6 +36,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\CommonServiceLocator.1.0\lib\NET40\Microsoft.Practices.ServiceLocation.dll</HintPath>
     </Reference>
+    <Reference Include="NLog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <HintPath>..\packages\NLog.2.0.0.2000\lib\net40\NLog.dll</HintPath>
+    </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="System" />

diff --git a/ReactiveUI.Routing/ReactiveUI.Routing_SL4.csproj b/ReactiveUI.Routing/ReactiveUI.Routing_SL4.csproj
@@ -59,6 +59,9 @@
       <HintPath>..\ext\SL4\Microsoft.Practices.ServiceLocation.dll</HintPath>
     </Reference>
     <Reference Include="mscorlib" />
+    <Reference Include="NLog">
+      <HintPath>..\packages\NLog.2.0.0.2000\lib\sl4\NLog.dll</HintPath>
+    </Reference>
     <Reference Include="System.ComponentModel.DataAnnotations, Version=2.0.5.0, Culture=neutral, PublicKeyToken=ddd0da4d3e678217, processorArchitecture=MSIL" />
     <Reference Include="System.Reactive">
       <Private>True</Private>

diff --git a/ReactiveUI.Routing/ReactiveUI.Routing_SL5.csproj b/ReactiveUI.Routing/ReactiveUI.Routing_SL5.csproj
@@ -59,6 +59,9 @@
       <HintPath>..\ext\SL5\Microsoft.Practices.ServiceLocation.dll</HintPath>
     </Reference>
     <Reference Include="mscorlib" />
+    <Reference Include="NLog">
+      <HintPath>..\packages\NLog.2.0.0.2000\lib\sl4\NLog.dll</HintPath>
+    </Reference>
     <Reference Include="System.ComponentModel.DataAnnotations, Version=5.0.5.0, Culture=neutral, PublicKeyToken=ddd0da4d3e678217, processorArchitecture=MSIL" />
     <Reference Include="System.Reactive">
       <Private>True</Private>

diff --git a/ReactiveUI.Routing/ReactiveUI.Routing_WP7.csproj b/ReactiveUI.Routing/ReactiveUI.Routing_WP7.csproj
@@ -70,6 +70,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\ext\WP7\Microsoft.Practices.ServiceLocation.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.Windows.Threading">
       <Private>True</Private>
@@ -105,6 +108,9 @@
       <Name>ReactiveUI_WP7</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight for Phone\$(TargetFrameworkVersion)\Microsoft.Silverlight.$(TargetFrameworkProfile).Overrides.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight for Phone\$(TargetFrameworkVersion)\Microsoft.Silverlight.CSharp.targets" />
   <ProjectExtensions />

diff --git a/ReactiveUI.Routing/packages.config b/ReactiveUI.Routing/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="NLog" version="2.0.0.2000" />
+</packages>
diff --git a/ReactiveUI.Serialization.Tests/ReactiveUI.Serialization.Tests.csproj b/ReactiveUI.Serialization.Tests/ReactiveUI.Serialization.Tests.csproj
@@ -63,6 +63,9 @@
     <Reference Include="Microsoft.Moles.Framework, Version=0.94.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
     <Reference Include="Microsoft.Pex.Framework, Version=0.94.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
     <Reference Include="Microsoft.Pex.Linq, Version=0.94.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+    <Reference Include="NLog">
+      <HintPath>..\packages\NLog.2.0.0.2000\lib\net40\NLog.dll</HintPath>
+    </Reference>
     <Reference Include="ReactiveUI.Serialization.Moles, Version=2.2.0.0, Culture=neutral, processorArchitecture=MSIL" />
     <Reference Include="ReactiveXaml.Serialization.Moles, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL" />
     <Reference Include="System" />
@@ -148,4 +151,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
diff --git a/ReactiveUI.Serialization.Tests/ReactiveUI.Serialization.Tests_SL4.csproj b/ReactiveUI.Serialization.Tests/ReactiveUI.Serialization.Tests_SL4.csproj
@@ -87,6 +87,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\ext\SL4\Newtonsoft.Json.Silverlight.dll</HintPath>
     </Reference>
+    <Reference Include="NLog">
+      <HintPath>..\packages\NLog.2.0.0.2000\lib\sl4\NLog.dll</HintPath>
+    </Reference>
     <Reference Include="System.ComponentModel.DataAnnotations, Version=2.0.5.0, Culture=neutral, PublicKeyToken=ddd0da4d3e678217, processorArchitecture=MSIL" />
     <Reference Include="System.Observable">
       <SpecificVersion>False</SpecificVersion>

diff --git a/ReactiveUI.Serialization.Tests/ReactiveUI.Serialization.Tests_SL5.csproj b/ReactiveUI.Serialization.Tests/ReactiveUI.Serialization.Tests_SL5.csproj
@@ -83,6 +83,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\ext\SL5\Newtonsoft.Json.Silverlight.dll</HintPath>
     </Reference>
+    <Reference Include="NLog">
+      <HintPath>..\packages\NLog.2.0.0.2000\lib\sl4\NLog.dll</HintPath>
+    </Reference>
     <Reference Include="System.ComponentModel.DataAnnotations, Version=5.0.5.0, Culture=neutral, PublicKeyToken=ddd0da4d3e678217, processorArchitecture=MSIL" />
     <Reference Include="System.Reactive">
       <SpecificVersion>False</SpecificVersion>
@@ -121,6 +124,8 @@
     </ApplicationDefinition>
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
+    <None Include="packages.config" />
     <None Include="Properties\AppManifest.xml">
       <SubType>Designer</SubType>
     </None>

diff --git a/ReactiveUI.Serialization.Tests/app.config b/ReactiveUI.Serialization.Tests/app.config
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.5.0" newVersion="5.0.5.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Silverlight.Testing" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.5.0" newVersion="5.0.5.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
diff --git a/ReactiveUI.Serialization.Tests/packages.config b/ReactiveUI.Serialization.Tests/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="NLog" version="2.0.0.2000" />
+</packages>
diff --git a/ReactiveUI.Serialization/ReactiveUI.Serialization_SL4.csproj b/ReactiveUI.Serialization/ReactiveUI.Serialization_SL4.csproj
@@ -111,4 +111,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
diff --git a/ReactiveUI.Serialization/ReactiveUI.Serialization_SL5.csproj b/ReactiveUI.Serialization/ReactiveUI.Serialization_SL5.csproj
@@ -60,9 +60,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\ext\SL5\Newtonsoft.Json.Silverlight.dll</HintPath>
     </Reference>
-    <Reference Include="NLog">
-      <HintPath>..\packages\NLog.2.0.0.2000\lib\sl4\NLog.dll</HintPath>
-    </Reference>
     <Reference Include="System.ComponentModel.DataAnnotations, Version=5.0.5.0, Culture=neutral, PublicKeyToken=ddd0da4d3e678217, processorArchitecture=MSIL" />
     <Reference Include="System.Reactive">
       <Private>True</Private>

diff --git a/ReactiveUI.Serialization/ReactiveUI.Serialization_WP7.csproj b/ReactiveUI.Serialization/ReactiveUI.Serialization_WP7.csproj
@@ -69,6 +69,9 @@
     <Reference Include="Newtonsoft.Json.WindowsPhone">
       <HintPath>..\ext\WP7\Newtonsoft.Json.WindowsPhone.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>
@@ -122,4 +125,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
diff --git a/ReactiveUI.Testing/ReactiveUI.Testing.csproj b/ReactiveUI.Testing/ReactiveUI.Testing.csproj
@@ -91,6 +91,9 @@
     <NoWarn>1591, 1573, 1711, 1587, 1570, 1572</NoWarn>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="NLog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <HintPath>..\packages\NLog.2.0.0.2000\lib\net40\NLog.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Core" />

diff --git a/ReactiveUI.Testing/ReactiveUI.Testing_35.csproj b/ReactiveUI.Testing/ReactiveUI.Testing_35.csproj
@@ -40,6 +40,9 @@
     <DocumentationFile>bin\Release\Net35\ReactiveUI.Testing_35.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\net35\NLog.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Core" />
@@ -81,4 +84,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
diff --git a/ReactiveUI.Testing/ReactiveUI.Testing_SL4.csproj b/ReactiveUI.Testing/ReactiveUI.Testing_SL4.csproj
@@ -101,4 +101,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
diff --git a/ReactiveUI.Testing/ReactiveUI.Testing_WP7.csproj b/ReactiveUI.Testing/ReactiveUI.Testing_WP7.csproj
@@ -66,6 +66,9 @@
     <DocumentationFile>Bin\Release\WP7\ReactiveUI.Testing_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>
     <Reference Include="System.Reactive">
       <Private>True</Private>
       <HintPath>..\ext\WP7\System.Reactive.dll</HintPath>
@@ -99,6 +102,9 @@
       <Name>ReactiveUI_WP7</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight for Phone\$(TargetFrameworkVersion)\Microsoft.Silverlight.$(TargetFrameworkProfile).Overrides.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight for Phone\$(TargetFrameworkVersion)\Microsoft.Silverlight.CSharp.targets" />
   <ProjectExtensions />
@@ -109,4 +115,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
diff --git a/ReactiveUI.Testing/packages.config b/ReactiveUI.Testing/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="NLog" version="2.0.0.2000" />
+</packages>