Upgraded to P8

Author: egil

Directory.Build.props

@@ -0,0 +1,5 @@
+<Project>
+    <PropertyGroup>
+        <AspNetCoreVersion>3.0.0-preview8.19405.7</AspNetCoreVersion>
+    </PropertyGroup>
+</Project>

Razor.Components.Testing.Library.sln

@@ -5,6 +5,7 @@ VisualStudioVersion = 16.0.29123.89
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A5D7B605-02D8-468C-9BDF-864CF93B12F9}"
 	ProjectSection(SolutionItems) = preProject
+		Directory.Build.props = Directory.Build.props
 		LICENSE = LICENSE
 		README.md = README.md
 	EndProjectSection

src/Egil.RazorComponents.Testing.Library.csproj

@@ -14,7 +14,7 @@
     <RepositoryUrl>https://github.com/egil/razor-components-testing-library</RepositoryUrl>
     <PackageProjectUrl>https://github.com/egil/razor-components-testing-library</PackageProjectUrl>
     <PackageTags>razor-components unit-testing testing blazor blazor-server-side blazor-client-side</PackageTags>
-    <Version>0.1.0-preview7-19365-7-5</Version>
+    <Version>0.1.0-preview8-19405-7-1</Version>
     <Authors>Egil Hansen</Authors>
     <Company>Egil Hansen</Company>
     <Product>Razor Component Testing Library</Product>
@@ -24,10 +24,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.Browser" Version="3.0.0-preview7.19365.7" />
-    <PackageReference Include="Microsoft.AspNetCore.Components" Version="3.0.0-preview7.19365.7" />
+    <PackageReference Include="Microsoft.AspNetCore.Components" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
-    <PackageReference Include="System.Text.Encodings.Web" Version="4.6.0-preview7.19362.9" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="4.6.0-preview8.19405.3" />
     <PackageReference Include="XMLUnit.Core" Version="2.7.1" />
     <PackageReference Include="xunit.assert" Version="2.4.1" />
     <PackageReference Include="xunit.extensibility.core" Version="2.4.1" />

src/RazerComponentTestRenderer.cs

@@ -6,16 +6,15 @@
 using System.Xml;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Rendering;
-using Microsoft.AspNetCore.Components.RenderTree;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging.Abstractions;
 
 namespace Egil.RazorComponents.Testing
 {
     public class RazerComponentTestRenderer : IDisposable
     {
         private const string RenderResultsElement = "RenderResults";
 
-        private readonly IDispatcher _dispatcher = Renderer.CreateDefaultDispatcher();
         private readonly Func<string, string> _encoder = (t) => HtmlEncoder.Default.Encode(t);
 
         public bool HasRendered { get; private set; } = false;
@@ -28,18 +27,17 @@ public void Dispose() { }
 
         public void Render(RenderFragment renderFragment, IServiceCollection services)
         {
-            var paramCollection = ParameterCollection.FromDictionary(new Dictionary<string, object>() { { RenderTreeBuilder.ChildContent, renderFragment } });
-
             using var serviceProvider = services.BuildServiceProvider();
-            using var htmlRenderer = new HtmlRenderer(serviceProvider, _encoder, _dispatcher);
-            RenderResults = GetTestResults(htmlRenderer, paramCollection);
+            using var htmlRenderer = new HtmlRenderer(serviceProvider, NullLoggerFactory.Instance, _encoder);
+            RenderResults = GetTestResults(htmlRenderer, renderFragment);
 
             HasRendered = true;
         }
 
-        private IReadOnlyList<TestRenderResult> GetTestResults(HtmlRenderer htmlRenderer, ParameterCollection parameterCollection)
+        private IReadOnlyList<TestRenderResult> GetTestResults(HtmlRenderer htmlRenderer, RenderFragment renderFragment)
         {
-            var renderTask = _dispatcher.InvokeAsync(() => htmlRenderer.RenderComponentAsync<RenderFragmentWrapper>(parameterCollection));
+            var parameters = ParameterView.FromDictionary(new Dictionary<string, object>() { { "ChildContent", renderFragment } });
+            var renderTask = htmlRenderer.Dispatcher.InvokeAsync(() => htmlRenderer.RenderComponentAsync<RenderFragmentWrapper>(parameters));
             var renderResult = GetResult(renderTask);
             return ProcessRenderResult(string.Concat(renderResult.Tokens));
         }

tests/Egil.RazorComponents.Testing.Library.Tests.csproj

@@ -2,8 +2,8 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
-
     <IsPackable>false</IsPackable>
+    <RootNamespace>Egil.RazorComponents.Testing.Library</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>

tests/RazorComponentTestRendererTest.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Components;
+using Microsoft.Extensions.DependencyInjection;
+using Shouldly;
+using Xunit;
+
+namespace Egil.RazorComponents.Testing.Library
+{
+    public class RazorComponentTestRendererTest
+    {
+        // TODO
+    }
+}