Refactor LogicComponent to use JsSyncManager infrastructure

.dockerignore

@@ -19,11 +19,14 @@
 **/node_modules
 **/npm-debug.log
 **/obj
+**/esBuild.lock
 bin
 obj
 **/wwwroot/js/*.js
+**/wwwroot/js/*.js.map
 **/secrets.dev.yaml
 **/values.dev.yaml
+**/.esbuild-record.json
 test/dymaptic.GeoBlazor.Core.Test.WebApp/dymaptic.GeoBlazor.Core.Test.WebApp.Client/wwwroot/appsettings.json
 LICENSE
 README.md

.github/workflows/dev-pr-build.yml

@@ -59,8 +59,16 @@ jobs:
           HTTP_PORT: 8082
           HTTPS_PORT: 9445
         run: |
-          dotnet test --project ./test/dymaptic.GeoBlazor.Core.Test.Automation/dymaptic.GeoBlazor.Core.Test.Automation.csproj -c Release --filter CORE_
-
+          dotnet ./build-tools/win-x64/GBTest.dll -c Release --cover --container --filter Core
+
+      - name: Upload test log
+        uses: actions/upload-artifact@v4
+        if: always()
+        with:
+          name: test-run-log
+          retention-days: 4
+          path: ./test/dymaptic.GeoBlazor.Core.Test.Automation/test-run.log
+
   build:
     runs-on: ubuntu-latest
     needs: [ actor-check ]
@@ -99,7 +107,7 @@ jobs:
     - name: Build GeoBlazor
       shell: pwsh
       run: |
-        dotnet ./build-tools/GeoBlazorBuild.dll -xml -pkg -docs -c "Release"
+        dotnet ./build-tools/linux-x64/GeoBlazorBuild.dll -xml -pkg -docs -c "Release"
 
       # Copies the nuget package to the artifacts directory
     - name: Upload nuget artifact

.github/workflows/main-release-build.yml

@@ -44,13 +44,21 @@ jobs:
         HTTP_PORT: 8082
         HTTPS_PORT: 9445
       run: |
-        dotnet test --project ./test/dymaptic.GeoBlazor.Core.Test.Automation/dymaptic.GeoBlazor.Core.Test.Automation.csproj -c Release --filter CORE_
-
+        dotnet ./build-tools/win-x64/GBTest.dll -c Release --container --filter Core
+
+    - name: Upload test log
+      uses: actions/upload-artifact@v4
+      if: always()
+      with:
+        name: test-run-log
+        retention-days: 4
+        path: ./test/dymaptic.GeoBlazor.Core.Test.Automation/test-run.log
+
       # This runs the main GeoBlazor build script
     - name: Build GeoBlazor
       shell: pwsh
       run: |
-        dotnet ./build-tools/GeoBlazorBuild.dll -xml -pkg -pub -c "Release"
+        dotnet ./build-tools/win-x64/GeoBlazorBuild.dll -xml -pkg -pub -c "Release"
 
       # xmllint is a dependency of the copy steps below
     - name: Install xmllint

.github/workflows/tests.yml

@@ -43,4 +43,12 @@ jobs:
           HTTP_PORT: 8082
           HTTPS_PORT: 9445
         run: |
-          dotnet test --project ./test/dymaptic.GeoBlazor.Core.Test.Automation/dymaptic.GeoBlazor.Core.Test.Automation.csproj -c Release --filter CORE_
+          dotnet ./build-tools/win-x64/GBTest.dll -c Release --cover --container --filter Core
+
+      - name: Upload test log
+        uses: actions/upload-artifact@v4
+        if: always()
+        with:
+          name: test-run-log
+          retention-days: 4
+          path: ./test/dymaptic.GeoBlazor.Core.Test.Automation/test-run.log

.gitignore

@@ -10,15 +10,19 @@
 *.userosscache
 *.sln.docstates
 .DS_Store
-esBuild.*.lock
+**/esBuild.lock
 esBuild.log
+esBuild.hash
+*.binlog
 .esbuild-record.json
