Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use standard .NET libraries instead of windows only libraries #145

Merged
merged 2 commits into from
Jun 2, 2021
Merged

Use standard .NET libraries instead of windows only libraries #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
815d7b6
Use standard .NET libraries instead of windows only libraries
Eran-YT Jun 1, 2021
0c92a9b
Fix map and fody version
Eran-YT Jun 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions EvtxECmd/EvtxECmd.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net462</TargetFramework>
<TargetFramework>net46</TargetFramework>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<AssemblyTitle>EvtxECmd</AssemblyTitle>
<Company>Eric R. Zimmerman</Company>
Expand All @@ -18,6 +18,7 @@
<ApplicationIcon>IDCard.ico</ApplicationIcon>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="SharpZipLib" Version="1.3.2" />
<PackageReference Include="System.IO.Compression" Version="4.*" />
<PackageReference Include="System.Threading" Version="4.*" />
<PackageReference Include="System.Threading.Tasks" Version="4.*" />
Expand All @@ -44,18 +45,18 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="AlphaFS" Version="2.2.6" />
<PackageReference Include="Costura.Fody" Version="5.1.0">
<PackageReference Include="Costura.Fody" Version="5.2.0">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="CsvHelper" Version="26.1.0" />
<PackageReference Include="CsvHelper" Version="27.1.0" />
<PackageReference Include="Exceptionless" Version="4.6.2" />
<PackageReference Include="FluentCommandLineParser" Version="1.5.0.20-commands" />
<PackageReference Include="Fody" Version="6.5.1">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="NLog" Version="4.7.9" />
<PackageReference Include="ServiceStack.Text" Version="5.10.4" />
<PackageReference Include="NLog" Version="4.7.10" />
<PackageReference Include="ServiceStack.Text" Version="5.11.0" />
<PackageReference Include="System.Buffers" Version="4.5.1" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
<PackageReference Include="System.Security.Principal.Windows" Version="5.0.0" />
Expand Down
13 changes: 4 additions & 9 deletions evtx.Test/evtx.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net461</TargetFramework>
<TargetFrameworks>net46;net5.0</TargetFrameworks>
<AssemblyTitle>evtx.Test</AssemblyTitle>
<Product>evtx.Test</Product>
<Copyright>Copyright © 2019</Copyright>
Expand All @@ -11,17 +11,12 @@
<PackageReference Include="Microsoft.CSharp" Version="4.*" />
<PackageReference Include="System.Net.Http" Version="4.*" />
</ItemGroup>
<ItemGroup>
<Reference Include="System.Configuration" />
<Reference Include="System.ServiceModel" />
<Reference Include="System.Transactions" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\evtx\evtx.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="NFluent" Version="2.7.1" />
<PackageReference Include="NLog" Version="4.7.9" />
<PackageReference Include="NUnit" Version="3.13.1" />
<PackageReference Include="NFluent" Version="2.7.2" />
<PackageReference Include="NLog" Version="4.7.10" />
<PackageReference Include="NUnit" Version="3.13.2" />
</ItemGroup>
</Project>
18 changes: 1 addition & 17 deletions evtx/EventLog.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,13 @@
using System.IO;
using System.Linq;
using System.Text;
using Alphaleonis.Win32.Filesystem;
using FluentValidation.Results;
using Force.Crc32;
using NLog;
using ServiceStack;
using ServiceStack.Text;
using YamlDotNet.Core;
using YamlDotNet.Serialization;
using Directory = Alphaleonis.Win32.Filesystem.Directory;
using File = Alphaleonis.Win32.Filesystem.File;
using Path = Alphaleonis.Win32.Filesystem.Path;

//TODO rename project to EventLog?
namespace evtx
Expand Down Expand Up @@ -113,20 +109,8 @@ public static bool LoadMaps(string mapPath)
{
EventLogMaps = new Dictionary<string, EventLogMap>();

var f = new DirectoryEnumerationFilters();
f.InclusionFilter = fsei => fsei.Extension.ToUpperInvariant() == ".MAP";

f.RecursionFilter = null; //entryInfo => !entryInfo.IsMountPoint && !entryInfo.IsSymbolicLink;

f.ErrorFilter = (errorCode, errorMessage, pathProcessed) => true;

var dirEnumOptions =
DirectoryEnumerationOptions.Files |
DirectoryEnumerationOptions.SkipReparsePoints | DirectoryEnumerationOptions.ContinueOnException |
DirectoryEnumerationOptions.BasicSearch;

var mapFiles =
Directory.EnumerateFileSystemEntries(mapPath, dirEnumOptions, f).ToList();
Directory.EnumerateFileSystemEntries(mapPath, "*.map").ToList();

var l = LogManager.GetLogger("LoadMaps");

Expand Down
13 changes: 3 additions & 10 deletions evtx/evtx.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
<Copyright>Copyright © 2021</Copyright>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<AssemblyVersion>1.0.0.1</AssemblyVersion>
<FileVersion>1.0.0.1</FileVersion>
<Version>1.0.0.1</Version>
<AssemblyVersion>1.0.1</AssemblyVersion>
<FileVersion>1.0.1</FileVersion>
<Version>1.0.1</Version>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand All @@ -22,17 +22,10 @@
<PackageReference Include="System.Net.Http" Version="4.*" />
</ItemGroup>
<ItemGroup>
<Reference Include="System.Configuration" />
<Reference Include="System.ServiceModel" />
<Reference Include="System.Transactions" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="AlphaFS" Version="2.2.6" />
<PackageReference Include="Crc32.NET" Version="1.2.0" />
<PackageReference Include="FluentValidation" Version="8.6.1" />
<PackageReference Include="NLog" Version="4.7.9" />
<PackageReference Include="ServiceStack.Text" Version="5.10.4" />
<PackageReference Include="SharpZipLib" Version="1.3.1" />
<PackageReference Include="System.Xml.XPath" Version="4.3.0" />
<PackageReference Include="YamlDotNet" Version="11.0.1" />
</ItemGroup>
Expand Down