diff --git a/src/Avalonia.Base/Data/BindingValue.cs b/src/Avalonia.Base/Data/BindingValue.cs index 414baf88fc..0e7bdfe0bf 100644 --- a/src/Avalonia.Base/Data/BindingValue.cs +++ b/src/Avalonia.Base/Data/BindingValue.cs @@ -247,9 +247,7 @@ namespace Avalonia.Data UnsetValueType _ => Unset, DoNothingType _ => DoNothing, BindingNotification n => n.ToBindingValue().Cast(), -#pragma warning disable CS8600 // Converting null literal or possible null value to non-nullable type. - _ => new BindingValue((T)value) -#pragma warning restore CS8600 // Converting null literal or possible null value to non-nullable type. + _ => new BindingValue((T)value!) }; } diff --git a/src/Avalonia.Styling/Styling/Setter.cs b/src/Avalonia.Styling/Styling/Setter.cs index 9e8969c164..168a882499 100644 --- a/src/Avalonia.Styling/Styling/Setter.cs +++ b/src/Avalonia.Styling/Styling/Setter.cs @@ -101,11 +101,7 @@ namespace Avalonia.Styling data.result = new PropertySetterInstance( data.target, property, -#pragma warning disable CS8600 // Converting null literal or possible null value to non-nullable type. -#pragma warning disable CS8604 // Possible null reference argument. - (T)data.value); -#pragma warning restore CS8604 // Possible null reference argument. -#pragma warning restore CS8600 // Converting null literal or possible null value to non-nullable type. + (T)data.value!); } } @@ -132,11 +128,7 @@ namespace Avalonia.Styling data.result = new PropertySetterInstance( data.target, property, -#pragma warning disable CS8600 // Converting null literal or possible null value to non-nullable type. -#pragma warning disable CS8604 // Possible null reference argument. - (T)data.value); -#pragma warning restore CS8604 // Possible null reference argument. -#pragma warning restore CS8600 // Converting null literal or possible null value to non-nullable type. + (T)data.value!); } }