Skip to content

feat(TargetFramework): support net10 #7100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Nov 12, 2025
Merged

feat(TargetFramework): support net10 #7100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ed637d5
refactor: 精简单元测试配置
ArgoZhang Nov 11, 2025
586d73d
chore: 更新框架为 net10
ArgoZhang Nov 11, 2025
d9dff4c
chore: 更新解决方案配置
ArgoZhang Nov 11, 2025
e6a99ac
refactor: 精简代码
ArgoZhang Nov 11, 2025
6a48f4d
refactor: 增加逻辑不是当前月日期不参与 Range
ArgoZhang Nov 11, 2025
69e9024
Merge branch 'main' into feat-net10
ArgoZhang Nov 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions BootstrapBlazor.slnx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,7 @@
<Folder Name="/configuration/">
<File Path=".editorconfig" />
<File Path=".gitignore" />
<File Path="Directory.Build.props" />
<File Path="exclusion.dic" />
<File Path="Framework.props" />
<File Path="Version.props" />
</Folder>
<Folder Name="/docs/">
<File Path="README.md" />
Expand All @@ -28,6 +25,11 @@
<File Path="localization/uk-UA.json" />
<File Path="localization/zh-TW.json" />
</Folder>
<Folder Name="/props/">
<File Path="Directory.Build.props" />
<File Path="Framework.props" />
<File Path="Version.props" />
</Folder>
<Folder Name="/scripts/" />
<Folder Name="/scripts/linux/">
<File Path="scripts/linux/ba.blazor.service" />
Expand Down Expand Up @@ -55,12 +57,20 @@
<Project Path="src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj" />
<Project Path="src/BootstrapBlazor/BootstrapBlazor.csproj" />
</Folder>
<Folder Name="/src/props/">
<File Path="src/Directory.Build.props" />
<File Path="src/Logo.props" />
<File Path="src/SourceLink.targets" />
</Folder>
<Folder Name="/test/">
<Project Path="test/UniTest.Sass/UniTest.Sass.csproj" />
<Project Path="test/UnitTest.Localization/UnitTest.Localization.csproj" />
<Project Path="test/UnitTest/UnitTest.csproj" />
<Project Path="test/UnitTestDocs/UnitTestDocs.csproj" />
</Folder>
<Folder Name="/test/props/">
<File Path="test/Directory.Build.props" />
</Folder>
<Folder Name="/tools/">
<Project Path="tools/Benchmarks/UnitTest.Benchmarks.csproj" />
</Folder>
Expand Down
7 changes: 1 addition & 6 deletions Version.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
<Project>

<PropertyGroup Condition="'$(VisualStudioVersion)' == '17.0'">
<RunTargetFramework>net9.0</RunTargetFramework>
<RunTargetFrameworks>net6.0;net7.0;net8.0;net9.0</RunTargetFrameworks>
</PropertyGroup>

<PropertyGroup Condition="'$(VisualStudioVersion)' == '18.0'">
<PropertyGroup>
<RunTargetFramework>net10.0</RunTargetFramework>
<RunTargetFrameworks>net6.0;net7.0;net8.0;net9.0;net10.0</RunTargetFrameworks>
</PropertyGroup>
Expand Down
8 changes: 2 additions & 6 deletions src/BootstrapBlazor/BootstrapBlazor.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">

<PropertyGroup Condition="'$(VisualStudioVersion)' == '17.0'">
<Version>9.12.2-beta03</Version>
</PropertyGroup>

<PropertyGroup Condition="'$(VisualStudioVersion)' == '18.0'">
<Version>10.0.0-rc.2.2.5</Version>
<PropertyGroup>
<Version>10.0.0</Version>
</PropertyGroup>

<ItemGroup>
Expand Down
17 changes: 13 additions & 4 deletions test/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,20 @@
</PropertyGroup>

<ItemGroup>
<Using Include="BootstrapBlazor.Components"/>
<Using Include="Bunit"/>
<Using Include="Microsoft.AspNetCore.Components"/>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.*" />
<PackageReference Include="xunit" Version="2.*" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.*">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="6.*">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
<Using Include="System.Diagnostics.CodeAnalysis"/>
<Using Include="UnitTest.Core"/>
<Using Include="Xunit"/>
<Using Include="Xunit.Abstractions"/>
</ItemGroup>
Expand Down
20 changes: 0 additions & 20 deletions test/UniTest.Sass/UniTest.Sass.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,3 @@
<Project Sdk="Microsoft.NET.Sdk">

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.*" />
<PackageReference Include="xunit" Version="2.*" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.*">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="6.*">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
<Using Remove="BootstrapBlazor.Components" />
<Using Remove="Bunit" />
<Using Remove="Microsoft.AspNetCore.Components" />
<Using Remove="UnitTest.Core" />
</ItemGroup>

</Project>
19 changes: 8 additions & 11 deletions test/UnitTest.Localization/UnitTest.Localization.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<ItemGroup>
<Compile Include="..\..\src\BootstrapBlazor.Server\Data\Foo.cs" Link="Mics\Foo.cs" />
Expand All @@ -9,16 +9,6 @@

<ItemGroup>
<PackageReference Include="bunit" Version="1.*" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.*" />
<PackageReference Include="xunit" Version="2.*" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.*">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="6.*">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
Expand All @@ -40,4 +30,11 @@
<ProjectReference Include="..\..\src\BootstrapBlazor\BootstrapBlazor.csproj" />
</ItemGroup>

<ItemGroup>
<Using Include="BootstrapBlazor.Components"/>
<Using Include="Bunit"/>
<Using Include="Microsoft.AspNetCore.Components"/>
<Using Include="UnitTest.Core"/>
</ItemGroup>

</Project>
19 changes: 8 additions & 11 deletions test/UnitTest/UnitTest.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<ItemGroup>
<PackageReference Include="bunit" Version="1.*" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.*" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.*" />
<PackageReference Include="xunit" Version="2.*" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.*">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="6.*">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
Expand Down Expand Up @@ -58,4 +48,11 @@
</None>
</ItemGroup>

<ItemGroup>
<Using Include="BootstrapBlazor.Components"/>
<Using Include="Bunit"/>
<Using Include="Microsoft.AspNetCore.Components"/>
<Using Include="UnitTest.Core"/>
</ItemGroup>

</Project>
20 changes: 0 additions & 20 deletions test/UnitTestDocs/UnitTestDocs.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<IsPackable>false</IsPackable>
<IsTestProject>true</IsTestProject>
</PropertyGroup>

<ItemGroup>
<Compile Include="..\..\src\BootstrapBlazor.Server\Extensions\MenusLocalizerExtensions.cs" Link="Extensions\MenusLocalizerExtensions.cs" />
<Compile Include="..\..\src\BootstrapBlazor.Server\Services\MenuService.cs" Link="Services\MenuService.cs" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.*" />
<PackageReference Include="xunit" Version="2.*" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.*">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="6.*">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
<Using Include="BootstrapBlazor.Components" />
<Using Include="BootstrapBlazor.Server.Components" />
Expand All @@ -32,8 +14,6 @@
<Using Include="Microsoft.AspNetCore.Components" />
<Using Include="Microsoft.Extensions.Localization" />
<Using Include="System.ComponentModel.DataAnnotations" />
<Using Remove="Bunit" />
<Using Remove="UnitTest.Core" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading