bUnit-dev · egil · Aug 13, 2020 · Aug 12, 2020 · Aug 12, 2020 · Aug 12, 2020
diff --git a/.github/workflows/CI-PR.yml b/.github/workflows/CI-PR.yml
@@ -33,7 +33,7 @@ jobs:
           files: '["*.csproj", "**/*.csproj"]'
       - uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: '3.1.202'
+          dotnet-version: '5.0.100'
       - name: Building library
         run: |
           dotnet restore src

diff --git a/global.json b/global.json
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -1,16 +1,15 @@
 <Project>
-  <PropertyGroup>
-    <LangVersion>8.0</LangVersion>
-    <Nullable>enable</Nullable>
-    <WarningsAsErrors>CS8600;CS8602;CS8603;CS8625</WarningsAsErrors>
+	<PropertyGroup>
+		<LangVersion>8.0</LangVersion>
+		<Nullable>enable</Nullable>
+		<WarningsAsErrors>CS8600;CS8602;CS8603;CS8625</WarningsAsErrors>
 		<Deterministic>true</Deterministic>
-  </PropertyGroup>
+	</PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
-
+	<ItemGroup>
+		<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
+	</ItemGroup>
 </Project>
diff --git a/src/bunit.core.tests/ComponentParameterFactoryTest.cs b/src/bunit.core.tests/ComponentParameterFactoryTest.cs
@@ -4,6 +4,9 @@
 using Bunit.Rendering;
 using Bunit.TestAssets.SampleComponents;
 using Bunit.TestDoubles.JSInterop;
+
+using Microsoft.AspNetCore.Components.Rendering;
+
 using Shouldly;
 
 using Xunit;
@@ -37,12 +40,12 @@ public void Test005()
 			instance.RegularParam.ShouldBe("some value");
 			instance.UnnamedCascadingValue.ShouldBe(42);
 			instance.NamedCascadingValue.ShouldBe(1337);
-			Should.Throw<Exception>(async () => await instance.NonGenericCallback.InvokeAsync(null)).Message.ShouldBe("NonGenericCallback");
+			Should.Throw<Exception>(async () => await instance.NonGenericCallback.InvokeAsync(EventArgs.Empty)).Message.ShouldBe("NonGenericCallback");
 			Should.Throw<Exception>(async () => await instance.GenericCallback.InvokeAsync(EventArgs.Empty)).Message.ShouldBe("GenericCallback");
 
 			new RenderedFragment(Services, Renderer.RenderFragment(instance.ChildContent!)).Markup.ShouldBe(nameof(ChildContent));
 			new RenderedFragment(Services, Renderer.RenderFragment(instance.OtherContent!)).Markup.ShouldBe(nameof(AllTypesOfParams<string>.OtherContent));
-			Should.Throw<Exception>(() => instance.ItemTemplate!("")(null)).Message.ShouldBe("ItemTemplate");
+			Should.Throw<Exception>(() => instance.ItemTemplate!("")(new RenderTreeBuilder())).Message.ShouldBe("ItemTemplate");
 		}
 
 		[Fact(DisplayName = "All types of parameters are correctly assigned to component on re-render")]
@@ -77,11 +80,11 @@ public void Test002()
 
 			instance.Attributes["some-unmatched-attribute"].ShouldBe("unmatched value");
 			instance.RegularParam.ShouldBe("some value");
-			Should.Throw<Exception>(async () => await instance.NonGenericCallback.InvokeAsync(null)).Message.ShouldBe("NonGenericCallback");
+			Should.Throw<Exception>(async () => await instance.NonGenericCallback.InvokeAsync(EventArgs.Empty)).Message.ShouldBe("NonGenericCallback");
 			Should.Throw<Exception>(async () => await instance.GenericCallback.InvokeAsync(EventArgs.Empty)).Message.ShouldBe("GenericCallback");
 			new RenderedFragment(Services, Renderer.RenderFragment(instance.ChildContent!)).Markup.ShouldBe(nameof(ChildContent));
 			new RenderedFragment(Services, Renderer.RenderFragment(instance.OtherContent!)).Markup.ShouldBe(nameof(AllTypesOfParams<string>.OtherContent));
