feature: .net 5 and C# 9, tvos (#294)

.editorconfig

@@ -29,9 +29,13 @@ csharp_new_line_between_query_expression_clauses = true
 csharp_indent_block_contents = true
 csharp_indent_braces = false
 csharp_indent_case_contents = true
+csharp_indent_case_contents_when_block = true
 csharp_indent_switch_labels = true
 csharp_indent_labels = one_less_than_current
 
+# Modifier preferences
+csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:suggestion
+
 # avoid this. unless absolutely necessary
 dotnet_style_qualification_for_field = false:suggestion
 dotnet_style_qualification_for_property = false:suggestion
@@ -40,59 +44,80 @@ dotnet_style_qualification_for_event = false:suggestion
 
 # only use var when it's obvious what the variable type is
 csharp_style_var_for_built_in_types = false:none
-csharp_style_var_when_type_is_apparent = false:suggestion
-csharp_style_var_elsewhere = false:suggestion
+csharp_style_var_when_type_is_apparent = true:suggestion
+csharp_style_var_elsewhere = true:suggestion
 
-# use language keywords instead of BCL types
+# Types: use keywords instead of BCL types, and permit var only when the type is clear
+csharp_style_var_for_built_in_types = false:suggestion
+csharp_style_var_when_type_is_apparent = false:none
+csharp_style_var_elsewhere = false:suggestion
 dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
 dotnet_style_predefined_type_for_member_access = true:suggestion
 
 # name all constant fields using PascalCase
 dotnet_naming_rule.constant_fields_should_be_pascal_case.severity = suggestion
 dotnet_naming_rule.constant_fields_should_be_pascal_case.symbols  = constant_fields
 dotnet_naming_rule.constant_fields_should_be_pascal_case.style    = pascal_case_style
-
 dotnet_naming_symbols.constant_fields.applicable_kinds   = field
 dotnet_naming_symbols.constant_fields.required_modifiers = const
-
 dotnet_naming_style.pascal_case_style.capitalization = pascal_case
 
 # static fields should have s_ prefix
+dotnet_naming_rule.static_fields_should_have_prefix.severity = suggestion
+dotnet_naming_rule.static_fields_should_have_prefix.symbols  = static_fields
+dotnet_naming_rule.static_fields_should_have_prefix.style    = static_prefix_style
 dotnet_naming_symbols.static_fields.applicable_kinds   = field
 dotnet_naming_symbols.static_fields.required_modifiers = static
-
-dotnet_naming_style.static_prefix_style.capitalization = camel_case 
+dotnet_naming_symbols.static_fields.applicable_accessibilities = private, internal, private_protected
+dotnet_naming_style.static_prefix_style.required_prefix = s_
+dotnet_naming_style.static_prefix_style.capitalization = camel_case
 
 # internal and private fields should be _camelCase
 dotnet_naming_rule.camel_case_for_private_internal_fields.severity = suggestion
 dotnet_naming_rule.camel_case_for_private_internal_fields.symbols  = private_internal_fields
 dotnet_naming_rule.camel_case_for_private_internal_fields.style    = camel_case_underscore_style
-
 dotnet_naming_symbols.private_internal_fields.applicable_kinds = field
 dotnet_naming_symbols.private_internal_fields.applicable_accessibilities = private, internal
-
 dotnet_naming_style.camel_case_underscore_style.required_prefix = _
-dotnet_naming_style.camel_case_underscore_style.capitalization = camel_case 
+dotnet_naming_style.camel_case_underscore_style.capitalization = camel_case
 
 # Code style defaults
+csharp_using_directive_placement = outside_namespace:suggestion
 dotnet_sort_system_directives_first = true
-csharp_preserve_single_line_blocks = true
-csharp_preserve_single_line_statements = false
+csharp_prefer_braces = true:silent
+csharp_preserve_single_line_blocks = true:none
+csharp_preserve_single_line_statements = false:none
+csharp_prefer_static_local_function = true:suggestion
+csharp_prefer_simple_using_statement = false:none
+csharp_style_prefer_switch_expression = true:suggestion
+
+# Code quality
+dotnet_style_readonly_field = true:suggestion
+dotnet_code_quality_unused_parameters = non_public:suggestion
 
 # Expression-level preferences
 dotnet_style_object_initializer = true:suggestion
 dotnet_style_collection_initializer = true:suggestion
 dotnet_style_explicit_tuple_names = true:suggestion
 dotnet_style_coalesce_expression = true:suggestion
 dotnet_style_null_propagation = true:suggestion
+dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion
+dotnet_style_prefer_inferred_tuple_names = true:suggestion
+dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
+dotnet_style_prefer_auto_properties = true:suggestion
+dotnet_style_prefer_conditional_expression_over_assignment = true:silent
+dotnet_style_prefer_conditional_expression_over_return = true:silent
+csharp_prefer_simple_default_expression = true:suggestion
 
 # Expression-bodied members
