Merge branch 'main' into to-async-immutable

dotnet · Aug 23, 2021 · eb87b70 · eb87b70
2 parents 9614e0a + 2b9f921
commit eb87b70
Show file tree

Hide file tree

Showing 13 changed files with 29 additions and 64 deletions.
diff --git a/AsyncRx.NET/Directory.build.props b/AsyncRx.NET/Directory.build.props
@@ -28,11 +28,11 @@
 
  <ItemGroup>
  <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
- <PackageReference Include="Nerdbank.GitVersioning" Version="3.4.203" PrivateAssets="all" />
+ <PackageReference Include="Nerdbank.GitVersioning" Version="3.4.231" PrivateAssets="all" />
  </ItemGroup>
 
  <ItemGroup Condition="'$(IsTestProject)' == 'true'">
- <PackageReference Include="coverlet.collector" Version="3.0.3" />
+ <PackageReference Include="coverlet.collector" Version="3.1.0" />
  </ItemGroup>
 
 </Project>
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/Ix.NET/Source/Directory.Build.props b/Ix.NET/Source/Directory.Build.props
@@ -26,11 +26,11 @@
 
  <ItemGroup>
  <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
- <PackageReference Include="Nerdbank.GitVersioning" Version="3.4.203" PrivateAssets="all" />
+ <PackageReference Include="Nerdbank.GitVersioning" Version="3.4.231" PrivateAssets="all" />
  </ItemGroup>
 
  <ItemGroup Condition="'$(IsTestProject)' == 'true'">
- <PackageReference Include="coverlet.collector" Version="3.0.3" />
+ <PackageReference Include="coverlet.collector" Version="3.1.0" />
  </ItemGroup>
 
 

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/NuGet.Config b/Rx.NET/Integration/NuGet.Config
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
  <packageSources>
  <add key="Local Packages" value="./LocalPackages" />
+ <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
  </packageSources>
 </configuration>
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/Directory.build.props b/Rx.NET/Source/Directory.build.props
@@ -28,11 +28,11 @@
 
  <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.231" PrivateAssets="all" />
  </ItemGroup>
 
  <ItemGroup Condition="'$(IsTestProject)' == 'true'">
- <PackageReference Include="coverlet.collector" Version="3.0.3" />
+ <PackageReference Include="coverlet.collector" Version="3.1.0" />
  </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/Rx.NET/Source/global.json b/Rx.NET/Source/global.json
@@ -1,8 +1,5 @@
 {
-"sdk": {
- "version": "5.0.100-preview"
- },
  "msbuild-sdks": {
  "MSBuild.Sdk.Extras": "3.0.23"
  }
-}
+}
diff --git a/Rx.NET/Source/src/System.Reactive/System.Reactive.csproj b/Rx.NET/Source/src/System.Reactive/System.Reactive.csproj
@@ -188,7 +188,7 @@
  <None Include="build\_._" PackagePath="buildTransitive\net5.0;buildTransitive\net5.0-windows10.0.19041" Pack="true" />
  <None Include="build\System.Reactive.targets" PackagePath="buildTransitive\netcoreapp3.1" Pack="true" />
  <None Include="build\System.Reactive.targets" PackagePath="build\netcoreapp3.1" Pack="true" />
- <None Include="build\System.Reactive.net5.0-windows.targets" PackagePath="build\net5.0-windows\$(PackageId).targets;buildTransitive\net5.0-windows\$(PackageId).targets" Pack="true" />
+ <None Include="build\System.Reactive.net5.0-windows.targets" PackagePath="build\net5.0-windows7\$(PackageId).targets;buildTransitive\net5.0-windows7\$(PackageId).targets" Pack="true" />
  <None Include="Linq\QbservableEx.NAry.cs">
  <DesignTime>True</DesignTime>
  <AutoGen>True</AutoGen>
@@ -200,4 +200,4 @@
  <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
  </ItemGroup>
 
-</Project>
+</Project>
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
@@ -25,11 +25,11 @@
  </ItemGroup>
 
  <ItemGroup>
- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
  <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/Rx.NET/Source/tests/Tests.System.Reactive/Tests.System.Reactive.csproj b/Rx.NET/Source/tests/Tests.System.Reactive/Tests.System.Reactive.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.10.0" /> 
  <PackageReference Include="xunit" Version="2.4.1" />
  <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
  <ProjectReference Include="..\..\src\System.Reactive\System.Reactive.csproj" />

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: