From 7baac1dbfc0b1c677ef263ff037ac81c6d91f5fb Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期日, 22 十二月 2024 12:34:04 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/Yw.WinFrmUI.Core/Yw.WinFrmUI.Core.csproj | 38 ++++++++++++++++++++++++++++++++++----
1 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Core/Yw.WinFrmUI.Core.csproj b/WinFrmUI/Yw.WinFrmUI.Core/Yw.WinFrmUI.Core.csproj
index 0e940b3..58c0912 100644
--- a/WinFrmUI/Yw.WinFrmUI.Core/Yw.WinFrmUI.Core.csproj
+++ b/WinFrmUI/Yw.WinFrmUI.Core/Yw.WinFrmUI.Core.csproj
@@ -11,28 +11,58 @@
<ItemGroup>
<Compile Remove="00-basic\**" />
<Compile Remove="04-win-ui-core\**" />
- <Compile Remove="44-win-ui-core\**" />
<Compile Remove="99-models\**" />
<Compile Remove="bak\**" />
<EmbeddedResource Remove="00-basic\**" />
<EmbeddedResource Remove="04-win-ui-core\**" />
- <EmbeddedResource Remove="44-win-ui-core\**" />
<EmbeddedResource Remove="99-models\**" />
<EmbeddedResource Remove="bak\**" />
<None Remove="00-basic\**" />
<None Remove="04-win-ui-core\**" />
- <None Remove="44-win-ui-core\**" />
<None Remove="99-models\**" />
<None Remove="bak\**" />
<Page Remove="00-basic\**" />
<Page Remove="04-win-ui-core\**" />
- <Page Remove="44-win-ui-core\**" />
<Page Remove="99-models\**" />
<Page Remove="bak\**" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
+ <PackageReference Include="Yw.Untity.Core" Version="3.0.3" />
+ </ItemGroup>
+
+ <ItemGroup>
+ <Compile Update="03-wait\WaitFormStyle.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Update="09-common\06-search-import\GeneralSearchAndExportCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="09-common\04-search-select\GeneralSearchAndSelectCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="09-common\05-search-set-select\GeneralSearchAndSelectCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="09-common\07-search\GeneralSearchCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="11-tree\01-simple\SimpleTreeViewCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="Properties\Resources.Designer.cs">
+ <DesignTime>True</DesignTime>
+ <AutoGen>True</AutoGen>
+ <DependentUpon>Resources.resx</DependentUpon>
+ </Compile>
+ </ItemGroup>
+
+ <ItemGroup>
+ <EmbeddedResource Update="Properties\Resources.resx">
+ <Generator>ResXFileCodeGenerator</Generator>
+ <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+ </EmbeddedResource>
</ItemGroup>
</Project>
--
Gitblit v1.9.3