Clean, Update version

.editorconfig

@@ -1,18 +1,22 @@
+# EditorConfig is awesome: http://EditorConfig.org
+# Based on: https://github.com/dotnet/roslyn/blob/master/.editorconfig
+# https://docs.microsoft.com/en-us/visualstudio/ide/editorconfig-code-style-settings-reference
+# https://www.jetbrains.com/help/rider/Using_EditorConfig.html?Wave=183
+
+root = true
+
 [*]
 charset = utf-8
 end_of_line = lf
 indent_style = space
 max_line_length = 180
 insert_final_newline = true
 
-[*.cs]
-indent_size = 4
-insert_final_newline = true
-
-[*.csproj]
+# XML
+[{*.csproj, *.props, .ruleset}]
 indent_size = 2
 
-[{*.yml,*.yaml}]
+[{*.yml, *.yaml}]
 indent_size = 2
 
 [*.json]
@@ -21,6 +25,70 @@ indent_size = 2
 [{*.sh, *.ps1}]
 indent_size = 2
 
-# code style settings:
-[*.{cs}]
+[*.cs]
+indent_size = 4
+
+## Dotnet code style settings:
+
+# Sort using and Import directives with System.* appearing first
 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
+
+# Use language keywords instead of framework type names for type references
+dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
+dotnet_style_predefined_type_for_member_access = true:suggestion
+
+# Suggest more modern language features when available
+dotnet_style_object_initializer = true:suggestion
+dotnet_style_collection_initializer = true:suggestion
+dotnet_style_coalesce_expression = true:suggestion
+dotnet_style_null_propagation = true:suggestion
+dotnet_style_explicit_tuple_names = true:suggestion
+
+# CSharp code style settings:
+
+# Prefer "var" everywhere
+csharp_style_var_for_built_in_types = false:none
+csharp_style_var_when_type_is_apparent = true: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
+
+# Prefer property-like constructs to have an expression-body
+csharp_style_expression_bodied_properties = true:none
+csharp_style_expression_bodied_indexers = true:none
+csharp_style_expression_bodied_accessors = true:none
+
+# Suggest more modern language features when available
+csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
+csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
+csharp_style_inlined_variable_declaration = true:suggestion
+csharp_style_throw_expression = true:suggestion
+csharp_style_conditional_delegate_call = true:suggestion
+
+# Newline settings
+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
+
+## Naming
+
+dotnet_naming_style.underscore_prefix.capitalization = camel_case
+dotnet_naming_style.underscore_prefix.required_prefix = _
+
+# private fields should be _camelCase
+dotnet_naming_rule.private_fields_with_underscore.symbols = private_fields
+dotnet_naming_rule.private_fields_with_underscore.style = underscore_prefix
+dotnet_naming_rule.private_fields_with_underscore.severity = suggestion
+
+dotnet_naming_symbols.private_fields.applicable_kinds = field
+dotnet_naming_symbols.private_fields.applicable_accessibilities = private

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2018 Sergey Kuznetsov
+Copyright (c) 2019 Sergey Kuznetsov
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

src/Prometheus.Client.AspNetCore/Prometheus.Client.AspNetCore.csproj

@@ -1,24 +1,24 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Description>Middleware for the Prometheus.Client</Description>
-    <Copyright>2018 © Sergey Kuznetsov</Copyright>
+    <Copyright>2019 © Sergey Kuznetsov</Copyright>
     <AssemblyTitle>Prometheus.Client.AspNetCore</AssemblyTitle>
-    <VersionPrefix>2.1.1</VersionPrefix>
+    <VersionPrefix>2.2.0</VersionPrefix>
     <Authors>Sergey Kuznetsov</Authors>
     <TargetFrameworks>netstandard1.3;netstandard2.0</TargetFrameworks>
     <AssemblyName>Prometheus.Client.AspNetCore</AssemblyName>
     <PackageId>Prometheus.Client.AspNetCore</PackageId>
     <PackageTags>prometheus;metrics</PackageTags>
     <PackageIconUrl>https://image.ibb.co/k4Sc0k/prometheus.png</PackageIconUrl>
     <PackageProjectUrl>https://github.com/PrometheusClientNet/Prometheus.Client.AspNetCore</PackageProjectUrl>
-    <PackageLicenseUrl>https://opensource.org/licenses/MIT</PackageLicenseUrl>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>https://github.com/PrometheusClientNet/Prometheus.Client.AspNetCore</RepositoryUrl>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Prometheus.Client" Version="2.0.0" /> 
+    <PackageReference Include="Prometheus.Client" Version="[2.0.0,3.0.0)" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3'">
     <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions">

src/Prometheus.Client.AspNetCore/PrometheusExtensions.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Net;
 using System.Threading.Tasks;
 using Prometheus.Client.Collectors;
 using Microsoft.AspNetCore.Builder;
@@ -38,8 +37,8 @@ public static IApplicationBuilder UsePrometheusServer(this IApplicationBuilder a
                 throw new ArgumentException($"MapPath '{options.MapPath}' should start with '/'");
 
             RegisterCollectors(options);
-            
-            Action<IApplicationBuilder> addMetricsHandler = coreapp =>
+
+            void AddMetricsHandler(IApplicationBuilder coreapp)
             {
                 coreapp.Run(async context =>
                 {
@@ -53,15 +52,13 @@ public static IApplicationBuilder UsePrometheusServer(this IApplicationBuilder a
 
                     await Task.FromResult(0).ConfigureAwait(false);
                 });
-            };
-
-            if (options.Port == null)
-            {
-                return app.Map(options.MapPath, addMetricsHandler);
             }
 
-            Func<HttpContext, bool> portMatches = context => context.Connection.LocalPort == options.Port;
-            return app.Map(options.MapPath, cfg => cfg.MapWhen(portMatches, addMetricsHandler));
+            if (options.Port == null)
+                return app.Map(options.MapPath, AddMetricsHandler);
+
+            bool PortMatches(HttpContext context) => context.Connection.LocalPort == options.Port;
+            return app.Map(options.MapPath, cfg => cfg.MapWhen(PortMatches, AddMetricsHandler));
         }
 
 

src/Prometheus.Client.AspNetCore/PrometheusOptions.cs

@@ -28,7 +28,7 @@ public class PrometheusOptions
         ///     IOnDemandCollectors
         /// </summary>
         public List<IOnDemandCollector> Collectors { get; set; } = new List<IOnDemandCollector>();
-        
+
         /// <summary>
         ///     Use default collectors
         /// </summary>