+.csbuild-record.json
 CustomerTests.razor
 .claude/
 .env
 test/dymaptic.GeoBlazor.Core.Test.Automation/test.txt
 test/dymaptic.GeoBlazor.Core.Test.Automation/test-run.log
 test/dymaptic.GeoBlazor.Core.Test.Automation/coverage*
+test/dymaptic.GeoBlazor.Core.Test.Automation/history*
 test/dymaptic.GeoBlazor.Core.Test.Automation/unit-coverage*
 test/dymaptic.GeoBlazor.Core.Test.Automation/sgen-coverage*
 test/dymaptic.GeoBlazor.Core.Test.Automation/Summary.txt

CLAUDE.md

@@ -38,7 +38,7 @@ GeoBlazor is a Blazor component library that brings ArcGIS Maps SDK for JavaScri
 ### Build
 ```bash
 # Clean build of the Core project
-dotnet ./build-tools/GeoBlazorBuild.dll
+dotnet ./build-tools/win-x64/GeoBlazorBuild.dll
 
 -- _`GeoBlazorBuild` includes lots of options, use -h to see options_
 
@@ -77,7 +77,7 @@ pwsh bumpVersion.ps1 -test 1.2.3  # Test version bump
 ### Development
 ```bash
 # Clear ESBuild locks if build is stuck
-dotnet ./build-tools/ESBuildClearLocks.dll
+dotnet ./build-tools/win-x64/ESBuildClearLocks.dll
 
 # Watch TypeScript changes (from src/dymaptic.GeoBlazor.Core/)
 npm run watchBuild

Directory.Build.props

@@ -5,24 +5,76 @@
   <PropertyGroup>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <CoreVersion>5.0.0.38</CoreVersion>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <CoreVersion>5.0.0.75</CoreVersion>
     <Configurations>Debug;Release;SourceGen Highlighting</Configurations>
     <Platforms>AnyCPU</Platforms>
-    <CoreProjectPath>$(MSBuildThisFileDirectory)src\dymaptic.GeoBlazor.Core</CoreProjectPath>
+    <TestingPlatformDotnetTestSupport>true</TestingPlatformDotnetTestSupport>
+    <CoreProjectPath>$(MSBuildThisFileDirectory)src/dymaptic.GeoBlazor.Core</CoreProjectPath>
     <!-- https://github.com/dotnet/aspnetcore/issues/64381 -->
     <StaticWebAssetEndpointExclusionPattern>
             $(StaticWebAssetEndpointExclusionPattern);js/**
         </StaticWebAssetEndpointExclusionPattern>
   </PropertyGroup>
+  <PropertyGroup Condition="'$([System.OperatingSystem]::IsWindows())' == 'true' and '$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture.ToString())' == 'X64'">
+    <GBBuildToolsPath>$(MSBuildThisFileDirectory)build-tools/win-x64</GBBuildToolsPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$([System.OperatingSystem]::IsWindows())' == 'true' and '$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture.ToString())' == 'Arm64'">
+    <GBBuildToolsPath>$(MSBuildThisFileDirectory)build-tools/win-arm64</GBBuildToolsPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$([System.OperatingSystem]::IsMacOS())' == 'true' and '$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture.ToString())' == 'X64'">
+    <GBBuildToolsPath>$(MSBuildThisFileDirectory)build-tools/osx-x64</GBBuildToolsPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$([System.OperatingSystem]::IsMacOS())' == 'true' and '$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture.ToString())' == 'Arm64'">
+    <GBBuildToolsPath>$(MSBuildThisFileDirectory)build-tools/osx-arm64</GBBuildToolsPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$([System.OperatingSystem]::IsLinux())' == 'true' and '$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture.ToString())' == 'X64'">
+    <GBBuildToolsPath>$(MSBuildThisFileDirectory)build-tools/linux-x64</GBBuildToolsPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$([System.OperatingSystem]::IsLinux())' == 'true' and '$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture.ToString())' == 'Arm64'">
+    <GBBuildToolsPath>$(MSBuildThisFileDirectory)build-tools/linux-arm64</GBBuildToolsPath>
+  </PropertyGroup>
   <ItemGroup>
     <Watch Remove="$(CoreProjectPath)\wwwroot\**\*;$(CoreProjectPath)\Scripts\**\*;**\esbuild*;$(CoreProjectPath)\node_modules\**\*" />
   </ItemGroup>
   <ItemGroup>
+    <CompilerVisibleProperty Include="Configuration" Value="$(GBBuildToolsPath)" />
     <CompilerVisibleProperty Include="Configuration" Value="$(Configuration)" />
-    <CompilerVisibleProperty Include="PipelineBuild" Value="$(PipelineBuild)" />
-    <CompilerVisibleProperty Include="LogSourceGenOutput" Value="$(LogSourceGenOutput)" />
-    <CompilerVisibleProperty Include="CoreProjectPath" Value="$(CoreProjectPath)" />
     <CompilerVisibleProperty Include="DesignTimeBuild" Value="$(DesignTimeBuild)" />
+    <CompilerVisibleProperty Include="ShowScriptDialogs" Value="$(ShowScriptDialogs)" />
+    <CompilerVisibleProperty Include="CoreProjectPath" Value="$(CoreProjectPath)" />
+    <CompilerVisibleProperty Include="CoreProjectPath" Value="$(ProProjectPath)" />
   </ItemGroup>
+  <!-- ESBuild Project Trigger: Must happen before RESTORE -->
+  <PropertyGroup>
+    <BuildDependsOn>TriggerESBuild;$(BuildDependsOn)</BuildDependsOn>
+    <ESBuildLockFilePath>$(MSBuildThisFileDirectory)src/dymaptic.GeoBlazor.Core/esBuild.lock</ESBuildLockFilePath>
+    <ESBuildLockFileTimeStamp Condition="EXISTS($(ESBuildLockFilePath))">$([System.IO.File]::GetLastWriteTime(`$(ESBuildLockFilePath)`).Ticks)</ESBuildLockFileTimeStamp>
+    <ESBuildLockFileTimeStamp Condition="'$(ESBuildLockFileTimeStamp)' == ''">0</ESBuildLockFileTimeStamp>
+    <StaleFileThresholdTimeStamp>$([System.DateTime]::Now.AddMinutes(-5).Ticks)</StaleFileThresholdTimeStamp>
+    <ESBuildRemoveProps>
+            BuildProjectReferences;
+            Configuration;
+            EnableDefaultCompileItems;
+            EnableDefaultEmbeddedResourceItems;
+            EnableDefaultNoneItems;
+            ExcludeRestorePackageImports;
+            GBBuildToolsPath;
+            MSBuildIsRestoring;
+            MSBuildRestoreSessionId;
+            NugetInteractive;
+            Platform;
+            ProESBuildRequired;
+            ShowScriptDialogs;
+            TargetFramework;
+            TargetFrameworks;
+            TriggerESBuild;
+            TriggerProESBuild
+        </ESBuildRemoveProps>
+  </PropertyGroup>
+  <Target Name="TriggerESBuild" BeforeTargets="Restore;BeforeBuild" Condition="'$(MSBuildProjectName)' != 'dymaptic.GeoBlazor.Core.ESBuild' AND (!EXISTS($(ESBuildLockFilePath)) OR $(ESBuildLockFileTimeStamp) &lt; $(StaleFileThresholdTimeStamp))">
+    <WriteLinesToFile File="$(ESBuildLockFilePath)" Lines="$([System.DateTime]::Now.ToString(`o`))" Overwrite="false" ContinueOnError="true" />
+    <Exec Command="dotnet restore $(MSBuildThisFileDirectory)src/dymaptic.GeoBlazor.Core.ESBuild/dymaptic.GeoBlazor.Core.ESBuild.csproj" />
+    <MSBuild Projects="$(MSBuildThisFileDirectory)src/dymaptic.GeoBlazor.Core.ESBuild/dymaptic.GeoBlazor.Core.ESBuild.csproj" Properties="GBBuildToolsPath=$(GBBuildToolsPath);ShowScriptDialogs=$(ShowScriptDialogs)" RemoveProperties="$(ESBuildRemoveProps)" />
+  </Target>
 </Project>

Dockerfile

@@ -1,13 +1,12 @@
+# syntax=docker/dockerfile:1.7.0
 FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build
 ARG ARCGIS_API_KEY
 ARG GEOBLAZOR_LICENSE_KEY
 ARG WFS_SERVERS
 ARG HTTP_PORT
 ARG HTTPS_PORT
-ENV ARCGIS_API_KEY=${ARCGIS_API_KEY}
-ENV GEOBLAZOR_LICENSE_KEY=${GEOBLAZOR_LICENSE_KEY}
-ENV WFS_SERVERS=${WFS_SERVERS}
 
+# Install NodeJS and NPM
 RUN apt-get update \
     && apt-get install -y ca-certificates curl gnupg \
     && mkdir -p /etc/apt/keyrings \
@@ -16,51 +15,63 @@ RUN apt-get update \
     && apt-get update \
     && apt-get install -y nodejs
 
+# Install NPM Packages
 WORKDIR /work
 WORKDIR /work/src/dymaptic.GeoBlazor.Core
 COPY ./src/dymaptic.GeoBlazor.Core/package.json ./package.json
-RUN npm install
+RUN --mount=type=cache,target=/root/.npm npm install
 
 WORKDIR /work
-COPY ./src/ ./src/
+
+# Update GeoBlazor Build Scripts
+COPY ./build-tools/build-scripts ./build-tools/build-scripts
+COPY ./build-tools/utilities ./build-tools/utilities
+RUN --mount=type=cache,target=/root/.nuget/packages \
+    dotnet run ./build-tools/build-scripts/ScriptBuilder.cs 
+
+# Copy Source Files
 COPY ./*.ps1 ./
 COPY ./Directory.Build.* ./
 COPY ./.gitignore ./.gitignore
 COPY ./nuget.config ./nuget.config
-COPY ./build-tools ./build-tools
-COPY ./build-scripts/ScriptBuilder.cs ./build-scripts/ScriptBuilder.cs
-
-RUN dotnet ./build-tools/GeoBlazorBuild.dll -v current
-
-COPY ./test/dymaptic.GeoBlazor.Core.Test.Blazor.Shared/dymaptic.GeoBlazor.Core.Test.Blazor.Shared.csproj ./test/dymaptic.GeoBlazor.Core.Test.Blazor.Shared.csproj
-COPY ./test/dymaptic.GeoBlazor.Core.Test.WebApp/dymaptic.GeoBlazor.Core.Test.WebApp/dymaptic.GeoBlazor.Core.Test.WebApp.csproj ./test/dymaptic.GeoBlazor.Core.Test.WebApp/dymaptic.GeoBlazor.Core.Test.WebApp/dymaptic.GeoBlazor.Core.Test.WebApp.csproj
-COPY ./test/dymaptic.GeoBlazor.Core.Test.WebApp/dymaptic.GeoBlazor.Core.Test.WebApp.Client/dymaptic.GeoBlazor.Core.Test.WebApp.Client.csproj ./test/dymaptic.GeoBlazor.Core.Test.WebApp/dymaptic.GeoBlazor.Core.Test.WebApp.Client/dymaptic.GeoBlazor.Core.Test.WebApp.Client.csproj
-
-# Use UsePackageReference=false to build from source (enables code coverage with PDB symbols)
-RUN dotnet restore ./test/dymaptic.GeoBlazor.Core.Test.WebApp/dymaptic.GeoBlazor.Core.Test.WebApp/dymaptic.GeoBlazor.Core.Test.WebApp.csproj /p:UsePackageReference=false
-
+COPY ./src/ ./src/
 COPY ./test/dymaptic.GeoBlazor.Core.Test.Blazor.Shared ./test/dymaptic.GeoBlazor.Core.Test.Blazor.Shared
 COPY ./test/dymaptic.GeoBlazor.Core.Test.WebApp ./test/dymaptic.GeoBlazor.Core.Test.WebApp
 
-RUN dotnet ./build-tools/BuildAppSettings.dll \
-    -k "$ARCGIS_API_KEY" \
-    -l "$GEOBLAZOR_LICENSE_KEY" \
+# Create appsettings files
+RUN dotnet ./build-tools/linux-x64/BuildAppSettings.dll \
+    -k "${ARCGIS_API_KEY}" \
+    -l "${GEOBLAZOR_LICENSE_KEY}" \
     -o "./test/dymaptic.GeoBlazor.Core.Test.WebApp/dymaptic.GeoBlazor.Core.Test.WebApp.Client/wwwroot/appsettings.json" \
     -o "./test/dymaptic.GeoBlazor.Core.Test.WebApp/dymaptic.GeoBlazor.Core.Test.WebApp.Client/wwwroot/appsettings.Production.json" \
     -o "./test/dymaptic.GeoBlazor.Core.Test.WebApp/dymaptic.GeoBlazor.Core.Test.WebApp/appsettings.json" \
     -o "./test/dymaptic.GeoBlazor.Core.Test.WebApp/dymaptic.GeoBlazor.Core.Test.WebApp/appsettings.Production.json" \
-    -w "$WFS_SERVERS"
+    -w "${WFS_SERVERS}" 
 
 # Build from source with debug symbols for code coverage
 # UsePackageReference=false builds GeoBlazor from source instead of NuGet
 # DebugSymbols=true and DebugType=portable ensure PDB files are generated
-RUN dotnet publish ./test/dymaptic.GeoBlazor.Core.Test.WebApp/dymaptic.GeoBlazor.Core.Test.WebApp/dymaptic.GeoBlazor.Core.Test.WebApp.csproj \
+RUN --mount=type=cache,target=/root/.nuget/packages \
+    dotnet build ./test/dymaptic.GeoBlazor.Core.Test.WebApp/dymaptic.GeoBlazor.Core.Test.WebApp/dymaptic.GeoBlazor.Core.Test.WebApp.csproj \
+    -c Release \
+    /p:UsePackageReference=false \
+    /p:DebugSymbols=true \
+    /p:DebugType=portable \
+    /p:GeneratePackage=false \
+    /p:GenerateDocs=false \
+    /p:GenerateXmlComments=false \
+    /p:ShowScriptDialogs=false
+
+RUN --mount=type=cache,target=/root/.nuget/packages \
+    dotnet publish ./test/dymaptic.GeoBlazor.Core.Test.WebApp/dymaptic.GeoBlazor.Core.Test.WebApp/dymaptic.GeoBlazor.Core.Test.WebApp.csproj \
     -c Release \
     /p:UsePackageReference=false \
-    /p:PipelineBuild=true \
     /p:DebugSymbols=true \
     /p:DebugType=portable \
-    /p:GeneratePack=false \
+    /p:GeneratePackage=false \
+    /p:GenerateDocs=false \
+    /p:GenerateXmlComments=false \
+    /p:ShowScriptDialogs=false \
     -o /app/publish
 
 FROM mcr.microsoft.com/dotnet/aspnet:10.0
@@ -109,6 +120,7 @@ ENV ASPNETCORE_Kestrel__Certificates__Default__Password=password
 # Coverage configuration (can be overridden via environment)
 ENV COVERAGE_ENABLED=false
 ENV COVERAGE_FORMAT=xml
+ENV SESSION_ID=WEB_APP
 
 # Copy entrypoint script
 COPY ./test/dymaptic.GeoBlazor.Core.Test.Automation/docker-entrypoint.sh /docker-entrypoint.sh
@@ -117,4 +129,4 @@ RUN chmod +x /docker-entrypoint.sh
 USER info
 EXPOSE ${HTTP_PORT} ${HTTPS_PORT}
 ENTRYPOINT ["/docker-entrypoint.sh"]
-CMD ["dotnet", "dymaptic.GeoBlazor.Core.Test.WebApp.dll"]
+CMD ["dotnet", "dymaptic.GeoBlazor.Core.Test.WebApp.dll"]