feat: add explicit support for net6 preview 3

egil · egil · commit 23e05128f082 · 2021-04-28T22:45:24.000Z
diff --git a/.github/workflows/docs-deploy.yml b/.github/workflows/docs-deploy.yml
@@ -63,6 +63,11 @@ jobs:
         with:
           dotnet-version: '5.0.x'
 
+      - name: ⚙️ Setup dotnet 6.0.x
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '6.0.x'
+
       - name: 🛠️ Building bUnit
         run: dotnet build /p:PublicRelease=true
 
diff --git a/.github/workflows/release-preview.yml b/.github/workflows/release-preview.yml
@@ -27,6 +27,11 @@ jobs:
         uses: actions/setup-dotnet@v1
         with:
           dotnet-version: '5.0.x'
+
+      - name: ⚙️ Setup dotnet 6.0.x
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '6.0.x'
       
       - name: 🛠️ Update tokens in project files
         uses: cschleiden/replace-tokens@v1
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -64,6 +64,11 @@ jobs:
         with:
           dotnet-version: '5.0.x'
 
+      - name: ⚙️ Setup dotnet 6.0.x
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '6.0.x'
+
       - name: 🛠️ Update changelog
         uses: thomaseizinger/keep-a-changelog-new-release@1.2.1
         with:
diff --git a/.github/workflows/verification.yml b/.github/workflows/verification.yml
@@ -42,6 +42,11 @@ jobs:
         with:
           dotnet-version: '5.0.x'
 
+      - name: ⚙️ Setup dotnet 6.0.x
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '6.0.x'
+
       - name: ⚙️ Setup GIT versioning
         uses: dotnet/nbgv@v0.4.0
         with:
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -4,6 +4,7 @@
 	<PropertyGroup Label="Configuration variables">
 		<DotNet3Version>3.1.1</DotNet3Version>
 		<DotNet5Version>5.0.0</DotNet5Version>
+		<DotNet6Version>6.0.0-preview.3.*</DotNet6Version>
 	</PropertyGroup>
 
 	<!-- Solution wide properties -->
@@ -67,4 +68,12 @@
 		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="$(DotNet5Version)" />
 	</ItemGroup>
 
+	<ItemGroup Condition="'$(TargetFramework)' == 'net6.0' AND $(MSBuildProjectName) != 'bunit.template' AND $(MSBuildProjectName) != 'bunit'">
+		<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="$(DotNet6Version)" />
+		<PackageReference Include="Microsoft.Extensions.Logging" Version="$(DotNet6Version)" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(DotNet6Version)" />
+		<PackageReference Include="Microsoft.AspNetCore.Components" Version="$(DotNet6Version)" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="$(DotNet6Version)" />
+	</ItemGroup>
+
 </Project>
diff --git a/bunit.sln b/bunit.sln
@@ -53,6 +53,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "bunit.web.testcomponents.te
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".workflows", ".workflows", "{3B2F3419-5336-4147-A212-E19091195203}"
 	ProjectSection(SolutionItems) = preProject
+		.github\workflows\docs-deploy.yml = .github\workflows\docs-deploy.yml
+		.github\workflows\prepare-release.yml = .github\workflows\prepare-release.yml
+		.github\workflows\release-preview.yml = .github\workflows\release-preview.yml
+		.github\workflows\release.yml = .github\workflows\release.yml
 		.github\workflows\verification.yml = .github\workflows\verification.yml
 	EndProjectSection
 EndProject
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
     "sdk": {
         "rollForward": "latestMajor",
-        "allowPrerelease": false
+        "allowPrerelease": true
     }
-}
+}
diff --git a/src/bunit.core/bunit.core.csproj b/src/bunit.core/bunit.core.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>netstandard2.1;net5.0</TargetFrameworks>
+		<TargetFrameworks>netstandard2.1;net5.0;net6.0</TargetFrameworks>
 		<RootNamespace>Bunit</RootNamespace>
 		<AssemblyName>Bunit.Core</AssemblyName>
 	</PropertyGroup>
diff --git a/src/bunit.web/Asserting/FocusAsyncAssertJSInteropExtensions.cs b/src/bunit.web/Asserting/FocusAsyncAssertJSInteropExtensions.cs
@@ -1,4 +1,4 @@
-#if NET5_0
+#if !NETSTANDARD2_1
 using System.Collections.Generic;
 using Bunit.JSInterop.InvocationHandlers.Implementation;
 using Microsoft.AspNetCore.Components;
