Merged and updated to 3.2.1

Author: csharpfritz

CONTRIBUTING.md

@@ -1,12 +1,12 @@
 # Contributing to BlazorWebFormsComponents
 
-Thank you for taking the time to consider contributing to our project.  
+Thank you for taking the time to consider contributing to our project.
 
 The following is a set of guidelines for contributing to the project.  These are mostly guidelines, not rules, and can be changed in the future.  Please submit your suggestions with a pull-request to this document.
 
 1. [Code of Conduct](#code-of-conduct)
 1. [What should I know before I get started?](#what-should-i-know-before-i-get-started?)
-    1. [Project Folder Structure](#project-folder-structure) 
+    1. [Project Folder Structure](#project-folder-structure)
     1. [Design Decisions](#design-decisions)
 1. [How can I contribute?](#how-can-i-contribute?)
     1. [Tell us your story](#tell-us-your-story)
@@ -28,7 +28,7 @@ This project is designed to be built and run primarily with Visual Studio 2019.
 
 ```
 /docs                                 -- User Documentation
-/samples                              -- Usage Samples 
+/samples                              -- Usage Samples
   BeforeWebForms
   AfterBlazorClientSide               -- Shell project with WebAssembly config
   AfterBlazorServerSide               -- Shared project with Server-Side config
@@ -49,7 +49,7 @@ All official versions of the project are built and delivered with Azure DevOps P
 
 Design for this project is ultimately decided by the project lead, [Jeff Fritz](https://github.com/csharpfritz).  The following project tenets are adhered to when making decisions:
 
-1. All attributes of the original controls should be supported. This helps emphasize the 'convert your markup' feature. 
+1. All attributes of the original controls should be supported. This helps emphasize the 'convert your markup' feature.
 1. HTML markup generated by the components should replicate the markup generated by the original controls.  This helps to ensure the components behave as the Web Forms controls were expected to.
 1. Minimal .NET APIs should be supported, in order to present the API.  The following are the primary APIs available:
     1. Component events: OnInit, OnLoad, OnPrerender, OnUnload
@@ -75,10 +75,10 @@ Tell us how you are currently using the web forms framework so that we can build
 
 All code for a component should have an assigned issue that matches it.  This way we can prevent contributors from working on the same feature at the same time.
 
-Any code that is written to support a component are required to be accompanied with unit tests at the time the pull request is submitted.  Pull requests without unit tests will be delayed and asked for unit tests to prove their functionality.  We use the [Razor Components Testing Library](https://www.nuget.org/packages/Razor.Components.Testing.Library/) to test our components.
+Any code that is written to support a component are required to be accompanied with unit tests at the time the pull request is submitted.  Pull requests without unit tests will be delayed and asked for unit tests to prove their functionality.  We use the [bUnit](https://www.nuget.org/packages/bunit/) to test our components.
 
 Code for components' features should also include some definition in the `/docs` folder so that our users can identify and understand which feature is supported.
 
 ### Write documentation
 
-The documentation for the migration and consumption of these components will be significant in scope and need to cover many scenarios.  We are always looking for help to add content to the `/docs` section of the repository with proper links back through to the main `/README.md` 
+The documentation for the migration and consumption of these components will be significant in scope and need to cover many scenarios.  We are always looking for help to add content to the `/docs` section of the repository with proper links back through to the main `/README.md`.

global.json

@@ -1,5 +1,6 @@
 {
-  "sdk": {
-    "version": "3.1.201"
+	"sdk": {
+		"version": "3.1.300",
+		"rollForward": "latestMinor"
   }
 }

src/BlazorWebFormsComponents.Test/AdRotator/Rotate.razor

@@ -7,9 +7,9 @@
 </Fixture>
 
 @code {
-	void RotateTest()
+	void RotateTest(Fixture fixture)
 	{
-		var cut = GetComponentUnderTest();
+		var cut = fixture.GetComponentUnderTest();
 		var img = cut.Find("img");
 		var alternatText = img.Attributes["alt"].Value;
 

src/BlazorWebFormsComponents.Test/BaseWebFormsComponent/BubbleEvent.razor

@@ -11,9 +11,9 @@
 @code {
 
 
-void FirstTest() {
+void FirstTest(Fixture fixture) {
 
-	var cut = GetComponentUnderTest<TestBubbleComponent>();
+	var cut = fixture.GetComponentUnderTest<TestBubbleComponent>();
 	cut.Find("button").Click();
 
 	cut.Instance.EventRaised.Count().ShouldBe(1);

src/BlazorWebFormsComponents.Test/BaseWebFormsComponent/Controls.razor

@@ -1,8 +1,6 @@
 @inherits TestComponentBase
 
-<Fixture
-	Test="FirstTest"
->
+<Fixture Test="FirstTest">
 	<ComponentUnderTest>
 		<ListView Items="Widget.SimpleWidgetList"
 							ItemType="Widget"
@@ -11,7 +9,7 @@
 			<LayoutTemplate Context="itemPlaceholder">
 				<div>
 					<b>Header <Button @ref="MyButton">My Button</Button></b>
-					<br/>
+					<br />
 					@itemPlaceholder
 				</div>
 			</LayoutTemplate>
@@ -22,13 +20,14 @@
 
 @code {
 
-Button MyButton { get; set; }
+	Button MyButton { get; set; }
 
-void FirstTest() {
+	void FirstTest(Fixture fixture)
+	{
 
-	var cut = GetComponentUnderTest<ListView<Widget>>();
-	cut.Instance.Controls.Count().ShouldBe(1);
+		var cut = fixture.GetComponentUnderTest<ListView<Widget>>();
+		cut.Instance.Controls.Count().ShouldBe(1);
 
-}
+	}
 
 }

src/BlazorWebFormsComponents.Test/BaseWebFormsComponent/Parent.razor

@@ -24,9 +24,9 @@
 
 Button MyButton { get; set; }
 
-void FirstTest() {
+void FirstTest(Fixture fixture) {
 
-	var cut = GetComponentUnderTest();
+	var cut = fixture.GetComponentUnderTest();
 	cut.FindAll("button").Count().ShouldNotBe(0);
 
 	MyButton.ShouldNotBeNull();

src/BlazorWebFormsComponents.Test/BlazorWebFormsComponents.Test.csproj

@@ -7,11 +7,11 @@
 
 
 	<ItemGroup>
-		<PackageReference Include="bunit" Version="1.0.0-beta-6" />
+		<PackageReference Include="bunit" Version="1.0.0-beta-7" />
 		<PackageReference Include="Microsoft.AspNetCore.Components" Version="3.1.1" />
 		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.1.1" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
-		<PackageReference Include="Moq" Version="4.13.1" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.*" />
+		<PackageReference Include="Moq" Version="4.14.1" />
 		<PackageReference Include="Shouldly" Version="3.0.2" />
 		<PackageReference Include="xunit.core" Version="2.4.1" />
 		<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">

src/BlazorWebFormsComponents.Test/Button/Click.razor

@@ -19,10 +19,10 @@
 
 	}
 
-	void FirstTest()
+	void FirstTest(Fixture fixture)
 	{
 		// Given
-		var cut = GetComponentUnderTest();
+		var cut = fixture.GetComponentUnderTest();
 
 		TheContent.ShouldBe("Not clicked yet!");
 

src/BlazorWebFormsComponents.Test/Button/Command.razor

@@ -20,10 +20,10 @@
 
 	}
 
-	void FirstTest()
+	void FirstTest(Fixture fixture)
 	{
 		// Given
-		var cut = GetComponentUnderTest();
+		var cut = fixture.GetComponentUnderTest();
 
 		TheContent.ShouldBe("No Command yet!");
 

src/BlazorWebFormsComponents.Test/DataBinder/Eval_SimpleDataList.razor

@@ -17,10 +17,10 @@
 
 @code {
 
-	void FirstTest()
+	void FirstTest(Fixture fixture)
 	{
 
-		var cut = GetComponentUnderTest();
+		var cut = fixture.GetComponentUnderTest();
 
 		cut.FindAll("span").Count().ShouldBe(5);
 		cut.FindAll("span").Skip(1).First().TextContent.ShouldBe("My Widget List");