diff --git a/tool/OpenCvSharp.ReleaseMaker/Packer.cs b/tool/OpenCvSharp.ReleaseMaker/Packer.cs index e2ce0033f..61af07b84 100644 --- a/tool/OpenCvSharp.ReleaseMaker/Packer.cs +++ b/tool/OpenCvSharp.ReleaseMaker/Packer.cs @@ -44,7 +44,7 @@ public static class Packer @"OpenCvSharp.Extensions\bin\Release\netcoreapp2.1\OpenCvSharp.Extensions.dll", @"OpenCvSharp.Extensions\bin\Release\netcoreapp2.1\OpenCvSharp.Extensions.pdb", }, - ["netcoreapp3.1"] = new[] + ["netcoreapp3.1"] = new[] { // netstandard2.1 @"OpenCvSharp\bin\Release\netstandard2.1\OpenCvSharp.dll", @@ -87,18 +87,27 @@ public static class Packer ".nuget", "packages", }.ToHashSet(); - - private static IReadOnlyDictionary UwpNativeDllDirectories(string version) => new Dictionary + + private static IReadOnlyDictionary UwpNativeDllDirectories(string version) { - ["x86"] = @$"opencv_files\opencv{version}_uwp_x86\x86\vc16\bin", - ["x64"] = @$"opencv_files\opencv{version}_uwp_x64\x64\vc16\bin", - ["ARM"] = @$"opencv_files\opencv{version}_uwp_ARM\x86\vc16\bin", - }; - private static IReadOnlyList UwpNativeDlls(string version) => new[] + version = version.Replace(".", ""); + return new Dictionary + { + ["x86"] = @$"opencv_files\opencv{version}_uwp_x86\x86\vc16\bin", + ["x64"] = @$"opencv_files\opencv{version}_uwp_x64\x64\vc16\bin", + ["ARM"] = @$"opencv_files\opencv{version}_uwp_ARM\x86\vc16\bin", + }; + } + + private static IReadOnlyList UwpNativeDlls(string version) { - $"opencv_world{version}.dll", - $"opencv_img_hash{version}.dll" - }; + version = version.Replace(".", ""); + return new[] + { + $"opencv_world{version}.dll", + $"opencv_img_hash{version}.dll" + }; + } /// /// Make