diff --git a/Build/Test/YaraSharp.dll b/Build/Test/YaraSharp.dll index 2ec9631..9640753 100644 Binary files a/Build/Test/YaraSharp.dll and b/Build/Test/YaraSharp.dll differ diff --git a/Build/Test/YaraTest.exe b/Build/Test/YaraTest.exe index 3332af7..5ee3650 100644 Binary files a/Build/Test/YaraTest.exe and b/Build/Test/YaraTest.exe differ diff --git a/README.md b/README.md index 40692ac..c2c22c6 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,8 @@ C# wrapper around the [Yara pattern matching library](https://github.com/VirusTotal/yara). Use signatures form [Loki](https://github.com/Neo23x0/signature-base/tree/master/yara) or [Yara](https://github.com/Yara-Rules/rules). + +Nuget package is [available](https://www.nuget.org/packages/YaraSharp) ## Usage ```C# // All API calls happens here @@ -77,7 +79,7 @@ Soultion contains 2 projects: ## Other Build in vs 2017 -Compiled with yara 3.7.0 +Compiled with yara 3.8.1 You can use or modify the sources however you want diff --git a/YaraSharp.1.1.3.nupkg b/YaraSharp.1.1.3.nupkg new file mode 100644 index 0000000..51db03b Binary files /dev/null and b/YaraSharp.1.1.3.nupkg differ diff --git a/YaraSharp/dll.rc b/YaraSharp/dll.rc index a2d6c9f..9dbbb70 100644 Binary files a/YaraSharp/dll.rc and b/YaraSharp/dll.rc differ diff --git a/YaraTest/YaraTest.csproj b/YaraTest/YaraTest.csproj index dd427b7..5c63d71 100644 --- a/YaraTest/YaraTest.csproj +++ b/YaraTest/YaraTest.csproj @@ -46,10 +46,6 @@ - - False - .\YaraSharp.dll - @@ -59,5 +55,11 @@ + + + {c005e3b9-2474-4fea-b5f4-7bb897111e8f} + YaraSharp + + \ No newline at end of file diff --git a/nuget/YaraSharp.1.2.1.nupkg b/nuget/YaraSharp.1.2.1.nupkg new file mode 100644 index 0000000..a6d9a4e Binary files /dev/null and b/nuget/YaraSharp.1.2.1.nupkg differ diff --git a/nuget/YaraSharp.nuspec b/nuget/YaraSharp.nuspec index f4d681a..8f02c99 100644 --- a/nuget/YaraSharp.nuspec +++ b/nuget/YaraSharp.nuspec @@ -2,7 +2,7 @@ YaraSharp - 1.2.0 + 1.2.1 YaraSharp stellarbears stellarbears @@ -16,7 +16,8 @@ yara yara-scanner wrapper-api wrapper-library yara-forensics wrapper libyara async-scanning net csharp + - + \ No newline at end of file diff --git a/nuget/build.ps1 b/nuget/build_special.ps1 similarity index 71% rename from nuget/build.ps1 rename to nuget/build_special.ps1 index 89b038b..bb4d500 100644 --- a/nuget/build.ps1 +++ b/nuget/build_special.ps1 @@ -7,10 +7,6 @@ param ( $projectName = (Split-Path $SourceDirectory -Leaf) $ErrorActionPreference = 'Stop' -& $msbuild /m "$SourceDirectory/$projectName.sln" /p:Configuration=Release /p:Platform="Any CPU" '/t:Clean;Rebuild' -if (-not $?) { - throw "msbuild returned error code: $LASTEXITCODE" -} & $msbuild /m "$SourceDirectory/$projectName.sln" /p:Configuration=Release /p:Platform="x86" '/t:Clean;Rebuild' if (-not $?) { throw "msbuild returned error code: $LASTEXITCODE" @@ -20,7 +16,7 @@ if (-not $?) { throw "msbuild returned error code: $LASTEXITCODE" } -(Get-Content "props").replace('PROJECTNAME', $projectName) | Set-Content "$SourceDirectory/Build/Release/$projectName.props" +(Get-Content "targets").replace('PROJECTNAME', $projectName) | Set-Content "$SourceDirectory/Build/Release/$projectName.targets" & $nuget pack -Exclude **\*.pdb -BasePath "$SourceDirectory/Build" "$PSScriptRoot/$projectName.nuspec" diff --git a/nuget/props b/nuget/props deleted file mode 100644 index 255b9fc..0000000 --- a/nuget/props +++ /dev/null @@ -1,11 +0,0 @@ - - - - - $(MSBuildThisFileDirectory)..\net\x86\PROJECTNAME.dll - - - $(MSBuildThisFileDirectory)..\net\x64\PROJECTNAME.dll - - - \ No newline at end of file diff --git a/nuget/targets b/nuget/targets new file mode 100644 index 0000000..efdd51a --- /dev/null +++ b/nuget/targets @@ -0,0 +1,43 @@ + + + + + + + + + + + %(RecursiveDir)%(FileName)%(Extension) + Always + + + + + + + + + + + + + + + + + $(PostBuildEventDependsOn); + CopyPROJECTNAMEFiles; + + + $(BuildDependsOn); + CopyPROJECTNAMEFiles; + + + $(CleanDependsOn); + CleanPROJECTNAMEFiles; + + +