Visual Studio terrorism

reactiveui · Dec 13, 2012 · b8d68fe · b8d68fe
1 parent b34a938
commit b8d68fe
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 5 deletions.
diff --git a/ReactiveUI.Tests/ReactiveUI.Tests_SL5.csproj b/ReactiveUI.Tests/ReactiveUI.Tests_SL5.csproj
@@ -82,6 +82,15 @@
     <Reference Include="Microsoft.Silverlight.Testing">
       <HintPath>..\ext\SL5\Microsoft.Silverlight.Testing.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.Threading.Tasks">
+      <HintPath>..\packages\Microsoft.Bcl.Async.1.0.12-beta\lib\sl5\Microsoft.Threading.Tasks.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Threading.Tasks.Extensions">
+      <HintPath>..\packages\Microsoft.Bcl.Async.1.0.12-beta\lib\sl5\Microsoft.Threading.Tasks.Extensions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Threading.Tasks.Extensions.Silverlight">
+      <HintPath>..\packages\Microsoft.Bcl.Async.1.0.12-beta\lib\sl5\Microsoft.Threading.Tasks.Extensions.Silverlight.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight">
       <HintPath>..\ext\SL5\Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight.dll</HintPath>
     </Reference>
@@ -106,9 +115,17 @@
       <HintPath>..\ext\SL5\System.Reactive.Windows.Threading.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.DataAnnotations, Version=5.0.5.0, Culture=neutral, PublicKeyToken=ddd0da4d3e678217, processorArchitecture=MSIL" />
+    <Reference Include="System.Runtime, Version=2.5.11.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Microsoft.Bcl.1.0.11-beta\lib\sl5\System.Runtime.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.ServiceModel.Web" />
+    <Reference Include="System.Threading.Tasks, Version=2.5.11.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Microsoft.Bcl.1.0.11-beta\lib\sl5\System.Threading.Tasks.dll</HintPath>
+    </Reference>
     <Reference Include="System.Windows" />
     <Reference Include="mscorlib" />
     <Reference Include="system" />
@@ -156,6 +173,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
+    <None Include="packages.config" />
     <None Include="Properties\AppManifest.xml">
       <SubType>Designer</SubType>
     </None>
