Prepare 2.0.4

* Also added demo distribution
* Fixed build not aborting if code signing failed

.gitignore

@@ -7,6 +7,7 @@ NDependOut/
 _NCrunch_*/
 nuget/
 testresults/
+dist/
 
 push.cmd
 

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## 2.0.4
+
+### Fixed
+
+* Fixed issues (including a crash) that could occur loading
+  plain text fonts that contained blank lines
+
 ## 2.0.3
 
 ### Added

CONTRIBUTORS.md

@@ -1,23 +1,28 @@
 # Contributors
 
-## Version 2.0.3
+## 2.0.4
+
+* @AshleighAdams for fixing a crash when loading a plain text
+  font that contained blank lines
+
+## 2.0.3
 
 * @abenedik for fixing a crash when loading a plain text font
   and texture filenames contained spaces
 
-## Version 2.0
+## 2.0
 
 * @Tom94 for the initial conversion to SDK project format
 
-## Version 1.3.4
+## 1.3.4
 
 * @JTOne123 for adding SourceLink support
 
-## Version 1.3.3
+## 1.3.3
 
 * @ScottSWu for fixing kerning by implementing equality
 
-## Version 1.3.1
+## 1.3.1
 
 * @rds1983 for fixing a crash when fields were missing or
   invalid in plain text font files

LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright © 2012-2021 Cyotek Ltd.
+Copyright © 2012-2022 Cyotek Ltd.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

build.cmd

@@ -9,34 +9,120 @@ SET RELDIR=src\bin\Release\
 SET PRJFILE=src\%BASENAME%.csproj
 SET DLLNAME=%BASENAME%.dll
 
+SET DISTDIR=dist\
+
+SET DEMOPRJFILE=%BASENAME%.sln
+SET DEMORELDIR=fontviewer\bin\Release\
+SET DEMORELDIR2=textmaker\bin\Release\
+
+SET DEPDIR=%DISTDIR%demo\
+
 IF EXIST %RELDIR%*.nupkg  DEL /F %RELDIR%*.nupkg
 IF EXIST %RELDIR%*.snupkg DEL /F %RELDIR%*.snupkg
 IF EXIST %RELDIR%*.zip    DEL /F %RELDIR%*.zip
