From 0e2561be635627c099a304d95513d18a499a435e Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 29 Jul 2021 06:26:04 +0000
Subject: [PATCH 1/3] Bump DiffPlex from 1.6.3 to 1.7.0 in /Rx.NET/Source

Bumps [DiffPlex](https://github.com/mmanela/diffplex) from 1.6.3 to 1.7.0.
- [Release notes](https://github.com/mmanela/diffplex/releases)
- [Commits](https://github.com/mmanela/diffplex/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 .../Tests.System.Reactive.ApiApprovals.csproj                   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Rx.NET/Source/tests/Tests.System.Reactive.ApiApprovals/Tests.System.Reactive.ApiApprovals.csproj b/Rx.NET/Source/tests/Tests.System.Reactive.ApiApprovals/Tests.System.Reactive.ApiApprovals.csproj
index f0cd25d153..5bb13ab0a0 100644
--- a/Rx.NET/Source/tests/Tests.System.Reactive.ApiApprovals/Tests.System.Reactive.ApiApprovals.csproj
+++ b/Rx.NET/Source/tests/Tests.System.Reactive.ApiApprovals/Tests.System.Reactive.ApiApprovals.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Verify.Xunit" Version="10.9.1" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
-    <PackageReference Include="DiffPlex" Version="1.6.3" />
+    <PackageReference Include="DiffPlex" Version="1.7.0" />
     <PackageReference Include="PublicApiGenerator" Version="10.2.0" />
   </ItemGroup>
 

From 5c2979c2f828effe8a2eadbeefd29659b87493b8 Mon Sep 17 00:00:00 2001
From: "Bart J.F. De Smet" <bartde@microsoft.com>
Date: Mon, 23 Aug 2021 10:18:01 -0700
Subject: [PATCH 2/3] Fix CI build for integration tests.

---
 azure-pipelines.rx.yml | 40 ++++------------------------------------
 1 file changed, 4 insertions(+), 36 deletions(-)

diff --git a/azure-pipelines.rx.yml b/azure-pipelines.rx.yml
index cf3b9859d0..36ccd541f5 100644
--- a/azure-pipelines.rx.yml
+++ b/azure-pipelines.rx.yml
@@ -154,24 +154,8 @@ stages:
       inputs:
         command: custom
         projects: $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LinuxTests/LinuxTests.csproj
-        custom: add
-        arguments: package System.Reactive -v $(NBGV_NuGetPackageVersion) -s $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LocalPackages
-
-    - task: DotNetCoreCLI@2
-      displayName: Update Aliases
-      inputs:
-        command: custom
-        projects: $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LinuxTests/LinuxTests.csproj
-        custom: add
-        arguments: package System.Reactive.Observable.Aliases -v $(NBGV_NuGetPackageVersion) -s $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LocalPackages
-
-    - task: DotNetCoreCLI@2
-      displayName: Update Testing
-      inputs:
-        command: custom
-        projects: $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LinuxTests/LinuxTests.csproj
-        custom: add
-        arguments: package Microsoft.Reactive.Testing -v $(NBGV_NuGetPackageVersion) -s $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LocalPackages
+        custom: restore
+        arguments: --configfile $(System.DefaultWorkingDirectory)/Rx.NET/Integration/NuGet.Config
 
     - task: DotNetCoreCLI@2
       inputs:
@@ -231,24 +215,8 @@ stages:
       inputs:
         command: custom
         projects: $(System.DefaultWorkingDirectory)/Rx.NET/Integration/WindowsDesktopTests/WindowsDesktopTests.csproj
-        custom: add
-        arguments: package System.Reactive -v $(NBGV_NuGetPackageVersion) -s $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LocalPackages
-
-    - task: DotNetCoreCLI@2
-      displayName: Update Aliases
-      inputs:
-        command: custom
-        projects: $(System.DefaultWorkingDirectory)/Rx.NET/Integration/WindowsDesktopTests/WindowsDesktopTests.csproj
-        custom: add
-        arguments: package System.Reactive.Observable.Aliases -v $(NBGV_NuGetPackageVersion) -s $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LocalPackages
-
-    - task: DotNetCoreCLI@2
-      displayName: Update Testing
-      inputs:
-        command: custom
-        projects: $(System.DefaultWorkingDirectory)/Rx.NET/Integration/WindowsDesktopTests/WindowsDesktopTests.csproj
-        custom: add
-        arguments: package Microsoft.Reactive.Testing -v $(NBGV_NuGetPackageVersion) -s $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LocalPackages
+        custom: restore
+        arguments: --configfile $(System.DefaultWorkingDirectory)/Rx.NET/Integration/NuGet.Config
 
     - task: DotNetCoreCLI@2
       inputs:

From aa376a5d7008296394149b7aff3d03dc6fb1a9c6 Mon Sep 17 00:00:00 2001
From: "Bart J.F. De Smet" <bartde@microsoft.com>
Date: Mon, 23 Aug 2021 10:39:03 -0700
Subject: [PATCH 3/3] Limit target platforms for integration tests.

---
 .../Integration/WindowsDesktopTests/WindowsDesktopTests.csproj | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Rx.NET/Integration/WindowsDesktopTests/WindowsDesktopTests.csproj b/Rx.NET/Integration/WindowsDesktopTests/WindowsDesktopTests.csproj
index 6dedc757a4..3cab48abef 100644
--- a/Rx.NET/Integration/WindowsDesktopTests/WindowsDesktopTests.csproj
+++ b/Rx.NET/Integration/WindowsDesktopTests/WindowsDesktopTests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net5.0;net5.0-windows10.0.19041</TargetFrameworks>
+    <TargetFrameworks>net5.0;net5.0-windows10.0.19041</TargetFrameworks>
     <NoWarn>$(NoWarn);CS0618</NoWarn>
     <LangVersion>latest</LangVersion>
     <AssemblyName>Tests.System.Reactive</AssemblyName>
@@ -8,7 +8,6 @@
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\Source\ReactiveX.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
-  
 
   <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
     <UseWPF >true</UseWPF>