diff --git a/src/ReactiveUI.Winforms/RoutedViewHost.cs b/src/ReactiveUI.Winforms/RoutedViewHost.cs index 717274c4df..eea62182c6 100644 --- a/src/ReactiveUI.Winforms/RoutedViewHost.cs +++ b/src/ReactiveUI.Winforms/RoutedViewHost.cs @@ -98,7 +98,7 @@ public RoutedControlHost() /// [Category("ReactiveUI")] [Description("The default control when no viewmodel is specified")] - [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)] + [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] public Control? DefaultContent { get => _defaultContent; @@ -110,7 +110,7 @@ public Control? DefaultContent /// [Category("ReactiveUI")] [Description("The router.")] - [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)] + [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] public RoutingState? Router { get => _router; @@ -121,7 +121,7 @@ public RoutingState? Router /// Gets or sets the view contract observable. /// [Browsable(false)] - [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)] + [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] public IObservable? ViewContractObservable { get => _viewContractObservable; @@ -132,7 +132,7 @@ public IObservable? ViewContractObservable /// Gets or sets the view locator. /// [Browsable(false)] - [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)] + [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] public IViewLocator? ViewLocator { get; set; } /// diff --git a/src/ReactiveUI.Winforms/ViewModelViewHost.cs b/src/ReactiveUI.Winforms/ViewModelViewHost.cs index f2b225b41e..4e7306fea0 100644 --- a/src/ReactiveUI.Winforms/ViewModelViewHost.cs +++ b/src/ReactiveUI.Winforms/ViewModelViewHost.cs @@ -45,7 +45,6 @@ public ViewModelControlHost() /// /// Gets or sets a value indicating whether [default cache views enabled]. /// - [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)] public static bool DefaultCacheViewsEnabled { get; set; } /// @@ -58,7 +57,7 @@ public ViewModelControlHost() /// [Category("ReactiveUI")] [Description("The default control when no viewmodel is specified")] - [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)] + [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] public Control? DefaultContent { get => _defaultContent; @@ -72,7 +71,7 @@ public Control? DefaultContent /// The view contract observable. /// [Browsable(false)] - [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)] + [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] public IObservable? ViewContractObservable { get => _viewContractObservable; @@ -83,14 +82,14 @@ public IObservable? ViewContractObservable /// Gets or sets the view locator. /// [Browsable(false)] - [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)] + [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] public IViewLocator? ViewLocator { get; set; } /// [Category("ReactiveUI")] [Description("The viewmodel to host.")] [Bindable(true)] - [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)] + [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] public object? ViewModel { get => _viewModel; @@ -103,7 +102,7 @@ public object? ViewModel [Category("ReactiveUI")] [Description("The Current View")] [Bindable(true)] - [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)] + [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] public object? Content { get => _content; diff --git a/src/tests/ReactiveUI.WinForms.Tests/API/ApiApprovalTests.Winforms.DotNet10_0.verified.txt b/src/tests/ReactiveUI.WinForms.Tests/API/ApiApprovalTests.Winforms.DotNet10_0.verified.txt index 02edf5bce0..2c8860fbd1 100644 --- a/src/tests/ReactiveUI.WinForms.Tests/API/ApiApprovalTests.Winforms.DotNet10_0.verified.txt +++ b/src/tests/ReactiveUI.WinForms.Tests/API/ApiApprovalTests.Winforms.DotNet10_0.verified.txt @@ -74,17 +74,17 @@ namespace ReactiveUI.Winforms public RoutedControlHost() { } [System.ComponentModel.Category("ReactiveUI")] [System.ComponentModel.Description("The default control when no viewmodel is specified")] - [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)] + [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)] public System.Windows.Forms.Control? DefaultContent { get; set; } [System.ComponentModel.Category("ReactiveUI")] [System.ComponentModel.Description("The router.")] - [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)] + [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)] public ReactiveUI.RoutingState? Router { get; set; } [System.ComponentModel.Browsable(false)] - [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)] + [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)] public System.IObservable? ViewContractObservable { get; set; } [System.ComponentModel.Browsable(false)] - [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)] + [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)] public ReactiveUI.IViewLocator? ViewLocator { get; set; } public event System.ComponentModel.PropertyChangedEventHandler? PropertyChanged; public event System.ComponentModel.PropertyChangingEventHandler? PropertyChanging; @@ -112,25 +112,24 @@ namespace ReactiveUI.Winforms [System.ComponentModel.Bindable(true)] [System.ComponentModel.Category("ReactiveUI")] [System.ComponentModel.Description("The Current View")] - [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)] + [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)] public object? Content { get; protected set; } public System.Windows.Forms.Control? CurrentView { get; } [System.ComponentModel.Category("ReactiveUI")] [System.ComponentModel.Description("The default control when no viewmodel is specified")] - [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)] + [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)] public System.Windows.Forms.Control? DefaultContent { get; set; } [System.ComponentModel.Browsable(false)] - [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)] + [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)] public System.IObservable? ViewContractObservable { get; set; } [System.ComponentModel.Browsable(false)] - [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)] + [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)] public ReactiveUI.IViewLocator? ViewLocator { get; set; } [System.ComponentModel.Bindable(true)] [System.ComponentModel.Category("ReactiveUI")] [System.ComponentModel.Description("The viewmodel to host.")] - [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)] + [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)] public object? ViewModel { get; set; } - [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)] public static bool DefaultCacheViewsEnabled { get; set; } public event System.ComponentModel.PropertyChangedEventHandler? PropertyChanged; public event System.ComponentModel.PropertyChangingEventHandler? PropertyChanging; diff --git a/src/tests/ReactiveUI.WinForms.Tests/API/ApiApprovalTests.Winforms.DotNet8_0.verified.txt b/src/tests/ReactiveUI.WinForms.Tests/API/ApiApprovalTests.Winforms.DotNet8_0.verified.txt index 02edf5bce0..2c8860fbd1 100644 --- a/src/tests/ReactiveUI.WinForms.Tests/API/ApiApprovalTests.Winforms.DotNet8_0.verified.txt +++ b/src/tests/ReactiveUI.WinForms.Tests/API/ApiApprovalTests.Winforms.DotNet8_0.verified.txt @@ -74,17 +74,17 @@ namespace ReactiveUI.Winforms public RoutedControlHost() { } [System.ComponentModel.Category("ReactiveUI")] [System.ComponentModel.Description("The default control when no viewmodel is specified")] - [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)] + [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)] public System.Windows.Forms.Control? DefaultContent { get; set; } [System.ComponentModel.Category("ReactiveUI")] [System.ComponentModel.Description("The router.")] - [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)] + [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)] public ReactiveUI.RoutingState? Router { get; set; } [System.ComponentModel.Browsable(false)] - [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)] + [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)] public System.IObservable? ViewContractObservable { get; set; } [System.ComponentModel.Browsable(false)] - [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)] + [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)] public ReactiveUI.IViewLocator? ViewLocator { get; set; } public event System.ComponentModel.PropertyChangedEventHandler? PropertyChanged; public event System.ComponentModel.PropertyChangingEventHandler? PropertyChanging; @@ -112,25 +112,24 @@ namespace ReactiveUI.Winforms [System.ComponentModel.Bindable(true)] [System.ComponentModel.Category("ReactiveUI")] [System.ComponentModel.Description("The Current View")] - [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)] + [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)] public object? Content { get; protected set; } public System.Windows.Forms.Control? CurrentView { get; } [System.ComponentModel.Category("ReactiveUI")] [System.ComponentModel.Description("The default control when no viewmodel is specified")] - [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)] + [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)] public System.Windows.Forms.Control? DefaultContent { get; set; } [System.ComponentModel.Browsable(false)] - [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)] + [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)] public System.IObservable? ViewContractObservable { get; set; } [System.ComponentModel.Browsable(false)] - [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)] + [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)] public ReactiveUI.IViewLocator? ViewLocator { get; set; } [System.ComponentModel.Bindable(true)] [System.ComponentModel.Category("ReactiveUI")] [System.ComponentModel.Description("The viewmodel to host.")] - [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)] + [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)] public object? ViewModel { get; set; } - [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)] public static bool DefaultCacheViewsEnabled { get; set; } public event System.ComponentModel.PropertyChangedEventHandler? PropertyChanged; public event System.ComponentModel.PropertyChangingEventHandler? PropertyChanging; diff --git a/src/tests/ReactiveUI.WinForms.Tests/API/ApiApprovalTests.Winforms.DotNet9_0.verified.txt b/src/tests/ReactiveUI.WinForms.Tests/API/ApiApprovalTests.Winforms.DotNet9_0.verified.txt index 02edf5bce0..2c8860fbd1 100644 --- a/src/tests/ReactiveUI.WinForms.Tests/API/ApiApprovalTests.Winforms.DotNet9_0.verified.txt +++ b/src/tests/ReactiveUI.WinForms.Tests/API/ApiApprovalTests.Winforms.DotNet9_0.verified.txt @@ -74,17 +74,17 @@ namespace ReactiveUI.Winforms public RoutedControlHost() { } [System.ComponentModel.Category("ReactiveUI")] [System.ComponentModel.Description("The default control when no viewmodel is specified")] - [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)] + [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)] public System.Windows.Forms.Control? DefaultContent { get; set; } [System.ComponentModel.Category("ReactiveUI")] [System.ComponentModel.Description("The router.")] - [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)] + [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)] public ReactiveUI.RoutingState? Router { get; set; } [System.ComponentModel.Browsable(false)] - [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)] + [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)] public System.IObservable? ViewContractObservable { get; set; } [System.ComponentModel.Browsable(false)] - [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)] + [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)] public ReactiveUI.IViewLocator? ViewLocator { get; set; } public event System.ComponentModel.PropertyChangedEventHandler? PropertyChanged; public event System.ComponentModel.PropertyChangingEventHandler? PropertyChanging; @@ -112,25 +112,24 @@ namespace ReactiveUI.Winforms [System.ComponentModel.Bindable(true)] [System.ComponentModel.Category("ReactiveUI")] [System.ComponentModel.Description("The Current View")] - [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)] + [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)] public object? Content { get; protected set; } public System.Windows.Forms.Control? CurrentView { get; } [System.ComponentModel.Category("ReactiveUI")] [System.ComponentModel.Description("The default control when no viewmodel is specified")] - [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)] + [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)] public System.Windows.Forms.Control? DefaultContent { get; set; } [System.ComponentModel.Browsable(false)] - [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)] + [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)] public System.IObservable? ViewContractObservable { get; set; } [System.ComponentModel.Browsable(false)] - [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)] + [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)] public ReactiveUI.IViewLocator? ViewLocator { get; set; } [System.ComponentModel.Bindable(true)] [System.ComponentModel.Category("ReactiveUI")] [System.ComponentModel.Description("The viewmodel to host.")] - [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)] + [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)] public object? ViewModel { get; set; } - [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Content)] public static bool DefaultCacheViewsEnabled { get; set; } public event System.ComponentModel.PropertyChangedEventHandler? PropertyChanged; public event System.ComponentModel.PropertyChangingEventHandler? PropertyChanging;