Merge from TFS remote branch

micjahn · Mar 2, 2017 · 625cb1e · 625cb1e
2 parents 216e27d + b508aca
commit 625cb1e
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 5 deletions.
diff --git a/build_deployment.cmd b/build_deployment.cmd
@@ -38,6 +38,7 @@ IF NOT EXIST "%BINARY_DIR%\winmd\zxing.winmd" GOTO BINARY_WINRTCOMPONENTS_NOT_FO
 IF NOT EXIST "%BINARY_DIR%\portable\zxing.portable.dll" GOTO BINARY_PORTABLE_NOT_FOUND
 IF NOT EXIST "%BINARY_DIR%\kinect\zxing.kinect.dll" GOTO BINARY_KINECT_NOT_FOUND
 IF NOT EXIST "%BINARY_DIR%\uwp\zxing.dll" GOTO BINARY_UWP_NOT_FOUND
+IF NOT EXIST "%BINARY_DIR%\netstandard1.6\zxing.dll" GOTO BINARY_NETSTANDARD16_NOT_FOUND
 
 ECHO.
 ECHO Build deployment files in directory
@@ -54,13 +55,18 @@ IF NOT EXIST "%BINARY_DIR%" GOTO BINARY_DIR_NOT_FOUND
 MKDIR "%DEPLOYMENT_DIR%" >NUL: 2>&1
 DEL /F "%DEPLOYMENT_DIR%\%FILENAME_BINARY%" >NUL: 2>&1
 
+REM
+REM preparing binaries
+REM ***************************************************************************************
+DEL /S "%BINARY_DIR%"\Clients\*.xml
+DEL /S "%BINARY_DIR%"\Clients\*.pdb
 
 REM
 REM building archives for binaries
 REM ***************************************************************************************
 
 CD "%BINARY_DIR%"
-"%ZIP_TOOL%" a -tzip -mx9 -r "%FILENAME_BINARY%" ce2.0 ce3.5 net2.0 net3.5 net4.0 net4.5 net4.6 winrt uwp unity sl4 sl5 wp7.0 wp7.1 wp8.0 monodroid winmd portable kinect ..\..\THANKS ..\..\COPYING -xr!Documentation
+"%ZIP_TOOL%" a -tzip -mx9 -r "%FILENAME_BINARY%" ce2.0 ce3.5 net2.0 net3.5 net4.0 net4.5 net4.6 winrt uwp netstandard1.6 unity sl4 sl5 wp7.0 wp7.1 wp8.0 monodroid winmd portable kinect ..\..\THANKS ..\..\COPYING -xr!Documentation
 "%ZIP_TOOL%" a -tzip -mx9 -r "%FILENAME_DEMO_BINARY%" Clients
 "%ZIP_TOOL%" a -tzip -mx9 -r "%FILENAME_DOCUMENTATION%" Documentation
 CD "%CURRENT_DIR%"
@@ -94,6 +100,7 @@ MKDIR "%SVN_EXPORT_DIR%\Base\3rdparty" >NUL: 2>&1
 MKDIR "%SVN_EXPORT_DIR%\Base\3rdparty\AForge" >NUL: 2>&1
 MKDIR "%SVN_EXPORT_DIR%\Base\3rdparty\EmguCV" >NUL: 2>&1
 MKDIR "%SVN_EXPORT_DIR%\Base\3rdparty\OpenCV" >NUL: 2>&1
+MKDIR "%SVN_EXPORT_DIR%\Base\3rdparty\log4net" >NUL: 2>&1
 MKDIR "%SVN_EXPORT_DIR%\Base\3rdparty\NUnit.NET" >NUL: 2>&1
 MKDIR "%SVN_EXPORT_DIR%\Base\3rdparty\NUnit.Silverlight" >NUL: 2>&1
 MKDIR "%SVN_EXPORT_DIR%\Base\3rdparty\Unity" >NUL: 2>&1
@@ -114,9 +121,11 @@ MKDIR "%SVN_EXPORT_DIR%\WinMD\Clients" >NUL: 2>&1
 "%SVN_TOOL%" export --force "%SVN_URL%/3rdparty/NUnit.Silverlight" "%SVN_EXPORT_DIR%\Base\3rdparty\NUnit.Silverlight"
 "%SVN_TOOL%" export --force "%SVN_URL%/3rdparty/Unity" "%SVN_EXPORT_DIR%\Base\3rdparty\Unity"
 "%SVN_TOOL%" export --force "%SVN_URL%/3rdparty/Kinect" "%SVN_EXPORT_DIR%\Base\3rdparty\Kinect"
+"%SVN_TOOL%" export --force "%SVN_URL%/Key" "%SVN_EXPORT_DIR%\Base\Key"
 "%SVN_TOOL%" export --force "%SVN_URL%/zxing.sln" "%SVN_EXPORT_DIR%\Base"
 "%SVN_TOOL%" export --force "%SVN_URL%/zxing.ce.sln" "%SVN_EXPORT_DIR%\Base"
 "%SVN_TOOL%" export --force "%SVN_URL%/zxing.vs2012.sln" "%SVN_EXPORT_DIR%\Base"
+"%SVN_TOOL%" export --force "%SVN_URL%/zxing.vs2015.sln" "%SVN_EXPORT_DIR%\Base"
 "%SVN_TOOL%" export --force "%SVN_URL%/zxing.monoandroid.sln" "%SVN_EXPORT_DIR%\Base"
 "%SVN_TOOL%" export --force "%SVN_URL%/zxing.monotouch.sln" "%SVN_EXPORT_DIR%\Base"
 "%SVN_TOOL%" export --force "%SVN_URL%/zxing.nunit" "%SVN_EXPORT_DIR%\Base"