+IF EXIST %DEPDIR%         RMDIR /Q /S %DEPDIR%
+IF EXIST %DISTDIR%        RMDIR /Q /S %DISTDIR%
+
+MKDIR %DISTDIR%
+
+CALL :builddemo
+IF %ERRORLEVEL% NEQ 0 GOTO :failed
+
+CALL :buildpackage
+IF %ERRORLEVEL% NEQ 0 GOTO :failed
+
+ENDLOCAL
+
+GOTO :eof
+
+:buildfailed
+:failed
+CECHO {0c}ERROR  {#}: Build failed.{\n}
+EXIT /b 1
+
+:builddemo
+%msbuildexe% %DEMOPRJFILE% /p:Configuration=Release /verbosity:minimal /nologo /t:Clean,Build
+IF %ERRORLEVEL% NEQ 0 EXIT /b %ERRORLEVEL%
+
+MKDIR %DEPDIR%
+MKDIR %DEPDIR%\samples
+
+COPY %DEMORELDIR%ctkbmfnt.exe                           %DEPDIR%demo.exe
+COPY %DEMORELDIR%ctkbmfnt.pdb                           %DEPDIR%demo.pdb
+COPY %DEMORELDIR%ctkbmfnt.exe.config                    %DEPDIR%demo.exe.config
+COPY %DEMORELDIR%%BASENAME%.dll                         %DEPDIR%
+COPY %DEMORELDIR%%BASENAME%.pdb                         %DEPDIR%
+COPY %DEMORELDIR%Cyotek.Windows.Forms.ImageBox.dll      %DEPDIR%
+COPY %DEMORELDIR%about.txt                              %DEPDIR%
+COPY %DEMORELDIR%samples\*.*                            %DEPDIR%samples
 
+COPY %DEMORELDIR2%ctktxtmk.exe                          %DEPDIR%
+COPY %DEMORELDIR2%ctktxtmk.pdb                          %DEPDIR%
+COPY %DEMORELDIR2%ctktxtmk.exe.config                   %DEPDIR%
+COPY %DEMORELDIR2%Cyotek.Windows.Forms.ColorPicker.dll  %DEPDIR%
+COPY %DEMORELDIR2%samples\*.ctm                         %DEPDIR%samples
+
+PUSHD %DEPDIR%
+
+CALL signcmd demo.exe
+IF %ERRORLEVEL% NEQ 0 EXIT /b %ERRORLEVEL%
+CALL signcmd ctktxtmk.exe
+IF %ERRORLEVEL% NEQ 0 EXIT /b %ERRORLEVEL%
+CALL signcmd %BASENAME%.dll
+IF %ERRORLEVEL% NEQ 0 EXIT /b %ERRORLEVEL%
+
+%zipexe% a %BASENAME%.Demo.2.x.x.zip -r
+
+POPD
+
+MOVE %DEPDIR%*.zip %DISTDIR%
+
+EXIT /b %ERRORLEVEL%
+
+:buildpackage
 dotnet build %PRJFILE% --configuration Release
+IF %ERRORLEVEL% NEQ 0 EXIT /b %ERRORLEVEL%
 
 PUSHD %RELDIR%
 
 CALL signcmd net35\%DLLNAME%
+IF %ERRORLEVEL% NEQ 0 EXIT /b %ERRORLEVEL%
 CALL signcmd net40\%DLLNAME%
+IF %ERRORLEVEL% NEQ 0 EXIT /b %ERRORLEVEL%
 CALL signcmd net452\%DLLNAME%
+IF %ERRORLEVEL% NEQ 0 EXIT /b %ERRORLEVEL%
 CALL signcmd net462\%DLLNAME%
+IF %ERRORLEVEL% NEQ 0 EXIT /b %ERRORLEVEL%
 CALL signcmd net472\%DLLNAME%
+IF %ERRORLEVEL% NEQ 0 EXIT /b %ERRORLEVEL%
 CALL signcmd net48\%DLLNAME%
+IF %ERRORLEVEL% NEQ 0 EXIT /b %ERRORLEVEL%
 CALL signcmd net5.0\%DLLNAME%
+IF %ERRORLEVEL% NEQ 0 EXIT /b %ERRORLEVEL%
 CALL signcmd netcoreapp2.1\%DLLNAME%
+IF %ERRORLEVEL% NEQ 0 EXIT /b %ERRORLEVEL%
 CALL signcmd netcoreapp2.2\%DLLNAME%
+IF %ERRORLEVEL% NEQ 0 EXIT /b %ERRORLEVEL%
 CALL signcmd netcoreapp3.1\%DLLNAME%
+IF %ERRORLEVEL% NEQ 0 EXIT /b %ERRORLEVEL%
 CALL signcmd netstandard1.3\%DLLNAME%
+IF %ERRORLEVEL% NEQ 0 EXIT /b %ERRORLEVEL%
 CALL signcmd netstandard2.0\%DLLNAME%
+IF %ERRORLEVEL% NEQ 0 EXIT /b %ERRORLEVEL%
 CALL signcmd netstandard2.1\%DLLNAME%
+IF %ERRORLEVEL% NEQ 0 EXIT /b %ERRORLEVEL%
 
-%zipexe% a Cyotek.Drawing.BitmapFont.x.x.x.zip -r
+%zipexe% a %BASENAME%.2.x.x.zip -r
 
 POPD
 
+MOVE %RELDIR%*.zip %DISTDIR%
+
 dotnet pack %PRJFILE% --configuration Release --no-build
+IF %ERRORLEVEL% NEQ 0 EXIT /b %ERRORLEVEL%
+
 CALL sign-package %RELDIR%*.nupkg
+IF %ERRORLEVEL% NEQ 0 EXIT /b %ERRORLEVEL%
 CALL sign-package %RELDIR%*.snupkg
-
-ENDLOCAL
+IF %ERRORLEVEL% NEQ 0 EXIT /b %ERRORLEVEL%
+EXIT /b %ERRORLEVEL%

samples/test.ctm

@@ -2,7 +2,7 @@
   "font" : "Marediv (32px)",
   "backgroundColor" : "#B0E0E680",
   "textColor" : "Purple",
-  "text" : "AngelCode BMFont parsing\r\nusing Cyotek.Drawing.Bitmap",
+  "text" : "AngelCode BMFont parsing\r\nusing Cyotek.Drawing.BitmapFont",
   "padding" : [
     12,
     12,

src/Directory.Build.props

@@ -3,9 +3,9 @@
     <Title>Cyotek BitmapFont</Title>
     <Authors>Cyotek</Authors>
     <Owners>Cyotek</Owners>
-    <VersionPrefix>2.0.3</VersionPrefix>
+    <VersionPrefix>2.0.4</VersionPrefix>
     <VersionSuffix></VersionSuffix>
-    <Copyright>Copyright © 2012-2021 Cyotek Ltd. All Rights Reserved.</Copyright>
+    <Copyright>Copyright © 2012-2022 Cyotek Ltd. All Rights Reserved.</Copyright>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/cyotek/Cyotek.Drawing.BitmapFont</PackageProjectUrl>
     <PackageIcon>icon.png</PackageIcon>