解决冲突

duheng

2024-06-08 7b072c0563be4c57325f44fbf6ac828756ae582e

 Hydraulic/Hydro.MapView/Hydro.MapView.csproj

@@ -18,7 +18,7 @@
    <DebugSymbols>true</DebugSymbols>
    <DebugType>full</DebugType>
    <Optimize>false</Optimize>
    <OutputPath>..\..\out\debug\</OutputPath>
    <OutputPath>..\..\bin\debug\</OutputPath>
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>0</WarningLevel>
@@ -28,12 +28,17 @@
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <DebugType>pdbonly</DebugType>
    <Optimize>true</Optimize>
    <OutputPath>..\..\out\release\</OutputPath>
    <OutputPath>..\..\bin\release\</OutputPath>
    <DefineConstants>TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="DevExpress.Data.Desktop.v22.2, Version=22.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
    <Reference Include="DevExpress.Data.v22.2, Version=22.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
    <Reference Include="DevExpress.Printing.v22.2.Core, Version=22.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
    <Reference Include="DevExpress.Utils.v22.2, Version=22.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
    <Reference Include="DevExpress.XtraEditors.v22.2, Version=22.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
    <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>
@@ -72,6 +77,8 @@
    <Compile Include="Common\MapDimensions.cs" />
    <Compile Include="Common\ShouldSerializeContractResolver.cs" />
    <Compile Include="Common\TempForEnum.cs" />
    <Compile Include="EditorConvert\DlTemplateEditor.cs" />
    <Compile Include="EditorConvert\EquivalentTemplateModel.cs" />
    <Compile Include="Enum\MapViewEnum.cs" />
    <Compile Include="MapViewNetWork.cs" />
    <Compile Include="MapViewNetWork2Inp.cs" />