Merge branch 'renovate/epplus-5.x' into 'master'

Update dependency EPPlus to v5.4.2

See merge request JFronny/GradeCalc!26

.github/workflows/main.yml

@@ -1,71 +0,0 @@
-name: CD
-
-on:
-  push:
-    branches:
-      - master
-
-jobs:
-  build:
-    runs-on: windows-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Build
-      id: base_init
-      run: |
-        $(new-object System.Net.WebClient).DownloadFile("https://www.github.com/JFronny/UpTool2/releases/latest/download/Tools.zip", "$($(pwd).Path)\Tools.zip")
-        & "C:\Program Files\7-Zip\7z.exe" x .\Tools.zip
-        rm Tools.zip
-        rm Install.bat
-        rm Remove.bat
-        dotnet build --verbosity:m -p:Configuration=Release
-        cp *\bin\Release\netcoreapp3.1\package.zip .
-        $file = Get-Item $(Resolve-Path *\bin\Release\netcoreapp3.1\*.exe).Path
-        $asm = $([Reflection.Assembly]::LoadFile($file.DirectoryName + "\" + $file.BaseName + ".dll"))
-        $asmver = $asm.GetName().Version.ToString()
-        echo "::set-output name=vers::$asmver"
-    - name: Create Release
-      id: create_release
-      uses: actions/create-release@v1.0.1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        tag_name: ${{ steps.base_init.outputs.vers }}
-        release_name: Release ${{ steps.base_init.outputs.vers }}
-        draft: false
-        prerelease: false
-    - name: Upload Release Asset
-      id: upload_release_asset
-      uses: actions/upload-release-asset@v1.0.2
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: ./package.zip
-        asset_name: package.zip
-        asset_content_type: application/zip
-    - name: Generate XML
-      run: |
-        $file = Get-Item $(Resolve-Path *\bin\Release\netcoreapp3.1\*.exe).Path
-        $asm = [Reflection.Assembly]::LoadFile($file.DirectoryName + "\" + $file.BaseName + ".dll")
-        [System.XML.XMLDocument]$xml=New-Object System.XML.XMLDocument
-        [System.XML.XMLElement]$app=$xml.CreateElement("app")
-        $xml.appendChild($app)
-        $app.appendChild($xml.CreateElement("Name")).InnerText = $asm.GetName().Name
-        $app.appendChild($xml.CreateElement("Description")).InnerText = "Calculate grades for students"
-        $app.appendChild($xml.CreateElement("Version")).InnerText = "${{ steps.base_init.outputs.vers }}"
-        $app.appendChild($xml.CreateElement("ID")).InnerText = "c8119098-ec7f-4fb3-8668-9e81915b112d"
-        $app.appendChild($xml.CreateElement("File")).InnerText = "${{ steps.upload_release_asset.outputs.browser_download_url }}"
-        $app.appendChild($xml.CreateElement("Hash")).InnerText = $(Get-FileHash .\package.zip).Hash
-        $app.appendChild($xml.CreateElement("MainFile")).InnerText = $file.Name
-        echo NULL > app.xml
-        $xml.save($(gi .\app.xml).Fullname)
-    - name: Upload XML
-      uses: actions/upload-release-asset@v1.0.2
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: ./app.xml
-        asset_name: app.xml
-        asset_content_type: text/xml

.gitlab-ci.yml

@@ -0,0 +1,48 @@
+.shared_windows_runners:
+  tags:
+  - windows
+
+image: mcr.microsoft.com/dotnet/core/sdk
+
+uptool:
+  extends:
+  - .shared_windows_runners
+  stage: deploy
+  script: |
+    mkdir i
+    cd i
+    $(new-object System.Net.WebClient).DownloadFile("https://gitlab.com/JFronny/UpTool2/-/jobs/artifacts/master/raw/Installer-generic.zip?job=uptool", "$($(pwd).Path)\Install.zip")
+    & "C:\Program Files\7-Zip\7z.exe" x .\Install.zip
+    .\Installer.exe --basic i -p
+    cd ..
+    rm -R i
+    $Env:Path="$Env:Path;$Env:APPDATA\UpTool2\Install"
+    uptool --basic add-repo DevTools https://gitlab.com/JFronny/UpTool2/-/snippets/2010392/raw
+    uptool --basic update
+    uptool --basic install "UpTool2 package tools"
+    $Env:Path="$Env:Path;$Env:APPDATA\UpTool2\Apps\0e35d154-d0d3-45e0-b080-62f521263a44\app"
+
+    mkdir .\build
+    dotnet publish -o .\build -c Release
+    $file = Get-Item $(Resolve-Path .\build\*.exe).Path
+    pkgtool build --binDir build --mainBin $file --packageFile .\package.zip --noLogo
+    $asm = $([Reflection.Assembly]::LoadFile($file.DirectoryName + "\" + $file.BaseName + ".dll"))
+    $asmver = $asm.GetName().Version.ToString()
+    [System.XML.XMLDocument]$xml=New-Object System.XML.XMLDocument
+    [System.XML.XMLElement]$app=$xml.CreateElement("app")
+    $xml.appendChild($app)
+    $app.appendChild($xml.CreateElement("Name")).InnerText = $asm.GetName().Name
+    $app.appendChild($xml.CreateElement("Description")).InnerText = "Calculate grades for students"
+    $app.appendChild($xml.CreateElement("Version")).InnerText = $asmver
+    $app.appendChild($xml.CreateElement("ID")).InnerText = "c8119098-ec7f-4fb3-8668-9e81915b112d"
+    $app.appendChild($xml.CreateElement("File")).InnerText = $CI_PROJECT_URL + "/-/jobs/" + $CI_JOB_ID + "/artifacts/raw/package.zip"
+    $app.appendChild($xml.CreateElement("Hash")).InnerText = $(Get-FileHash .\package.zip).Hash
+    $app.appendChild($xml.CreateElement("MainFile")).InnerText = $file.Name
+    echo NULL > app.xml
+    $xml.save($(gi .\app.xml).Fullname)
+  artifacts:
+    paths:
+      - package.zip
+      - app.xml
+  only:
+    - master

GradeCalc/GradeCalc.csproj

@@ -10,8 +10,8 @@
     <PostBuildEvent>if exist "$(SolutionDir)Data\pkgtool.exe" ($(SolutionDir)Data\pkgtool.exe build --noLogo --binDir .) else if exist "%appdata%\UpTool2\Apps\0e35d154-d0d3-45e0-b080-62f521263a44\app\pkgtool.exe" ("%appdata%\UpTool2\Apps\0e35d154-d0d3-45e0-b080-62f521263a44\app\pkgtool.exe" build --noLogo --binDir .) else echo Cound not find Package build tools, skipping</PostBuildEvent>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="CC-Functions.Misc" Version="1.1.7396.23808" />
-    <PackageReference Include="EPPlus" Version="5.0.4" />
+    <PackageReference Include="CC-Functions.W32" Version="1.1.7468.32091" />
+    <PackageReference Include="EPPlus" Version="5.4.2" />
     <PackageReference Include="NCalc2" Version="2.1.0" />
   </ItemGroup>
 </Project>

GradeCalc/MainForm.cs

@@ -6,7 +6,7 @@ using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Windows.Forms;
-using CC_Functions.Misc;
+using CC_Functions.W32.Forms;
 using NCalc2;
 using OfficeOpenXml;
 using OfficeOpenXml.Style;

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020 J. Fronny
+
+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 the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+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.

README.md

@@ -1,2 +1,2 @@
 # GradeCalc
-Simple app to calculate student grades [![UpTool2](https://img.shields.io/github/v/tag/JFronny/GradeCalc?color=informational&label=UpTool2)](https://jfronny.github.io/home/uptool)
+Simple app to calculate student grades [![UpTool2](https://img.shields.io/badge/Get%20it-on%20UpTool2-blue)](https://jfronny.gitlab.io/home/uptool)

renovate.json

@@ -0,0 +1,5 @@
+{
+  "extends": [
+    "config:base"
+  ]
+}