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
4 changes: 1 addition & 3 deletions .github/workflows/dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ env:
# Build Set Up
USE_TEL_BLAZOR_COMPONENTS_PROJECT_REFERENCE: false
DISABLE_PACKAGE_GENERATION: false
E2E_TRACING_ENABLED: false

jobs:

Expand Down Expand Up @@ -287,8 +286,7 @@ jobs:
/p:NupkgOutputPath=$TELBLAZOR_PACKAGE_LOCAL_OUTPUT_PATH \
/p:UseTELBlazorComponentsProjectReference=$USE_TEL_BLAZOR_COMPONENTS_PROJECT_REFERENCE \
/p:TELBlazorPackageSource=$TELBLAZOR_PACKAGE_SOURCE \
/p:DisablePackageGeneration=$DISABLE_PACKAGE_GENERATION \
/p:E2ETracingEnabled=$E2E_TRACING_ENABLED
/p:DisablePackageGeneration=$DISABLE_PACKAGE_GENERATION

- name: Publish WasmStaticClient
run: |
Expand Down
11 changes: 4 additions & 7 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ env:
# Build Set Up
USE_TEL_BLAZOR_COMPONENTS_PROJECT_REFERENCE: false
DISABLE_PACKAGE_GENERATION: false
E2E_TRACING_ENABLED: false

jobs:
generate-semantic-version:
Expand Down Expand Up @@ -144,8 +143,8 @@ jobs:
# /p:NupkgOutputPath=$TELBLAZOR_PACKAGE_LOCAL_OUTPUT_PATH \
# /p:UseTELBlazorComponentsProjectReference=$USE_TEL_BLAZOR_COMPONENTS_PROJECT_REFERENCE \
# /p:TELBlazorPackageSource=$TELBLAZOR_PACKAGE_SOURCE \
# /p:DisablePackageGeneration=$DISABLE_PACKAGE_GENERATION \
# /p:E2ETracingEnabled=$E2E_TRACING_ENABLED
# /p:DisablePackageGeneration=$DISABLE_PACKAGE_GENERATION
#

- name: Build and pack TELBlazor.Components
env:
Expand All @@ -156,8 +155,7 @@ jobs:
/p:NupkgOutputPath=$TELBLAZOR_PACKAGE_LOCAL_OUTPUT_PATH \
/p:UseTELBlazorComponentsProjectReference=$USE_TEL_BLAZOR_COMPONENTS_PROJECT_REFERENCE \
/p:TELBlazorPackageSource=$TELBLAZOR_PACKAGE_SOURCE \
/p:DisablePackageGeneration=$DISABLE_PACKAGE_GENERATION \
/p:E2ETracingEnabled=$E2E_TRACING_ENABLED
/p:DisablePackageGeneration=$DISABLE_PACKAGE_GENERATION

- name: Publish to TELBlazor.Components Package
run: |
Expand Down Expand Up @@ -244,8 +242,7 @@ jobs:
/p:NupkgOutputPath=$TELBLAZOR_PACKAGE_LOCAL_OUTPUT_PATH \
/p:UseTELBlazorComponentsProjectReference=$USE_TEL_BLAZOR_COMPONENTS_PROJECT_REFERENCE \
/p:TELBlazorPackageSource=$TELBLAZOR_PACKAGE_SOURCE \
/p:DisablePackageGeneration=$DISABLE_PACKAGE_GENERATION \
/p:E2ETracingEnabled=$E2E_TRACING_ENABLED
/p:DisablePackageGeneration=$DISABLE_PACKAGE_GENERATION

- name: Publish WasmStaticClient TELBlazor ShowCase
env:
Expand Down
21 changes: 7 additions & 14 deletions .github/workflows/reuseable-ci-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,9 @@ env:
# May need coverlet.collector xplat if using the packaged version to test
USE_TEL_BLAZOR_COMPONENTS_PROJECT_REFERENCE: true
DISABLE_PACKAGE_GENERATION: true
E2E_TRACING_ENABLED: false

# Check Dummy Data
TELBLAZOR_PACKAGE_VERSION: "0.0.0-ci-checks"
HEADLESS_TESTING: true

