Merge pull request #36 from TechnologyEnhancedLearning/feat-version-work-on-branch-maybe

Phil-NHS · web-flow · commit 0a5084d7a9ad · 2025-04-15T10:39:29.000+01:00
Feat version work on branch maybe
diff --git a/.artifacts/1/blazor-component-library-package/blazor-component-library-package.zip b/.artifacts/1/blazor-component-library-package/blazor-component-library-package.zip
diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -168,13 +168,27 @@ jobs:
         
         - name: Create docs directory
           run: mkdir -p docs
-        
-        - name: Publish client using client release .csproj logic
-          run: |
-            dotnet publish ./TestHostPrerenderWASM/TestHostPrerenderWASM.Client/TestHostPrerenderWASM.Client.csproj --configuration Release \
-              /p:IsLocalDev=$IS_LOCAL_DEV \
-              /p:BCLVersion=$BCL_VERSION \
-              /p:UseBCLProjectReference=$USE_BCL_PROJECT_REFERENCE
+          
+      # 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
+
+
+
+      # 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
                   
       
       # No this will be in the release branch that we do a prod wiki host
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/CICDPackageLocation/gitinclude - Copy.txt b/CICDPackageLocation/gitinclude - Copy.txt
@@ -0,0 +1 @@
+just so its in git
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -19,6 +19,7 @@
     <PackageVersion Include="coverlet.collector" Version="6.0.0" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageVersion Include="TELBlazorComponentLibrary.GitPageBlazorWasm" Version="$(BCLVersion)" />
+    <!--<PackageVersion Include="TELBlazorComponentLibrary.GitPageBlazorWasm" Version="8.4.0-feat-version-work-on-branch-maybe.19-250410-1414" />-->
     <PackageVersion Include="xunit" Version="2.5.3" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.3" />
   </ItemGroup>
diff --git a/GitPageBlazorWASM.sln b/GitPageBlazorWASM.sln
@@ -28,13 +28,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		PackageSettings.props.local = PackageSettings.props.local
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CICDPackageLocation", "CICDPackageLocation", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}"
-	ProjectSection(SolutionItems) = preProject
-		gitinclude.txt = gitinclude.txt
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Previous working yml taken out of pipeline", "Previous working yml taken out of pipeline", "{60F62104-7665-411D-90F2-757E979F564D}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -65,10 +58,6 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{02EA681E-C7D8-13C7-8484-4AC65E1B71E8} = {8EC462FD-D22E-90A8-E5CE-7E832BA40C5D}
-		{60F62104-7665-411D-90F2-757E979F564D} = {8EC462FD-D22E-90A8-E5CE-7E832BA40C5D}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {4D34DAB5-2332-41DD-A133-3A5765237422}
 	EndGlobalSection
