upgrade 29

2026-10-19 15:08:05 +08:00 · 2026-10-19 15:08:05 +08:00 · 4418217b01
commit 4418217b01
parent 1540a74d52
8 changed files with 45 additions and 66 deletions
--- a/Directory.Build.props
+++ b/Directory.Build.props
@ -1,9 +1,9 @@
 <Project>
-    <Import Project="Fake.Local.EventBus.props" Condition="Exists('Fake.Local.EventBus.props')" />
+    <Import Project="Fake.Local.props" Condition="Exists('Fake.Local.props')" />

    <PropertyGroup>
        <!-- All Fake packages -->
        <!-- 清本地nuget缓存：dotnet nuget locals -c http-cache -->
-        <FakePackageVersion>8.0.5.28</FakePackageVersion>
+        <FakePackageVersion>8.0.5.29</FakePackageVersion>
    </PropertyGroup>
 </Project>
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@ -0,0 +1,26 @@
+<Project>
+  <!--
+    UseLocalFake=true：每个 Fake.* PackageReference 换成本地工程。
+    NuGet 资产全部排除，避免同名 1.0.0.0 程序集盖掉本地输出。
+  -->
+  <ItemGroup Condition="'$(UseLocalFake)' == 'true'">
+    <PackageReference Update="Fake.*" ExcludeAssets="all" PrivateAssets="all" />
+    <_LocalFakeCandidate Include="@(PackageReference -> '$(FakeRepoRoot)\src\%(Identity)\%(Identity).csproj')" />
+    <_LocalFakeCandidate Include="@(PackageReference -> '$(FakeRepoRoot)\modules\rbac\%(Identity)\%(Identity).csproj')" />
+    <_LocalFakeCandidate Include="@(PackageReference -> '$(FakeRepoRoot)\modules\file-management\%(Identity)\%(Identity).csproj')" />
+    <!-- 变换会带上 PackageReference 的 ExcludeAssets/PrivateAssets，必须清掉，否则传递引用进不了编译。 -->
+    <ProjectReference Include="@(_LocalFakeCandidate)">
+      <ExcludeAssets></ExcludeAssets>
+      <PrivateAssets></PrivateAssets>
+    </ProjectReference>
+  </ItemGroup>
+
+  <Target Name="DropMissingLocalFakeProjects"
+          BeforeTargets="AssignProjectConfiguration"
+          Condition="'$(UseLocalFake)' == 'true'">
+    <ItemGroup>
+      <_MissingLocalFake Include="@(_LocalFakeCandidate)" Condition="!Exists('%(Identity)')" />
+      <ProjectReference Remove="@(_MissingLocalFake)" />
+    </ItemGroup>
+  </Target>
+</Project>
--- a/Fake.Local.EventBus.props
+++ b/Fake.Local.EventBus.props
@ -1,13 +0,0 @@
-<Project>
-  <!--
-    本地调试 Fake 框架模块：不发包，直接工程引用。
-    切回 NuGet：UseLocalFakeEventBus / UseLocalFakeModules = false
-  -->
-  <PropertyGroup>
-    <FakeRepoRoot Condition="'$(FakeRepoRoot)' == ''">C:\Users\BSI\RiderProjects\fake2</FakeRepoRoot>
-    <!-- EventBus / Dashboard / IntegrationEventLog -->
-    <UseLocalFakeEventBus Condition="'$(UseLocalFakeEventBus)' == ''">false</UseLocalFakeEventBus>
-    <!-- RBAC / FileManagement（表前缀 fk_ 等框架改动需同源） -->
-    <UseLocalFakeModules Condition="'$(UseLocalFakeModules)' == ''">false</UseLocalFakeModules>
-  </PropertyGroup>
-</Project>
--- a/Fake.Local.props
+++ b/Fake.Local.props
@ -0,0 +1,10 @@
+<Project>
+  <!--
+    UseLocalFake=true：所有 Fake.* 包改为引用 $(FakeRepoRoot) 下的本地工程。
+    UseLocalFake=false：全部走 NuGet（FakePackageVersion）。
+  -->
+  <PropertyGroup>
+    <FakeRepoRoot Condition="'$(FakeRepoRoot)' == ''">C:\Users\BSI\RiderProjects\fake2</FakeRepoRoot>
+    <UseLocalFake Condition="'$(UseLocalFake)' == ''">false</UseLocalFake>
+  </PropertyGroup>
+</Project>
--- a/SimpleAdmin.sln
+++ b/SimpleAdmin.sln
@ -16,7 +16,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "items", "items", "{BE5132AD
 		db.sql = db.sql
 		Directory.Build.props = Directory.Build.props
 		.gitea\workflows\deploy.yml = .gitea\workflows\deploy.yml
-		Fake.Local.EventBus.props = Fake.Local.EventBus.props
+		Fake.Local.props = Fake.Local.props
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleAdmin.Api", "src\SimpleAdmin.Api\SimpleAdmin.Api.csproj", "{229ED167-9ECC-4736-8DFB-522EEA8FF680}"
--- a/src/Oms.Application/Oms.Application.csproj
+++ b/src/Oms.Application/Oms.Application.csproj
@ -20,6 +20,11 @@
  <ItemGroup>
    <PackageReference Include="Fake.ObjectMapping.AutoMapper" Version="$(FakePackageVersion)" />
    <PackageReference Include="Fake.ObjectStorage" Version="$(FakePackageVersion)" />
+    <PackageReference Include="Fake.EventBus.IntegrationEventLog" Version="$(FakePackageVersion)" />
+    <PackageReference Include="Fake.EventBus.RabbitMQ" Version="$(FakePackageVersion)" />
+    <PackageReference Include="Fake.RabbitMQ" Version="$(FakePackageVersion)" />
+    <PackageReference Include="Fake.Rbac.Application" Version="$(FakePackageVersion)" />
+    <PackageReference Include="Fake.Rbac.Infrastructure" Version="$(FakePackageVersion)" />
    <PackageReference Include="DocumentFormat.OpenXml" Version="3.0.2" />
    <PackageReference Include="FreeRedis" Version="1.5.5" />
    <PackageReference Include="MailKit" Version="4.17.0" />
@ -30,29 +35,6 @@
    <PackageReference Include="ZXing.Net.Bindings.ImageSharp.V3" Version="0.16.15" />
  </ItemGroup>

-  <!-- EventBus / RabbitMQ：本地工程引用（调试） / NuGet（发包后） -->
-  <ItemGroup Condition="'$(UseLocalFakeEventBus)' == 'true'">
-    <ProjectReference Include="$(FakeRepoRoot)\src\Fake.EventBus\Fake.EventBus.csproj" />
-    <ProjectReference Include="$(FakeRepoRoot)\src\Fake.EventBus.RabbitMQ\Fake.EventBus.RabbitMQ.csproj" />
-    <ProjectReference Include="$(FakeRepoRoot)\src\Fake.EventBus.IntegrationEventLog\Fake.EventBus.IntegrationEventLog.csproj" />
-    <ProjectReference Include="$(FakeRepoRoot)\src\Fake.RabbitMQ\Fake.RabbitMQ.csproj" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(UseLocalFakeEventBus)' != 'true'">
-    <PackageReference Include="Fake.EventBus.IntegrationEventLog" Version="$(FakePackageVersion)" />
-    <PackageReference Include="Fake.EventBus.RabbitMQ" Version="$(FakePackageVersion)" />
-    <PackageReference Include="Fake.RabbitMQ" Version="$(FakePackageVersion)" />
-  </ItemGroup>
-
-  <!-- RBAC：本地工程（表前缀） / NuGet -->
-  <ItemGroup Condition="'$(UseLocalFakeModules)' == 'true'">
-    <ProjectReference Include="$(FakeRepoRoot)\modules\rbac\Fake.Rbac.Application\Fake.Rbac.Application.csproj" />
-    <ProjectReference Include="$(FakeRepoRoot)\modules\rbac\Fake.Rbac.Infrastructure\Fake.Rbac.Infrastructure.csproj" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(UseLocalFakeModules)' != 'true'">
-    <PackageReference Include="Fake.Rbac.Application" Version="$(FakePackageVersion)" />
-    <PackageReference Include="Fake.Rbac.Infrastructure" Version="$(FakePackageVersion)" />
-  </ItemGroup>
-
  <ItemGroup>
    <InternalsVisibleTo Include="Oms.Tests" />
  </ItemGroup>
