Skip to content

Commit

Permalink
Update net6 (#26)
Browse files Browse the repository at this point in the history
Updates solution to use .net6
* Introduces editorconfig for consistent styling
* File scoped namespaces
* Utilizes centralized package versioning to make upgrades like this a bit easier going forward 
  * https://blog.kritner.com/2021/10/01/dotnet-centralized-package-versioning/
  • Loading branch information
Kritner authored Jan 6, 2022
1 parent d70ec72 commit 89897dc
Show file tree
Hide file tree
Showing 57 changed files with 1,758 additions and 1,627 deletions.
138 changes: 138 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,138 @@
###############################
# Core EditorConfig Options #
###############################
root = true
# All files
[*]
indent_style = space

# yml files
[*.{yml,yaml}]
indent_size = 2

# XML project files
[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj}]
indent_size = 2

# XML config files
[*.{props,targets,ruleset,config,nuspec,resx,vsixmanifest,vsct}]
indent_size = 2

# Code files
[*.{cs,csx,vb,vbx}]
indent_size = 4
insert_final_newline = true
charset = utf-8-bom
###############################
# .NET Coding Conventions #
###############################
[*.{cs,vb}]
# Organize usings
dotnet_sort_system_directives_first = true
# this. preferences
dotnet_style_qualification_for_field = false:silent
dotnet_style_qualification_for_property = false:silent
dotnet_style_qualification_for_method = false:silent
dotnet_style_qualification_for_event = false:silent
# Language keywords vs BCL types preferences
dotnet_style_predefined_type_for_locals_parameters_members = true:silent
dotnet_style_predefined_type_for_member_access = true:silent
# Parentheses preferences
dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent
dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent
dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent
dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent
# Modifier preferences
dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent
dotnet_style_readonly_field = true: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_null_propagation = true:suggestion
dotnet_style_coalesce_expression = true:suggestion
dotnet_style_prefer_is_null_check_over_reference_equality_method = true:silent
dotnet_style_prefer_inferred_tuple_names = true:suggestion
dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
dotnet_style_prefer_auto_properties = true:silent
dotnet_style_prefer_conditional_expression_over_assignment = true:silent
dotnet_style_prefer_conditional_expression_over_return = true:silent
###############################
# Naming Conventions #
###############################
# Style Definitions
dotnet_naming_style.pascal_case_style.capitalization = pascal_case
# Use PascalCase for constant fields
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.applicable_accessibilities = *
dotnet_naming_symbols.constant_fields.required_modifiers = const
###############################
# C# Coding Conventions #
###############################
[*.cs]
# var preferences
csharp_style_var_for_built_in_types = true:silent
csharp_style_var_when_type_is_apparent = true:silent
csharp_style_var_elsewhere = true:silent
# Expression-bodied members
csharp_style_expression_bodied_methods = false:silent
csharp_style_expression_bodied_constructors = false:silent
csharp_style_expression_bodied_operators = false:silent
csharp_style_expression_bodied_properties = true:silent
csharp_style_expression_bodied_indexers = true:silent
csharp_style_expression_bodied_accessors = true:silent
# Pattern matching preferences
csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
# Null-checking preferences
csharp_style_throw_expression = true:suggestion
csharp_style_conditional_delegate_call = true:suggestion
# Modifier preferences
csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:suggestion
# Expression-level preferences
csharp_prefer_braces = true:silent
csharp_style_deconstructed_variable_declaration = true:suggestion
csharp_prefer_simple_default_expression = true:suggestion
csharp_style_pattern_local_over_anonymous_function = true:suggestion
csharp_style_inlined_variable_declaration = true:suggestion
###############################
# C# Formatting Rules #
###############################
# New line preferences
csharp_new_line_before_open_brace = all
csharp_new_line_before_else = true
csharp_new_line_before_catch = true
csharp_new_line_before_finally = true
csharp_new_line_before_members_in_object_initializers = true
csharp_new_line_before_members_in_anonymous_types = true
csharp_new_line_between_query_expression_clauses = true
# Indentation preferences
csharp_indent_case_contents = true
csharp_indent_switch_labels = true
csharp_indent_labels = flush_left
# Space preferences
csharp_space_after_cast = false
csharp_space_after_keywords_in_control_flow_statements = true
csharp_space_between_method_call_parameter_list_parentheses = false
csharp_space_between_method_declaration_parameter_list_parentheses = false
csharp_space_between_parentheses = false
csharp_space_before_colon_in_inheritance_clause = true
csharp_space_after_colon_in_inheritance_clause = true
csharp_space_around_binary_operators = before_and_after
csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
csharp_space_between_method_call_name_and_opening_parenthesis = false
csharp_space_between_method_call_empty_parameter_list_parentheses = false
# Wrapping preferences
csharp_preserve_single_line_statements = true
csharp_preserve_single_line_blocks = true
# Misc
csharp_style_namespace_declarations = file_scoped
###############################
# VB Coding Conventions #
###############################
[*.vb]
# Modifier preferences
visual_basic_preferred_modifier_order = Partial,Default,Private,Protected,Public,Friend,NotOverridable,Overridable,MustOverride,Overloads,Overrides,MustInherit,NotInheritable,Static,Shared,Shadows,ReadOnly,WriteOnly,Dim,Const,WithEvents,Widening,Narrowing,Custom,Async:suggestion
14 changes: 14 additions & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<Project>
<!--
Centrally managed repository nuget package versioning, read more at https://blog.kritner.com/2021/10/01/dotnet-centralized-package-versioning/
-->
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>

