dotnet
/
reactive
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merge branch 'main' into dependabot/nuget/Rx.NET/Source/coverlet.collector-3.1.0

This commit is contained in:
Bart J.F. De Smet 2021-08-23 11:10:06 -07:00 коммит произвёл GitHub
Родитель 80cc10c1f7 40d61ac751
Коммит e38747bd63
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
6 изменённых файлов: 16 добавлений и 49 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
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'">

8
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>

11
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>
@ -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>

2
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>

2
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>

40
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: