Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
jeikabu committed Aug 3, 2020
1 parent 2d24038 commit 225762a
Show file tree
Hide file tree
Showing 10 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion dockerfiles/build_nng/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ RUN apt-get update && apt-get install -y \
git

ARG SRC
ARG NNG_BRANCH=v1.3.0
ARG NNG_BRANCH=v1.3.1
WORKDIR ${SRC}

RUN git clone https://github.com/nanomsg/nng.git \
Expand Down
4 changes: 2 additions & 2 deletions nng.NETCore/nng.NETCore.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
<!-- Including assembly as part of runtimes/ so don't want it placed in lib/ -->
<IncludeBuildOutput>false</IncludeBuildOutput>
<PackageId>Subor.nng.NETCore</PackageId>
<PackageVersion>1.3.0-rc1</PackageVersion>
<Version>1.3.0.1</Version>
<PackageVersion>1.3.1-rc0</PackageVersion>
<Version>1.3.1.0</Version>
<!-- Needed to avoid `error NU5128` when running `dotnet pack`.
Assemblies for targetted frameworks are in runtimes/ instead of lib/ or ref/
See: https://docs.microsoft.com/en-us/nuget/reference/errors-and-warnings/nu5128#scenario-2
Expand Down
Binary file modified nng.NETCore/runtimes/linux-arm/native/libnng.so
Binary file not shown.
Binary file modified nng.NETCore/runtimes/linux-arm64/native/libnng.so
Binary file not shown.
Binary file modified nng.NETCore/runtimes/linux-x64/native/libnng.so
Binary file not shown.
Binary file modified nng.NETCore/runtimes/osx-x64/native/libnng.dylib
Binary file not shown.
Binary file modified nng.NETCore/runtimes/win-x64/native/nng.dll
Binary file not shown.
Binary file modified nng.NETCore/runtimes/win-x86/native/nng.dll
Binary file not shown.
4 changes: 2 additions & 2 deletions nng.Shared/nng.Shared.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@

<PropertyGroup>
<PackageId>Subor.nng.NETCore.Shared</PackageId>
<PackageVersion>1.3.0-rc1</PackageVersion>
<Version>1.3.0.1</Version>
<PackageVersion>1.3.1-rc0</PackageVersion>
<Version>1.3.1.0</Version>

<PackageOutputPath>../bin/$(Configuration)</PackageOutputPath>
</PropertyGroup>
Expand Down
1 change: 1 addition & 0 deletions scripts/build_nng.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ $current_dir = $(Get-Location)
try {
if ($IsLinux) {
docker build -t jeikabu/build-nng dockerfiles/build_nng
docker run --rm --privileged multiarch/qemu-user-static:register
docker run -i -t --rm -v "$PWD/nng.NETCore/runtimes:/runtimes" jeikabu/build-nng
}
else {
Expand Down

0 comments on commit 225762a

Please sign in to comment.