diff --git a/.github/workflows/workflow-readme.md b/.github/workflows/workflow-readme.md index 4b74fe6..185fd4e 100644 --- a/.github/workflows/workflow-readme.md +++ b/.github/workflows/workflow-readme.md @@ -83,4 +83,4 @@ The individual steps also automatically pass so can see if any error at the end - for tests use the run-tests-and-report-with-env-values.ps1 file ## Versioning - +Via semantic release and recorded as a generate c# file used by a blazor component diff --git a/.gitignore b/.gitignore index 934d9ab..b8fe7c8 100644 --- a/.gitignore +++ b/.gitignore @@ -208,3 +208,31 @@ CHANGELOG.md /.runsettings /nuget.config /nuget.config + + +AllTestResults/* +!AllTestResults/gitinclude.txt + +CICDPackageLocation/* +!CICDPackageLocation/gitinclude.txt + +CoverageReport/* +!CoverageReport/gitinclude.txt + +docs/css/* +!docs/css/gitinclude.txt + +TELBlazor.Components.ShowCase.E2ETests/Reports/* +!TELBlazor.Components.ShowCase.E2ETests/Reports/gitinclude.txt + +TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/Logs/* +!TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/Logs/gitinclude.txt + +**/wwwroot/css/* +!**/wwwroot/css/app.css + +/tools/ +**/wwwroot/TELBlazorPackageVersion.txt + +# Generated version info files +TELBlazor.Components/TELBlazorPackageVersion/VersionInfo*.cs diff --git a/Directory.Packages.props b/Directory.Packages.props index 074ee19..e75535d 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -58,6 +58,6 @@ - + \ No newline at end of file diff --git a/PackageSettings.props b/PackageSettings.props index 1506e02..f372b16 100644 --- a/PackageSettings.props +++ b/PackageSettings.props @@ -50,7 +50,9 @@ $(DISABLE_PACKAGE_GENERATION) - + + + true diff --git a/README.md b/README.md index f0a1550..2d5fe66 100644 --- a/README.md +++ b/README.md @@ -173,7 +173,10 @@ It is recommended you check setup by reading this section and making sure packag - **packagesettings.props** sets thresholds - running at solution level **./run-tests-and-report-with-env-values.ps1** (see in the file for specific arguments you may want to set) - will produce a test coverage site **[your repo folder]/TELBlazor/CoverageReport/index.html** - + - then look at CoverageReport in solution root and you can bookmark index.html to see your coverage + - E2E project has a Reports folder for tracings +- Similarly run-tests-and-report-using-local-props.ps1 runs just using your local props file +- appsettings.Development can be set in the E2E Host to log to the Logs folder at project route, see template #### Tips @@ -186,7 +189,7 @@ It is recommended you check setup by reading this section and making sure packag ``` npm install -g @commitlint/cli @commitlint/config-angular ``` - - You can put into your pre-push, pre-commit hook, or into the gitguardian hooks some logic like the below. + - You can put into your pre-push, pre-commit hook, commit-ms, or into the gitguardian hooks some logic like the below. ``` #### --- Commitlint Logic (force local config) --- REPO_ROOT=$(git rev-parse --show-toplevel) @@ -270,6 +273,7 @@ It is recommended you check setup by reading this section and making sure packag - if still not working delete **bin** and **obj** - if still not working, restart Visual Studio - if there are still issues its easier to problem solve by using a random very high **TELBlazor.Components** package version number and ensuring it fails and says it found the source but not the version + #### Git commit names - git commit names can be caught locally - if they are not diff --git a/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost.Client/Program.cs b/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost.Client/Program.cs index 4939927..5a2f4e7 100644 --- a/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost.Client/Program.cs +++ b/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost.Client/Program.cs @@ -49,7 +49,7 @@ .CreateLogger(); // Add Serilog to logging providers -builder.Logging.AddSerilog(Log.Logger, dispose: true);//qqqq may not need dispose for client +builder.Logging.AddSerilog(Log.Logger); //for really bad fails try diff --git a/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost.Client/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost.Client.csproj b/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost.Client/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost.Client.csproj index 9830405..177c906 100644 --- a/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost.Client/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost.Client.csproj +++ b/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost.Client/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost.Client.csproj @@ -35,7 +35,6 @@ - diff --git a/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost.Client/packages.lock.json b/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost.Client/packages.lock.json index 743b635..c05ad3b 100644 --- a/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost.Client/packages.lock.json +++ b/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost.Client/packages.lock.json @@ -40,15 +40,15 @@ }, "Microsoft.NET.ILLink.Tasks": { "type": "Direct", - "requested": "[8.0.18, )", - "resolved": "8.0.18", - "contentHash": "OiXqr2YIBEV9dsAWEtasK470ALyJ0VxJ9k4MotOxlWV6HeEgrJKYMW4HHj1OCCXvqE0/A25wEKPkpfiBARgDZA==" + "requested": "[8.0.19, )", + "resolved": "8.0.19", + "contentHash": "IhHf+zeZiaE5EXRyxILd4qM+Hj9cxV3sa8MpzZgeEhpvaG3a1VEGF6UCaPFLO44Kua3JkLKluE0SWVamS50PlA==" }, "Microsoft.NET.Sdk.WebAssembly.Pack": { "type": "Direct", - "requested": "[8.0.18, )", - "resolved": "8.0.18", - "contentHash": "SoVkRwFwnaX39J1uaI72PTilSJ6OoonIG+2VMpazEaAA9t+aJt2Caf49q76SYv3x9iU8hu1axlMWSkR9rt8nIg==" + "requested": "[8.0.19, )", + "resolved": "8.0.19", + "contentHash": "Cm/sq4ET7XGU7jBSfSh+s+eV0faJ1RnErpImRYN7+d5loWISBwl22qsM6sn9StUWKJao+xGvF0IxgyPVnY20Vw==" }, "Serilog": { "type": "Direct", @@ -321,7 +321,7 @@ "Markdig": "[0.41.3, )", "Microsoft.AspNetCore.Components.Web": "[8.0.14, )", "Serilog": "[4.2.0, )", - "TELBlazor.Components": "[1.9.3-local, )" + "TELBlazor.Components": "[1.2.6-local, )" } }, "Markdig": { diff --git a/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/Logs/gitinclude.rtf b/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/Logs/gitinclude.txt similarity index 100% rename from TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/Logs/gitinclude.rtf rename to TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/Logs/gitinclude.txt diff --git a/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/Logs/log-development2-20250513.txt b/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/Logs/log-development2-20250513.txt deleted file mode 100644 index df494e6..0000000 --- a/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/Logs/log-development2-20250513.txt +++ /dev/null @@ -1,29 +0,0 @@ -{"@t":"2025-05-13T07:56:28.9102309Z","@mt":"HTTP {RequestMethod} {RequestPath} responded {StatusCode} in {Elapsed:0.0000} ms","@r":["206.2063"],"@tr":"e486761fa10a1b3849ed675fab43bd5e","@sp":"402c7c3cd7c050f2","RequestMethod":"GET","RequestPath":"/","StatusCode":200,"Elapsed":206.2063,"SourceContext":"Serilog.AspNetCore.RequestLoggingMiddleware","RequestId":"0HNCHUEL8TL9R:00000001","ConnectionId":"0HNCHUEL8TL9R","Application":"E2E Blazor Server","Environment":"Development"} -{"@t":"2025-05-13T07:56:28.9714160Z","@mt":"HTTP {RequestMethod} {RequestPath} responded {StatusCode} in {Elapsed:0.0000} ms","@r":["26.5823"],"@tr":"9f7c570770e460eb7c5cd26f1fb25acb","@sp":"14f7e48ba89bc42e","RequestMethod":"GET","RequestPath":"/_content/TELBlazor.Components.ShowCase.Shared/css/app.css","StatusCode":304,"Elapsed":26.5823,"SourceContext":"Serilog.AspNetCore.RequestLoggingMiddleware","RequestId":"0HNCHUEL8TL9R:0000000B","ConnectionId":"0HNCHUEL8TL9R","Application":"E2E Blazor Server","Environment":"Development"} -{"@t":"2025-05-13T07:56:28.9719321Z","@mt":"HTTP {RequestMethod} {RequestPath} responded {StatusCode} in {Elapsed:0.0000} ms","@r":["19.5909"],"@tr":"bbc619ec27ba17b62c1047edc09f1ab5","@sp":"1fbc0cf08ee7321f","RequestMethod":"GET","RequestPath":"/_framework/blazor.web.js","StatusCode":304,"Elapsed":19.5909,"SourceContext":"Serilog.AspNetCore.RequestLoggingMiddleware","RequestId":"0HNCHUEL8TL9R:0000000D","ConnectionId":"0HNCHUEL8TL9R","Application":"E2E Blazor Server","Environment":"Development"} -{"@t":"2025-05-13T07:56:29.0000859Z","@mt":"HTTP {RequestMethod} {RequestPath} responded {StatusCode} in {Elapsed:0.0000} ms","@r":["55.2582"],"@tr":"119b1111a59d4e94549f0f3395a3cd57","@sp":"a2bd8d243ef1d563","RequestMethod":"GET","RequestPath":"/_content/TELBlazor.Components/css/nhsuk.css","StatusCode":200,"Elapsed":55.2582,"SourceContext":"Serilog.AspNetCore.RequestLoggingMiddleware","RequestId":"0HNCHUEL8TL9R:00000005","ConnectionId":"0HNCHUEL8TL9R","Application":"E2E Blazor Server","Environment":"Development"} -{"@t":"2025-05-13T07:56:28.9907364Z","@mt":"HTTP {RequestMethod} {RequestPath} responded {StatusCode} in {Elapsed:0.0000} ms","@r":["45.9193"],"@tr":"0821a71fd084442cacb800a6f1150d4a","@sp":"f64fe12816942ee4","RequestMethod":"GET","RequestPath":"/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost.styles.css","StatusCode":200,"Elapsed":45.9193,"SourceContext":"Serilog.AspNetCore.RequestLoggingMiddleware","RequestId":"0HNCHUEL8TL9R:00000009","ConnectionId":"0HNCHUEL8TL9R","Application":"E2E Blazor Server","Environment":"Development"} -{"@t":"2025-05-13T07:56:29.0292779Z","@mt":"HTTP {RequestMethod} {RequestPath} responded {StatusCode} in {Elapsed:0.0000} ms","@r":["11.6949"],"@tr":"d11c7bcad8925492ec8f5bb42f847c90","@sp":"3ca886b78de93069","RequestMethod":"GET","RequestPath":"/_content/TELBlazor.Components/TELBlazor.Components.bundle.scp.css","StatusCode":200,"Elapsed":11.6949,"SourceContext":"Serilog.AspNetCore.RequestLoggingMiddleware","RequestId":"0HNCHUEL8TL9R:0000000F","ConnectionId":"0HNCHUEL8TL9R","Application":"E2E Blazor Server","Environment":"Development"} -{"@t":"2025-05-13T07:56:29.0943576Z","@mt":"HTTP {RequestMethod} {RequestPath} responded {StatusCode} in {Elapsed:0.0000} ms","@r":["22.6620"],"@tr":"e9117519b6bb718cc70a4f019d09f6b8","@sp":"30d9ba84dae84774","RequestMethod":"GET","RequestPath":"/_framework/dotnet.js.gz","StatusCode":200,"Elapsed":22.662,"SourceContext":"Serilog.AspNetCore.RequestLoggingMiddleware","RequestId":"0HNCHUEL8TL9R:00000011","ConnectionId":"0HNCHUEL8TL9R","Application":"E2E Blazor Server","Environment":"Development"} -{"@t":"2025-05-13T07:56:29.1159233Z","@mt":"HTTP {RequestMethod} {RequestPath} responded {StatusCode} in {Elapsed:0.0000} ms","@r":["13.7434"],"@tr":"f00bf6b1bcb645cbcd26d62b8a2dd11c","@sp":"c53dc030a90556f2","RequestMethod":"GET","RequestPath":"/_framework/blazor.boot.json.gz","StatusCode":200,"Elapsed":13.7434,"SourceContext":"Serilog.AspNetCore.RequestLoggingMiddleware","RequestId":"0HNCHUEL8TL9R:00000013","ConnectionId":"0HNCHUEL8TL9R","Application":"E2E Blazor Server","Environment":"Development"} -{"@t":"2025-05-13T07:56:29.1530386Z","@mt":"HTTP {RequestMethod} {RequestPath} responded {StatusCode} in {Elapsed:0.0000} ms","@r":["0.6500"],"@tr":"d28fe0e1707c06270e0226cf35d82f52","@sp":"084b1b5e86b81323","RequestMethod":"GET","RequestPath":"/appsettings.json","StatusCode":304,"Elapsed":0.65,"SourceContext":"Serilog.AspNetCore.RequestLoggingMiddleware","RequestId":"0HNCHUEL8TL9R:0000001B","ConnectionId":"0HNCHUEL8TL9R","Application":"E2E Blazor Server","Environment":"Development"} -{"@t":"2025-05-13T07:56:29.1752472Z","@mt":"HTTP {RequestMethod} {RequestPath} responded {StatusCode} in {Elapsed:0.0000} ms","@r":["22.6228"],"@tr":"593e85af821d83f203a2a560066ca493","@sp":"ef50c038fdfd4be5","RequestMethod":"GET","RequestPath":"/appsettings.Development.json","StatusCode":200,"Elapsed":22.6228,"SourceContext":"Serilog.AspNetCore.RequestLoggingMiddleware","RequestId":"0HNCHUEL8TL9R:00000019","ConnectionId":"0HNCHUEL8TL9R","Application":"E2E Blazor Server","Environment":"Development"} -{"@t":"2025-05-13T07:56:29.1908279Z","@mt":"HTTP {RequestMethod} {RequestPath} responded {StatusCode} in {Elapsed:0.0000} ms","@r":["67.3867"],"@tr":"332c05f2eadb9d2293e35b9f21ffe303","@sp":"8db27f9bde557d08","RequestMethod":"GET","RequestPath":"/_framework/dotnet.native.8.0.15.ggd1fyv7lv.js.gz","StatusCode":200,"Elapsed":67.3867,"SourceContext":"Serilog.AspNetCore.RequestLoggingMiddleware","RequestId":"0HNCHUEL8TL9R:00000017","ConnectionId":"0HNCHUEL8TL9R","Application":"E2E Blazor Server","Environment":"Development"} -{"@t":"2025-05-13T07:56:29.1910914Z","@mt":"HTTP {RequestMethod} {RequestPath} responded {StatusCode} in {Elapsed:0.0000} ms","@r":["67.6677"],"@tr":"fc95a374b99986089601d8892e71f90e","@sp":"84defb2d07dc3675","RequestMethod":"GET","RequestPath":"/_framework/dotnet.runtime.8.0.15.pdm8tx6jky.js.gz","StatusCode":200,"Elapsed":67.6677,"SourceContext":"Serilog.AspNetCore.RequestLoggingMiddleware","RequestId":"0HNCHUEL8TL9R:00000015","ConnectionId":"0HNCHUEL8TL9R","Application":"E2E Blazor Server","Environment":"Development"} -{"@t":"2025-05-13T07:56:29.2369807Z","@mt":"HTTP {RequestMethod} {RequestPath} responded {StatusCode} in {Elapsed:0.0000} ms","@r":["19.8228"],"@tr":"eb3c6708a53efe68d00b0c3d5f5c0fab","@sp":"f38af59c4908c9f3","RequestMethod":"GET","RequestPath":"/_framework/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost.Client.wasm.gz","StatusCode":200,"Elapsed":19.8228,"SourceContext":"Serilog.AspNetCore.RequestLoggingMiddleware","RequestId":"0HNCHUEL8TL9R:0000001F","ConnectionId":"0HNCHUEL8TL9R","Application":"E2E Blazor Server","Environment":"Development"} -{"@t":"2025-05-13T07:56:29.2371549Z","@mt":"HTTP {RequestMethod} {RequestPath} responded {StatusCode} in {Elapsed:0.0000} ms","@r":["19.7992"],"@tr":"f1aefece9435ecf6573db8bd0bca0152","@sp":"271ceba616ec011d","RequestMethod":"GET","RequestPath":"/_framework/TELBlazor.Components.wasm.gz","StatusCode":200,"Elapsed":19.7992,"SourceContext":"Serilog.AspNetCore.RequestLoggingMiddleware","RequestId":"0HNCHUEL8TL9R:0000001D","ConnectionId":"0HNCHUEL8TL9R","Application":"E2E Blazor Server","Environment":"Development"} -{"@t":"2025-05-13T07:56:29.2373820Z","@mt":"HTTP {RequestMethod} {RequestPath} responded {StatusCode} in {Elapsed:0.0000} ms","@r":["20.2431"],"@tr":"69c0ecbb3151c6679bb4bca81fb1b99d","@sp":"2ff25ec00c0f2074","RequestMethod":"GET","RequestPath":"/_framework/TELBlazor.Components.ShowCase.Shared.pdb.gz","StatusCode":200,"Elapsed":20.2431,"SourceContext":"Serilog.AspNetCore.RequestLoggingMiddleware","RequestId":"0HNCHUEL8TL9R:00000021","ConnectionId":"0HNCHUEL8TL9R","Application":"E2E Blazor Server","Environment":"Development"} -{"@t":"2025-05-13T07:56:29.2415066Z","@mt":"HTTP {RequestMethod} {RequestPath} responded {StatusCode} in {Elapsed:0.0000} ms","@r":["22.7513"],"@tr":"80e92042f986d5ad50f0c3caa2b7758a","@sp":"2068dfccb49789a8","RequestMethod":"GET","RequestPath":"/_framework/TELBlazor.Components.pdb.gz","StatusCode":200,"Elapsed":22.7513,"SourceContext":"Serilog.AspNetCore.RequestLoggingMiddleware","RequestId":"0HNCHUEL8TL9R:00000023","ConnectionId":"0HNCHUEL8TL9R","Application":"E2E Blazor Server","Environment":"Development"} -{"@t":"2025-05-13T07:56:29.2514843Z","@mt":"HTTP {RequestMethod} {RequestPath} responded {StatusCode} in {Elapsed:0.0000} ms","@r":["33.4019"],"@tr":"9d1329c63d4e6bf792519555499f14bb","@sp":"c5b15ea3baf13c19","RequestMethod":"GET","RequestPath":"/_framework/TELBlazor.Components.ShowCase.Shared.wasm.gz","StatusCode":200,"Elapsed":33.4019,"SourceContext":"Serilog.AspNetCore.RequestLoggingMiddleware","RequestId":"0HNCHUEL8TL9R:00000027","ConnectionId":"0HNCHUEL8TL9R","Application":"E2E Blazor Server","Environment":"Development"} -{"@t":"2025-05-13T07:56:29.2521368Z","@mt":"HTTP {RequestMethod} {RequestPath} responded {StatusCode} in {Elapsed:0.0000} ms","@r":["34.1502"],"@tr":"cdbe70904b7d859e76a47abd22448fdb","@sp":"d70333c099fb14cd","RequestMethod":"GET","RequestPath":"/_framework/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost.Client.pdb.gz","StatusCode":200,"Elapsed":34.1502,"SourceContext":"Serilog.AspNetCore.RequestLoggingMiddleware","RequestId":"0HNCHUEL8TL9R:00000025","ConnectionId":"0HNCHUEL8TL9R","Application":"E2E Blazor Server","Environment":"Development"} -{"@t":"2025-05-13T08:08:00.8564165Z","@mt":"HTTP {RequestMethod} {RequestPath} responded {StatusCode} in {Elapsed:0.0000} ms","@r":["264.2519"],"@tr":"2c815a5a9ce2594b6a8e9491e4fa4c92","@sp":"5cb23edaac1efa38","RequestMethod":"GET","RequestPath":"/","StatusCode":200,"Elapsed":264.2519,"SourceContext":"Serilog.AspNetCore.RequestLoggingMiddleware","RequestId":"0HNCHUL3G0QAN:00000001","ConnectionId":"0HNCHUL3G0QAN","Application":"E2E Blazor Server","Environment":"Development"} -{"@t":"2025-05-13T08:08:00.9279296Z","@mt":"HTTP {RequestMethod} {RequestPath} responded {StatusCode} in {Elapsed:0.0000} ms","@r":["24.7573"],"@tr":"b7f9cba0b7a44a7715e44c1d2a1f2761","@sp":"29656352487f4935","RequestMethod":"GET","RequestPath":"/_content/TELBlazor.Components/TELBlazor.Components.bundle.scp.css","StatusCode":200,"Elapsed":24.7573,"SourceContext":"Serilog.AspNetCore.RequestLoggingMiddleware","RequestId":"0HNCHUL3G0QAN:0000000B","ConnectionId":"0HNCHUL3G0QAN","Application":"E2E Blazor Server","Environment":"Development"} -{"@t":"2025-05-13T08:08:00.9130988Z","@mt":"HTTP {RequestMethod} {RequestPath} responded {StatusCode} in {Elapsed:0.0000} ms","@r":["14.1676"],"@tr":"f9fb442da3b7727a913852de5cc17415","@sp":"67f1b1048dd5cf01","RequestMethod":"GET","RequestPath":"/_framework/blazor.web.js","StatusCode":304,"Elapsed":14.1676,"SourceContext":"Serilog.AspNetCore.RequestLoggingMiddleware","RequestId":"0HNCHUL3G0QAN:00000009","ConnectionId":"0HNCHUL3G0QAN","Application":"E2E Blazor Server","Environment":"Development"} -{"@t":"2025-05-13T08:08:00.9279296Z","@mt":"HTTP {RequestMethod} {RequestPath} responded {StatusCode} in {Elapsed:0.0000} ms","@r":["37.7552"],"@tr":"2a2347b18f0fb7f7a57f5342a7b6d027","@sp":"0cc498bc25c39dc2","RequestMethod":"GET","RequestPath":"/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost.styles.css","StatusCode":200,"Elapsed":37.7552,"SourceContext":"Serilog.AspNetCore.RequestLoggingMiddleware","RequestId":"0HNCHUL3G0QAN:00000003","ConnectionId":"0HNCHUL3G0QAN","Application":"E2E Blazor Server","Environment":"Development"} -{"@t":"2025-05-13T08:08:00.9401372Z","@mt":"HTTP {RequestMethod} {RequestPath} responded {StatusCode} in {Elapsed:0.0000} ms","@r":["49.9483"],"@tr":"74708534fe6a6a3ade28a2671fa24d37","@sp":"9442089822255248","RequestMethod":"GET","RequestPath":"/_content/TELBlazor.Components/css/nhsuk.css","StatusCode":200,"Elapsed":49.9483,"SourceContext":"Serilog.AspNetCore.RequestLoggingMiddleware","RequestId":"0HNCHUL3G0QAN:00000007","ConnectionId":"0HNCHUL3G0QAN","Application":"E2E Blazor Server","Environment":"Development"} -{"@t":"2025-05-13T08:08:01.0296173Z","@mt":"HTTP {RequestMethod} {RequestPath} responded {StatusCode} in {Elapsed:0.0000} ms","@r":["32.0095"],"@tr":"00bf5ccdd97650377ad403a48c52035f","@sp":"e2136a7ed6a09a62","RequestMethod":"GET","RequestPath":"/_framework/dotnet.js.gz","StatusCode":200,"Elapsed":32.0095,"SourceContext":"Serilog.AspNetCore.RequestLoggingMiddleware","RequestId":"0HNCHUL3G0QAN:0000000F","ConnectionId":"0HNCHUL3G0QAN","Application":"E2E Blazor Server","Environment":"Development"} -{"@t":"2025-05-13T08:08:01.0612584Z","@mt":"HTTP {RequestMethod} {RequestPath} responded {StatusCode} in {Elapsed:0.0000} ms","@r":["19.9243"],"@tr":"9df52c64edae2aeaff965ad1343e447a","@sp":"0bab8774cbbfcc21","RequestMethod":"GET","RequestPath":"/_framework/blazor.boot.json.gz","StatusCode":200,"Elapsed":19.9243,"SourceContext":"Serilog.AspNetCore.RequestLoggingMiddleware","RequestId":"0HNCHUL3G0QAN:00000011","ConnectionId":"0HNCHUL3G0QAN","Application":"E2E Blazor Server","Environment":"Development"} -{"@t":"2025-05-13T08:08:01.1055423Z","@mt":"HTTP {RequestMethod} {RequestPath} responded {StatusCode} in {Elapsed:0.0000} ms","@r":["0.5052"],"@tr":"a551d7bb00bb6bb0d4bdc3a2075c4185","@sp":"3405854768d2a850","RequestMethod":"GET","RequestPath":"/appsettings.Development.json","StatusCode":304,"Elapsed":0.5052,"SourceContext":"Serilog.AspNetCore.RequestLoggingMiddleware","RequestId":"0HNCHUL3G0QAN:00000017","ConnectionId":"0HNCHUL3G0QAN","Application":"E2E Blazor Server","Environment":"Development"} -{"@t":"2025-05-13T08:08:01.1055786Z","@mt":"HTTP {RequestMethod} {RequestPath} responded {StatusCode} in {Elapsed:0.0000} ms","@r":["0.5519"],"@tr":"e89879fdfe290fda2483e579fb0734fc","@sp":"1b766c853964aefe","RequestMethod":"GET","RequestPath":"/appsettings.json","StatusCode":304,"Elapsed":0.5519,"SourceContext":"Serilog.AspNetCore.RequestLoggingMiddleware","RequestId":"0HNCHUL3G0QAN:00000019","ConnectionId":"0HNCHUL3G0QAN","Application":"E2E Blazor Server","Environment":"Development"} -{"@t":"2025-05-13T08:08:01.1405785Z","@mt":"HTTP {RequestMethod} {RequestPath} responded {StatusCode} in {Elapsed:0.0000} ms","@r":["64.3627"],"@tr":"9180ba7c6d32f1d2aea5dd935e8d63a9","@sp":"13300517905d5cda","RequestMethod":"GET","RequestPath":"/_framework/dotnet.native.8.0.15.ggd1fyv7lv.js.gz","StatusCode":200,"Elapsed":64.3627,"SourceContext":"Serilog.AspNetCore.RequestLoggingMiddleware","RequestId":"0HNCHUL3G0QAN:00000015","ConnectionId":"0HNCHUL3G0QAN","Application":"E2E Blazor Server","Environment":"Development"} -{"@t":"2025-05-13T08:08:01.1552604Z","@mt":"HTTP {RequestMethod} {RequestPath} responded {StatusCode} in {Elapsed:0.0000} ms","@r":["79.1946"],"@tr":"20fb8c9cdff6bbfff277ea4755ed74df","@sp":"cd501e94e83ef06f","RequestMethod":"GET","RequestPath":"/_framework/dotnet.runtime.8.0.15.pdm8tx6jky.js.gz","StatusCode":200,"Elapsed":79.1946,"SourceContext":"Serilog.AspNetCore.RequestLoggingMiddleware","RequestId":"0HNCHUL3G0QAN:00000013","ConnectionId":"0HNCHUL3G0QAN","Application":"E2E Blazor Server","Environment":"Development"} diff --git a/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost.csproj b/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost.csproj index 76d41a5..8cca8d1 100644 --- a/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost.csproj +++ b/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost.csproj @@ -28,8 +28,4 @@ - - - - diff --git a/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/appsettings.Development.json.template b/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/appsettings.Development.json.template index 319791f..375c3f6 100644 --- a/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/appsettings.Development.json.template +++ b/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/appsettings.Development.json.template @@ -35,6 +35,7 @@ "Name": "File", "Args": { "path": "Logs/log-development2-.txt", + // Adjust the path as needed for your environment because currently its relative to bin e.g. "path": "C:/dev/repos/TELBlazor/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/Logs/log-development2-.txt", "rollingInterval": "Day", "rollOnFileSizeLimit": true, "formatter": "Serilog.Formatting.Compact.CompactJsonFormatter, Serilog.Formatting.Compact" diff --git a/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/packages.lock.json b/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/packages.lock.json index c76c734..c01e0ce 100644 --- a/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/packages.lock.json +++ b/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/packages.lock.json @@ -348,7 +348,6 @@ "Serilog.Settings.Configuration": "[8.0.0, )", "Serilog.Sinks.BrowserConsole": "[8.0.0, )", "Serilog.Sinks.Http": "[8.0.0, )", - "TELBlazor.Components": "[1.9.3-local, )", "TELBlazor.Components.ShowCase.Shared": "[1.0.0, )" } }, @@ -359,7 +358,7 @@ "Markdig": "[0.41.3, )", "Microsoft.AspNetCore.Components.Web": "[8.0.14, )", "Serilog": "[4.2.0, )", - "TELBlazor.Components": "[1.9.3-local, )" + "TELBlazor.Components": "[1.2.6-local, )" } }, "Markdig": { diff --git a/TELBlazor.Components.ShowCase.E2ETests/Reports/gitinclude.txt b/TELBlazor.Components.ShowCase.E2ETests/Reports/gitinclude.txt new file mode 100644 index 0000000..e3a3b5f --- /dev/null +++ b/TELBlazor.Components.ShowCase.E2ETests/Reports/gitinclude.txt @@ -0,0 +1 @@ +gitinclude \ No newline at end of file diff --git a/TELBlazor.Components.ShowCase.E2ETests/packages.lock.json b/TELBlazor.Components.ShowCase.E2ETests/packages.lock.json index 3f5982a..74639a6 100644 --- a/TELBlazor.Components.ShowCase.E2ETests/packages.lock.json +++ b/TELBlazor.Components.ShowCase.E2ETests/packages.lock.json @@ -1601,7 +1601,6 @@ "Serilog.Settings.Configuration": "[8.0.0, )", "Serilog.Sinks.BrowserConsole": "[8.0.0, )", "Serilog.Sinks.Http": "[8.0.0, )", - "TELBlazor.Components": "[1.9.3-local, )", "TELBlazor.Components.ShowCase.Shared": "[1.0.0, )" } }, @@ -1612,7 +1611,7 @@ "Markdig": "[0.41.3, )", "Microsoft.AspNetCore.Components.Web": "[8.0.14, )", "Serilog": "[4.2.0, )", - "TELBlazor.Components": "[1.9.3-local, )" + "TELBlazor.Components": "[1.2.6-local, )" } }, "Blazored.LocalStorage": { diff --git a/TELBlazor.Components.ShowCase.Shared/TELBlazor.Components.ShowCase.Shared.csproj b/TELBlazor.Components.ShowCase.Shared/TELBlazor.Components.ShowCase.Shared.csproj index 8e19aef..4bdb05a 100644 --- a/TELBlazor.Components.ShowCase.Shared/TELBlazor.Components.ShowCase.Shared.csproj +++ b/TELBlazor.Components.ShowCase.Shared/TELBlazor.Components.ShowCase.Shared.csproj @@ -13,7 +13,9 @@ - + + + diff --git a/TELBlazor.Components.ShowCase.WasmStaticClient/TELBlazor.Components.ShowCase.WasmStaticClient.csproj b/TELBlazor.Components.ShowCase.WasmStaticClient/TELBlazor.Components.ShowCase.WasmStaticClient.csproj index 341866a..ee264e8 100644 --- a/TELBlazor.Components.ShowCase.WasmStaticClient/TELBlazor.Components.ShowCase.WasmStaticClient.csproj +++ b/TELBlazor.Components.ShowCase.WasmStaticClient/TELBlazor.Components.ShowCase.WasmStaticClient.csproj @@ -42,11 +42,14 @@ + + + - + diff --git a/TELBlazor.Components.ShowCase.WasmStaticClient/packages.lock.json b/TELBlazor.Components.ShowCase.WasmStaticClient/packages.lock.json index fa02c91..1194dc0 100644 --- a/TELBlazor.Components.ShowCase.WasmStaticClient/packages.lock.json +++ b/TELBlazor.Components.ShowCase.WasmStaticClient/packages.lock.json @@ -76,15 +76,15 @@ }, "Microsoft.NET.ILLink.Tasks": { "type": "Direct", - "requested": "[8.0.18, )", - "resolved": "8.0.18", - "contentHash": "OiXqr2YIBEV9dsAWEtasK470ALyJ0VxJ9k4MotOxlWV6HeEgrJKYMW4HHj1OCCXvqE0/A25wEKPkpfiBARgDZA==" + "requested": "[8.0.19, )", + "resolved": "8.0.19", + "contentHash": "IhHf+zeZiaE5EXRyxILd4qM+Hj9cxV3sa8MpzZgeEhpvaG3a1VEGF6UCaPFLO44Kua3JkLKluE0SWVamS50PlA==" }, "Microsoft.NET.Sdk.WebAssembly.Pack": { "type": "Direct", - "requested": "[8.0.18, )", - "resolved": "8.0.18", - "contentHash": "SoVkRwFwnaX39J1uaI72PTilSJ6OoonIG+2VMpazEaAA9t+aJt2Caf49q76SYv3x9iU8hu1axlMWSkR9rt8nIg==" + "requested": "[8.0.19, )", + "resolved": "8.0.19", + "contentHash": "Cm/sq4ET7XGU7jBSfSh+s+eV0faJ1RnErpImRYN7+d5loWISBwl22qsM6sn9StUWKJao+xGvF0IxgyPVnY20Vw==" }, "Serilog": { "type": "Direct", @@ -464,7 +464,7 @@ "Markdig": "[0.41.3, )", "Microsoft.AspNetCore.Components.Web": "[8.0.14, )", "Serilog": "[4.2.0, )", - "TELBlazor.Components": "[1.9.3-local, )" + "TELBlazor.Components": "[1.2.6-local, )" } }, "Markdig": { diff --git a/TELBlazor.Components.UnitTests/TELBlazor.Components.UnitTests.csproj b/TELBlazor.Components.UnitTests/TELBlazor.Components.UnitTests.csproj index cdea28d..4d6fded 100644 --- a/TELBlazor.Components.UnitTests/TELBlazor.Components.UnitTests.csproj +++ b/TELBlazor.Components.UnitTests/TELBlazor.Components.UnitTests.csproj @@ -33,11 +33,13 @@ + + + all runtime; build; native; contentfiles; analyzers - diff --git a/TELBlazor.Components/OptionalImplementations/Test/TestComponents/SearchExperiment/SearchExperimentServiceOpenApi.cs b/TELBlazor.Components/OptionalImplementations/Test/TestComponents/SearchExperiment/SearchExperimentServiceOpenApi.cs index 7697f69..1b471f9 100644 --- a/TELBlazor.Components/OptionalImplementations/Test/TestComponents/SearchExperiment/SearchExperimentServiceOpenApi.cs +++ b/TELBlazor.Components/OptionalImplementations/Test/TestComponents/SearchExperiment/SearchExperimentServiceOpenApi.cs @@ -12,71 +12,6 @@ namespace TELBlazor.Components.OptionalImplementations.Test.TestComponents.SearchExperiment { - //curl -X 'GET' \ - // 'https://lh-openapi.dev.local/Search/GetAutoSuggestionResult/blood' \ - // -H 'accept: */*' \ - // -H 'Authorization: Bearer ' - -// { -// "stats": { -// "totalHits": 23, -// "searchEngineTimeInMillis": 3, -// "searchEngineRoundTripTimeInMillis": 4, -// "searchProcessingTimeInMillis": 5 -// }, -// "catalogueDocument": { -// "id": "catalogues_documents", -// "totalHits": 0, -// "catalogueDocumentList": [] -// }, -// "conceptDocument": { -// "id": "concepts_documents", -// "totalHits": 6, -// "conceptDocumentList": [ -// { -// "id": "blood transfusion_hee-local", -// "title": "426 Blood Transfusion - Non Registered Staff, Mandatory Training Workbook 2019-20", -// "concept": "blood transfusion", -// "click": { -// "payload": { -// "searchSignal": { -// "stats": { -// "totalHits": 23 -// }, -// "searchId": "5b3e2cb9-2a6b-4d9a-8879-a7ba336abf3e", -// "profileSignature": { -// "applicationId": "HEE", -// "profileType": "SEARCHER", -// "profileId": "auto-suggestion-local" -// }, -// "userQuery": "q=blood", -// "query": "q=blood", -// "timeOfSearch": 1750247278498 -// }, -// "hitNumber": 4, -// "clickTargetUrl": "blood transfusion_hee-local", -// "documentFields": { -// "name": null, -// "title": "426 Blood Transfusion - Non Registered Staff, Mandatory Training Workbook 2019-20" -// }, -// "containerId": "concepts_documents", -// "timeOfClick": null -// }, -// "url": "/signals/hee/signal/click-hee" -// } -// } -// ] -// }, -// "resourceDocument": { -// "id": "resources_documents", -// "totalHits": 17, -// "resourceDocumentList": [ -// { - -// } -// ] -// } -//} public class SearchExperimentServiceOpenApi :ISearchExperimentService { //qqqq can do alot better @@ -90,11 +25,6 @@ public SearchExperimentServiceOpenApi(HttpClient httpClient, IConfiguration conf _baseUrl = configuration["SearchApi:BaseUrl"] ?? "https://lh-openapi.dev.local"; _logger = logger; - //var token = configuration["SearchApi:BearerToken"]; - //if (!string.IsNullOrEmpty(token)) - //{ - // _httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token); - //} } public async Task> GetSuggestionsAsync(string term, CancellationToken cancellationToken = default) { diff --git a/TELBlazor.Components/TELBlazor.Components.csproj b/TELBlazor.Components/TELBlazor.Components.csproj index 274d19b..ea4db64 100644 --- a/TELBlazor.Components/TELBlazor.Components.csproj +++ b/TELBlazor.Components/TELBlazor.Components.csproj @@ -48,17 +48,6 @@ - - - @@ -70,18 +59,45 @@ PreserveNewest - - - + + + + + + + $(DefaultItemExcludes);TELBlazorPackageVersion\VersionInfo.*.cs + + + - - - + + + + + + + + + + + + + + + - diff --git a/TELBlazor.Components/TELBlazorPackageVersion/VersionInfo.TELBlazor.cs b/TELBlazor.Components/TELBlazorPackageVersion/VersionInfo.TELBlazor.cs deleted file mode 100644 index 6ec3dc5..0000000 --- a/TELBlazor.Components/TELBlazorPackageVersion/VersionInfo.TELBlazor.cs +++ /dev/null @@ -1,2 +0,0 @@ -namespace TELBlazor.Components.TELBlazorPackageVersion{public static partial class VersionInfo{public const string TELBlazorPackageVersion = "1.9.3-local" ; -} } diff --git a/TELBlazor.Components/TELBlazorPackageVersion/VersionInfo.TELFrontEnd.cs b/TELBlazor.Components/TELBlazorPackageVersion/VersionInfo.TELFrontEnd.cs deleted file mode 100644 index 3d003c7..0000000 --- a/TELBlazor.Components/TELBlazorPackageVersion/VersionInfo.TELFrontEnd.cs +++ /dev/null @@ -1 +0,0 @@ - namespace TELBlazor.Components.TELBlazorPackageVersion{public static partial class VersionInfo{public static readonly string TELFrontEndPackageVersion = "0.0.2";}} \ No newline at end of file diff --git a/TELBlazor.Components/gulpfile.js b/TELBlazor.Components/gulpfile.js index a7d2d38..c25fa4c 100644 --- a/TELBlazor.Components/gulpfile.js +++ b/TELBlazor.Components/gulpfile.js @@ -37,13 +37,21 @@ gulp.task("add-telFrontEndVersion-to-versionInfo", function (done) { console.log(`Adding TELFrontEndPackageVersion to CS file at: ${versionFilePath}`); + // Read existing content only if file exists + if (fs.existsSync(versionFilePath)) { + let existingContent = fs.readFileSync(versionFilePath, "utf8"); + console.log("This pre-existing content will boe over written :", existingContent); + } - // Read existing content - let existingContent = fs.readFileSync(versionFilePath, "utf8"); - console.log("Existing content:", existingContent); - - const content = ` namespace TELBlazor.Components.TELBlazorPackageVersion{public static partial class VersionInfo{public static readonly string TELFrontEndPackageVersion = "${TELFrontEndPackageVersion}";}} `; - + const content = `// This file is auto-generated. Do not edit manually. +namespace TELBlazor.Components.TELBlazorPackageVersion +{ + public static partial class VersionInfo + { + public const string TELFrontEndPackageVersion = "${TELFrontEndPackageVersion}"; + } +} +`; // Write or overwrite the file completely fs.writeFileSync(versionFilePath, content, "utf8"); console.log(`VersionInfo.TELFrontEnd.cs file updated with version ${TELFrontEndPackageVersion}`); diff --git a/TELBlazor.Components/wwwroot/TELBlazorPackageVersion.txt b/TELBlazor.Components/wwwroot/TELBlazorPackageVersion.txt deleted file mode 100644 index 3826c65..0000000 --- a/TELBlazor.Components/wwwroot/TELBlazorPackageVersion.txt +++ /dev/null @@ -1 +0,0 @@ -1.4.0 diff --git a/TELBlazor.sln b/TELBlazor.sln index d2f65a3..324610f 100644 --- a/TELBlazor.sln +++ b/TELBlazor.sln @@ -16,7 +16,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution nuget.config = nuget.config nuget.config.cicd = nuget.config.cicd nuget.config.template = nuget.config.template - package-lock.json = package-lock.json package.json = package.json PackageSettings.props = PackageSettings.props PackageSettings.props.local = PackageSettings.props.local diff --git a/run-tests-and-report-using-local-props.ps1 b/run-tests-and-report-using-local-props.ps1 new file mode 100644 index 0000000..db8f90a --- /dev/null +++ b/run-tests-and-report-using-local-props.ps1 @@ -0,0 +1,47 @@ +<# +.SYNOPSIS +Run tests and generate coverage report using local MSBuild props file for environment settings. + + +.USAGE +From the solution root (where this script lives), run: + ./run-tests-and-report-using-local-props.ps1 +#> + +# Go to script root +$ScriptRoot = Split-Path -Parent $MyInvocation.MyCommand.Path +Set-Location $ScriptRoot + +# Path to your local props file +$LocalPropsFile = Join-Path $ScriptRoot "PackageSettings.props.local" + +if (-Not (Test-Path $LocalPropsFile)) { + Write-Error "Local props file not found at $LocalPropsFile" + exit 1 +} + +# Load MSBuild XML +[xml]$propsXml = Get-Content $LocalPropsFile + +# Extract values and set env variables +$env:TELBLAZOR_PACKAGE_VERSION = $propsXml.Project.PropertyGroup.TELBlazorPackageVersion +$env:NUGET_PACKAGES_OUTPUT_PATH = $propsXml.Project.PropertyGroup.NugetPackagesOutputPath +$env:USE_TEL_BLAZOR_COMPONENTS_PROJECT_REFERENCE = $propsXml.Project.PropertyGroup.UseTELBlazorComponentsProjectReference +$env:DISABLE_PACKAGE_GENERATION = $propsXml.Project.PropertyGroup.DisablePackageGeneration + +Write-Host "Using the following local settings from PackageSettings.Local.props:" +Write-Host "TELBLAZOR_PACKAGE_VERSION=$env:TELBLAZOR_PACKAGE_VERSION" +Write-Host "NUGET_PACKAGES_OUTPUT_PATH=$env:NUGET_PACKAGES_OUTPUT_PATH" +Write-Host "USE_TEL_BLAZOR_COMPONENTS_PROJECT_REFERENCE=$env:USE_TEL_BLAZOR_COMPONENTS_PROJECT_REFERENCE" +Write-Host "DISABLE_PACKAGE_GENERATION=$env:DISABLE_PACKAGE_GENERATION" + +# Run Tests +dotnet test --no-build --no-restore --settings .runsettings + +# Generate Coverage Report +dotnet reportgenerator ` + -reports:"**/AllTestResults/**/coverage.cobertura.xml" ` + -targetdir:CoverageReport ` + -reporttypes:Html + +Write-Host "Coverage report generated at: $ScriptRoot\CoverageReport\index.html"