Skip to content

Bump DiffPlex from 1.6.3 to 1.7.0 in /Rx.NET/Source #1499

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bartdesmet merged 4 commits into from
Aug 23, 2021
Merged

Bump DiffPlex from 1.6.3 to 1.7.0 in /Rx.NET/Source #1499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0e2561b
Bump DiffPlex from 1.6.3 to 1.7.0 in /Rx.NET/Source
dependabot-preview[bot] Jul 29, 2021
86edb2a
Merge branch 'main' into dependabot/nuget/Rx.NET/Source/DiffPlex-1.7.0
bartdesmet Aug 23, 2021
5c2979c
Fix CI build for integration tests.
bartdesmet Aug 23, 2021
aa376a5
Limit target platforms for integration tests.
bartdesmet Aug 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions Rx.NET/Integration/WindowsDesktopTests/WindowsDesktopTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ...Source/tests/Tests.System.Reactive.ApiApprovals/Tests.System.Reactive.ApiApprovals.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
40 changes: 4 additions & 36 deletions azure-pipelines.rx.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down