Merge pull request #31 from mayuki/vNext

Rin v2.0

.editorconfig

@@ -0,0 +1,122 @@
+# To learn more about .editorconfig see https://aka.ms/editorconfigdocs
+###############################
+# Core EditorConfig Options   #
+###############################
+root = true
+
+# All files
+[*]
+indent_style = space
+
+# Code files
+[*.{cs,csx,vb,vbx}]
+indent_size = 4
+insert_final_newline = true
+charset = utf-8
+
+
+###############################
+# .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

.github/workflows/build.yml

@@ -1,40 +1,60 @@
-name: CI
+name: Build-Development
 
-on: [push]
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    types:
+      - opened
+      - synchronize
 
 jobs:
   build:
 
     runs-on: ubuntu-latest
+    env:
+      DOTNET_NOLOGO: true
 
     steps:
     - uses: actions/checkout@v1
+
     - uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.0.100
-    - uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 2.2.402
-    - name: npm install & build & pack (Rin.Frontend)
+        dotnet-version: '3.1.x'
+
+    - name: "Set VersionSuffix"
+      run: |
+        echo "::set-env name=VERSION_SUFFIX::preview.`date '+%Y%m%d-%H%M%S'`+${GITHUB_SHA:0:6}"
+
+    - name: "Get git tag"
+      if: "contains(github.ref, 'refs/tags')"
+      run: echo ::set-env name=GIT_TAG::${GITHUB_REF#refs/tags/}
+
+    - name: "Rin.Frontend: build & pack"
       working-directory: src/Rin.Frontend
       run: |
-        npm install
-        npm run build
-        npm run pack
-    - name: npm install & build & pack (Rin.Mvc.Frontend)
+        yarn
+        yarn run build
+        yarn run pack
+
+    - name: "Rin.Mvc.Frontend: build"
       working-directory: src/Rin.Mvc.Frontend
       run: |
-        npm install
-        npm run build
+        yarn
+        yarn run build
+
     - name: Copy Rin.Mvc.Frontend
       run: |
         mkdir -p src/Rin.Mvc/EmbeddedResources/
-        cp -R src/Rin.Mvc.Frontend/build/static/* src/Rin.Mvc/EmbeddedResources/
-    - name: dotnet
+        cp -R src/Rin.Mvc.Frontend/dist/static/* src/Rin.Mvc/EmbeddedResources/
+
+    - name: "dotnet build & pack"
       run: |
         dotnet restore
         dotnet build -c Release
-        dotnet pack -c Release -o $GITHUB_WORKSPACE/artifacts --version-suffix preview.`date +%Y%m%d%H%M%S`
+        dotnet pack -c Release -o $GITHUB_WORKSPACE/artifacts --version-suffix "$VERSION_SUFFIX" -p:IncludeSymbols=true -p:SymbolPackageFormat=snupkg
+
     - uses: actions/upload-artifact@master
       with:
         name: Packages

.github/workflows/release.yml

@@ -0,0 +1,63 @@
+name: Build-Release
+
+on:
+  push:
+    tags:
+      - v*
+
+jobs:
+  release:
+    if: "contains(github.ref, 'refs/tags')"
+
+    runs-on: ubuntu-latest
+    env:
+      DOTNET_NOLOGO: true
+
+    steps:
+    - uses: actions/checkout@v1
+
+    - uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: '3.1.x'
+
+    - name: "Set VersionSuffix for Preview"
+      if: "contains(github.ref, 'refs/tags') && contains(github.ref, 'preview')"
+      run: |
+        echo "::set-env name=VERSION_SUFFIX::preview.`date '+%Y%m%d-%H%M%S'`+${GITHUB_SHA:0:6}"
+
+    - name: "Get git tag"
+      if: "contains(github.ref, 'refs/tags')"
+      run: echo ::set-env name=GIT_TAG::${GITHUB_REF#refs/tags/}
+
+    - name: "Rin.Frontend: build & pack"
+      working-directory: src/Rin.Frontend
+      run: |
+        yarn
+        yarn run build
+        yarn run pack
+
+    - name: "Rin.Mvc.Frontend: build"
+      working-directory: src/Rin.Mvc.Frontend
+      run: |
+        yarn
+        yarn run build
+
+    - name: Copy Rin.Mvc.Frontend
+      run: |
+        mkdir -p src/Rin.Mvc/EmbeddedResources/
+        cp -R src/Rin.Mvc.Frontend/dist/static/* src/Rin.Mvc/EmbeddedResources/
+
+    - name: "dotnet build & pack"
+      run: |
+        dotnet restore
+        dotnet build -c Release
+        dotnet pack -c Release -o $GITHUB_WORKSPACE/artifacts --version-suffix "$VERSION_SUFFIX" -p:IncludeSymbols=true -p:SymbolPackageFormat=snupkg
+
+    - uses: actions/upload-artifact@master
+      with:
+        name: Packages
+        path: artifacts
+
+    - name: "Push to NuGet.org"
+      run: |
+        dotnet nuget push "$GITHUB_WORKSPACE/artifacts/*.nupkg" --skip-duplicate -k ${{ secrets.NUGET_KEY }} -s https://api.nuget.org/v3/index.json

Directory.Build.props

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <VersionPrefix>2.0.0</VersionPrefix>
+    <VersionSuffix>$(VersionSuffix)</VersionSuffix>
+    <LangVersion>latest</LangVersion>
+
+    <!-- NuGet Package Information -->
+    <Description>Request/response Inspector middleware for ASP.NET Core</Description>
+    <Authors>Mayuki Sawatari</Authors>
+    <Copyright>Copyright 2019-present Mayuki Sawatari</Copyright>
+    <PackageProjectUrl>https://github.com/mayuki/Rin</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/mayuki/Rin</RepositoryUrl>
+    <PackageIcon>logo.png</PackageIcon>
+    <PackageTags>Rin ASP.NET Request Inspector</PackageTags>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+  </PropertyGroup>
+</Project>

README.md

@@ -47,9 +47,8 @@ You can replay a request easily using cURL and LINQPad.
 ![](docs/images/Screenshot-04.png)
 
 # 📝 Requirements
-- .NET Core 2.0+
-- ASP.NET Core 2.1+
-- ASP.NET Core MVC 2.1+
+- .NET Core 3.1+
+- ASP.NET Core 3.1+
 - Modern browser (e.g. Microsoft Edge, Google Chrome, Firefox, Safari...)
     - WebSocket connectivity
 
@@ -94,11 +93,9 @@ public class Startup
     public void ConfigureServices(IServiceCollection services)
     {
         ...
-
-        services.AddMvc()
+        services.AddControllersWithViews()
             // Add(option): Enable ASP.NET Core MVC support if the project built with ASP.NET Core MVC
-            .AddRinMvcSupport()
-            .SetCompatibilityVersion(CompatibilityVersion.Version_2_1);
+            .AddRinMvcSupport();        
 
         // Add: Register Rin services
         services.AddRin();

Rin.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27703.2026
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30128.74
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Rin", "src\Rin\Rin.csproj", "{B9CDC00F-4AED-49D5-B4DC-6520FAF371CB}"
 EndProject
@@ -13,7 +13,19 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Rin.Mvc", "src\Rin.Mvc\Rin.
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Rin.Log4NetAppender", "src\Rin.Log4NetAppender\Rin.Log4NetAppender.csproj", "{20890D4F-9D03-4663-ACCE-D4404E8A8AF6}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Rin.Storage.Redis", "src\Rin.Storage.Redis\Rin.Storage.Redis.csproj", "{306BC2D2-ACB8-4F60-9D03-6EAAAD6CF8F0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Rin.Storage.Redis", "src\Rin.Storage.Redis\Rin.Storage.Redis.csproj", "{306BC2D2-ACB8-4F60-9D03-6EAAAD6CF8F0}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{FFF7EB81-6AC3-4509-ACB5-502DECFAE084}"
+	ProjectSection(SolutionItems) = preProject
+		src\.editorconfig = src\.editorconfig
+		Directory.Build.props = Directory.Build.props
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GitHub Actions", "GitHub Actions", "{7BFF5E34-A85B-4B34-B0F8-676A081EC620}"
+	ProjectSection(SolutionItems) = preProject
+		.github\workflows\build.yml = .github\workflows\build.yml
+		.github\workflows\release.yml = .github\workflows\release.yml
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -47,6 +59,7 @@ Global
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{921C0263-C56A-4332-897C-2107D0E0DDF2} = {B82C9F89-AD8F-473B-AA41-3061CD0FE9DF}
+		{7BFF5E34-A85B-4B34-B0F8-676A081EC620} = {FFF7EB81-6AC3-4509-ACB5-502DECFAE084}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {739B12D9-4F90-4F23-B6FE-D0A94CFB1608}

samples/HelloRin/Controllers/HomeController.cs

@@ -5,27 +5,21 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using HelloRin.Models;
+using Microsoft.Extensions.Logging;
 
 namespace HelloRin.Controllers
 {
     public class HomeController : Controller
     {
-        public IActionResult Index()
-        {
-            return View();
-        }
+        private readonly ILogger<HomeController> _logger;
 
-        public IActionResult About()
+        public HomeController(ILogger<HomeController> logger)
         {
-            ViewData["Message"] = "Your application description page.";
-
-            return View();
+            _logger = logger;
         }
 
-        public IActionResult Contact()
+        public IActionResult Index()
         {
-            ViewData["Message"] = "Your contact page.";
-
             return View();
         }
 

samples/HelloRin/Controllers/MyApiController.cs

@@ -28,6 +28,11 @@ public IActionResult Index()
             return Content("Index");
         }
 
+        public async Task<IActionResult> InvokeGrpc([FromServices] Greeter.GreeterClient client)
+        {
+            return Content((await client.SayHelloAsync(new HelloRequest() { Name = "Alice" })).Message);
+        }
+
         public async Task<string> Delay(int ms)
         {
             await Task.Delay(ms);