Merge pull request #39 from gpproton/dev

drolx · Nov 1, 2020 · a309ab5 · a309ab5
2 parents ed5f4d4 + 2fc34bd
commit a309ab5
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 10 deletions.
diff --git a/.github/workflows/dotnet-dev-publish.yml b/.github/workflows/dotnet-dev-publish.yml
@@ -9,7 +9,7 @@ jobs:
     name: Release
     strategy:
       matrix:
-        kind: ['linux-x64', 'linux-arm64', 'linux-arm', 'windows-x64', 'macOS-x64']
+        kind: ['linux-x64', 'linux-arm64', 'linux-arm', 'windows-x64', 'osx-x64']
         include:
           - kind: linux-x64
             os: ubuntu-latest
@@ -23,7 +23,7 @@ jobs:
           - kind: windows-x64
             os: windows-latest
             target: win-x64
-          - kind: macOS-x64
+          - kind: osx-x64
             os: macos-latest
             target: osx-x64
     runs-on: ${{ matrix.os }}
@@ -41,14 +41,17 @@ jobs:
         run: |
           tag=$(git describe --tags --abbrev=0)
           release_name="UHFRFID-IOT-bin-$tag-${{ matrix.target }}"
-          # Build everything
-          dotnet publish UHFRFID-IOT.csproj --framework net5.0 --runtime "${{ matrix.target }}" -c Release -o "$release_name" /p:SelfContained=true /p:PublishSingleFile=true /p:PublishTrimmed=false /p:PublishReadyToRun=false
-          # Pack files
+
+          # Build for windows, osx and linux
+            dotnet publish UHFRFID-IOT.csproj --runtime "${{ matrix.target }}" -c Release -o "$release_name" --self-contained true -p:PublishSingleFile=true -p:PublishTrimmed=true -p:PublishReadyToRun=true
+
+          # Build everything & Pack files
           if [ "${{ matrix.target }}" == "win-x64" ]; then
-            # Pack to zip for Windows
+            # Pack to zip
             7z a -tzip "${release_name}.zip" "./${release_name}/*"
           else
-          tar czvf "${release_name}.tar.gz" "$release_name"
+            # Pack to gzipped tar 
+            tar czvf "${release_name}.tar.gz" "$release_name"
           fi
           # Delete output directory
           rm -r "$release_name"

diff --git a/Program.cs b/Program.cs
@@ -23,15 +23,16 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-using System.Threading;
+using System;
 using System.Threading.Tasks;
-using NLog.Web;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Hosting;
+using NLog.Web;
 using RFIDIOT.Handlers;
 using RFIDIOT.Helpers;
 
+
 namespace RFIDIOT
 {
     internal static class Program
@@ -42,7 +43,9 @@ internal static class Program
 
         static void Main(string[] args)
         {
-            _logger.Trigger("Info", "Booting up daemon.....");
+            Console.WriteLine(Figgle.FiggleFonts.Standard.Render("UHFRFID IOT"));
+
+            _logger.Trigger("Info", "Booting up daemon....");
 
             // Reader process thread//
             Task.Run(() => _readerProcess.Run()).Wait();

diff --git a/UHFRFID-IOT.csproj b/UHFRFID-IOT.csproj
@@ -31,6 +31,7 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(RunConfiguration)' == 'UHFRFID-IOT' " />
   <ItemGroup>
+    <PackageReference Include="Figgle" Version="0.4.0" />
     <PackageReference Include="System.IO.Ports" Version="5.0.0-rc.2.20475.5" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.0-rc.2.20475.6" />
     <PackageReference Include="Autofac" Version="6.0.0" />