Merge pull request #1499 from dotnet/dependabot/nuget/Rx.NET/Source/D…

…iffPlex-1.7.0 Bump DiffPlex from 1.6.3 to 1.7.0 in /Rx.NET/Source
dotnet · Aug 23, 2021 · cd6fe7d · cd6fe7d
2 parents 4cf4501 + aa376a5
commit cd6fe7d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 39 deletions.
diff --git a/Rx.NET/Integration/WindowsDesktopTests/WindowsDesktopTests.csproj b/Rx.NET/Integration/WindowsDesktopTests/WindowsDesktopTests.csproj
@@ -1,14 +1,13 @@
 <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>
     <RootNamespace>Tests.System.Reactive</RootNamespace>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\Source\ReactiveX.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
-
 
   <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
     <UseWPF >true</UseWPF>

diff --git a/...Source/tests/Tests.System.Reactive.ApiApprovals/Tests.System.Reactive.ApiApprovals.csproj b/...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>
 

diff --git 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: