From 0a6c1d69626e7a9af49c76a73ef5ff8051ebf419 Mon Sep 17 00:00:00 2001
From: cloudflight <cloudflight@126.com>
Date: 星期三, 15 五月 2024 14:34:47 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/Yw/Hydro.V1.1
---
Hydraulic/Hydro.MapUI/Hydro.MapUI.csproj | 37 ++++++++++++++++++++++++++++++++++++-
1 files changed, 36 insertions(+), 1 deletions(-)
diff --git a/Hydraulic/Hydro.MapUI/Hydro.MapUI.csproj b/Hydraulic/Hydro.MapUI/Hydro.MapUI.csproj
index 4f86043..221636b 100644
--- a/Hydraulic/Hydro.MapUI/Hydro.MapUI.csproj
+++ b/Hydraulic/Hydro.MapUI/Hydro.MapUI.csproj
@@ -160,7 +160,6 @@
<EmbeddedResource Include="Map\DMap.resx">
<DependentUpon>DMap.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="Properties\licenses.licx" />
<EmbeddedResource Include="PropertyFrom.resx">
<DependentUpon>PropertyFrom.cs</DependentUpon>
</EmbeddedResource>
@@ -242,6 +241,42 @@
<Reference Include="Dapper, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Dapper.2.1.28\lib\net461\Dapper.dll</HintPath>
</Reference>
+ <Reference Include="DevExpress.Data.Desktop.v22.2, Version=22.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\..\bin\Debug\DevExpress.Data.Desktop.v22.2.dll</HintPath>
+ </Reference>
+ <Reference Include="DevExpress.Data.v22.2, Version=22.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\..\bin\Debug\DevExpress.Data.v22.2.dll</HintPath>
+ </Reference>
+ <Reference Include="DevExpress.Drawing.v22.2, Version=22.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\..\bin\Debug\DevExpress.Drawing.v22.2.dll</HintPath>
+ </Reference>
+ <Reference Include="DevExpress.Printing.v22.2.Core, Version=22.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\..\bin\Debug\DevExpress.Printing.v22.2.Core.dll</HintPath>
+ </Reference>
+ <Reference Include="DevExpress.Utils.v22.2, Version=22.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\..\bin\Debug\DevExpress.Utils.v22.2.dll</HintPath>
+ </Reference>
+ <Reference Include="DevExpress.XtraEditors.v22.2, Version=22.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\..\bin\Debug\DevExpress.XtraEditors.v22.2.dll</HintPath>
+ </Reference>
+ <Reference Include="DevExpress.XtraGrid.v22.2, Version=22.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\..\bin\Debug\DevExpress.XtraGrid.v22.2.dll</HintPath>
+ </Reference>
+ <Reference Include="DevExpress.XtraPrinting.v22.2, Version=22.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\..\bin\Debug\DevExpress.XtraPrinting.v22.2.dll</HintPath>
+ </Reference>
+ <Reference Include="DevExpress.XtraVerticalGrid.v22.2, Version=22.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\..\bin\Debug\DevExpress.XtraVerticalGrid.v22.2.dll</HintPath>
+ </Reference>
<Reference Include="MathNet.Numerics, Version=4.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\MathNet.Numerics.4.1.0\lib\net40\MathNet.Numerics.dll</HintPath>
</Reference>
--
Gitblit v1.9.3