Merge branch 'main' into stable

egil · web-flow · commit 770a98fb22c3 · 2021-04-28T17:51:39.000Z
diff --git a/.github/workflows/docs-deploy.yml b/.github/workflows/docs-deploy.yml
@@ -4,8 +4,8 @@ on:
   push:
     branches:
       - stable
-    paths-ignore:
-      - '!docs/**'
+    paths:
+      - 'docs/**'
 
   workflow_dispatch:
 
@@ -19,6 +19,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
+          token: ${{ secrets.BUNIT_BOT_TOKEN }}
 
       - name: ⚙️ Import GPG key
         id: import_gpg
@@ -98,7 +99,7 @@ jobs:
         if: ${{ failure() }}
         uses: thomaseizinger/create-pull-request@1.0.0
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.BUNIT_BOT_TOKEN }}
         with:
           head: stable
           base: main
diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml
@@ -85,7 +85,7 @@ jobs:
       - name: ⏭ Create pull request for release branch
         uses: thomaseizinger/create-pull-request@1.0.0
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.BUNIT_BOT_TOKEN }}
         with:
           head: release/v${{ env.NBGV_MajorMinorVersion }}
           base: stable
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -120,7 +120,7 @@ jobs:
         if: ${{ failure() }}
         uses: thomaseizinger/create-pull-request@1.0.0
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.BUNIT_BOT_TOKEN }}
         with:
           head: stable
           base: main
diff --git a/.github/workflows/verification.yml b/.github/workflows/verification.yml
@@ -7,19 +7,13 @@ on:
       - stable
     paths:
       - 'src/**'
-      - 'tests/**'    
+      - 'tests/**'
 
   pull_request:
-    branches:
-      - main
-      - stable  
     types:
       - opened
       - synchronize
       - reopened
-    paths:
-      - 'src/**'
-      - 'tests/**'          
 
   workflow_dispatch:
 
@@ -67,7 +61,10 @@ jobs:
         run: dotnet build -c release -p:ContinuousIntegrationBuild=true
 
       - name: 🧪 Run unit tests
-        run: dotnet test -c release --no-build  --logger GitHubActions
+        run: |
+          dotnet test tests/bunit.core.tests -c release --no-build --logger GitHubActions
+          dotnet test tests/bunit.web.tests -c release --no-build --logger GitHubActions
+          dotnet test tests/bunit.web.testcomponents.tests -c release --no-build --logger GitHubActions
 
       - name: 🗳️ Create library packages
         run: |
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@ All notable changes to **bUnit** will be documented in this file. The project ad
 
 ## [Unreleased]
 
+### Added
+
+- All bUnit assemblies is now strong named signed.
+
 ### Changed
 
 - Changed bunit.template such that created projects only reference the bunit package. Bumped other referenced packages to latest version.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -22,6 +22,8 @@
 		<!-- Used by code coverage -->
 		<DebugType>full</DebugType>
 		<DebugSymbols>true</DebugSymbols>
