@@ -149,9 +149,9 @@ namespace N
149149{
150150 using System.ComponentModel;
151151
152- public class KaxamlInfo
152+ public class C
153153 {
154- public static event PropertyChangedEventHandler PropertyChanged;
154+ public static event PropertyChangedEventHandler? PropertyChanged;
155155 }
156156}" ;
157157
@@ -189,7 +189,7 @@ public void Reset()
189189 Current = null;
190190 }
191191
192- public object Current { get; private set; }
192+ public object? Current { get; private set; }
193193 }
194194}" ;
195195 RoslynAssert . Valid ( Analyzer , code ) ;
@@ -276,7 +276,9 @@ namespace N
276276
277277 public class C
278278 {
279- public event EventHandler E;
279+ public event EventHandler? E;
280+
281+ private void M() => this.E?.Invoke(this, EventArgs.Empty);
280282 }
281283}" ;
282284 RoslynAssert . Valid ( Analyzer , code ) ;
@@ -350,7 +352,7 @@ namespace N
350352 [AttributeUsage(AttributeTargets.Class)]
351353 public class TestAttribute : Attribute
352354 {
353- public string Name { get; set; }
355+ public string? Name { get; set; }
354356 }
355357}" ;
356358 RoslynAssert . Valid ( Analyzer , code ) ;
@@ -370,16 +372,16 @@ namespace N
370372 [SuppressMessage(""ReSharper"", ""MemberCanBePrivate.Global"", Justification = ""Used from xaml"")]
371373 public class DialogButtonTemplateSelector : DataTemplateSelector
372374 {
373- public DataTemplate OKTemplate { get; set; }
375+ public DataTemplate? OKTemplate { get; set; }
374376
375- public DataTemplate CancelTemplate { get; set; }
377+ public DataTemplate? CancelTemplate { get; set; }
376378
377- public DataTemplate YesTemplate { get; set; }
379+ public DataTemplate? YesTemplate { get; set; }
378380
379- public DataTemplate NoTemplate { get; set; }
381+ public DataTemplate? NoTemplate { get; set; }
380382
381383 /// <inheritdoc />
382- public override DataTemplate SelectTemplate(object item, DependencyObject container)
384+ public override DataTemplate? SelectTemplate(object item, DependencyObject container)
383385 {
384386 var result = item as MessageBoxResult?;
385387 if (!result.HasValue)
@@ -412,7 +414,6 @@ public override DataTemplate SelectTemplate(object item, DependencyObject contai
412414 [ Test ]
413415 public static void WhenBaseHasPropertyChangedEventButNoInterface ( )
414416 {
415- //// ReSharper disable once HeuristicUnreachableCode
416417 var code = @"
417418namespace N
418419{
@@ -441,7 +442,7 @@ namespace N
441442 [DataContract]
442443 public class C : INotifyPropertyChanged
443444 {
444- public event PropertyChangedEventHandler PropertyChanged;
445+ public event PropertyChangedEventHandler? PropertyChanged;
445446
446447 public C(int p)
447448 {
@@ -451,7 +452,7 @@ public C(int p)
451452 [DataMember]
452453 public int P { get; private set; }
453454
454- protected virtual void OnPropertyChanged([System.Runtime.CompilerServices.CallerMemberName] string propertyName = null)
455+ protected virtual void OnPropertyChanged([System.Runtime.CompilerServices.CallerMemberName] string? propertyName = null)
455456 {
456457 this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
457458 }
0 commit comments