jobs:

Expand Down Expand Up @@ -113,8 +111,8 @@ jobs:
/p:NupkgOutputPath=$TELBLAZOR_PACKAGE_LOCAL_OUTPUT_PATH \
/p:UseTELBlazorComponentsProjectReference=$USE_TEL_BLAZOR_COMPONENTS_PROJECT_REFERENCE \
/p:TELBlazorPackageSource=$TELBLAZOR_PACKAGE_SOURCE \
/p:DisablePackageGeneration=$DISABLE_PACKAGE_GENERATION \
/p:E2ETracingEnabled=$E2E_TRACING_ENABLED
/p:DisablePackageGeneration=$DISABLE_PACKAGE_GENERATION


- name: Build solution without generating new package
env:
Expand All @@ -126,8 +124,8 @@ jobs:
/p:NupkgOutputPath=$TELBLAZOR_PACKAGE_LOCAL_OUTPUT_PATH \
/p:UseTELBlazorComponentsProjectReference=$USE_TEL_BLAZOR_COMPONENTS_PROJECT_REFERENCE \
/p:TELBlazorPackageSource=$TELBLAZOR_PACKAGE_SOURCE \
/p:DisablePackageGeneration=$DISABLE_PACKAGE_GENERATION \
/p:E2ETracingEnabled=$E2E_TRACING_ENABLED
/p:DisablePackageGeneration=$DISABLE_PACKAGE_GENERATION


reuseable-ci-checks-branch-name-check:
name: Check branch names
Expand Down Expand Up @@ -247,9 +245,7 @@ jobs:
/p:NupkgOutputPath=$TELBLAZOR_PACKAGE_LOCAL_OUTPUT_PATH \
/p:UseTELBlazorComponentsProjectReference=$USE_TEL_BLAZOR_COMPONENTS_PROJECT_REFERENCE \
/p:TELBlazorPackageSource=$TELBLAZOR_PACKAGE_SOURCE \
/p:DisablePackageGeneration=$DISABLE_PACKAGE_GENERATION \
/p:E2ETracingEnabled=$E2E_TRACING_ENABLED \
/p:HeadlessTesting=$HEADLESS_TESTING
/p:DisablePackageGeneration=$DISABLE_PACKAGE_GENERATION


- name: Ensure browsers are installed
Expand All @@ -264,17 +260,14 @@ jobs:
UseTELBlazorComponentsProjectReference: ${{ env.USE_TEL_BLAZOR_COMPONENTS_PROJECT_REFERENCE }}
TELBlazorPackageSource: ${{ env.TELBLAZOR_PACKAGE_SOURCE }}
DisablePackageGeneration: ${{ env.DISABLE_PACKAGE_GENERATION }}
E2ETracingEnabled: ${{ env.E2E_TRACING_ENABLED }}
HeadlessTesting: ${{ env.HEADLESS_TESTING }}

run: |
dotnet test --no-build --no-restore \
/p:TELBlazorPackageVersion=$TELBLAZOR_PACKAGE_VERSION \
/p:NupkgOutputPath=$TELBLAZOR_PACKAGE_LOCAL_OUTPUT_PATH \
/p:UseTELBlazorComponentsProjectReference=$USE_TEL_BLAZOR_COMPONENTS_PROJECT_REFERENCE \
/p:TELBlazorPackageSource=$TELBLAZOR_PACKAGE_SOURCE \
/p:DisablePackageGeneration=$DISABLE_PACKAGE_GENERATION \
/p:E2ETracingEnabled=$E2E_TRACING_ENABLED \
/p:HeadlessTesting=$HEADLESS_TESTING
/p:DisablePackageGeneration=$DISABLE_PACKAGE_GENERATION

continue-on-error: true

