Skip to content

Commit b2ef9f6

Browse files
authored
Merge pull request #95 from komsa-ag/Feature/LockingModel
2 parents 963c29e + 702184c commit b2ef9f6

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

src/log4net/Appender/FileAppender.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1657,7 +1657,7 @@ protected static string ConvertToFullPath(string path)
16571657
/// <summary>
16581658
/// The locking model to use
16591659
/// </summary>
1660-
private FileAppender.LockingModelBase m_lockingModel = new FileAppender.ExclusiveLock();
1660+
private FileAppender.LockingModelBase m_lockingModel;
16611661

16621662
#endregion Private Instance Fields
16631663

src/log4net/log4net.csproj

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
<Product>Apache log4net</Product>
77
<Description>
88
log4net is a tool to help the programmer output log statements to a variety of output targets.
9-
In case of problems with an application, it is helpful to enable logging so that the problem
9+
In case of problems with an application, it is helpful to enable logging so that the problem
1010
can be located. With log4net it is possible to enable logging at runtime without modifying the
11-
application binary. The log4net package is designed so that log statements can remain in
11+
application binary. The log4net package is designed so that log statements can remain in
1212
shipped code without incurring a high performance cost. It follows that the speed of logging
1313
(or rather not logging) is crucial.
1414

@@ -64,6 +64,7 @@
6464
<OutputPath>..\..\build\$(Configuration)</OutputPath>
6565
<PackageOutputPath>..\..\build\artifacts</PackageOutputPath>
6666
<DocumentationFile>..\..\build\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
67+
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
6768
</PropertyGroup>
6869
<PropertyGroup>
6970
<BaseAddress>285212672</BaseAddress>
@@ -203,4 +204,12 @@
203204
</ItemGroup>
204205
<PropertyGroup />
205206
<Import Project="../MonoForFramework.targets" />
206-
</Project>
207+
<Target Name="_ResolveCopyLocalNuGetPackagePdbsAndXml" Condition="$(CopyLocalLockFileAssemblies) == true" AfterTargets="ResolveReferences">
208+
<!-- "Workaround" for missing '.pdb'-Files from NuGet Packages -->
209+
<!-- https://github.com/dotnet/sdk/issues/1458#issuecomment-420456386 -->
210+
<ItemGroup>
211+
<ReferenceCopyLocalPaths Include="@(ReferenceCopyLocalPaths->'%(RootDir)%(Directory)%(Filename).pdb')" Condition="'%(ReferenceCopyLocalPaths.NuGetPackageId)' != '' and Exists('%(RootDir)%(Directory)%(Filename).pdb')"/>
212+
<ReferenceCopyLocalPaths Include="@(ReferenceCopyLocalPaths->'%(RootDir)%(Directory)%(Filename).xml')" Condition="'%(ReferenceCopyLocalPaths.NuGetPackageId)' != '' and Exists('%(RootDir)%(Directory)%(Filename).xml')"/>
213+
</ItemGroup>
214+
</Target>
215+
</Project>

0 commit comments

Comments
 (0)