Lower C# version requirement to 8 for all generators

Sergio0694 · Sergio0694 · commit 13a9149eee9f · 2021-12-29T18:31:11.000+01:00
diff --git a/CommunityToolkit.Mvvm.SourceGenerators/ComponentModel/ObservablePropertyGenerator.cs b/CommunityToolkit.Mvvm.SourceGenerators/ComponentModel/ObservablePropertyGenerator.cs
@@ -33,7 +33,7 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
         // This ensures that users not using any of the source generators won't be broken when upgrading to this new version.
         IncrementalValueProvider<bool> isGeneratorSupported =
             context.ParseOptionsProvider
-            .Select(static (item, _) => item is CSharpParseOptions { LanguageVersion: >= LanguageVersion.CSharp9 });
+            .Select(static (item, _) => item is CSharpParseOptions { LanguageVersion: >= LanguageVersion.CSharp8 });
 
         // Emit the diagnostic, if needed
         context.ReportDiagnosticsIsNotSupported(isGeneratorSupported, Diagnostic.Create(UnsupportedCSharpLanguageVersionError, null));
diff --git a/CommunityToolkit.Mvvm.SourceGenerators/ComponentModel/TransitiveMembersGenerator.cs b/CommunityToolkit.Mvvm.SourceGenerators/ComponentModel/TransitiveMembersGenerator.cs
@@ -76,7 +76,7 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
         // Validate the language version
         IncrementalValueProvider<bool> isGeneratorSupported =
             context.ParseOptionsProvider
-            .Select(static (item, _) => item is CSharpParseOptions { LanguageVersion: >= LanguageVersion.CSharp9 });
+            .Select(static (item, _) => item is CSharpParseOptions { LanguageVersion: >= LanguageVersion.CSharp8 });
 
         // Get all class declarations
         IncrementalValuesProvider<INamedTypeSymbol> typeSymbols =
diff --git a/CommunityToolkit.Mvvm.SourceGenerators/EmbeddedResources/INotifyPropertyChanged.cs b/CommunityToolkit.Mvvm.SourceGenerators/EmbeddedResources/INotifyPropertyChanged.cs
@@ -272,7 +272,7 @@ protected bool SetProperty<TModel, T>(T oldValue, T newValue, global::System.Col
     /// </remarks>
     protected bool SetPropertyAndNotifyOnCompletion([global::System.Diagnostics.CodeAnalysis.NotNull] ref TaskNotifier? taskNotifier, global::System.Threading.Tasks.Task? newValue, [global::System.Runtime.CompilerServices.CallerMemberName] string? propertyName = null)
     {
-        return SetPropertyAndNotifyOnCompletion(taskNotifier ??= new TaskNotifier(), newValue, static _ => { }, propertyName);
+        return SetPropertyAndNotifyOnCompletion(taskNotifier ??= new TaskNotifier(), newValue, null, propertyName);
     }
 
     /// <summary>
@@ -330,7 +330,7 @@ protected bool SetPropertyAndNotifyOnCompletion([global::System.Diagnostics.Code
     /// </remarks>
     protected bool SetPropertyAndNotifyOnCompletion<T>([global::System.Diagnostics.CodeAnalysis.NotNull] ref TaskNotifier<T>? taskNotifier, global::System.Threading.Tasks.Task<T>? newValue, [global::System.Runtime.CompilerServices.CallerMemberName] string? propertyName = null)
     {
-        return SetPropertyAndNotifyOnCompletion(taskNotifier ??= new TaskNotifier<T>(), newValue, static _ => { }, propertyName);
+        return SetPropertyAndNotifyOnCompletion(taskNotifier ??= new TaskNotifier<T>(), newValue, null, propertyName);
     }
 
     /// <summary>
@@ -360,10 +360,10 @@ protected bool SetPropertyAndNotifyOnCompletion<T>([global::System.Diagnostics.C
     /// <typeparam name="TTask">The type of <see cref="global::System.Threading.Tasks.Task"/> to set and monitor.</typeparam>
     /// <param name="taskNotifier">The field notifier.</param>
     /// <param name="newValue">The property's value after the change occurred.</param>
-    /// <param name="callback">A callback to invoke to update the property value.</param>
+    /// <param name="callback">(optional) A callback to invoke to update the property value.</param>
     /// <param name="propertyName">(optional) The name of the property that changed.</param>
     /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
-    private bool SetPropertyAndNotifyOnCompletion<TTask>(ITaskNotifier<TTask> taskNotifier, TTask? newValue, global::System.Action<TTask?> callback, [global::System.Runtime.CompilerServices.CallerMemberName] string? propertyName = null)
+    private bool SetPropertyAndNotifyOnCompletion<TTask>(ITaskNotifier<TTask> taskNotifier, TTask? newValue, global::System.Action<TTask?>? callback, [global::System.Runtime.CompilerServices.CallerMemberName] string? propertyName = null)
         where TTask : global::System.Threading.Tasks.Task
     {
         if (ReferenceEquals(taskNotifier.Task, newValue))
@@ -379,7 +379,10 @@ private bool SetPropertyAndNotifyOnCompletion<TTask>(ITaskNotifier<TTask> taskNo
 
         if (isAlreadyCompletedOrNull)
         {
-            callback(newValue);
+            if (callback != null)
+            {
+                callback(newValue);
+            }
 
             return true;
         }
@@ -399,7 +402,10 @@ async void MonitorTask()
                 OnPropertyChanged(propertyName);
             }
 
-            callback(newValue);
+            if (callback != null)
+            {
+                callback(newValue);
+            }
         }
 
         MonitorTask();
diff --git a/CommunityToolkit.Mvvm.SourceGenerators/EmbeddedResources/ObservableObject.cs b/CommunityToolkit.Mvvm.SourceGenerators/EmbeddedResources/ObservableObject.cs
@@ -313,7 +313,7 @@ protected bool SetProperty<TModel, T>(T oldValue, T newValue, global::System.Col
     /// </remarks>
     protected bool SetPropertyAndNotifyOnCompletion([global::System.Diagnostics.CodeAnalysis.NotNull] ref TaskNotifier? taskNotifier, global::System.Threading.Tasks.Task? newValue, [global::System.Runtime.CompilerServices.CallerMemberName] string? propertyName = null)
     {
-        return SetPropertyAndNotifyOnCompletion(taskNotifier ??= new TaskNotifier(), newValue, static _ => { }, propertyName);
+        return SetPropertyAndNotifyOnCompletion(taskNotifier ??= new TaskNotifier(), newValue, null, propertyName);
     }
 
     /// <summary>
@@ -374,7 +374,7 @@ protected bool SetPropertyAndNotifyOnCompletion([global::System.Diagnostics.Code
     /// </remarks>
     protected bool SetPropertyAndNotifyOnCompletion<T>([global::System.Diagnostics.CodeAnalysis.NotNull] ref TaskNotifier<T>? taskNotifier, global::System.Threading.Tasks.Task<T>? newValue, [global::System.Runtime.CompilerServices.CallerMemberName] string? propertyName = null)
     {
-        return SetPropertyAndNotifyOnCompletion(taskNotifier ??= new TaskNotifier<T>(), newValue, static _ => { }, propertyName);
+        return SetPropertyAndNotifyOnCompletion(taskNotifier ??= new TaskNotifier<T>(), newValue, null, propertyName);
     }
 
     /// <summary>
@@ -406,10 +406,10 @@ protected bool SetPropertyAndNotifyOnCompletion<T>([global::System.Diagnostics.C
     /// <typeparam name="TTask">The type of <see cref="global::System.Threading.Tasks.Task"/> to set and monitor.</typeparam>
     /// <param name="taskNotifier">The field notifier.</param>
     /// <param name="newValue">The property's value after the change occurred.</param>
-    /// <param name="callback">A callback to invoke to update the property value.</param>
+    /// <param name="callback">(optional) A callback to invoke to update the property value.</param>
     /// <param name="propertyName">(optional) The name of the property that changed.</param>
     /// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>
-    private bool SetPropertyAndNotifyOnCompletion<TTask>(ITaskNotifier<TTask> taskNotifier, TTask? newValue, global::System.Action<TTask?> callback, [global::System.Runtime.CompilerServices.CallerMemberName] string? propertyName = null)
+    private bool SetPropertyAndNotifyOnCompletion<TTask>(ITaskNotifier<TTask> taskNotifier, TTask? newValue, global::System.Action<TTask?>? callback, [global::System.Runtime.CompilerServices.CallerMemberName] string? propertyName = null)
         where TTask : global::System.Threading.Tasks.Task
     {
         if (ReferenceEquals(taskNotifier.Task, newValue))
@@ -427,7 +427,10 @@ private bool SetPropertyAndNotifyOnCompletion<TTask>(ITaskNotifier<TTask> taskNo
 
         if (isAlreadyCompletedOrNull)
         {
-            callback(newValue);
+            if (callback != null)
+            {
+                callback(newValue);
+            }
 
             return true;
         }
@@ -447,7 +450,10 @@ async void MonitorTask()
                 OnPropertyChanged(propertyName);
             }
 
-            callback(newValue);
+            if (callback != null)
+            {
+                callback(newValue);
+            }
         }
 
         MonitorTask();
diff --git a/CommunityToolkit.Mvvm.SourceGenerators/EmbeddedResources/ObservableRecipient.cs b/CommunityToolkit.Mvvm.SourceGenerators/EmbeddedResources/ObservableRecipient.cs
@@ -103,7 +103,7 @@ protected virtual void OnDeactivated()
     /// </remarks>
     protected virtual void Broadcast<T>(T oldValue, T newValue, string? propertyName)
     {
-        global::CommunityToolkit.Mvvm.Messaging.Messages.PropertyChangedMessage<T> message = new(this, propertyName, oldValue, newValue);
+        var message = new global::CommunityToolkit.Mvvm.Messaging.Messages.PropertyChangedMessage<T>(this, propertyName, oldValue, newValue);
 
         _ = global::CommunityToolkit.Mvvm.Messaging.IMessengerExtensions.Send(Messenger, message);
     }
diff --git a/CommunityToolkit.Mvvm.SourceGenerators/Input/ICommandGenerator.cs b/CommunityToolkit.Mvvm.SourceGenerators/Input/ICommandGenerator.cs
@@ -29,7 +29,7 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
         // Validate the language version
         IncrementalValueProvider<bool> isGeneratorSupported =
             context.ParseOptionsProvider
-            .Select(static (item, _) => item is CSharpParseOptions { LanguageVersion: >= LanguageVersion.CSharp9 });
+            .Select(static (item, _) => item is CSharpParseOptions { LanguageVersion: >= LanguageVersion.CSharp8 });
 
         // Emit the diagnostic, if needed
         context.ReportDiagnosticsIsNotSupported(isGeneratorSupported, Diagnostic.Create(UnsupportedCSharpLanguageVersionError, null));

Original file line number	Diff line number	Diff line change
`@@ -272,7 +272,7 @@ protected bool SetProperty<TModel, T>(T oldValue, T newValue, global::System.Col`
`272`	`272`	`/// </remarks>`
`273`	`273`	`protected bool SetPropertyAndNotifyOnCompletion([global::System.Diagnostics.CodeAnalysis.NotNull] ref TaskNotifier? taskNotifier, global::System.Threading.Tasks.Task? newValue, [global::System.Runtime.CompilerServices.CallerMemberName] string? propertyName = null)`
`274`	`274`	`{`
`275`		`- return SetPropertyAndNotifyOnCompletion(taskNotifier ??= new TaskNotifier(), newValue, static _ => { }, propertyName);`
	`275`	`+ return SetPropertyAndNotifyOnCompletion(taskNotifier ??= new TaskNotifier(), newValue, null, propertyName);`
`276`	`276`	`}`
`277`	`277`
`278`	`278`	`/// <summary>`
`@@ -330,7 +330,7 @@ protected bool SetPropertyAndNotifyOnCompletion([global::System.Diagnostics.Code`
`330`	`330`	`/// </remarks>`
`331`	`331`	`protected bool SetPropertyAndNotifyOnCompletion<T>([global::System.Diagnostics.CodeAnalysis.NotNull] ref TaskNotifier<T>? taskNotifier, global::System.Threading.Tasks.Task<T>? newValue, [global::System.Runtime.CompilerServices.CallerMemberName] string? propertyName = null)`
`332`	`332`	`{`
`333`		`- return SetPropertyAndNotifyOnCompletion(taskNotifier ??= new TaskNotifier<T>(), newValue, static _ => { }, propertyName);`
	`333`	`+ return SetPropertyAndNotifyOnCompletion(taskNotifier ??= new TaskNotifier<T>(), newValue, null, propertyName);`
`334`	`334`	`}`
`335`	`335`
`336`	`336`	`/// <summary>`
`@@ -360,10 +360,10 @@ protected bool SetPropertyAndNotifyOnCompletion<T>([global::System.Diagnostics.C`
`360`	`360`	`/// <typeparam name="TTask">The type of <see cref="global::System.Threading.Tasks.Task"/> to set and monitor.</typeparam>`
`361`	`361`	`/// <param name="taskNotifier">The field notifier.</param>`
`362`	`362`	`/// <param name="newValue">The property's value after the change occurred.</param>`
`363`		`- /// <param name="callback">A callback to invoke to update the property value.</param>`
	`363`	`+ /// <param name="callback">(optional) A callback to invoke to update the property value.</param>`
`364`	`364`	`/// <param name="propertyName">(optional) The name of the property that changed.</param>`
`365`	`365`	`/// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>`
`366`		`- private bool SetPropertyAndNotifyOnCompletion<TTask>(ITaskNotifier<TTask> taskNotifier, TTask? newValue, global::System.Action<TTask?> callback, [global::System.Runtime.CompilerServices.CallerMemberName] string? propertyName = null)`
	`366`	`+ private bool SetPropertyAndNotifyOnCompletion<TTask>(ITaskNotifier<TTask> taskNotifier, TTask? newValue, global::System.Action<TTask?>? callback, [global::System.Runtime.CompilerServices.CallerMemberName] string? propertyName = null)`
`367`	`367`	`where TTask : global::System.Threading.Tasks.Task`
`368`	`368`	`{`
`369`	`369`	`if (ReferenceEquals(taskNotifier.Task, newValue))`
`@@ -379,7 +379,10 @@ private bool SetPropertyAndNotifyOnCompletion<TTask>(ITaskNotifier<TTask> taskNo`
`379`	`379`
`380`	`380`	`if (isAlreadyCompletedOrNull)`
`381`	`381`	`{`
`382`		`- callback(newValue);`
	`382`	`+ if (callback != null)`
	`383`	`+ {`
	`384`	`+ callback(newValue);`
	`385`	`+ }`
`383`	`386`
`384`	`387`	`return true;`
`385`	`388`	`}`
`@@ -399,7 +402,10 @@ async void MonitorTask()`
`399`	`402`	`OnPropertyChanged(propertyName);`
`400`	`403`	`}`
`401`	`404`
`402`		`- callback(newValue);`
	`405`	`+ if (callback != null)`
	`406`	`+ {`
	`407`	`+ callback(newValue);`
	`408`	`+ }`
`403`	`409`	`}`
`404`	`410`
`405`	`411`	`MonitorTask();`
Original file line number	Diff line number	Diff line change
`@@ -313,7 +313,7 @@ protected bool SetProperty<TModel, T>(T oldValue, T newValue, global::System.Col`
`313`	`313`	`/// </remarks>`
`314`	`314`	`protected bool SetPropertyAndNotifyOnCompletion([global::System.Diagnostics.CodeAnalysis.NotNull] ref TaskNotifier? taskNotifier, global::System.Threading.Tasks.Task? newValue, [global::System.Runtime.CompilerServices.CallerMemberName] string? propertyName = null)`
`315`	`315`	`{`
`316`		`- return SetPropertyAndNotifyOnCompletion(taskNotifier ??= new TaskNotifier(), newValue, static _ => { }, propertyName);`
	`316`	`+ return SetPropertyAndNotifyOnCompletion(taskNotifier ??= new TaskNotifier(), newValue, null, propertyName);`
`317`	`317`	`}`
`318`	`318`
`319`	`319`	`/// <summary>`
`@@ -374,7 +374,7 @@ protected bool SetPropertyAndNotifyOnCompletion([global::System.Diagnostics.Code`
`374`	`374`	`/// </remarks>`
`375`	`375`	`protected bool SetPropertyAndNotifyOnCompletion<T>([global::System.Diagnostics.CodeAnalysis.NotNull] ref TaskNotifier<T>? taskNotifier, global::System.Threading.Tasks.Task<T>? newValue, [global::System.Runtime.CompilerServices.CallerMemberName] string? propertyName = null)`
`376`	`376`	`{`
`377`		`- return SetPropertyAndNotifyOnCompletion(taskNotifier ??= new TaskNotifier<T>(), newValue, static _ => { }, propertyName);`
	`377`	`+ return SetPropertyAndNotifyOnCompletion(taskNotifier ??= new TaskNotifier<T>(), newValue, null, propertyName);`
`378`	`378`	`}`
`379`	`379`
`380`	`380`	`/// <summary>`
`@@ -406,10 +406,10 @@ protected bool SetPropertyAndNotifyOnCompletion<T>([global::System.Diagnostics.C`
`406`	`406`	`/// <typeparam name="TTask">The type of <see cref="global::System.Threading.Tasks.Task"/> to set and monitor.</typeparam>`
`407`	`407`	`/// <param name="taskNotifier">The field notifier.</param>`
`408`	`408`	`/// <param name="newValue">The property's value after the change occurred.</param>`
`409`		`- /// <param name="callback">A callback to invoke to update the property value.</param>`
	`409`	`+ /// <param name="callback">(optional) A callback to invoke to update the property value.</param>`
`410`	`410`	`/// <param name="propertyName">(optional) The name of the property that changed.</param>`
`411`	`411`	`/// <returns><see langword="true"/> if the property was changed, <see langword="false"/> otherwise.</returns>`
`412`		`- private bool SetPropertyAndNotifyOnCompletion<TTask>(ITaskNotifier<TTask> taskNotifier, TTask? newValue, global::System.Action<TTask?> callback, [global::System.Runtime.CompilerServices.CallerMemberName] string? propertyName = null)`
	`412`	`+ private bool SetPropertyAndNotifyOnCompletion<TTask>(ITaskNotifier<TTask> taskNotifier, TTask? newValue, global::System.Action<TTask?>? callback, [global::System.Runtime.CompilerServices.CallerMemberName] string? propertyName = null)`
`413`	`413`	`where TTask : global::System.Threading.Tasks.Task`
`414`	`414`	`{`
`415`	`415`	`if (ReferenceEquals(taskNotifier.Task, newValue))`
`@@ -427,7 +427,10 @@ private bool SetPropertyAndNotifyOnCompletion<TTask>(ITaskNotifier<TTask> taskNo`
`427`	`427`
`428`	`428`	`if (isAlreadyCompletedOrNull)`
`429`	`429`	`{`
`430`		`- callback(newValue);`
	`430`	`+ if (callback != null)`
	`431`	`+ {`
	`432`	`+ callback(newValue);`
	`433`	`+ }`
`431`	`434`
`432`	`435`	`return true;`
`433`	`436`	`}`
`@@ -447,7 +450,10 @@ async void MonitorTask()`
`447`	`450`	`OnPropertyChanged(propertyName);`
`448`	`451`	`}`
`449`	`452`
`450`		`- callback(newValue);`
	`453`	`+ if (callback != null)`
	`454`	`+ {`
	`455`	`+ callback(newValue);`
	`456`	`+ }`
`451`	`457`	`}`
`452`	`458`
`453`	`459`	`MonitorTask();`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ protected virtual void OnDeactivated()`
`103`	`103`	`/// </remarks>`
`104`	`104`	`protected virtual void Broadcast<T>(T oldValue, T newValue, string? propertyName)`
`105`	`105`	`{`
`106`		`- global::CommunityToolkit.Mvvm.Messaging.Messages.PropertyChangedMessage<T> message = new(this, propertyName, oldValue, newValue);`
	`106`	`+ var message = new global::CommunityToolkit.Mvvm.Messaging.Messages.PropertyChangedMessage<T>(this, propertyName, oldValue, newValue);`
`107`	`107`
`108`	`108`	`_ = global::CommunityToolkit.Mvvm.Messaging.IMessengerExtensions.Send(Messenger, message);`
`109`	`109`	`}`