-csharp_style_expression_bodied_methods = false:none
-csharp_style_expression_bodied_constructors = false:none
-csharp_style_expression_bodied_operators = false:none
+csharp_style_expression_bodied_methods = true:suggestion
+csharp_style_expression_bodied_constructors = true:suggestion
+csharp_style_expression_bodied_operators = true:suggestion
 csharp_style_expression_bodied_properties = true:suggestion
-csharp_style_expression_bodied_indexers = true:none
-csharp_style_expression_bodied_accessors = true:none
+csharp_style_expression_bodied_indexers = true:suggestion
+csharp_style_expression_bodied_accessors = true:suggestion
+csharp_style_expression_bodied_lambdas = true:suggestion
+csharp_style_expression_bodied_local_functions = true:suggestion
 
 # Pattern matching
 csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
@@ -103,6 +128,11 @@ csharp_style_inlined_variable_declaration = true:suggestion
 csharp_style_throw_expression = true:suggestion
 csharp_style_conditional_delegate_call = true:suggestion
 
+# Other features
+csharp_style_prefer_index_operator = false:none
+csharp_style_prefer_range_operator = false:none
+csharp_style_pattern_local_over_anonymous_function = false:none
+
 # Space preferences
 csharp_space_after_cast = false
 csharp_space_after_colon_in_inheritance_clause = true
@@ -152,4 +182,4 @@ indent_size = 2
 [*.sh]
 end_of_line = lf
 [*.{cmd, bat}]
-end_of_line = crlf
+end_of_line = crlf

Sample/SextantSample.Android/MainActivity.cs

@@ -1,10 +1,7 @@
 using System;
-using Android;
+
 using Android.App;
 using Android.Content.PM;
-using Android.Runtime;
-using Android.Views;
-using Android.Widget;
 using Android.OS;
 
 namespace SextantSample.Droid
@@ -19,7 +16,7 @@ protected override void OnCreate(Bundle bundle)
 
             base.OnCreate(bundle);
 
-            global::Xamarin.Forms.Forms.Init(this, bundle);
+            Xamarin.Forms.Forms.Init(this, bundle);
             LoadApplication(new App());
         }
     }

Sample/SextantSample.Android/Properties/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="com.giusepe.SextantSample" android:installLocation="auto">
-	<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="28" />
+	<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="29" />
 	<application android:label="SextantSample.Android"></application>
-</manifest>
+</manifest>

Sample/SextantSample.Android/SextantSample.Android.csproj

@@ -15,7 +15,7 @@
     <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
     <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
     <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
-    <TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v10.0</TargetFrameworkVersion>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
   </PropertyGroup>
@@ -74,6 +74,7 @@
     <PackageReference Include="Xamarin.Android.Support.v7.CardView" Version="28.0.0.3" />
     <PackageReference Include="Xamarin.Android.Support.v7.MediaRouter" Version="28.0.0.3" />
     <PackageReference Include="ReactiveUI.XamForms" Version="13.*" />
+    <PackageReference Include="Xamarin.AndroidX.MediaRouter" Version="1.1.0.1" />    
   </ItemGroup>
   <ItemGroup>
     <Compile Include="MainActivity.cs" />
@@ -121,4 +122,4 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
-</Project>
+</Project>

Sample/SextantSample.Avalonia/SextantSample.Avalonia.csproj

@@ -9,6 +9,7 @@
         <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.0-preview6" />
         <PackageReference Include="Citrus.Avalonia" Version="1.3.0-preview" />
         <PackageReference Include="MessageBox.Avalonia" Version="0.10.0-prev2" />
+        <PackageReference Include="ReactiveUI" Version="13.*" />
     </ItemGroup>
     <ItemGroup>
         <Compile Update="**\*.xaml.cs">

Sample/SextantSample.Core/FirstModalNavigationViewModel.cs

@@ -1,5 +1,4 @@
 using System;
-using ReactiveUI;
 using Sextant;
 
 namespace SextantSample.ViewModels

Sample/SextantSample.Core/FirstModalViewModel.cs

@@ -3,7 +3,6 @@
 using Sextant;
 using System;
 using System.Diagnostics;
-using Splat;
 
 namespace SextantSample.ViewModels
 {
@@ -33,9 +32,6 @@ public FirstModalViewModel(IViewStackService viewStackService) : base(viewStackS
         }
 
 
-        public void Destroy()
-        {
-            Debug.WriteLine($"Destroy: {nameof(FirstModalViewModel)}");
-        }
+        public void Destroy() => Debug.WriteLine($"Destroy: {nameof(FirstModalViewModel)}");
     }
 }

Sample/SextantSample.Core/GreenViewModel.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Diagnostics;
 using System.Reactive;
-using System.Reactive.Disposables;
 using System.Reactive.Linq;
 using ReactiveUI;
 using Sextant;
