diff --git a/.gitignore b/.gitignore index b8995e9..700b0e5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,77 +1,10 @@ -ACPLogAnalyzer.exe.config.deploy -ACPLogAnalyzer_TemporaryKey.pfx -ACPLogAnalyzer.application -ACPLogAnalyzer_MarkupCompile.i.cache -ACPLogAnalyzer_MarkupCompile.lref -App.g.i.cs -ConfigPlot.g.cs -ConfigPlot.g.i.cs -ConfigReport.g.cs -ConfigReport.g.i.cs -DesignTimeResolveAssemblyReferencesInput.cache -GeneratedInternalTypeHelper.g.cs -GeneratedInternalTypeHelper.g.i.cs -Graph.g.cs -Graph.g.i.cs -GraphUserControl.g.cs -GraphUserControl.g.i.cs -Help.g.cs -Help.g.i.cs -MainWindow.g.cs -MainWindow.g.i.cs -Update.g.cs -ACPLogAnalyzer.csprojResolveAssemblyReference.cache -App.g.cs -Update.g.i.cs -ACPLogAnalyzer.exe -ACPLogAnalyzer.exe.manifest -ACPLogAnalyzer.pdb -ACPLogAnalyzer_MarkupCompile.cache -ACPLogAnalyzer.csproj.FileListAbsolute.txt -ACPLogAnalyzer.csproj.GenerateResource.Cache -ACPLogAnalyzer_MarkupCompile.i.lref -ACPLogAnalyzer.csproj.GenerateResource.Cache -/ACPLogAnalyzer/bin/Debug/ACPLogAnalyzer.exe -/ACPLogAnalyzer/bin/Debug/ACPLogAnalyzer.exe.manifest -/ACPLogAnalyzer/bin/Debug/ACPLogAnalyzer.pdb -/ACPLogAnalyzer/bin/Debug/app.publish/ACPLogAnalyzer.application -/ACPLogAnalyzer/bin/Debug/app.publish/Application Files/ACPLogAnalyzer_1_0_0_0/ACPLogAnalyzer.exe.deploy -/ACPLogAnalyzer/bin/Debug/app.publish/Application Files/ACPLogAnalyzer_1_0_0_0/ACPLogAnalyzer.exe.manifest -/ACPLogAnalyzer/bin/Debug/app.publish/Application Files/ACPLogAnalyzer_1_0_0_0/ACPLogAnalyzerIcons.ico.deploy -/ACPLogAnalyzer/bin/Debug/app.publish/Application Files/ACPLogAnalyzer_1_0_0_0/System.Windows.Controls.DataVisualization.Toolkit.VisualStudio.Design.dll.deploy -/ACPLogAnalyzer/bin/Debug/app.publish/Application Files/ACPLogAnalyzer_1_0_0_0/System.Windows.Controls.DataVisualization.Toolkit.dll.deploy -/ACPLogAnalyzer/bin/Debug/app.publish/Application Files/ACPLogAnalyzer_1_0_0_0/WPFToolkit.dll.deploy -/ACPLogAnalyzer/bin/Release/ACPLogAnalyzer.application -/ACPLogAnalyzer/bin/Release/ACPLogAnalyzer.exe -/ACPLogAnalyzer/bin/Release/ACPLogAnalyzer.exe.CodeAnalysisLog.xml -/ACPLogAnalyzer/bin/Release/ACPLogAnalyzer.exe.lastcodeanalysissucceeded -/ACPLogAnalyzer/bin/Release/ACPLogAnalyzer.exe.manifest -/ACPLogAnalyzer/bin/Release/ACPLogAnalyzer.pdb -/ACPLogAnalyzer/obj/x86/Debug/App.g.i.cs -/ACPLogAnalyzer/obj/x86/Debug/ConfigReport.g.cs -/ACPLogAnalyzer/obj/x86/Debug/GeneratedInternalTypeHelper.g.cs -/ACPLogAnalyzer/obj/x86/Debug/Graph.g.i.cs -/ACPLogAnalyzer/obj/x86/Debug/ConfigReport.g.i.cs -/ACPLogAnalyzer/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache -/ACPLogAnalyzer/obj/x86/Debug/GeneratedInternalTypeHelper.g.i.cs -/ACPLogAnalyzer/obj/x86/Debug/Graph.g.cs -/ACPLogAnalyzer/obj/x86/Debug/GraphUserControl.g.cs -/ACPLogAnalyzer/obj/x86/Debug/GraphUserControl.g.i.cs -/ACPLogAnalyzer/obj/x86/Debug/Help.g.cs -/ACPLogAnalyzer/obj/x86/Debug/Help.g.i.cs -/ACPLogAnalyzer/obj/x86/Debug/MainWindow.g.cs -/ACPLogAnalyzer/obj/x86/Debug/MainWindow.g.i.cs -/ACPLogAnalyzer/obj/x86/Debug/Update.g.cs -/ACPLogAnalyzer/obj/x86/Debug/Update.g.i.cs -/ACPLogAnalyzer/obj/x86/Release/ACPLogAnalyzer.application -/ACPLogAnalyzer/obj/x86/Release/ACPLogAnalyzer.csproj.FileListAbsolute.txt -*.zip ## Ignore Visual Studio temporary files, build results, and ## files generated by popular Visual Studio add-ons. ## ## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore # User-specific files +*.rsuser *.suo *.user *.userosscache @@ -91,6 +24,7 @@ bld/ [Bb]in/ [Oo]bj/ [Ll]og/ +[Oo]utput/ # Visual Studio 2015/2017 cache/options directory .vs/ @@ -120,7 +54,6 @@ BenchmarkDotNet.Artifacts/ project.lock.json project.fragment.lock.json artifacts/ -**/Properties/launchSettings.json # StyleCop StyleCopReport.xml @@ -128,12 +61,14 @@ StyleCopReport.xml # Files built by Visual Studio *_i.c *_p.c -*_i.h +*_h.h *.ilk *.meta *.obj +*.iobj *.pch *.pdb +*.ipdb *.pgc *.pgd *.rsp @@ -143,6 +78,7 @@ StyleCopReport.xml *.tlh *.tmp *.tmp_proj +*_wpftmp.csproj *.log *.vspscc *.vssscc @@ -287,7 +223,7 @@ ClientBin/ *.publishsettings orleans.codegen.cs -# Including strong name files can present a security risk +# Including strong name files can present a security risk # (https://github.com/github/gitignore/pull/2483#issue-259490424) #*.snk @@ -306,6 +242,7 @@ Backup*/ UpgradeLog*.XML UpgradeLog*.htm ServiceFabricBackup/ +*.rptproj.bak # SQL Server files *.mdf @@ -356,8 +293,8 @@ paket-files/ .idea/ *.sln.iml -# CodeRush -.cr/ +# CodeRush personal settings +.cr/personal # Python Tools for Visual Studio (PTVS) __pycache__/ @@ -382,7 +319,7 @@ __pycache__/ # OpenCover UI analysis results OpenCover/ -# Azure Stream Analytics local run output +# Azure Stream Analytics local run output ASALocalRun/ # MSBuild Binary and Structured Log @@ -390,6 +327,9 @@ ASALocalRun/ # NVidia Nsight GPU debugger configuration file *.nvuser -README.sublime-workspace -*.dll -.DS_Store + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ diff --git a/ACPLogAnalyzer.UnitTests/.gitignore b/ACPLogAnalyzer.UnitTests/.gitignore new file mode 100644 index 0000000..4d13c54 --- /dev/null +++ b/ACPLogAnalyzer.UnitTests/.gitignore @@ -0,0 +1,334 @@ +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore + +# User-specific files +*.rsuser +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUNIT +*.VisualState.xml +TestResult.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_h.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*_wpftmp.csproj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# JustCode is a .NET coding add-in +.JustCode + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# JetBrains Rider +.idea/ +*.sln.iml + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ diff --git a/ACPLogAnalyzer.UnitTests/ACPLogAnalyzer.UnitTests.csproj b/ACPLogAnalyzer.UnitTests/ACPLogAnalyzer.UnitTests.csproj index a0d97dd..38f06ea 100644 --- a/ACPLogAnalyzer.UnitTests/ACPLogAnalyzer.UnitTests.csproj +++ b/ACPLogAnalyzer.UnitTests/ACPLogAnalyzer.UnitTests.csproj @@ -1,6 +1,6 @@  - + Debug AnyCPU @@ -39,10 +39,10 @@ - ..\packages\MSTest.TestFramework.1.2.0\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll + ..\packages\MSTest.TestFramework.1.3.2\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll - ..\packages\MSTest.TestFramework.1.2.0\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll + ..\packages\MSTest.TestFramework.1.3.2\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll @@ -64,10 +64,10 @@ - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + Данный проект ссылается на пакеты NuGet, отсутствующие на этом компьютере. Используйте восстановление пакетов NuGet, чтобы скачать их. Дополнительную информацию см. по адресу: http://go.microsoft.com/fwlink/?LinkID=322105. Отсутствует следующий файл: {0}. - - + + - + \ No newline at end of file diff --git a/ACPLogAnalyzer.UnitTests/packages.config b/ACPLogAnalyzer.UnitTests/packages.config index cf2d094..102a45c 100644 --- a/ACPLogAnalyzer.UnitTests/packages.config +++ b/ACPLogAnalyzer.UnitTests/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/ACPLogAnalyzer.iss b/ACPLogAnalyzer.iss index 270993f..bd0a128 100644 --- a/ACPLogAnalyzer.iss +++ b/ACPLogAnalyzer.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "ACPLogAnalyzer" -#define MyAppVersion "1.36" +#define MyAppVersion "1.37" #define MyAppPublisher "ACPLogAnalyzer" #define MyAppURL "http://ACPLogAnalyzer.org" #define MyAppExeName "ACPLogAnalyzer.exe" @@ -24,6 +24,7 @@ DisableProgramGroupPage=yes OutputBaseFilename=ACPLogAnalyzerSetup Compression=lzma SolidCompression=yes +SetupIconFile=ACPLogAnalyzer\ACPLogAnalyzerIcons.ico [Languages] Name: "english"; MessagesFile: "compiler:Default.isl" @@ -33,16 +34,18 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{ Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked; OnlyBelowVersion: 0,6.1 [Files] -Source: "C:\Users\dwormuth\Documents\source\rarcher\ACPLogAnalyzer\ACPLogAnalyzer\bin\Release\ACPLogAnalyzer.exe"; DestDir: "{app}"; Flags: ignoreversion +Source: "ACPLogAnalyzer\bin\Release\ACPLogAnalyzer.exe"; DestDir: "{app}"; Flags: ignoreversion ; NOTE: Don't use "Flags: ignoreversion" on any shared system files Source: "ACPLogAnalyzer\bin\Release\ACPLogAnalyzer.application"; DestDir: "{app}"; Flags: ignoreversion Source: "ACPLogAnalyzer\bin\Release\ACPLogAnalyzer.exe.config"; DestDir: "{app}"; Flags: ignoreversion Source: "ACPLogAnalyzer\bin\Release\ACPLogAnalyzer.exe.manifest"; DestDir: "{app}"; Flags: ignoreversion -Source: "ACPLogAnalyzer\bin\Release\ACPLogAnalyzer.pdb"; DestDir: "{app}"; Flags: ignoreversion -Source: "ACPLogAnalyzer\bin\Release\ACPLogAnalyzer.vshost.exe"; DestDir: "{app}"; Flags: ignoreversion -Source: "ACPLogAnalyzer\bin\Release\ACPLogAnalyzer.vshost.exe.config"; DestDir: "{app}"; Flags: ignoreversion +;Source: "ACPLogAnalyzer\bin\Release\ACPLogAnalyzer.pdb"; DestDir: "{app}"; Flags: ignoreversion +;Source: "ACPLogAnalyzer\bin\Release\ACPLogAnalyzer.vshost.exe"; DestDir: "{app}"; Flags: ignoreversion +;Source: "ACPLogAnalyzer\bin\Release\ACPLogAnalyzer.vshost.exe.config"; DestDir: "{app}"; Flags: ignoreversion Source: "ACPLogAnalyzer\bin\Release\System.Windows.Controls.DataVisualization.Toolkit.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "ACPLogAnalyzer\bin\Release\System.Windows.Controls.DataVisualization.Toolkit.VisualStudio.Design.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "ACPLogAnalyzer\bin\Release\System.Windows.Controls.Input.Toolkit.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "ACPLogAnalyzer\bin\Release\System.Windows.Controls.Layout.Toolkit.dll"; DestDir: "{app}"; Flags: ignoreversion +;Source: "ACPLogAnalyzer\bin\Release\System.Windows.Controls.DataVisualization.Toolkit.VisualStudio.Design.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "ACPLogAnalyzer\bin\Release\WPFToolkit.dll"; DestDir: "{app}"; Flags: ignoreversion [Icons] diff --git a/ACPLogAnalyzer.sln b/ACPLogAnalyzer.sln index b00e6b3..5139e96 100644 --- a/ACPLogAnalyzer.sln +++ b/ACPLogAnalyzer.sln @@ -14,79 +14,38 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ACPLogAnalyzer.UnitTests", EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - CD_ROM|Any CPU = CD_ROM|Any CPU - CD_ROM|Mixed Platforms = CD_ROM|Mixed Platforms - CD_ROM|x86 = CD_ROM|x86 Debug|Any CPU = Debug|Any CPU Debug|Mixed Platforms = Debug|Mixed Platforms Debug|x86 = Debug|x86 - DVD-5|Any CPU = DVD-5|Any CPU - DVD-5|Mixed Platforms = DVD-5|Mixed Platforms - DVD-5|x86 = DVD-5|x86 Release|Any CPU = Release|Any CPU Release|Mixed Platforms = Release|Mixed Platforms Release|x86 = Release|x86 - SingleImage|Any CPU = SingleImage|Any CPU - SingleImage|Mixed Platforms = SingleImage|Mixed Platforms - SingleImage|x86 = SingleImage|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {C743A4A1-B358-4302-83B3-A317D1EB923F}.CD_ROM|Any CPU.ActiveCfg = Release|x86 - {C743A4A1-B358-4302-83B3-A317D1EB923F}.CD_ROM|Mixed Platforms.ActiveCfg = Release|x86 - {C743A4A1-B358-4302-83B3-A317D1EB923F}.CD_ROM|Mixed Platforms.Build.0 = Release|x86 - {C743A4A1-B358-4302-83B3-A317D1EB923F}.CD_ROM|x86.ActiveCfg = Release|x86 - {C743A4A1-B358-4302-83B3-A317D1EB923F}.CD_ROM|x86.Build.0 = Release|x86 - {C743A4A1-B358-4302-83B3-A317D1EB923F}.Debug|Any CPU.ActiveCfg = Debug|x86 - {C743A4A1-B358-4302-83B3-A317D1EB923F}.Debug|Mixed Platforms.ActiveCfg = Release|x86 - {C743A4A1-B358-4302-83B3-A317D1EB923F}.Debug|Mixed Platforms.Build.0 = Release|x86 + {C743A4A1-B358-4302-83B3-A317D1EB923F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C743A4A1-B358-4302-83B3-A317D1EB923F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C743A4A1-B358-4302-83B3-A317D1EB923F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {C743A4A1-B358-4302-83B3-A317D1EB923F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU {C743A4A1-B358-4302-83B3-A317D1EB923F}.Debug|x86.ActiveCfg = Debug|x86 {C743A4A1-B358-4302-83B3-A317D1EB923F}.Debug|x86.Build.0 = Debug|x86 - {C743A4A1-B358-4302-83B3-A317D1EB923F}.DVD-5|Any CPU.ActiveCfg = Debug|x86 - {C743A4A1-B358-4302-83B3-A317D1EB923F}.DVD-5|Mixed Platforms.ActiveCfg = Debug|x86 - {C743A4A1-B358-4302-83B3-A317D1EB923F}.DVD-5|Mixed Platforms.Build.0 = Debug|x86 - {C743A4A1-B358-4302-83B3-A317D1EB923F}.DVD-5|x86.ActiveCfg = Debug|x86 - {C743A4A1-B358-4302-83B3-A317D1EB923F}.DVD-5|x86.Build.0 = Debug|x86 - {C743A4A1-B358-4302-83B3-A317D1EB923F}.Release|Any CPU.ActiveCfg = Release|x86 - {C743A4A1-B358-4302-83B3-A317D1EB923F}.Release|Any CPU.Build.0 = Release|x86 - {C743A4A1-B358-4302-83B3-A317D1EB923F}.Release|Mixed Platforms.ActiveCfg = Release|x86 - {C743A4A1-B358-4302-83B3-A317D1EB923F}.Release|Mixed Platforms.Build.0 = Release|x86 + {C743A4A1-B358-4302-83B3-A317D1EB923F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C743A4A1-B358-4302-83B3-A317D1EB923F}.Release|Any CPU.Build.0 = Release|Any CPU + {C743A4A1-B358-4302-83B3-A317D1EB923F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {C743A4A1-B358-4302-83B3-A317D1EB923F}.Release|Mixed Platforms.Build.0 = Release|Any CPU {C743A4A1-B358-4302-83B3-A317D1EB923F}.Release|x86.ActiveCfg = Release|x86 {C743A4A1-B358-4302-83B3-A317D1EB923F}.Release|x86.Build.0 = Release|x86 - {C743A4A1-B358-4302-83B3-A317D1EB923F}.SingleImage|Any CPU.ActiveCfg = Release|x86 - {C743A4A1-B358-4302-83B3-A317D1EB923F}.SingleImage|Mixed Platforms.ActiveCfg = Release|x86 - {C743A4A1-B358-4302-83B3-A317D1EB923F}.SingleImage|Mixed Platforms.Build.0 = Release|x86 - {C743A4A1-B358-4302-83B3-A317D1EB923F}.SingleImage|x86.ActiveCfg = Release|x86 - {C743A4A1-B358-4302-83B3-A317D1EB923F}.SingleImage|x86.Build.0 = Release|x86 - {C4257819-2B63-47A7-AF49-B997C5CA0FAA}.CD_ROM|Any CPU.ActiveCfg = Release|Any CPU - {C4257819-2B63-47A7-AF49-B997C5CA0FAA}.CD_ROM|Any CPU.Build.0 = Release|Any CPU - {C4257819-2B63-47A7-AF49-B997C5CA0FAA}.CD_ROM|Mixed Platforms.ActiveCfg = Release|Any CPU - {C4257819-2B63-47A7-AF49-B997C5CA0FAA}.CD_ROM|Mixed Platforms.Build.0 = Release|Any CPU - {C4257819-2B63-47A7-AF49-B997C5CA0FAA}.CD_ROM|x86.ActiveCfg = Release|Any CPU - {C4257819-2B63-47A7-AF49-B997C5CA0FAA}.CD_ROM|x86.Build.0 = Release|Any CPU {C4257819-2B63-47A7-AF49-B997C5CA0FAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C4257819-2B63-47A7-AF49-B997C5CA0FAA}.Debug|Any CPU.Build.0 = Debug|Any CPU {C4257819-2B63-47A7-AF49-B997C5CA0FAA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU {C4257819-2B63-47A7-AF49-B997C5CA0FAA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU {C4257819-2B63-47A7-AF49-B997C5CA0FAA}.Debug|x86.ActiveCfg = Debug|Any CPU {C4257819-2B63-47A7-AF49-B997C5CA0FAA}.Debug|x86.Build.0 = Debug|Any CPU - {C4257819-2B63-47A7-AF49-B997C5CA0FAA}.DVD-5|Any CPU.ActiveCfg = Debug|Any CPU - {C4257819-2B63-47A7-AF49-B997C5CA0FAA}.DVD-5|Any CPU.Build.0 = Debug|Any CPU - {C4257819-2B63-47A7-AF49-B997C5CA0FAA}.DVD-5|Mixed Platforms.ActiveCfg = Debug|Any CPU - {C4257819-2B63-47A7-AF49-B997C5CA0FAA}.DVD-5|Mixed Platforms.Build.0 = Debug|Any CPU - {C4257819-2B63-47A7-AF49-B997C5CA0FAA}.DVD-5|x86.ActiveCfg = Debug|Any CPU - {C4257819-2B63-47A7-AF49-B997C5CA0FAA}.DVD-5|x86.Build.0 = Debug|Any CPU {C4257819-2B63-47A7-AF49-B997C5CA0FAA}.Release|Any CPU.ActiveCfg = Release|Any CPU {C4257819-2B63-47A7-AF49-B997C5CA0FAA}.Release|Any CPU.Build.0 = Release|Any CPU {C4257819-2B63-47A7-AF49-B997C5CA0FAA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {C4257819-2B63-47A7-AF49-B997C5CA0FAA}.Release|Mixed Platforms.Build.0 = Release|Any CPU {C4257819-2B63-47A7-AF49-B997C5CA0FAA}.Release|x86.ActiveCfg = Release|Any CPU {C4257819-2B63-47A7-AF49-B997C5CA0FAA}.Release|x86.Build.0 = Release|Any CPU - {C4257819-2B63-47A7-AF49-B997C5CA0FAA}.SingleImage|Any CPU.ActiveCfg = Release|Any CPU - {C4257819-2B63-47A7-AF49-B997C5CA0FAA}.SingleImage|Any CPU.Build.0 = Release|Any CPU - {C4257819-2B63-47A7-AF49-B997C5CA0FAA}.SingleImage|Mixed Platforms.ActiveCfg = Release|Any CPU - {C4257819-2B63-47A7-AF49-B997C5CA0FAA}.SingleImage|Mixed Platforms.Build.0 = Release|Any CPU - {C4257819-2B63-47A7-AF49-B997C5CA0FAA}.SingleImage|x86.ActiveCfg = Release|Any CPU - {C4257819-2B63-47A7-AF49-B997C5CA0FAA}.SingleImage|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/ACPLogAnalyzer/.gitignore b/ACPLogAnalyzer/.gitignore new file mode 100644 index 0000000..4d13c54 --- /dev/null +++ b/ACPLogAnalyzer/.gitignore @@ -0,0 +1,334 @@ +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore + +# User-specific files +*.rsuser +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUNIT +*.VisualState.xml +TestResult.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_h.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*_wpftmp.csproj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# JustCode is a .NET coding add-in +.JustCode + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# JetBrains Rider +.idea/ +*.sln.iml + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ diff --git a/ACPLogAnalyzer/ACPLogAnalyzer.csproj b/ACPLogAnalyzer/ACPLogAnalyzer.csproj index 9fa666a..589c799 100644 --- a/ACPLogAnalyzer/ACPLogAnalyzer.csproj +++ b/ACPLogAnalyzer/ACPLogAnalyzer.csproj @@ -1,6 +1,6 @@  - + Debug x86 @@ -12,7 +12,8 @@ ACPLogAnalyzer ACPLogAnalyzer v4.0 - Client + + 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 @@ -26,7 +27,7 @@ C:\Users\dwormuth\Downloads\ true Disk - true + false Background 1 Hours @@ -44,7 +45,7 @@ true - x86 + AnyCPU true full false @@ -56,11 +57,12 @@ - x86 + AnyCPU pdbonly true bin\Release\ - TRACE + + prompt 4 @@ -77,22 +79,31 @@ true - true + false + + + AnyCPU + bin\Debug\ + + + AnyCPU + bin\Release\ - - ..\packages\NUnit.3.10.1\lib\net40\nunit.framework.dll + + ..\packages\NUnit.3.11.0\lib\net40\nunit.framework.dll - - False - bin\Debug\System.Windows.Controls.DataVisualization.Toolkit.dll + + ..\packages\System.Windows.Controls.DataVisualization.Toolkit.4.0.0.0\lib\net40-Client\System.Windows.Controls.DataVisualization.Toolkit.dll + + + ..\packages\WPFToolkit.3.5.50211.1\lib\System.Windows.Controls.Input.Toolkit.dll - - False - bin\Debug\System.Windows.Controls.DataVisualization.Toolkit.VisualStudio.Design.dll + + ..\packages\WPFToolkit.3.5.50211.1\lib\System.Windows.Controls.Layout.Toolkit.dll @@ -107,8 +118,7 @@ - False - bin\Debug\WPFToolkit.dll + ..\packages\WPFToolkit.3.5.50211.1\lib\WPFToolkit.dll @@ -117,6 +127,9 @@ Designer + + ConfigParser.xaml + ConfigPlot.xaml @@ -142,6 +155,10 @@ Help.xaml + + Designer + MSBuild:Compile + Designer MSBuild:Compile @@ -204,8 +221,6 @@ Resources.Designer.cs Designer - - @@ -253,7 +268,7 @@ False - Microsoft .NET Framework 4.6.1 %28x86 and x64%29 + Microsoft .NET Framework 4.6.1 %28x86 и x64%29 true @@ -265,9 +280,9 @@ - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + Данный проект ссылается на пакеты NuGet, отсутствующие на этом компьютере. Используйте восстановление пакетов NuGet, чтобы скачать их. Дополнительную информацию см. по адресу: http://go.microsoft.com/fwlink/?LinkID=322105. Отсутствует следующий файл: {0}. - +