Skip to content
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
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
1 change: 1 addition & 0 deletions BootstrapBlazor.slnx
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
<File Path="scripts/windows/push.ps1" />
</Folder>
<Folder Name="/src/">
<Project Path="../BootstrapBlazor.Extensions/src/components/BootstrapBlazor.DockView/BootstrapBlazor.DockView.csproj" />
<Project Path="src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj" />
<Project Path="src/BootstrapBlazor/BootstrapBlazor.csproj" />
</Folder>
Expand Down
3 changes: 2 additions & 1 deletion src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<PackageReference Include="BootstrapBlazor.CherryMarkdown" Version="10.0.1" />
<PackageReference Include="BootstrapBlazor.CodeEditor" Version="10.0.0" />
<PackageReference Include="BootstrapBlazor.Dock" Version="10.0.0" />
<PackageReference Include="BootstrapBlazor.DockView" Version="10.0.7" />
<PackageReference Include="BootstrapBlazor.DockView" Version="10.0.8-beta03" />
Copy link

Copilot AI Apr 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This project now references BootstrapBlazor.DockView twice (PackageReference here and a ProjectReference later in the file). Referencing the same assembly from both NuGet and a project typically causes duplicate/ambiguous type conflicts at compile time. Choose a single source (prefer PackageReference for CI), or gate the ProjectReference behind a Condition and remove the PackageReference when the project reference is enabled.

Copilot uses AI. Check for mistakes.
<PackageReference Include="BootstrapBlazor.Dom2Image" Version="10.0.1" />
<PackageReference Include="BootstrapBlazor.DriverJs" Version="10.0.1" />
<PackageReference Include="BootstrapBlazor.ElementIcon" Version="10.0.0" />
Expand Down Expand Up @@ -92,6 +92,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\BootstrapBlazor.Extensions\src\components\BootstrapBlazor.DockView\BootstrapBlazor.DockView.csproj" />
<ProjectReference Include="..\BootstrapBlazor\BootstrapBlazor.csproj" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@page "/dock-view2/col"
@page "/dock-view2/col"
@inherits BaseDockView

<h3>@Localizer["DockViewColTitle"]</h3>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
@page "/dock-view2/group"
@page "/dock-view2/group"
@inherits BaseDockView

<h3>@Localizer["DockViewGroupTitle"]</h3>

<h4>@((MarkupString)Localizer["DockViewGroupIntro"].Value)</h4>

<DockViewV2 Name="DockViewV2LayoutGroup" class="dockview-demo">
<DockViewV2 Name="DockViewV2LayoutGroup" class="dockview-demo" EnableLocalStorage="false">
<DockViewContent Type="DockViewContentType.Row">
<DockViewContent Type="DockViewContentType.Group">
<DockViewComponent Key="tab1" Title="标签一">
Expand Down
Loading