HStation/XHS.V1.0.git

			@@ -16,8 +16,7 @@
			<Compile Remove="03-simulation\07-matching\07-fourlink\01-fourlinksinglematching\**" />
			<Compile Remove="03-ViewModel\**" />
			<Compile Remove="04-HomePageMainPanel\**" />
			<Compile Remove="04-pump\02-analy\**" />
			<Compile Remove="04-pump\03-calc\**" />
			<Compile Remove="map\gaode\css\**" />
			<Compile Remove="Resources\**" />
			<EmbeddedResource Remove="02-project\01-import\01-ModelFile\**" />
			<EmbeddedResource Remove="03-simulation\04-scheme\01-info - 复制\**" />
			@@ -27,8 +26,7 @@
			<EmbeddedResource Remove="03-simulation\07-matching\07-fourlink\01-fourlinksinglematching\**" />
			<EmbeddedResource Remove="03-ViewModel\**" />
			<EmbeddedResource Remove="04-HomePageMainPanel\**" />
			<EmbeddedResource Remove="04-pump\02-analy\**" />
			<EmbeddedResource Remove="04-pump\03-calc\**" />
			<EmbeddedResource Remove="map\gaode\css\**" />
			<EmbeddedResource Remove="Resources\**" />
			<None Remove="02-project\01-import\01-ModelFile\**" />
			<None Remove="03-simulation\04-scheme\01-info - 复制\**" />
			@@ -38,8 +36,7 @@
			<None Remove="03-simulation\07-matching\07-fourlink\01-fourlinksinglematching\**" />
			<None Remove="03-ViewModel\**" />
			<None Remove="04-HomePageMainPanel\**" />
			<None Remove="04-pump\02-analy\**" />
			<None Remove="04-pump\03-calc\**" />
			<None Remove="map\gaode\css\**" />
			<None Remove="Resources\**" />
			<Page Remove="02-project\01-import\01-ModelFile\**" />
			<Page Remove="03-simulation\04-scheme\01-info - 复制\**" />
			@@ -49,8 +46,7 @@
			<Page Remove="03-simulation\07-matching\07-fourlink\01-fourlinksinglematching\**" />
			<Page Remove="03-ViewModel\**" />
			<Page Remove="04-HomePageMainPanel\**" />
			<Page Remove="04-pump\02-analy\**" />
			<Page Remove="04-pump\03-calc\**" />
			<Page Remove="map\gaode\css\**" />
			<Page Remove="Resources\**" />
			</ItemGroup>

			@@ -90,12 +86,6 @@
			<Compile Remove="03-simulation\07-matching\07-fourlink\XhsProjectSimulationFourlinkMatchingListCtrl.cs" />
			<Compile Remove="03-simulation\07-matching\07-fourlink\XhsProjectSimulationFourlinkMatchingListCtrl.Designer.cs" />
			<Compile Remove="03-simulation\07-matching\07-fourlink\XhsProjectSimulationFourlinkMatchingViewModel.cs" />
			<Compile Remove="04-pump\PumpFullInfoCtrl.cs" />
			<Compile Remove="04-pump\PumpFullInfoCtrl.designer.cs" />
			<Compile Remove="04-pump\PumpFullInfoViewDlg.cs" />
			<Compile Remove="04-pump\PumpFullInfoViewDlg.Designer.cs" />
			<Compile Remove="04-pump\SinglePumpInfoViewDLg.cs" />
			<Compile Remove="04-pump\SinglePumpInfoViewDLg.Designer.cs" />
			</ItemGroup>

			<ItemGroup>
			@@ -113,9 +103,6 @@
			<EmbeddedResource Remove="03-simulation\07-matching\05-elbows\XhsProjectSimulationElbowsMatchingListCtrl.resx" />
			<EmbeddedResource Remove="03-simulation\07-matching\06-threelink\XhsProjectSimulationThreelinkMatchingListCtrl.resx" />
			<EmbeddedResource Remove="03-simulation\07-matching\07-fourlink\XhsProjectSimulationFourlinkMatchingListCtrl.resx" />
			<EmbeddedResource Remove="04-pump\PumpFullInfoCtrl.resx" />
			<EmbeddedResource Remove="04-pump\PumpFullInfoViewDlg.resx" />
			<EmbeddedResource Remove="04-pump\SinglePumpInfoViewDLg.resx" />
			</ItemGroup>

			<ItemGroup>
			@@ -168,12 +155,9 @@

			<ItemGroup>
			<PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
			<PackageReference Include="Yw.Epanet.Calcu.Core" Version="1.1.3" />
			<PackageReference Include="Yw.SkiaSharp.Core" Version="3.0.0" />
			<PackageReference Include="Yw.ZipFile.Core" Version="3.0.2" />
			</ItemGroup>

			<ItemGroup>
			<Folder Include="map\gaode\css\" />
			</ItemGroup>

			<ItemGroup>
			@@ -199,10 +183,12 @@
			<Compile Update="02-project\01-import\04-completed\02-bimface\XhsProjectResultBimfaceCtrl.cs" />
			<Compile Update="02-project\01-import\04-completed\03-hydro\XhsProjectResultHydroCtrl.cs" />
			<Compile Update="02-project\01-import\04-completed\01-info\XhsProjectResultInfoCtrl.cs" />
			<Compile Update="02-project\04-q3d\XhsProjectQ3dViewPage.cs" />
			<Compile Update="02-project\05-add\AddXhsProjectDlg.cs" />
			<Compile Update="02-project\08-view\ViewXhsProjectDlg.cs" />
			<Compile Update="02-project\06-edit\EditXhsProjectDlg.cs" />
			<Compile Update="03-simulation\03-q3d\XhsProjectSimulationL3d2Ctrl.cs">
			<SubType>UserControl</SubType>
			</Compile>
			<Compile Update="03-simulation\04-scheme\02-change\00-core\CreateXhsSchemeBimfaceCtrl.cs">
			<SubType>UserControl</SubType>
			</Compile>
			@@ -387,18 +373,27 @@
			<Compile Update="03-simulation\01-info\XhsProjectSimulationProjectInfoCtrl.cs" />
			<Compile Update="03-simulation\01-info\XhsProjectSimulationBimfaceInfoCtrl.cs" />
			<Compile Update="03-simulation\01-info\XhsProjectSimulationInfoPage.cs" />
			<Compile Update="03-simulation\03-q3d\XhsProjectSimulationQ3dCtrl.cs" />
			<Compile Update="03-simulation\11-pump\05-edit\SimulationPumpCurveEditDlg.cs">
			<SubType>Form</SubType>
			</Compile>
			<Compile Update="03-simulation\09-energy-analy\SimulationEnergyAnalyCtrl.cs">
			<SubType>UserControl</SubType>
			</Compile>
			<Compile Update="03-simulation\09-energy-analy\SimulationEnergyAnalyDlg.cs">
			<SubType>Form</SubType>
			</Compile>
			<Compile Update="03-simulation\09-energy-analy\SimulationEnergyAnalyWorkingDlg.cs">
			<SubType>Form</SubType>
			</Compile>
			<Compile Update="eMatchingDlg.cs" />
			<Compile Update="03-simulation\06-simulation\XhsProjectSimulationCorePage.cs" />
			<Compile Update="03-simulation\09-energy\SimulationMultiWorkingEnergyDlg.cs" />
			<Compile Update="03-simulation\10-analy\SimulationMultiWorkingAnalyDlg.cs" />
			<Compile Update="03-simulation\10-analy\SimulationSingleWorkingAnalyDlg.cs" />
			<Compile Update="03-simulation\10-multi-analy\SimulationMultiAnalyWorkingDlg.cs" />
			<Compile Update="03-simulation\10-multi-analy\SimulationMultiAnalyDlg.cs" />
			<Compile Update="03-simulation\11-pump\01-parallel\SimulationPumpParallelDlg.cs" />
			<Compile Update="03-simulation\11-pump\02-feat\SimulationSinglePumpFeatDlg.cs" />
			<Compile Update="03-simulation\11-pump\02-feat\SimulationPumpFeatDlg.cs" />
			<Compile Update="03-simulation\09-energy\SimulationSingleWorkingEnergyDlg.cs" />
			<Compile Update="03-simulation\11-pump\03-analy\SimulationMultiWorkingPumpAnalyDlg.cs" />
			<Compile Update="03-simulation\11-pump\03-analy\SimulationSingleWorkingPumpAnalyDlg.cs" />
			<Compile Update="03-simulation\10-pump-analy\SimulationPumpAnalyWorkingDlg.cs" />
			<Compile Update="03-simulation\10-pump-analy\SimulationPumpAnalyDlg.cs" />
			<Compile Update="Properties\Resources.Designer.cs">
			<DesignTime>True</DesignTime>
			<AutoGen>True</AutoGen>
			@@ -413,4 +408,7 @@
			</EmbeddedResource>
			</ItemGroup>

			</Project>
			<ItemGroup>
			<Folder Include="03-simulation\11-pump\03-analy\" />
			</ItemGroup>
			</Project>