@@ -11,13 +10,11 @@ namespace SextantSample.ViewModels
     public class GreenViewModel : ViewModelBase, INavigable, IDestructible
     {
         public GreenViewModel(IViewStackService viewStackService)
-            : base(viewStackService)
-        {
+            : base(viewStackService) =>
             OpenModal = ReactiveCommand
                 .CreateFromObservable(() =>
                         ViewStackService.PushModal(new FirstModalViewModel(viewStackService), string.Empty, false),
                     outputScheduler: RxApp.MainThreadScheduler);
-        }
 
         public override string Id { get; } = string.Empty;
 
@@ -32,9 +29,6 @@ public IObservable<Unit> WhenNavigatedFrom(INavigationParameter parameter) =>
         public IObservable<Unit> WhenNavigatingTo(INavigationParameter parameter) =>
             Observable.Return(Unit.Default);
 
-        public void Destroy()
-        {
-            Debug.WriteLine($"Destroy: {nameof(GreenViewModel)}");
-        }
+        public void Destroy() => Debug.WriteLine($"Destroy: {nameof(GreenViewModel)}");
     }
 }

Sample/SextantSample.Core/HomeViewModel.cs

@@ -1,7 +1,5 @@
 using System;
-using System.Diagnostics;
 using System.Reactive;
-using System.Reactive.Linq;
 using ReactiveUI;
 using Sextant;
 using Splat;

Sample/SextantSample.Core/Interactions.cs

@@ -1,12 +1,10 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using ReactiveUI;
 
 namespace SextantSample.ViewModels
 {
     public static class Interactions
     {
-        public static Interaction<Exception, bool> ErrorMessage = new Interaction<Exception, bool>();
+        public static readonly Interaction<Exception, bool> ErrorMessage = new Interaction<Exception, bool>();
     }
 }

Sample/SextantSample.Core/RedViewModel.cs

@@ -1,14 +1,12 @@
 using System;
 using System.Diagnostics;
 using System.Reactive;
-using System.Reactive.Linq;
-using System.Windows.Input;
 using ReactiveUI;
 using Sextant;
 
 namespace SextantSample.ViewModels
 {
-    public class RedViewModel : ViewModelBase, IViewModel
+    public class RedViewModel : ViewModelBase
     {
         public ReactiveCommand<Unit, Unit> PopModal { get; set; }
 

Sample/SextantSample.Core/SecondModalNavigationViewModel.cs

@@ -1,6 +1,5 @@
 using System;
 using ReactiveUI;
-using Sextant;
 
 namespace SextantSample.ViewModels
 {

Sample/SextantSample.Core/SecondModalViewModel.cs

@@ -3,7 +3,6 @@
 using System;
 using System.Diagnostics;
 using Sextant;
-using System.Reactive.Linq;
 
 namespace SextantSample.ViewModels
 {
@@ -28,7 +27,7 @@ public SecondModalViewModel(IViewStackService viewStackService) : base(viewStack
                     outputScheduler: RxApp.MainThreadScheduler);
 
             PushPage.Subscribe(x => Debug.WriteLine("PagePushed"));
-            PopModal.Subscribe(x => Debug.WriteLine("PagePoped"));
+            PopModal.Subscribe(x => Debug.WriteLine("PagePopped"));
 
             PushPage.ThrownExceptions.Subscribe(error => Interactions.ErrorMessage.Handle(error).Subscribe());
             PopModal.ThrownExceptions.Subscribe(error => Interactions.ErrorMessage.Handle(error).Subscribe());

Sample/SextantSample.Core/SextantDefaultExceptionHandler.cs

@@ -14,7 +14,7 @@ public void OnNext(Exception ex)
                 Debugger.Break();
             }
 
-            RxApp.MainThreadScheduler.Schedule(() => { throw ex; });
+            RxApp.MainThreadScheduler.Schedule(() => throw ex);
         }
 
         public void OnError(Exception ex)
@@ -23,14 +23,18 @@ public void OnError(Exception ex)
             {
                 Debugger.Break();
             }
-            RxApp.MainThreadScheduler.Schedule(() => { throw ex; });
+
+            RxApp.MainThreadScheduler.Schedule(() => throw ex);
         }
 
         public void OnCompleted()
         {
             if (Debugger.IsAttached)
+            {
                 Debugger.Break();
-            RxApp.MainThreadScheduler.Schedule(() => { throw new NotImplementedException(); });
+            }
+
+            RxApp.MainThreadScheduler.Schedule(() => throw new NotImplementedException());
         }
     }
 }

Sample/SextantSample.Core/SextantSample.ViewModels.csproj

@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ReactiveUI" Version="12.*" />
+    <PackageReference Include="ReactiveUI" Version="13.*" />
   </ItemGroup>
 
   <ItemGroup>

Sample/SextantSample.Core/ViewModelBase.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Reactive;
 using ReactiveUI;
 using Sextant;
 
@@ -9,10 +8,7 @@ public abstract class ViewModelBase : ReactiveObject, IViewModel
     {
         protected readonly IViewStackService ViewStackService;
 
-        protected ViewModelBase(IViewStackService viewStackService)
-        {
-            ViewStackService = viewStackService;
-        }
+        protected ViewModelBase(IViewStackService viewStackService) => ViewStackService = viewStackService;
 
         public virtual string Id { get; }
     }