diff --git a/src/bunit.web/EventDispatchExtensions/DetailsElementEventDispatcherExtensions.cs b/src/bunit.web/EventDispatchExtensions/DetailsElementEventDispatcherExtensions.cs
@@ -1,4 +1,4 @@
-#if NET5_0
+#if !NETSTANDARD2_1
 using System;
 using System.Threading.Tasks;
 using AngleSharp.Dom;
diff --git a/src/bunit.web/JSInterop/BunitJSInterop.cs b/src/bunit.web/JSInterop/BunitJSInterop.cs
@@ -3,7 +3,7 @@
 using System.Threading.Tasks;
 using Bunit.JSInterop;
 using Bunit.JSInterop.InvocationHandlers;
-#if NET5_0
+#if !NETSTANDARD2_1
 using Bunit.JSInterop.InvocationHandlers.Implementation;
 #endif
 using Microsoft.JSInterop;
@@ -41,7 +41,7 @@ public BunitJSInterop()
 		{
 			mode = JSRuntimeMode.Strict;
 			JSRuntime = new BunitJSRuntime(this);
-#if NET5_0
+#if !NETSTANDARD2_1
 			AddCustomHandlers();
 #endif
 		}
@@ -130,7 +130,7 @@ internal virtual void RegisterInvocation(JSRuntimeInvocation invocation)
 			return default;
 		}
 
