Merge pull request #616 from 304NotModified/conditionaldebug3

Added DEBUG-Conditional trace and debug methods #2
NLog · Mar 1, 2015 · 9398399 · 9398399
2 parents 7d908f5 + deead95
commit 9398399
Show file tree

Hide file tree

Showing 11 changed files with 979 additions and 11 deletions.
diff --git a/src/NLog/Logger-Conditional.cs b/src/NLog/Logger-Conditional.cs
diff --git a/src/NLog/NLog.doc.csproj b/src/NLog/NLog.doc.csproj
@@ -288,6 +288,7 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Logger.tt</DependentUpon>
     </Compile>
+    <Compile Include="Logger-Conditional.cs" />
     <Compile Include="LoggerImpl.cs" />
     <Compile Include="Logger-V1Compat.cs">
       <ExcludeFromStyleCop>true</ExcludeFromStyleCop>

diff --git a/src/NLog/NLog.mono2.csproj b/src/NLog/NLog.mono2.csproj
@@ -290,6 +290,7 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Logger.tt</DependentUpon>
     </Compile>
+    <Compile Include="Logger-Conditional.cs" />
     <Compile Include="LoggerImpl.cs" />
     <Compile Include="Logger-V1Compat.cs">
       <ExcludeFromStyleCop>true</ExcludeFromStyleCop>

diff --git a/src/NLog/NLog.monodevelop.csproj b/src/NLog/NLog.monodevelop.csproj
@@ -292,6 +292,7 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Logger.tt</DependentUpon>
     </Compile>
+    <Compile Include="Logger-Conditional.cs" />
     <Compile Include="LoggerImpl.cs" />
     <Compile Include="Logger-V1Compat.cs">
       <ExcludeFromStyleCop>true</ExcludeFromStyleCop>

diff --git a/src/NLog/NLog.netfx35.csproj b/src/NLog/NLog.netfx35.csproj
@@ -27,8 +27,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <OutputPath>bin\Debug</OutputPath>
-    <CodeAnalysisRules>
-    </CodeAnalysisRules>
+    <CodeAnalysisRules></CodeAnalysisRules>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -290,6 +289,7 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Logger.tt</DependentUpon>
     </Compile>
+    <Compile Include="Logger-Conditional.cs" />
     <Compile Include="LoggerImpl.cs" />
     <Compile Include="Logger-V1Compat.cs">
       <ExcludeFromStyleCop>true</ExcludeFromStyleCop>
@@ -395,15 +395,6 @@
   <ItemGroup>
     <EmbeddedResource Include="Resources\NLog.ico" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="Logger.tt">
-      <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>Logger1.cs</LastGenOutput>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(StyleCopTargetsFile)" Condition="'$(StyleCopTargetsFile)' != ''" />
   <Target Name="BeforeBuild">

diff --git a/src/NLog/NLog.netfx40.csproj b/src/NLog/NLog.netfx40.csproj
@@ -291,6 +291,7 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Logger.tt</DependentUpon>
     </Compile>
+    <Compile Include="Logger-Conditional.cs" />
     <Compile Include="LoggerImpl.cs" />
     <Compile Include="Logger-V1Compat.cs">
       <ExcludeFromStyleCop>true</ExcludeFromStyleCop>

diff --git a/src/NLog/NLog.netfx45.csproj b/src/NLog/NLog.netfx45.csproj
@@ -295,6 +295,7 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Logger.tt</DependentUpon>
     </Compile>
+    <Compile Include="Logger-Conditional.cs" />
     <Compile Include="LoggerImpl.cs" />
     <Compile Include="Logger-V1Compat.cs">
       <ExcludeFromStyleCop>true</ExcludeFromStyleCop>

diff --git a/src/NLog/NLog.sl4.csproj b/src/NLog/NLog.sl4.csproj
@@ -294,6 +294,7 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Logger.tt</DependentUpon>
     </Compile>
+    <Compile Include="Logger-Conditional.cs" />
     <Compile Include="LoggerImpl.cs" />
     <Compile Include="Logger-V1Compat.cs">
       <ExcludeFromStyleCop>true</ExcludeFromStyleCop>

diff --git a/src/NLog/NLog.sl5.csproj b/src/NLog/NLog.sl5.csproj
@@ -291,6 +291,7 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Logger.tt</DependentUpon>
     </Compile>
+    <Compile Include="Logger-Conditional.cs" />
     <Compile Include="LoggerImpl.cs" />
     <Compile Include="Logger-V1Compat.cs">
       <ExcludeFromStyleCop>true</ExcludeFromStyleCop>

diff --git a/src/NLog/NLog.wp7.csproj b/src/NLog/NLog.wp7.csproj
@@ -290,6 +290,7 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Logger.tt</DependentUpon>
     </Compile>
+    <Compile Include="Logger-Conditional.cs" />
     <Compile Include="LoggerImpl.cs" />
     <Compile Include="Logger-V1Compat.cs">
       <ExcludeFromStyleCop>true</ExcludeFromStyleCop>

diff --git a/src/NLog/NLog.wp71.csproj b/src/NLog/NLog.wp71.csproj
@@ -290,6 +290,7 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Logger.tt</DependentUpon>
     </Compile>
+    <Compile Include="Logger-Conditional.cs" />
     <Compile Include="LoggerImpl.cs" />
     <Compile Include="Logger-V1Compat.cs">
       <ExcludeFromStyleCop>true</ExcludeFromStyleCop>