<PropertyGroup>
<MicrosoftVersionsOfPackages>6.0.0</MicrosoftVersionsOfPackages>
<OrleansVersionsOfPackages>3.5.1</OrleansVersionsOfPackages>
</PropertyGroup>

</Project>
24 changes: 24 additions & 0 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<Project>

<!--
Centrally managed repository nuget package versioning, read more at https://blog.kritner.com/2021/10/01/dotnet-centralized-package-versioning/
-->
<ItemGroup>
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="$(MicrosoftVersionsOfPackages)" />
<PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicrosoftVersionsOfPackages)" />
<PackageVersion Include="Microsoft.Extensions.Configuration.FileExtensions" Version="$(MicrosoftVersionsOfPackages)" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="$(MicrosoftVersionsOfPackages)" />
<PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="$(MicrosoftVersionsOfPackages)" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftVersionsOfPackages)" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="$(MicrosoftVersionsOfPackages)" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftVersionsOfPackages)" />
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftVersionsOfPackages)" />
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="$(MicrosoftVersionsOfPackages)" />
<PackageVersion Include="Microsoft.Orleans.CodeGenerator.MSBuild" Version="$(OrleansVersionsOfPackages)" />
<PackageVersion Include="Microsoft.Orleans.Core.Abstractions" Version="$(OrleansVersionsOfPackages)" />
<PackageVersion Include="Microsoft.Orleans.Client" Version="$(OrleansVersionsOfPackages)" />
<PackageVersion Include="Microsoft.Orleans.OrleansTelemetryConsumers.Counters" Version="$(OrleansVersionsOfPackages)" />
<PackageVersion Include="Microsoft.Orleans.Server" Version="$(OrleansVersionsOfPackages)" />
<PackageVersion Include="OrleansDashboard" Version="3.6.1" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
using Microsoft.Extensions.Diagnostics.HealthChecks;
using Microsoft.Extensions.Diagnostics.HealthChecks;
using Orleans;

namespace Kritner.Orleans.GettingStarted.GrainInterfaces.HealthChecks
namespace Kritner.Orleans.GettingStarted.GrainInterfaces.HealthChecks;

public interface IBasicHealthCheckGrain : IHealthCheck, IGrainWithGuidKey
{
public interface IBasicHealthCheckGrain : IHealthCheck, IGrainWithGuidKey
{

}
}

}
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
using Microsoft.Extensions.Diagnostics.HealthChecks;
using Microsoft.Extensions.Diagnostics.HealthChecks;
using Orleans;

namespace Kritner.Orleans.GettingStarted.GrainInterfaces.HealthChecks
namespace Kritner.Orleans.GettingStarted.GrainInterfaces.HealthChecks;

public interface ICpuHealthCheckGrain : IHealthCheck, IGrainWithGuidKey
{
public interface ICpuHealthCheckGrain : IHealthCheck, IGrainWithGuidKey
{

}

}
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
using Microsoft.Extensions.Diagnostics.HealthChecks;
using Microsoft.Extensions.Diagnostics.HealthChecks;
using Orleans;

namespace Kritner.Orleans.GettingStarted.GrainInterfaces.HealthChecks
namespace Kritner.Orleans.GettingStarted.GrainInterfaces.HealthChecks;

public interface IMemoryHealthCheckGrain : IHealthCheck, IGrainWithGuidKey
{
public interface IMemoryHealthCheckGrain : IHealthCheck, IGrainWithGuidKey
{

}

}
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
using System.Threading.Tasks;