Expand Down
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -202,4 +202,7 @@ CHANGELOG.md
/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost.Client/wwwroot/appsettings.json
/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost.Client/wwwroot/appsettings.ci.json
/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost.Client/wwwroot/appsettings.Development.json
/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost.Client/wwwroot/appsettings.Production.json
/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost.Client/wwwroot/appsettings.Production.json
/TELBlazor.Components.ShowCase.E2ETests/appsettings.Production.json
/TELBlazor.Components.ShowCase.E2ETests/appsettings.json
/.runsettings
17 changes: 17 additions & 0 deletions .runsettingsTemplate
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8" ?>
<RunSettings>

<RunConfiguration>
<EnvironmentVariables>
<TracingEnabled>True</TracingEnabled>
<RunSettingFile>".runsettingsTemplate"</RunSettingFile>
</EnvironmentVariables>
</RunConfiguration>
<Playwright>
<LaunchOptions>
<Headless>false</Headless>

</LaunchOptions>
</Playwright>

</RunSettings>
20 changes: 14 additions & 6 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,23 @@
# [1.7.0](https://github.com/TechnologyEnhancedLearning/TELBlazor/compare/v1.6.0...v1.7.0) (2025-06-09)
# [1.8.0-feat-button-for-cicd-testing.3](https://github.com/TechnologyEnhancedLearning/TELBlazor/compare/v1.8.0-feat-button-for-cicd-testing.2...v1.8.0-feat-button-for-cicd-testing.3) (2025-06-16)


### Features

