[email protected]

jeikabu · Aug 3, 2020 · 225762a · 225762a
1 parent 2d24038
commit 225762a
Show file tree

Hide file tree

Showing 10 changed files with 6 additions and 5 deletions.
diff --git a/dockerfiles/build_nng/Dockerfile b/dockerfiles/build_nng/Dockerfile
@@ -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 \

diff --git a/nng.NETCore/nng.NETCore.csproj b/nng.NETCore/nng.NETCore.csproj
@@ -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

diff --git a/nng.NETCore/runtimes/linux-arm/native/libnng.so b/nng.NETCore/runtimes/linux-arm/native/libnng.so
diff --git a/nng.NETCore/runtimes/linux-arm64/native/libnng.so b/nng.NETCore/runtimes/linux-arm64/native/libnng.so
diff --git a/nng.NETCore/runtimes/linux-x64/native/libnng.so b/nng.NETCore/runtimes/linux-x64/native/libnng.so
diff --git a/nng.NETCore/runtimes/osx-x64/native/libnng.dylib b/nng.NETCore/runtimes/osx-x64/native/libnng.dylib
diff --git a/nng.NETCore/runtimes/win-x64/native/nng.dll b/nng.NETCore/runtimes/win-x64/native/nng.dll
diff --git a/nng.NETCore/runtimes/win-x86/native/nng.dll b/nng.NETCore/runtimes/win-x86/native/nng.dll
diff --git a/nng.Shared/nng.Shared.csproj b/nng.Shared/nng.Shared.csproj
@@ -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>

diff --git a/scripts/build_nng.ps1 b/scripts/build_nng.ps1
@@ -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 {