Skip to content
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.

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

Marking Observable properties from ReactiveObject and ReactiveRecord … #3695

Merged
merged 7 commits into from
Dec 15, 2023
1 change: 1 addition & 0 deletions src/ReactiveUI/GlobalUsings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
global using global::System.Collections.Generic;
global using global::System.Collections.ObjectModel;
global using global::System.ComponentModel;
global using global::System.ComponentModel.DataAnnotations;
global using global::System.Diagnostics.CodeAnalysis;
global using global::System.Linq;
global using global::System.Linq.Expressions;
Expand Down
6 changes: 6 additions & 0 deletions src/ReactiveUI/ReactiveObject/ReactiveObject.cs
Original file line number Diff line number Diff line change
Expand Up @@ -72,16 +72,22 @@
/// <inheritdoc />
[IgnoreDataMember]
[JsonIgnore]
[Browsable(false)]
[Display(Order = -1, AutoGenerateField = false, AutoGenerateFilter = false)]

Check failure on line 76 in src/ReactiveUI/ReactiveObject/ReactiveObject.cs

View workflow job for this annotation

GitHub Actions / build / build

The type or namespace name 'DisplayAttribute' could not be found (are you missing a using directive or an assembly reference?)

Check failure on line 76 in src/ReactiveUI/ReactiveObject/ReactiveObject.cs

View workflow job for this annotation

GitHub Actions / build / build

The type or namespace name 'Display' could not be found (are you missing a using directive or an assembly reference?)
public IObservable<IReactivePropertyChangedEventArgs<IReactiveObject>> Changing => _changing.Value;

/// <inheritdoc />
[IgnoreDataMember]
[JsonIgnore]
[Browsable(false)]
[Display(Order = -1, AutoGenerateField = false, AutoGenerateFilter = false)]

Check failure on line 83 in src/ReactiveUI/ReactiveObject/ReactiveObject.cs

View workflow job for this annotation

GitHub Actions / build / build

The type or namespace name 'DisplayAttribute' could not be found (are you missing a using directive or an assembly reference?)

Check failure on line 83 in src/ReactiveUI/ReactiveObject/ReactiveObject.cs

View workflow job for this annotation

GitHub Actions / build / build

The type or namespace name 'Display' could not be found (are you missing a using directive or an assembly reference?)
public IObservable<IReactivePropertyChangedEventArgs<IReactiveObject>> Changed => _changed.Value;

/// <inheritdoc/>
[IgnoreDataMember]
[JsonIgnore]
[Browsable(false)]
[Display(Order = -1, AutoGenerateField = false, AutoGenerateFilter = false)]

Check failure on line 90 in src/ReactiveUI/ReactiveObject/ReactiveObject.cs

View workflow job for this annotation

GitHub Actions / build / build

The type or namespace name 'DisplayAttribute' could not be found (are you missing a using directive or an assembly reference?)

Check failure on line 90 in src/ReactiveUI/ReactiveObject/ReactiveObject.cs

View workflow job for this annotation

GitHub Actions / build / build

The type or namespace name 'Display' could not be found (are you missing a using directive or an assembly reference?)
public IObservable<Exception> ThrownExceptions => _thrownExceptions.Value;

/// <inheritdoc/>
Expand Down
6 changes: 6 additions & 0 deletions src/ReactiveUI/ReactiveObject/ReactiveRecord.cs
Original file line number Diff line number Diff line change
Expand Up @@ -72,18 +72,24 @@
/// <inheritdoc />
[IgnoreDataMember]
[JsonIgnore]
[Browsable(false)]
[Display(Order = -1, AutoGenerateField = false, AutoGenerateFilter = false)]

Check failure on line 76 in src/ReactiveUI/ReactiveObject/ReactiveRecord.cs

View workflow job for this annotation

GitHub Actions / build / build

The type or namespace name 'DisplayAttribute' could not be found (are you missing a using directive or an assembly reference?)

Check failure on line 76 in src/ReactiveUI/ReactiveObject/ReactiveRecord.cs

View workflow job for this annotation

GitHub Actions / build / build

The type or namespace name 'Display' could not be found (are you missing a using directive or an assembly reference?)
public IObservable<IReactivePropertyChangedEventArgs<IReactiveObject>> Changing => // TODO: Create Test
_changing.Value;

/// <inheritdoc />
[IgnoreDataMember]
[JsonIgnore]
[Browsable(false)]
[Display(Order = -1, AutoGenerateField = false, AutoGenerateFilter = false)]

Check failure on line 84 in src/ReactiveUI/ReactiveObject/ReactiveRecord.cs

View workflow job for this annotation

GitHub Actions / build / build

The type or namespace name 'DisplayAttribute' could not be found (are you missing a using directive or an assembly reference?)

Check failure on line 84 in src/ReactiveUI/ReactiveObject/ReactiveRecord.cs

View workflow job for this annotation

GitHub Actions / build / build

The type or namespace name 'Display' could not be found (are you missing a using directive or an assembly reference?)
public IObservable<IReactivePropertyChangedEventArgs<IReactiveObject>> Changed => // TODO: Create Test
_changed.Value;

/// <inheritdoc/>
[IgnoreDataMember]
[JsonIgnore]
[Browsable(false)]
[Display(Order = -1, AutoGenerateField = false, AutoGenerateFilter = false)]
public IObservable<Exception> ThrownExceptions => _thrownExceptions.Value;

/// <inheritdoc/>
Expand Down
1 change: 1 addition & 0 deletions src/ReactiveUI/ReactiveUI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
<Compile Include="Platforms\netstandard2.0\**\*.cs" />
<Compile Include="Platforms\shared\**\*.cs" />
<PackageReference Include="System.ComponentModel" Version="4.3.0" />
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
<PackageReference Include="System.Diagnostics.Contracts" Version="4.3.0" />
<PackageReference Include="System.Dynamic.Runtime" Version="4.3.0" />
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
Expand Down