Skip to content

Commit 63bb707

Browse files
hueifengclaude
andcommitted
refactor(Core): 折叠 6 段 TFM 条件 ItemGroup 为 2 段
违反架构不变量:csproj 重复了 props 已表达的 TFM 维度。 原状:6 段几乎相同的 ItemGroup 表达 6 个 TFM。 - ns2.0 / ns2.1 各 1 段(几乎完全相同,差异在 System.Runtime.Loader 都引入) - net6/7/8/10 各 1 段(完全相同,都是同 2 个包) 折叠后:2 段。 - ns2.x 段(OR 条件):引入 3 个包(含 System.Runtime.Loader) - 其余 .NET 段(AND-NOT 条件):引入 2 个包 dotnet list package --include-transitive 验证所有 TFM 仍拿到正确版本: - ns2.0 → 2.2.0 / 3.1.6 / 4.3.0 - ns2.1 → 3.1.2 / 3.1.6 / 4.3.0 - net6 → 6.0.0 / 6.0.0 - net7 → 7.0.0 / 7.0.0 - net8 → 8.0.0 / 8.0.0 - net10 → 10.0.0 / 10.0.0 未来新增 TFM (e.g. net11) 只需在 props 加 Update 段,csproj 无需改。 Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
1 parent 322c5c7 commit 63bb707

1 file changed

Lines changed: 4 additions & 26 deletions

File tree

src/Magicodes.ExporterAndImporter.Core/Magicodes.IE.Core.csproj

Lines changed: 4 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -6,42 +6,20 @@
66
<ItemGroup>
77
<PackageReference Include="System.ComponentModel.Annotations" />
88
</ItemGroup>
9-
<!-- netstandard2.0 依赖 -->
10-
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
11-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
12-
<PackageReference Include="Microsoft.Extensions.DependencyModel" />
13-
<PackageReference Include="System.Runtime.Loader" />
14-
</ItemGroup>
159

16-
<!-- netstandard2.1 依赖 -->
17-
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
10+
<!-- netstandard 2.x 依赖 (System.Runtime.Loader 仅 ns2.0+ 需要) -->
11+
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'netstandard2.1' ">
1812
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
1913
<PackageReference Include="Microsoft.Extensions.DependencyModel" />
2014
<PackageReference Include="System.Runtime.Loader" />
2115
</ItemGroup>
2216

23-
24-
<!-- .NET 6.0+ 依赖 -->
25-
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
26-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
27-
<PackageReference Include="Microsoft.Extensions.DependencyModel" />
28-
</ItemGroup>
29-
30-
<ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
31-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
32-
<PackageReference Include="Microsoft.Extensions.DependencyModel" />
33-
</ItemGroup>
34-
35-
<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
17+
<!-- .NET 6+ 依赖 -->
18+
<ItemGroup Condition=" '$(TargetFramework)' != 'netstandard2.0' AND '$(TargetFramework)' != 'netstandard2.1' ">
3619
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
3720
<PackageReference Include="Microsoft.Extensions.DependencyModel" />
3821
</ItemGroup>
3922

40-
<ItemGroup Condition=" '$(TargetFramework)' == 'net10.0' ">
41-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
42-
<PackageReference Include="Microsoft.Extensions.DependencyModel" />
43-
</ItemGroup>
44-
4523
<ItemGroup>
4624
<Compile Update="Resource.Designer.cs">
4725
<DesignTime>True</DesignTime>

0 commit comments

Comments
 (0)