Merge branch 'develop'

ied206 · Oct 30, 2018 · c9f09cd · c9f09cd
2 parents 35e1f9c + a8a7213
commit c9f09cd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/ManagedWimLib/ManagedWimLib.csproj b/ManagedWimLib/ManagedWimLib.csproj
@@ -9,13 +9,13 @@
 Supports Windows and Linux.</Description>
     <Copyright>Copyright (c) 2018 Hajin Jang</Copyright>
     <Company>Joveler</Company>
-    <PackageReleaseNotes>- Support armhf, arm64 on linux</PackageReleaseNotes>
+    <PackageReleaseNotes>- Include native armhf, arm64 linux binary</PackageReleaseNotes>
     <PackageLicenseUrl>https://github.com/ied206/ManagedWimLib/blob/master/LICENSE</PackageLicenseUrl>
     <PackageProjectUrl>https://github.com/ied206/ManagedWimLib</PackageProjectUrl>
     <RepositoryUrl></RepositoryUrl>
     <PackageTags>wim wimlib pinvoke interop</PackageTags>
     <PackageIconUrl>https://raw.githubusercontent.com/ied206/ManagedWimLib/master/Image/Logo.png</PackageIconUrl>
-    <Version>1.2.2</Version>
+    <Version>1.2.3</Version>
   </PropertyGroup>
   <Import Project="$(MSBuildProjectDirectory)\ManagedWimLib.targets" />
 </Project>
diff --git a/ManagedWimLib/ManagedWimLib.nuspec b/ManagedWimLib/ManagedWimLib.nuspec
@@ -3,7 +3,7 @@
   <metadata>
     <id>ManagedWimLib</id>
     <title>ManagedWimLib</title>
-    <version>1.2.2</version>
+    <version>1.2.3</version>
     <owners>ied206</owners>
     <authors>Eric Biggers, Hajin Jang</authors>
     <licenseUrl>https://github.com/ied206/ManagedWimLib/blob/master/LICENSE</licenseUrl> 
@@ -13,7 +13,7 @@
     <description>C# pinvoke library for wimlib.
 Supports Windows and Linux.</description>
     <summary>C# pinvoke library for wimlib.</summary>
-    <releaseNotes>- Support armhf, arm64 on linux</releaseNotes>
+    <releaseNotes>- Include native armhf, arm64 linux binary</releaseNotes>
     <copyright>Copyright (c) 2018 Hajin Jang</copyright>
     <tags>wim wimlib pinvoke interop</tags>
     <dependencies>
@@ -29,20 +29,26 @@ Supports Windows and Linux.</description>
     <file src="Precompiled\x86\libwim-15.dll" target="build\net451\Precompiled\x86" />
     <file src="Precompiled\x64\libwim-15.dll" target="build\net451\Precompiled\x64" />
     <file src="Precompiled\x64\libwim.so" target="build\net451\Precompiled\x64" />
+    <file src="Precompiled\armhf\libwim.so" target="build\net451\Precompiled\armhf" />
+    <file src="Precompiled\arm64\libwim.so" target="build\net451\Precompiled\arm64" />
     <file src="ManagedWimLib.targets" target="build\net451\ManagedWimLib.targets" />
     <!-- .Net Standard 1.3 -->
     <file src="bin\Release\netstandard1.3\ManagedWimLib.dll" target="lib\netstandard1.3" />
     <file src="bin\Release\netstandard1.3\ManagedWimLib.pdb" target="lib\netstandard1.3" />
     <file src="Precompiled\x86\libwim-15.dll" target="build\netstandard1.3\Precompiled\x86" />
     <file src="Precompiled\x64\libwim-15.dll" target="build\netstandard1.3\Precompiled\x64" />
     <file src="Precompiled\x64\libwim.so" target="build\netstandard1.3\Precompiled\x64" />
+    <file src="Precompiled\armhf\libwim.so" target="build\netstandard1.3\Precompiled\armhf" />
+    <file src="Precompiled\arm64\libwim.so" target="build\netstandard1.3\Precompiled\arm64" />
     <file src="ManagedWimLib.targets" target="build\netstandard1.3\ManagedWimLib.targets" />
     <!-- .Net Standard 2.0 -->
     <file src="bin\Release\netstandard2.0\ManagedWimLib.dll" target="lib\netstandard2.0" />
     <file src="bin\Release\netstandard2.0\ManagedWimLib.pdb" target="lib\netstandard2.0" />
     <file src="Precompiled\x86\libwim-15.dll" target="build\netstandard2.0\Precompiled\x86" />
     <file src="Precompiled\x64\libwim-15.dll" target="build\netstandard2.0\Precompiled\x64" />
     <file src="Precompiled\x64\libwim.so" target="build\netstandard2.0\Precompiled\x64" />
+    <file src="Precompiled\armhf\libwim.so" target="build\netstandard2.0\Precompiled\armhf" />
+    <file src="Precompiled\arm64\libwim.so" target="build\netstandard2.0\Precompiled\arm64" />
     <file src="ManagedWimLib.targets" target="build\netstandard2.0\ManagedWimLib.targets" />
   </files>
 </package>