-#if NET5_0
+#if !NETSTANDARD2_1
 		private void AddCustomHandlers()
 		{
 			AddInvocationHandler(new FocusAsyncInvocationHandler());
diff --git a/src/bunit.web/JSInterop/BunitJSInteropSetupExtensions.cs b/src/bunit.web/JSInterop/BunitJSInteropSetupExtensions.cs
@@ -24,7 +24,7 @@ public static JSRuntimeInvocationHandler<TResult> Setup<TResult>(this BunitJSInt
 			if (jsInterop is null)
 				throw new ArgumentNullException(nameof(jsInterop));
 
-#if NET5_0
+#if !NETSTANDARD2_1
 			EnsureResultNotIJSObjectReference<TResult>();
 #endif
 
@@ -157,13 +157,16 @@ public static JSRuntimeInvocationHandler SetupVoid(this BunitJSInterop jsInterop
 				x => x.IsVoidResultHandler) as JSRuntimeInvocationHandler;
 		}
 
-#if NET5_0
+#if !NETSTANDARD2_1
 		private static void EnsureResultNotIJSObjectReference<TResult>()
 		{
 			const string UseSetupModuleErrorMessage = "Use one of the SetupModule() methods instead to set up an invocation handler that returns an IJSObjectReference.";
+
 			var resultType = typeof(TResult);
+
 			if (resultType == typeof(IJSObjectReference))
 				throw new ArgumentException(UseSetupModuleErrorMessage);
+
 			if (resultType == typeof(Microsoft.JSInterop.Implementation.JSObjectReference))
 				throw new ArgumentException(UseSetupModuleErrorMessage);
 		}
diff --git a/src/bunit.web/JSInterop/BunitJSInteropSetupExtensions.net5.cs b/src/bunit.web/JSInterop/BunitJSInteropSetupExtensions.net5.cs
@@ -1,4 +1,4 @@
-#if NET5_0
+#if !NETSTANDARD2_1
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
diff --git a/src/bunit.web/JSInterop/BunitJSModuleInterop.cs b/src/bunit.web/JSInterop/BunitJSModuleInterop.cs
@@ -1,4 +1,4 @@
-#if NET5_0
+#if !NETSTANDARD2_1
 namespace Bunit
 {
 	/// <summary>
diff --git a/src/bunit.web/JSInterop/Implementation/BunitJSObjectReference.cs b/src/bunit.web/JSInterop/Implementation/BunitJSObjectReference.cs
@@ -1,4 +1,4 @@
-#if NET5_0
+#if !NETSTANDARD2_1
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Threading;
diff --git a/src/bunit.web/JSInterop/Implementation/BunitJSRuntime.net5.cs b/src/bunit.web/JSInterop/Implementation/BunitJSRuntime.net5.cs
@@ -1,4 +1,4 @@
-#if NET5_0
+#if !NETSTANDARD2_1
 using System;
 using Bunit.JSInterop.Implementation;
 using Microsoft.JSInterop;
diff --git a/src/bunit.web/JSInterop/InvocationHandlers/Implementation/FocusAsyncInvocationHandler.cs b/src/bunit.web/JSInterop/InvocationHandlers/Implementation/FocusAsyncInvocationHandler.cs
@@ -1,4 +1,4 @@
-#if NET5_0
+#if !NETSTANDARD2_1
 using System;
 using Microsoft.AspNetCore.Components;
 
diff --git a/src/bunit.web/JSInterop/InvocationHandlers/Implementation/JSObjectReferenceInvocationHandler.cs b/src/bunit.web/JSInterop/InvocationHandlers/Implementation/JSObjectReferenceInvocationHandler.cs
@@ -1,4 +1,4 @@
-#if NET5_0
+#if !NETSTANDARD2_1
 using System.Diagnostics.CodeAnalysis;
 using Microsoft.JSInterop;
 
diff --git a/src/bunit.web/JSInterop/InvocationHandlers/Implementation/LooseModeJSObjectReferenceInvocationHandler.cs b/src/bunit.web/JSInterop/InvocationHandlers/Implementation/LooseModeJSObjectReferenceInvocationHandler.cs
@@ -1,4 +1,4 @@
-#if NET5_0
+#if !NETSTANDARD2_1
 using System.Diagnostics.CodeAnalysis;
 using Microsoft.JSInterop;
 
diff --git a/src/bunit.web/JSInterop/InvocationHandlers/Implementation/VirtualizeJSRuntimeInvocationHandler.cs b/src/bunit.web/JSInterop/InvocationHandlers/Implementation/VirtualizeJSRuntimeInvocationHandler.cs
@@ -1,4 +1,4 @@
-#if NET5_0
+#if !NETSTANDARD2_1
 using System;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
@@ -15,7 +15,7 @@ namespace Bunit.JSInterop.InvocationHandlers.Implementation
 	internal sealed class VirtualizeJSRuntimeInvocationHandler : JSRuntimeInvocationHandler
 	{
 		private const string JsFunctionsPrefix = "Blazor._internal.Virtualize.";
-		private static readonly Lazy<(PropertyInfo, MethodInfo)> VirtualizeReflection = new Lazy<(PropertyInfo, MethodInfo)>(() =>
+		private static readonly Lazy<(PropertyInfo, MethodInfo)> VirtualizeReflection = new(() =>
 		{
 			var virtualizeJsInteropType = typeof(Virtualize<>)
 				.Assembly
diff --git a/src/bunit.web/Rendering/WebTestRenderer.cs b/src/bunit.web/Rendering/WebTestRenderer.cs
@@ -1,10 +1,10 @@
 using System;
-#if NET5_0
+#if !NETSTANDARD2_1
 using Microsoft.AspNetCore.Components;
 using Microsoft.Extensions.DependencyInjection;
 #endif
 using Microsoft.Extensions.Logging;
-#if NET5_0
+#if !NETSTANDARD2_1
 using Microsoft.JSInterop;
 #endif
 
@@ -22,7 +22,7 @@ public class WebTestRenderer : TestRenderer
 		public WebTestRenderer(IRenderedComponentActivator activator, IServiceProvider services, ILoggerFactory loggerFactory)
 			: base(activator, services, loggerFactory)
 		{
-#if NET5_0
+#if !NETSTANDARD2_1
 			ElementReferenceContext = new WebElementReferenceContext(services.GetRequiredService<IJSRuntime>());
 #endif
 		}
diff --git a/src/bunit.web/bunit.web.csproj b/src/bunit.web/bunit.web.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>netstandard2.1;net5.0</TargetFrameworks>
+		<TargetFrameworks>netstandard2.1;net5.0;net6.0</TargetFrameworks>
 		<RootNamespace>Bunit</RootNamespace>
 		<AssemblyName>Bunit.Web</AssemblyName>
 	</PropertyGroup>
@@ -27,6 +27,9 @@
 	<ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
 		<PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="$(DotNet5Version)" />
 	</ItemGroup>
+	<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
+		<PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="$(DotNet6Version)" />
+	</ItemGroup>
 
 	<ItemGroup>
 		<ProjectReference Include="..\bunit.core\bunit.core.csproj" />
diff --git a/src/bunit/bunit.csproj b/src/bunit/bunit.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>netstandard2.1;net5.0</TargetFrameworks>
+		<TargetFrameworks>netstandard2.1;net5.0;net6.0</TargetFrameworks>
 		<NoBuild>true</NoBuild>
 		<IncludeBuildOutput>false</IncludeBuildOutput>
 		<IncludeSymbols>false</IncludeSymbols>		
diff --git a/tests/bunit.core.tests/TestServiceProviderTest.net5.cs b/tests/bunit.core.tests/TestServiceProviderTest.net5.cs
@@ -1,4 +1,4 @@
-#if NET5_0
+#if !NETCOREAPP3_1
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Threading.Tasks;
diff --git a/tests/bunit.core.tests/bunit.core.tests.csproj b/tests/bunit.core.tests/bunit.core.tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>		
+		<TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>		
 		<RootNamespace>Bunit</RootNamespace>
 		<AssemblyName>Bunit.Core.Tests</AssemblyName>
 	</PropertyGroup>
diff --git a/tests/bunit.testassets/bunit.testassets.csproj b/tests/bunit.testassets/bunit.testassets.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
 	<PropertyGroup>
-		<TargetFrameworks>netstandard2.1;net5.0</TargetFrameworks>
+		<TargetFrameworks>netstandard2.1;net5.0;net6.0</TargetFrameworks>
 		<RootNamespace>Bunit.TestAssets</RootNamespace>
 		<AssemblyName>Bunit.TestAssets</AssemblyName>
 	</PropertyGroup>
@@ -20,5 +20,8 @@
 	<ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
 		<PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="$(DotNet5Version)" />
 	</ItemGroup>
+	<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
+		<PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="$(DotNet6Version)" />
+	</ItemGroup>
 
 </Project>
diff --git a/tests/bunit.web.tests/Asserting/MarkupMatchesAssertExtensionsTest.net5.cs b/tests/bunit.web.tests/Asserting/MarkupMatchesAssertExtensionsTest.net5.cs
@@ -1,4 +1,4 @@
-#if NET5_0
+#if !NETCOREAPP3_1
 
 using Bunit.TestAssets.SampleComponents;
 using Xunit;
diff --git a/tests/bunit.web.tests/EventDispatchExtensions/DetailsElementEventDispatcherExtensionsTest.cs b/tests/bunit.web.tests/EventDispatchExtensions/DetailsElementEventDispatcherExtensionsTest.cs
@@ -1,4 +1,4 @@
-#if NET5_0
+#if !NETCOREAPP3_1
 using Bunit.TestAssets.SampleComponents;
 using Shouldly;
 using Xunit;
diff --git a/tests/bunit.web.tests/JSInterop/BunitJSInteropTest.net5.cs b/tests/bunit.web.tests/JSInterop/BunitJSInteropTest.net5.cs
@@ -1,4 +1,4 @@
-#if NET5_0
+#if !NETCOREAPP3_1
 using System;
 using System.Linq;
 using AutoFixture.Xunit2;
diff --git a/tests/bunit.web.tests/JSInterop/BunitJSObjectReferenceTest.cs b/tests/bunit.web.tests/JSInterop/BunitJSObjectReferenceTest.cs
@@ -1,4 +1,4 @@
-#if NET5_0
+#if !NETCOREAPP3_1
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
diff --git a/tests/bunit.web.tests/JSInterop/InvocationHandlers/FocusAsyncInvocationHandlerTest.cs b/tests/bunit.web.tests/JSInterop/InvocationHandlers/FocusAsyncInvocationHandlerTest.cs
@@ -1,4 +1,4 @@
-#if NET5_0
+#if !NETCOREAPP3_1
 using System.Threading.Tasks;
 using Bunit.TestAssets.SampleComponents;
 using Microsoft.AspNetCore.Components;
diff --git a/tests/bunit.web.tests/JSInterop/InvocationHandlers/VirtualizeJSRuntimeInvocationHandlerTest.cs b/tests/bunit.web.tests/JSInterop/InvocationHandlers/VirtualizeJSRuntimeInvocationHandlerTest.cs
@@ -1,4 +1,4 @@
-#if NET5_0
+#if !NETCOREAPP3_1
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/tests/bunit.web.tests/Rendering/Internal/HtmlizerTests.net5.cs b/tests/bunit.web.tests/Rendering/Internal/HtmlizerTests.net5.cs
@@ -1,4 +1,4 @@
-#if NET5_0
+#if !NETCOREAPP3_1
 using Shouldly;
 using Xunit;
 
diff --git a/tests/bunit.web.tests/bunit.web.tests.csproj b/tests/bunit.web.tests/bunit.web.tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
+		<TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
 		<RootNamespace>Bunit</RootNamespace>
 		<AssemblyName>Bunit.Web.Tests</AssemblyName>
 	</PropertyGroup>

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"sdk": {`
`3`	`3`	`"rollForward": "latestMajor",`
`4`		`- "allowPrerelease": false`
	`4`	`+ "allowPrerelease": true`
`5`	`5`	`}`
`6`		`-}`
	`6`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#if NET5_0`
	`1`	`+#if !NETSTANDARD2_1`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using Bunit.JSInterop.InvocationHandlers.Implementation;`
`4`	`4`	`using Microsoft.AspNetCore.Components;`