namespace Kritner.Orleans.GettingStarted.GrainInterfaces
{
public interface IEmailSender
{
Task SendEmailAsync(string from, string[] to, string subject, string body);
}
}
using System.Threading.Tasks;

namespace Kritner.Orleans.GettingStarted.GrainInterfaces;

public interface IEmailSender
{
Task SendEmailAsync(string from, string[] to, string subject, string body);
}
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
using Orleans;
using System.Threading.Tasks;

namespace Kritner.Orleans.GettingStarted.GrainInterfaces
{
public interface IEmailSenderGrain : IGrainWithGuidKey, IGrainInterfaceMarker
{
Task SendEmail(string from, string[] to, string subject, string body);
}
using System.Threading.Tasks;
using Orleans;

namespace Kritner.Orleans.GettingStarted.GrainInterfaces;

public interface IEmailSenderGrain : IGrainWithGuidKey, IGrainInterfaceMarker
{
Task SendEmail(string from, string[] to, string subject, string body);
}
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
using Orleans;
using System.Threading.Tasks;

namespace Kritner.Orleans.GettingStarted.GrainInterfaces
{
public interface IEverythingIsOkGrain : IGrainWithStringKey, IRemindable
{
Task Start();
Task Stop();
}
}
using System.Threading.Tasks;
using Orleans;

namespace Kritner.Orleans.GettingStarted.GrainInterfaces;

public interface IEverythingIsOkGrain : IGrainWithStringKey, IRemindable
{
Task Start();
Task Stop();
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
namespace Kritner.Orleans.GettingStarted.GrainInterfaces
{
public interface IGrainInterfaceMarker
{

}
namespace Kritner.Orleans.GettingStarted.GrainInterfaces;

public interface IGrainInterfaceMarker
{

}
19 changes: 9 additions & 10 deletions src/Kritner.Orleans.GettingStarted.GrainInterfaces/IHelloWorld.cs
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
using Orleans;
using System.Threading.Tasks;

namespace Kritner.Orleans.GettingStarted.GrainInterfaces
{
public interface IHelloWorld : IGrainWithGuidKey, IGrainInterfaceMarker
{
Task<string> SayHello(string name);
}
}
using System.Threading.Tasks;
using Orleans;

namespace Kritner.Orleans.GettingStarted.GrainInterfaces;

public interface IHelloWorld : IGrainWithGuidKey, IGrainInterfaceMarker
{
Task<string> SayHello(string name);
}
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
using Orleans;
using System.Threading.Tasks;

namespace Kritner.Orleans.GettingStarted.GrainInterfaces
{
public interface IObservableManager : IGrainWithIntegerKey, IGrainInterfaceMarker
{
Task Subscribe(IObserverSample observer);
Task Unsubscribe(IObserverSample observer);
Task SendMessageToObservers(string message);
}
}
using System.Threading.Tasks;
using Orleans;

namespace Kritner.Orleans.GettingStarted.GrainInterfaces;

public interface IObservableManager : IGrainWithIntegerKey, IGrainInterfaceMarker
{
Task Subscribe(IObserverSample observer);
Task Unsubscribe(IObserverSample observer);
Task SendMessageToObservers(string message);
}
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
using Orleans;
using System;

namespace Kritner.Orleans.GettingStarted.GrainInterfaces
{
public interface IObserverSample : IGrainObserver
{
void ReceiveMessage(string message);
}
}
using System;
using Orleans;

namespace Kritner.Orleans.GettingStarted.GrainInterfaces;

public interface IObserverSample : IGrainObserver
{
void ReceiveMessage(string message);
}
21 changes: 10 additions & 11 deletions src/Kritner.Orleans.GettingStarted.GrainInterfaces/IVisitTracker.cs
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
using Orleans;
using System.Threading.Tasks;

namespace Kritner.Orleans.GettingStarted.GrainInterfaces
{
public interface IVisitTracker : IGrainWithStringKey, IGrainInterfaceMarker
{
Task<int> GetNumberOfVisits();
Task Visit();
}
}
using System.Threading.Tasks;
using Orleans;

namespace Kritner.Orleans.GettingStarted.GrainInterfaces;

public interface IVisitTracker : IGrainWithStringKey, IGrainInterfaceMarker
{
Task<int> GetNumberOfVisits();
Task Visit();
}
Loading

0 comments on commit 89897dc

Please sign in to comment.