Merge branch 'main' into dependabot/nuget/Rx.NET/Source/Nerdbank.GitV…

…ersioning-3.4.231
dotnet · Aug 23, 2021 · 4e29a5e · 4e29a5e
2 parents a6b3a38 + 40d61ac
commit 4e29a5e
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 49 deletions.
diff --git a/Ix.NET/Source/Benchmarks.System.Interactive/Benchmarks.System.Interactive.csproj b/Ix.NET/Source/Benchmarks.System.Interactive/Benchmarks.System.Interactive.csproj
@@ -20,7 +20,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.0" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(Configuration)|$(Platform)'=='Ix.net 3.1.1|AnyCPU'">

diff --git a/Rx.NET/Integration/LinuxTests/LinuxTests.csproj b/Rx.NET/Integration/LinuxTests/LinuxTests.csproj
@@ -24,11 +24,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />    
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
-    <PackageReference Include="System.Reactive" Version="4.2.0-preview.63" />
-    <PackageReference Include="Microsoft.Reactive.Testing" Version="4.2.0-preview.63" />
-    <PackageReference Include="System.Reactive.Observable.Aliases" Version="4.2.0-preview.63" />
+    <PackageReference Include="System.Reactive" Version="5.1.0-preview*" />
+    <PackageReference Include="Microsoft.Reactive.Testing" Version="5.1.0-preview*" />
+    <PackageReference Include="System.Reactive.Observable.Aliases" Version="5.1.0-preview*" />
   </ItemGroup>
 </Project>
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>
@@ -29,11 +28,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />    
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
-    <PackageReference Include="System.Reactive" Version="4.2.0-preview.63" />
-    <PackageReference Include="Microsoft.Reactive.Testing" Version="4.2.0-preview.63" />
-    <PackageReference Include="System.Reactive.Observable.Aliases" Version="4.2.0-preview.63" />
+    <PackageReference Include="System.Reactive" Version="5.1.0-preview*" />
+    <PackageReference Include="Microsoft.Reactive.Testing" Version="5.1.0-preview*" />
+    <PackageReference Include="System.Reactive.Observable.Aliases" Version="5.1.0-preview*" />
   </ItemGroup>
 </Project>
diff --git a/Rx.NET/Source/benchmarks/Benchmarks.System.Reactive/Benchmarks.System.Reactive.csproj b/Rx.NET/Source/benchmarks/Benchmarks.System.Reactive/Benchmarks.System.Reactive.csproj
@@ -21,7 +21,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.0" />
     <PackageReference Include="WindowsBase" Version="4.6.1055" />
   </ItemGroup>
 

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: