License validation feature

.editorconfig

@@ -4,6 +4,11 @@ root = true
 [**/wwwroot/js/**.js]
 generated_code = true
 
+# MSBuild / XML project files
+[*.{props,csproj,targets}]
+ij_xml_attribute_wrap = split_into_lines
+ij_xml_keep_line_breaks = true
+
 # C# files
 [*.cs]
 
@@ -94,9 +99,9 @@ dotnet_style_allow_statement_immediately_after_block_experimental = true
 #### C# Coding Conventions ####
 
 # var preferences (Rider: UseVarWhenEvident for all)
-csharp_style_var_elsewhere = true
-csharp_style_var_for_built_in_types = true
-csharp_style_var_when_type_is_apparent = true
+csharp_style_var_elsewhere = false
+csharp_style_var_for_built_in_types = false
+csharp_style_var_when_type_is_apparent = false
 
 # Expression-bodied members
 csharp_style_expression_bodied_accessors = true
@@ -122,7 +127,7 @@ csharp_style_conditional_delegate_call = true
 # Modifier preferences
 csharp_prefer_static_anonymous_function = true
 csharp_prefer_static_local_function = true
-csharp_preferred_modifier_order = public,private,protected,internal,file,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,required,volatile,async
+csharp_preferred_modifier_order = public, private, protected, internal, file, static, extern, new, virtual, abstract, sealed, override, readonly, unsafe, required, volatile, async
 csharp_style_prefer_readonly_struct = true
 csharp_style_prefer_readonly_struct_member = true
 
@@ -268,7 +273,7 @@ dotnet_naming_symbols.private_constants.required_modifiers = const
 
 dotnet_naming_symbols.private_static_readonly.applicable_kinds = field
 dotnet_naming_symbols.private_static_readonly.applicable_accessibilities = private
-dotnet_naming_symbols.private_static_readonly.required_modifiers = static,readonly
+dotnet_naming_symbols.private_static_readonly.required_modifiers = static, readonly
 
 dotnet_naming_symbols.public_fields.applicable_kinds = field
 dotnet_naming_symbols.public_fields.applicable_accessibilities = public

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

@@ -50,6 +50,11 @@ jobs:
           repository: ${{ github.event.pull_request.head.repo.full_name || github.repository }}
           ref: ${{ github.event.pull_request.head.ref || github.ref }}
 
+      - name: Clean node_modules
+        shell: pwsh
+        run: |
+            Remove-Item -Recurse -Force ./src/dymaptic.GeoBlazor.Core/node_modules -ErrorAction SilentlyContinue
+
       - name: Run Tests
         shell: pwsh
         env:

.gitignore

@@ -201,6 +201,7 @@ PublishScripts/
 
 # NuGet Packages
 *.nupkg
+*.nupkg.bak
 # NuGet Symbol Packages
 *.snupkg
 # The packages folder can be ignored because of Package Restore
@@ -399,3 +400,4 @@ DefaultDocsLinks
 .esbuild-record.json
 *.nupkg.bak
 /samples/dymaptic.GeoBlazor.Core.Sample.TokenRefresh/dymaptic.GeoBlazor.Core.Sample.TokenRefresh/arcgis_token_cache.json
+build-tools/debug-output

Directory.Build.props

@@ -6,7 +6,7 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <CoreVersion>5.0.0.85</CoreVersion>
+    <CoreVersion>5.0.0.142</CoreVersion>
     <Configurations>Debug;Release;SourceGen Highlighting</Configurations>
     <Platforms>AnyCPU</Platforms>
     <TestingPlatformDotnetTestSupport>true</TestingPlatformDotnetTestSupport>
@@ -48,9 +48,6 @@
   <!-- ESBuild Project Trigger: Must happen before RESTORE -->
   <PropertyGroup>
     <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;
@@ -69,10 +66,25 @@
             TriggerESBuild;
             TriggerProESBuild
         </ESBuildRemoveProps>
+    <ESBuildNonTriggeringProjects>
+            ;dymaptic.GeoBlazor.Core.ESBuild;
+            ;dymaptic.GeoBlazor.Pro.ESBuild;
+            ;dymaptic.GeoBlazor.Pro.V;
+        </ESBuildNonTriggeringProjects>
   </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 Name="TriggerESBuild" BeforeTargets="Restore;BeforeBuild" Condition="!$(ESBuildNonTriggeringProjects.Contains(';$(MSBuildProjectName);'))">
+    <!-- Atomically check-and-acquire the lock file; exit code 0 = acquired.
+         AcquireBuildLock also creates a .running marker file when the lock is acquired,
+         so other projects can wait for ESBuild to complete. -->
+    <Exec Command="dotnet &quot;$(GBBuildToolsPath)/AcquireBuildLock.dll&quot; &quot;$(ESBuildLockFilePath)&quot; 5" IgnoreExitCode="true">
+      <Output TaskParameter="ExitCode" PropertyName="_AcquireLockExitCode" />
+    </Exec>
+    <!-- Lock acquired: run ESBuild, then remove the .running marker -->
+    <Message Importance="high" Text="Triggering Core ESBuild from $(MSBuildProjectName)" Condition="'$(_AcquireLockExitCode)' == '0'" />
+    <Exec Command="dotnet restore $(MSBuildThisFileDirectory)src/dymaptic.GeoBlazor.Core.ESBuild/dymaptic.GeoBlazor.Core.ESBuild.csproj" Condition="'$(_AcquireLockExitCode)' == '0'" />
+    <MSBuild Projects="$(MSBuildThisFileDirectory)src/dymaptic.GeoBlazor.Core.ESBuild/dymaptic.GeoBlazor.Core.ESBuild.csproj" Properties="GBBuildToolsPath=$(GBBuildToolsPath);ShowScriptDialogs=$(ShowScriptDialogs)" RemoveProperties="$(ESBuildRemoveProps)" Condition="'$(_AcquireLockExitCode)' == '0'" />
+    <Delete Files="$(ESBuildLockFilePath).running" Condition="'$(_AcquireLockExitCode)' == '0'" />
+    <!-- Lock not acquired: another project is running ESBuild — wait for it to finish -->
+    <Exec Command="dotnet &quot;$(GBBuildToolsPath)/WaitForBuildComplete.dll&quot; &quot;$(ESBuildLockFilePath).running&quot; 120" Condition="'$(_AcquireLockExitCode)' != '0'" />
   </Target>
 </Project>

Dockerfile

@@ -35,6 +35,11 @@ COPY ./Directory.Build.* ./
 COPY ./.gitignore ./.gitignore
 COPY ./nuget.config ./nuget.config
 COPY ./src/ ./src/
+
+# Create GeoBlazor NuGet Packages
+RUN --mount=type=cache,target=/root/.nuget/packages \
+    dotnet ./build-tools/linux-x64/GeoBlazorBuild.dll -pkg -obf -c "Release"
+
 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
 
@@ -49,30 +54,21 @@ RUN dotnet ./build-tools/linux-x64/BuildAppSettings.dll \
     -w "${WFS_SERVERS}" 
 
 # Build from source with debug symbols for code coverage
-# UsePackageReference=false builds GeoBlazor from source instead of NuGet
+# UsePackageReferences=false builds GeoBlazor from source instead of NuGet
 # DebugSymbols=true and DebugType=portable ensure PDB files are generated
-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:UsePackageReferences=true \
     /p:DebugSymbols=true \
     /p:DebugType=portable \
     /p:GeneratePackage=false \
     /p:GenerateDocs=false \
     /p:GenerateXmlComments=false \
     /p:ShowScriptDialogs=false \
-    -o /app/publish
+    -o /app/publish -bl 
+
+RUN cp ./msbuild.binlog /app/publish/msbuild.binlog 2>/dev/null || true
 
 FROM mcr.microsoft.com/dotnet/aspnet:10.0
 

Dockerfile.unit

@@ -55,13 +55,13 @@ COPY $TEST_FOLDER $TEST_FOLDER
 RUN --mount=type=cache,target=/root/.nuget/packages \
     dotnet build $TEST_PROJECT \
     -c Release \
-    /p:UsePackageReference=false \
+    /p:UsePackageReferences=false \
     /p:DebugSymbols=true \
     /p:DebugType=portable \
     /p:GeneratePackage=false \
     /p:GenerateDocs=false \
     /p:GenerateXmlComments=false \
-    /p:ShowScriptDialogs=false
+    /p:ShowScriptDialogs=false -bl
 
 # Create user and set working directory
 RUN groupadd -r info && useradd -r -g info info \

build-tools/build-scripts/AcquireBuildLock.cs

@@ -0,0 +1,74 @@
+#!/usr/bin/env dotnet
+
+// AcquireBuildLock - Atomic build lock acquisition
+// =================================================
+// Atomically checks whether a time-based lock file is stale and acquires it
+// if so, using exclusive file access to prevent races in parallel MSBuild.
+//
+// When the lock is acquired, a companion ".running" marker file is also created
+// atomically. This allows other projects to wait for the build step to complete
+// by polling for the marker file's removal (see WaitForBuildComplete).
+//
+// Usage: dotnet AcquireBuildLock.cs <lock-file-path> [stale-minutes]
+//
+// Arguments:
+//   <lock-file-path>   Path to the lock file
+//   [stale-minutes]    Minutes before the lock is considered stale (default: 5)
+//
+// Exit codes:
+//   0  Lock acquired — caller should proceed with the build step
+//   1  Lock is fresh or held by another process — caller should skip
+
+if (args.Length < 1 || args[0] is "-h" or "--help")
+{
+    Console.WriteLine("Usage: dotnet AcquireBuildLock.cs <lock-file-path> [stale-minutes]");
+    Console.WriteLine();
+    Console.WriteLine("Exit codes:");
+    Console.WriteLine("  0  Lock acquired (proceed)");
+    Console.WriteLine("  1  Lock fresh or held (skip)");
+    return args.Length > 0 ? 0 : 1;
+}
+
+string lockFilePath = args[0];
+string runningFilePath = lockFilePath + ".running";
+int staleMinutes = args.Length > 1 && int.TryParse(args[1], out int m) ? m : 5;
+
+try
+{
+    string? dir = Path.GetDirectoryName(lockFilePath);
+    if (!string.IsNullOrEmpty(dir) && !Directory.Exists(dir))
+        Directory.CreateDirectory(dir);
+
+    // FileShare.None = exclusive lock; concurrent callers get IOException
+    using var fs = new FileStream(lockFilePath,
+        FileMode.OpenOrCreate,
+        FileAccess.ReadWrite,
+        FileShare.None);
+
+    using var reader = new StreamReader(fs, leaveOpen: true);
+    string content = reader.ReadToEnd().Trim();
+
+    if (!string.IsNullOrEmpty(content) &&
+        DateTime.TryParse(content, out DateTime lastWrite) &&
+        (DateTime.Now - lastWrite).TotalMinutes < staleMinutes)
+    {
+        // Lock is fresh — another project already triggered
+        return 1;
+    }
+
+    // Stale or missing — we win, stamp it
+    fs.SetLength(0);
+    using var writer = new StreamWriter(fs);
+    writer.Write(DateTime.Now.ToString("o"));
+    writer.Flush();
+
+    // Create .running marker so other projects can wait for completion
+    File.WriteAllText(runningFilePath, DateTime.Now.ToString("o"));
+
+    return 0;
+}
+catch (IOException)
+{
+    // Another process holds the exclusive lock — they win
+    return 1;
+}