Merge branch 'main' into dev

# Conflicts:
#	docs/site/docs/test-doubles/emulating-ijsruntime.md

Author: egil

.github/ISSUE_TEMPLATE/bug_report.md

@@ -4,13 +4,14 @@ about: Create a report to help us improve
 title: ''
 labels: ''
 assignees: ''
-
 ---
 
-**NOTE:** _Remove any parts of the template you do not need and replace the default text in each section with your own, including this._
+<!-- **NOTE:** Remove any parts of the template you do not need and
+replace the default text in each section with your own, including this. -->
+
+**Describe the bug**
 
-**Describe the bug or question**
-_A clear and concise description of what the bug or question is._
+<!-- A clear and concise description of the bug. This include a list of reproduction steps. -->
 
 **Example:**
 Testing this component:
@@ -32,11 +33,15 @@ Message output from running the test.
 ```
 
 **Expected behavior:**
-A clear and concise description of what you expected to happen.
+
+<!-- A clear and concise description of what you expected to happen. -->
 
 **Version info:**
- - Library version: 
- - .NET Core/Blazor version:
+
+ - bUnit version: 
+ - .NET Runtime and Blazor version:
+ - OS type and version:
 
 **Additional context:**
-Add any other context about the problem here.
+
+<!-- Add any other context about the problem here. -->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,22 +1,26 @@
 ---
 name: Feature request
-about: Suggest an idea for this project
+about: Suggest an idea or enhancement for this project
 title: ''
 labels: ''
 assignees: ''
 
 ---
 
-**NOTE:** _Remove any parts of the template you do not need and replace the default text in each section with your own, including this._
+<!-- NOTE: Remove any parts of the template not needed and fill in as needed. -->
 
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+**Is the feature request related to a problem? Please elaborate.**
 
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
+<!-- A clear and concise description of what the problem is. -->
 
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
+**The suggested solution**
+
+<!-- A clear and concise description of the suggested solution. -->
+
+**Describe any alternative solutions**
+
+<!-- A clear and concise description of any alternative solutions or features considered. -->
 
 **Additional context**
-Add any other context or screenshots about the feature request here.
+
+<!-- Add any other context or screenshots about the feature request here. -->

.github/pull_request_template.md

@@ -5,11 +5,12 @@
 -->
 
 ### PR meta checklist
-- [ ] Pull request is targeting at `DEV` branch.
+- [ ] Pull request is targeted at `DEV` branch for code   
+  or targeted at `main` branch for documentation that is live on bunit.egilhansen.com.
 - [ ] Pull request is linked to all related issues, if any.
 - [ ] I have read the _CONTRIBUTING.md_ document.
 
-### Content checklist
+### Code PR specific checklist
 - [ ] My code follows the code style of this project and AspNetCore coding guidelines.
 - [ ] My change requires a change to the documentation.
   - [ ] I have updated the documentation accordingly.

README.md

@@ -40,10 +40,10 @@ A huge thank you to the [sponsors of my work with bUnit](https://github.com/spon
 <table>
 	<tr>
 		<td align="center" width="120">
-			<a src="https://github.com/Progress-Telerik"><img src="https://avatars3.githubusercontent.com/u/57092419?s=460&u=fd421a2b423c3cad85866976935df3d4bec2ace3&v=4" alt="@Progress-Telerik" width="40" height="40" /></a><br/><a href="https://github.com/Progress-Telerik">Progress-Telerik</a>
+			<a src="https://github.com/Progress-Telerik"><img src="https://avatars3.githubusercontent.com/u/57092419?s=460&u=fd421a2b423c3cad85866976935df3d4bec2ace3&v=4" alt="@Progress-Telerik" class="avatar" width="72" height="72" /></a><br/><a href="https://github.com/Progress-Telerik">Progress-Telerik</a>
 		</td>
 		<td align="center" width="120">
-			<a src="https://github.com/hassanhabib"><img src="https://avatars0.githubusercontent.com/u/1453985?s=460&v=4" alt="Hassan Rezk Habib (@hassanhabib)" width="40" height="40" /></a><br/><a href="https://github.com/hassanhabib">Hassan Rezk Habib (@hassanhabib)</a>
+			<a src="https://github.com/hassanhabib"><img src="https://avatars0.githubusercontent.com/u/1453985?s=460&v=4" alt="Hassan Rezk Habib (@hassanhabib)" width="72" height="72" class="avatar" /></a><br/><a href="https://github.com/hassanhabib">Hassan Rezk Habib (@hassanhabib)</a>
 		</td>
 	</tr>
 </table>

docs/README.md

@@ -9,16 +9,16 @@ Here is a small getting started guide for contributing to the documentation...
 1. The `site` folder contains the code for generating the documentation site, _and_ the documentation in markdown files, located in `site/docs`.
 2. The `samples` folder projects for the sample code that is displayed in the documentation. It has the following projects:  
   - `samples/components`: A Blazor component library project where components under test are placed.
-  - `samples/tests/mstest`: A MSTest project where MSTest test samples are placed.
-  - `samples/tests/nunit`: A NUnit project where NUnit test samples are placed.
-  - `samples/tests/razor`: A xUnit based test project where razor test samples are placed.
-  - `samples/tests/xunit`: A xUnit project where xUnit C# only test samples are placed.
+  - `samples/tests/mstest`: An MSTest project where MSTest test samples are placed.
+  - `samples/tests/nunit`: An NUnit project where NUnit test samples are placed.
+  - `samples/tests/razor`: An xUnit-based test project where razor test samples are placed.
+  - `samples/tests/xunit`: An xUnit project where xUnit C#-only test samples are placed.
 
-These sample components source files and tests source files are included in the documentation using [DocFx's Code Snippet syntax](https://dotnet.github.io/docfx/spec/docfx_flavored_markdown.html?tabs=tabid-1%2Ctabid-a#code-snippet). They are created as real projects, making them runnable, which helps ensure that the code shown in the documentation pages are correct and in working order.  
+These sample components, source files, and tests source files are included in the documentation using [DocFx's Code Snippet syntax](https://dotnet.github.io/docfx/spec/docfx_flavored_markdown.html?tabs=tabid-1%2Ctabid-a#code-snippet). They are created as real projects, making them runnable, which helps ensure that the code samples shown in the documentation pages are correct and in working order.  
 
 ## Building and Viewing Docs Locally
 
-To build and view the documentation locally, following a few steps is required:
+To build and view the documentation locally, follow these steps:
 
 1. From `docs/site` run `dotnet build`. If you get warnings from running `dotnet build`, try running it again.
 2. From `docs/` run `serve-docs.cmd`. This will start up a local web server, hosting the generated documentation site on http://localhost:8080, using the [`dotnet serve` tool](https://github.com/natemcmaster/dotnet-serve).
@@ -29,4 +29,4 @@ To build and view the documentation locally, following a few steps is required:
 - All pages should have a [YAML header](https://dotnet.github.io/docfx/spec/docfx_flavored_markdown.html#yaml-header) with a `UID` to make it easy to [cross reference](https://dotnet.github.io/docfx/spec/docfx_flavored_markdown.html#cross-reference) between pages
 - All page and code references should be created using the [`xref:UID` cross reference syntax](https://dotnet.github.io/docfx/tutorial/links_and_cross_references.html#using-cross-reference).
 -   By default, you should include code snippets as sample files in the `samples` projects, using the [code snippet syntax](https://dotnet.github.io/docfx/spec/docfx_flavored_markdown.html#code-snippet).
-- All code snippets should use 2 spaces as an indention unit (1 tab = 2 spaces).
+- All code snippets should use 2 spaces as an indention unit (1 tab = 2 spaces).

…/samples/components/ImparativeCalc.razor docs/samples/components/Calc.razordocs/samples/components/ImparativeCalc.razor renamed to docs/samples/components/Calc.razor docs/samples/components/ImparativeCalc.razor renamed to docs/samples/components/Calc.razor

@@ -47,7 +47,7 @@ public void RendersViaInvokeAsync()
     {
       // Arrange - renders the Heading component
       using var ctx = new TestContext();
-      var cut = ctx.RenderComponent<ImparativeCalc>();
+      var cut = ctx.RenderComponent<Calc>();
 
       // Indirectly re-renders through the call to StateHasChanged 
       // in the Calculate(x, y) method.

docs/samples/tests/xunit/ReRenderTest.cs

@@ -1,11 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="docfx.console" Version="2.56.2" PrivateAssets="All" />
+    <PackageReference Include="docfx.console" Version="2.56.6">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
 </Project>

docs/site/docs.csproj

@@ -7,7 +7,7 @@ title: Contributor Covenant Code of Conduct
 
 ## Our Pledge
 
-In the interest of fostering an open and welcoming environment, we as
+In the interests of fostering an open and welcoming environment, we as
 contributors and maintainers pledge to make our project and
 community a harassment-free experience for everyone, regardless of age, 
 size, disability, ethnicity, sexuality, gender identity and expression,
@@ -27,8 +27,7 @@ include:
 
 Examples of unacceptable behavior by participants include:
 
-* The use of sexualized language or imagery and unwelcome sexual attention or
-  advances
+* The use of sexualized language or imagery and unwelcome sexual attention or advances
 * Trolling, insulting/derogatory comments, and personal or political attacks
 * Public or private harassment
 * Publishing others' private information, such as a physical or electronic
@@ -44,9 +43,8 @@ response to any instances of unacceptable behavior.
 
 Project maintainers have the right and responsibility to remove, edit, or
 reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to temporarily or
-permanently ban any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
+that are not aligned with this Code of Conduct, or to temporarily or
+permanently ban any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
 
 ## Scope
 

docs/site/docs/code-of-conduct.md

@@ -10,7 +10,7 @@ One of the easiest ways to contribute is to participate in discussions on GitHub
 ## General Feedback and Discussions
 Start a discussion on the [bUnit discussion list](https://github.com/egil/bUnit/discussions).
 
-## Bugs and feature requests
+## Bugs and Feature Requests
 For bugs or feature requests, log a new issue on the [issues list](https://github.com/egil/bunit/issues). Be sure to use the right template.
 
 ## Contributing Code and Content
@@ -21,7 +21,7 @@ bUnit accepts fixes and features. Here is what you should do when writing code f
 - Add, remove, or delete unit tests to cover your changes. Make sure tests are specific to the changes you are making. Tests need to be provided for every bug/feature that is completed.
 - All code changes should be done on the `DEV` branch, and pull requests should target it.
 - All updates to the documentation located under `./docs/` should be done on the `main` branch **if** they are general in nature and not tied to a specific version. Changes to the documentation related to changes on the `DEV` branch should be submitted to the `DEV` branch.
-- Any code or documentation you share with the bUnit projects should fall under the projects license agreement.
+- Any code or documentation you share with the bUnit projects should fall under the project's license agreement.
 
 Here are some resources to help you get started on how to contribute code or new content:
 
@@ -42,4 +42,4 @@ If you don't know what a pull request is, read this article: https://help.github
 
 ## Code of Conduct
 
-See <xref:code-of-conduct>
+See <xref:code-of-conduct>