+		<SignAssembly>true</SignAssembly>
+		<AssemblyOriginatorKeyFile>../../key.snk</AssemblyOriginatorKeyFile>
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.1' OR '$(TargetFramework)' == 'netcoreapp3.1'">
diff --git a/README.md b/README.md
@@ -1,11 +1,11 @@
-[![GitHub tag (latest SemVer pre-release)](https://img.shields.io/github/v/tag/egil/bunit?include_prereleases&logo=github&style=flat-square)](https://github.com/egil/bunit/releases)
-[![Nuget](https://img.shields.io/nuget/dt/bunit?logo=nuget&style=flat-square)](https://www.nuget.org/packages/bunit/)
-[![Issues Open](https://img.shields.io/github/issues/egil/bunit.svg?style=flat-square&logo=github)](https://github.com/egil/bunit/issues)
+[![GitHub tag](https://img.shields.io/github/v/tag/bUnit-dev/bUnit?include_prereleases&logo=github&style=flat-square)](https://github.com/egil/bunit/releases)
+[![NuGet](https://img.shields.io/nuget/dt/bunit?logo=nuget&style=flat-square)](https://www.nuget.org/packages/bunit/)
+[![Issues Open](https://img.shields.io/github/issues/bUnit-dev/bUnit.svg?style=flat-square&logo=github)](https://github.com/bUnit-dev/bUnit/issues)
 [![Gitter](https://img.shields.io/gitter/room/egil/bunit?logo=gitter&style=flat-square)](https://gitter.im/egil/bunit?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 
 # bUnit - a testing library for Blazor components
 
-<a href="https://www.telerik.com/campaigns/blazor/free-trial-1?utm_source=egilhansen&utm_medium=cpm&utm_campaign=blazor-trial-readme-sponsored-message"><img align="right" width="200" src="https://raw.githubusercontent.com/egil/bUnit/main/docs/site/sponsors/telerik-ad-github.svg"  /></a>
+<a href="https://www.telerik.com/campaigns/blazor/free-trial-1?utm_source=egilhansen&utm_medium=cpm&utm_campaign=blazor-trial-readme-sponsored-message"><img align="right" width="200" src="https://raw.githubusercontent.com/bUnit-dev/bUnit/main/docs/site/sponsors/telerik-ad-github.svg"  /></a>
 
 **bUnit** is a testing library for Blazor Components. Its goal is to make it easy to write _comprehensive, stable_ unit tests. With bUnit, you can:
 
diff --git a/key.snk b/key.snk
diff --git a/src/bunit.core/InternalsVisibleTo.cs b/src/bunit.core/InternalsVisibleTo.cs
@@ -1 +1 @@
-[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Bunit.Core.Tests")]
+[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Bunit.Core.Tests, PublicKey=002400000480000094000000060200000024000052534131000400000100010001be6b1a2ca57b09b7040e2ab0993e515296ae22aef4031a4fe388a1336fe21f69c7e8610e9935de6ed18d94b5c98429f99ef62ce3d0af28a7088f856239368ea808ad4c448aa2a8075ed581f989f36ed0d0b8b1cfcaf1ff6a4506c8a99b7024b6eb56996d08e3c9c1cf5db59bff96fcc63ccad155ef7fc63aab6a69862437b6")]
diff --git a/src/bunit.web.testcomponents/InternalsVisibleTo.cs b/src/bunit.web.testcomponents/InternalsVisibleTo.cs
@@ -1 +1 @@
-[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Bunit.Web.TestComponents.Tests")]
+[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Bunit.Web.TestComponents.Tests, PublicKey=002400000480000094000000060200000024000052534131000400000100010001be6b1a2ca57b09b7040e2ab0993e515296ae22aef4031a4fe388a1336fe21f69c7e8610e9935de6ed18d94b5c98429f99ef62ce3d0af28a7088f856239368ea808ad4c448aa2a8075ed581f989f36ed0d0b8b1cfcaf1ff6a4506c8a99b7024b6eb56996d08e3c9c1cf5db59bff96fcc63ccad155ef7fc63aab6a69862437b6")]
diff --git a/src/bunit.web.testcomponents/bunit.web.testcomponents.csproj b/src/bunit.web.testcomponents/bunit.web.testcomponents.csproj
@@ -19,7 +19,7 @@ NOTE: This package represents experimental features of bUnit that has been super
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="SourceFileFinder" Version="1.0.1" />
+		<PackageReference Include="SourceFileFinder" Version="1.1.0" />
 		<PackageReference Include="System.Reflection.Metadata" Version="$(DotNet5Version)" />
 		<PackageReference Include="xunit.assert" Version="2.4.1" />
 		<PackageReference Include="xunit.extensibility.core" Version="2.4.1" />
diff --git a/src/bunit.web/InternalsVisibleTo.cs b/src/bunit.web/InternalsVisibleTo.cs
@@ -1 +1 @@
-[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Bunit.Web.Tests")]
+[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Bunit.Web.Tests, PublicKey=002400000480000094000000060200000024000052534131000400000100010001be6b1a2ca57b09b7040e2ab0993e515296ae22aef4031a4fe388a1336fe21f69c7e8610e9935de6ed18d94b5c98429f99ef62ce3d0af28a7088f856239368ea808ad4c448aa2a8075ed581f989f36ed0d0b8b1cfcaf1ff6a4506c8a99b7024b6eb56996d08e3c9c1cf5db59bff96fcc63ccad155ef7fc63aab6a69862437b6")]
diff --git a/src/bunit.web/bunit.web.csproj b/src/bunit.web/bunit.web.csproj
@@ -15,10 +15,10 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="AngleSharp" Version="0.14.0" />
-		<PackageReference Include="AngleSharp.Css" Version="0.14.2" />
-		<PackageReference Include="AngleSharp.Diffing" Version="0.14.0" />
-		<PackageReference Include="AngleSharp.Wrappers" Version="1.2.0" />
+		<PackageReference Include="AngleSharp" Version="0.15.0" />
+		<PackageReference Include="AngleSharp.Css" Version="0.15.0" />
+		<PackageReference Include="AngleSharp.Diffing" Version="0.15.0" />
+		<PackageReference Include="AngleSharp.Wrappers" Version="1.3.0" />
 	</ItemGroup>
 	
 	<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
diff --git a/tests/bunit.testassets/Serilog.Sinks.XUnit/NOTICE.md b/tests/bunit.testassets/Serilog.Sinks.XUnit/NOTICE.md
@@ -0,0 +1,4 @@
+# LEGAL NOTICE
+
+The files in this folder has been copied from https://github.com/trbenning/serilog-sinks-xunit,
+since the project does not use strong name signing.
diff --git a/tests/bunit.testassets/Serilog.Sinks.XUnit/TestOutputSink.cs b/tests/bunit.testassets/Serilog.Sinks.XUnit/TestOutputSink.cs
@@ -0,0 +1,41 @@
+using System;
+using System.IO;
+using Serilog.Core;
+using Serilog.Events;
+using Serilog.Formatting;
+using Xunit.Abstractions;
+using Xunit.Sdk;
+
+namespace Serilog.Sinks.XUnit
+{
+	internal class TestOutputSink : ILogEventSink
+	{
+		private readonly IMessageSink messageSink;
+		private readonly ITestOutputHelper testOutputHelper;
+		private readonly ITextFormatter textFormatter;
+
+		public TestOutputSink(IMessageSink messageSink, ITextFormatter textFormatter)
+		{
+			this.messageSink = messageSink ?? throw new ArgumentNullException(nameof(messageSink));
+			this.textFormatter = textFormatter ?? throw new ArgumentNullException(nameof(textFormatter));
+		}
+
+		public TestOutputSink(ITestOutputHelper testOutputHelper, ITextFormatter textFormatter)
+		{
+			this.testOutputHelper = testOutputHelper ?? throw new ArgumentNullException(nameof(testOutputHelper));
+			this.textFormatter = textFormatter ?? throw new ArgumentNullException(nameof(textFormatter));
+		}
+
+		public void Emit(LogEvent logEvent)
+		{
+			if (logEvent == null)
+				throw new ArgumentNullException(nameof(logEvent));
+
+			using var renderSpace = new StringWriter();
+			textFormatter.Format(logEvent, renderSpace);
+			var message = renderSpace.ToString().Trim();
+			messageSink?.OnMessage(new DiagnosticMessage(message));
+			testOutputHelper?.WriteLine(message);
+		}
+	}
+}
diff --git a/tests/bunit.testassets/Serilog.Sinks.XUnit/XUnitLoggerConfigurationExtensions.cs b/tests/bunit.testassets/Serilog.Sinks.XUnit/XUnitLoggerConfigurationExtensions.cs
@@ -0,0 +1,133 @@
+using System;
+using Serilog.Configuration;
+using Serilog.Core;
+using Serilog.Events;
+using Serilog.Formatting;
+using Serilog.Formatting.Display;
+using Serilog.Sinks.XUnit;
+using Xunit.Abstractions;
+
+namespace Serilog
+{
+	/// <summary>
+	/// Adds the WriteTo.TestOutput() extension method to <see cref="LoggerConfiguration"/>.
+	/// </summary>
+	public static class TestOutputLoggerConfigurationExtensions
+	{
+		internal const string DefaultConsoleOutputTemplate = "{Timestamp:yyyy-MM-dd HH:mm:ss} [{Level}] {Message}{NewLine}{Exception}";
+
+		/// <summary>
+		/// Writes log events to <see cref="ITestOutputHelper"/>.
+		/// </summary>
+		/// <param name="sinkConfiguration">Logger sink configuration.</param>
+		/// <param name="messageSink">The <see cref="IMessageSink"/> that will be written to.</param>
+		/// <param name="restrictedToMinimumLevel">The minimum level for
+		/// events passed through the sink. Ignored when <paramref name="levelSwitch"/> is specified.</param>
+		/// <param name="outputTemplate">A message template describing the format used to write to the sink.
+		/// the default is "{Timestamp} [{Level}] {Message}{NewLine}{Exception}".</param>
+		/// <param name="formatProvider">Supplies culture-specific formatting information, or null.</param>
+		/// <param name="levelSwitch">A switch allowing the pass-through minimum level to be changed at runtime.</param>
+		/// <returns>Configuration object allowing method chaining.</returns>
+		public static LoggerConfiguration TestOutput(
+			this LoggerSinkConfiguration sinkConfiguration,
+			IMessageSink messageSink,
+			LogEventLevel restrictedToMinimumLevel = LevelAlias.Minimum,
+			string outputTemplate = DefaultConsoleOutputTemplate,
+			IFormatProvider formatProvider = null,
+			LoggingLevelSwitch levelSwitch = null)
+		{
+			if (sinkConfiguration == null)
+				throw new ArgumentNullException(nameof(sinkConfiguration));
+			if (messageSink == null)
+				throw new ArgumentNullException(nameof(messageSink));
+
+			var formatter = new MessageTemplateTextFormatter(outputTemplate, formatProvider);
+
+			return sinkConfiguration.Sink(new TestOutputSink(messageSink, formatter), restrictedToMinimumLevel, levelSwitch);
+		}
+
+		/// <summary>
+		/// Writes log events to <see cref="ITestOutputHelper"/>.
+		/// </summary>
+		/// <param name="sinkConfiguration">Logger sink configuration.</param>
+		/// <param name="messageSink">The <see cref="IMessageSink"/> that will be written to.</param>
+		/// <param name="formatter">Controls the rendering of log events into text, for example to log JSON. To
+		/// control plain text formatting, use the overload that accepts an output template.</param>
+		/// <param name="restrictedToMinimumLevel">The minimum level for
+		/// events passed through the sink. Ignored when <paramref name="levelSwitch"/> is specified.</param>
+		/// <param name="levelSwitch">A switch allowing the pass-through minimum level
+		/// to be changed at runtime.</param>
+		/// <returns>Configuration object allowing method chaining.</returns>
+		public static LoggerConfiguration TestOutput(
+			this LoggerSinkConfiguration sinkConfiguration,
+			IMessageSink messageSink,
+			ITextFormatter formatter,
+			LogEventLevel restrictedToMinimumLevel = LevelAlias.Minimum,
+			LoggingLevelSwitch levelSwitch = null)
+		{
+			if (sinkConfiguration == null)
+				throw new ArgumentNullException(nameof(sinkConfiguration));
+			if (formatter == null)
+				throw new ArgumentNullException(nameof(formatter));
+
+			return sinkConfiguration.Sink(new TestOutputSink(messageSink, formatter), restrictedToMinimumLevel, levelSwitch);
+		}
+
+		/// <summary>
+		/// Writes log events to <see cref="ITestOutputHelper"/>.
+		/// </summary>
+		/// <param name="sinkConfiguration">Logger sink configuration.</param>
+		/// <param name="testOutputHelper">The <see cref="ITestOutputHelper"/> that will be written to.</param>
+		/// <param name="restrictedToMinimumLevel">The minimum level for
+		/// events passed through the sink. Ignored when <paramref name="levelSwitch"/> is specified.</param>
+		/// <param name="outputTemplate">A message template describing the format used to write to the sink.
+		/// the default is "{Timestamp} [{Level}] {Message}{NewLine}{Exception}".</param>
+		/// <param name="formatProvider">Supplies culture-specific formatting information, or null.</param>
+		/// <param name="levelSwitch">A switch allowing the pass-through minimum level to be changed at runtime.</param>
+		/// <returns>Configuration object allowing method chaining.</returns>
+		public static LoggerConfiguration TestOutput(
+			this LoggerSinkConfiguration sinkConfiguration,
+			ITestOutputHelper testOutputHelper,
+			LogEventLevel restrictedToMinimumLevel = LevelAlias.Minimum,
+			string outputTemplate = DefaultConsoleOutputTemplate,
+			IFormatProvider formatProvider = null,
+			LoggingLevelSwitch levelSwitch = null)
+		{
+			if (sinkConfiguration == null)
+				throw new ArgumentNullException(nameof(sinkConfiguration));
+			if (testOutputHelper == null)
+				throw new ArgumentNullException(nameof(testOutputHelper));
+
+			var formatter = new MessageTemplateTextFormatter(outputTemplate, formatProvider);
+
+			return sinkConfiguration.Sink(new TestOutputSink(testOutputHelper, formatter), restrictedToMinimumLevel, levelSwitch);
+		}
+
+		/// <summary>
+		/// Writes log events to <see cref="ITestOutputHelper"/>.
+		/// </summary>
+		/// <param name="sinkConfiguration">Logger sink configuration.</param>
+		/// <param name="testOutputHelper">The <see cref="ITestOutputHelper"/> that will be written to.</param>
+		/// <param name="formatter">Controls the rendering of log events into text, for example to log JSON. To
+		/// control plain text formatting, use the overload that accepts an output template.</param>
+		/// <param name="restrictedToMinimumLevel">The minimum level for
+		/// events passed through the sink. Ignored when <paramref name="levelSwitch"/> is specified.</param>
+		/// <param name="levelSwitch">A switch allowing the pass-through minimum level
+		/// to be changed at runtime.</param>
+		/// <returns>Configuration object allowing method chaining.</returns>
+		public static LoggerConfiguration TestOutput(
+			this LoggerSinkConfiguration sinkConfiguration,
+			ITestOutputHelper testOutputHelper,
+			ITextFormatter formatter,
+			LogEventLevel restrictedToMinimumLevel = LevelAlias.Minimum,
+			LoggingLevelSwitch levelSwitch = null)
+		{
+			if (sinkConfiguration == null)
+				throw new ArgumentNullException(nameof(sinkConfiguration));
+			if (formatter == null)
+				throw new ArgumentNullException(nameof(formatter));
+
+			return sinkConfiguration.Sink(new TestOutputSink(testOutputHelper, formatter), restrictedToMinimumLevel, levelSwitch);
+		}
+	}
+}
diff --git a/tests/bunit.testassets/bunit.testassets.csproj b/tests/bunit.testassets/bunit.testassets.csproj
@@ -7,11 +7,11 @@
 	</PropertyGroup>
 
 	<ItemGroup>
+		<PackageReference Include="xunit.core" Version="2.4.1" />
 		<PackageReference Include="xunit.assert" Version="2.4.1" />
 		<PackageReference Include="xunit.abstractions" Version="2.0.3" />
 		<PackageReference Include="Serilog" Version="2.10.0" />
 		<PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
-		<PackageReference Include="Serilog.Sinks.XUnit" Version="2.0.4" />
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
diff --git a/tests/bunit.web.tests/Asserting/JSRuntimeAssertExtensionsTest.cs b/tests/bunit.web.tests/Asserting/JSRuntimeAssertExtensionsTest.cs
@@ -14,7 +14,7 @@ namespace Bunit.Asserting
 {
 	public class JSRuntimeAssertExtensionsTest
 	{
-		private static BunitJSInterop CreateSut(JSRuntimeMode mode = JSRuntimeMode.Loose) => new BunitJSInterop { Mode = mode };
+		private static BunitJSInterop CreateSut(JSRuntimeMode mode = JSRuntimeMode.Loose) => new() { Mode = mode };
 
 		[Fact(DisplayName = "BunitJSInterop.VerifyNotInvoke throws if handler is null")]
 		public void Test001()
diff --git a/version.json b/version.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "1.0",
+  "version": "1.1-preview",
   "assemblyVersion": {
     "precision": "revision"
   },
@@ -12,7 +12,7 @@
   ],
 	"pathFilters": [
 		"./src"
-	],  
+	],
   "cloudBuild": {
 		"setVersionVariables": true,
 		"buildNumber": {

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Bunit.Core.Tests")]`
	`1`	`+[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Bunit.Core.Tests, PublicKey=002400000480000094000000060200000024000052534131000400000100010001be6b1a2ca57b09b7040e2ab0993e515296ae22aef4031a4fe388a1336fe21f69c7e8610e9935de6ed18d94b5c98429f99ef62ce3d0af28a7088f856239368ea808ad4c448aa2a8075ed581f989f36ed0d0b8b1cfcaf1ff6a4506c8a99b7024b6eb56996d08e3c9c1cf5db59bff96fcc63ccad155ef7fc63aab6a69862437b6")]`