diff --git a/Directory.Build.props b/Directory.Build.props index b13101a72..ebdb1b2cb 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -6,7 +6,7 @@ enable enable true - 4.6.0 + 4.6.1 Debug;Release;SourceGen Highlighting AnyCPU true diff --git a/build-tools/build-scripts/ESBuild.cs b/build-tools/build-scripts/ESBuild.cs index af7ee06ca..a988835da 100644 --- a/build-tools/build-scripts/ESBuild.cs +++ b/build-tools/build-scripts/ESBuild.cs @@ -305,8 +305,11 @@ static BuildRecord GetLastBuildRecord(string recordFilePath) /// /// Determines whether a TypeScript build is needed. -/// A build is needed if: the branch changed, scripts were modified since last build, -/// or the output directory is empty. +/// A build is needed if scripts were modified since the last build or the output directory is +/// empty. A branch change alone does NOT force a rebuild when scripts are unchanged and output +/// already exists: that would regenerate hashed split chunks with new names, orphaning the +/// static web assets MSBuild already cataloged (dotnet/sdk#49988) — the cause of 404 chunk loads. +/// This also makes CI detached-HEAD branch noise ("HEAD"/"unknown" vs the real branch) harmless. /// /// Path to the build record file. /// The current Git branch name. @@ -316,42 +319,38 @@ static BuildRecord GetLastBuildRecord(string recordFilePath) static bool CheckIfNeedsBuild(string recordFilePath, string currentBranch, string scriptsDir, string outputDir, string sourceProject) { - // Check if build is needed BuildRecord lastBuild = GetLastBuildRecord(recordFilePath); - bool branchChanged = currentBranch != "no-git" - && currentBranch != lastBuild.Branch; - - if (branchChanged) - { - Trace.WriteLine($"ESBUILD {sourceProject}: Git branch changed from \"{lastBuild.Branch}\" to \"{currentBranch}\". Rebuilding..."); - return true; - } + // Just built — ESBuild can be triggered more than once per run (e.g. the library build + // followed by a samples publish). Skip to avoid regenerating hashed chunks already cataloged. if (lastBuild.Timestamp > DateTimeOffset.UtcNow.AddMinutes(-1).ToUnixTimeMilliseconds()) { - // we just built this, possible if ESBuild gets triggered multiple times in a single run Trace.WriteLine($"ESBUILD {sourceProject}: Was built within the past 1 minute, will skip this build."); return false; } - if (!GetScriptsModifiedSince(scriptsDir, lastBuild.Timestamp, sourceProject)) + bool scriptsChanged = GetScriptsModifiedSince(scriptsDir, lastBuild.Timestamp, sourceProject); + bool outputPresent = Directory.Exists(outputDir) && Directory.GetFiles(outputDir).Length > 0; + + // Scripts unchanged with output already present: rebuilding would only churn chunk hashes + // and orphan cataloged static web assets. Skip regardless of any branch change. + if (!scriptsChanged && outputPresent) { - Trace.WriteLine($"ESBUILD {sourceProject}: No changes in Scripts folder since last build."); + Trace.WriteLine($"ESBUILD {sourceProject}: No Scripts changes since last build and output is present. Skipping build."); + return false; + } - // Check output directory for existing files - if (Directory.Exists(outputDir) && Directory.GetFiles(outputDir).Length > 0) - { - Trace.WriteLine($"ESBUILD {sourceProject}: Output directory is not empty. Skipping build."); - return false; - } - else - { - Trace.WriteLine($"ESBUILD {sourceProject}: Output directory is empty. Proceeding with build."); - return true; - } + // Past here a build is needed (scripts changed or output missing). A genuine branch change + // is only relevant in these cases and is logged for traceability. + bool branchChanged = currentBranch != "no-git" && currentBranch != lastBuild.Branch; + if (branchChanged) + { + Trace.WriteLine($"ESBUILD {sourceProject}: Git branch changed from \"{lastBuild.Branch}\" to \"{currentBranch}\"."); } - Trace.WriteLine($"ESBUILD {sourceProject}: Changes detected in Scripts folder. Proceeding with build."); + Trace.WriteLine(scriptsChanged + ? $"ESBUILD {sourceProject}: Changes detected in Scripts folder. Proceeding with build." + : $"ESBUILD {sourceProject}: Output directory is empty. Proceeding with build."); return true; } diff --git a/build-tools/build-scripts/GeoBlazorBuild.cs b/build-tools/build-scripts/GeoBlazorBuild.cs index e1b4f9e11..c866eb8ed 100644 --- a/build-tools/build-scripts/GeoBlazorBuild.cs +++ b/build-tools/build-scripts/GeoBlazorBuild.cs @@ -461,6 +461,7 @@ if (package) { // Copy generated NuGet package to repo root + DeleteFilesIfExists(coreRepoRoot, "dymaptic.GeoBlazor.Core.*.nupkg"); string coreBinPath = Path.Combine(coreProjectPath, "bin", configuration); if (Directory.Exists(coreBinPath)) @@ -639,6 +640,7 @@ if (package) { // Copy generated NuGet package to Core repo root + DeleteFilesIfExists(coreRepoRoot, "dymaptic.GeoBlazor.Pro.*.nupkg"); string proBinPath = Path.Combine(proProjectPath, "bin", configuration); if (Directory.Exists(proBinPath)) @@ -681,6 +683,22 @@ Console.WriteLine(); } +/// +/// Deletes matching files from a directory if it exists. +/// +static void DeleteFilesIfExists(string directory, string searchPattern) +{ + if (!Directory.Exists(directory)) + { + return; + } + + foreach (string path in Directory.GetFiles(directory, searchPattern, SearchOption.TopDirectoryOnly)) + { + DeleteFileIfExists(path); + } +} + /// /// Deletes a file if it exists. /// diff --git a/build-tools/build-scripts/ScriptBuilder.cs b/build-tools/build-scripts/ScriptBuilder.cs index 5a8ea1c99..b9397424a 100644 --- a/build-tools/build-scripts/ScriptBuilder.cs +++ b/build-tools/build-scripts/ScriptBuilder.cs @@ -465,7 +465,7 @@ static void RewriteRuntimeConfigPaths(string scriptName, string outDir) return; } - configProperties["EntryPointFilePath"] = $".\\{scriptName}"; + configProperties["EntryPointFilePath"] = $"./{scriptName}"; configProperties["EntryPointFileDirectoryPath"] = "."; File.WriteAllText(runtimeConfigPath, root.ToJsonString(new JsonSerializerOptions { WriteIndented = true })); diff --git a/build-tools/linux-x64/AcquireBuildLock b/build-tools/linux-x64/AcquireBuildLock index 5855af851..431248de2 100755 Binary files a/build-tools/linux-x64/AcquireBuildLock and b/build-tools/linux-x64/AcquireBuildLock differ diff --git a/build-tools/linux-x64/AcquireBuildLock.dll b/build-tools/linux-x64/AcquireBuildLock.dll index 461d742c1..a2c1ac11e 100644 Binary files a/build-tools/linux-x64/AcquireBuildLock.dll and b/build-tools/linux-x64/AcquireBuildLock.dll differ diff --git a/build-tools/linux-x64/AcquireBuildLock.runtimeconfig.json b/build-tools/linux-x64/AcquireBuildLock.runtimeconfig.json index 855685c56..ae63e150c 100644 --- a/build-tools/linux-x64/AcquireBuildLock.runtimeconfig.json +++ b/build-tools/linux-x64/AcquireBuildLock.runtimeconfig.json @@ -5,15 +5,9 @@ "name": "Microsoft.NETCore.App", "version": "10.0.0" }, - "runtimeOptions": { - "configProperties": { - "EntryPointFilePath": ".\\GBTest.cs", - "EntryPointFileDirectoryPath": "." - } - }, "configProperties": { - "EntryPointFilePath": "/Users/timpurdum/repos/GeoBlazor/GeoBlazor.Pro/GeoBlazor/build-tools/build-scripts/AcquireBuildLock.cs", - "EntryPointFileDirectoryPath": "/Users/timpurdum/repos/GeoBlazor/GeoBlazor.Pro/GeoBlazor/build-tools/build-scripts", + "EntryPointFilePath": "./AcquireBuildLock.cs", + "EntryPointFileDirectoryPath": ".", "Microsoft.Extensions.DependencyInjection.VerifyOpenGenericServiceTrimmability": true, "System.ComponentModel.DefaultValueAttribute.IsSupported": false, "System.ComponentModel.Design.IDesignerHost.IsSupported": false, diff --git a/build-tools/linux-x64/BuildAppSettings b/build-tools/linux-x64/BuildAppSettings index 2792b05f4..c49ba2ead 100755 Binary files a/build-tools/linux-x64/BuildAppSettings and b/build-tools/linux-x64/BuildAppSettings differ diff --git a/build-tools/linux-x64/BuildAppSettings.dll b/build-tools/linux-x64/BuildAppSettings.dll index 80e1bbbd1..b842fe0d3 100644 Binary files a/build-tools/linux-x64/BuildAppSettings.dll and b/build-tools/linux-x64/BuildAppSettings.dll differ diff --git a/build-tools/linux-x64/BuildAppSettings.runtimeconfig.json b/build-tools/linux-x64/BuildAppSettings.runtimeconfig.json index 2056e9091..5738368d5 100644 --- a/build-tools/linux-x64/BuildAppSettings.runtimeconfig.json +++ b/build-tools/linux-x64/BuildAppSettings.runtimeconfig.json @@ -5,15 +5,9 @@ "name": "Microsoft.NETCore.App", "version": "10.0.0" }, - "runtimeOptions": { - "configProperties": { - "EntryPointFilePath": ".\\GBTest.cs", - "EntryPointFileDirectoryPath": "." - } - }, "configProperties": { - "EntryPointFilePath": "/Users/timpurdum/repos/GeoBlazor/GeoBlazor.Pro/GeoBlazor/build-tools/build-scripts/BuildAppSettings.cs", - "EntryPointFileDirectoryPath": "/Users/timpurdum/repos/GeoBlazor/GeoBlazor.Pro/GeoBlazor/build-tools/build-scripts", + "EntryPointFilePath": "./BuildAppSettings.cs", + "EntryPointFileDirectoryPath": ".", "Microsoft.Extensions.DependencyInjection.VerifyOpenGenericServiceTrimmability": true, "System.ComponentModel.DefaultValueAttribute.IsSupported": false, "System.ComponentModel.Design.IDesignerHost.IsSupported": false, diff --git a/build-tools/linux-x64/ConsoleDialog b/build-tools/linux-x64/ConsoleDialog index d12869838..8a1c9d5c8 100755 Binary files a/build-tools/linux-x64/ConsoleDialog and b/build-tools/linux-x64/ConsoleDialog differ diff --git a/build-tools/linux-x64/ConsoleDialog.dll b/build-tools/linux-x64/ConsoleDialog.dll index 7478d845c..236c80dc9 100644 Binary files a/build-tools/linux-x64/ConsoleDialog.dll and b/build-tools/linux-x64/ConsoleDialog.dll differ diff --git a/build-tools/linux-x64/ConsoleDialog.runtimeconfig.json b/build-tools/linux-x64/ConsoleDialog.runtimeconfig.json index 3c65263b6..64ac1f915 100644 --- a/build-tools/linux-x64/ConsoleDialog.runtimeconfig.json +++ b/build-tools/linux-x64/ConsoleDialog.runtimeconfig.json @@ -5,15 +5,9 @@ "name": "Microsoft.NETCore.App", "version": "10.0.0" }, - "runtimeOptions": { - "configProperties": { - "EntryPointFilePath": ".\\GBTest.cs", - "EntryPointFileDirectoryPath": "." - } - }, "configProperties": { - "EntryPointFilePath": "/Users/timpurdum/repos/GeoBlazor/GeoBlazor.Pro/GeoBlazor/build-tools/build-scripts/ConsoleDialog.cs", - "EntryPointFileDirectoryPath": "/Users/timpurdum/repos/GeoBlazor/GeoBlazor.Pro/GeoBlazor/build-tools/build-scripts", + "EntryPointFilePath": "./ConsoleDialog.cs", + "EntryPointFileDirectoryPath": ".", "Microsoft.Extensions.DependencyInjection.VerifyOpenGenericServiceTrimmability": true, "System.ComponentModel.DefaultValueAttribute.IsSupported": false, "System.ComponentModel.Design.IDesignerHost.IsSupported": false, diff --git a/build-tools/linux-x64/ESBuild b/build-tools/linux-x64/ESBuild index c0a88ef2e..26f97a18e 100755 Binary files a/build-tools/linux-x64/ESBuild and b/build-tools/linux-x64/ESBuild differ diff --git a/build-tools/linux-x64/ESBuild.dll b/build-tools/linux-x64/ESBuild.dll index 22a8e2b62..988fd1c6d 100644 Binary files a/build-tools/linux-x64/ESBuild.dll and b/build-tools/linux-x64/ESBuild.dll differ diff --git a/build-tools/linux-x64/ESBuild.runtimeconfig.json b/build-tools/linux-x64/ESBuild.runtimeconfig.json index aa1a9467e..e4f6e6e1e 100644 --- a/build-tools/linux-x64/ESBuild.runtimeconfig.json +++ b/build-tools/linux-x64/ESBuild.runtimeconfig.json @@ -5,15 +5,9 @@ "name": "Microsoft.NETCore.App", "version": "10.0.0" }, - "runtimeOptions": { - "configProperties": { - "EntryPointFilePath": ".\\GBTest.cs", - "EntryPointFileDirectoryPath": "." - } - }, "configProperties": { - "EntryPointFilePath": "/Users/timpurdum/repos/GeoBlazor/GeoBlazor.Pro/GeoBlazor/build-tools/build-scripts/ESBuild.cs", - "EntryPointFileDirectoryPath": "/Users/timpurdum/repos/GeoBlazor/GeoBlazor.Pro/GeoBlazor/build-tools/build-scripts", + "EntryPointFilePath": "./ESBuild.cs", + "EntryPointFileDirectoryPath": ".", "Microsoft.Extensions.DependencyInjection.VerifyOpenGenericServiceTrimmability": true, "System.ComponentModel.DefaultValueAttribute.IsSupported": false, "System.ComponentModel.Design.IDesignerHost.IsSupported": false, diff --git a/build-tools/linux-x64/ESBuildClearLocks b/build-tools/linux-x64/ESBuildClearLocks index 822cc24cb..a74d9ae18 100755 Binary files a/build-tools/linux-x64/ESBuildClearLocks and b/build-tools/linux-x64/ESBuildClearLocks differ diff --git a/build-tools/linux-x64/ESBuildClearLocks.dll b/build-tools/linux-x64/ESBuildClearLocks.dll index 2b55825e8..9649e43da 100644 Binary files a/build-tools/linux-x64/ESBuildClearLocks.dll and b/build-tools/linux-x64/ESBuildClearLocks.dll differ diff --git a/build-tools/linux-x64/ESBuildClearLocks.runtimeconfig.json b/build-tools/linux-x64/ESBuildClearLocks.runtimeconfig.json index 723869aec..adcb36f55 100644 --- a/build-tools/linux-x64/ESBuildClearLocks.runtimeconfig.json +++ b/build-tools/linux-x64/ESBuildClearLocks.runtimeconfig.json @@ -5,15 +5,9 @@ "name": "Microsoft.NETCore.App", "version": "10.0.0" }, - "runtimeOptions": { - "configProperties": { - "EntryPointFilePath": ".\\GBTest.cs", - "EntryPointFileDirectoryPath": "." - } - }, "configProperties": { - "EntryPointFilePath": "/Users/timpurdum/repos/GeoBlazor/GeoBlazor.Pro/GeoBlazor/build-tools/build-scripts/ESBuildClearLocks.cs", - "EntryPointFileDirectoryPath": "/Users/timpurdum/repos/GeoBlazor/GeoBlazor.Pro/GeoBlazor/build-tools/build-scripts", + "EntryPointFilePath": "./ESBuildClearLocks.cs", + "EntryPointFileDirectoryPath": ".", "Microsoft.Extensions.DependencyInjection.VerifyOpenGenericServiceTrimmability": true, "System.ComponentModel.DefaultValueAttribute.IsSupported": false, "System.ComponentModel.Design.IDesignerHost.IsSupported": false, diff --git a/build-tools/linux-x64/FetchNuGetVersion b/build-tools/linux-x64/FetchNuGetVersion index 743a28a3d..6029fa748 100755 Binary files a/build-tools/linux-x64/FetchNuGetVersion and b/build-tools/linux-x64/FetchNuGetVersion differ diff --git a/build-tools/linux-x64/FetchNuGetVersion.dll b/build-tools/linux-x64/FetchNuGetVersion.dll index 5fbbd6abe..538796e4e 100644 Binary files a/build-tools/linux-x64/FetchNuGetVersion.dll and b/build-tools/linux-x64/FetchNuGetVersion.dll differ diff --git a/build-tools/linux-x64/FetchNuGetVersion.runtimeconfig.json b/build-tools/linux-x64/FetchNuGetVersion.runtimeconfig.json index fcaf3aad8..75a023257 100644 --- a/build-tools/linux-x64/FetchNuGetVersion.runtimeconfig.json +++ b/build-tools/linux-x64/FetchNuGetVersion.runtimeconfig.json @@ -5,15 +5,9 @@ "name": "Microsoft.NETCore.App", "version": "10.0.0" }, - "runtimeOptions": { - "configProperties": { - "EntryPointFilePath": ".\\GBTest.cs", - "EntryPointFileDirectoryPath": "." - } - }, "configProperties": { - "EntryPointFilePath": "/Users/timpurdum/repos/GeoBlazor/GeoBlazor.Pro/GeoBlazor/build-tools/build-scripts/FetchNuGetVersion.cs", - "EntryPointFileDirectoryPath": "/Users/timpurdum/repos/GeoBlazor/GeoBlazor.Pro/GeoBlazor/build-tools/build-scripts", + "EntryPointFilePath": "./FetchNuGetVersion.cs", + "EntryPointFileDirectoryPath": ".", "Microsoft.Extensions.DependencyInjection.VerifyOpenGenericServiceTrimmability": true, "System.ComponentModel.DefaultValueAttribute.IsSupported": false, "System.ComponentModel.Design.IDesignerHost.IsSupported": false, diff --git a/build-tools/linux-x64/GBTest.dll b/build-tools/linux-x64/GBTest.dll index 749c86d89..9eaf8258a 100644 Binary files a/build-tools/linux-x64/GBTest.dll and b/build-tools/linux-x64/GBTest.dll differ diff --git a/build-tools/linux-x64/GBTest.runtimeconfig.json b/build-tools/linux-x64/GBTest.runtimeconfig.json index 7ff48568f..e79efe465 100644 --- a/build-tools/linux-x64/GBTest.runtimeconfig.json +++ b/build-tools/linux-x64/GBTest.runtimeconfig.json @@ -5,15 +5,9 @@ "name": "Microsoft.NETCore.App", "version": "10.0.0" }, - "runtimeOptions": { - "configProperties": { - "EntryPointFilePath": ".\\GBTest.cs", - "EntryPointFileDirectoryPath": "." - } - }, "configProperties": { - "EntryPointFilePath": "D:\\dymaptic.GeoBlazor.CodeGen\\GeoBlazor.Pro\\GeoBlazor\\build-tools\\build-scripts\\GBTest.cs", - "EntryPointFileDirectoryPath": "D:\\dymaptic.GeoBlazor.CodeGen\\GeoBlazor.Pro\\GeoBlazor\\build-tools\\build-scripts", + "EntryPointFilePath": "./GBTest.cs", + "EntryPointFileDirectoryPath": ".", "Microsoft.Extensions.DependencyInjection.VerifyOpenGenericServiceTrimmability": true, "System.ComponentModel.DefaultValueAttribute.IsSupported": false, "System.ComponentModel.Design.IDesignerHost.IsSupported": false, diff --git a/build-tools/linux-x64/GeoBlazorBuild b/build-tools/linux-x64/GeoBlazorBuild index 224afb088..169ca78d0 100755 Binary files a/build-tools/linux-x64/GeoBlazorBuild and b/build-tools/linux-x64/GeoBlazorBuild differ diff --git a/build-tools/linux-x64/GeoBlazorBuild.dll b/build-tools/linux-x64/GeoBlazorBuild.dll index 28cbd9dc4..6b1732d3c 100644 Binary files a/build-tools/linux-x64/GeoBlazorBuild.dll and b/build-tools/linux-x64/GeoBlazorBuild.dll differ diff --git a/build-tools/linux-x64/GeoBlazorBuild.runtimeconfig.json b/build-tools/linux-x64/GeoBlazorBuild.runtimeconfig.json index e0b7d3db1..87e17ce9a 100644 --- a/build-tools/linux-x64/GeoBlazorBuild.runtimeconfig.json +++ b/build-tools/linux-x64/GeoBlazorBuild.runtimeconfig.json @@ -5,15 +5,9 @@ "name": "Microsoft.NETCore.App", "version": "10.0.0" }, - "runtimeOptions": { - "configProperties": { - "EntryPointFilePath": ".\\GBTest.cs", - "EntryPointFileDirectoryPath": "." - } - }, "configProperties": { - "EntryPointFilePath": "/Users/timpurdum/repos/GeoBlazor/GeoBlazor.Pro/GeoBlazor/build-tools/build-scripts/GeoBlazorBuild.cs", - "EntryPointFileDirectoryPath": "/Users/timpurdum/repos/GeoBlazor/GeoBlazor.Pro/GeoBlazor/build-tools/build-scripts", + "EntryPointFilePath": "./GeoBlazorBuild.cs", + "EntryPointFileDirectoryPath": ".", "Microsoft.Extensions.DependencyInjection.VerifyOpenGenericServiceTrimmability": true, "System.ComponentModel.DefaultValueAttribute.IsSupported": false, "System.ComponentModel.Design.IDesignerHost.IsSupported": false, diff --git a/build-tools/linux-x64/Utilities.dll b/build-tools/linux-x64/Utilities.dll index faf2d8902..fe971bc50 100644 Binary files a/build-tools/linux-x64/Utilities.dll and b/build-tools/linux-x64/Utilities.dll differ diff --git a/build-tools/linux-x64/WaitForBuildComplete b/build-tools/linux-x64/WaitForBuildComplete index 22977afbb..8b585bb5d 100755 Binary files a/build-tools/linux-x64/WaitForBuildComplete and b/build-tools/linux-x64/WaitForBuildComplete differ diff --git a/build-tools/linux-x64/WaitForBuildComplete.dll b/build-tools/linux-x64/WaitForBuildComplete.dll index 4adea660f..faac8ab6f 100644 Binary files a/build-tools/linux-x64/WaitForBuildComplete.dll and b/build-tools/linux-x64/WaitForBuildComplete.dll differ diff --git a/build-tools/linux-x64/WaitForBuildComplete.runtimeconfig.json b/build-tools/linux-x64/WaitForBuildComplete.runtimeconfig.json index db669e077..71145baae 100644 --- a/build-tools/linux-x64/WaitForBuildComplete.runtimeconfig.json +++ b/build-tools/linux-x64/WaitForBuildComplete.runtimeconfig.json @@ -5,15 +5,9 @@ "name": "Microsoft.NETCore.App", "version": "10.0.0" }, - "runtimeOptions": { - "configProperties": { - "EntryPointFilePath": ".\\GBTest.cs", - "EntryPointFileDirectoryPath": "." - } - }, "configProperties": { - "EntryPointFilePath": "/Users/timpurdum/repos/GeoBlazor/GeoBlazor.Pro/GeoBlazor/build-tools/build-scripts/WaitForBuildComplete.cs", - "EntryPointFileDirectoryPath": "/Users/timpurdum/repos/GeoBlazor/GeoBlazor.Pro/GeoBlazor/build-tools/build-scripts", + "EntryPointFilePath": "./WaitForBuildComplete.cs", + "EntryPointFileDirectoryPath": ".", "Microsoft.Extensions.DependencyInjection.VerifyOpenGenericServiceTrimmability": true, "System.ComponentModel.DefaultValueAttribute.IsSupported": false, "System.ComponentModel.Design.IDesignerHost.IsSupported": false, diff --git a/build-tools/osx-arm64/AcquireBuildLock b/build-tools/osx-arm64/AcquireBuildLock index 30bce1f8a..b8bd853d7 100755 Binary files a/build-tools/osx-arm64/AcquireBuildLock and b/build-tools/osx-arm64/AcquireBuildLock differ diff --git a/build-tools/osx-arm64/AcquireBuildLock.dll b/build-tools/osx-arm64/AcquireBuildLock.dll index 1a685c608..970d78943 100644 Binary files a/build-tools/osx-arm64/AcquireBuildLock.dll and b/build-tools/osx-arm64/AcquireBuildLock.dll differ diff --git a/build-tools/osx-arm64/AcquireBuildLock.runtimeconfig.json b/build-tools/osx-arm64/AcquireBuildLock.runtimeconfig.json index ecd4b386b..5b20cccd1 100644 --- a/build-tools/osx-arm64/AcquireBuildLock.runtimeconfig.json +++ b/build-tools/osx-arm64/AcquireBuildLock.runtimeconfig.json @@ -5,15 +5,9 @@ "name": "Microsoft.NETCore.App", "version": "10.0.0" }, - "runtimeOptions": { - "configProperties": { - "EntryPointFilePath": ".\\GBTest.cs", - "EntryPointFileDirectoryPath": "." - } - }, "configProperties": { - "EntryPointFilePath": "/Users/timpurdum/repos/GeoBlazor/GeoBlazor.Pro/GeoBlazor/build-tools/build-scripts/AcquireBuildLock.cs", - "EntryPointFileDirectoryPath": "/Users/timpurdum/repos/GeoBlazor/GeoBlazor.Pro/GeoBlazor/build-tools/build-scripts", + "EntryPointFilePath": "./AcquireBuildLock.cs", + "EntryPointFileDirectoryPath": ".", "Microsoft.Extensions.DependencyInjection.VerifyOpenGenericServiceTrimmability": true, "System.ComponentModel.DefaultValueAttribute.IsSupported": false, "System.ComponentModel.Design.IDesignerHost.IsSupported": false, diff --git a/build-tools/osx-arm64/BuildAppSettings b/build-tools/osx-arm64/BuildAppSettings index 84acf1f8e..8df56922a 100755 Binary files a/build-tools/osx-arm64/BuildAppSettings and b/build-tools/osx-arm64/BuildAppSettings differ diff --git a/build-tools/osx-arm64/BuildAppSettings.dll b/build-tools/osx-arm64/BuildAppSettings.dll index 5b7ad9c10..dedf3571f 100644 Binary files a/build-tools/osx-arm64/BuildAppSettings.dll and b/build-tools/osx-arm64/BuildAppSettings.dll differ diff --git a/build-tools/osx-arm64/BuildAppSettings.runtimeconfig.json b/build-tools/osx-arm64/BuildAppSettings.runtimeconfig.json index 059210063..a142e8507 100644 --- a/build-tools/osx-arm64/BuildAppSettings.runtimeconfig.json +++ b/build-tools/osx-arm64/BuildAppSettings.runtimeconfig.json @@ -5,15 +5,9 @@ "name": "Microsoft.NETCore.App", "version": "10.0.0" }, - "runtimeOptions": { - "configProperties": { - "EntryPointFilePath": ".\\GBTest.cs", - "EntryPointFileDirectoryPath": "." - } - }, "configProperties": { - "EntryPointFilePath": "/Users/timpurdum/repos/GeoBlazor/GeoBlazor.Pro/GeoBlazor/build-tools/build-scripts/BuildAppSettings.cs", - "EntryPointFileDirectoryPath": "/Users/timpurdum/repos/GeoBlazor/GeoBlazor.Pro/GeoBlazor/build-tools/build-scripts", + "EntryPointFilePath": "./BuildAppSettings.cs", + "EntryPointFileDirectoryPath": ".", "Microsoft.Extensions.DependencyInjection.VerifyOpenGenericServiceTrimmability": true, "System.ComponentModel.DefaultValueAttribute.IsSupported": false, "System.ComponentModel.Design.IDesignerHost.IsSupported": false, diff --git a/build-tools/osx-arm64/ConsoleDialog b/build-tools/osx-arm64/ConsoleDialog index 6eb8c6dfe..de7802f5f 100755 Binary files a/build-tools/osx-arm64/ConsoleDialog and b/build-tools/osx-arm64/ConsoleDialog differ diff --git a/build-tools/osx-arm64/ConsoleDialog.dll b/build-tools/osx-arm64/ConsoleDialog.dll index 29a8dc96b..6e9ab3ce6 100644 Binary files a/build-tools/osx-arm64/ConsoleDialog.dll and b/build-tools/osx-arm64/ConsoleDialog.dll differ diff --git a/build-tools/osx-arm64/ConsoleDialog.runtimeconfig.json b/build-tools/osx-arm64/ConsoleDialog.runtimeconfig.json index 2c4ca27df..19c30cdbb 100644 --- a/build-tools/osx-arm64/ConsoleDialog.runtimeconfig.json +++ b/build-tools/osx-arm64/ConsoleDialog.runtimeconfig.json @@ -5,15 +5,9 @@ "name": "Microsoft.NETCore.App", "version": "10.0.0" }, - "runtimeOptions": { - "configProperties": { - "EntryPointFilePath": ".\\GBTest.cs", - "EntryPointFileDirectoryPath": "." - } - }, "configProperties": { - "EntryPointFilePath": "/Users/timpurdum/repos/GeoBlazor/GeoBlazor.Pro/GeoBlazor/build-tools/build-scripts/ConsoleDialog.cs", - "EntryPointFileDirectoryPath": "/Users/timpurdum/repos/GeoBlazor/GeoBlazor.Pro/GeoBlazor/build-tools/build-scripts", + "EntryPointFilePath": "./ConsoleDialog.cs", + "EntryPointFileDirectoryPath": ".", "Microsoft.Extensions.DependencyInjection.VerifyOpenGenericServiceTrimmability": true, "System.ComponentModel.DefaultValueAttribute.IsSupported": false, "System.ComponentModel.Design.IDesignerHost.IsSupported": false, diff --git a/build-tools/osx-arm64/ESBuild b/build-tools/osx-arm64/ESBuild index d9e8fb5f8..9fbe36f07 100755 Binary files a/build-tools/osx-arm64/ESBuild and b/build-tools/osx-arm64/ESBuild differ diff --git a/build-tools/osx-arm64/ESBuild.dll b/build-tools/osx-arm64/ESBuild.dll index a35d2383c..5ed44d8bb 100644 Binary files a/build-tools/osx-arm64/ESBuild.dll and b/build-tools/osx-arm64/ESBuild.dll differ diff --git a/build-tools/osx-arm64/ESBuild.runtimeconfig.json b/build-tools/osx-arm64/ESBuild.runtimeconfig.json index d1930f8c3..04f2a3b5c 100644 --- a/build-tools/osx-arm64/ESBuild.runtimeconfig.json +++ b/build-tools/osx-arm64/ESBuild.runtimeconfig.json @@ -5,15 +5,9 @@ "name": "Microsoft.NETCore.App", "version": "10.0.0" }, - "runtimeOptions": { - "configProperties": { - "EntryPointFilePath": ".\\GBTest.cs", - "EntryPointFileDirectoryPath": "." - } - }, "configProperties": { - "EntryPointFilePath": "/Users/timpurdum/repos/GeoBlazor/GeoBlazor.Pro/GeoBlazor/build-tools/build-scripts/ESBuild.cs", - "EntryPointFileDirectoryPath": "/Users/timpurdum/repos/GeoBlazor/GeoBlazor.Pro/GeoBlazor/build-tools/build-scripts", + "EntryPointFilePath": "./ESBuild.cs", + "EntryPointFileDirectoryPath": ".", "Microsoft.Extensions.DependencyInjection.VerifyOpenGenericServiceTrimmability": true, "System.ComponentModel.DefaultValueAttribute.IsSupported": false, "System.ComponentModel.Design.IDesignerHost.IsSupported": false, diff --git a/build-tools/osx-arm64/ESBuildClearLocks b/build-tools/osx-arm64/ESBuildClearLocks index a16a42717..1b9c6f882 100755 Binary files a/build-tools/osx-arm64/ESBuildClearLocks and b/build-tools/osx-arm64/ESBuildClearLocks differ diff --git a/build-tools/osx-arm64/ESBuildClearLocks.dll b/build-tools/osx-arm64/ESBuildClearLocks.dll index 26c340f05..852520990 100644 Binary files a/build-tools/osx-arm64/ESBuildClearLocks.dll and b/build-tools/osx-arm64/ESBuildClearLocks.dll differ diff --git a/build-tools/osx-arm64/ESBuildClearLocks.runtimeconfig.json b/build-tools/osx-arm64/ESBuildClearLocks.runtimeconfig.json index 075d7dc73..e9e9dd5e6 100644 --- a/build-tools/osx-arm64/ESBuildClearLocks.runtimeconfig.json +++ b/build-tools/osx-arm64/ESBuildClearLocks.runtimeconfig.json @@ -5,15 +5,9 @@ "name": "Microsoft.NETCore.App", "version": "10.0.0" }, - "runtimeOptions": { - "configProperties": { - "EntryPointFilePath": ".\\GBTest.cs", - "EntryPointFileDirectoryPath": "." - } - }, "configProperties": { - "EntryPointFilePath": "/Users/timpurdum/repos/GeoBlazor/GeoBlazor.Pro/GeoBlazor/build-tools/build-scripts/ESBuildClearLocks.cs", - "EntryPointFileDirectoryPath": "/Users/timpurdum/repos/GeoBlazor/GeoBlazor.Pro/GeoBlazor/build-tools/build-scripts", + "EntryPointFilePath": "./ESBuildClearLocks.cs", + "EntryPointFileDirectoryPath": ".", "Microsoft.Extensions.DependencyInjection.VerifyOpenGenericServiceTrimmability": true, "System.ComponentModel.DefaultValueAttribute.IsSupported": false, "System.ComponentModel.Design.IDesignerHost.IsSupported": false, diff --git a/build-tools/osx-arm64/FetchNuGetVersion b/build-tools/osx-arm64/FetchNuGetVersion index 6817a9034..1e4f4ccde 100755 Binary files a/build-tools/osx-arm64/FetchNuGetVersion and b/build-tools/osx-arm64/FetchNuGetVersion differ diff --git a/build-tools/osx-arm64/FetchNuGetVersion.dll b/build-tools/osx-arm64/FetchNuGetVersion.dll index 4ecb4f8ab..669d1afa5 100644 Binary files a/build-tools/osx-arm64/FetchNuGetVersion.dll and b/build-tools/osx-arm64/FetchNuGetVersion.dll differ diff --git a/build-tools/osx-arm64/FetchNuGetVersion.runtimeconfig.json b/build-tools/osx-arm64/FetchNuGetVersion.runtimeconfig.json index 76488907e..305cf8f88 100644 --- a/build-tools/osx-arm64/FetchNuGetVersion.runtimeconfig.json +++ b/build-tools/osx-arm64/FetchNuGetVersion.runtimeconfig.json @@ -5,15 +5,9 @@ "name": "Microsoft.NETCore.App", "version": "10.0.0" }, - "runtimeOptions": { - "configProperties": { - "EntryPointFilePath": ".\\GBTest.cs", - "EntryPointFileDirectoryPath": "." - } - }, "configProperties": { - "EntryPointFilePath": "/Users/timpurdum/repos/GeoBlazor/GeoBlazor.Pro/GeoBlazor/build-tools/build-scripts/FetchNuGetVersion.cs", - "EntryPointFileDirectoryPath": "/Users/timpurdum/repos/GeoBlazor/GeoBlazor.Pro/GeoBlazor/build-tools/build-scripts", + "EntryPointFilePath": "./FetchNuGetVersion.cs", + "EntryPointFileDirectoryPath": ".", "Microsoft.Extensions.DependencyInjection.VerifyOpenGenericServiceTrimmability": true, "System.ComponentModel.DefaultValueAttribute.IsSupported": false, "System.ComponentModel.Design.IDesignerHost.IsSupported": false, diff --git a/build-tools/osx-arm64/GBTest.dll b/build-tools/osx-arm64/GBTest.dll index 4aee4ef77..66376c26f 100644 Binary files a/build-tools/osx-arm64/GBTest.dll and b/build-tools/osx-arm64/GBTest.dll differ diff --git a/build-tools/osx-arm64/GBTest.runtimeconfig.json b/build-tools/osx-arm64/GBTest.runtimeconfig.json index 1cf2450bf..42e5cec7d 100644 --- a/build-tools/osx-arm64/GBTest.runtimeconfig.json +++ b/build-tools/osx-arm64/GBTest.runtimeconfig.json @@ -5,15 +5,9 @@ "name": "Microsoft.NETCore.App", "version": "10.0.0" }, - "runtimeOptions": { - "configProperties": { - "EntryPointFilePath": ".\\GBTest.cs", - "EntryPointFileDirectoryPath": "." - } - }, "configProperties": { - "EntryPointFilePath": "D:\\dymaptic.GeoBlazor.CodeGen\\GeoBlazor.Pro\\GeoBlazor\\build-tools\\build-scripts\\GBTest.cs", - "EntryPointFileDirectoryPath": "D:\\dymaptic.GeoBlazor.CodeGen\\GeoBlazor.Pro\\GeoBlazor\\build-tools\\build-scripts", + "EntryPointFilePath": "./GBTest.cs", + "EntryPointFileDirectoryPath": ".", "Microsoft.Extensions.DependencyInjection.VerifyOpenGenericServiceTrimmability": true, "System.ComponentModel.DefaultValueAttribute.IsSupported": false, "System.ComponentModel.Design.IDesignerHost.IsSupported": false, diff --git a/build-tools/osx-arm64/GeoBlazorBuild b/build-tools/osx-arm64/GeoBlazorBuild index d58970659..047baf96a 100755 Binary files a/build-tools/osx-arm64/GeoBlazorBuild and b/build-tools/osx-arm64/GeoBlazorBuild differ diff --git a/build-tools/osx-arm64/GeoBlazorBuild.dll b/build-tools/osx-arm64/GeoBlazorBuild.dll index 8d527c5d4..8dcbcbd73 100644 Binary files a/build-tools/osx-arm64/GeoBlazorBuild.dll and b/build-tools/osx-arm64/GeoBlazorBuild.dll differ diff --git a/build-tools/osx-arm64/GeoBlazorBuild.runtimeconfig.json b/build-tools/osx-arm64/GeoBlazorBuild.runtimeconfig.json index 15aeea8d4..5a4758ef3 100644 --- a/build-tools/osx-arm64/GeoBlazorBuild.runtimeconfig.json +++ b/build-tools/osx-arm64/GeoBlazorBuild.runtimeconfig.json @@ -5,15 +5,9 @@ "name": "Microsoft.NETCore.App", "version": "10.0.0" }, - "runtimeOptions": { - "configProperties": { - "EntryPointFilePath": ".\\GBTest.cs", - "EntryPointFileDirectoryPath": "." - } - }, "configProperties": { - "EntryPointFilePath": "/Users/timpurdum/repos/GeoBlazor/GeoBlazor.Pro/GeoBlazor/build-tools/build-scripts/GeoBlazorBuild.cs", - "EntryPointFileDirectoryPath": "/Users/timpurdum/repos/GeoBlazor/GeoBlazor.Pro/GeoBlazor/build-tools/build-scripts", + "EntryPointFilePath": "./GeoBlazorBuild.cs", + "EntryPointFileDirectoryPath": ".", "Microsoft.Extensions.DependencyInjection.VerifyOpenGenericServiceTrimmability": true, "System.ComponentModel.DefaultValueAttribute.IsSupported": false, "System.ComponentModel.Design.IDesignerHost.IsSupported": false, diff --git a/build-tools/osx-arm64/Utilities.dll b/build-tools/osx-arm64/Utilities.dll index faf2d8902..fe971bc50 100644 Binary files a/build-tools/osx-arm64/Utilities.dll and b/build-tools/osx-arm64/Utilities.dll differ diff --git a/build-tools/osx-arm64/WaitForBuildComplete b/build-tools/osx-arm64/WaitForBuildComplete index 71db73492..f4d8bd177 100755 Binary files a/build-tools/osx-arm64/WaitForBuildComplete and b/build-tools/osx-arm64/WaitForBuildComplete differ diff --git a/build-tools/osx-arm64/WaitForBuildComplete.dll b/build-tools/osx-arm64/WaitForBuildComplete.dll index 659880405..49b1c8803 100644 Binary files a/build-tools/osx-arm64/WaitForBuildComplete.dll and b/build-tools/osx-arm64/WaitForBuildComplete.dll differ diff --git a/build-tools/osx-arm64/WaitForBuildComplete.runtimeconfig.json b/build-tools/osx-arm64/WaitForBuildComplete.runtimeconfig.json index 15fa93df5..cbfcaab4e 100644 --- a/build-tools/osx-arm64/WaitForBuildComplete.runtimeconfig.json +++ b/build-tools/osx-arm64/WaitForBuildComplete.runtimeconfig.json @@ -5,15 +5,9 @@ "name": "Microsoft.NETCore.App", "version": "10.0.0" }, - "runtimeOptions": { - "configProperties": { - "EntryPointFilePath": ".\\GBTest.cs", - "EntryPointFileDirectoryPath": "." - } - }, "configProperties": { - "EntryPointFilePath": "/Users/timpurdum/repos/GeoBlazor/GeoBlazor.Pro/GeoBlazor/build-tools/build-scripts/WaitForBuildComplete.cs", - "EntryPointFileDirectoryPath": "/Users/timpurdum/repos/GeoBlazor/GeoBlazor.Pro/GeoBlazor/build-tools/build-scripts", + "EntryPointFilePath": "./WaitForBuildComplete.cs", + "EntryPointFileDirectoryPath": ".", "Microsoft.Extensions.DependencyInjection.VerifyOpenGenericServiceTrimmability": true, "System.ComponentModel.DefaultValueAttribute.IsSupported": false, "System.ComponentModel.Design.IDesignerHost.IsSupported": false, diff --git a/build-tools/win-x64/AcquireBuildLock.dll b/build-tools/win-x64/AcquireBuildLock.dll index e942e7f3b..9bab67ca6 100644 Binary files a/build-tools/win-x64/AcquireBuildLock.dll and b/build-tools/win-x64/AcquireBuildLock.dll differ diff --git a/build-tools/win-x64/AcquireBuildLock.exe b/build-tools/win-x64/AcquireBuildLock.exe index 689a2033f..da27584c2 100755 Binary files a/build-tools/win-x64/AcquireBuildLock.exe and b/build-tools/win-x64/AcquireBuildLock.exe differ diff --git a/build-tools/win-x64/AcquireBuildLock.runtimeconfig.json b/build-tools/win-x64/AcquireBuildLock.runtimeconfig.json index 9c1f35a7b..53669388c 100644 --- a/build-tools/win-x64/AcquireBuildLock.runtimeconfig.json +++ b/build-tools/win-x64/AcquireBuildLock.runtimeconfig.json @@ -5,15 +5,9 @@ "name": "Microsoft.NETCore.App", "version": "10.0.0" }, - "runtimeOptions": { - "configProperties": { - "EntryPointFilePath": ".\\GBTest.cs", - "EntryPointFileDirectoryPath": "." - } - }, "configProperties": { - "EntryPointFilePath": "/Users/timpurdum/repos/GeoBlazor/GeoBlazor.Pro/GeoBlazor/build-tools/build-scripts/AcquireBuildLock.cs", - "EntryPointFileDirectoryPath": "/Users/timpurdum/repos/GeoBlazor/GeoBlazor.Pro/GeoBlazor/build-tools/build-scripts", + "EntryPointFilePath": "./AcquireBuildLock.cs", + "EntryPointFileDirectoryPath": ".", "Microsoft.Extensions.DependencyInjection.VerifyOpenGenericServiceTrimmability": true, "System.ComponentModel.DefaultValueAttribute.IsSupported": false, "System.ComponentModel.Design.IDesignerHost.IsSupported": false, diff --git a/build-tools/win-x64/BuildAppSettings.dll b/build-tools/win-x64/BuildAppSettings.dll index 335aa9a10..17cead6a6 100644 Binary files a/build-tools/win-x64/BuildAppSettings.dll and b/build-tools/win-x64/BuildAppSettings.dll differ diff --git a/build-tools/win-x64/BuildAppSettings.exe b/build-tools/win-x64/BuildAppSettings.exe index 552245495..aefc0d6bd 100755 Binary files a/build-tools/win-x64/BuildAppSettings.exe and b/build-tools/win-x64/BuildAppSettings.exe differ diff --git a/build-tools/win-x64/BuildAppSettings.runtimeconfig.json b/build-tools/win-x64/BuildAppSettings.runtimeconfig.json index 6218d8e86..5dbb04aab 100644 --- a/build-tools/win-x64/BuildAppSettings.runtimeconfig.json +++ b/build-tools/win-x64/BuildAppSettings.runtimeconfig.json @@ -5,15 +5,9 @@ "name": "Microsoft.NETCore.App", "version": "10.0.0" }, - "runtimeOptions": { - "configProperties": { - "EntryPointFilePath": ".\\GBTest.cs", - "EntryPointFileDirectoryPath": "." - } - }, "configProperties": { - "EntryPointFilePath": "/Users/timpurdum/repos/GeoBlazor/GeoBlazor.Pro/GeoBlazor/build-tools/build-scripts/BuildAppSettings.cs", - "EntryPointFileDirectoryPath": "/Users/timpurdum/repos/GeoBlazor/GeoBlazor.Pro/GeoBlazor/build-tools/build-scripts", + "EntryPointFilePath": "./BuildAppSettings.cs", + "EntryPointFileDirectoryPath": ".", "Microsoft.Extensions.DependencyInjection.VerifyOpenGenericServiceTrimmability": true, "System.ComponentModel.DefaultValueAttribute.IsSupported": false, "System.ComponentModel.Design.IDesignerHost.IsSupported": false, diff --git a/build-tools/win-x64/ConsoleDialog.dll b/build-tools/win-x64/ConsoleDialog.dll index 8c9305b75..a0c73a264 100644 Binary files a/build-tools/win-x64/ConsoleDialog.dll and b/build-tools/win-x64/ConsoleDialog.dll differ diff --git a/build-tools/win-x64/ConsoleDialog.exe b/build-tools/win-x64/ConsoleDialog.exe index f2d3862e9..5246c4fb1 100755 Binary files a/build-tools/win-x64/ConsoleDialog.exe and b/build-tools/win-x64/ConsoleDialog.exe differ diff --git a/build-tools/win-x64/ConsoleDialog.runtimeconfig.json b/build-tools/win-x64/ConsoleDialog.runtimeconfig.json index af0e7647f..0bbbf896e 100644 --- a/build-tools/win-x64/ConsoleDialog.runtimeconfig.json +++ b/build-tools/win-x64/ConsoleDialog.runtimeconfig.json @@ -5,15 +5,9 @@ "name": "Microsoft.NETCore.App", "version": "10.0.0" }, - "runtimeOptions": { - "configProperties": { - "EntryPointFilePath": ".\\GBTest.cs", - "EntryPointFileDirectoryPath": "." - } - }, "configProperties": { - "EntryPointFilePath": "/Users/timpurdum/repos/GeoBlazor/GeoBlazor.Pro/GeoBlazor/build-tools/build-scripts/ConsoleDialog.cs", - "EntryPointFileDirectoryPath": "/Users/timpurdum/repos/GeoBlazor/GeoBlazor.Pro/GeoBlazor/build-tools/build-scripts", + "EntryPointFilePath": "./ConsoleDialog.cs", + "EntryPointFileDirectoryPath": ".", "Microsoft.Extensions.DependencyInjection.VerifyOpenGenericServiceTrimmability": true, "System.ComponentModel.DefaultValueAttribute.IsSupported": false, "System.ComponentModel.Design.IDesignerHost.IsSupported": false, diff --git a/build-tools/win-x64/ESBuild.dll b/build-tools/win-x64/ESBuild.dll index adf856724..b2d0d5165 100644 Binary files a/build-tools/win-x64/ESBuild.dll and b/build-tools/win-x64/ESBuild.dll differ diff --git a/build-tools/win-x64/ESBuild.exe b/build-tools/win-x64/ESBuild.exe index cddc761d7..aba53fe66 100755 Binary files a/build-tools/win-x64/ESBuild.exe and b/build-tools/win-x64/ESBuild.exe differ diff --git a/build-tools/win-x64/ESBuild.runtimeconfig.json b/build-tools/win-x64/ESBuild.runtimeconfig.json index 6ca2db58b..3749453c8 100644 --- a/build-tools/win-x64/ESBuild.runtimeconfig.json +++ b/build-tools/win-x64/ESBuild.runtimeconfig.json @@ -5,15 +5,9 @@ "name": "Microsoft.NETCore.App", "version": "10.0.0" }, - "runtimeOptions": { - "configProperties": { - "EntryPointFilePath": ".\\GBTest.cs", - "EntryPointFileDirectoryPath": "." - } - }, "configProperties": { - "EntryPointFilePath": "/Users/timpurdum/repos/GeoBlazor/GeoBlazor.Pro/GeoBlazor/build-tools/build-scripts/ESBuild.cs", - "EntryPointFileDirectoryPath": "/Users/timpurdum/repos/GeoBlazor/GeoBlazor.Pro/GeoBlazor/build-tools/build-scripts", + "EntryPointFilePath": "./ESBuild.cs", + "EntryPointFileDirectoryPath": ".", "Microsoft.Extensions.DependencyInjection.VerifyOpenGenericServiceTrimmability": true, "System.ComponentModel.DefaultValueAttribute.IsSupported": false, "System.ComponentModel.Design.IDesignerHost.IsSupported": false, diff --git a/build-tools/win-x64/ESBuildClearLocks.dll b/build-tools/win-x64/ESBuildClearLocks.dll index b1804be80..794114630 100644 Binary files a/build-tools/win-x64/ESBuildClearLocks.dll and b/build-tools/win-x64/ESBuildClearLocks.dll differ diff --git a/build-tools/win-x64/ESBuildClearLocks.exe b/build-tools/win-x64/ESBuildClearLocks.exe index 7e2664489..850314c44 100755 Binary files a/build-tools/win-x64/ESBuildClearLocks.exe and b/build-tools/win-x64/ESBuildClearLocks.exe differ diff --git a/build-tools/win-x64/ESBuildClearLocks.runtimeconfig.json b/build-tools/win-x64/ESBuildClearLocks.runtimeconfig.json index 47fa7b493..6a1edd8f6 100644 --- a/build-tools/win-x64/ESBuildClearLocks.runtimeconfig.json +++ b/build-tools/win-x64/ESBuildClearLocks.runtimeconfig.json @@ -5,15 +5,9 @@ "name": "Microsoft.NETCore.App", "version": "10.0.0" }, - "runtimeOptions": { - "configProperties": { - "EntryPointFilePath": ".\\GBTest.cs", - "EntryPointFileDirectoryPath": "." - } - }, "configProperties": { - "EntryPointFilePath": "/Users/timpurdum/repos/GeoBlazor/GeoBlazor.Pro/GeoBlazor/build-tools/build-scripts/ESBuildClearLocks.cs", - "EntryPointFileDirectoryPath": "/Users/timpurdum/repos/GeoBlazor/GeoBlazor.Pro/GeoBlazor/build-tools/build-scripts", + "EntryPointFilePath": "./ESBuildClearLocks.cs", + "EntryPointFileDirectoryPath": ".", "Microsoft.Extensions.DependencyInjection.VerifyOpenGenericServiceTrimmability": true, "System.ComponentModel.DefaultValueAttribute.IsSupported": false, "System.ComponentModel.Design.IDesignerHost.IsSupported": false, diff --git a/build-tools/win-x64/FetchNuGetVersion.dll b/build-tools/win-x64/FetchNuGetVersion.dll index 99b07d6d5..8e3640e22 100644 Binary files a/build-tools/win-x64/FetchNuGetVersion.dll and b/build-tools/win-x64/FetchNuGetVersion.dll differ diff --git a/build-tools/win-x64/FetchNuGetVersion.exe b/build-tools/win-x64/FetchNuGetVersion.exe index 8d755525c..29066328f 100755 Binary files a/build-tools/win-x64/FetchNuGetVersion.exe and b/build-tools/win-x64/FetchNuGetVersion.exe differ diff --git a/build-tools/win-x64/FetchNuGetVersion.runtimeconfig.json b/build-tools/win-x64/FetchNuGetVersion.runtimeconfig.json index e968ecc0b..2d63f0d88 100644 --- a/build-tools/win-x64/FetchNuGetVersion.runtimeconfig.json +++ b/build-tools/win-x64/FetchNuGetVersion.runtimeconfig.json @@ -5,15 +5,9 @@ "name": "Microsoft.NETCore.App", "version": "10.0.0" }, - "runtimeOptions": { - "configProperties": { - "EntryPointFilePath": ".\\GBTest.cs", - "EntryPointFileDirectoryPath": "." - } - }, "configProperties": { - "EntryPointFilePath": "/Users/timpurdum/repos/GeoBlazor/GeoBlazor.Pro/GeoBlazor/build-tools/build-scripts/FetchNuGetVersion.cs", - "EntryPointFileDirectoryPath": "/Users/timpurdum/repos/GeoBlazor/GeoBlazor.Pro/GeoBlazor/build-tools/build-scripts", + "EntryPointFilePath": "./FetchNuGetVersion.cs", + "EntryPointFileDirectoryPath": ".", "Microsoft.Extensions.DependencyInjection.VerifyOpenGenericServiceTrimmability": true, "System.ComponentModel.DefaultValueAttribute.IsSupported": false, "System.ComponentModel.Design.IDesignerHost.IsSupported": false, diff --git a/build-tools/win-x64/GBTest.dll b/build-tools/win-x64/GBTest.dll index bca7aac54..ff7b82b7b 100644 Binary files a/build-tools/win-x64/GBTest.dll and b/build-tools/win-x64/GBTest.dll differ diff --git a/build-tools/win-x64/GBTest.exe b/build-tools/win-x64/GBTest.exe index 157e2f253..f7da3b071 100755 Binary files a/build-tools/win-x64/GBTest.exe and b/build-tools/win-x64/GBTest.exe differ diff --git a/build-tools/win-x64/GBTest.runtimeconfig.json b/build-tools/win-x64/GBTest.runtimeconfig.json index 0feb20dac..e3b669da7 100644 --- a/build-tools/win-x64/GBTest.runtimeconfig.json +++ b/build-tools/win-x64/GBTest.runtimeconfig.json @@ -5,15 +5,9 @@ "name": "Microsoft.NETCore.App", "version": "10.0.0" }, - "runtimeOptions": { - "configProperties": { - "EntryPointFilePath": ".\\GBTest.cs", - "EntryPointFileDirectoryPath": "." - } - }, "configProperties": { - "EntryPointFilePath": "D:\\dymaptic.GeoBlazor.CodeGen\\GeoBlazor.Pro\\GeoBlazor\\build-tools\\build-scripts\\GBTest.cs", - "EntryPointFileDirectoryPath": "D:\\dymaptic.GeoBlazor.CodeGen\\GeoBlazor.Pro\\GeoBlazor\\build-tools\\build-scripts", + "EntryPointFilePath": "./GBTest.cs", + "EntryPointFileDirectoryPath": ".", "Microsoft.Extensions.DependencyInjection.VerifyOpenGenericServiceTrimmability": true, "System.ComponentModel.DefaultValueAttribute.IsSupported": false, "System.ComponentModel.Design.IDesignerHost.IsSupported": false, diff --git a/build-tools/win-x64/GeoBlazorBuild.dll b/build-tools/win-x64/GeoBlazorBuild.dll index 31a671879..4720d2ceb 100644 Binary files a/build-tools/win-x64/GeoBlazorBuild.dll and b/build-tools/win-x64/GeoBlazorBuild.dll differ diff --git a/build-tools/win-x64/GeoBlazorBuild.exe b/build-tools/win-x64/GeoBlazorBuild.exe index ccf57421a..e4337454f 100755 Binary files a/build-tools/win-x64/GeoBlazorBuild.exe and b/build-tools/win-x64/GeoBlazorBuild.exe differ diff --git a/build-tools/win-x64/GeoBlazorBuild.runtimeconfig.json b/build-tools/win-x64/GeoBlazorBuild.runtimeconfig.json index 0946735cb..0759ceb54 100644 --- a/build-tools/win-x64/GeoBlazorBuild.runtimeconfig.json +++ b/build-tools/win-x64/GeoBlazorBuild.runtimeconfig.json @@ -5,15 +5,9 @@ "name": "Microsoft.NETCore.App", "version": "10.0.0" }, - "runtimeOptions": { - "configProperties": { - "EntryPointFilePath": ".\\GBTest.cs", - "EntryPointFileDirectoryPath": "." - } - }, "configProperties": { - "EntryPointFilePath": "/Users/timpurdum/repos/GeoBlazor/GeoBlazor.Pro/GeoBlazor/build-tools/build-scripts/GeoBlazorBuild.cs", - "EntryPointFileDirectoryPath": "/Users/timpurdum/repos/GeoBlazor/GeoBlazor.Pro/GeoBlazor/build-tools/build-scripts", + "EntryPointFilePath": "./GeoBlazorBuild.cs", + "EntryPointFileDirectoryPath": ".", "Microsoft.Extensions.DependencyInjection.VerifyOpenGenericServiceTrimmability": true, "System.ComponentModel.DefaultValueAttribute.IsSupported": false, "System.ComponentModel.Design.IDesignerHost.IsSupported": false, diff --git a/build-tools/win-x64/ScriptBuilder.dll b/build-tools/win-x64/ScriptBuilder.dll index 87f209290..d3dc3af8e 100644 Binary files a/build-tools/win-x64/ScriptBuilder.dll and b/build-tools/win-x64/ScriptBuilder.dll differ diff --git a/build-tools/win-x64/ScriptBuilder.exe b/build-tools/win-x64/ScriptBuilder.exe index 63a89cdd8..c92a59edd 100644 Binary files a/build-tools/win-x64/ScriptBuilder.exe and b/build-tools/win-x64/ScriptBuilder.exe differ diff --git a/build-tools/win-x64/ScriptBuilder.runtimeconfig.json b/build-tools/win-x64/ScriptBuilder.runtimeconfig.json index bf9935c2d..49e178a69 100644 --- a/build-tools/win-x64/ScriptBuilder.runtimeconfig.json +++ b/build-tools/win-x64/ScriptBuilder.runtimeconfig.json @@ -5,12 +5,6 @@ "name": "Microsoft.NETCore.App", "version": "10.0.0" }, - "runtimeOptions": { - "configProperties": { - "EntryPointFilePath": ".\\GBTest.cs", - "EntryPointFileDirectoryPath": "." - } - }, "configProperties": { "EntryPointFilePath": "D:\\dymaptic.GeoBlazor.CodeGen\\GeoBlazor.Pro\\GeoBlazor\\build-tools\\build-scripts\\ScriptBuilder.cs", "EntryPointFileDirectoryPath": "D:\\dymaptic.GeoBlazor.CodeGen\\GeoBlazor.Pro\\GeoBlazor\\build-tools\\build-scripts", diff --git a/build-tools/win-x64/Utilities.dll b/build-tools/win-x64/Utilities.dll index faf2d8902..fe971bc50 100644 Binary files a/build-tools/win-x64/Utilities.dll and b/build-tools/win-x64/Utilities.dll differ diff --git a/build-tools/win-x64/WaitForBuildComplete.dll b/build-tools/win-x64/WaitForBuildComplete.dll index 5a53feb23..3dc52a8a8 100644 Binary files a/build-tools/win-x64/WaitForBuildComplete.dll and b/build-tools/win-x64/WaitForBuildComplete.dll differ diff --git a/build-tools/win-x64/WaitForBuildComplete.exe b/build-tools/win-x64/WaitForBuildComplete.exe index 8528e1ea3..f1ddb3b04 100755 Binary files a/build-tools/win-x64/WaitForBuildComplete.exe and b/build-tools/win-x64/WaitForBuildComplete.exe differ diff --git a/build-tools/win-x64/WaitForBuildComplete.runtimeconfig.json b/build-tools/win-x64/WaitForBuildComplete.runtimeconfig.json index 1f2ded421..669998e3e 100644 --- a/build-tools/win-x64/WaitForBuildComplete.runtimeconfig.json +++ b/build-tools/win-x64/WaitForBuildComplete.runtimeconfig.json @@ -5,15 +5,9 @@ "name": "Microsoft.NETCore.App", "version": "10.0.0" }, - "runtimeOptions": { - "configProperties": { - "EntryPointFilePath": ".\\GBTest.cs", - "EntryPointFileDirectoryPath": "." - } - }, "configProperties": { - "EntryPointFilePath": "/Users/timpurdum/repos/GeoBlazor/GeoBlazor.Pro/GeoBlazor/build-tools/build-scripts/WaitForBuildComplete.cs", - "EntryPointFileDirectoryPath": "/Users/timpurdum/repos/GeoBlazor/GeoBlazor.Pro/GeoBlazor/build-tools/build-scripts", + "EntryPointFilePath": "./WaitForBuildComplete.cs", + "EntryPointFileDirectoryPath": ".", "Microsoft.Extensions.DependencyInjection.VerifyOpenGenericServiceTrimmability": true, "System.ComponentModel.DefaultValueAttribute.IsSupported": false, "System.ComponentModel.Design.IDesignerHost.IsSupported": false, diff --git a/src/dymaptic.GeoBlazor.Core/Components/MapComponent.razor.cs b/src/dymaptic.GeoBlazor.Core/Components/MapComponent.razor.cs index 95f68aad5..a0fbc1cd9 100644 --- a/src/dymaptic.GeoBlazor.Core/Components/MapComponent.razor.cs +++ b/src/dymaptic.GeoBlazor.Core/Components/MapComponent.razor.cs @@ -580,8 +580,8 @@ public virtual async Task SetLayer(Layer? value) return; } - await JsComponentReference.InvokeVoidAsync("setLayer", - CancellationTokenSource.Token, value); + await CoreJsModule.InvokeVoidAsync("setLayer", + CancellationTokenSource.Token, JsComponentReference, value); } /// diff --git a/src/dymaptic.GeoBlazor.Core/Scripts/geoBlazorCore.ts b/src/dymaptic.GeoBlazor.Core/Scripts/geoBlazorCore.ts index b043a6ade..646a874d5 100644 --- a/src/dymaptic.GeoBlazor.Core/Scripts/geoBlazorCore.ts +++ b/src/dymaptic.GeoBlazor.Core/Scripts/geoBlazorCore.ts @@ -416,6 +416,20 @@ export async function setProperty(obj: any, prop: string, value: any): Promise { + if ('setLayer' in obj) { + await obj.setLayer(value); + } else { + let jsLayer: any = null; + if (hasValue(value)) { + let { buildJsLayer } = await import('./layer'); + jsLayer = await buildJsLayer(value, null, null); + } + + obj.layer = jsLayer; + } +} + export function addToProperty(obj, prop, value) { if ('addToProperty' in obj) { obj.addToProperty(prop, value); diff --git a/test/dymaptic.GeoBlazor.Core.Test.Blazor.Shared/wwwroot/testRunner.js b/test/dymaptic.GeoBlazor.Core.Test.Blazor.Shared/wwwroot/testRunner.js index 291b2ac21..778ae24c4 100644 --- a/test/dymaptic.GeoBlazor.Core.Test.Blazor.Shared/wwwroot/testRunner.js +++ b/test/dymaptic.GeoBlazor.Core.Test.Blazor.Shared/wwwroot/testRunner.js @@ -239,6 +239,25 @@ export function assertObjectHasPropertyWithValue(methodName, objectId, propertyN } } +export function assertObjectHasArcGisLayer(methodName, objectId, propertyName, expectedLayerId) { + let props = propertyName.split('.'); + let obj = arcGisObjectRefs[objectId]; + for (let i = 0; i < props.length; i++) { + obj = obj[props[i]]; + if (obj === undefined || obj === null) { + throw new Error(`Expected ${propertyName} to be an ArcGIS layer but found ${obj}`); + } + } + + if (obj.declaredClass !== "esri.layers.GraphicsLayer") { + throw new Error(`Expected ${propertyName} to be an ArcGIS GraphicsLayer but found ${obj.declaredClass}`); + } + + if (obj.id !== expectedLayerId) { + throw new Error(`Expected ${propertyName}.id to be ${expectedLayerId} but found ${obj.id}`); + } +} + export function testThrow() { throw new Error("Test throw"); } diff --git a/test/dymaptic.GeoBlazor.Core.Test.Unit/MapComponentTests.cs b/test/dymaptic.GeoBlazor.Core.Test.Unit/MapComponentTests.cs index 33192d07a..c310d0682 100644 --- a/test/dymaptic.GeoBlazor.Core.Test.Unit/MapComponentTests.cs +++ b/test/dymaptic.GeoBlazor.Core.Test.Unit/MapComponentTests.cs @@ -1,5 +1,7 @@ using dymaptic.GeoBlazor.Core.Components; +using dymaptic.GeoBlazor.Core.Components.Layers; using dymaptic.GeoBlazor.Core.Exceptions; +using Microsoft.JSInterop; namespace dymaptic.GeoBlazor.Core.Test.Unit; @@ -71,6 +73,29 @@ public void CallingValidateRequiredChildrenCascadesToCollectionTypes() Assert.IsTrue(child.WasValidated); } + [TestMethod] + public async Task SetLayer_UsesCoreSetLayerHelper() + { + var coreJsModule = new TestJsObjectReference(); + var jsComponentReference = new TestJsObjectReference(); + var component = new TestMapComponent + { + CoreJsModule = coreJsModule, + JsComponentReference = jsComponentReference + }; + var layer = new GraphicsLayer(); + + await component.SetLayer(layer); + + Assert.HasCount(1, coreJsModule.Invocations); + TestJsInvocation invocation = coreJsModule.Invocations[0]; + Assert.AreEqual("setLayer", invocation.Identifier); + Assert.AreSame(jsComponentReference, invocation.Args[0]); + Assert.AreSame(layer, invocation.Args[1]); + Assert.IsEmpty(jsComponentReference.Invocations, + "SetLayer must not invoke a missing setLayer method on the JS component reference."); + } + private class TestMapComponent : MapComponent { public TestChildComponent? TestChildComponent { get; set; } @@ -166,4 +191,30 @@ public override void ValidateRequiredChildren() } private class NotAChildComponent : MapComponent; -} \ No newline at end of file + + private sealed class TestJsObjectReference : IJSObjectReference + { + public List Invocations { get; } = []; + + public ValueTask DisposeAsync() + { + return ValueTask.CompletedTask; + } + + public ValueTask InvokeAsync(string identifier, object?[]? args) + { + Invocations.Add(new TestJsInvocation(identifier, args ?? [])); + + return ValueTask.FromResult(default(TValue)!); + } + + public ValueTask InvokeAsync(string identifier, CancellationToken cancellationToken, object?[]? args) + { + Invocations.Add(new TestJsInvocation(identifier, args ?? [])); + + return ValueTask.FromResult(default(TValue)!); + } + } + + private sealed record TestJsInvocation(string Identifier, object?[] Args); +}