* **button:** lower testing threshold ([63ded2c](https://github.com/TechnologyEnhancedLearning/TELBlazor/commit/63ded2c82e656cdb94b9f98a6d38eeda9c7bc0ba))
* **button:** optional implementation ([9a12d3c](https://github.com/TechnologyEnhancedLearning/TELBlazor/commit/9a12d3ce6ec6196c536958ab554f20a307c8096f))
* **readme:** readme update ([1a9ad4b](https://github.com/TechnologyEnhancedLearning/TELBlazor/commit/1a9ad4bda0771dd78fbe4140c21e0a6f65a2b337))

# [1.7.0-feat-button-for-cicd-testing.1](https://github.com/TechnologyEnhancedLearning/TELBlazor/compare/v1.6.0...v1.7.0-feat-button-for-cicd-testing.1) (2025-06-09)
# [1.8.0-feat-button-for-cicd-testing.2](https://github.com/TechnologyEnhancedLearning/TELBlazor/compare/v1.8.0-feat-button-for-cicd-testing.1...v1.8.0-feat-button-for-cicd-testing.2) (2025-06-16)


### Features

* **button:** lower testing threshold ([63ded2c](https://github.com/TechnologyEnhancedLearning/TELBlazor/commit/63ded2c82e656cdb94b9f98a6d38eeda9c7bc0ba))
* **button:** optional implementation ([9a12d3c](https://github.com/TechnologyEnhancedLearning/TELBlazor/commit/9a12d3ce6ec6196c536958ab554f20a307c8096f))
* **button:** changed .runsetting ([06470d7](https://github.com/TechnologyEnhancedLearning/TELBlazor/commit/06470d7e71e8a074653a176f87c1a3732f3b44f0))
* **button:** commit before change env vars ([1e4377f](https://github.com/TechnologyEnhancedLearning/TELBlazor/commit/1e4377fc768e7d770b769536e123453c024e8320))
* **button:** test fix ([022f427](https://github.com/TechnologyEnhancedLearning/TELBlazor/commit/022f42765e463f3f46e5e7b672979212cef36339))
* **cicd:** changing to runsetting config ([3b828b2](https://github.com/TechnologyEnhancedLearning/TELBlazor/commit/3b828b28ea7cc6d577ef0e15d9c6f8bc452705e1))

# [1.8.0-feat-button-for-cicd-testing.1](https://github.com/TechnologyEnhancedLearning/TELBlazor/compare/v1.7.0...v1.8.0-feat-button-for-cicd-testing.1) (2025-06-11)


### Features

* **button:** versioning from assembly not file parsing ([4b8c773](https://github.com/TechnologyEnhancedLearning/TELBlazor/commit/4b8c77356a834de351ad703394eeb060e9a99c01))
17 changes: 17 additions & 0 deletions CICD.runsettings
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8" ?>
<RunSettings>
<!--<xUnit>-->
<RunConfiguration>
<EnvironmentVariables>
<TracingEnabled>False</TracingEnabled>
<RunSettingFile>"CICD.runsettings"</RunSettingFile>
</EnvironmentVariables>
</RunConfiguration>
<Playwright>
<LaunchOptions>
<Headless>true</Headless>

</LaunchOptions>
</Playwright>
<!--</xUnit>-->
</RunSettings>
26 changes: 2 additions & 24 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,27 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<Import Project="PackageSettings.props" />
<Import Project="PackageSettings.props.local" Condition="Exists('PackageSettings.props.local')"/>
<PropertyGroup>

<!-- coverlet.msbuild, specifically msbuild props here we set when cicd testing fails on coverage -->
<CollectCoverage>true</CollectCoverage>
<CoverletOutputFormat>cobertura</CoverletOutputFormat>
<Threshold>30</Threshold>
<ThresholdType>line</ThresholdType>
<ThresholdStat>total</ThresholdStat>
<ThresholdBranch>30</ThresholdBranch>
<ThresholdMethod>30</ThresholdMethod>

<!-- What to test -->
<Include>[TELBlazor.Components]*</Include>
<ExcludeByAttribute>ExcludeFromCodeCoverage</ExcludeByAttribute>
<ExcludeByFile>**/Program.cs,**/Components/TestComponents/*.*</ExcludeByFile>
<IncludeTestAssembly>true</IncludeTestAssembly>

<!--centralising TestResults output could reduce abitity to run tests in parralel-->
<CoverletOutput>$(MSBuildThisFileDirectory)AllTestResults/</CoverletOutput>
<MergeWith>$(MSBuildThisFileDirectory)AllTestResults/coverage.json</MergeWith>

</PropertyGroup>
<Import Project="PackageSettings.props" />
<Import Project="PackageSettings.props.local" Condition="Exists('PackageSettings.props.local')"/>
</Project>
133 changes: 61 additions & 72 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -1,73 +1,62 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<PropertyGroup>
<!-- Enable central management of package versions -->
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>

</PropertyGroup>
<ItemGroup>

<!-- Microsoft packages tied to .NET 8 -->
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0"/>
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="8.0.14" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.14" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.14" PrivateAssets="all" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.14" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
<PackageVersion Include="Microsoft.Extensions.Http" Version="8.0.1" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />

<!-- Storage -->
<PackageVersion Include="Blazored.LocalStorage" Version="4.5.0" />

<!-- JSON -->
<PackageVersion Include="Newtonsoft.Json" Version="13.0.1" />

<!-- Mapping -->
<PackageVersion Include="AutoMapper" Version="12.0.1" />

<!-- Logging (Serilog) -->
<PackageVersion Include="Serilog" Version="4.2.0" />
<PackageVersion Include="Serilog.Extensions.Logging" Version="8.0.0" />
<PackageVersion Include="Serilog.Formatting.Compact" Version="3.0.0" />
<PackageVersion Include="Serilog.Settings.Configuration" Version="8.0.0" />
<PackageVersion Include="Serilog.Sinks.BrowserConsole" Version="8.0.0" />
<PackageVersion Include="Serilog.Sinks.Http" Version="8.0.0" />
<PackageVersion Include="Serilog.Expressions" Version="5.0.0" />
<PackageVersion Include="Serilog.Sinks.InMemory" Version="0.14.0" />
<PackageVersion Include="Serilog.Sinks.InMemory.Assertions" Version="0.14.0" />
<PackageVersion Include="Serilog.Sinks.XUnit" Version="2.0.4" />
<PackageVersion Include="Serilog.AspNetCore" Version="8.0.0" />
<PackageVersion Include="Serilog.Sinks.Console" Version="6.0.0" />
<PackageVersion Include="Serilog.Sinks.Debug" Version="3.0.0" />
<PackageVersion Include="Serilog.Sinks.File" Version="6.0.0" />


<!-- Testing - xUnit -->
<PackageVersion Include="xunit" Version="2.9.0" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.4" PrivateAssets="all" />

<!-- Testing - General -->
<PackageVersion Include="bunit" Version="1.34.0" />
<PackageVersion Include="coverlet.msbuild" Version="6.0.4" />
<PackageVersion Include="AutoFixture" Version="4.18.1" />
<PackageVersion Include="AutoFixture.AutoMoq" Version="4.18.1" />
<PackageVersion Include="FluentAssertions" Version="8.0.1" />

<!-- Testing - Playwright -->
<PackageVersion Include="Deque.AxeCore.Playwright" Version="4.10.1" />
<PackageVersion Include="Microsoft.Playwright" Version="1.50.0" />
<PackageVersion Include="Microsoft.Playwright.MSTest" Version="1.50.0" />
<PackageVersion Include="Microsoft.Playwright.Xunit" Version="1.50.0" />
<PackageVersion Include="Verify.Playwright" Version="3.0.0" />

<!-- Internal packages -->
<PackageVersion Include="TELBlazor.Components" Version="$(TELBlazorPackageVersion)" />

</ItemGroup>
</Project>
<Project>
<PropertyGroup>
<!-- Enable central management of package versions -->
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
</PropertyGroup>
<ItemGroup>
<!-- Microsoft packages tied to .NET 8 -->
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="8.0.14" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.14" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.14" PrivateAssets="all" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.14" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
<PackageVersion Include="Microsoft.Extensions.Http" Version="8.0.1" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
<!-- Storage -->
<PackageVersion Include="Blazored.LocalStorage" Version="4.5.0" />
<!-- JSON -->
<PackageVersion Include="Newtonsoft.Json" Version="13.0.1" />
<!-- Mapping -->
<PackageVersion Include="AutoMapper" Version="12.0.1" />
<!-- Logging (Serilog) -->
<PackageVersion Include="Serilog" Version="4.2.0" />
<PackageVersion Include="Serilog.Extensions.Logging" Version="8.0.0" />
<PackageVersion Include="Serilog.Formatting.Compact" Version="3.0.0" />
<PackageVersion Include="Serilog.Settings.Configuration" Version="8.0.0" />
<PackageVersion Include="Serilog.Sinks.BrowserConsole" Version="8.0.0" />
<PackageVersion Include="Serilog.Sinks.Http" Version="8.0.0" />
<PackageVersion Include="Serilog.Expressions" Version="5.0.0" />
<PackageVersion Include="Serilog.Sinks.InMemory" Version="0.14.0" />
<PackageVersion Include="Serilog.Sinks.InMemory.Assertions" Version="0.14.0" />
<PackageVersion Include="Serilog.Sinks.XUnit" Version="2.0.4" />
<PackageVersion Include="Serilog.AspNetCore" Version="8.0.0" />
<PackageVersion Include="Serilog.Sinks.Console" Version="6.0.0" />
<PackageVersion Include="Serilog.Sinks.Debug" Version="3.0.0" />
<PackageVersion Include="Serilog.Sinks.File" Version="6.0.0" />
<!-- Testing - xUnit -->
<PackageVersion Include="xunit" Version="2.9.0" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.4" PrivateAssets="all" />
<!-- Testing - General -->
<PackageVersion Include="bunit" Version="1.34.0" />
<PackageVersion Include="coverlet.msbuild" Version="6.0.4" />
<PackageVersion Include="AutoFixture" Version="4.18.1" />
<PackageVersion Include="AutoFixture.AutoMoq" Version="4.18.1" />
<PackageVersion Include="FluentAssertions" Version="8.0.1" />
<!-- Testing - Playwright -->
<PackageVersion Include="Deque.AxeCore.Playwright" Version="4.10.1" />
<PackageVersion Include="Microsoft.Playwright" Version="1.50.0" />
<PackageVersion Include="Microsoft.Playwright.MSTest" Version="1.50.0" />
<PackageVersion Include="Microsoft.Playwright.Xunit" Version="1.50.0" />
<PackageVersion Include="Verify.Playwright" Version="3.0.0" />
<!-- Internal packages -->
<PackageVersion Include="TELBlazor.Components" Version="$(TELBlazorPackageVersion)" />
</ItemGroup>
</Project>
Loading