-			Should.Throw<Exception>(() => instance.ItemTemplate!("")(null)).Message.ShouldBe("ItemTemplate");
+			Should.Throw<Exception>(() => instance.ItemTemplate!("")(new RenderTreeBuilder())).Message.ShouldBe("ItemTemplate");
 		}
 
 		[Fact(DisplayName = "Template(name, markupFactory) helper correctly renders markup template")]

diff --git a/src/bunit.core.tests/bunit.core.tests.csproj b/src/bunit.core.tests/bunit.core.tests.csproj
@@ -1,15 +1,24 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
 	<PropertyGroup>
-		<TargetFramework>netcoreapp3.1</TargetFramework>
+		<TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
 		<IsPackable>false</IsPackable>
 		<RootNamespace>Bunit</RootNamespace>
 		<AssemblyName>Bunit.Core.Tests</AssemblyName>
 	</PropertyGroup>
 
-	<ItemGroup>
+	<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
+		<PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.1" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.1" />
 		<PackageReference Include="Microsoft.AspNetCore.Components" Version="3.1.1" />
-		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.1.1" />
+	</ItemGroup>
+	<ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
+		<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0-preview.7.*" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0-preview.7.*" />
+		<PackageReference Include="Microsoft.AspNetCore.Components" Version="5.0.0-preview.7.*" />
+	</ItemGroup>
+
+	<ItemGroup>
 		<PackageReference Include="AngleSharp" Version="0.14.0" />
 		<PackageReference Include="AngleSharp.Css" Version="0.14.0" />
 		<PackageReference Include="AngleSharp.Diffing" Version="0.14.0" />

