diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d757ba6..c0f8838 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -171,9 +171,9 @@ 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 @@ -181,14 +181,14 @@ jobs: # - 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 diff --git a/CHANGELOG.md b/CHANGELOG.md index 6eebd52..be2d94e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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) diff --git a/tree_structure.md b/tree_structure.md index 26d1c56..8643d05 100644 --- a/tree_structure.md +++ b/tree_structure.md @@ -12,35 +12,24 @@ 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 | @@ -48,16 +37,16 @@ tr td:nth-child(2) { | |                             ┗ 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 |