Bläddra i källkod

Restore rulesets

akarnokd 7 år sedan
förälder
incheckning
0f14ea79dc

+ 0 - 7
Rx.NET/Source/Rx.ruleset

@@ -218,12 +218,5 @@
     <Rule Id="CA2241" Action="Warning" />
     <Rule Id="CA2242" Action="Warning" />
     <Rule Id="CA2243" Action="Warning" />
-    <!--
-    <Rule Id="IDE0001" Action="Warning" />
-    <Rule Id="IDE0003" Action="Warning" />
-    <Rule Id="IDE0004" Action="Warning" />
-    <Rule Id="IDE0005" Action="Warning" />
-    <Rule Id="IDE0034" Action="Warning" />
-    -->
   </Rules>
 </RuleSet>

+ 0 - 7
Rx.NET/Source/Test.ruleset

@@ -2,13 +2,6 @@
 <RuleSet Name="Test Rule Set" Description=" " ToolsVersion="10.0">
   <Rules AnalyzerId="Microsoft.Analyzers.ManagedCodeAnalysis" RuleNamespace="Microsoft.Rules.Managed">
     <Rule Id="CA2212" Action="Warning" />
-    <!--
-    <Rule Id="IDE0001" Action="Warning" />
-    <Rule Id="IDE0003" Action="Warning" />
-    <Rule Id="IDE0004" Action="Warning" />
-    <Rule Id="IDE0005" Action="Warning" />
-    <Rule Id="IDE0034" Action="Warning" />
-    -->
   </Rules>
   <Rules AnalyzerId="xunit.analyzers" RuleNamespace="xunit.analyzers">
     <Rule Id="xUnit1004" Action="None" />

+ 6 - 6
Rx.NET/Source/src/System.Reactive/Linq/QueryLanguage.Async.cs

@@ -730,13 +730,13 @@ namespace System.Reactive.Linq
 
         private sealed class StartAsyncObservable<TSource> : ObservableBase<TSource>
         {
-            private readonly CancellationDisposable cancellable;
-            private readonly IObservable<TSource> result;
+            private readonly CancellationDisposable _cancellable;
+            private readonly IObservable<TSource> _result;
 
             public StartAsyncObservable(CancellationDisposable cancellable, IObservable<TSource> result)
             {
-                this.cancellable = cancellable;
-                this.result = result;
+                _cancellable = cancellable;
+                _result = result;
             }
 
             protected override IDisposable SubscribeCore(IObserver<TSource> observer)
@@ -744,8 +744,8 @@ namespace System.Reactive.Linq
                 //
                 // [OK] Use of unsafe Subscribe: result is an AsyncSubject<TSource>.
                 //
-                var subscription = result.Subscribe/*Unsafe*/(observer);
-                return StableCompositeDisposable.Create(cancellable, subscription);
+                var subscription = _result.Subscribe/*Unsafe*/(observer);
+                return StableCompositeDisposable.Create(_cancellable, subscription);
             }
         }