diff --git a/.editorconfig b/.editorconfig
index 1ea2ffe..56c91c6 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -25,10 +25,10 @@ indent_size = 2
dotnet_sort_system_directives_first = true
# Avoid "this." and "Me." if not necessary
-dotnet_style_qualification_for_field = false:suggestion
-dotnet_style_qualification_for_property = false:suggestion
-dotnet_style_qualification_for_method = false:suggestion
-dotnet_style_qualification_for_event = false:suggestion
+dotnet_style_qualification_for_field = true:suggestion
+dotnet_style_qualification_for_property = true:suggestion
+dotnet_style_qualification_for_method = true:suggestion
+dotnet_style_qualification_for_event = true:suggestion
# Use language keywords instead of framework type names for type references
dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
@@ -44,14 +44,14 @@ dotnet_style_explicit_tuple_names = true:suggestion
# CSharp code style settings:
[*.cs]
# Prefer "var" where the type is apparent
-csharp_style_var_for_built_in_types = false:suggestion
+csharp_style_var_for_built_in_types = true:suggestion
csharp_style_var_when_type_is_apparent = true:suggestion
-csharp_style_var_elsewhere = false:suggestion
+csharp_style_var_elsewhere = true:suggestion
# Prefer method-like constructs to have a block body
-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:none
+csharp_style_expression_bodied_constructors = true:none
+csharp_style_expression_bodied_operators = true:none
# Prefer property-like constructs to have an expression-body
csharp_style_expression_bodied_properties = true:none
diff --git a/Cycle.NET.Demo/Cycle.NET.Demo.csproj b/Cycle.NET.Demo/Cycle.NET.Demo.csproj
index 894227f..fd1486f 100644
--- a/Cycle.NET.Demo/Cycle.NET.Demo.csproj
+++ b/Cycle.NET.Demo/Cycle.NET.Demo.csproj
@@ -2,9 +2,13 @@
Exe
- netcoreapp2.0
+ net6.0
+
+
+
+
diff --git a/Cycle.NET.Demo/Program.cs b/Cycle.NET.Demo/Program.cs
index 0d7e7b1..f6d3fde 100644
--- a/Cycle.NET.Demo/Program.cs
+++ b/Cycle.NET.Demo/Program.cs
@@ -4,7 +4,7 @@
namespace Cycle.NET.Demo
{
- class Program
+ internal static class Program
{
private static IObservable