Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions .github/workflows/docs-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,9 @@ jobs:
- name: 🛠️ Verfiy docs samples
run: dotnet test docs/samples/samples.sln

- name: 🛠️ Building docs
run: |
dotnet tool update -g docfx --version 2.67.0
docfx docs/site/docfx.json
- name: 📄 Building docs
working-directory: ./docs/site
run: dotnet run Site.csproj

- name: 🛠️ Deploy to GitHub Pages
if: success()
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/verification.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ jobs:
with:
files: '["docs/site/*.md", "docs/**/*.md", "docs/**/*.tmpl.partial", "*.csproj", "**/*.csproj"]'

- name: 🧪 Run unit tests
- name: 🧪 Run unit tests
run: dotnet test -c release --blame --blame-crash --blame-hang

- name: 🧪 Run sample unit tests
Expand Down Expand Up @@ -115,6 +115,5 @@ jobs:
dotnet test ${{ github.workspace }}/TemplateTestMstest

- name: 📄 Building docs
run: |
dotnet tool update -g docfx --version 2.67.0
docfx docs/site/docfx.json
working-directory: ./docs/site
run: dotnet run Site.csproj
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ All notable changes to **bUnit** will be documented in this file. The project ad

## [Unreleased]

### Changed

- Upgraded AngleSharp to 1.0.7.

### Fixed

