Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
1735725
Creating build automation
gbakeman Sep 25, 2022
5c1fdf1
Trying to fix syntax error @L31
gbakeman Sep 25, 2022
3cdc551
Allow dispatching workflow manually
gbakeman Sep 25, 2022
fe859b9
Setup MSBuild
gbakeman Sep 25, 2022
c2fca45
Upgrade AGauge compiled framework
gbakeman Sep 25, 2022
b07c0f0
Relocate ToastPopups class back into GUI program
gbakeman Sep 25, 2022
fa4ced3
Remove specific references to Windows 10-only classes, add WIN10 buil…
gbakeman Sep 25, 2022
577fd76
Migrate to new package definition type
gbakeman Sep 25, 2022
5095185
Add compiler def for toast usage
gbakeman Sep 25, 2022
be26099
Adding remaining build configs
gbakeman Sep 26, 2022
5c3d81c
Adding official MS community toolkit package
gbakeman Sep 28, 2022
04201ff
Build workflow restores NuGet packages
gbakeman Sep 28, 2022
dc92e29
Forgot a comment
gbakeman Sep 28, 2022
aa92bbc
Upgrading setup-nuget version
gbakeman Sep 28, 2022
8e29c5f
Change build action to devenv
gbakeman Sep 29, 2022
e31b43c
Replaced 3rd party action w/ environment var
gbakeman Sep 29, 2022
c0c872f
Fixing unescaped backslashes
gbakeman Sep 29, 2022
5ec70ab
Fix env var syntax
gbakeman Sep 29, 2022
19f2d7c
Use powershell env syntax
gbakeman Sep 29, 2022
6f8c5ca
Reverting changes back to msbuild
gbakeman Sep 29, 2022
17a1992
Removing Win10 build target
gbakeman Sep 29, 2022
3342318
Switching to msbuild package restore
gbakeman Sep 29, 2022
27815c4
Renaming main client project folder
gbakeman Sep 30, 2022
74ff4a9
Fixing Client project name
gbakeman Sep 30, 2022
6c69238
Updating output path in build
gbakeman Sep 30, 2022
f26f62a
upload-artifact does not use working-directory
gbakeman Sep 30, 2022
f63b609
MSBuild versioning tests
gbakeman Sep 30, 2022
94fcea9
Basic auto build version test
gbakeman Oct 3, 2022
ceafd78
Moving version calculation to beginning
gbakeman Oct 3, 2022
379d83d
Fix missing working directory
gbakeman Oct 3, 2022
ea8aa3c
More environment variable testing
gbakeman Oct 3, 2022
54285ea
Update build-validate.yaml
gbakeman Oct 3, 2022
7da1c93
Changing number source
gbakeman Oct 3, 2022
8ec42ab
Having trouble with math
gbakeman Oct 3, 2022
55de024
Force cast to int
gbakeman Oct 3, 2022
7f589bf
Correct env variable syntax
gbakeman Oct 3, 2022
c20c73b
Correct type
gbakeman Oct 3, 2022
bd2f621
Variable concat changes
gbakeman Oct 3, 2022
5ce7bfd
More var syntax fixing
gbakeman Oct 3, 2022
d0bbada
env var debugging
gbakeman Oct 3, 2022
8fe02a2
Didn't like the brackets?
gbakeman Oct 3, 2022
1be0494
More debug output, more syntax changes
gbakeman Oct 3, 2022
f0c4c18
More debugging
gbakeman Oct 3, 2022
df4229f
Trying solution from github
gbakeman Oct 3, 2022
7e2299b
Trying James's version
gbakeman Oct 3, 2022
5909054
Small tweaks
gbakeman Oct 3, 2022
628dff8
Update build-validate.yaml
gbakeman Oct 3, 2022
6ef604e
Use berglie/assembly-version
gbakeman Oct 7, 2022
fa5d6b4
Update build-validate.yaml
gbakeman Oct 7, 2022
402c593
Changing workflow name
gbakeman Oct 7, 2022
0b724a0
Update output dir env var
gbakeman Oct 8, 2022
bc5a0ee
Corrected var syntax (again)
gbakeman Oct 8, 2022
6bedc98
Correcting output dir
gbakeman Oct 8, 2022
2641633
Attempt to fix too many twos
gbakeman Oct 8, 2022
cd0bdfc
Merging from dev-2.2
gbakeman Oct 8, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 59 additions & 0 deletions .github/workflows/build-validate.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
name: build-debug

