冲突

Shuxia Ning

2025-01-08 687a3dfd095bc8c099b7fa6e65f0dc699fdc8f1d

 WinFrmUI/HStation.WinFrmUI.Auth.Core/HStation.WinFrmUI.Auth.Core.csproj

@@ -7,20 +7,46 @@
  </PropertyGroup>

  <ItemGroup>
    <Compile Remove="00-Control\**" />
    <Compile Remove="01-Role\**" />
    <Compile Remove="02-User\**" />
    <Compile Remove="03-Menu\**" />
    <Compile Remove="04-ViewModel\**" />
    <Compile Remove="FakesAssemblies\**" />
    <Compile Remove="Fakes\**" />
    <EmbeddedResource Remove="00-Control\**" />
    <EmbeddedResource Remove="01-Role\**" />
    <EmbeddedResource Remove="02-User\**" />
    <EmbeddedResource Remove="03-Menu\**" />
    <EmbeddedResource Remove="04-ViewModel\**" />
    <EmbeddedResource Remove="FakesAssemblies\**" />
    <EmbeddedResource Remove="Fakes\**" />
    <None Remove="00-Control\**" />
    <None Remove="01-Role\**" />
    <None Remove="02-User\**" />
    <None Remove="03-Menu\**" />
    <None Remove="04-ViewModel\**" />
    <None Remove="FakesAssemblies\**" />
    <None Remove="Fakes\**" />
    <Page Remove="00-Control\**" />
    <Page Remove="01-Role\**" />
    <Page Remove="02-User\**" />
    <Page Remove="03-Menu\**" />
    <Page Remove="04-ViewModel\**" />
    <Page Remove="FakesAssemblies\**" />
    <Page Remove="Fakes\**" />
  </ItemGroup>

  <ItemGroup>
    <PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
    <PackageReference Include="Microsoft.QualityTools.Testing.Fakes" Version="17.5.0-beta.23060.1" />
    <PackageReference Include="Yw.BLL.Auth.Core" Version="3.2.9" />
  </ItemGroup>

  <ItemGroup>
    <ProjectReference Include="..\..\BLL\HStation.BLL.Organize.Core\HStation.BLL.Organize.Core.csproj" />
    <ProjectReference Include="..\Yw.WinFrmUI.Core\Yw.WinFrmUI.Core.csproj" />
    <ProjectReference Include="..\HStation.WinFrmUI.Basic.Core\HStation.WinFrmUI.Basic.Core.csproj" />
    <ProjectReference Include="..\HStation.WinFrmUI.Core\HStation.WinFrmUI.Core.csproj" />
  </ItemGroup>

  <ItemGroup>
@@ -28,6 +54,48 @@
  </ItemGroup>

  <ItemGroup>
    <Compile Remove="02-role\ViewRoleDlg.cs" />
    <Compile Remove="02-role\ViewRoleDlg.Designer.cs" />
    <Compile Remove="03-user\ViewUserDlg.cs" />
    <Compile Remove="03-user\ViewUserDlg.Designer.cs" />
    <Compile Remove="RoleMainPanel.cs" />
    <Compile Remove="RoleMainPanel.Designer.cs" />
  </ItemGroup>

  <ItemGroup>
    <EmbeddedResource Remove="02-role\ViewRoleDlg.resx" />
    <EmbeddedResource Remove="03-user\ViewUserDlg.resx" />
    <EmbeddedResource Remove="RoleMainPanel.resx" />
  </ItemGroup>

  <ItemGroup>
    <Compile Update="01-menu\AddMenuDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="01-menu\EditMenuDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="01-menu\MenuMgrPage.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="01-menu\ViewMenuDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-user\AddUserDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-user\EditUserDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="03-user\UserMgrPage.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="02-role\RoleMgrPage.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="04-role-projcet-menu\RoleTreeListCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="Properties\Resources.Designer.cs">
      <DesignTime>True</DesignTime>
      <AutoGen>True</AutoGen>