Jelajahi Sumber

Fix errors from xUnit CA

Oren Novotny 8 tahun lalu
induk
melakukan
746eb76788

+ 1 - 0
Rx.NET/Source/Directory.build.props

@@ -16,6 +16,7 @@
     <DefaultLanguage>en-US</DefaultLanguage>
     <IncludeSymbols>false</IncludeSymbols>
     <IsTestProject>$(MSBuildProjectName.Contains('Test'))</IsTestProject>
+    <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)Rx.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   
   <ItemGroup>

+ 3 - 1
Rx.NET/Source/System.Reactive.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26228.9
+VisualStudioVersion = 15.0.26606.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reactive", "src\System.Reactive\System.Reactive.csproj", "{01706A0F-8A63-4FD6-AF45-0BC0BED3C0D9}"
 EndProject
@@ -18,6 +18,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		build-new.ps1 = build-new.ps1
 		Directory.build.props = Directory.build.props
 		Directory.build.targets = Directory.build.targets
+		Rx.ruleset = Rx.ruleset
+		Test.ruleset = Test.ruleset
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{D324579D-CBE6-4867-8980-D7842C7C45A2}"

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

@@ -3,4 +3,7 @@
   <Rules AnalyzerId="Microsoft.Analyzers.ManagedCodeAnalysis" RuleNamespace="Microsoft.Rules.Managed">
     <Rule Id="CA2212" Action="Warning" />
   </Rules>
+  <Rules AnalyzerId="xunit.analyzers" RuleNamespace="xunit.analyzers">
+    <Rule Id="xUnit1004" Action="None" />
+  </Rules>
 </RuleSet>

+ 3 - 0
Rx.NET/Source/tests/Directory.build.props

@@ -1,3 +1,6 @@
 <Project>
   <Import Project="..\Directory.build.props" />
+  <PropertyGroup>
+    <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)..\Test.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup> 
 </Project>

+ 0 - 29
Rx.NET/Source/tests/Tests.System.Reactive.Uwp.DeviceRunner/Properties/AssemblyInfo.cs