--- a/src/Oms.Tests/Oms.Tests.csproj
+++ b/src/Oms.Tests/Oms.Tests.csproj
@ -15,13 +15,6 @@
    </PackageReference>
    <PackageReference Include="Fake.Autofac" Version="$(FakePackageVersion)" />
    <PackageReference Include="Fake.Testing" Version="$(FakePackageVersion)" />
-  </ItemGroup>
-
-  <!-- EventBus：与 Oms.Application / SimpleAdmin.Api 保持一致（本地工程或 NuGet） -->
-  <ItemGroup Condition="'$(UseLocalFakeEventBus)' == 'true'">
-    <ProjectReference Include="$(FakeRepoRoot)\src\Fake.EventBus.IntegrationEventLog\Fake.EventBus.IntegrationEventLog.csproj" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(UseLocalFakeEventBus)' != 'true'">
    <PackageReference Include="Fake.EventBus.IntegrationEventLog" Version="$(FakePackageVersion)" />
  </ItemGroup>

--- a/src/SimpleAdmin.Api/SimpleAdmin.Api.csproj
+++ b/src/SimpleAdmin.Api/SimpleAdmin.Api.csproj
@ -17,31 +17,12 @@
    <PackageReference Include="Fake.Consul" Version="$(FakePackageVersion)" />
    <PackageReference Include="Fake.ObjectStorage.TencentCos" Version="$(FakePackageVersion)" />
    <PackageReference Include="Fake.Serilog" Version="$(FakePackageVersion)" />
-    <PackageReference Include="Serilog.AspNetCore" Version="8.0.3" />
-  </ItemGroup>
-
-  <!-- EventBus：本地工程引用（调试） / NuGet（发包后） -->
-  <ItemGroup Condition="'$(UseLocalFakeEventBus)' == 'true'">
-    <ProjectReference Include="$(FakeRepoRoot)\src\Fake.EventBus\Fake.EventBus.csproj" />
-    <ProjectReference Include="$(FakeRepoRoot)\src\Fake.EventBus.IntegrationEventLog\Fake.EventBus.IntegrationEventLog.csproj" />
-    <ProjectReference Include="$(FakeRepoRoot)\src\Fake.EventBus.Dashboard\Fake.EventBus.Dashboard.csproj" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(UseLocalFakeEventBus)' != 'true'">
    <PackageReference Include="Fake.EventBus.IntegrationEventLog" Version="$(FakePackageVersion)" />
    <PackageReference Include="Fake.EventBus.Dashboard" Version="$(FakePackageVersion)" />
-  </ItemGroup>
-
-  <!-- RBAC / FileManagement：本地工程（表前缀 fk_ 等） / NuGet -->
-  <ItemGroup Condition="'$(UseLocalFakeModules)' == 'true'">
-    <ProjectReference Include="$(FakeRepoRoot)\modules\rbac\Fake.Rbac.Application\Fake.Rbac.Application.csproj" />
-    <ProjectReference Include="$(FakeRepoRoot)\modules\rbac\Fake.Rbac.Infrastructure\Fake.Rbac.Infrastructure.csproj" />
-    <ProjectReference Include="$(FakeRepoRoot)\modules\file-management\Fake.FileManagement.Application\Fake.FileManagement.Application.csproj" />
-    <ProjectReference Include="$(FakeRepoRoot)\modules\file-management\Fake.FileManagement.Infrastructure\Fake.FileManagement.Infrastructure.csproj" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(UseLocalFakeModules)' != 'true'">
    <PackageReference Include="Fake.FileManagement.Application" Version="$(FakePackageVersion)" />
    <PackageReference Include="Fake.FileManagement.Infrastructure" Version="$(FakePackageVersion)" />
    <PackageReference Include="Fake.Rbac.Application" Version="$(FakePackageVersion)" />
+    <PackageReference Include="Serilog.AspNetCore" Version="8.0.3" />
  </ItemGroup>

  <ItemGroup>