Merge branch 'main' into patch-1

bartdesmet · web-flow · commit 002c1379872d · 2021-05-21T09:28:40.000-07:00
diff --git a/AsyncRx.NET/Directory.build.props b/AsyncRx.NET/Directory.build.props
@@ -28,7 +28,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
-    <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="all" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.4.190" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(IsTestProject)' == 'true'">
diff --git a/AsyncRx.NET/System.Reactive.Async.Concurrency/System/Reactive/Concurrency/AsyncScheduler.cs b/AsyncRx.NET/System.Reactive.Async.Concurrency/System/Reactive/Concurrency/AsyncScheduler.cs
@@ -231,10 +231,7 @@ public void GetResult()
                         throw new InvalidOperationException(); // REVIEW: No support for blocking.
                     }
 
-                    if (_error != null)
-                    {
-                        _error.Throw();
-                    }
+                    _error?.Throw();
                 }
 
                 public void OnCompleted(Action continuation)
diff --git a/Ix.NET/Source/Directory.Build.props b/Ix.NET/Source/Directory.Build.props
@@ -26,7 +26,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
-    <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="all" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.4.194" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(IsTestProject)' == 'true'">
diff --git a/Ix.NET/Source/System.Interactive.Async.Providers.Tests/System.Interactive.Async.Providers.Tests.csproj b/Ix.NET/Source/System.Interactive.Async.Providers.Tests/System.Interactive.Async.Providers.Tests.csproj
@@ -17,7 +17,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/Ix.NET/Source/System.Interactive.Async.Tests/System.Interactive.Async.Tests.csproj b/Ix.NET/Source/System.Interactive.Async.Tests/System.Interactive.Async.Tests.csproj
@@ -17,7 +17,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
     <PackageReference Include="FluentAssertions" Version="5.10.3" />
     <PackageReference Include="xunit" Version="2.4.1" />
diff --git a/Ix.NET/Source/System.Interactive.Tests/System.Interactive.Tests.csproj b/Ix.NET/Source/System.Interactive.Tests/System.Interactive.Tests.csproj
@@ -16,7 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/Ix.NET/Source/System.Interactive/System/Linq/Operators/Publish.cs b/Ix.NET/Source/System.Interactive/System/Linq/Operators/Publish.cs
@@ -191,10 +191,7 @@ private IEnumerator<T> GetEnumeratorCore(int i)
                 }
                 finally
                 {
-                    if (_buffer != null)
-                    {
-                        _buffer.Done(i + 1);
-                    }
+                    _buffer?.Done(i + 1);
                 }
             }
         }
diff --git a/Ix.NET/Source/System.Linq.Async.Queryable.Tests/System.Linq.Async.Queryable.Tests.csproj b/Ix.NET/Source/System.Linq.Async.Queryable.Tests/System.Linq.Async.Queryable.Tests.csproj
@@ -17,7 +17,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
     <PackageReference Include="FluentAssertions" Version="5.10.3" />
     <PackageReference Include="xunit" Version="2.4.1" />
diff --git a/Ix.NET/Source/System.Linq.Async.Queryable/System/Linq/AsyncEnumerableRewriter.cs b/Ix.NET/Source/System.Linq.Async.Queryable/System/Linq/AsyncEnumerableRewriter.cs
@@ -291,10 +291,7 @@ private static ReadOnlyCollection<Expression> FixupQuotedArgs(MethodInfo method,
                         }
                     }
 
-                    if (list != null)
-                    {
-                        list.Add(expression);
-                    }
+                    list?.Add(expression);
                 }
 
                 //
diff --git a/Ix.NET/Source/System.Linq.Async.Tests/System.Linq.Async.Tests.csproj b/Ix.NET/Source/System.Linq.Async.Tests/System.Linq.Async.Tests.csproj
@@ -39,7 +39,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
     <PackageReference Include="FluentAssertions" Version="5.10.3" />
     <PackageReference Include="xunit" Version="2.4.1" />
diff --git a/Ix.NET/Source/System.Linq.Async/System/Linq/Disposables.cs b/Ix.NET/Source/System.Linq.Async/System/Linq/Disposables.cs
@@ -47,10 +47,7 @@ public void Dispose()
                 d1.Dispose();
 
                 var d2 = Interlocked.Exchange(ref _d2, null);
-                if (d2 != null)
-                {
-                    d2.Dispose();
-                }
+                d2?.Dispose();
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -231,10 +231,7 @@ public void GetResult()`
`231`	`231`	`throw new InvalidOperationException(); // REVIEW: No support for blocking.`
`232`	`232`	`}`
`233`	`233`
`234`		`- if (_error != null)`
`235`		`- {`
`236`		`- _error.Throw();`
`237`		`- }`
	`234`	`+ _error?.Throw();`
`238`	`235`	`}`
`239`	`236`
`240`	`237`	`public void OnCompleted(Action continuation)`
Original file line number	Diff line number	Diff line change
`@@ -191,10 +191,7 @@ private IEnumerator<T> GetEnumeratorCore(int i)`
`191`	`191`	`}`
`192`	`192`	`finally`
`193`	`193`	`{`
`194`		`- if (_buffer != null)`
`195`		`- {`
`196`		`- _buffer.Done(i + 1);`
`197`		`- }`
	`194`	`+ _buffer?.Done(i + 1);`
`198`	`195`	`}`
`199`	`196`	`}`
`200`	`197`	`}`
Original file line number	Diff line number	Diff line change
`@@ -291,10 +291,7 @@ private static ReadOnlyCollection<Expression> FixupQuotedArgs(MethodInfo method,`
`291`	`291`	`}`
`292`	`292`	`}`
`293`	`293`
`294`		`- if (list != null)`
`295`		`- {`
`296`		`- list.Add(expression);`
`297`		`- }`
	`294`	`+ list?.Add(expression);`
`298`	`295`	`}`
`299`	`296`
`300`	`297`	`//`