Permalink
Browse files

Merge remote-tracking branch 'origin/master' into reactiveui.mobile

  • Loading branch information...
2 parents f92a87a + 394eb8c commit 05a1286e125331f6a0121a534b78532db86fd9f2 @paulcbetts paulcbetts committed Dec 13, 2012
Showing with 54,043 additions and 7,496 deletions.
  1. +22 −0 .gitattributes
  2. BIN .nuget/NuGet.exe
  3. +36 −36 CONTRIBUTING.md
  4. +62 −62 MakeRelease.ps1
  5. +1 −0 NuGet/ReactiveUI-Core/ReactiveUI-Core.nuspec
  6. +3 −3 ReactiveUI.Blend/ReactiveUI.Blend_Net45.csproj
  7. +18 −4 ReactiveUI.Blend/ReactiveUI.Blend_WP7.csproj
  8. +20 −1 ReactiveUI.Blend/ReactiveUI.Blend_WP8.csproj
  9. +2 −2 ReactiveUI.NLog/ReactiveUI.NLog_Net45.csproj
  10. +16 −2 ReactiveUI.NLog/ReactiveUI.NLog_WP7.csproj
  11. +16 −1 ReactiveUI.NLog/ReactiveUI.NLog_WP8.csproj
  12. +1 −4 ReactiveUI.Routing/ReactiveUI.Routing.csproj
  13. +3 −3 ReactiveUI.Routing/ReactiveUI.Routing_Net45.csproj
  14. +3 −3 ReactiveUI.Routing/ReactiveUI.Routing_SL5.csproj
  15. +15 −3 ReactiveUI.Routing/ReactiveUI.Routing_WP7.csproj
  16. +21 −1 ReactiveUI.Routing/ReactiveUI.Routing_WP8.csproj
  17. +2 −2 ReactiveUI.Testing/ReactiveUI.Testing_Net45.csproj
  18. +1 −2 ReactiveUI.Testing/ReactiveUI.Testing_WP7.csproj
  19. +20 −2 ReactiveUI.Testing/ReactiveUI.Testing_WP8.csproj
  20. +2 −2 ReactiveUI.Xaml/ReactiveUI.Xaml_Net45.csproj
  21. +20 −8 ReactiveUI.Xaml/ReactiveUI.Xaml_WP7.csproj
  22. +20 −1 ReactiveUI.Xaml/ReactiveUI.Xaml_WP8.csproj
  23. +1 −1 ReactiveUI.sln
  24. +8 −0 ReactiveUI/CallerMemberNameAttribute.cs
  25. +3 −0 ReactiveUI/Properties/AssemblyInfo.cs
  26. +0 −5 ReactiveUI/ReactiveObject.cs
  27. +6 −0 ReactiveUI/ReactiveUI.csproj
  28. +4 −3 ReactiveUI/ReactiveUI_Mono.csproj
  29. +2 −2 ReactiveUI/ReactiveUI_Net45.csproj
  30. +16 −1 ReactiveUI/ReactiveUI_SL5.csproj
  31. +16 −2 ReactiveUI/ReactiveUI_WP7.csproj
  32. +16 −1 ReactiveUI/ReactiveUI_WP8.csproj
  33. BIN ext/WP71/AsyncCtpLibrary_Phone.dll
  34. +460 −0 packages/Microsoft.Bcl.1.0.11-beta/License.rtf
  35. +28 −0 packages/Microsoft.Bcl.1.0.11-beta/Microsoft.Bcl.1.0.11-beta.nuspec
  36. BIN packages/Microsoft.Bcl.1.0.11-beta/lib/net40/System.Runtime.dll
  37. +56 −0 packages/Microsoft.Bcl.1.0.11-beta/lib/net40/System.Runtime.xml
  38. BIN packages/Microsoft.Bcl.1.0.11-beta/lib/net40/System.Threading.Tasks.dll
  39. +475 −0 packages/Microsoft.Bcl.1.0.11-beta/lib/net40/System.Threading.Tasks.xml
  40. 0 packages/Microsoft.Bcl.1.0.11-beta/lib/net45/_._
  41. BIN packages/Microsoft.Bcl.1.0.11-beta/lib/portable-net40+sl4+win8+wp71/System.Runtime.dll
  42. +860 −0 packages/Microsoft.Bcl.1.0.11-beta/lib/portable-net40+sl4+win8+wp71/System.Runtime.xml
  43. BIN packages/Microsoft.Bcl.1.0.11-beta/lib/portable-net40+sl4+win8+wp71/System.Threading.Tasks.dll
  44. +6,907 −7,339 ... → packages/Microsoft.Bcl.1.0.11-beta/lib/portable-net40+sl4+win8+wp71/System.Threading.Tasks.xml
  45. BIN packages/Microsoft.Bcl.1.0.11-beta/lib/portable-net40+sl4+win8+wp8/System.Runtime.dll
  46. +56 −0 packages/Microsoft.Bcl.1.0.11-beta/lib/portable-net40+sl4+win8+wp8/System.Runtime.xml
  47. BIN packages/Microsoft.Bcl.1.0.11-beta/lib/portable-net40+sl4+win8+wp8/System.Threading.Tasks.dll
  48. +8,969 −0 packages/Microsoft.Bcl.1.0.11-beta/lib/portable-net40+sl4+win8+wp8/System.Threading.Tasks.xml
  49. BIN packages/Microsoft.Bcl.1.0.11-beta/lib/portable-net40+sl4+win8/System.Runtime.dll
  50. +56 −0 packages/Microsoft.Bcl.1.0.11-beta/lib/portable-net40+sl4+win8/System.Runtime.xml
  51. BIN packages/Microsoft.Bcl.1.0.11-beta/lib/portable-net40+sl4+win8/System.Threading.Tasks.dll
  52. +8,969 −0 packages/Microsoft.Bcl.1.0.11-beta/lib/portable-net40+sl4+win8/System.Threading.Tasks.xml
  53. BIN packages/Microsoft.Bcl.1.0.11-beta/lib/portable-net40+sl5+win8+wp8/System.Runtime.dll
  54. +56 −0 packages/Microsoft.Bcl.1.0.11-beta/lib/portable-net40+sl5+win8+wp8/System.Runtime.xml
  55. BIN packages/Microsoft.Bcl.1.0.11-beta/lib/portable-net40+sl5+win8+wp8/System.Threading.Tasks.dll
  56. +475 −0 packages/Microsoft.Bcl.1.0.11-beta/lib/portable-net40+sl5+win8+wp8/System.Threading.Tasks.xml
  57. BIN packages/Microsoft.Bcl.1.0.11-beta/lib/portable-net40+win8+wp8/System.Runtime.dll
  58. +56 −0 packages/Microsoft.Bcl.1.0.11-beta/lib/portable-net40+win8+wp8/System.Runtime.xml
  59. BIN packages/Microsoft.Bcl.1.0.11-beta/lib/portable-net40+win8+wp8/System.Threading.Tasks.dll
  60. +475 −0 packages/Microsoft.Bcl.1.0.11-beta/lib/portable-net40+win8+wp8/System.Threading.Tasks.xml
  61. BIN packages/Microsoft.Bcl.1.0.11-beta/lib/portable-net40+win8/System.Runtime.dll
  62. +56 −0 packages/Microsoft.Bcl.1.0.11-beta/lib/portable-net40+win8/System.Runtime.xml
  63. BIN packages/Microsoft.Bcl.1.0.11-beta/lib/portable-net40+win8/System.Threading.Tasks.dll
  64. +475 −0 packages/Microsoft.Bcl.1.0.11-beta/lib/portable-net40+win8/System.Threading.Tasks.xml
  65. 0 packages/Microsoft.Bcl.1.0.11-beta/lib/portable-net45+win8+wp8/_._
  66. BIN packages/Microsoft.Bcl.1.0.11-beta/lib/sl4-windowsphone71/System.Runtime.dll
  67. +860 −0 packages/Microsoft.Bcl.1.0.11-beta/lib/sl4-windowsphone71/System.Runtime.xml
  68. BIN packages/Microsoft.Bcl.1.0.11-beta/lib/sl4-windowsphone71/System.Threading.Tasks.dll
  69. +8,969 −0 packages/Microsoft.Bcl.1.0.11-beta/lib/sl4-windowsphone71/System.Threading.Tasks.xml
  70. BIN packages/Microsoft.Bcl.1.0.11-beta/lib/sl4/System.Runtime.dll
  71. +56 −0 packages/Microsoft.Bcl.1.0.11-beta/lib/sl4/System.Runtime.xml
  72. BIN packages/Microsoft.Bcl.1.0.11-beta/lib/sl4/System.Threading.Tasks.dll
  73. +8,969 −0 packages/Microsoft.Bcl.1.0.11-beta/lib/sl4/System.Threading.Tasks.xml
  74. BIN packages/Microsoft.Bcl.1.0.11-beta/lib/sl5/System.Runtime.dll
  75. +56 −0 packages/Microsoft.Bcl.1.0.11-beta/lib/sl5/System.Runtime.xml
  76. BIN packages/Microsoft.Bcl.1.0.11-beta/lib/sl5/System.Threading.Tasks.dll
  77. +475 −0 packages/Microsoft.Bcl.1.0.11-beta/lib/sl5/System.Threading.Tasks.xml
  78. 0 packages/Microsoft.Bcl.1.0.11-beta/lib/win8/_._
  79. 0 packages/Microsoft.Bcl.1.0.11-beta/lib/wp8/_._
  80. +18 −0 packages/Microsoft.Bcl.1.0.11-beta/tools/portable-net40+sl4+win8+wp71/Install.ps1
  81. +25 −0 packages/Microsoft.Bcl.1.0.11-beta/tools/portable-net40+sl4+win8+wp71/Microsoft.Bcl.targets
  82. +13 −0 packages/Microsoft.Bcl.1.0.11-beta/tools/portable-net40+sl4+win8+wp71/Uninstall.ps1
  83. 0 packages/Microsoft.Bcl.1.0.11-beta/tools/portable-net45+win8+wp8/_._
  84. +458 −0 packages/Microsoft.Bcl.Async.1.0.12-beta/License.rtf
  85. +21 −0 packages/Microsoft.Bcl.Async.1.0.12-beta/Microsoft.Bcl.Async.1.0.12-beta.nuspec
  86. BIN packages/Microsoft.Bcl.Async.1.0.12-beta/lib/net40/Microsoft.Threading.Tasks.Extensions.Desktop.dll
  87. +684 −0 packages/Microsoft.Bcl.Async.1.0.12-beta/lib/net40/Microsoft.Threading.Tasks.Extensions.Desktop.xml
  88. BIN packages/Microsoft.Bcl.Async.1.0.12-beta/lib/net40/Microsoft.Threading.Tasks.Extensions.dll
  89. +275 −0 packages/Microsoft.Bcl.Async.1.0.12-beta/lib/net40/Microsoft.Threading.Tasks.Extensions.xml
  90. BIN packages/Microsoft.Bcl.Async.1.0.12-beta/lib/net40/Microsoft.Threading.Tasks.dll
  91. +630 −0 packages/Microsoft.Bcl.Async.1.0.12-beta/lib/net40/Microsoft.Threading.Tasks.xml
  92. 0 packages/Microsoft.Bcl.Async.1.0.12-beta/lib/net45/_._
  93. BIN ...t.Bcl.Async.1.0.12-beta/lib/portable-net40+sl4+win8+wp71/Microsoft.Threading.Tasks.Extensions.dll
  94. +275 −0 ...t.Bcl.Async.1.0.12-beta/lib/portable-net40+sl4+win8+wp71/Microsoft.Threading.Tasks.Extensions.xml
  95. BIN ...es/Microsoft.Bcl.Async.1.0.12-beta/lib/portable-net40+sl4+win8+wp71/Microsoft.Threading.Tasks.dll
  96. +630 −0 ...es/Microsoft.Bcl.Async.1.0.12-beta/lib/portable-net40+sl4+win8+wp71/Microsoft.Threading.Tasks.xml
  97. BIN ...rosoft.Bcl.Async.1.0.12-beta/lib/portable-net45+win8+wp8/Microsoft.Threading.Tasks.Extensions.dll
  98. +275 −0 ...rosoft.Bcl.Async.1.0.12-beta/lib/portable-net45+win8+wp8/Microsoft.Threading.Tasks.Extensions.xml
  99. 0 packages/Microsoft.Bcl.Async.1.0.12-beta/lib/portable-net45+win8/_._
  100. BIN ...osoft.Bcl.Async.1.0.12-beta/lib/sl4-windowsphone71/Microsoft.Threading.Tasks.Extensions.Phone.dll
  101. +141 −0 ...osoft.Bcl.Async.1.0.12-beta/lib/sl4-windowsphone71/Microsoft.Threading.Tasks.Extensions.Phone.xml
  102. BIN ...s/Microsoft.Bcl.Async.1.0.12-beta/lib/sl4-windowsphone71/Microsoft.Threading.Tasks.Extensions.dll
  103. +275 −0 ...s/Microsoft.Bcl.Async.1.0.12-beta/lib/sl4-windowsphone71/Microsoft.Threading.Tasks.Extensions.xml
  104. BIN packages/Microsoft.Bcl.Async.1.0.12-beta/lib/sl4-windowsphone71/Microsoft.Threading.Tasks.dll
  105. +630 −0 packages/Microsoft.Bcl.Async.1.0.12-beta/lib/sl4-windowsphone71/Microsoft.Threading.Tasks.xml
  106. BIN ...ages/Microsoft.Bcl.Async.1.0.12-beta/lib/sl5/Microsoft.Threading.Tasks.Extensions.Silverlight.dll
  107. +141 −0 ...ages/Microsoft.Bcl.Async.1.0.12-beta/lib/sl5/Microsoft.Threading.Tasks.Extensions.Silverlight.xml
  108. BIN packages/Microsoft.Bcl.Async.1.0.12-beta/lib/sl5/Microsoft.Threading.Tasks.Extensions.dll
  109. +275 −0 packages/Microsoft.Bcl.Async.1.0.12-beta/lib/sl5/Microsoft.Threading.Tasks.Extensions.xml
  110. BIN packages/Microsoft.Bcl.Async.1.0.12-beta/lib/sl5/Microsoft.Threading.Tasks.dll
  111. +630 −0 packages/Microsoft.Bcl.Async.1.0.12-beta/lib/sl5/Microsoft.Threading.Tasks.xml
  112. 0 packages/Microsoft.Bcl.Async.1.0.12-beta/lib/win8/_._
  113. BIN packages/Microsoft.Bcl.Async.1.0.12-beta/lib/wp8/Microsoft.Threading.Tasks.Extensions.Phone.dll
  114. +141 −0 packages/Microsoft.Bcl.Async.1.0.12-beta/lib/wp8/Microsoft.Threading.Tasks.Extensions.Phone.xml
  115. BIN packages/Microsoft.Bcl.Async.1.0.12-beta/lib/wp8/Microsoft.Threading.Tasks.Extensions.dll
  116. +275 −0 packages/Microsoft.Bcl.Async.1.0.12-beta/lib/wp8/Microsoft.Threading.Tasks.Extensions.xml
  117. +41 −0 script/clean-merged-branches