diff --git a/src/bunit.core/Extensions/ComponentParameterExtensions.cs b/src/bunit.core/Extensions/ComponentParameterExtensions.cs
@@ -63,7 +63,7 @@ static RenderFragment CreateComponentRenderFragment(IReadOnlyList<ComponentParam
 					for (var i = 0; i < parameters.Count; i++)
 					{
 						var para = parameters[i];
-						if (!para.IsCascadingValue)
+						if (!para.IsCascadingValue && para.Name is { })
 							builder.AddAttribute(i + 1, para.Name, para.Value);
 					}
 

diff --git a/src/bunit.core/Extensions/EnumerableExtensions.cs b/src/bunit.core/Extensions/EnumerableExtensions.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using System.Text;
+
+namespace Bunit.Extensions
+{
+	/// <summary>
+	/// Helper methods for working with <see cref="IEnumerable{T}"/>
+	/// </summary>
+	public static class EnumerableExtensions
+	{
+		/// <summary>
+		/// Returns true if the numerable is null or empty.
+		/// </summary>
+		public static bool IsNullOrEmpty<T>([NotNullWhen(false)]this IEnumerable<T>? enumerable)
+		{
+			return enumerable is null || !enumerable.Any();
+		}
+	}
+}
diff --git a/src/bunit.core/Extensions/RenderedComponentRenderExtensions.cs b/src/bunit.core/Extensions/RenderedComponentRenderExtensions.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Bunit.Rendering;
@@ -72,12 +72,16 @@ private static ParameterView ToParameterView(IReadOnlyList<ComponentParameter> p
 			var parameterView = ParameterView.Empty;
 			if (parameters.Any())
 			{
-				var paramDict = new Dictionary<string, object?>();
+				var paramDict = new Dictionary<string, object>();
 				foreach (var param in parameters)
 				{
 					if (param.IsCascadingValue)
 						throw new InvalidOperationException($"You cannot provide a new cascading value through the {nameof(SetParametersAndRender)} method.");
-					paramDict.Add(param.Name!, param.Value);
+					if(param.Name is null)
+						throw new InvalidOperationException($"A parameters name is required.");
+
+					// BANG: it should technically be allowed to pass null
+					paramDict.Add(param.Name, param.Value!);
 				}
 				parameterView = ParameterView.FromDictionary(paramDict);
 			}

diff --git a/src/bunit.core/Extensions/WaitForHelpers/RenderedFragmentWaitForHelperExtensions.cs b/src/bunit.core/Extensions/WaitForHelpers/RenderedFragmentWaitForHelperExtensions.cs
@@ -27,7 +27,7 @@ public static void WaitForState(this IRenderedFragmentBase renderedFragment, Fun
 			{
 				waiter.WaitTask.Wait();
 			}
-			catch (AggregateException e)
+			catch (AggregateException e) when (e.InnerException is { })
 			{
 				throw e.InnerException;
 			}
@@ -50,7 +50,7 @@ public static void WaitForAssertion(this IRenderedFragmentBase renderedFragment,
 			{
 				waiter.WaitTask.Wait();
 			}
-			catch (AggregateException e)
+			catch (AggregateException e) when (e.InnerException is { })
 			{
 				throw e.InnerException;
 			}

diff --git a/src/bunit.core/Extensions/WaitForHelpers/WaitForHelper.cs b/src/bunit.core/Extensions/WaitForHelpers/WaitForHelper.cs
@@ -108,7 +108,7 @@ private void OnAfterRender()
 			}
 		}
 
-		private void OnTimeout(object state)
+		private void OnTimeout(object? state)
 		{
 			if (_isDisposed)
 				return;

diff --git a/src/bunit.core/RazorTesting/FixtureBase.cs b/src/bunit.core/RazorTesting/FixtureBase.cs
@@ -20,7 +20,7 @@ public abstract class FixtureBase<TFixture> : RazorTestBase
 		/// <summary>
 		/// Gets or sets the child content of the fragment.
 		/// </summary>
-		[Parameter] public RenderFragment ChildContent { get; set; } = default!;
+		[Parameter] public RenderFragment? ChildContent { get; set; }
 
 		/// <summary>
 		/// Gets or sets the setup action to perform before the <see cref="Test"/> action or
@@ -48,20 +48,6 @@ public abstract class FixtureBase<TFixture> : RazorTestBase
 		/// </summary>
 		[Parameter] public Func<TFixture, Task>? TestAsync { get; set; }
 
-		/// <summary>
-		/// Obsolete. Methods assigned to this parameter will not be invoked.
-		/// </summary>
-		[Obsolete("This feature has been removed since it caused confusion about the state of the fixture being passed to the test methods. Methods assigned to this parameter will not be invoked.")]
-		[Parameter]
-		public IReadOnlyCollection<Action<TFixture>>? Tests { get; set; }
-
-		/// <summary>
-		/// Obsolete. Methods assigned to this parameter will not be invoked.
-		/// </summary>
-		[Obsolete("This feature has been removed since it caused confusion about the state of the fixture being passed to the test methods. Methods assigned to this parameter will not be invoked.")]
-		[Parameter]
-		public IReadOnlyCollection<Func<TFixture, Task>>? TestsAsync { get; set; }
-
 		/// <inheritdoc/>
 		public override Task SetParametersAsync(ParameterView parameters)
 		{
@@ -71,17 +57,9 @@ public override Task SetParametersAsync(ParameterView parameters)
 			Test = parameters.GetValueOrDefault<Action<TFixture>>(nameof(Test));
 			TestAsync = parameters.GetValueOrDefault<Func<TFixture, Task>>(nameof(TestAsync));
 
-#pragma warning disable CS0618 // Type or member is obsolete
-			if (parameters.TryGetValue<IReadOnlyCollection<Action<TFixture>>>(nameof(Tests), out var tests))
-				Tests = tests;
-			if (parameters.TryGetValue<IReadOnlyCollection<Func<TFixture, Task>>>(nameof(TestsAsync), out var asyncTests))
-				TestsAsync = asyncTests;
-#pragma warning restore CS0618 // Type or member is obsolete
-
 			return base.SetParametersAsync(parameters);
 		}
 
-
 		/// <inheritdoc/>
 		[SuppressMessage("Usage", "CA2208:Instantiate argument exceptions correctly", Justification = "Validating component parameters")]
 		public override void Validate()
@@ -93,12 +71,6 @@ public override void Validate()
 				throw new ArgumentException($"No test action provided via the '{nameof(Test)}' or '{nameof(TestAsync)}' parameters to the {GetType().Name} component.", nameof(Test));
 			if (Test is { } && TestAsync is { })
 				throw new ArgumentException($"Only one of the '{nameof(Test)}' or '{nameof(TestAsync)}' actions can be provided to the {GetType().Name} component at the same time.", nameof(Test));
-#pragma warning disable CS0618 // Type or member is obsolete
-			if (Tests is { })
-				throw new ArgumentException($"The use of the '{nameof(Tests)}' parameter has been obsoleted, and any methods assigned to it will not longer be invoked.");
-			if (TestsAsync is { })
-				throw new ArgumentException($"The use of the '{nameof(TestsAsync)}' parameter has been obsoleted, and any methods assigned to it will not longer be invoked.");
-#pragma warning restore CS0618 // Type or member is obsolete
 		}
 
 		/// <inheritdoc/>

diff --git a/src/bunit.core/Rendering/ComponentParameter.cs b/src/bunit.core/Rendering/ComponentParameter.cs
@@ -79,7 +79,7 @@ public bool Equals(ComponentParameter other)
 			=> string.Equals(Name, other.Name, StringComparison.Ordinal) && Value == other.Value && IsCascadingValue == other.IsCascadingValue;
 
 		/// <inheritdoc/>
-		public override bool Equals(object obj) => obj is ComponentParameter other && Equals(other);
+		public override bool Equals(object? obj) => obj is ComponentParameter other && Equals(other);
 
 		/// <inheritdoc/>
 		public override int GetHashCode() => HashCode.Combine(Name, Value, IsCascadingValue);

diff --git a/src/bunit.core/bunit.core.csproj b/src/bunit.core/bunit.core.csproj
@@ -1,16 +1,16 @@
-<Project Sdk="Microsoft.NET.Sdk.Razor">
+<Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-    <RazorLangVersion>3.0</RazorLangVersion>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <RootNamespace>Bunit</RootNamespace>
+	<PropertyGroup>
+		<TargetFrameworks>netstandard2.1;net5.0</TargetFrameworks>
+		<RazorLangVersion>3.0</RazorLangVersion>
+		<GenerateDocumentationFile>true</GenerateDocumentationFile>
+		<RootNamespace>Bunit</RootNamespace>
 		<AssemblyName>Bunit.Core</AssemblyName>
-  </PropertyGroup>
+	</PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)' == 'Release'">
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-  </PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)' == 'Release'">
+		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+	</PropertyGroup>
 
 	<PropertyGroup>
 		<PackageId>bunit.core</PackageId>
