Browse files

Merge branch 'rxui5-master' into portable

Conflicts:
	ReactiveUI.Tests/ReactiveCollectionTest.cs
	ReactiveUI/ReactiveCollectionMixins.cs
  • Loading branch information...
2 parents 713978b + 95257a2 commit 8e04ce17984a112604cc893a849d45a3f143366b @paulcbetts paulcbetts committed Apr 4, 2013
View
21 MakeRelease.ps1
@@ -11,7 +11,9 @@ if ($SlnFileExists -eq $False) {
### Build the Release directory
###
-rmdir -r --force .\Release
+if (Test-Path .\Release) {
+ rmdir -r -force .\Release
+}
foreach-object $Archs | %{mkdir -p ".\Release\$_"}
@@ -30,12 +32,17 @@ ls -r .\Release | ?{$_.FullName.Contains("Clousot")} | %{rm $_.FullName}
### Build NuGet Packages
###
-rm -r -fo .\NuGet-Release. .
+if (Test-Path .\NuGet-Release) {
+ rm -r -fo .\NuGet-Release
+}
+
cp -r .\NuGet .\NuGet-Release
$libDirs = ls -r .\NuGet-Release | ?{$_.Name -eq "lib"}
+$srcDirs = ls -r .\NuGet-Release | ?{$_.Name -eq "src"} | %{ls $_.FullName}
$nugetReleaseDir = Resolve-Path ".\NuGet-Release"
+# copy binaries
foreach ($dir in $libDirs) {
$projName = $dir.FullName.Split("\\")[-2]
$arches = ls $dir.FullName
@@ -50,6 +57,14 @@ foreach ($dir in $libDirs) {
}
}
+# copy source
+foreach ($dir in $srcDirs) {
+ $projName = $dir.Name
+ $projFolderName = $projName.Replace("-", ".")
+
+ robocopy ".\$projFolderName\" "$($dir.FullName)" *.cs /S
+}
+
$stubs = ls -r -file .\NuGet-Release | ?{$_.Length -eq 0}
if ($stubs.Length -gt 0) {
echo "*** BUILD FAILED ***"
@@ -59,4 +74,4 @@ if ($stubs.Length -gt 0) {
}
$specFiles = ls -r .\NuGet-Release | ?{$_.Name.EndsWith(".nuspec")}
-$specFiles | %{.\.nuget\NuGet.exe pack $_.FullName}
+$specFiles | %{.\.nuget\NuGet.exe pack -symbols $_.FullName}
View
1 NuGet/ReactiveUI-Core/src/ReactiveUI/.keepme
@@ -0,0 +1 @@
+ 1 file(s) copied.
View
0 NuGet/ReactiveUI-Mobile/src/ReactiveUI.Mobile/.keepme
No changes.
View
0 NuGet/ReactiveUI-NLog/src/ReactiveUI.NLog/.keepme
No changes.
View
0 NuGet/ReactiveUI-Testing/src/ReactiveUI.Testing/.keepme
No changes.
View
0 NuGet/ReactiveUI-Xaml/src/ReactiveUI.Blend/.keepme
No changes.
View
0 NuGet/ReactiveUI-Xaml/src/ReactiveUI.Routing/.keepme
No changes.
View
0 NuGet/ReactiveUI-Xaml/src/ReactiveUI.Xaml/.keepme
No changes.
View
1 ReactiveUI.Tests/ReactiveCollectionTest.cs
@@ -551,7 +551,6 @@ public void DerivedCollectionsSmokeTest()
// else if (isIncluded && shouldBeIncluded)
testAll(() => { adam.Salary = 350; });
-
testAll(() => { dan.Age = 50; });
testAll(() => { dan.Age = 51; });
}
View
6 ReactiveUI/ReactiveCollectionMixins.cs
@@ -241,9 +241,9 @@ private void onItemChanged(TSource changedItem)
TValue newItem = selector(changedItem);
if (orderer == null) {
- // We don't have an orderer so we're currently using the source collection index for sorting
+ // We don't have an orderer so we're currently using the source collection index for sorting
// meaning that no item change will affect ordering. Look at our current item and see if it's
- // the exact (reference-wise) same object. If it is then we're done, if it's not (for example
+ // the exact (reference-wise) same object. If it is then we're done, if it's not (for example
// if it's an integer) we'll issue a replace event so that subscribers get the new value.
if (!object.ReferenceEquals(newItem, this[destinationIndex])) {
internalReplace(destinationIndex, newItem);
@@ -557,7 +557,7 @@ public static class ReactiveCollectionMixins
/// <returns>A new collection which will be populated with the
/// Observable.</returns>
public static ReactiveDerivedCollection<T> CreateCollection<T>(
- this IObservable<T> fromObservable,
+ this IObservable<T> fromObservable,
TimeSpan? withDelay = null,
Action<Exception> onError = null)
{

0 comments on commit 8e04ce1

Please sign in to comment.