- When the `TestContext` was disposed, the Blazor Renderer itself didn't dispose components under test. By [@linkdotnet](https://github.com/linkdotnet).
Expand Down
23 changes: 15 additions & 8 deletions bunit.sln
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "bunit.benchmarks", "benchma
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "bunit.benchmarks.assets", "benchmark\bunit.benchmarks.assets\bunit.benchmarks.assets.csproj", "{3619481F-DF6F-4399-9FED-450EE545A19E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AngleSharpWrappers", "src\AngleSharpWrappers\AngleSharpWrappers.csproj", "{ABB3F046-0297-491A-9106-7948403BE0DE}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "bunit.web.query", "src\bunit.web.query\bunit.web.query.csproj", "{0FF92169-7D8F-46A2-8327-A2F028CB426F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "bunit.web.query", "src\bunit.web.query\bunit.web.query.csproj", "{0FF92169-7D8F-46A2-8327-A2F028CB426F}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "bunit.web.query.tests", "tests\bunit.web.query.tests\bunit.web.query.tests.csproj", "{DE975A0C-0672-4248-913E-D267C1001801}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "bunit.web.query.tests", "tests\bunit.web.query.tests\bunit.web.query.tests.csproj", "{DE975A0C-0672-4248-913E-D267C1001801}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "bunit.web.anglesharp", "src\bunit.web.anglesharp\bunit.web.anglesharp.csproj", "{683600A7-236B-4C5D-9F42-84657F64B9C1}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "bunit.web.anglesharp.tests", "tests\bunit.web.anglesharp.tests\bunit.web.anglesharp.tests.csproj", "{69305E2B-49EF-4DB5-B9EB-952E1A6D667F}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -108,10 +110,6 @@ Global
{3619481F-DF6F-4399-9FED-450EE545A19E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3619481F-DF6F-4399-9FED-450EE545A19E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3619481F-DF6F-4399-9FED-450EE545A19E}.Release|Any CPU.Build.0 = Release|Any CPU
{ABB3F046-0297-491A-9106-7948403BE0DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{ABB3F046-0297-491A-9106-7948403BE0DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{ABB3F046-0297-491A-9106-7948403BE0DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{ABB3F046-0297-491A-9106-7948403BE0DE}.Release|Any CPU.Build.0 = Release|Any CPU
{0FF92169-7D8F-46A2-8327-A2F028CB426F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0FF92169-7D8F-46A2-8327-A2F028CB426F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0FF92169-7D8F-46A2-8327-A2F028CB426F}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand All @@ -120,6 +118,14 @@ Global
{DE975A0C-0672-4248-913E-D267C1001801}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DE975A0C-0672-4248-913E-D267C1001801}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DE975A0C-0672-4248-913E-D267C1001801}.Release|Any CPU.Build.0 = Release|Any CPU
{683600A7-236B-4C5D-9F42-84657F64B9C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{683600A7-236B-4C5D-9F42-84657F64B9C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{683600A7-236B-4C5D-9F42-84657F64B9C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{683600A7-236B-4C5D-9F42-84657F64B9C1}.Release|Any CPU.Build.0 = Release|Any CPU
{69305E2B-49EF-4DB5-B9EB-952E1A6D667F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{69305E2B-49EF-4DB5-B9EB-952E1A6D667F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{69305E2B-49EF-4DB5-B9EB-952E1A6D667F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{69305E2B-49EF-4DB5-B9EB-952E1A6D667F}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -134,9 +140,10 @@ Global
{7972A80F-30DC-4EF4-9294-7D4DD2965882} = {6EA09ED4-B714-4E6F-B0E1-4D987F8AE520}
{9F7A0623-8294-4A5D-946F-70C481732AA5} = {F6084D31-2A92-4794-A47E-A8F2254E6970}
{3619481F-DF6F-4399-9FED-450EE545A19E} = {F6084D31-2A92-4794-A47E-A8F2254E6970}
{ABB3F046-0297-491A-9106-7948403BE0DE} = {9A2B3B34-D41C-43E8-BC7D-246BEBE48D59}
{0FF92169-7D8F-46A2-8327-A2F028CB426F} = {9A2B3B34-D41C-43E8-BC7D-246BEBE48D59}
{DE975A0C-0672-4248-913E-D267C1001801} = {6EA09ED4-B714-4E6F-B0E1-4D987F8AE520}
{683600A7-236B-4C5D-9F42-84657F64B9C1} = {9A2B3B34-D41C-43E8-BC7D-246BEBE48D59}
{69305E2B-49EF-4DB5-B9EB-952E1A6D667F} = {6EA09ED4-B714-4E6F-B0E1-4D987F8AE520}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {24106918-1C86-4769-BDA6-9C80E64CD260}
Expand Down
30 changes: 19 additions & 11 deletions docs/samples/components/bunit.docs.samples.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net5.0;net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
<LangVersion>10.0</LangVersion>
<RazorLangVersion>3.0</RazorLangVersion>
<RootNamespace>Bunit.Docs.Samples</RootNamespace>
Expand All @@ -27,19 +27,27 @@
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components" Version="6.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components" Version="6.0.25" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.25" />
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="6.0.25" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components" Version="7.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components" Version="7.0.14" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.0.14" />
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="7.0.1" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components" Version="8.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="8.0.0" />
</ItemGroup>

</Project>
9 changes: 6 additions & 3 deletions docs/samples/samples.sln
Original file line number Diff line number Diff line change
@@ -1,19 +1,22 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.30114.105
# Visual Studio Version 17
VisualStudioVersion = 17.9.34310.174
MinimumVisualStudioVersion = 15.0.26124.0
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "bunit.docs.samples", "components\bunit.docs.samples.csproj", "{60E2C52E-0DF6-445A-9568-ABA05CB2E6AF}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{FC897929-3A4D-4276-9AF4-C77B0FAF221E}"
ProjectSection(SolutionItems) = preProject
tests\Directory.Build.props = tests\Directory.Build.props
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "bunit.docs.mstest.samples", "tests\mstest\bunit.docs.mstest.samples.csproj", "{C2060A20-8C56-4678-B65C-DCF52D70223D}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "bunit.docs.nunit.samples", "tests\nunit\bunit.docs.nunit.samples.csproj", "{0BC8DBEB-500A-4DB2-9123-7617D24E5053}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "bunit.docs.xunit.samples", "tests\xunit\bunit.docs.xunit.samples.csproj", "{3B8B3B0E-CA33-4C76-901D-219F5FF848B3}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "bunit.docs.razor.samples", "tests\razor\bunit.docs.razor.samples.csproj", "{C92CB47E-8A70-409C-9213-8D743BB29366}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "bunit.docs.razor.samples", "tests\razor\bunit.docs.razor.samples.csproj", "{C92CB47E-8A70-409C-9213-8D743BB29366}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
30 changes: 21 additions & 9 deletions docs/samples/tests/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,11 +1,23 @@
<Project>
<PropertyGroup>
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
<IsPackable>false</IsPackable>
<LangVersion>10.0</LangVersion>
<RazorLangVersion>3.0</RazorLangVersion>
<ImplicitUsings>enable</ImplicitUsings>
<NoWarn>CA1014,NU5104</NoWarn>
<CheckEolTargetFramework>false</CheckEolTargetFramework>
</PropertyGroup>
<PropertyGroup>
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
<IsPackable>false</IsPackable>
<SonarQubeTestProject>true</SonarQubeTestProject>
<IsPackable>false</IsPackable>
<IsTestProject>true</IsTestProject>
<LangVersion>latest</LangVersion>
<RazorLangVersion>3.0</RazorLangVersion>
<ImplicitUsings>enable</ImplicitUsings>
<NoWarn>CA1014,NU5104</NoWarn>
<CheckEolTargetFramework>false</CheckEolTargetFramework>
</PropertyGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net6.0' OR '$(TargetFramework)' == 'net7.0' OR '$(TargetFramework)' == 'net8.0'">
<PackageReference Include="System.Text.Json" Version="8.0.0" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1' OR '$(TargetFramework)' == 'net5.0'">
<PackageReference Include="System.Text.Json" Version="6.0.9" />
</ItemGroup>

</Project>
1 change: 1 addition & 0 deletions docs/site/Program.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
await Docfx.Docset.Build("docfx.json");
13 changes: 13 additions & 0 deletions docs/site/Site.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Docfx.App" Version="2.74.0" />
</ItemGroup>
</Project>
9 changes: 6 additions & 3 deletions docs/site/docfx.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
// "$schema": "https://raw.githubusercontent.com/dotnet/docfx/main/schemas/v1.0/schema.json#",
{
"metadata": [
{
"src": [
{
"files": [
"bunit.core/bunit.core.csproj",
"bunit.web/bunit.web.csproj"
"bunit.web/bunit.web.csproj",
"bunit.web.anglesharp/bunit.web.anglesharp.csproj"
],
"src": "../../src"
}
Expand All @@ -14,7 +16,8 @@
"includePrivateMembers": false,
"disableGitFeatures": false,
"disableDefaultFilter": false,
"noRestore": true,
"noRestore": false,

"namespaceLayout": "flattened",
"memberLayout": "samePage",
"allowCompilationErrors": false
Expand Down Expand Up @@ -75,4 +78,4 @@
"cleanupCacheHistory": true,
"disableGitFeatures": false
}
}
}
7 changes: 0 additions & 7 deletions src/AngleSharpWrappers/.editorconfig

This file was deleted.

23 changes: 0 additions & 23 deletions src/AngleSharpWrappers/AngleSharpWrappers.csproj

This file was deleted.

Loading