@@ -26,21 +26,28 @@
 		<Description>
 			bUnit.core is the base library that provides support for testing Blazor components. You need to install bUnit.web as well to test web-based Blazor components.
 		</Description>
-    <PublishRepositoryUrl>true</PublishRepositoryUrl>
-    <EmbedUntrackedSources>true</EmbedUntrackedSources>
-    <IncludeSymbols>true</IncludeSymbols>
-    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+		<PublishRepositoryUrl>true</PublishRepositoryUrl>
+		<EmbedUntrackedSources>true</EmbedUntrackedSources>
+		<IncludeSymbols>true</IncludeSymbols>
+		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
 		<Deterministic>true</Deterministic>
 	</PropertyGroup>
 
-	<ItemGroup>
+	<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
 		<PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.1" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Components" Version="3.1.1" />
+		<PackageReference Include="Microsoft.AspNetCore.Components" Version="3.1.1" />
+	</ItemGroup>
+	<ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
+		<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0-preview.7.*" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0-preview.7.*" />
+		<PackageReference Include="Microsoft.AspNetCore.Components" Version="5.0.0-preview.7.*" />
+	</ItemGroup>
+	<ItemGroup>
 		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
-		<PackageReference Include="Nerdbank.GitVersioning" Version="3.1.91">
-		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-		  <PrivateAssets>all</PrivateAssets>
+		<PackageReference Include="Nerdbank.GitVersioning" Version="3.2.31">
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+			<PrivateAssets>all</PrivateAssets>
 		</PackageReference>
 	</ItemGroup>
 