defaults:
run:
working-directory: WinNUT_V2

on:
push:
workflow_dispatch:
pull_request:
branches: [ main, Dev-2.2 ] # Build for dev primarily, probably don't need main...?
paths:
- '**.vb'
- '**.vbproj'

env:
DOTNET_VERSION: '4.7.2' # The .NET SDK version to use
SLN_FILE: WinNUT_V2.sln
DEBUG_OUTPUT: WinNUT_V2/WinNUT-Client/bin/Debug

jobs:
build:

name: debug-build-${{ matrix.os }}
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [windows-2019] # Should have MSBuild.
steps:
# Make MSBuild available from $PATH.
- name: setup-msbuild
uses: microsoft/[email protected]

- name: Checkout Code
uses: actions/checkout@v3

- name: Restore Packages
run: msbuild -t:restore

# msbuild cannot handle .vdproj Installer projects, so only build debug for now.
- name: Build solution
run: |
Write-Output "::echo::on"
msbuild.exe $env:SLN_FILE -p:Configuration=Debug

# For now, let msbuild continue autogenerating assembly versions and base everything off of that.
- name: Get AssemblyVersion generated by msbuild
id: getversion
uses: berglie/assembly-version/get@v1
with:
directory: ${{ env.DEBUG_OUTPUT }}

- name: Upload Artifact
uses: actions/upload-artifact@v3
with:
name: ${{ format('WinNUT-Client-debugbuild-v{0}', steps.getversion.outputs.version) }}
if-no-files-found: error
path: ${{ env.DEBUG_OUTPUT }}

3 changes: 2 additions & 1 deletion WinNUT_V2/.editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@
###############################
# Core EditorConfig Options #
###############################
root = true
# All files
[*]
indent_style = space
file_header_template = WinNUT is a NUT windows client for monitoring your ups hooked up to your favorite linux server.\nCopyright (C) 2019-2021 Gawindx (Decaux Nicolas)\n\nThis program is free software: you can redistribute it and/or modify it under the terms of the\nGNU General Public License as published by the Free Software Foundation, either version 3 of the\nLicense, or any later version.\n\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without\neven the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\nGeneral Public License for more details.\n\nYou should have received a copy of the GNU General Public License along with this program.\nIf not, see https://www.gnu.org/licenses/.\n
file_header_template = WinNUT-Client is a NUT windows client for monitoring your ups hooked up to your favorite linux server.\nCopyright (C) 2019-2021 Gawindx (Decaux Nicolas)\n\nThis program is free software: you can redistribute it and/or modify it under the terms of the\nGNU General Public License as published by the Free Software Foundation, either version 3 of the\nLicense, or any later version.\n\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without\neven the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\nGeneral Public License for more details.\n\nYou should have received a copy of the GNU General Public License along with this program.\nIf not, see https://www.gnu.org/licenses/.\n
# Code files
[*.{cs,csx,vb,vbx}]
indent_size = 4
Expand Down
7 changes: 5 additions & 2 deletions WinNUT_V2/AGauge_mod/AGauge.csproj
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
Expand All @@ -10,8 +10,9 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>System.Windows.Forms</RootNamespace>
<AssemblyName>AGauge</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand All @@ -22,6 +23,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<RegisterForComInterop>false</RegisterForComInterop>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
Expand All @@ -30,6 +32,7 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
Expand Down
Loading