fix dashboard and conflicts

Author: arcenox

src/Directory.Build.props

@@ -8,8 +8,8 @@
         <PackageTags>ticker;queue;cron;time;scheduler;fire-and-forget</PackageTags>
         <PackageIcon>icon.jpg</PackageIcon>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-        <Version>9.1.0</Version>
-        <DotNetVersion>[10.0.0,11.0.0)</DotNetVersion>
+        <Version>9.1.1</Version>
+        <DotNetVersion>[9.0.0,10.0.0)</DotNetVersion>
         <LangVersion>default</LangVersion>
     </PropertyGroup>
 

src/TickerQ.Dashboard/TickerQ.Dashboard.csproj

@@ -1,10 +1,11 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>Library</OutputType>
         <IsPackable>true</IsPackable>
+        <DisableStaticWebAssets>true</DisableStaticWebAssets>
         <PackageId>TickerQ.Dashboard</PackageId>
-        <Description>Dashboard UI for visualizing and monitoring TickerQ scheduled jobs, status, and system metrics.</Description>
-        <PackageTags>$(PackageTags);dashboard;monitoring;scheduler;status;job;ui</PackageTags>
+        <Description>Dashboard UI for visualizing and monitoring TickerQ scheduled jobs.</Description>
+        <PackageTags>dashboard;monitoring;scheduler;ui</PackageTags>
         <PackageReadmeFile>README.md</PackageReadmeFile>
         <Nullable>enable</Nullable>
     </PropertyGroup>
@@ -18,21 +19,21 @@
     <ItemGroup>
         <None Include="README.md" Pack="true" PackagePath="" />
     </ItemGroup>
-
+    <ItemGroup>
+        <FrameworkReference Include="Microsoft.AspNetCore.App" />
+    </ItemGroup>
     <ItemGroup>
         <PackageReference Include="TickerQ.Utilities" Version="$(Version)" />
     </ItemGroup>
 
+    <!-- Prevent static web asset discovery -->
     <ItemGroup>
-        <EmbeddedResource Include="wwwroot\dist\**\*" />
+        <Content Remove="wwwroot\**\*" />
+        <None Remove="wwwroot\**\*" />
     </ItemGroup>
 
+    <!-- Embed the dashboard -->
     <ItemGroup>
-        <None Remove="wwwroot\src\**\*" />
-        <None Remove="wwwroot\node_modules\**\*" />
-        <None Remove="wwwroot\**\.vite\**\*" />
-        <None Remove="wwwroot\**\*.map" />
-        <None Remove="wwwroot\*" />
-        <None Remove="wwwroot\public\*" />
+        <EmbeddedResource Include="wwwroot\dist\**\*" />
     </ItemGroup>
 </Project>

src/TickerQ.EntityFrameworkCore/Infrastructure/BasePersistenceProvider.cs

@@ -130,13 +130,8 @@ public async Task UpdateTimeTickersWithUnifiedContext(Guid[] timeTickerIds, Inte
         await using var dbContext = await DbContextFactory.CreateDbContextAsync(cancellationToken).ConfigureAwait(false);;
         var idList = timeTickerIds.ToList();
         await dbContext.Set<TTimeTicker>()
-<<<<<<< HEAD
-            .Where(x => timeTickerIds.Contains(x.Id))
-            .ExecuteUpdateAsync(MappingExtensions.UpdateTimeTicker<TTimeTicker>(functionContext, _clock.UtcNow), cancellationToken).ConfigureAwait(false);
-=======
             .Where(x => idList.Contains(x.Id))
-            .ExecuteUpdateAsync(setter => setter.UpdateTimeTicker<TTimeTicker>(functionContext, _clock.UtcNow), cancellationToken).ConfigureAwait(false);
->>>>>>> 39b9b90 (Fix .NET 9+ EF Core query failures caused by ReadOnlySpan array.Contains() (#574))
+            .ExecuteUpdateAsync(MappingExtensions.UpdateTimeTicker<TTimeTicker>(functionContext, _clock.UtcNow), cancellationToken).ConfigureAwait(false);
     }
 
     public async Task<TimeTickerEntity[]> GetEarliestTimeTickers(CancellationToken cancellationToken)
@@ -567,13 +562,8 @@ public async Task UpdateCronTickerOccurrencesWithUnifiedContext(Guid[] cronOccur
         await using var dbContext = await DbContextFactory.CreateDbContextAsync(cancellationToken).ConfigureAwait(false);;
         var idList = cronOccurrenceIds.ToList();
         await dbContext.Set<CronTickerOccurrenceEntity<TCronTicker>>()
-<<<<<<< HEAD
-            .Where(x => cronOccurrenceIds.Contains(x.Id))
-            .ExecuteUpdateAsync(MappingExtensions.UpdateCronTickerOccurrence<TCronTicker>(functionContext), cancellationToken)
-=======
             .Where(x => idList.Contains(x.Id))
-            .ExecuteUpdateAsync(setter => setter.UpdateCronTickerOccurrence<TCronTicker>(functionContext), cancellationToken)
->>>>>>> 39b9b90 (Fix .NET 9+ EF Core query failures caused by ReadOnlySpan array.Contains() (#574))
+            .ExecuteUpdateAsync(MappingExtensions.UpdateCronTickerOccurrence<TCronTicker>(functionContext), cancellationToken)
             .ConfigureAwait(false);
     }