@@ -189,4 +207,5 @@
     </VisualStudio>
   </ProjectExtensions>
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
-</Project>
+  <Import Project="..\packages\Microsoft.Bcl.1.0.11-beta\tools\portable-net40+sl4+win8+wp71\Microsoft.Bcl.targets" />
+</Project>
diff --git a/ReactiveUI.Tests/packages.config b/ReactiveUI.Tests/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.Bcl" version="1.0.11-beta" targetFramework="sl50" />
+  <package id="Microsoft.Bcl.Async" version="1.0.12-beta" targetFramework="sl50" />
+</packages>
diff --git a/ReactiveUI.sln b/ReactiveUI.sln
@@ -132,6 +132,7 @@ Global
 		{B3381C78-C099-4902-89D4-B879AA83BFC9}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{B3381C78-C099-4902-89D4-B879AA83BFC9}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{B3381C78-C099-4902-89D4-B879AA83BFC9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B3381C78-C099-4902-89D4-B879AA83BFC9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B3381C78-C099-4902-89D4-B879AA83BFC9}.Release|ARM.ActiveCfg = Release|Any CPU
 		{B3381C78-C099-4902-89D4-B879AA83BFC9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{B3381C78-C099-4902-89D4-B879AA83BFC9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
@@ -159,6 +160,7 @@ Global
 		{1E453720-AEE5-4B34-8660-7AD86E5E05AF}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{1E453720-AEE5-4B34-8660-7AD86E5E05AF}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{1E453720-AEE5-4B34-8660-7AD86E5E05AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1E453720-AEE5-4B34-8660-7AD86E5E05AF}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1E453720-AEE5-4B34-8660-7AD86E5E05AF}.Release|ARM.ActiveCfg = Release|Any CPU
 		{1E453720-AEE5-4B34-8660-7AD86E5E05AF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{1E453720-AEE5-4B34-8660-7AD86E5E05AF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
@@ -200,6 +202,7 @@ Global
 		{007E6D54-44FE-45BA-A364-AD108B7C6CDF}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{007E6D54-44FE-45BA-A364-AD108B7C6CDF}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{007E6D54-44FE-45BA-A364-AD108B7C6CDF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{007E6D54-44FE-45BA-A364-AD108B7C6CDF}.Release|Any CPU.Build.0 = Release|Any CPU
 		{007E6D54-44FE-45BA-A364-AD108B7C6CDF}.Release|ARM.ActiveCfg = Release|Any CPU
 		{007E6D54-44FE-45BA-A364-AD108B7C6CDF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{007E6D54-44FE-45BA-A364-AD108B7C6CDF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
@@ -227,6 +230,7 @@ Global
 		{73804A79-A9FC-48FD-8F7C-E796415A8B3A}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{73804A79-A9FC-48FD-8F7C-E796415A8B3A}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{73804A79-A9FC-48FD-8F7C-E796415A8B3A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{73804A79-A9FC-48FD-8F7C-E796415A8B3A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{73804A79-A9FC-48FD-8F7C-E796415A8B3A}.Release|ARM.ActiveCfg = Release|Any CPU
 		{73804A79-A9FC-48FD-8F7C-E796415A8B3A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{73804A79-A9FC-48FD-8F7C-E796415A8B3A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
@@ -268,6 +272,7 @@ Global
 		{435E1011-E9FE-4E61-8B6D-2627DC6D1F06}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{435E1011-E9FE-4E61-8B6D-2627DC6D1F06}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{435E1011-E9FE-4E61-8B6D-2627DC6D1F06}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{435E1011-E9FE-4E61-8B6D-2627DC6D1F06}.Release|Any CPU.Build.0 = Release|Any CPU
 		{435E1011-E9FE-4E61-8B6D-2627DC6D1F06}.Release|ARM.ActiveCfg = Release|Any CPU
 		{435E1011-E9FE-4E61-8B6D-2627DC6D1F06}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{435E1011-E9FE-4E61-8B6D-2627DC6D1F06}.Release|Mixed Platforms.Build.0 = Release|Any CPU
@@ -624,4 +629,3 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 EndGlobal
-
diff --git a/ReactiveUI/ReactiveUI_WinRT.csproj b/ReactiveUI/ReactiveUI_WinRT.csproj
@@ -14,6 +14,8 @@
     <DefaultLanguage>en-US</DefaultLanguage>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -68,6 +70,7 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
+    <None Include="packages.config" />
     <None Include="VariadicTemplates.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
       <LastGenOutput>VariadicTemplates.cs</LastGenOutput>
@@ -100,11 +103,13 @@
     <VisualStudioVersion>11.0</VisualStudioVersion>
   </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
+  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  <Import Project="..\packages\Microsoft.Bcl.1.0.11-beta\tools\portable-net40+sl4+win8+wp71\Microsoft.Bcl.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.
   <Target Name="BeforeBuild">
   </Target>
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
diff --git a/ReactiveUI/packages.config b/ReactiveUI/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.Bcl" version="1.0.11-beta" targetFramework="win" />
+  <package id="Microsoft.Bcl.Async" version="1.0.12-beta" targetFramework="win" />
+</packages>
diff --git a/packages/repositories.config b/packages/repositories.config
@@ -2,9 +2,9 @@
 <repositories>
   <repository path="..\PerfConsoleRunner\packages.config" />
   <repository path="..\ReactiveUI.NLog\packages.config" />
-  <repository path="..\ReactiveUI.Sample\ReactiveUI.Sample.Tests\packages.config" />
-  <repository path="..\ReactiveUI.Sample\ReactiveUI.Sample\packages.config" />
   <repository path="..\ReactiveUI.Serialization.Esent\packages.config" />
   <repository path="..\ReactiveUI.Serialization.Tests\packages.config" />
   <repository path="..\ReactiveUI.Serialization\packages.config" />
+  <repository path="..\ReactiveUI.Tests\packages.config" />
+  <repository path="..\ReactiveUI\packages.config" />
 </repositories>