ホーム エクスプローラ ヘルプ
登録 サインイン
Apq
/
reactive
同期ミラー https://github.com/dotnet/reactive.git
1
0
フォーク 0
ファイル 課題 0 Wiki
ソースを参照

Fixing build break.

Bart De Smet 8 年 前
親
671500d7ac
コミット
0368436851
4 ファイル変更、60 行追加、60 行削除
分割表示 差分情報を表示
  1. 28 28
      AsyncRx.NET/System.Reactive.Async/System/Reactive/Linq/Operators/CombineLatest.Generated.cs
  2. 2 2
      AsyncRx.NET/System.Reactive.Async/System/Reactive/Linq/Operators/CombineLatest.Generated.tt
  3. 28 28
      AsyncRx.NET/System.Reactive.Async/System/Reactive/Linq/Operators/Zip.Generated.cs
  4. 2 2
      AsyncRx.NET/System.Reactive.Async/System/Reactive/Linq/Operators/Zip.Generated.tt

+ 28 - 28
AsyncRx.NET/System.Reactive.Async/System/Reactive/Linq/Operators/CombineLatest.Generated.cs
ファイルの表示 

@@ -23,7 +23,7 @@ namespace System.Reactive.Linq
 
             {
 
                 var d = new CompositeAsyncDisposable();
 
 
-                var (observer1, observer2) = observer.CombineLatest(selector);
 
+                var (observer1, observer2) = AsyncObserver.CombineLatest(observer, selector);
 
 
                 var sub1 = source1.SubscribeAsync(observer1).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
                 var sub2 = source2.SubscribeAsync(observer2).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
@@ -47,7 +47,7 @@ namespace System.Reactive.Linq
 
             {
 
                 var d = new CompositeAsyncDisposable();
 
 
-                var (observer1, observer2) = observer.CombineLatest(selector);
 
+                var (observer1, observer2) = AsyncObserver.CombineLatest(observer, selector);
 
 
                 var sub1 = source1.SubscribeAsync(observer1).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
                 var sub2 = source2.SubscribeAsync(observer2).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
@@ -73,7 +73,7 @@ namespace System.Reactive.Linq
 
             {
 
                 var d = new CompositeAsyncDisposable();
 
 
-                var (observer1, observer2, observer3) = observer.CombineLatest(selector);
 
+                var (observer1, observer2, observer3) = AsyncObserver.CombineLatest(observer, selector);
 
 
                 var sub1 = source1.SubscribeAsync(observer1).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
                 var sub2 = source2.SubscribeAsync(observer2).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
@@ -100,7 +100,7 @@ namespace System.Reactive.Linq
 
             {
 
                 var d = new CompositeAsyncDisposable();
 
 
-                var (observer1, observer2, observer3) = observer.CombineLatest(selector);
 
+                var (observer1, observer2, observer3) = AsyncObserver.CombineLatest(observer, selector);
 
 
                 var sub1 = source1.SubscribeAsync(observer1).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
                 var sub2 = source2.SubscribeAsync(observer2).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
@@ -129,7 +129,7 @@ namespace System.Reactive.Linq
 
             {
 
                 var d = new CompositeAsyncDisposable();
 
 
-                var (observer1, observer2, observer3, observer4) = observer.CombineLatest(selector);
 
+                var (observer1, observer2, observer3, observer4) = AsyncObserver.CombineLatest(observer, selector);
 
 
                 var sub1 = source1.SubscribeAsync(observer1).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
                 var sub2 = source2.SubscribeAsync(observer2).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
@@ -159,7 +159,7 @@ namespace System.Reactive.Linq
 
             {
 
                 var d = new CompositeAsyncDisposable();
 
 
-                var (observer1, observer2, observer3, observer4) = observer.CombineLatest(selector);
 
+                var (observer1, observer2, observer3, observer4) = AsyncObserver.CombineLatest(observer, selector);
 
 
                 var sub1 = source1.SubscribeAsync(observer1).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
                 var sub2 = source2.SubscribeAsync(observer2).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
@@ -191,7 +191,7 @@ namespace System.Reactive.Linq
 
             {
 
                 var d = new CompositeAsyncDisposable();
 
 
-                var (observer1, observer2, observer3, observer4, observer5) = observer.CombineLatest(selector);
 
+                var (observer1, observer2, observer3, observer4, observer5) = AsyncObserver.CombineLatest(observer, selector);
 
 
                 var sub1 = source1.SubscribeAsync(observer1).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
                 var sub2 = source2.SubscribeAsync(observer2).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
@@ -224,7 +224,7 @@ namespace System.Reactive.Linq
 
             {
 
                 var d = new CompositeAsyncDisposable();
 
 
-                var (observer1, observer2, observer3, observer4, observer5) = observer.CombineLatest(selector);
 
+                var (observer1, observer2, observer3, observer4, observer5) = AsyncObserver.CombineLatest(observer, selector);
 
 
                 var sub1 = source1.SubscribeAsync(observer1).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
                 var sub2 = source2.SubscribeAsync(observer2).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
@@ -259,7 +259,7 @@ namespace System.Reactive.Linq
 
             {
 
                 var d = new CompositeAsyncDisposable();
 
 
-                var (observer1, observer2, observer3, observer4, observer5, observer6) = observer.CombineLatest(selector);
 
+                var (observer1, observer2, observer3, observer4, observer5, observer6) = AsyncObserver.CombineLatest(observer, selector);
 
 
                 var sub1 = source1.SubscribeAsync(observer1).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
                 var sub2 = source2.SubscribeAsync(observer2).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
@@ -295,7 +295,7 @@ namespace System.Reactive.Linq
 
             {
 
                 var d = new CompositeAsyncDisposable();
 
 
-                var (observer1, observer2, observer3, observer4, observer5, observer6) = observer.CombineLatest(selector);
 
+                var (observer1, observer2, observer3, observer4, observer5, observer6) = AsyncObserver.CombineLatest(observer, selector);
 
 
                 var sub1 = source1.SubscribeAsync(observer1).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
                 var sub2 = source2.SubscribeAsync(observer2).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
@@ -333,7 +333,7 @@ namespace System.Reactive.Linq
 
             {
 
                 var d = new CompositeAsyncDisposable();
 
 
-                var (observer1, observer2, observer3, observer4, observer5, observer6, observer7) = observer.CombineLatest(selector);
 
+                var (observer1, observer2, observer3, observer4, observer5, observer6, observer7) = AsyncObserver.CombineLatest(observer, selector);
 
 
                 var sub1 = source1.SubscribeAsync(observer1).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
                 var sub2 = source2.SubscribeAsync(observer2).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
@@ -372,7 +372,7 @@ namespace System.Reactive.Linq
 
             {
 
                 var d = new CompositeAsyncDisposable();
 
 
-                var (observer1, observer2, observer3, observer4, observer5, observer6, observer7) = observer.CombineLatest(selector);
 
+                var (observer1, observer2, observer3, observer4, observer5, observer6, observer7) = AsyncObserver.CombineLatest(observer, selector);
 
 
                 var sub1 = source1.SubscribeAsync(observer1).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
                 var sub2 = source2.SubscribeAsync(observer2).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
@@ -413,7 +413,7 @@ namespace System.Reactive.Linq
 
             {
 
                 var d = new CompositeAsyncDisposable();
 
 
-                var (observer1, observer2, observer3, observer4, observer5, observer6, observer7, observer8) = observer.CombineLatest(selector);
 
+                var (observer1, observer2, observer3, observer4, observer5, observer6, observer7, observer8) = AsyncObserver.CombineLatest(observer, selector);
 
 
                 var sub1 = source1.SubscribeAsync(observer1).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
                 var sub2 = source2.SubscribeAsync(observer2).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
@@ -455,7 +455,7 @@ namespace System.Reactive.Linq
 
             {
 
                 var d = new CompositeAsyncDisposable();
 
 
-                var (observer1, observer2, observer3, observer4, observer5, observer6, observer7, observer8) = observer.CombineLatest(selector);
 
+                var (observer1, observer2, observer3, observer4, observer5, observer6, observer7, observer8) = AsyncObserver.CombineLatest(observer, selector);
 
 
                 var sub1 = source1.SubscribeAsync(observer1).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
                 var sub2 = source2.SubscribeAsync(observer2).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
@@ -499,7 +499,7 @@ namespace System.Reactive.Linq
 
             {
 
                 var d = new CompositeAsyncDisposable();
 
 
-                var (observer1, observer2, observer3, observer4, observer5, observer6, observer7, observer8, observer9) = observer.CombineLatest(selector);
 
+                var (observer1, observer2, observer3, observer4, observer5, observer6, observer7, observer8, observer9) = AsyncObserver.CombineLatest(observer, selector);
 
 
                 var sub1 = source1.SubscribeAsync(observer1).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
                 var sub2 = source2.SubscribeAsync(observer2).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
@@ -544,7 +544,7 @@ namespace System.Reactive.Linq
 
             {
 
                 var d = new CompositeAsyncDisposable();
 
 
-                var (observer1, observer2, observer3, observer4, observer5, observer6, observer7, observer8, observer9) = observer.CombineLatest(selector);
 
+                var (observer1, observer2, observer3, observer4, observer5, observer6, observer7, observer8, observer9) = AsyncObserver.CombineLatest(observer, selector);
 
 
                 var sub1 = source1.SubscribeAsync(observer1).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
                 var sub2 = source2.SubscribeAsync(observer2).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
@@ -591,7 +591,7 @@ namespace System.Reactive.Linq
 
             {
 
                 var d = new CompositeAsyncDisposable();
 
 
-                var (observer1, observer2, observer3, observer4, observer5, observer6, observer7, observer8, observer9, observer10) = observer.CombineLatest(selector);
 
+                var (observer1, observer2, observer3, observer4, observer5, observer6, observer7, observer8, observer9, observer10) = AsyncObserver.CombineLatest(observer, selector);
 
 
                 var sub1 = source1.SubscribeAsync(observer1).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
                 var sub2 = source2.SubscribeAsync(observer2).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
@@ -639,7 +639,7 @@ namespace System.Reactive.Linq
 
             {
 
                 var d = new CompositeAsyncDisposable();
 
 
-                var (observer1, observer2, observer3, observer4, observer5, observer6, observer7, observer8, observer9, observer10) = observer.CombineLatest(selector);
 
+                var (observer1, observer2, observer3, observer4, observer5, observer6, observer7, observer8, observer9, observer10) = AsyncObserver.CombineLatest(observer, selector);
 
 
                 var sub1 = source1.SubscribeAsync(observer1).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
                 var sub2 = source2.SubscribeAsync(observer2).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
@@ -689,7 +689,7 @@ namespace System.Reactive.Linq
 
             {
 
                 var d = new CompositeAsyncDisposable();
 
 
-                var (observer1, observer2, observer3, observer4, observer5, observer6, observer7, observer8, observer9, observer10, observer11) = observer.CombineLatest(selector);
 
+                var (observer1, observer2, observer3, observer4, observer5, observer6, observer7, observer8, observer9, observer10, observer11) = AsyncObserver.CombineLatest(observer, selector);
 
 
                 var sub1 = source1.SubscribeAsync(observer1).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
                 var sub2 = source2.SubscribeAsync(observer2).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
@@ -740,7 +740,7 @@ namespace System.Reactive.Linq
 
             {
 
                 var d = new CompositeAsyncDisposable();
 
 
-                var (observer1, observer2, observer3, observer4, observer5, observer6, observer7, observer8, observer9, observer10, observer11) = observer.CombineLatest(selector);
 
+                var (observer1, observer2, observer3, observer4, observer5, observer6, observer7, observer8, observer9, observer10, observer11) = AsyncObserver.CombineLatest(observer, selector);
 
 
                 var sub1 = source1.SubscribeAsync(observer1).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
                 var sub2 = source2.SubscribeAsync(observer2).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
@@ -793,7 +793,7 @@ namespace System.Reactive.Linq
 
             {
 
                 var d = new CompositeAsyncDisposable();
 
 
-                var (observer1, observer2, observer3, observer4, observer5, observer6, observer7, observer8, observer9, observer10, observer11, observer12) = observer.CombineLatest(selector);
 
+                var (observer1, observer2, observer3, observer4, observer5, observer6, observer7, observer8, observer9, observer10, observer11, observer12) = AsyncObserver.CombineLatest(observer, selector);
 
 
                 var sub1 = source1.SubscribeAsync(observer1).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
                 var sub2 = source2.SubscribeAsync(observer2).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
@@ -847,7 +847,7 @@ namespace System.Reactive.Linq
 
             {
 
                 var d = new CompositeAsyncDisposable();
 
 
-                var (observer1, observer2, observer3, observer4, observer5, observer6, observer7, observer8, observer9, observer10, observer11, observer12) = observer.CombineLatest(selector);
 
+                var (observer1, observer2, observer3, observer4, observer5, observer6, observer7, observer8, observer9, observer10, observer11, observer12) = AsyncObserver.CombineLatest(observer, selector);
 
 
                 var sub1 = source1.SubscribeAsync(observer1).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
                 var sub2 = source2.SubscribeAsync(observer2).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
@@ -903,7 +903,7 @@ namespace System.Reactive.Linq
 
             {
 
                 var d = new CompositeAsyncDisposable();
 
 
-                var (observer1, observer2, observer3, observer4, observer5, observer6, observer7, observer8, observer9, observer10, observer11, observer12, observer13) = observer.CombineLatest(selector);
 
+                var (observer1, observer2, observer3, observer4, observer5, observer6, observer7, observer8, observer9, observer10, observer11, observer12, observer13) = AsyncObserver.CombineLatest(observer, selector);
 
 
                 var sub1 = source1.SubscribeAsync(observer1).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
                 var sub2 = source2.SubscribeAsync(observer2).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
@@ -960,7 +960,7 @@ namespace System.Reactive.Linq
 
             {
 
                 var d = new CompositeAsyncDisposable();
 
 
-                var (observer1, observer2, observer3, observer4, observer5, observer6, observer7, observer8, observer9, observer10, observer11, observer12, observer13) = observer.CombineLatest(selector);
 
+                var (observer1, observer2, observer3, observer4, observer5, observer6, observer7, observer8, observer9, observer10, observer11, observer12, observer13) = AsyncObserver.CombineLatest(observer, selector);
 
 
                 var sub1 = source1.SubscribeAsync(observer1).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
                 var sub2 = source2.SubscribeAsync(observer2).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
@@ -1019,7 +1019,7 @@ namespace System.Reactive.Linq
 
             {
 
                 var d = new CompositeAsyncDisposable();
 
 
-                var (observer1, observer2, observer3, observer4, observer5, observer6, observer7, observer8, observer9, observer10, observer11, observer12, observer13, observer14) = observer.CombineLatest(selector);
 
+                var (observer1, observer2, observer3, observer4, observer5, observer6, observer7, observer8, observer9, observer10, observer11, observer12, observer13, observer14) = AsyncObserver.CombineLatest(observer, selector);
 
 
                 var sub1 = source1.SubscribeAsync(observer1).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
                 var sub2 = source2.SubscribeAsync(observer2).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
@@ -1079,7 +1079,7 @@ namespace System.Reactive.Linq
 
             {
 
                 var d = new CompositeAsyncDisposable();
 
 
-                var (observer1, observer2, observer3, observer4, observer5, observer6, observer7, observer8, observer9, observer10, observer11, observer12, observer13, observer14) = observer.CombineLatest(selector);
 
+                var (observer1, observer2, observer3, observer4, observer5, observer6, observer7, observer8, observer9, observer10, observer11, observer12, observer13, observer14) = AsyncObserver.CombineLatest(observer, selector);
 
 
                 var sub1 = source1.SubscribeAsync(observer1).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
                 var sub2 = source2.SubscribeAsync(observer2).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
@@ -1141,7 +1141,7 @@ namespace System.Reactive.Linq
 
             {
 
                 var d = new CompositeAsyncDisposable();
 
 
-                var (observer1, observer2, observer3, observer4, observer5, observer6, observer7, observer8, observer9, observer10, observer11, observer12, observer13, observer14, observer15) = observer.CombineLatest(selector);
 
+                var (observer1, observer2, observer3, observer4, observer5, observer6, observer7, observer8, observer9, observer10, observer11, observer12, observer13, observer14, observer15) = AsyncObserver.CombineLatest(observer, selector);
 
 
                 var sub1 = source1.SubscribeAsync(observer1).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
                 var sub2 = source2.SubscribeAsync(observer2).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
@@ -1204,7 +1204,7 @@ namespace System.Reactive.Linq
 
             {
 
                 var d = new CompositeAsyncDisposable();
 
 
-                var (observer1, observer2, observer3, observer4, observer5, observer6, observer7, observer8, observer9, observer10, observer11, observer12, observer13, observer14, observer15) = observer.CombineLatest(selector);
 
+                var (observer1, observer2, observer3, observer4, observer5, observer6, observer7, observer8, observer9, observer10, observer11, observer12, observer13, observer14, observer15) = AsyncObserver.CombineLatest(observer, selector);
 
 
                 var sub1 = source1.SubscribeAsync(observer1).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
                 var sub2 = source2.SubscribeAsync(observer2).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();

+ 2 - 2
AsyncRx.NET/System.Reactive.Async/System/Reactive/Linq/Operators/CombineLatest.Generated.tt
ファイルの表示 

@@ -42,7 +42,7 @@ for (var j = 1; j <= i; j++)
 
             {
 
                 var d = new CompositeAsyncDisposable();
 
 
-                var <#=obs#> = observer.CombineLatest(selector);
 
+                var <#=obs#> = AsyncObserver.CombineLatest(observer, selector);
 
 
 <#
 
 for (var j = 1; j <= i; j++)
 
@@ -77,7 +77,7 @@ for (var j = 1; j <= i; j++)
 
             {
 
                 var d = new CompositeAsyncDisposable();
 
 
-                var <#=obs#> = observer.CombineLatest(selector);
 
+                var <#=obs#> = AsyncObserver.CombineLatest(observer, selector);
 
 
 <#
 
 for (var j = 1; j <= i; j++)

+ 28 - 28
AsyncRx.NET/System.Reactive.Async/System/Reactive/Linq/Operators/Zip.Generated.cs
ファイルの表示 

@@ -24,7 +24,7 @@ namespace System.Reactive.Linq
 
             {
 
                 var d = new CompositeAsyncDisposable();
 
 
-                var (observer1, observer2) = observer.Zip(selector);
 
+                var (observer1, observer2) = AsyncObserver.Zip(observer, selector);
 
 
                 var sub1 = source1.SubscribeAsync(observer1).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
                 var sub2 = source2.SubscribeAsync(observer2).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
@@ -48,7 +48,7 @@ namespace System.Reactive.Linq
 
             {
 
                 var d = new CompositeAsyncDisposable();
 
 
-                var (observer1, observer2) = observer.Zip(selector);
 
+                var (observer1, observer2) = AsyncObserver.Zip(observer, selector);
 
 
                 var sub1 = source1.SubscribeAsync(observer1).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
                 var sub2 = source2.SubscribeAsync(observer2).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
@@ -74,7 +74,7 @@ namespace System.Reactive.Linq
 
             {
 
                 var d = new CompositeAsyncDisposable();
 
 
-                var (observer1, observer2, observer3) = observer.Zip(selector);
 
+                var (observer1, observer2, observer3) = AsyncObserver.Zip(observer, selector);
 
 
                 var sub1 = source1.SubscribeAsync(observer1).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
                 var sub2 = source2.SubscribeAsync(observer2).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
@@ -101,7 +101,7 @@ namespace System.Reactive.Linq
 
             {
 
                 var d = new CompositeAsyncDisposable();
 
 
-                var (observer1, observer2, observer3) = observer.Zip(selector);
 
+                var (observer1, observer2, observer3) = AsyncObserver.Zip(observer, selector);
 
 
                 var sub1 = source1.SubscribeAsync(observer1).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
                 var sub2 = source2.SubscribeAsync(observer2).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
@@ -130,7 +130,7 @@ namespace System.Reactive.Linq
 
             {
 
                 var d = new CompositeAsyncDisposable();
 
 
-                var (observer1, observer2, observer3, observer4) = observer.Zip(selector);
 
+                var (observer1, observer2, observer3, observer4) = AsyncObserver.Zip(observer, selector);
 
 
                 var sub1 = source1.SubscribeAsync(observer1).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
                 var sub2 = source2.SubscribeAsync(observer2).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
@@ -160,7 +160,7 @@ namespace System.Reactive.Linq
 
             {
 
                 var d = new CompositeAsyncDisposable();
 
 
-                var (observer1, observer2, observer3, observer4) = observer.Zip(selector);
 
+                var (observer1, observer2, observer3, observer4) = AsyncObserver.Zip(observer, selector);
 
 
                 var sub1 = source1.SubscribeAsync(observer1).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
                 var sub2 = source2.SubscribeAsync(observer2).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
@@ -192,7 +192,7 @@ namespace System.Reactive.Linq
 
             {
 
                 var d = new CompositeAsyncDisposable();
 
 
-                var (observer1, observer2, observer3, observer4, observer5) = observer.Zip(selector);
 
+                var (observer1, observer2, observer3, observer4, observer5) = AsyncObserver.Zip(observer, selector);
 
 
                 var sub1 = source1.SubscribeAsync(observer1).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
                 var sub2 = source2.SubscribeAsync(observer2).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
@@ -225,7 +225,7 @@ namespace System.Reactive.Linq
 
             {
 
                 var d = new CompositeAsyncDisposable();
 
 
-                var (observer1, observer2, observer3, observer4, observer5) = observer.Zip(selector);
 
+                var (observer1, observer2, observer3, observer4, observer5) = AsyncObserver.Zip(observer, selector);
 
 
                 var sub1 = source1.SubscribeAsync(observer1).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
                 var sub2 = source2.SubscribeAsync(observer2).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
@@ -260,7 +260,7 @@ namespace System.Reactive.Linq
 
             {
 
                 var d = new CompositeAsyncDisposable();
 
 
-                var (observer1, observer2, observer3, observer4, observer5, observer6) = observer.Zip(selector);
 
+                var (observer1, observer2, observer3, observer4, observer5, observer6) = AsyncObserver.Zip(observer, selector);
 
 
                 var sub1 = source1.SubscribeAsync(observer1).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
                 var sub2 = source2.SubscribeAsync(observer2).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
@@ -296,7 +296,7 @@ namespace System.Reactive.Linq
 
             {
 
                 var d = new CompositeAsyncDisposable();
 
 
-                var (observer1, observer2, observer3, observer4, observer5, observer6) = observer.Zip(selector);
 
+                var (observer1, observer2, observer3, observer4, observer5, observer6) = AsyncObserver.Zip(observer, selector);
 
 
                 var sub1 = source1.SubscribeAsync(observer1).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
                 var sub2 = source2.SubscribeAsync(observer2).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
@@ -334,7 +334,7 @@ namespace System.Reactive.Linq
 
             {
 
                 var d = new CompositeAsyncDisposable();
 
 
-                var (observer1, observer2, observer3, observer4, observer5, observer6, observer7) = observer.Zip(selector);
 
+                var (observer1, observer2, observer3, observer4, observer5, observer6, observer7) = AsyncObserver.Zip(observer, selector);
 
 
                 var sub1 = source1.SubscribeAsync(observer1).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
                 var sub2 = source2.SubscribeAsync(observer2).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
@@ -373,7 +373,7 @@ namespace System.Reactive.Linq
 
             {
 
                 var d = new CompositeAsyncDisposable();
 
 
-                var (observer1, observer2, observer3, observer4, observer5, observer6, observer7) = observer.Zip(selector);
 
+                var (observer1, observer2, observer3, observer4, observer5, observer6, observer7) = AsyncObserver.Zip(observer, selector);
 
 
                 var sub1 = source1.SubscribeAsync(observer1).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
                 var sub2 = source2.SubscribeAsync(observer2).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
@@ -414,7 +414,7 @@ namespace System.Reactive.Linq
 
             {
 
                 var d = new CompositeAsyncDisposable();
 
 
-                var (observer1, observer2, observer3, observer4, observer5, observer6, observer7, observer8) = observer.Zip(selector);
 
+                var (observer1, observer2, observer3, observer4, observer5, observer6, observer7, observer8) = AsyncObserver.Zip(observer, selector);
 
 
                 var sub1 = source1.SubscribeAsync(observer1).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
                 var sub2 = source2.SubscribeAsync(observer2).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
@@ -456,7 +456,7 @@ namespace System.Reactive.Linq
 
             {
 
                 var d = new CompositeAsyncDisposable();
 
 
-                var (observer1, observer2, observer3, observer4, observer5, observer6, observer7, observer8) = observer.Zip(selector);
 
+                var (observer1, observer2, observer3, observer4, observer5, observer6, observer7, observer8) = AsyncObserver.Zip(observer, selector);
 
 
                 var sub1 = source1.SubscribeAsync(observer1).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
                 var sub2 = source2.SubscribeAsync(observer2).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
@@ -500,7 +500,7 @@ namespace System.Reactive.Linq
 
             {
 
                 var d = new CompositeAsyncDisposable();
 
 
-                var (observer1, observer2, observer3, observer4, observer5, observer6, observer7, observer8, observer9) = observer.Zip(selector);
 
+                var (observer1, observer2, observer3, observer4, observer5, observer6, observer7, observer8, observer9) = AsyncObserver.Zip(observer, selector);
 
 
                 var sub1 = source1.SubscribeAsync(observer1).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
                 var sub2 = source2.SubscribeAsync(observer2).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
@@ -545,7 +545,7 @@ namespace System.Reactive.Linq
 
             {
 
                 var d = new CompositeAsyncDisposable();
 
 
-                var (observer1, observer2, observer3, observer4, observer5, observer6, observer7, observer8, observer9) = observer.Zip(selector);
 
+                var (observer1, observer2, observer3, observer4, observer5, observer6, observer7, observer8, observer9) = AsyncObserver.Zip(observer, selector);
 
 
                 var sub1 = source1.SubscribeAsync(observer1).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
                 var sub2 = source2.SubscribeAsync(observer2).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
@@ -592,7 +592,7 @@ namespace System.Reactive.Linq
 
             {
 
                 var d = new CompositeAsyncDisposable();
 
 
-                var (observer1, observer2, observer3, observer4, observer5, observer6, observer7, observer8, observer9, observer10) = observer.Zip(selector);
 
+                var (observer1, observer2, observer3, observer4, observer5, observer6, observer7, observer8, observer9, observer10) = AsyncObserver.Zip(observer, selector);
 
 
                 var sub1 = source1.SubscribeAsync(observer1).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
                 var sub2 = source2.SubscribeAsync(observer2).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
@@ -640,7 +640,7 @@ namespace System.Reactive.Linq
 
             {
 
                 var d = new CompositeAsyncDisposable();
 
 
-                var (observer1, observer2, observer3, observer4, observer5, observer6, observer7, observer8, observer9, observer10) = observer.Zip(selector);
 
+                var (observer1, observer2, observer3, observer4, observer5, observer6, observer7, observer8, observer9, observer10) = AsyncObserver.Zip(observer, selector);
 
 
                 var sub1 = source1.SubscribeAsync(observer1).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
                 var sub2 = source2.SubscribeAsync(observer2).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
@@ -690,7 +690,7 @@ namespace System.Reactive.Linq
 
             {
 
                 var d = new CompositeAsyncDisposable();
 
 
-                var (observer1, observer2, observer3, observer4, observer5, observer6, observer7, observer8, observer9, observer10, observer11) = observer.Zip(selector);
 
+                var (observer1, observer2, observer3, observer4, observer5, observer6, observer7, observer8, observer9, observer10, observer11) = AsyncObserver.Zip(observer, selector);
 
 
                 var sub1 = source1.SubscribeAsync(observer1).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
                 var sub2 = source2.SubscribeAsync(observer2).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
@@ -741,7 +741,7 @@ namespace System.Reactive.Linq
 
             {
 
                 var d = new CompositeAsyncDisposable();
 
 
-                var (observer1, observer2, observer3, observer4, observer5, observer6, observer7, observer8, observer9, observer10, observer11) = observer.Zip(selector);
 
+                var (observer1, observer2, observer3, observer4, observer5, observer6, observer7, observer8, observer9, observer10, observer11) = AsyncObserver.Zip(observer, selector);
 
 
                 var sub1 = source1.SubscribeAsync(observer1).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
                 var sub2 = source2.SubscribeAsync(observer2).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
@@ -794,7 +794,7 @@ namespace System.Reactive.Linq
 
             {
 
                 var d = new CompositeAsyncDisposable();
 
 
-                var (observer1, observer2, observer3, observer4, observer5, observer6, observer7, observer8, observer9, observer10, observer11, observer12) = observer.Zip(selector);
 
+                var (observer1, observer2, observer3, observer4, observer5, observer6, observer7, observer8, observer9, observer10, observer11, observer12) = AsyncObserver.Zip(observer, selector);
 
 
                 var sub1 = source1.SubscribeAsync(observer1).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
                 var sub2 = source2.SubscribeAsync(observer2).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
@@ -848,7 +848,7 @@ namespace System.Reactive.Linq
 
             {
 
                 var d = new CompositeAsyncDisposable();
 
 
-                var (observer1, observer2, observer3, observer4, observer5, observer6, observer7, observer8, observer9, observer10, observer11, observer12) = observer.Zip(selector);
 
+                var (observer1, observer2, observer3, observer4, observer5, observer6, observer7, observer8, observer9, observer10, observer11, observer12) = AsyncObserver.Zip(observer, selector);
 
 
                 var sub1 = source1.SubscribeAsync(observer1).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
                 var sub2 = source2.SubscribeAsync(observer2).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
@@ -904,7 +904,7 @@ namespace System.Reactive.Linq
 
             {
 
                 var d = new CompositeAsyncDisposable();
 
 
-                var (observer1, observer2, observer3, observer4, observer5, observer6, observer7, observer8, observer9, observer10, observer11, observer12, observer13) = observer.Zip(selector);
 
+                var (observer1, observer2, observer3, observer4, observer5, observer6, observer7, observer8, observer9, observer10, observer11, observer12, observer13) = AsyncObserver.Zip(observer, selector);
 
 
                 var sub1 = source1.SubscribeAsync(observer1).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
                 var sub2 = source2.SubscribeAsync(observer2).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
@@ -961,7 +961,7 @@ namespace System.Reactive.Linq
 
             {
 
                 var d = new CompositeAsyncDisposable();
 
 
-                var (observer1, observer2, observer3, observer4, observer5, observer6, observer7, observer8, observer9, observer10, observer11, observer12, observer13) = observer.Zip(selector);
 
+                var (observer1, observer2, observer3, observer4, observer5, observer6, observer7, observer8, observer9, observer10, observer11, observer12, observer13) = AsyncObserver.Zip(observer, selector);
 
 
                 var sub1 = source1.SubscribeAsync(observer1).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
                 var sub2 = source2.SubscribeAsync(observer2).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
@@ -1020,7 +1020,7 @@ namespace System.Reactive.Linq
 
             {
 
                 var d = new CompositeAsyncDisposable();
 
 
-                var (observer1, observer2, observer3, observer4, observer5, observer6, observer7, observer8, observer9, observer10, observer11, observer12, observer13, observer14) = observer.Zip(selector);
 
+                var (observer1, observer2, observer3, observer4, observer5, observer6, observer7, observer8, observer9, observer10, observer11, observer12, observer13, observer14) = AsyncObserver.Zip(observer, selector);
 
 
                 var sub1 = source1.SubscribeAsync(observer1).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
                 var sub2 = source2.SubscribeAsync(observer2).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
@@ -1080,7 +1080,7 @@ namespace System.Reactive.Linq
 
             {
 
                 var d = new CompositeAsyncDisposable();
 
 
-                var (observer1, observer2, observer3, observer4, observer5, observer6, observer7, observer8, observer9, observer10, observer11, observer12, observer13, observer14) = observer.Zip(selector);
 
+                var (observer1, observer2, observer3, observer4, observer5, observer6, observer7, observer8, observer9, observer10, observer11, observer12, observer13, observer14) = AsyncObserver.Zip(observer, selector);
 
 
                 var sub1 = source1.SubscribeAsync(observer1).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
                 var sub2 = source2.SubscribeAsync(observer2).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
@@ -1142,7 +1142,7 @@ namespace System.Reactive.Linq
 
             {
 
                 var d = new CompositeAsyncDisposable();
 
 
-                var (observer1, observer2, observer3, observer4, observer5, observer6, observer7, observer8, observer9, observer10, observer11, observer12, observer13, observer14, observer15) = observer.Zip(selector);
 
+                var (observer1, observer2, observer3, observer4, observer5, observer6, observer7, observer8, observer9, observer10, observer11, observer12, observer13, observer14, observer15) = AsyncObserver.Zip(observer, selector);
 
 
                 var sub1 = source1.SubscribeAsync(observer1).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
                 var sub2 = source2.SubscribeAsync(observer2).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
@@ -1205,7 +1205,7 @@ namespace System.Reactive.Linq
 
             {
 
                 var d = new CompositeAsyncDisposable();
 
 
-                var (observer1, observer2, observer3, observer4, observer5, observer6, observer7, observer8, observer9, observer10, observer11, observer12, observer13, observer14, observer15) = observer.Zip(selector);
 
+                var (observer1, observer2, observer3, observer4, observer5, observer6, observer7, observer8, observer9, observer10, observer11, observer12, observer13, observer14, observer15) = AsyncObserver.Zip(observer, selector);
 
 
                 var sub1 = source1.SubscribeAsync(observer1).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();
 
                 var sub2 = source2.SubscribeAsync(observer2).ContinueWith(disposable => d.AddAsync(disposable.Result)).Unwrap();

+ 2 - 2
AsyncRx.NET/System.Reactive.Async/System/Reactive/Linq/Operators/Zip.Generated.tt
ファイルの表示 

@@ -43,7 +43,7 @@ for (var j = 1; j <= i; j++)
 
             {
 
                 var d = new CompositeAsyncDisposable();
 
 
-                var <#=obs#> = observer.Zip(selector);
 
+                var <#=obs#> = AsyncObserver.Zip(observer, selector);
 
 
 <#
 
 for (var j = 1; j <= i; j++)
 
@@ -78,7 +78,7 @@ for (var j = 1; j <= i; j++)
 
             {
 
                 var d = new CompositeAsyncDisposable();
 
 
-                var <#=obs#> = observer.Zip(selector);
 
+                var <#=obs#> = AsyncObserver.Zip(observer, selector);
 
 
 <#
 
 for (var j = 1; j <= i; j++)