diff --git a/src/bunit.sln b/src/bunit.sln
@@ -8,7 +8,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".items", ".items", "{A5D7B6
 		.editorconfig = .editorconfig
 		..\CHANGELOG.md = ..\CHANGELOG.md
 		Directory.Build.props = Directory.Build.props
-		..\global.json = ..\global.json
 		..\README.md = ..\README.md
 	EndProjectSection
 EndProject
@@ -41,8 +40,12 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{785D7644-18F2-45E4-9B30-016ADB7AB9E3}"
 	ProjectSection(SolutionItems) = preProject
 		..\.github\workflows\CI-CD-Docs.yml = ..\.github\workflows\CI-CD-Docs.yml
+		..\.github\workflows\CI-PR.yml = ..\.github\workflows\CI-PR.yml
 		..\.github\workflows\CI.yml = ..\.github\workflows\CI.yml
+		..\.github\workflows\DEV-GPR-PUSH.yml = ..\.github\workflows\DEV-GPR-PUSH.yml
 		..\.github\workflows\nuget-pack-push.yml = ..\.github\workflows\nuget-pack-push.yml
+		..\.github\workflows\NUGET-PUSH.yml = ..\.github\workflows\NUGET-PUSH.yml
+		..\.github\workflows\RELEASE.yml = ..\.github\workflows\RELEASE.yml
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "bunit.template", "bunit.template\bunit.template.csproj", "{58FB9C26-7170-426C-ACE8-A98237710CDB}"

diff --git a/src/bunit.template/bunit.template.csproj b/src/bunit.template/bunit.template.csproj
@@ -10,11 +10,11 @@
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
 		<Description>A project template for a testing Blazor/Razor components using the bUnit library.</Description>
 		<PackageDescription>
-    A project template for a testing Blazor/Razor components using the bUnit library.
+			A project template for a testing Blazor/Razor components using the bUnit library.
 
-    bUnit is a testing library for Blazor Components. You can easily define components under test in C# or Razor syntax and verify outcome using semantic HTML diffing/comparison logic. You can easily interact with and inspect components, trigger event handlers, provide cascading values, inject services, mock IJSRuntime, and perform snapshot testing.
+			bUnit is a testing library for Blazor Components. You can easily define components under test in C# or Razor syntax and verify outcome using semantic HTML diffing/comparison logic. You can easily interact with and inspect components, trigger event handlers, provide cascading values, inject services, mock IJSRuntime, and perform snapshot testing.
 
-    The library's goal is to make it easy to write comprehensive, stable unit tests for Blazor Components/Razor Components. Go to bunit.egilhansen.com to learn more.
+			The library's goal is to make it easy to write comprehensive, stable unit tests for Blazor Components/Razor Components. Go to bunit.egilhansen.com to learn more.
 		</PackageDescription>
 		<PackageTags>bUnit;razor components;blazor components;unit testing;testing blazor components;blazor server;blazor wasm</PackageTags>
 		<PackageProjectUrl>https://github.com/egil/bunit</PackageProjectUrl>
@@ -30,7 +30,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Nerdbank.GitVersioning" Version="3.1.91">
+		<PackageReference Include="Nerdbank.GitVersioning" Version="3.2.31">
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 			<PrivateAssets>all</PrivateAssets>
 		</PackageReference>