From 20b138393ab0d441ee6b9e9b1cedbf1d22a2c00c Mon Sep 17 00:00:00 2001
From: qin <a@163.com>
Date: 星期一, 06 五月 2024 14:55:46 +0800
Subject: [PATCH] 冲突解决

---
 Hydraulic/Hydro.ConfigModel/Hydro.ConfigModel.csproj |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Hydraulic/Hydro.ConfigModel/Hydro.ConfigModel.csproj b/Hydraulic/Hydro.ConfigModel/Hydro.ConfigModel.csproj
index 3fb1173..770fb81 100644
--- a/Hydraulic/Hydro.ConfigModel/Hydro.ConfigModel.csproj
+++ b/Hydraulic/Hydro.ConfigModel/Hydro.ConfigModel.csproj
@@ -21,18 +21,18 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\..\bin\debug\</OutputPath>
+    <OutputPath>..\..\out\debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>0</WarningLevel>
     <NoWarn>MSB3305;DV2002;CS0219;CS0162;CS0414;CS016;CS0618;CS0169;CS0649;CS0109;CS3021;CS0168;CS0067</NoWarn>
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <UseVSHostingProcess>false</UseVSHostingProcess>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\..\..\bin\release\</OutputPath>
+    <OutputPath>..\..\out\release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>0</WarningLevel>

--
Gitblit v1.9.3