@@ -1,29 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Tests.System.Reactive.Uwp.DeviceRunner")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany(".NET Foundation and Contributors.")]
-[assembly: AssemblyProduct("Tests.System.Reactive.Uwp.DeviceRunner")]
-[assembly: AssemblyCopyright("\x00a9 .NET Foundation and Contributors.  All rights reserved.")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
-[assembly: ComVisible(false)]

+ 2 - 1
Rx.NET/Source/tests/Tests.System.Reactive.Uwp.DeviceRunner/Tests.System.Reactive.Uwp.DeviceRunner.csproj

@@ -17,6 +17,8 @@
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <PackageCertificateKeyFile>Tests.System.Reactive.Uwp.DeviceRunner_TemporaryKey.pfx</PackageCertificateKeyFile>
+    <PackageCertificateThumbprint>089EC27AC482FBFAFA90BA9DB8C8C793664FCA3B</PackageCertificateThumbprint>
+    <SignAssembly>false</SignAssembly>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
@@ -363,7 +365,6 @@
     <Compile Include="App.xaml.cs">
       <DependentUpon>App.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
     <AppxManifest Include="Package.appxmanifest">

TEMPAT SAMPAH
Rx.NET/Source/tests/Tests.System.Reactive.Uwp.DeviceRunner/Tests.System.Reactive.Uwp.DeviceRunner_TemporaryKey.pfx


+ 1 - 1
Rx.NET/Source/tests/Tests.System.Reactive/DispatcherHelpers.cs

@@ -3,7 +3,7 @@
 // See the LICENSE file in the project root for more information. 
 
 using System;
-#if NETCOREAPP1_0 || NET46
+#if NETCOREAPP1_1 || NET46
 using System.Threading;
 #endif
 #if HAS_DISPATCHER

+ 2 - 1
Rx.NET/Source/tests/Tests.System.Reactive/Tests.System.Reactive.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFrameworks>net46;netcoreapp1.1</TargetFrameworks>
     <NoWarn>$(NoWarn);CS0618</NoWarn>
-  </PropertyGroup> 
+  </PropertyGroup>
   
   <ItemGroup>
     <Content Include="xunit.runner.json">
@@ -18,6 +18,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0-preview-20170601-03" />
     <PackageReference Include="xunit" Version="2.3.0-beta3-build3705" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta3-build3705" />
+    <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0-beta3-build3705" />
     <ProjectReference Include="..\..\src\System.Reactive\System.Reactive.csproj" />
     <ProjectReference Include="..\..\src\System.Reactive.Observable.Aliases\System.Reactive.Observable.Aliases.csproj" />
     <ProjectReference Include="..\..\src\Microsoft.Reactive.Testing\Microsoft.Reactive.Testing.csproj" />

+ 1 - 0
Rx.NET/Source/tests/Tests.System.Reactive/Tests/Concurrency/DefaultSchedulerTest.cs

@@ -94,6 +94,7 @@ namespace ReactiveTests.Tests
 #endif
 #if DESKTOPCLR
         [Trait("SkipCI", "true")]
+        [Fact]
         public void No_ThreadPool_Starvation_Dispose()
         {
             var bwt = default(int);

+ 1 - 1
Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/ObservableAggregateTest.cs

@@ -2460,7 +2460,7 @@ namespace ReactiveTests.Tests
             ReactiveAssert.Throws<OverflowException>(() => res.ForEach(_ => { }));
         }
 #endif
-#if !CRIPPLED_REFLECTION || NETCOREAPP1_0
+#if !CRIPPLED_REFLECTION || NETCOREAPP1_1
         class OverflowInjection<T> : IObservable<T>
         {
             private readonly IObservable<T> _source;

+ 1 - 1
Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/ObservableMultipleTest.cs

@@ -6608,7 +6608,7 @@ namespace ReactiveTests.Tests
             res.Messages.AssertEqual(expected);
         }
 
-#if !NO_THREAD && !NETCOREAPP1_0
+#if !NO_THREAD && !NETCOREAPP1_1
         [Fact]
         public void Concat_TailRecursive2()
         {

+ 6 - 6
Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Subjects/AsyncSubjectTest.cs

@@ -308,14 +308,14 @@ namespace ReactiveTests.Tests
         public void Await_Blocking()
         {
             var s = new AsyncSubject<int>();
-            GetResult_Blocking(s.GetAwaiter());
+            GetResult_BlockingImpl(s.GetAwaiter());
         }
 
         [Fact]
         public void Await_Throw()
         {
             var s = new AsyncSubject<int>();
-            GetResult_Blocking_Throw(s.GetAwaiter());
+            GetResult_Blocking_ThrowImpl(s.GetAwaiter());
         }
 #endif
 
@@ -331,10 +331,10 @@ namespace ReactiveTests.Tests
         [Fact]
         public void GetResult_Blocking()
         {
-            GetResult_Blocking(new AsyncSubject<int>());
+            GetResult_BlockingImpl(new AsyncSubject<int>());
         }
 
-        private void GetResult_Blocking(AsyncSubject<int> s)
+        private void GetResult_BlockingImpl(AsyncSubject<int> s)
         {
             Assert.False(s.IsCompleted);
 
@@ -359,10 +359,10 @@ namespace ReactiveTests.Tests
         [Fact]
         public void GetResult_Blocking_Throw()
         {
-            GetResult_Blocking_Throw(new AsyncSubject<int>());
+            GetResult_Blocking_ThrowImpl(new AsyncSubject<int>());
         }
 
-        private void GetResult_Blocking_Throw(AsyncSubject<int> s)
+        private void GetResult_Blocking_ThrowImpl(AsyncSubject<int> s)
         {
             Assert.False(s.IsCompleted);
 

+ 30 - 30
Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Subjects/ReplaySubjectTest.cs

@@ -1497,13 +1497,13 @@ namespace ReactiveTests.Tests
         [Fact]
         public void HasObservers()
         {
-            HasObservers(new ReplaySubject<int>());
-            HasObservers(new ReplaySubject<int>(1));
-            HasObservers(new ReplaySubject<int>(3));
-            HasObservers(new ReplaySubject<int>(TimeSpan.FromSeconds(1)));
+            HasObserversImpl(new ReplaySubject<int>());
+            HasObserversImpl(new ReplaySubject<int>(1));
+            HasObserversImpl(new ReplaySubject<int>(3));
+            HasObserversImpl(new ReplaySubject<int>(TimeSpan.FromSeconds(1)));
         }
 
-        private static void HasObservers(ReplaySubject<int> s)
+        private static void HasObserversImpl(ReplaySubject<int> s)
         {
             Assert.False(s.HasObservers);
 
@@ -1529,13 +1529,13 @@ namespace ReactiveTests.Tests
         [Fact]
         public void HasObservers_Dispose1()
         {
-            HasObservers_Dispose1(new ReplaySubject<int>());
-            HasObservers_Dispose1(new ReplaySubject<int>(1));
-            HasObservers_Dispose1(new ReplaySubject<int>(3));
-            HasObservers_Dispose1(new ReplaySubject<int>(TimeSpan.FromSeconds(1)));
+            HasObservers_Dispose1Impl(new ReplaySubject<int>());
+            HasObservers_Dispose1Impl(new ReplaySubject<int>(1));
+            HasObservers_Dispose1Impl(new ReplaySubject<int>(3));
+            HasObservers_Dispose1Impl(new ReplaySubject<int>(TimeSpan.FromSeconds(1)));
         }
 
-        private static void HasObservers_Dispose1(ReplaySubject<int> s)
+        private static void HasObservers_Dispose1Impl(ReplaySubject<int> s)
         {
             Assert.False(s.HasObservers);
             Assert.False(s.IsDisposed);
@@ -1556,13 +1556,13 @@ namespace ReactiveTests.Tests
         [Fact]
         public void HasObservers_Dispose2()
         {
-            HasObservers_Dispose2(new ReplaySubject<int>());
-            HasObservers_Dispose2(new ReplaySubject<int>(1));
-            HasObservers_Dispose2(new ReplaySubject<int>(3));
-            HasObservers_Dispose2(new ReplaySubject<int>(TimeSpan.FromSeconds(1)));
+            HasObservers_Dispose2Impl(new ReplaySubject<int>());
+            HasObservers_Dispose2Impl(new ReplaySubject<int>(1));
+            HasObservers_Dispose2Impl(new ReplaySubject<int>(3));
+            HasObservers_Dispose2Impl(new ReplaySubject<int>(TimeSpan.FromSeconds(1)));
         }
 
-        private static void HasObservers_Dispose2(ReplaySubject<int> s)
+        private static void HasObservers_Dispose2Impl(ReplaySubject<int> s)
         {
             Assert.False(s.HasObservers);
             Assert.False(s.IsDisposed);
@@ -1583,13 +1583,13 @@ namespace ReactiveTests.Tests
         [Fact]
         public void HasObservers_Dispose3()
         {
-            HasObservers_Dispose3(new ReplaySubject<int>());
-            HasObservers_Dispose3(new ReplaySubject<int>(1));
-            HasObservers_Dispose3(new ReplaySubject<int>(3));
-            HasObservers_Dispose3(new ReplaySubject<int>(TimeSpan.FromSeconds(1)));
+            HasObservers_Dispose3Impl(new ReplaySubject<int>());
+            HasObservers_Dispose3Impl(new ReplaySubject<int>(1));
+            HasObservers_Dispose3Impl(new ReplaySubject<int>(3));
+            HasObservers_Dispose3Impl(new ReplaySubject<int>(TimeSpan.FromSeconds(1)));
         }
 
-        private static void HasObservers_Dispose3(ReplaySubject<int> s)
+        private static void HasObservers_Dispose3Impl(ReplaySubject<int> s)
         {
             Assert.False(s.HasObservers);
             Assert.False(s.IsDisposed);
@@ -1602,13 +1602,13 @@ namespace ReactiveTests.Tests
         [Fact]
         public void HasObservers_OnCompleted()
         {
-            HasObservers_OnCompleted(new ReplaySubject<int>());
-            HasObservers_OnCompleted(new ReplaySubject<int>(1));
-            HasObservers_OnCompleted(new ReplaySubject<int>(3));
-            HasObservers_OnCompleted(new ReplaySubject<int>(TimeSpan.FromSeconds(1)));
+            HasObservers_OnCompletedImpl(new ReplaySubject<int>());
+            HasObservers_OnCompletedImpl(new ReplaySubject<int>(1));
+            HasObservers_OnCompletedImpl(new ReplaySubject<int>(3));
+            HasObservers_OnCompletedImpl(new ReplaySubject<int>(TimeSpan.FromSeconds(1)));
         }
 
-        private static void HasObservers_OnCompleted(ReplaySubject<int> s)
+        private static void HasObservers_OnCompletedImpl(ReplaySubject<int> s)
         {
             Assert.False(s.HasObservers);
 
@@ -1625,13 +1625,13 @@ namespace ReactiveTests.Tests
         [Fact]
         public void HasObservers_OnError()
         {
-            HasObservers_OnError(new ReplaySubject<int>());
-            HasObservers_OnError(new ReplaySubject<int>(1));
-            HasObservers_OnError(new ReplaySubject<int>(3));
-            HasObservers_OnError(new ReplaySubject<int>(TimeSpan.FromSeconds(1)));
+            HasObservers_OnErrorImpl(new ReplaySubject<int>());
+            HasObservers_OnErrorImpl(new ReplaySubject<int>(1));
+            HasObservers_OnErrorImpl(new ReplaySubject<int>(3));
+            HasObservers_OnErrorImpl(new ReplaySubject<int>(TimeSpan.FromSeconds(1)));
         }
 
-        private static void HasObservers_OnError(ReplaySubject<int> s)
+        private static void HasObservers_OnErrorImpl(ReplaySubject<int> s)
         {
             Assert.False(s.HasObservers);