Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
ied206 committed Dec 5, 2018
2 parents c9f09cd + 81a19cb commit 1fc32d6
Show file tree
Hide file tree
Showing 9 changed files with 7 additions and 10 deletions.
6 changes: 3 additions & 3 deletions ManagedWimLib.Tests/GetVersionTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@ public class GetVersionTests
public void GetImageInfo()
{
Version ver = Wim.GetVersion();
Assert.AreEqual(new Version(1, 12, 0), ver);
Assert.AreEqual(new Version(1, 13, 0), ver);

Tuple<ushort, ushort, ushort> tuple = Wim.GetVersionTuple();
Assert.AreEqual(new Tuple<ushort, ushort, ushort>(1, 12, 0), tuple);
Assert.AreEqual(new Tuple<ushort, ushort, ushort>(1, 13, 0), tuple);

string str = Wim.GetVersionString();
Assert.IsTrue(str.Equals("1.13.0-BETA5", StringComparison.Ordinal));
Assert.IsTrue(str.Equals("1.13.0", StringComparison.Ordinal));
}
#endregion
}
Expand Down
3 changes: 0 additions & 3 deletions ManagedWimLib/ManagedWimLib.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,6 @@ Supports Windows and Linux.</description>
<file src="bin\Release\net451\ManagedWimLib.pdb" target="lib\net451" />
<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" />
Expand Down
Binary file modified ManagedWimLib/Precompiled/arm64/libwim.so
Binary file not shown.
Binary file modified ManagedWimLib/Precompiled/armhf/libwim.so
Binary file not shown.
Binary file modified ManagedWimLib/Precompiled/x64/libwim-15.dll
Binary file not shown.
Binary file modified ManagedWimLib/Precompiled/x64/libwim.so
Binary file not shown.
Binary file modified ManagedWimLib/Precompiled/x86/libwim-15.dll
Binary file not shown.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ If you need .Net Framework 4.5 support, use [1.1.x version](https://www.nuget.or

### Supported wimlib version

- 1.13.0-BETA5 (Included)
- 1.13.0 (Included)

## Usage

Expand All @@ -58,4 +58,4 @@ Licensed under LGPLv3.
See [LICENSE](./LICENSE) for details.

Logo is licensed under CC BY 3.0 US.
[disc](https://thenounproject.com/term/disc/772617) by Ralf Schmitzer from the Noun Project
[disc](https://thenounproject.com/term/disc/772617) by Ralf Schmitzer from the Noun Project.
4 changes: 2 additions & 2 deletions USAGE.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public static void InitNativeLibrary()

### Embedded binary

ManagedWimLib comes with sets of binaries of `wimlib 1.13.0-BETA5`.
ManagedWimLib comes with sets of binaries of `wimlib 1.13.0`.
They will be copied into the build directory at build time.

| Platform | Binary | License |
Expand Down Expand Up @@ -95,4 +95,4 @@ Most of the use cases follow this flow.
2. Do your job by calling API of your interest.
3. Cleanup Wim instance with the Disposable pattern.

[ManagedWimLib.Tests](./ManagedWimLib.Tests) provide a lot of examples of how to use ManagedWimLib.
[ManagedWimLib.Tests](./ManagedWimLib.Tests) provide a lot of examples of how to use ManagedWimLib.

0 comments on commit 1fc32d6

Please sign in to comment.