From 8dfc8d054b5b14e3fcde6415dd22cedf10c09915 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期二, 05 十一月 2024 14:13:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
DevApp/Gs.DevApp/Gs.DevApp.csproj | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 8a27c39..ba7bffa 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -419,6 +419,12 @@
<Compile Include="TestForm\XtraForm1.Designer.cs">
<DependentUpon>XtraForm1.cs</DependentUpon>
</Compile>
+ <Compile Include="TestForm\XtraForm2.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="TestForm\XtraForm2.Designer.cs">
+ <DependentUpon>XtraForm2.cs</DependentUpon>
+ </Compile>
<Compile Include="ToolBox\LogHelper.cs" />
<Compile Include="ToolBox\MsgHelper.cs" />
<Compile Include="ToolBox\UpdateParentEventArgs.cs" />
@@ -500,6 +506,12 @@
</Compile>
<Compile Include="UserControl\UcToolBarMenu.Designer.cs">
<DependentUpon>UcToolBarMenu.cs</DependentUpon>
+ </Compile>
+ <Compile Include="UserControl\UCUpFile.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="UserControl\UCUpFile.Designer.cs">
+ <DependentUpon>UCUpFile.cs</DependentUpon>
</Compile>
<Compile Include="UserControl\XtraUserControl1.cs">
<SubType>UserControl</SubType>
@@ -625,6 +637,9 @@
<EmbeddedResource Include="TestForm\XtraForm1.resx">
<DependentUpon>XtraForm1.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="TestForm\XtraForm2.resx">
+ <DependentUpon>XtraForm2.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="UserControl\SelectCgMx.resx">
<DependentUpon>SelectCgMx.cs</DependentUpon>
</EmbeddedResource>
@@ -664,6 +679,9 @@
<EmbeddedResource Include="UserControl\UcToolBarMenu.resx">
<DependentUpon>UcToolBarMenu.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="UserControl\UCUpFile.resx">
+ <DependentUpon>UCUpFile.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="UserControl\XtraUserControl1.resx">
<DependentUpon>XtraUserControl1.cs</DependentUpon>
</EmbeddedResource>
--
Gitblit v1.9.3