From 49784a22c1e2f1c0f9000d99fe8a9346fb028e7c Mon Sep 17 00:00:00 2001 From: Glenn <5834289+glennawatson@users.noreply.github.com> Date: Sat, 19 Jun 2021 22:25:52 +1000 Subject: [PATCH] housekeeping: Release 14.1 (#2792) * housekeeping: Release 14.1 * Update Approved Test files, remove white space Fix build issue Co-authored-by: Chris Pulman --- ...ApprovalTests.ReactiveUI.net472.approved.txt | 17 +++++++++-------- ...ApprovalTests.ReactiveUI.net5.0.approved.txt | 17 +++++++++-------- ...lTests.ReactiveUI.netcoreapp3.1.approved.txt | 17 +++++++++-------- version.json | 2 +- 4 files changed, 28 insertions(+), 25 deletions(-) diff --git a/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.net472.approved.txt b/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.net472.approved.txt index df2a7d834e..73d37bb1aa 100644 --- a/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.net472.approved.txt +++ b/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.net472.approved.txt @@ -683,13 +683,14 @@ namespace ReactiveUI } public enum RegistrationNamespace { - XamForms = 0, - Winforms = 1, - Wpf = 2, - Uno = 3, - Blazor = 4, - Drawing = 5, - Avalonia = 6, + None = 0, + XamForms = 1, + Winforms = 2, + Wpf = 3, + Uno = 4, + Blazor = 5, + Drawing = 6, + Avalonia = 7, } public class Registrations { @@ -935,4 +936,4 @@ namespace System.Reactive.Disposables public static T DisposeWith(this T item, System.Reactive.Disposables.CompositeDisposable compositeDisposable) where T : System.IDisposable { } } -} +} \ No newline at end of file diff --git a/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.net5.0.approved.txt b/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.net5.0.approved.txt index ae1a48f92b..447e71d275 100644 --- a/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.net5.0.approved.txt +++ b/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.net5.0.approved.txt @@ -678,13 +678,14 @@ namespace ReactiveUI } public enum RegistrationNamespace { - XamForms = 0, - Winforms = 1, - Wpf = 2, - Uno = 3, - Blazor = 4, - Drawing = 5, - Avalonia = 6, + None = 0, + XamForms = 1, + Winforms = 2, + Wpf = 3, + Uno = 4, + Blazor = 5, + Drawing = 6, + Avalonia = 7, } public class Registrations { @@ -930,4 +931,4 @@ namespace System.Reactive.Disposables public static T DisposeWith(this T item, System.Reactive.Disposables.CompositeDisposable compositeDisposable) where T : System.IDisposable { } } -} +} \ No newline at end of file diff --git a/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.netcoreapp3.1.approved.txt b/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.netcoreapp3.1.approved.txt index b0a5508e6d..9e24a24957 100644 --- a/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.netcoreapp3.1.approved.txt +++ b/src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.netcoreapp3.1.approved.txt @@ -676,13 +676,14 @@ namespace ReactiveUI } public enum RegistrationNamespace { - XamForms = 0, - Winforms = 1, - Wpf = 2, - Uno = 3, - Blazor = 4, - Drawing = 5, - Avalonia = 6, + None = 0, + XamForms = 1, + Winforms = 2, + Wpf = 3, + Uno = 4, + Blazor = 5, + Drawing = 6, + Avalonia = 7, } public class Registrations { @@ -928,4 +929,4 @@ namespace System.Reactive.Disposables public static T DisposeWith(this T item, System.Reactive.Disposables.CompositeDisposable compositeDisposable) where T : System.IDisposable { } } -} +} \ No newline at end of file diff --git a/version.json b/version.json index df72b119dc..d7a1273ddf 100644 --- a/version.json +++ b/version.json @@ -1,6 +1,6 @@ { "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", - "version": "13.3", + "version": "14.1", "publicReleaseRefSpec": [ "^refs/heads/master$", // we release out of master "^refs/heads/main$",