Skip to content

Commit 6ef2b7e

Browse files
committed
fix host deps
1 parent 77ef408 commit 6ef2b7e

2 files changed

Lines changed: 11 additions & 18 deletions

File tree

ModuleBase/build/OpenShock.Desktop.ModuleBase.targets

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@
2323
<OpenShockHostAssembly Include="Serilog.Sinks.File" Version="7.0.0" />
2424

2525
<!-- Microsoft.Extensions -->
26-
<OpenShockHostAssembly Include="Microsoft.Extensions.Hosting" Version="10.0.5" />
27-
<OpenShockHostAssembly Include="Microsoft.Extensions.Caching.Memory" Version="10.0.5" />
28-
<OpenShockHostAssembly Include="Microsoft.Extensions.Logging.Debug" Version="10.0.5" />
2926

3027
<!-- ASP.NET Core / SignalR -->
3128
<OpenShockHostAssembly Include="Microsoft.AspNetCore.SignalR.Client" Version="10.0.5" />
@@ -52,39 +49,26 @@
5249
<OpenShockHostAssembly Include="Microsoft.AspNetCore.SignalR.Client.Core" Version="10.0.5" />
5350
<OpenShockHostAssembly Include="Microsoft.AspNetCore.SignalR.Common" Version="10.0.5" />
5451
<OpenShockHostAssembly Include="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="10.0.5" />
55-
<OpenShockHostAssembly Include="Microsoft.Extensions.Caching.Abstractions" Version="10.0.5" />
5652
<OpenShockHostAssembly Include="Microsoft.Extensions.Configuration" Version="10.0.5" />
5753
<OpenShockHostAssembly Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.5" />
5854
<OpenShockHostAssembly Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.5" />
59-
<OpenShockHostAssembly Include="Microsoft.Extensions.Configuration.CommandLine" Version="10.0.5" />
60-
<OpenShockHostAssembly Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.5" />
61-
<OpenShockHostAssembly Include="Microsoft.Extensions.Configuration.FileExtensions" Version="10.0.5" />
62-
<OpenShockHostAssembly Include="Microsoft.Extensions.Configuration.Json" Version="10.0.5" />
63-
<OpenShockHostAssembly Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.5" />
6455
<OpenShockHostAssembly Include="Microsoft.Extensions.DependencyInjection" Version="10.0.5" />
6556
<OpenShockHostAssembly Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.5" />
6657
<OpenShockHostAssembly Include="Microsoft.Extensions.Diagnostics" Version="10.0.5" />
6758
<OpenShockHostAssembly Include="Microsoft.Extensions.Diagnostics.Abstractions" Version="10.0.5" />
6859
<OpenShockHostAssembly Include="Microsoft.Extensions.Features" Version="10.0.5" />
69-
<OpenShockHostAssembly Include="Microsoft.Extensions.FileProviders.Abstractions" Version="10.0.5" />
70-
<OpenShockHostAssembly Include="Microsoft.Extensions.FileProviders.Physical" Version="10.0.5" />
71-
<OpenShockHostAssembly Include="Microsoft.Extensions.FileSystemGlobbing" Version="10.0.5" />
72-
<OpenShockHostAssembly Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.5" />
60+
<OpenShockHostAssembly Include="Microsoft.Extensions.FileProviders.Abstractions" Version="10.0.0" />
61+
<OpenShockHostAssembly Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.0" />
7362
<OpenShockHostAssembly Include="Microsoft.Extensions.Localization" Version="10.0.1" />
7463
<OpenShockHostAssembly Include="Microsoft.Extensions.Localization.Abstractions" Version="10.0.1" />
7564
<OpenShockHostAssembly Include="Microsoft.Extensions.Logging" Version="10.0.5" />
7665
<OpenShockHostAssembly Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.5" />
77-
<OpenShockHostAssembly Include="Microsoft.Extensions.Logging.Configuration" Version="10.0.5" />
78-
<OpenShockHostAssembly Include="Microsoft.Extensions.Logging.Console" Version="10.0.5" />
79-
<OpenShockHostAssembly Include="Microsoft.Extensions.Logging.EventLog" Version="10.0.5" />
80-
<OpenShockHostAssembly Include="Microsoft.Extensions.Logging.EventSource" Version="10.0.5" />
8166
<OpenShockHostAssembly Include="Microsoft.Extensions.Options" Version="10.0.5" />
8267
<OpenShockHostAssembly Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="10.0.5" />
8368
<OpenShockHostAssembly Include="Microsoft.Extensions.Primitives" Version="10.0.5" />
8469
<OpenShockHostAssembly Include="Microsoft.Extensions.Validation" Version="10.0.5" />
8570
<OpenShockHostAssembly Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.1" />
8671
<OpenShockHostAssembly Include="Microsoft.JSInterop" Version="10.0.5" />
87-
<OpenShockHostAssembly Include="System.Diagnostics.EventLog" Version="10.0.5" />
8872
</ItemGroup>
8973

9074
<!-- Modules can override specific host assemblies to force-bundle them.

scripts/sync-host-deps.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,4 +256,13 @@ for name in $(echo "${!MISSING[@]}" | tr ' ' '\n' | sort); do
256256
fi
257257
done
258258

259+
# Remove entries that are no longer in the resolved host graph.
260+
# CI runs this script without --fix on every PR, so any accidental deletions
261+
# caused by a broken local restore will be caught before they merge.
262+
for entry in "${EXTRA[@]}"; do
263+
IFS='=' read -r name _ <<< "$entry"
264+
escaped_name=$(printf '%s' "$name" | sed 's/[.[\*^$/]/\\&/g')
265+
sed -i "/OpenShockHostAssembly\s\+Include=\"${escaped_name}\"\s\+Version=\"[^\"]*\"\s*\/>/d" "$TARGETS_FILE"
266+
done
267+
259268
echo "Done. Review the changes and commit."

0 commit comments

Comments
 (0)