diff --git a/.github/workflows/build-windows.yaml b/.github/workflows/build-windows.yaml new file mode 100644 index 0000000..bf0ee44 --- /dev/null +++ b/.github/workflows/build-windows.yaml @@ -0,0 +1,28 @@ +# Build the software/PC dotnet applications + +name: Windows Unisolder application + +on: + push: + pull_request: + branches: + - master + - develop + +jobs: + build: + runs-on: windows-latest + steps: + - uses: actions/checkout@v4 + - name: Add msbuild to PATH + uses: microsoft/setup-msbuild@v2 + # Build the application + - name: Build with MSBuild + working-directory: software/PC + run: msbuild /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/Release /p:DeployOnBuild=true /p:PublishProfile=Properties\PublishProfiles\UnisolderApp.pubxml /p:PublishDir=bin/Release /p:WebPublishMethod=FileSystem /p:DeleteExistingFiles=True /p:publishUrl=bin/Release /p:VisualStudioVersion=16.0 /p:DeployDefaultTarget=WebPublish + # Archive the build + - name: Archive build + uses: actions/upload-artifact@v2 + with: + name: UnisolderApp + path: software/PC/UniSolder/bin/Release \ No newline at end of file diff --git a/.gitignore b/.gitignore index beb41fb..d400e14 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,8 @@ software/front/US_Firmware.X/dist/PIC32_Standalone/production/ .vs/ *.Up2Date bin/ -obj/ \ No newline at end of file +obj/ +software/front/US_Firmware.X/build/PIC32_with_bootloader/debug/ +software/front/US_Firmware.X/dist/PIC32_with_bootloader/debug/ +*.deploy +software/PC/UniSolder/publish/ diff --git a/README.md b/README.md index 357dc0f..b105137 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ # UniSolder - The universal soldering controller ![License CC-BY-4.0](https://img.shields.io/badge/License-CC--BY--4.0-green.svg) Control almost any low voltage soldering instrument +[![Windows Unisolder application](https://github.com/PBrunot/UniSolder-5.2/actions/workflows/build-windows.yaml/badge.svg)](https://github.com/PBrunot/UniSolder-5.2/actions/workflows/build-windows.yaml) + My intention was to build the most universal soldering controller I can think of. It can drive any low voltage (upto 24V) iron with thermocouple or resistive sensor, in series with the heater, or separate. diff --git a/software/PC/UniSolder/UniSolder.csproj b/software/PC/UniSolder/UniSolder.csproj index 857a891..42b0264 100644 --- a/software/PC/UniSolder/UniSolder.csproj +++ b/software/PC/UniSolder/UniSolder.csproj @@ -12,6 +12,8 @@ v4.8 512 true + false + publish\ true Disk @@ -22,12 +24,11 @@ false false true - 0 + 1 1.0.0.%2a - false false + true true - AnyCPU @@ -51,6 +52,18 @@ UniSolder.Program + + CB58969D1BAAC89BC98FD8152A9F2E9A0AF1A2F4 + + + UniSolder_TemporaryKey.pfx + + + true + + + true + @@ -97,6 +110,7 @@ Settings.settings True + @@ -114,7 +128,7 @@ False - Microsoft .NET Framework 4.5.2 %28x86 and x64%29 + Microsoft .NET Framework 4.5.2 %28x86 e x64%29 true diff --git a/software/PC/UniSolder/UniSolder_TemporaryKey.pfx b/software/PC/UniSolder/UniSolder_TemporaryKey.pfx new file mode 100644 index 0000000..7392d4e Binary files /dev/null and b/software/PC/UniSolder/UniSolder_TemporaryKey.pfx differ