From f27cfedfc3cbe9b448319f9bdfc93b3ae817b21a Mon Sep 17 00:00:00 2001 From: lu <123456> Date: 星期五, 11 七月 2025 09:13:52 +0800 Subject: [PATCH] 首检 --- DevApp/Gs.DevApp/Gs.DevApp.csproj | 98 ++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 81 insertions(+), 17 deletions(-) diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj index cc74be8..eacfe6d 100644 --- a/DevApp/Gs.DevApp/Gs.DevApp.csproj +++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj @@ -1,7 +1,7 @@ 锘�<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\packages\CefSharp.Common.129.0.110\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.129.0.110\build\CefSharp.Common.props')" /> - <Import Project="..\packages\chromiumembeddedframework.runtime.win-x86.129.0.11\build\chromiumembeddedframework.runtime.win-x86.props" Condition="Exists('..\packages\chromiumembeddedframework.runtime.win-x86.129.0.11\build\chromiumembeddedframework.runtime.win-x86.props')" /> - <Import Project="..\packages\chromiumembeddedframework.runtime.win-x64.129.0.11\build\chromiumembeddedframework.runtime.win-x64.props" Condition="Exists('..\packages\chromiumembeddedframework.runtime.win-x64.129.0.11\build\chromiumembeddedframework.runtime.win-x64.props')" /> + <Import Project="..\packages\CefSharp.Common.109.1.110\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.109.1.110\build\CefSharp.Common.props')" /> + <Import Project="..\packages\cef.redist.x86.109.1.11\build\cef.redist.x86.props" Condition="Exists('..\packages\cef.redist.x86.109.1.11\build\cef.redist.x86.props')" /> + <Import Project="..\packages\cef.redist.x64.109.1.11\build\cef.redist.x64.props" Condition="Exists('..\packages\cef.redist.x64.109.1.11\build\cef.redist.x64.props')" /> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">x86</Platform> @@ -63,14 +63,14 @@ <Reference Include="AutoUpdater.NET, Version=1.9.2.0, Culture=neutral, PublicKeyToken=501435c91b35f4bc, processorArchitecture=MSIL"> <HintPath>..\packages\Autoupdater.NET.Official.1.9.2\lib\net462\AutoUpdater.NET.dll</HintPath> </Reference> - <Reference Include="CefSharp, Version=129.0.110.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL"> - <HintPath>..\packages\CefSharp.Common.129.0.110\lib\net462\CefSharp.dll</HintPath> + <Reference Include="CefSharp, Version=109.1.110.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL"> + <HintPath>..\packages\CefSharp.Common.109.1.110\lib\net452\CefSharp.dll</HintPath> </Reference> - <Reference Include="CefSharp.Core, Version=129.0.110.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL"> - <HintPath>..\packages\CefSharp.Common.129.0.110\lib\net462\CefSharp.Core.dll</HintPath> + <Reference Include="CefSharp.Core, Version=109.1.110.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL"> + <HintPath>..\packages\CefSharp.Common.109.1.110\lib\net452\CefSharp.Core.dll</HintPath> </Reference> - <Reference Include="CefSharp.WinForms, Version=129.0.110.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL"> - <HintPath>..\packages\CefSharp.WinForms.129.0.110\lib\net462\CefSharp.WinForms.dll</HintPath> + <Reference Include="CefSharp.WinForms, Version=109.1.110.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL"> + <HintPath>..\packages\CefSharp.WinForms.109.1.110\lib\net462\CefSharp.WinForms.dll</HintPath> </Reference> <Reference Include="DevExpress.BonusSkins.v22.2" /> <Reference Include="DevExpress.Charts.v22.2.Core, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" /> @@ -120,9 +120,6 @@ </Reference> <Reference Include="NModbus, Version=3.0.81.0, Culture=neutral, processorArchitecture=MSIL"> <HintPath>..\packages\NModbus.3.0.81\lib\net46\NModbus.dll</HintPath> - </Reference> - <Reference Include="Oracle.ManagedDataAccess, Version=4.122.23.1, Culture=neutral, PublicKeyToken=89b483f429c47342, processorArchitecture=MSIL"> - <HintPath>..\packages\Oracle.ManagedDataAccess.23.6.0\lib\net472\Oracle.ManagedDataAccess.dll</HintPath> </Reference> <Reference Include="PresentationCore" /> <Reference Include="PresentationFramework" /> @@ -305,6 +302,12 @@ <Compile Include="DevFrm\Ck\Frm_MesSctkSqDj.Designer.cs"> <DependentUpon>Frm_MesSctkSqDj.cs</DependentUpon> </Compile> + <Compile Include="DevFrm\Ck\Frm_MesYanTui.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\Ck\Frm_MesYanTui.Designer.cs"> + <DependentUpon>Frm_MesYanTui.cs</DependentUpon> + </Compile> <Compile Include="DevFrm\Ck\SelectSctk.cs"> <SubType>Form</SubType> </Compile> @@ -370,6 +373,12 @@ </Compile> <Compile Include="DevFrm\FrmMain.Designer.cs"> <DependentUpon>FrmMain.cs</DependentUpon> + </Compile> + <Compile Include="DevFrm\IPQC\Frm_ShouJianDetect01H5.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\IPQC\Frm_ShouJianDetect01H5.Designer.cs"> + <DependentUpon>Frm_ShouJianDetect01H5.cs</DependentUpon> </Compile> <Compile Include="DevFrm\IPQC\Frm_XunJianDetect01Show.cs"> <SubType>Form</SubType> @@ -674,6 +683,24 @@ <Compile Include="DevFrm\Rpt\CkYtmx.Designer.cs"> <DependentUpon>CkYtmx.cs</DependentUpon> </Compile> + <Compile Include="DevFrm\Rpt\Frm_MesQL.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\Rpt\Frm_MesQL.Designer.cs"> + <DependentUpon>Frm_MesQL.cs</DependentUpon> + </Compile> + <Compile Include="DevFrm\Rpt\QLCX.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\Rpt\QLCX.Designer.cs"> + <DependentUpon>QLCX.cs</DependentUpon> + </Compile> + <Compile Include="DevFrm\Rpt\WomShjh.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\Rpt\WomShjh.Designer.cs"> + <DependentUpon>WomShjh.cs</DependentUpon> + </Compile> <Compile Include="DevFrm\Sales\Frm_SalesDeliverDj.cs"> <SubType>Form</SubType> </Compile> @@ -715,6 +742,12 @@ </Compile> <Compile Include="DevFrm\Sys\EasyRptEdtShow.Designer.cs"> <DependentUpon>EasyRptEdtShow.cs</DependentUpon> + </Compile> + <Compile Include="DevFrm\Sys\Frm_Config.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\Sys\Frm_Config.Designer.cs"> + <DependentUpon>Frm_Config.cs</DependentUpon> </Compile> <Compile Include="DevFrm\User\ViewRole.cs"> <SubType>Form</SubType> @@ -932,6 +965,12 @@ </Compile> <Compile Include="DevFrm\WOM\Frm_MesWorkProd.Designer.cs"> <DependentUpon>Frm_MesWorkProd.cs</DependentUpon> + </Compile> + <Compile Include="DevFrm\WOM\Frm_WomFanGong.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\WOM\Frm_WomFanGong.Designer.cs"> + <DependentUpon>Frm_WomFanGong.cs</DependentUpon> </Compile> <Compile Include="DevFrm\WOM\ShowJieAn.cs"> <SubType>Form</SubType> @@ -1452,6 +1491,9 @@ <EmbeddedResource Include="DevFrm\Ck\Frm_MesSctkSqDj.resx"> <DependentUpon>Frm_MesSctkSqDj.cs</DependentUpon> </EmbeddedResource> + <EmbeddedResource Include="DevFrm\Ck\Frm_MesYanTui.resx"> + <DependentUpon>Frm_MesYanTui.cs</DependentUpon> + </EmbeddedResource> <EmbeddedResource Include="DevFrm\Ck\SelectSctk.resx"> <DependentUpon>SelectSctk.cs</DependentUpon> </EmbeddedResource> @@ -1494,6 +1536,9 @@ </EmbeddedResource> <EmbeddedResource Include="DevFrm\IPQC\Frm_ShouJianDetect01.resx"> <DependentUpon>Frm_ShouJianDetect01.cs</DependentUpon> + </EmbeddedResource> + <EmbeddedResource Include="DevFrm\IPQC\Frm_ShouJianDetect01H5.resx"> + <DependentUpon>Frm_ShouJianDetect01H5.cs</DependentUpon> </EmbeddedResource> <EmbeddedResource Include="DevFrm\IPQC\Frm_XunJianDetect01.resx"> <DependentUpon>Frm_XunJianDetect01.cs</DependentUpon> @@ -1606,6 +1651,12 @@ <EmbeddedResource Include="DevFrm\Rpt\CkYtmx.resx"> <DependentUpon>CkYtmx.cs</DependentUpon> </EmbeddedResource> + <EmbeddedResource Include="DevFrm\Rpt\Frm_MesQL.resx"> + <DependentUpon>Frm_MesQL.cs</DependentUpon> + </EmbeddedResource> + <EmbeddedResource Include="DevFrm\Rpt\QLCX.resx"> + <DependentUpon>QLCX.cs</DependentUpon> + </EmbeddedResource> <EmbeddedResource Include="DevFrm\Sales\Frm_SalesDeliverDj.resx"> <DependentUpon>Frm_SalesDeliverDj.cs</DependentUpon> </EmbeddedResource> @@ -1626,6 +1677,9 @@ </EmbeddedResource> <EmbeddedResource Include="DevFrm\Sys\EasyRptEdtShow.resx"> <DependentUpon>EasyRptEdtShow.cs</DependentUpon> + </EmbeddedResource> + <EmbeddedResource Include="DevFrm\Sys\Frm_Config.resx"> + <DependentUpon>Frm_Config.cs</DependentUpon> </EmbeddedResource> <EmbeddedResource Include="DevFrm\User\ViewRole.resx"> <DependentUpon>ViewRole.cs</DependentUpon> @@ -1729,6 +1783,9 @@ </EmbeddedResource> <EmbeddedResource Include="DevFrm\WOM\Frm_MesWorkProd.resx"> <DependentUpon>Frm_MesWorkProd.cs</DependentUpon> + </EmbeddedResource> + <EmbeddedResource Include="DevFrm\WOM\Frm_WomFanGong.resx"> + <DependentUpon>Frm_WomFanGong.cs</DependentUpon> </EmbeddedResource> <EmbeddedResource Include="DevFrm\WOM\ShowJieAn.resx"> <DependentUpon>ShowJieAn.cs</DependentUpon> @@ -2241,6 +2298,13 @@ <None Include="Resources\dayview_32x32.png" /> <None Include="Resources\dayview_16x16.png" /> <None Include="Resources\addfile_32x32.png" /> + <None Include="Resources\fullstackedbar3d_16x16.png" /> + <None Include="Resources\bofolder_16x16.png" /> + <None Include="Resources\insert_16x16.png" /> + <None Include="Resources\pie.svg" /> + <None Include="Resources\useinformula_16x16.png" /> + <None Include="Resources\boposition2_16x162.png" /> + <None Include="Resources\apply_16x16.png" /> <Content Include="Resources\user_16x16.png" /> </ItemGroup> <ItemGroup /> @@ -2263,12 +2327,12 @@ <ErrorText>杩欏彴璁$畻鏈轰笂缂哄皯姝ら」鐩紩鐢ㄧ殑 NuGet 绋嬪簭鍖呫�備娇鐢ㄢ�淣uGet 绋嬪簭鍖呰繕鍘熲�濆彲涓嬭浇杩欎簺绋嬪簭鍖呫�傛湁鍏虫洿澶氫俊鎭紝璇峰弬瑙� http://go.microsoft.com/fwlink/?LinkID=322105銆傜己灏戠殑鏂囦欢鏄� {0}銆�</ErrorText> </PropertyGroup> <Error Condition="!Exists('..\packages\Microsoft.Web.WebView2.1.0.2592.51\build\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Web.WebView2.1.0.2592.51\build\Microsoft.Web.WebView2.targets'))" /> - <Error Condition="!Exists('..\packages\chromiumembeddedframework.runtime.win-x64.129.0.11\build\chromiumembeddedframework.runtime.win-x64.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\chromiumembeddedframework.runtime.win-x64.129.0.11\build\chromiumembeddedframework.runtime.win-x64.props'))" /> - <Error Condition="!Exists('..\packages\chromiumembeddedframework.runtime.win-x86.129.0.11\build\chromiumembeddedframework.runtime.win-x86.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\chromiumembeddedframework.runtime.win-x86.129.0.11\build\chromiumembeddedframework.runtime.win-x86.props'))" /> - <Error Condition="!Exists('..\packages\CefSharp.Common.129.0.110\build\CefSharp.Common.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Common.129.0.110\build\CefSharp.Common.props'))" /> - <Error Condition="!Exists('..\packages\CefSharp.Common.129.0.110\build\CefSharp.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Common.129.0.110\build\CefSharp.Common.targets'))" /> + <Error Condition="!Exists('..\packages\cef.redist.x64.109.1.11\build\cef.redist.x64.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\cef.redist.x64.109.1.11\build\cef.redist.x64.props'))" /> + <Error Condition="!Exists('..\packages\cef.redist.x86.109.1.11\build\cef.redist.x86.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\cef.redist.x86.109.1.11\build\cef.redist.x86.props'))" /> + <Error Condition="!Exists('..\packages\CefSharp.Common.109.1.110\build\CefSharp.Common.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Common.109.1.110\build\CefSharp.Common.props'))" /> + <Error Condition="!Exists('..\packages\CefSharp.Common.109.1.110\build\CefSharp.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Common.109.1.110\build\CefSharp.Common.targets'))" /> </Target> - <Import Project="..\packages\CefSharp.Common.129.0.110\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.129.0.110\build\CefSharp.Common.targets')" /> + <Import Project="..\packages\CefSharp.Common.109.1.110\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.109.1.110\build\CefSharp.Common.targets')" /> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. Other similar extension points exist, see Microsoft.Common.targets. <Target Name="BeforeBuild"> -- Gitblit v1.9.3