Skip to content

Feat version work on branch maybe #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Phil-NHS merged 3 commits into from
Apr 15, 2025
Merged

Feat version work on branch maybe #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6032063
feat(rel yml): yml
Phil-NHS Apr 15, 2025
7ee39c3
Merge branch 'feat-version-work-on-branch-maybe' of https://github.co…
Phil-NHS Apr 15, 2025
b68a460
chore(release): 9.0.0-feat-version-work-on-branch-maybe.29 [skip ci]
semantic-release-bot Apr 15, 2025
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
22 changes: 11 additions & 11 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,24 +171,24 @@ jobs:

# Hardcode the INDEPENDENT_CLIENT_GH_PAGES value
# Blazor client so appsetting in wwwroot and public
- name: Modify appsettings.json with hardcoded value
run: |
jq '.INDEPENDENT_CLIENT_GH_PAGES = "true"' TestHostPrerenderWASM/TestHostPrerenderWASM.Client/wwwroot/appsettings.json > tmp.json && mv tmp.json TestHostPrerenderWASM/TestHostPrerenderWASM.Client/wwwroot/appsettings.json
- name: Modify appsettings.json with hardcoded value
run: |
jq '.INDEPENDENT_CLIENT_GH_PAGES = "true"' TestHostPrerenderWASM/TestHostPrerenderWASM.Client/wwwroot/appsettings.json > tmp.json && mv tmp.json TestHostPrerenderWASM/TestHostPrerenderWASM.Client/wwwroot/appsettings.json



# Print the contents of appsettings.json inside 'TestHostPrerenderWASM.Client' folder
# - name: Display appsettings.json content
# run: cat TestHostPrerenderWASM/TestHostPrerenderWASM.Client/wwwroot/appsettings.json

- name: Publish client using client release .csproj logic
run: |
dotnet publish ./TestHostPrerenderWASM/TestHostPrerenderWASM.Client/TestHostPrerenderWASM.Client.csproj --configuration Release \
/p:BCLVersion=$BCL_VERSION \
/p:NupkgOutputPath=$NUPKG_OUTPUT_PATH \
/p:UseBCLProjectReference=$USE_BCL_PROJECT_REFERENCE \
/p:GhPageRelease=true \
/p:LocalPackagePath=$BCL_Source
- name: Publish client using client release .csproj logic
run: |
dotnet publish ./TestHostPrerenderWASM/TestHostPrerenderWASM.Client/TestHostPrerenderWASM.Client.csproj --configuration Release \
/p:BCLVersion=$BCL_VERSION \
/p:NupkgOutputPath=$NUPKG_OUTPUT_PATH \
/p:UseBCLProjectReference=$USE_BCL_PROJECT_REFERENCE \
/p:GhPageRelease=true \
/p:LocalPackagePath=$BCL_Source


# No this will be in the release branch that we do a prod wiki host
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
# [9.0.0-feat-version-work-on-branch-maybe.29](https://github.com/TechnologyEnhancedLearning/GitPageBlazorWASM/compare/v9.0.0-feat-version-work-on-branch-maybe.28...v9.0.0-feat-version-work-on-branch-maybe.29) (2025-04-15)


### Features

* **rel yml:** yml ([6032063](https://github.com/TechnologyEnhancedLearning/GitPageBlazorWASM/commit/60320639e8e46d2a113f816ce259e0cf2b230e03))

# [9.0.0-feat-version-work-on-branch-maybe.28](https://github.com/TechnologyEnhancedLearning/GitPageBlazorWASM/compare/v9.0.0-feat-version-work-on-branch-maybe.27...v9.0.0-feat-version-work-on-branch-maybe.28) (2025-04-15)


Expand Down
47 changes: 18 additions & 29 deletions tree_structure.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,52 +12,41 @@ tr td:nth-child(2) {
# Project Structure
| Description | File Structure |
|----------------|-------------|
| | ┣ GitPageBlazorWASM |
| The github page is aimed at this and gets the version from gh-page branch. .Client publishes a standalone wasm site here |     ┣ docs |
| |             ┣ _content |
| |                     ┣ Package.BlazorComponentLibrary |
| |                     ┗ SharedPages |
| |                             ┗ css |
| |             ┣ _framework |
| Because its a spa we need to redirect 404 back to our index page parse them to take users to pages on refresh or if they go there directly |             ┣ 404.html |
| |             ┗ index.html |
| the pure webassembly project which was initially progressive publishes here |     ┣ docsReferenceNow |
| |             ┣ _content |
| |                     ┣ Package.BlazorComponentLibrary |
| |                     ┗ SharedPages |
| |                             ┗ css |
| |             ┣ _framework |
| |             ┗ index.html |
| just for making wiki style site if we decide to use the .client for testing and for creating the github page site then we dont need this |     ┣ GitPageBlazorWASMProgressive |
| | ┣ MVCBlazor |
| |     ┣ CICDPackageLocation |
| |     ┣ GitPageBlazorWASM |
| |     ┣ GitPageBlazorWASM.Client |
| |     ┣ Package.BlazorComponentLibrary |
| |             ┣ _Imports.razor |
| |             ┣ App.razor |
| |             ┗ Program.cs |
| This would be out blazor component package |     ┣ Package.BlazorComponentLibrary |
| |             ┣ _Imports.razor |
| |             ┗ Components |
| |             ┣ BCLVersion |
| |                     ┗ VersionInfo.cs |
| |             ┣ Components |
| |                     ┗ SimpleCounter.razor |
| Bunit and E2E tests, the E2E none javascript tests require prerendering and hence the server wasm project for testing |     ┣ PlaywrightXUnitGoesHere |
| |             ┗ DependencyInjection |
| |                     ┗ DependencyInjection.cs |
| |     ┣ PlaywrightXUnitGoesHere |
| |             ┣ justcheckinggitguardian.cs |
| |             ┗ UnitTest1.cs |
| to keep the projects slim, and if we decide to have seperate programs for creating the sites we put the site in a seperate project that everything can use, this wouldnt be packaged |     ┣ SharedPages |
| |     ┣ SharedPages |
| |             ┣ _Imports.razor |
| there is just enough complexity to see things working|             ┣ Layout |
| |             ┣ Layout |
| |                     ┣ ComponentPageLayout.razor |
| |                     ┗ MainLayout.razor |
| |             ┗ Pages |
| |                     ┣ ComponentPages |
| |                             ┗ CounterComponentPage.razor |
| |                     ┣ Error.razor |
| |                     ┗ Home.razor |
| we need this for prerendering this is the same kind of set up we would use when we consume our libraries (though see MVCBlazor project for actual setup) |     ┗ TestHostPrerenderWASM |
| slim |             ┣ TestHostPrerenderWASM |
| |     ┗ TestHostPrerenderWASM |
| |             ┣ TestHostPrerenderWASM |
| |                     ┣ Components |
| |                             ┣ _Imports.razor |
| |                             ┗ App.razor |
| |                     ┗ Program.cs |
| the client is standalone on release and used by TestHostPrerenderWASM in debug for testing. Look for the release conditions to see how it does both |             ┗ TestHostPrerenderWASM.Client |
| |             ┗ TestHostPrerenderWASM.Client |
| |                     ┣ _Imports.razor |
| |                     ┣ App.razor |
| if we put these in wwwroot then when running debug we would have two entry points so we keep them here and copy them on publish |                     ┣ GitPagesEntryPoint |
| |                     ┣ GitPagesEntryPoint |
| |                             ┣ 404.html |
| |                             ┗ index.html |
| |                     ┣ Program.cs |
Expand Down