diff --git a/Aucma.Scada.UI/Aucma.Scada.UI.csproj b/Aucma.Scada.UI/Aucma.Scada.UI.csproj index cf12fd11..8a5c1f41 100644 --- a/Aucma.Scada.UI/Aucma.Scada.UI.csproj +++ b/Aucma.Scada.UI/Aucma.Scada.UI.csproj @@ -254,6 +254,9 @@ ResXFileCodeGenerator Resources.Designer.cs + + PreserveNewest + SettingsSingleFileGenerator diff --git a/Aucma.Scada.UI/bin/Debug/config/log4net.config b/Aucma.Scada.UI/log4net.config similarity index 100% rename from Aucma.Scada.UI/bin/Debug/config/log4net.config rename to Aucma.Scada.UI/log4net.config diff --git a/HighWayIot.Log4net/HighWayIot.Log4net.csproj b/HighWayIot.Log4net/HighWayIot.Log4net.csproj index 034984b8..a4788d81 100644 --- a/HighWayIot.Log4net/HighWayIot.Log4net.csproj +++ b/HighWayIot.Log4net/HighWayIot.Log4net.csproj @@ -48,8 +48,5 @@ - - - \ No newline at end of file diff --git a/HighWayIot.Log4net/LogHelper.cs b/HighWayIot.Log4net/LogHelper.cs index 6ecec10a..2c307b2b 100644 --- a/HighWayIot.Log4net/LogHelper.cs +++ b/HighWayIot.Log4net/LogHelper.cs @@ -27,8 +27,8 @@ namespace HighWayIot.Log4net * 配置文件路径 * */ - //private readonly string fileName = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "log4net.config"); - private readonly string fileName = "E:\\桌面\\澳柯玛MES项目\\程序设计\\Aucma.Scada\\HighWayIot.Log4net\\config\\log4net.config"; + private readonly string fileName = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "log4net.config"); + // private readonly string fileName = "E:\\桌面\\澳柯玛MES项目\\程序设计\\Aucma.Scada\\HighWayIot.Log4net\\config\\log4net.config"; private LogHelper() { diff --git a/HighWayIot.Log4net/config/log4net.config b/HighWayIot.Log4net/config/log4net.config deleted file mode 100644 index c3c4ef30..00000000 --- a/HighWayIot.Log4net/config/log4net.config +++ /dev/null @@ -1,153 +0,0 @@ - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file