View
@@ -0,0 +1,22 @@
+# Auto detect text files and perform LF normalization
+* text=auto
+
+# Custom for Visual Studio
+*.cs diff=csharp
+*.sln merge=union
+*.csproj merge=union
+*.vbproj merge=union
+*.fsproj merge=union
+*.dbproj merge=union
+
+# Standard to msysgit
+*.doc diff=astextplain
+*.DOC diff=astextplain
+*.docx diff=astextplain
+*.DOCX diff=astextplain
+*.dot diff=astextplain
+*.DOT diff=astextplain
+*.pdf diff=astextplain
+*.PDF diff=astextplain
+*.rtf diff=astextplain
+*.RTF diff=astextplain
View
Binary file not shown.
View
@@ -1,37 +1,37 @@
-## The quick version
-
-1. Open `ReactiveUI_Net4Only.sln` in VS2010 / VS2012
-1. Run tests, build ReactiveUI.sln in VS2012 on Win8
-1. Submit PR
-
-
-## How to start hacking on ReactiveUI (the more verbose version)
-
-1. Fork and Clone the source
-1. Create a new branch for your feature / bugfix
-1. Open the ReactiveUI_Net4Only.sln solution - this is the one you should use unless you're hacking on platform-specific code.
-1. Run all the tests, make sure they pass.
-1. Write some new tests that fail
-1. Make your change
-1. See those same tests pass! Hurrah!
-1. Build ReactiveUI.sln, see if you broke any other platforms (easy to do, sadly)
-1. Push that branch to GitHub (`git push -u origin my-cool-new-feature`)
-1. Go to your fork on GitHub, you should see a button with your branch next to it labeled 'Pull Request'
-1. Type up some information about your change
-
-## To make a new NuGet release for private use
-
-*This looks hard, but once you get your environment set up, it's really only 'Build in VS, build in Mono, run script'*
-
-1. Put the source into DropBox or another way you can share the same folder between a Mac and a PC (Parallels Shared Folders works too)
-1. Edit `**/AssemblyInfo.cs` (i.e. every file named AssemblyInfo.cs) and bump the versions
-1. Edit `NuGet/**/*.nuspec` (every nuspec file under the root NuGet folder) and do the same. Make sure to bump the dependent versions too!
-1. Open ReactiveUI.sln and build it in Release mode under VS2012 on Windows 8 with the WP8 SDK installed (nothing earlier is supported)
-1. Open MonoDevelop, and build ReactiveUI_Mono.sln in Release mode
-1. Back on the PC, run `MakeRelease.ps1`
-1. You'll end up with two new folders, `Release` and `Nuget-Release`, as well as the `.nupkg` files in the root directory.
-
-## Some quirks
-
-* The only 100% guaranteed .sln files to be maintained are ReactiveUI_Net4Only.sln and ReactiveUI.sln - the others may be missing projects
+## The quick version
+
+1. Open `ReactiveUI_Net4Only.sln` in VS2010 / VS2012
+1. Run tests, build ReactiveUI.sln in VS2012 on Win8
+1. Submit PR
+
+
+## How to start hacking on ReactiveUI (the more verbose version)
+
+1. Fork and Clone the source
+1. Create a new branch for your feature / bugfix
+1. Open the ReactiveUI_Net4Only.sln solution - this is the one you should use unless you're hacking on platform-specific code.
+1. Run all the tests, make sure they pass.
+1. Write some new tests that fail
+1. Make your change
+1. See those same tests pass! Hurrah!
+1. Build ReactiveUI.sln, see if you broke any other platforms (easy to do, sadly)
+1. Push that branch to GitHub (`git push -u origin my-cool-new-feature`)
+1. Go to your fork on GitHub, you should see a button with your branch next to it labeled 'Pull Request'
+1. Type up some information about your change
+
+## To make a new NuGet release for private use
+
+*This looks hard, but once you get your environment set up, it's really only 'Build in VS, build in Mono, run script'*
+
+1. Put the source into DropBox or another way you can share the same folder between a Mac and a PC (Parallels Shared Folders works too)
+1. Edit `**/AssemblyInfo.cs` (i.e. every file named AssemblyInfo.cs) and bump the versions
+1. Edit `NuGet/**/*.nuspec` (every nuspec file under the root NuGet folder) and do the same. Make sure to bump the dependent versions too!
+1. Open ReactiveUI.sln and build it in Release mode under VS2012 on Windows 8 with the WP8 SDK installed (nothing earlier is supported)
+1. Open MonoDevelop, and build ReactiveUI_Mono.sln in Release mode
+1. Back on the PC, run `MakeRelease.ps1`
+1. You'll end up with two new folders, `Release` and `Nuget-Release`, as well as the `.nupkg` files in the root directory.
+
+## Some quirks
+
+* The only 100% guaranteed .sln files to be maintained are ReactiveUI_Net4Only.sln and ReactiveUI.sln - the others may be missing projects
* Please follow my coding convention when submitting PRs - `if` statements have the brackets on the same line, non-public methods shouldBeCasedLikeThis, etc etc. I know I'm weird, Deal With It(tm).
View
@@ -1,62 +1,62 @@
-$Archs = {"Net40", "Net45", "SL5", "SL4-WindowsPhone71", "WP8", "WinRT45", "Mono"}
-$Projects = {"ReactiveUI", "ReactiveUI.Testing", "ReactiveUI.Xaml", "ReactiveUI.Routing", "ReactiveUI.Blend", "ReactiveUI.Cocoa", "ReactiveUI.Gtk", "ReactiveUI.NLog"}
-
-$SlnFileExists = Test-Path ".\ReactiveUI.sln"
-if ($SlnFileExists -eq $False) {
- echo "*** ERROR: Run this in the project root ***"
- exit -1
-}
-
-###
-### Build the Release directory
-###
-
-rmdir -r --force .\Release
-
-foreach-object $Archs | %{mkdir -p ".\Release\$_"}
-
-foreach-object $Archs | %{
- $currentArch = $_
-
- foreach-object $Projects | %{cp -r -fo ".\$_\bin\Release\$currentArch\*" ".\Release\$currentArch"}
-
- #ls -r | ?{$_.FullName.Contains("bin\Release\$currentArch") -and $_.Length} | %{echo cp $_.FullName ".\Release\$currentArch"}
-}
-
-ls -r .\Release | ?{$_.FullName.Contains("Clousot")} | %{rm $_.FullName}
-
-
-###
-### Build NuGet Packages
-###
-
-rm -r -fo .\NuGet-Release. .
-cp -r .\NuGet .\NuGet-Release
-
-$libDirs = ls -r .\NuGet-Release | ?{$_.Name -eq "lib"}
-$nugetReleaseDir = Resolve-Path ".\NuGet-Release"
-
-foreach ($dir in $libDirs) {
- $projName = $dir.FullName.Split("\\")[-2]
- $arches = ls $dir.FullName
-
- foreach ($arch in $arches) {
- $files = ls $arch.FullName
-
- foreach ($file in $files) {
- $src = ".\Release\" + $arch.Name + "\\" + $file.Name
- cp -fo $src $file.FullName
- }
- }
-}
-
-$stubs = ls -r -file .\NuGet-Release | ?{$_.Length -eq 0}
-if ($stubs.Length -gt 0) {
- echo "*** BUILD FAILED ***"
- echo ""
- echo "*** There are still stubs in the NuGet output, did you fully build? (Hint: Check Silverlight) ***"
- #exit 1
-}
-
-$specFiles = ls -r .\NuGet-Release | ?{$_.Name.EndsWith(".nuspec")}
-$specFiles | %{.\.nuget\NuGet.exe pack $_.FullName}
+$Archs = {"Net40", "Net45", "SL5", "SL4-WindowsPhone71", "WP8", "WinRT45", "Mono"}
+$Projects = {"ReactiveUI", "ReactiveUI.Testing", "ReactiveUI.Xaml", "ReactiveUI.Routing", "ReactiveUI.Blend", "ReactiveUI.Cocoa", "ReactiveUI.Gtk", "ReactiveUI.NLog"}
+
+$SlnFileExists = Test-Path ".\ReactiveUI.sln"
+if ($SlnFileExists -eq $False) {
+ echo "*** ERROR: Run this in the project root ***"
+ exit -1
+}
+
+###
+### Build the Release directory
+###
+
+rmdir -r --force .\Release
+
+foreach-object $Archs | %{mkdir -p ".\Release\$_"}
+
+foreach-object $Archs | %{
+ $currentArch = $_
+
+ foreach-object $Projects | %{cp -r -fo ".\$_\bin\Release\$currentArch\*" ".\Release\$currentArch"}
+
+ #ls -r | ?{$_.FullName.Contains("bin\Release\$currentArch") -and $_.Length} | %{echo cp $_.FullName ".\Release\$currentArch"}
+}
+
+ls -r .\Release | ?{$_.FullName.Contains("Clousot")} | %{rm $_.FullName}
+
+
+###
+### Build NuGet Packages
+###
+
+rm -r -fo .\NuGet-Release. .
+cp -r .\NuGet .\NuGet-Release
+
+$libDirs = ls -r .\NuGet-Release | ?{$_.Name -eq "lib"}
+$nugetReleaseDir = Resolve-Path ".\NuGet-Release"
+
+foreach ($dir in $libDirs) {
+ $projName = $dir.FullName.Split("\\")[-2]
+ $arches = ls $dir.FullName
+
+ foreach ($arch in $arches) {
+ $files = ls $arch.FullName
+
+ foreach ($file in $files) {
+ $src = ".\Release\" + $arch.Name + "\\" + $file.Name
+ cp -fo $src $file.FullName
+ }
+ }
+}
+
+$stubs = ls -r -file .\NuGet-Release | ?{$_.Length -eq 0}
+if ($stubs.Length -gt 0) {
+ echo "*** BUILD FAILED ***"
+ echo ""
+ echo "*** There are still stubs in the NuGet output, did you fully build? (Hint: Check Silverlight) ***"
+ #exit 1
+}
+
+$specFiles = ls -r .\NuGet-Release | ?{$_.Name.EndsWith(".nuspec")}
+$specFiles | %{.\.nuget\NuGet.exe pack $_.FullName}
@@ -12,6 +12,7 @@
<dependencies>
<dependency id="Rx-Main" version="[2.0.21114]" />
+ <dependency id="Microsoft.Bcl.Async.NotBeta" version="1.0" />
</dependencies>
</metadata>
</package>
@@ -9,7 +9,7 @@
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ReactiveUI.Blend</RootNamespace>
- <AssemblyName>ReactiveUI.Blend</AssemblyName>
+ <AssemblyName>ReactiveUI.Blend_Net45</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SccProjectName>
@@ -41,7 +41,7 @@
<DefineConstants>TRACE;NET_45</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
- <DocumentationFile>bin\Release\Net45\ReactiveUI.Blend.xml</DocumentationFile>
+ <DocumentationFile>bin\Release\Net45\ReactiveUI.Blend_Net45.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.Expression.Interactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
@@ -101,4 +101,4 @@
<Target Name="AfterBuild">
</Target>
-->
-</Project>
+</Project>
@@ -44,10 +44,16 @@
<DocumentationFile>Bin\Release\SL4-WindowsPhone71\ReactiveUI.Blend_WP7.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
- <Reference Include="AsyncCtpLibrary_Phone">
- <HintPath>..\ext\WP71\AsyncCtpLibrary_Phone.dll</HintPath>
- </Reference>
<Reference Include="Microsoft.Expression.Interactions, Version=3.7.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+ <Reference Include="Microsoft.Threading.Tasks">
+ <HintPath>..\packages\Microsoft.Bcl.Async.1.0.12-beta\lib\sl4-windowsphone71\Microsoft.Threading.Tasks.dll</HintPath>
+ </Reference>
+ <Reference Include="Microsoft.Threading.Tasks.Extensions">
+ <HintPath>..\packages\Microsoft.Bcl.Async.1.0.12-beta\lib\sl4-windowsphone71\Microsoft.Threading.Tasks.Extensions.dll</HintPath>
+ </Reference>
+ <Reference Include="Microsoft.Threading.Tasks.Extensions.Phone">
+ <HintPath>..\packages\Microsoft.Bcl.Async.1.0.12-beta\lib\sl4-windowsphone71\Microsoft.Threading.Tasks.Extensions.Phone.dll</HintPath>
+ </Reference>
<Reference Include="mscorlib.Extensions" />
<Reference Include="System.Observable" />
<Reference Include="System.Reactive.Core, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -70,6 +76,14 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\ext\WP71\System.Reactive.Windows.Threading.dll</HintPath>
</Reference>
+ <Reference Include="System.Runtime, Version=1.5.11.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\packages\Microsoft.Bcl.1.0.11-beta\lib\sl4-windowsphone71\System.Runtime.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Threading.Tasks, Version=1.5.11.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\packages\Microsoft.Bcl.1.0.11-beta\lib\sl4-windowsphone71\System.Threading.Tasks.dll</HintPath>
+ </Reference>
<Reference Include="System.Windows" />
<Reference Include="system" />
<Reference Include="System.Core" />
@@ -107,4 +121,4 @@
<Target Name="AfterBuild">
</Target>
-->
-</Project>
+</Project>
@@ -44,6 +44,25 @@
<ItemGroup>
<Reference Include="mscorlib.Extensions" />
<Reference Include="System.Observable" />
+ <Reference Include="System.Reactive.Core, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\ext\WP80\System.Reactive.Core.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Reactive.Interfaces, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\ext\WP80\System.Reactive.Interfaces.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Reactive.Linq, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\ext\WP80\System.Reactive.Linq.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Reactive.PlatformServices, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\ext\WP80\System.Reactive.PlatformServices.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Reactive.Windows.Threading, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ </Reference>
<Reference Include="System.Reactive.Core">
<HintPath>..\ext\WP80\System.Reactive.Core.dll</HintPath>
</Reference>
@@ -96,4 +115,4 @@
<Target Name="AfterBuild">
</Target>
-->
-</Project>
+</Project>
@@ -9,7 +9,7 @@
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ReactiveUI.NLog</RootNamespace>
- <AssemblyName>ReactiveUI.NLog</AssemblyName>
+ <AssemblyName>ReactiveUI.NLog_Net45</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SccProjectName>
@@ -91,7 +91,7 @@
<CodeContractsCacheAnalysisResults>True</CodeContractsCacheAnalysisResults>
<CodeContractsRuntimeCheckingLevel>Full</CodeContractsRuntimeCheckingLevel>
<CodeContractsReferenceAssembly>%28none%29</CodeContractsReferenceAssembly>
- <DocumentationFile>bin\Release\Net45\ReactiveUI.NLog.xml</DocumentationFile>
+ <DocumentationFile>bin\Release\Net45\ReactiveUI.NLog_Net45.xml</DocumentationFile>
<NoWarn>1591, 1573, 1711, 1587, 1570, 1572</NoWarn>
</PropertyGroup>
<ItemGroup>
@@ -68,8 +68,14 @@
<DocumentationFile>Bin\Release\SL4-WindowsPhone71\ReactiveUI.NLog_WP7.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
- <Reference Include="AsyncCtpLibrary_Phone">
- <HintPath>..\ext\WP71\AsyncCtpLibrary_Phone.dll</HintPath>
+ <Reference Include="Microsoft.Threading.Tasks">
+ <HintPath>..\packages\Microsoft.Bcl.Async.1.0.12-beta\lib\sl4-windowsphone71\Microsoft.Threading.Tasks.dll</HintPath>
+ </Reference>
+ <Reference Include="Microsoft.Threading.Tasks.Extensions">
+ <HintPath>..\packages\Microsoft.Bcl.Async.1.0.12-beta\lib\sl4-windowsphone71\Microsoft.Threading.Tasks.Extensions.dll</HintPath>
+ </Reference>
+ <Reference Include="Microsoft.Threading.Tasks.Extensions.Phone">
+ <HintPath>..\packages\Microsoft.Bcl.Async.1.0.12-beta\lib\sl4-windowsphone71\Microsoft.Threading.Tasks.Extensions.Phone.dll</HintPath>
</Reference>
<Reference Include="mscorlib.Extensions" />
<Reference Include="NLog">
@@ -92,6 +98,14 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\ext\WP71\System.Reactive.PlatformServices.dll</HintPath>
</Reference>
+ <Reference Include="System.Runtime, Version=1.5.11.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\packages\Microsoft.Bcl.1.0.11-beta\lib\sl4-windowsphone71\System.Runtime.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Threading.Tasks, Version=1.5.11.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\packages\Microsoft.Bcl.1.0.11-beta\lib\sl4-windowsphone71\System.Threading.Tasks.dll</HintPath>
+ </Reference>
<Reference Include="System.Windows" />
<Reference Include="system" />
<Reference Include="System.Core" />
Oops, something went wrong.

0 comments on commit 05a1286

Please sign in to comment.