@@ -125,10 +134,11 @@ MKDIR "%SVN_EXPORT_DIR%\WinMD\Clients" >NUL: 2>&1
 
 "%SVN_TOOL%" export --force "%SVN_URL_WINMD%/Source/lib" "%SVN_EXPORT_DIR%\WinMD\Source\lib"
 "%SVN_TOOL%" export --force "%SVN_URL_WINMD%/Clients" "%SVN_EXPORT_DIR%\WinMD\Clients"
+"%SVN_TOOL%" export --force "%SVN_URL_WINMD%/Key" "%SVN_EXPORT_DIR%\WinMD\Key"
 "%SVN_TOOL%" export --force "%SVN_URL_WINMD%/zxing.vs2012.sln" "%SVN_EXPORT_DIR%\WinMD"
 
 CD "%SVN_EXPORT_DIR%"
-"%ZIP_TOOL%" a -tzip -mx9 -r "%FILENAME_SOURCE%" Base\Source\lib\*.* Base\Source\test\src\*.* Base\Clients\*.* Base\3rdparty\*.* Base\zxing.sln Base\zxing.ce.sln Base\zxing.vs2012.sln Base\zxing.monoandroid.sln Base\zxing.monotouch.sln Base\zxing.nunit Base\THANKS WinMD\Source\lib\*.* WinMD\Clients\*.* WinMD\zxing.vs2012.sln
+"%ZIP_TOOL%" a -tzip -mx9 -r "%FILENAME_SOURCE%" Base\Source\lib\*.* Base\Source\test\src\*.* Base\Clients\*.* Base\3rdparty\*.* Base\Key\*.* Base\zxing.sln Base\zxing.ce.sln Base\zxing.vs2012.sln Base\zxing.vs2015.sln Base\zxing.monoandroid.sln Base\zxing.monotouch.sln Base\zxing.nunit Base\THANKS Base\COPYING WinMD\Source\lib\*.* WinMD\Clients\*.* WinMD\Key\*.* WinMD\zxing.vs2012.sln
 CD "%CURRENT_DIR%"
 
 RMDIR /S /Q "%SVN_EXPORT_DIR%" >NUL: 2>&1
@@ -304,5 +314,12 @@ ECHO weren't found.
 ECHO.
 GOTO END
 
+:BINARY_NETSTANDARD16_NOT_FOUND
+ECHO The .Net Standard binaries 
+ECHO %BINARY_DIR%\netstandard1.6\...
+ECHO weren't found.
+ECHO.
+GOTO END
+
 :END
 
diff --git a/nuget-push.cmd b/nuget-push.cmd
@@ -1,6 +1,6 @@
 @ECHO OFF
 
 SET Id=ZXing.Net
-SET VERSION=0.14.1.0
+SET VERSION=0.15.0.0
 
 3rdParty\nuget\nuget push Build\Deployment\%ID%.%VERSION%.nupkg
diff --git a/zxing.nuspec b/zxing.nuspec
@@ -13,7 +13,7 @@
     <description>ZXing.Net is a port of ZXing, an open-source, multi-format 1D/2D barcode image processing library originally implemented in Java.
 It has been ported by hand with a lot of optimizations and improvements.
 
-It is now compatible with .Net 2.0, .Net 3.5, .Net 4.0, .Net 4.5, .Net 4.6, Windows RT Class Library and Components, UWP (experimental), Silverlight 4, Silverlight 5, Windows Phone 7.x and Windows Phone 8.x and Xamarin.Android</description>
+It is now compatible with .Net 2.0, .Net 3.5, .Net 4.0, .Net 4.5, .Net 4.6, Windows RT Class Library and Components, UWP (experimental), .Net Standard 1.6 (experimental), Silverlight 4, Silverlight 5, Windows Phone 7.x and Windows Phone 8.x and Xamarin.Android</description>
     <summary>ZXing.Net is a port of ZXing, an open-source, multi-format 1D/2D barcode image processing library originally implemented in Java.</summary>
     <releaseNotes>* changes of the java version are reflected until 2017/02/27
 * many other small bug fixes and improvements</releaseNotes>
@@ -22,7 +22,7 @@ It is now compatible with .Net 2.0, .Net 3.5, .Net 4.0, .Net 4.5, .Net 4.6, Wind
   <files>
     <file src="Build\Release\net2.0\zxing.dll" target="lib\net20\zxing.dll" />
     <file src="Build\Release\net2.0\zxing.pdb" target="lib\net20\zxing.pdb" />
-    <file src="Build\Release\net2.0\zxing.XML" target="lib\net20\zxing.XM" />
+    <file src="Build\Release\net2.0\zxing.XML" target="lib\net20\zxing.XML" />
     <file src="Build\Release\net3.5\zxing.dll" target="lib\net35\zxing.dll" />
     <file src="Build\Release\net3.5\zxing.pdb" target="lib\net35\zxing.pdb" />
     <file src="Build\Release\net3.5\zxing.XML" target="lib\net35\zxing.XML" />
@@ -86,5 +86,8 @@ It is now compatible with .Net 2.0, .Net 3.5, .Net 4.0, .Net 4.5, .Net 4.6, Wind
     <file src="Build\Release\uwp\zxing.pdb" target="lib\uap10\zxing.pdb" />
     <file src="Build\Release\uwp\zxing.xml" target="lib\uap10\zxing.xml" />
     <file src="Build\Release\uwp\zxing.pri" target="lib\uap10\zxing.pri" />
+    <file src="Build\Release\netstandard1.6\zxing.dll" target="lib\netstandard\zxing.dll" />
+    <file src="Build\Release\netstandard1.6\zxing.pdb" target="lib\netstandard\zxing.pdb" />
+    <file src="Build\Release\netstandard1.6\zxing.xml" target="lib\netstandard\zxing.xml" />
   </files>
 </package>