Skip to content

Commit

Permalink
Merge pull request #70 from PKRoma/pk/vs2010
Browse files Browse the repository at this point in the history
Clean references to ext/*.dll's to enable build of main and SL5 solutions on W7/VS2010
  • Loading branch information
Paul Betts committed Jun 27, 2012
2 parents de77e01 + 4149910 commit 87fb538
Show file tree
Hide file tree
Showing 25 changed files with 148 additions and 131 deletions.
8 changes: 3 additions & 5 deletions ReactiveUI.Blend/ReactiveUI.Blend.csproj
Expand Up @@ -49,12 +49,10 @@
<Reference Include="PresentationFramework" />
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Reactive, Version=1.1.11111.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<Reference Include="System.Reactive">
<HintPath>..\ext\System.Reactive.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.Windows.Threading, Version=1.1.11111.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<Reference Include="System.Reactive.Windows.Threading">
<HintPath>..\ext\System.Reactive.Windows.Threading.dll</HintPath>
</Reference>
<Reference Include="System.Windows.Interactivity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
Expand Down Expand Up @@ -88,4 +86,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
12 changes: 8 additions & 4 deletions ReactiveUI.Blend/ReactiveUI.Blend_SL5.csproj
Expand Up @@ -56,13 +56,17 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="mscorlib" />
<Reference Include="System.Reactive, Version=1.1.11111.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
<Reference Include="System.Reactive.Windows.Threading, Version=1.1.11111.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
<Reference Include="System.Reactive">
<HintPath>..\ext\SL5\System.Reactive.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.Windows.Threading">
<HintPath>..\ext\SL5\System.Reactive.Windows.Threading.dll</HintPath>
</Reference>
<Reference Include="System.Windows" />
<Reference Include="system" />
<Reference Include="System.Core" />
<Reference Include="System.Windows.Interactivity">
<HintPath>..\..\..\..\..\Program Files (x86)\Microsoft SDKs\Expression\Blend\Windows Phone\v7.0\Libraries\System.Windows.Interactivity.dll</HintPath>
<HintPath>C:\Program Files (x86)\Microsoft SDKs\Expression\Blend\Windows Phone\v7.1\Libraries\System.Windows.Interactivity.dll</HintPath>
</Reference>
<Reference Include="System.Xml" />
<Reference Include="System.Net" />
Expand Down Expand Up @@ -99,4 +103,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
10 changes: 7 additions & 3 deletions ReactiveUI.Blend/ReactiveUI.Blend_WP7.csproj
Expand Up @@ -54,8 +54,12 @@
<HintPath>..\packages\NLog.2.0.0.2000\lib\sl4-windowsphone71\NLog.dll</HintPath>
</Reference>
<Reference Include="System.Observable" />
<Reference Include="System.Reactive, Version=1.1.11111.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
<Reference Include="System.Reactive.Windows.Threading, Version=1.1.11111.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
<Reference Include="System.Reactive">
<HintPath>..\ext\WP71\System.Reactive.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.Windows.Threading">
<HintPath>..\ext\WP71\System.Reactive.Windows.Threading.dll</HintPath>
</Reference>
<Reference Include="System.Windows" />
<Reference Include="system" />
<Reference Include="System.Core" />
Expand Down Expand Up @@ -93,4 +97,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
8 changes: 3 additions & 5 deletions ReactiveUI.Routing.Tests/ReactiveUI.Routing.Tests.csproj
Expand Up @@ -42,12 +42,10 @@
<Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Core" />
<Reference Include="System.Reactive, Version=1.1.11111.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<Reference Include="System.Reactive">
<HintPath>..\ext\System.Reactive.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.Windows.Threading, Version=1.1.11111.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<Reference Include="System.Reactive.Windows.Threading">
<HintPath>..\ext\System.Reactive.Windows.Threading.dll</HintPath>
</Reference>
<Reference Include="System.Xaml" />
Expand Down Expand Up @@ -94,4 +92,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
13 changes: 5 additions & 8 deletions ReactiveUI.Routing/ReactiveUI.Routing.csproj
Expand Up @@ -32,9 +32,8 @@
<DocumentationFile>bin\Release\Net40\ReactiveUI.Routing.XML</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.Practices.ServiceLocation, Version=1.0.0.0, Culture=neutral, PublicKeyToken=176052f22c4ce19f, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\CommonServiceLocator.1.0\lib\NET40\Microsoft.Practices.ServiceLocation.dll</HintPath>
<Reference Include="Microsoft.Practices.ServiceLocation">
<HintPath>..\ext\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>
Expand All @@ -43,12 +42,10 @@
<Reference Include="PresentationFramework" />
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Reactive, Version=1.1.11111.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<Reference Include="System.Reactive">
<HintPath>..\ext\System.Reactive.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.Windows.Threading, Version=1.1.11111.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<Reference Include="System.Reactive.Windows.Threading">
<HintPath>..\ext\System.Reactive.Windows.Threading.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.Serialization" />
Expand Down Expand Up @@ -89,4 +86,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
10 changes: 7 additions & 3 deletions ReactiveUI.Routing/ReactiveUI.Routing_SL5.csproj
Expand Up @@ -63,8 +63,12 @@
<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, Version=1.1.11111.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
<Reference Include="System.Reactive.Windows.Threading, Version=1.1.11111.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
<Reference Include="System.Reactive">
<HintPath>..\ext\SL5\System.Reactive.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.Windows.Threading">
<HintPath>..\ext\SL5\System.Reactive.Windows.Threading.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Runtime.Serialization.Json, Version=5.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
<Reference Include="System.Windows" />
Expand Down Expand Up @@ -106,4 +110,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
14 changes: 10 additions & 4 deletions ReactiveUI.Routing/ReactiveUI.Routing_WP7.csproj
Expand Up @@ -72,14 +72,20 @@
<Reference Include="Microsoft.Practices.ServiceLocation">
<HintPath>..\ext\WP71\Microsoft.Practices.ServiceLocation.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Reactive.Testing, Version=2.0.20304.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
<Reference Include="Microsoft.Reactive.Testing">
<HintPath>..\ext\WP71\Microsoft.Reactive.Testing.dll</HintPath>
</Reference>
<Reference Include="mscorlib.Extensions" />
<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, Version=1.1.11111.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
<Reference Include="System.Reactive.Windows.Threading, Version=1.1.11111.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
<Reference Include="System.Reactive">
<HintPath>..\ext\WP71\System.Reactive.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.Windows.Threading">
<HintPath>..\ext\WP71\System.Reactive.Windows.Threading.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Windows" />
<Reference Include="system" />
Expand Down Expand Up @@ -119,4 +125,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
20 changes: 7 additions & 13 deletions ReactiveUI.Routing/ReactiveUI.Routing_WinRT.csproj
Expand Up @@ -127,28 +127,22 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Reference Include="System.Reactive.Core, Version=2.0.20304.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<Reference Include="System.Reactive.Core">
<HintPath>..\ext\winrt\System.Reactive.Core.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.Interfaces, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<Reference Include="System.Reactive.Interfaces">
<HintPath>..\ext\winrt\System.Reactive.Interfaces.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.Linq, Version=2.0.20304.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<Reference Include="System.Reactive.Linq">
<HintPath>..\ext\winrt\System.Reactive.Linq.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.PlatformServices, Version=2.0.20304.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<Reference Include="System.Reactive.PlatformServices">
<HintPath>..\ext\winrt\System.Reactive.PlatformServices.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.Windows.Threading, Version=2.0.20304.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<Reference Include="System.Reactive.Windows.Threading">
<HintPath>..\ext\winrt\System.Reactive.Windows.Threading.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.WindowsRuntime, Version=2.0.20304.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<Reference Include="System.Reactive.WindowsRuntime">
<HintPath>..\ext\winrt\System.Reactive.WindowsRuntime.dll</HintPath>
</Reference>
</ItemGroup>
Expand All @@ -163,4 +157,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
8 changes: 3 additions & 5 deletions ReactiveUI.Sample/ReactiveUI.Sample/ReactiveUI.Sample.csproj
Expand Up @@ -57,8 +57,7 @@
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.Reactive.Testing, Version=1.1.11011.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<Reference Include="Microsoft.Reactive.Testing">
<HintPath>..\..\ext\Microsoft.Reactive.Testing.dll</HintPath>
</Reference>
<Reference Include="NLog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
Expand All @@ -67,8 +66,7 @@
<Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Data" />
<Reference Include="System.Reactive, Version=1.1.11011.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<Reference Include="System.Reactive">
<HintPath>..\..\ext\System.Reactive.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.Windows.Threading">
Expand Down Expand Up @@ -191,4 +189,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
Expand Up @@ -79,18 +79,15 @@
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight">
<HintPath>..\ext\SL5\Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json.Silverlight, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<Reference Include="Newtonsoft.Json.Silverlight">
<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>
<HintPath>..\ext\SL5\System.Reactive.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Reactive.Testing">
<HintPath>..\ext\SL5\Microsoft.Reactive.Testing.dll</HintPath>
Expand All @@ -110,7 +107,9 @@
<Reference Include="xunit.extensions-silverlight4">
<HintPath>..\ext\xunit\xunit.extensions-silverlight4.dll</HintPath>
</Reference>
<Reference Include="xunitcontrib.runner.silverlight.toolkit-silverlight4, Version=0.1.0.40356, Culture=neutral, processorArchitecture=MSIL" />
<Reference Include="xunitcontrib.runner.silverlight.toolkit-silverlight4">
<HintPath>..\ext\xunit\xunitcontrib.runner.silverlight.toolkit-silverlight4.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="App.xaml.cs">
Expand Down Expand Up @@ -165,4 +164,4 @@
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
</Project>
</Project>
7 changes: 4 additions & 3 deletions ReactiveUI.Serialization/ReactiveUI.Serialization_SL5.csproj
Expand Up @@ -56,13 +56,14 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="mscorlib" />
<Reference Include="Newtonsoft.Json.Silverlight, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<Reference Include="Newtonsoft.Json.Silverlight">
<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>
<HintPath>..\ext\SL5\System.Reactive.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.Serialization" />
Expand Down
11 changes: 4 additions & 7 deletions ReactiveUI.Testing/ReactiveUI.Testing.csproj
Expand Up @@ -91,8 +91,7 @@
<NoWarn>1591, 1573, 1711, 1587, 1570, 1572</NoWarn>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.Reactive.Testing, Version=1.1.11111.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<Reference Include="Microsoft.Reactive.Testing">
<HintPath>..\ext\Microsoft.Reactive.Testing.dll</HintPath>
</Reference>
<Reference Include="NLog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
Expand All @@ -101,12 +100,10 @@
<Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Core" />
<Reference Include="System.Reactive, Version=1.1.11111.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<Reference Include="System.Reactive">
<HintPath>..\ext\System.Reactive.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.Windows.Threading, Version=1.1.11111.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<Reference Include="System.Reactive.Windows.Threading">
<HintPath>..\ext\System.Reactive.Windows.Threading.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.Serialization" />
Expand Down Expand Up @@ -136,4 +133,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
14 changes: 10 additions & 4 deletions ReactiveUI.Testing/ReactiveUI.Testing_SL5.csproj
Expand Up @@ -55,11 +55,17 @@
<DocumentationFile>Bin\Release\SL5\ReactiveUI.Testing_SL5.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.Reactive.Testing, Version=1.1.11111.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
<Reference Include="Microsoft.Reactive.Testing">
<HintPath>..\ext\SL5\Microsoft.Reactive.Testing.dll</HintPath>
</Reference>
<Reference Include="mscorlib" />
<Reference Include="System.ComponentModel.DataAnnotations, Version=5.0.5.0, Culture=neutral, PublicKeyToken=ddd0da4d3e678217, processorArchitecture=MSIL" />
<Reference Include="System.Reactive, Version=1.1.11111.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
<Reference Include="System.Reactive.Windows.Threading, Version=1.1.11111.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
<Reference Include="System.Reactive">
<HintPath>..\ext\SL5\System.Reactive.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.Windows.Threading">
<HintPath>..\ext\SL5\System.Reactive.Windows.Threading.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Windows" />
<Reference Include="system" />
Expand Down Expand Up @@ -96,4 +102,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
14 changes: 10 additions & 4 deletions ReactiveUI.Testing/ReactiveUI.Testing_WP7.csproj
Expand Up @@ -66,14 +66,20 @@
<DocumentationFile>Bin\Release\WP7\ReactiveUI.Testing_WP7.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.Reactive.Testing, Version=1.1.11111.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
<Reference Include="Microsoft.Reactive.Testing">
<HintPath>..\ext\WP71\Microsoft.Reactive.Testing.dll</HintPath>
</Reference>
<Reference Include="mscorlib.Extensions" />
<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, Version=1.1.11111.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
<Reference Include="System.Reactive.Windows.Threading, Version=1.1.11111.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
<Reference Include="System.Reactive">
<HintPath>..\ext\WP71\System.Reactive.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.Windows.Threading">
<HintPath>..\ext\WP71\System.Reactive.Windows.Threading.dll</HintPath>
</Reference>
<Reference Include="System.Windows" />
<Reference Include="system" />
<Reference Include="System.Core" />
Expand Down Expand Up @@ -110,4 +116,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>

0 comments on commit 87fb538

Please sign in to comment.