Skip to content

Commit 4e29a5e

Browse files
bartdesmetbartdesmet
authored
Merge branch 'main' into dependabot/nuget/Rx.NET/Source/Nerdbank.GitVersioning-3.4.231
2 parents a6b3a38 + 40d61ac commit 4e29a5e

File tree

6 files changed

+16
-49
lines changed

6 files changed

+16
-49
lines changed

‎Ix.NET/Source/Benchmarks.System.Interactive/Benchmarks.System.Interactive.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
</PropertyGroup>
2121

2222
<ItemGroup>
23-
<PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
23+
<PackageReference Include="BenchmarkDotNet" Version="0.13.0" />
2424
</ItemGroup>
2525

2626
<ItemGroup Condition="'$(Configuration)|$(Platform)'=='Ix.net 3.1.1|AnyCPU'">

‎Rx.NET/Integration/LinuxTests/LinuxTests.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424
</ItemGroup>
2525

2626
<ItemGroup>
27-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
27+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
2828
<PackageReference Include="xunit" Version="2.4.1" />
2929
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
30-
<PackageReference Include="System.Reactive" Version="4.2.0-preview.63" />
31-
<PackageReference Include="Microsoft.Reactive.Testing" Version="4.2.0-preview.63" />
32-
<PackageReference Include="System.Reactive.Observable.Aliases" Version="4.2.0-preview.63" />
30+
<PackageReference Include="System.Reactive" Version="5.1.0-preview*" />
31+
<PackageReference Include="Microsoft.Reactive.Testing" Version="5.1.0-preview*" />
32+
<PackageReference Include="System.Reactive.Observable.Aliases" Version="5.1.0-preview*" />
3333
</ItemGroup>
3434
</Project>

‎Rx.NET/Integration/WindowsDesktopTests/WindowsDesktopTests.csproj‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>netcoreapp3.1;net5.0;net5.0-windows10.0.19041</TargetFrameworks>
3+
<TargetFrameworks>net5.0;net5.0-windows10.0.19041</TargetFrameworks>
44
<NoWarn>$(NoWarn);CS0618</NoWarn>
55
<LangVersion>latest</LangVersion>
66
<AssemblyName>Tests.System.Reactive</AssemblyName>
77
<RootNamespace>Tests.System.Reactive</RootNamespace>
88
<SignAssembly>true</SignAssembly>
99
<AssemblyOriginatorKeyFile>..\..\Source\ReactiveX.snk</AssemblyOriginatorKeyFile>
1010
</PropertyGroup>
11-
1211

1312
<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
1413
<UseWPF >true</UseWPF>
@@ -29,11 +28,11 @@
2928
</ItemGroup>
3029

3130
<ItemGroup>
32-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
31+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
3332
<PackageReference Include="xunit" Version="2.4.1" />
3433
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
35-
<PackageReference Include="System.Reactive" Version="4.2.0-preview.63" />
36-
<PackageReference Include="Microsoft.Reactive.Testing" Version="4.2.0-preview.63" />
37-
<PackageReference Include="System.Reactive.Observable.Aliases" Version="4.2.0-preview.63" />
34+
<PackageReference Include="System.Reactive" Version="5.1.0-preview*" />
35+
<PackageReference Include="Microsoft.Reactive.Testing" Version="5.1.0-preview*" />
36+
<PackageReference Include="System.Reactive.Observable.Aliases" Version="5.1.0-preview*" />
3837
</ItemGroup>
3938
</Project>

‎Rx.NET/Source/benchmarks/Benchmarks.System.Reactive/Benchmarks.System.Reactive.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
</PropertyGroup>
2222

2323
<ItemGroup>
24-
<PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
24+
<PackageReference Include="BenchmarkDotNet" Version="0.13.0" />
2525
<PackageReference Include="WindowsBase" Version="4.6.1055" />
2626
</ItemGroup>
2727

‎Rx.NET/Source/tests/Tests.System.Reactive.ApiApprovals/Tests.System.Reactive.ApiApprovals.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<PackageReference Include="Verify.Xunit" Version="10.9.1" />
3030
<PackageReference Include="xunit" Version="2.4.1" />
3131
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
32-
<PackageReference Include="DiffPlex" Version="1.6.3" />
32+
<PackageReference Include="DiffPlex" Version="1.7.0" />
3333
<PackageReference Include="PublicApiGenerator" Version="10.2.0" />
3434
</ItemGroup>
3535

‎azure-pipelines.rx.yml‎

Lines changed: 4 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -154,24 +154,8 @@ stages:
154154
inputs:
155155
command: custom
156156
projects: $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LinuxTests/LinuxTests.csproj
157-
custom: add
158-
arguments: package System.Reactive -v $(NBGV_NuGetPackageVersion) -s $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LocalPackages
159-
160-
- task: DotNetCoreCLI@2
161-
displayName: Update Aliases
162-
inputs:
163-
command: custom
164-
projects: $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LinuxTests/LinuxTests.csproj
165-
custom: add
166-
arguments: package System.Reactive.Observable.Aliases -v $(NBGV_NuGetPackageVersion) -s $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LocalPackages
167-
168-
- task: DotNetCoreCLI@2
169-
displayName: Update Testing
170-
inputs:
171-
command: custom
172-
projects: $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LinuxTests/LinuxTests.csproj
173-
custom: add
174-
arguments: package Microsoft.Reactive.Testing -v $(NBGV_NuGetPackageVersion) -s $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LocalPackages
157+
custom: restore
158+
arguments: --configfile $(System.DefaultWorkingDirectory)/Rx.NET/Integration/NuGet.Config
175159

176160
- task: DotNetCoreCLI@2
177161
inputs:
@@ -231,24 +215,8 @@ stages:
231215
inputs:
232216
command: custom
233217
projects: $(System.DefaultWorkingDirectory)/Rx.NET/Integration/WindowsDesktopTests/WindowsDesktopTests.csproj
234-
custom: add
235-
arguments: package System.Reactive -v $(NBGV_NuGetPackageVersion) -s $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LocalPackages
236-
237-
- task: DotNetCoreCLI@2
238-
displayName: Update Aliases
239-
inputs:
240-
command: custom
241-
projects: $(System.DefaultWorkingDirectory)/Rx.NET/Integration/WindowsDesktopTests/WindowsDesktopTests.csproj
242-
custom: add
243-
arguments: package System.Reactive.Observable.Aliases -v $(NBGV_NuGetPackageVersion) -s $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LocalPackages
244-
245-
- task: DotNetCoreCLI@2
246-
displayName: Update Testing
247-
inputs:
248-
command: custom
249-
projects: $(System.DefaultWorkingDirectory)/Rx.NET/Integration/WindowsDesktopTests/WindowsDesktopTests.csproj
250-
custom: add
251-
arguments: package Microsoft.Reactive.Testing -v $(NBGV_NuGetPackageVersion) -s $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LocalPackages
218+
custom: restore
219+
arguments: --configfile $(System.DefaultWorkingDirectory)/Rx.NET/Integration/NuGet.Config
252220

253221
- task: DotNetCoreCLI@2
254222
inputs:

0 commit comments

Comments
 (0)