diff --git a/Package.BlazorComponentLibrary/BCLVersion/VersionInfo.cs b/Package.BlazorComponentLibrary/BCLVersion/VersionInfo.cs
@@ -1,2 +1,2 @@
-﻿namespace Package.BlazorComponentLibrary.BCLVersion { public static class VersionInfo { public static string Version = "3.0.8" ;
+﻿namespace Package.BlazorComponentLibrary.BCLVersion { public static class VersionInfo { public static string Version = "10.9.7" ;
 } }
diff --git a/Package.BlazorComponentLibrary/Components/SimpleCounter.razor b/Package.BlazorComponentLibrary/Components/SimpleCounter.razor
@@ -1,7 +1,11 @@
 ﻿<h3>Simple Counter</h3>
-Feat123
+change
+<b>version from build process</b>
+<span class="version-display">@Package.BlazorComponentLibrary.BCLVersion.VersionInfo.Version</span>
+<b>manually types</b>
+<span>5.6.9</span>
 <button class="btn btn-primary" @onclick="IncrementCount">
-   A Build aaa(@currentCount)
+  surely not A Build aaa(@currentCount)
 </button>
 
 @code {
diff --git a/Package.BlazorComponentLibrary/Package.BlazorComponentLibrary.csproj b/Package.BlazorComponentLibrary/Package.BlazorComponentLibrary.csproj
@@ -13,8 +13,8 @@
 	<EnableDefaultEmbeddedResources>true</EnableDefaultEmbeddedResources>
 	<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
 
-
-	<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+	<GeneratePackageOnBuild Condition="'$(DisablePackageGeneration)' != 'true'">true</GeneratePackageOnBuild>
+	<!--<GeneratePackageOnBuild>true</GeneratePackageOnBuild>-->
 	<PackageId>TELBlazorComponentLibrary.GitPageBlazorWasm</PackageId>
 	<Version>$(BCLVersion)</Version>
 	<Authors>TEL</Authors>
@@ -28,11 +28,6 @@
 	<PackageOutputPath>$(NupkgOutputPath)</PackageOutputPath>
 
   </PropertyGroup>
-	<!--<Target Name="DebugProperties" BeforeTargets="Build">
-		<Message Importance="high" Text="NupkgOutputPath: $(NupkgOutputPath)" />
-		<Message Importance="high" Text="PackageOutputPath: $(PackageOutputPath)" />
-		<Message Importance="high" Text="LocalPackagePath: $(LocalPackagePath)" />
-	</Target>-->
 
   <ItemGroup>
     <SupportedPlatform Include="browser" />
@@ -44,9 +39,15 @@
   </ItemGroup>
 	<ItemGroup>
 		<Content Remove="packages.lock.json" />
+		<Content Remove="wwwroot\background.png" />
 	</ItemGroup>
-
-	<Target Name="WriteBclVersionToFile" AfterTargets="Build">
+	<!--qqqq building in the solution wasnt an issue before-->
+	<ItemGroup>
+		<Compile Remove="..\CICDPackageLocation\**\*.cs" />
+		<Content Remove="..\CICDPackageLocation\**\*" />
+		<None Remove="..\CICDPackageLocation\**\*" />
+	</ItemGroup>
+	<Target Name="WriteBclVersionToFile" BeforeTargets="PrepareForBuild">
 		<WriteLinesToFile File="wwwroot/bclversion.txt" Lines="$(BCLVersion)" Overwrite="true" Encoding="UTF-8" />
 		<WriteLinesToFile File="BCLVersion/VersionInfo.cs" Lines="namespace Package.BlazorComponentLibrary.BCLVersion { public static class VersionInfo { public static string Version = &quot;$(BCLVersion)&quot; %3B; } }" Overwrite="true" Encoding="UTF-8" />
 	</Target>
diff --git a/Package.BlazorComponentLibrary/wwwroot/bclversion.txt b/Package.BlazorComponentLibrary/wwwroot/bclversion.txt
@@ -1 +1 @@
-﻿3.0.8
+﻿10.9.7
diff --git a/PackageSettings.props b/PackageSettings.props
@@ -2,28 +2,21 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <!-- Define the output path where the package will be stored -->
-	  <!--<NupkgOutputPath>$(Env:LocalPackagePath)</NupkgOutputPath>-->
+	 
+	<!-- being set in csproj directly in cicd at the moment -->
     <NupkgOutputPath>$(LocalPackagePath)</NupkgOutputPath>
-	<IsLocalDevVS Condition="'$(IsLocalDev)' == '' ">false</IsLocalDevVS>
-	<IsLocalDevVS Condition="'$(IsLocalDev)' != '' ">$(IsLocalDev)</IsLocalDevVS>
+
 
 	<UseBCLProjectReference Condition="'$(UseBCLProjectReference)' == '' ">false</UseBCLProjectReference>
 	<UseBCLProjectReference Condition="'$(UseBCLProjectReference)' != '' ">$(UseBCLProjectReference)</UseBCLProjectReference>
-  
-	<!--allows us to just use build versions while testing packages locally-->
-	<!--<UseHighestBCLVersionAvailable>false</UseHighestBCLVersionAvailable>-->
-    <!--<UseBCLProjectReference>$(UseBCLProjectReference)</UseBCLProjectReference>-->
-	  <!--wont have in environmental variable but useful for pipeline-->
+
+	<GhPageRelease Condition="'$(GhPageRelease)' == '' ">false</GhPageRelease>
+	<GhPageRelease Condition="'$(GhPageRelease)' != '' ">$(GhPageRelease)</GhPageRelease>
+
 	<BCLVersion>$(BCLVersion)</BCLVersion>
-	  <!--wont have in environmental variable but useful for pipeline-->
+
+    <DisablePackageGeneration >$(DisablePackageGeneration)</DisablePackageGeneration>
+
   </PropertyGroup>
-    <!-- it is there <Target Name="EnsureLocalFeed">
-    <Exec Command="echo $(LocalPackagePath)" />
-  </Target>-->
- <!--<Target Name="EnsureLocalFeed">
-    <Exec Command="echo $(IsLocalDev)" />
-  </Target>
-	<Target Name="DiagnoseIsLocalDev" BeforeTargets="Build">
-		<Message Text="!!!!!!!!!!!!!!!!!  Property IsLocalDevVS: $(IsLocalDevVS)" Importance="high" />
-	</Target>-->
+
 </Project>
diff --git a/PackageSettings.props.local b/PackageSettings.props.local
@@ -4,9 +4,9 @@
   <!--warning unless do nuget.config.template localpackagepath for nuget will still use sys environment values-->
     <LocalPackagePath>C:\LocalDevelopmentPackageVersions</LocalPackagePath>
     <NupkgOutputPath>C:\LocalDevelopmentPackageVersions</NupkgOutputPath>
-    <IsLocalDev>true</IsLocalDev>
+	<GhPageRelease>false</GhPageRelease>
     <UseBCLProjectReference>false</UseBCLProjectReference>
-      <!--qqqqqq come back to why did i stop using local env variable after git tags may want to rename this bclversionlocal and automate it with build number, and put a shared file so other solutions can use it like lh with now version updates in development-->
-    <BCLVersion>3.0.8</BCLVersion>
+    <BCLVersion>10.9.7</BCLVersion>
+	<DisablePackageGeneration>false</DisablePackageGeneration>
   </PropertyGroup>
 </Project>
diff --git a/ReadMe.md b/ReadMe.md
@@ -1,5 +1,32 @@
 
+
+
+
 ## qqqq unlike in nuget feed git package feed doesnt display this file so to see it you need to look in the actual nuget package
+
+# Local Development
+- inc the version in local props
+	- save
+- build package project (debug)
+- build solution (debug)
+- run
+	- for wasm use release and client
+	- for hosted wasm use host and debug
+
+## Trouble shooting
+- clean restore solution and try again
+- look in the sharedpages, look in depenency in solution explorer, open the package version drop down
+	- is the version what you expect?
+	- is there an error
+- if it still doesnt work increment the version and use the process again
+
+## Bonus 
+- there is probably a way to increment version with timestamps or build number to automate it more
+
+## extras
+- you can use a local feed two visual studio and see new components in LH for example
+- LH could be setup to automatically update too, system environment variables may help or a txt file to read in csproj to sinc versions
+
 # About
 
 
diff --git a/SharedPages/Layout/MainLayout.razor b/SharedPages/Layout/MainLayout.razor
@@ -1,8 +1,10 @@
 ﻿@inherits LayoutComponentBase
 
-
-
 <span class="version-display">@Package.BlazorComponentLibrary.BCLVersion.VersionInfo.Version</span>
+<div>
+    <b>manually added:</b>
+    <p></p>
+</div>
 <h1>Main Page Layout</h1>
 @Body
 <h1>Main Page Layout</h1>
diff --git a/SharedPages/Pages/ComponentPages/CounterComponentPage.razor b/SharedPages/Pages/ComponentPages/CounterComponentPage.razor
@@ -1,7 +1,7 @@
 ﻿@layout ComponentPageLayout
 @page "/CounterComponentPage/"
 
-<h2>A component here !! !</h2>
+<h2>A a component here !! !</h2>
 <SimpleCounter/>
 @code {
 
diff --git a/SharedPages/SharedPages.csproj b/SharedPages/SharedPages.csproj
@@ -5,9 +5,7 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
-	<!--<Target Name="PrintIsLocalDev" BeforeTargets="Build">
-		<Message Text="!!!!!!!!!!!!!!!!!!!!!!!    !!!!!!!!!!!!   IsLocalDevVS: $(IsLocalDevVS)" Importance="high" />
-	</Target>-->
+
 	<!--<ItemGroup>
 	put back in
 		<None Update="wwwroot\**">
@@ -18,24 +16,14 @@
 	<ItemGroup>
     <SupportedPlatform Include="browser" />
   </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Components.Web" />
-	  <!--not for production ideally we test against package version but for expedience can overide nuget package with project reference-->
-	  <!-- Fixed version when UseHighestBCLVersionAvailable is false -->
-	  <PackageReference  Include="TELBlazorComponentLibrary.GitPageBlazorWasm"/>
-
-	  <!-- Use the latest available version when UseHighestBCLVersionAvailable is true -->
-	  <!--having floating just isnt possible-->
-	  <!--<PackageVersion  Include="TELBlazorComponentLibrary.GitPageBlazorWasm" Version="1.0.2" Condition=" '$(UseHighestBCLVersionAvailable)' == 'true' "/>-->
+    <PackageReference Include="TELBlazorComponentLibrary.GitPageBlazorWasm" />
   </ItemGroup>
 	<ItemGroup>
 		<Content Remove="packages.lock.json" />
 	</ItemGroup>
-
-
-	<ItemGroup>
-	  <ProjectReference Include="..\Package.BlazorComponentLibrary\Package.BlazorComponentLibrary.csproj"  Condition="'$(UseBCLProjectReference)' == 'true'" />	  
-		<!--<ProjectReference Include="..\Package.BlazorComponentLibrary\Package.BlazorComponentLibrary.csproj" Condition="false" />-->
-    </ItemGroup>
+	<!--qqqq try putting back in with a condition<ItemGroup>
+	  <ProjectReference Include="..\Package.BlazorComponentLibrary\Package.BlazorComponentLibrary.csproj" />
+	</ItemGroup>-->
 </Project>
diff --git a/SharedPages/packages.lock.json b/SharedPages/packages.lock.json
@@ -18,9 +18,9 @@
       },
       "TELBlazorComponentLibrary.GitPageBlazorWasm": {
         "type": "Direct",
-        "requested": "[3.0.8, )",
-        "resolved": "3.0.8",
-        "contentHash": "9tH0jJ3LRvPkB+4zjhZm54+pFpuXYyvOxnbRZveUB24/PQAcyYmNjXzlqU+B0G7hax1Y2ltsgk58E/aXNllVWQ==",
+        "requested": "[10.9.7, )",
+        "resolved": "10.9.7",
+        "contentHash": "+dWmXBnL84HBWfTGiYZOxK8UGITQHbp4IO6bso+naGa9IxYNjcsOCjY/uczQmBfUPsuCZS/BKLq8Aznm5+Q4iA==",
         "dependencies": {
           "Microsoft.AspNetCore.Components.Web": "8.0.14",
           "Microsoft.Extensions.Http": "8.0.0"
diff --git a/TestHostPrerenderWASM/TestHostPrerenderWASM.Client/Program.cs b/TestHostPrerenderWASM/TestHostPrerenderWASM.Client/Program.cs
@@ -1,20 +1,36 @@
 using Microsoft.AspNetCore.Components.Web;
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.JSInterop;
 using TestHostPrerenderWASM.Client;
 
 var builder = WebAssemblyHostBuilder.CreateDefault(args);
 
-//Be careful we have two entry points to enable the client to be both a standalone app and the client for the server app. 
-// removing the below, app.razor, and index.html would put the project back to being just for the testing host (WebAssembly.DevServer could be removed from nuget too)
-if (builder.HostEnvironment.IsProduction())
+// Use the value in your app logic
+var independentClientGhPagesString = builder.Configuration["INDEPENDENT_CLIENT_GH_PAGES"];
+bool independentClientGhPages = false; // Default value if not found or invalid
+
+if (!string.IsNullOrEmpty(independentClientGhPagesString))
 {
+    if (independentClientGhPagesString.ToLowerInvariant() == "true")
+    {
+        independentClientGhPages = true;
+    }
+    else if (independentClientGhPagesString.ToLowerInvariant() == "false")
+    {
+        independentClientGhPages = false;
+    }
+
+}
+if (independentClientGhPages) { 
+
     builder.RootComponents.Add<App>("#app");
     builder.RootComponents.Add<HeadOutlet>("head::after");
     builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
-    
 }
 
+
+
 await builder.Build().RunAsync();
 
 
diff --git a/TestHostPrerenderWASM/TestHostPrerenderWASM.Client/Properties/launchSettings.json b/TestHostPrerenderWASM/TestHostPrerenderWASM.Client/Properties/launchSettings.json
@@ -1,8 +1,41 @@
 {
+  "$schema": "http://json.schemastore.org/launchsettings.json",
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:30155",
+      "sslPort": 44382
+    }
+  },
   "profiles": {
-    "WSL": {
-      "commandName": "WSL2",
-      "distributionName": ""
+    "http": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": true,
+      "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
+      "applicationUrl": "http://localhost:5290",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "https": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": true,
+      "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
+      "applicationUrl": "https://localhost:7242;http://localhost:5290",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
     }
   }
-}
+}
diff --git a/TestHostPrerenderWASM/TestHostPrerenderWASM.Client/TestHostPrerenderWASM.Client.csproj b/TestHostPrerenderWASM/TestHostPrerenderWASM.Client/TestHostPrerenderWASM.Client.csproj
diff --git a/TestHostPrerenderWASM/TestHostPrerenderWASM.Client/packages.lock.json b/TestHostPrerenderWASM/TestHostPrerenderWASM.Client/packages.lock.json
diff --git a/TestHostPrerenderWASM/TestHostPrerenderWASM.Client/wwwroot/appsettings.json b/TestHostPrerenderWASM/TestHostPrerenderWASM.Client/wwwroot/appsettings.json
diff --git a/TestHostPrerenderWASM/TestHostPrerenderWASM/packages.lock.json b/TestHostPrerenderWASM/TestHostPrerenderWASM/packages.lock.json

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-namespace Package.BlazorComponentLibrary.BCLVersion { public static class VersionInfo { public static string Version = "3.0.8" ;`
	`1`	`+namespace Package.BlazorComponentLibrary.BCLVersion { public static class VersionInfo { public static string Version = "10.9.7" ;`
`2`	`2`	`} }`