housekeeping: Release 14.1 (#2792)

glennawatson · ChrisPulman · web-flow · commit 49784a22c1e2 · 2021-06-19T13:25:52.000+01:00
* housekeeping: Release 14.1

* Update Approved Test files, remove white space

Fix build issue

Co-authored-by: Chris Pulman &lt;chris.pulman@yahoo.com&gt;
diff --git 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<T>(this T item, System.Reactive.Disposables.CompositeDisposable compositeDisposable)
             where T : System.IDisposable { }
     }
-}
+}
diff --git 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<T>(this T item, System.Reactive.Disposables.CompositeDisposable compositeDisposable)
             where T : System.IDisposable { }
     }
-}
+}
diff --git 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<T>(this T item, System.Reactive.Disposables.CompositeDisposable compositeDisposable)
             where T : System.IDisposable { }
     }
-}
+}
diff --git 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$",

Original file line number	Diff line number	Diff line change
`@@ -683,13 +683,14 @@ namespace ReactiveUI`
`683`	`683`	`}`
`684`	`684`	`public enum RegistrationNamespace`
`685`	`685`	`{`
`686`		`- XamForms = 0,`
`687`		`- Winforms = 1,`
`688`		`- Wpf = 2,`
`689`		`- Uno = 3,`
`690`		`- Blazor = 4,`
`691`		`- Drawing = 5,`
`692`		`- Avalonia = 6,`
	`686`	`+ None = 0,`
	`687`	`+ XamForms = 1,`
	`688`	`+ Winforms = 2,`
	`689`	`+ Wpf = 3,`
	`690`	`+ Uno = 4,`
	`691`	`+ Blazor = 5,`
	`692`	`+ Drawing = 6,`
	`693`	`+ Avalonia = 7,`
`693`	`694`	`}`
`694`	`695`	`public class Registrations`
`695`	`696`	`{`
`@@ -935,4 +936,4 @@ namespace System.Reactive.Disposables`
`935`	`936`	`public static T DisposeWith<T>(this T item, System.Reactive.Disposables.CompositeDisposable compositeDisposable)`
`936`	`937`	`where T : System.IDisposable { }`
`937`	`938`	`}`
`938`		`-}`
	`939`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -678,13 +678,14 @@ namespace ReactiveUI`
`678`	`678`	`}`
`679`	`679`	`public enum RegistrationNamespace`
`680`	`680`	`{`
`681`		`- XamForms = 0,`
`682`		`- Winforms = 1,`
`683`		`- Wpf = 2,`
`684`		`- Uno = 3,`
`685`		`- Blazor = 4,`
`686`		`- Drawing = 5,`
`687`		`- Avalonia = 6,`
	`681`	`+ None = 0,`
	`682`	`+ XamForms = 1,`
	`683`	`+ Winforms = 2,`
	`684`	`+ Wpf = 3,`
	`685`	`+ Uno = 4,`
	`686`	`+ Blazor = 5,`
	`687`	`+ Drawing = 6,`
	`688`	`+ Avalonia = 7,`
`688`	`689`	`}`
`689`	`690`	`public class Registrations`
`690`	`691`	`{`
`@@ -930,4 +931,4 @@ namespace System.Reactive.Disposables`
`930`	`931`	`public static T DisposeWith<T>(this T item, System.Reactive.Disposables.CompositeDisposable compositeDisposable)`
`931`	`932`	`where T : System.IDisposable { }`
`932`	`933`	`}`
`933`		`-}`
	`934`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -676,13 +676,14 @@ namespace ReactiveUI`
`676`	`676`	`}`
`677`	`677`	`public enum RegistrationNamespace`
`678`	`678`	`{`
`679`		`- XamForms = 0,`
`680`		`- Winforms = 1,`
`681`		`- Wpf = 2,`
`682`		`- Uno = 3,`
`683`		`- Blazor = 4,`
`684`		`- Drawing = 5,`
`685`		`- Avalonia = 6,`
	`679`	`+ None = 0,`
	`680`	`+ XamForms = 1,`
	`681`	`+ Winforms = 2,`
	`682`	`+ Wpf = 3,`
	`683`	`+ Uno = 4,`
	`684`	`+ Blazor = 5,`
	`685`	`+ Drawing = 6,`
	`686`	`+ Avalonia = 7,`
`686`	`687`	`}`
`687`	`688`	`public class Registrations`
`688`	`689`	`{`
`@@ -928,4 +929,4 @@ namespace System.Reactive.Disposables`
`928`	`929`	`public static T DisposeWith<T>(this T item, System.Reactive.Disposables.CompositeDisposable compositeDisposable)`
`929`	`930`	`where T : System.IDisposable { }`
`930`	`931`	`}`
`931`		`-}`
	`932`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",`
`3`		`- "version": "13.3",`
	`3`	`+ "version": "14.1",`
`4`	`4`	`"publicReleaseRefSpec": [`
`5`	`5`	`"^refs/heads/master$", // we release out of master`
`6`	`6`	`"^refs/heads/main$",`