From 38b671eb634505ee1d83dd2dd7b2ded650b507c4 Mon Sep 17 00:00:00 2001 From: Jimmie Houts Date: Sun, 14 May 2023 09:47:10 -0700 Subject: [PATCH 01/17] Create build.yml --- .github/workflows/build.yml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..e2efa3e --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,28 @@ +# This workflow will build a .NET project +# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-net + +name: .NET + +on: + push: + branches: [ "main" ] + pull_request: + branches: [ "main" ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + - name: Setup .NET + uses: actions/setup-dotnet@v3 + with: + dotnet-version: 7.0.x + - name: Restore dependencies + run: dotnet restore + - name: Build + run: dotnet build --configuration Release --no-restore + - name: Test + run: dotnet test --configuration Release --no-build --verbosity normal From 272eb5a5fe90b34e6b5db261d75039a6f800df08 Mon Sep 17 00:00:00 2001 From: Jimmie Houts Date: Sun, 14 May 2023 09:47:10 -0700 Subject: [PATCH 02/17] Create build.yml --- .github/workflows/build.yml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..e2efa3e --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,28 @@ +# This workflow will build a .NET project +# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-net + +name: .NET + +on: + push: + branches: [ "main" ] + pull_request: + branches: [ "main" ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + - name: Setup .NET + uses: actions/setup-dotnet@v3 + with: + dotnet-version: 7.0.x + - name: Restore dependencies + run: dotnet restore + - name: Build + run: dotnet build --configuration Release --no-restore + - name: Test + run: dotnet test --configuration Release --no-build --verbosity normal From faf7f899c5960b4e4bc76116898c1c3cfae613ce Mon Sep 17 00:00:00 2001 From: Jimmie Houts Date: Sun, 14 May 2023 10:21:03 -0700 Subject: [PATCH 03/17] Use windows build server --- .github/workflows/build.yml | 2 +- AuraScheduler.sln | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e2efa3e..32e4a6b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,7 +12,7 @@ on: jobs: build: - runs-on: ubuntu-latest + runs-on: windows-latest steps: - uses: actions/checkout@v3 diff --git a/AuraScheduler.sln b/AuraScheduler.sln index 7ececfa..c0e08b2 100644 --- a/AuraScheduler.sln +++ b/AuraScheduler.sln @@ -20,6 +20,13 @@ Project("{B7DD6F7E-DEF8-4E67-B5B7-07EF123DB6F0}") = "Setup", "Setup\Setup.wixpro EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AuraScheduler.UI", "AuraScheduler.UI\AuraScheduler.UI.csproj", "{9C45A10E-7618-46E2-A273-992B2315CA99}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "github", "github", "{DF13FA0D-6301-41B9-8C1D-922047FB097E}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{D4A0CA6D-294D-4D6E-82A4-CACB2268B76E}" + ProjectSection(SolutionItems) = preProject + .github\workflows\build.yml = .github\workflows\build.yml + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -45,6 +52,9 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {D4A0CA6D-294D-4D6E-82A4-CACB2268B76E} = {DF13FA0D-6301-41B9-8C1D-922047FB097E} + EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {EDC4F8D3-6A38-411E-A07D-066ED73EAC29} EndGlobalSection From 48d6811af29baae25771c8812cce9ff8c6b91fa1 Mon Sep 17 00:00:00 2001 From: Jimmie Houts Date: Sun, 14 May 2023 10:41:47 -0700 Subject: [PATCH 04/17] Separate worker and UI build tasks --- .github/workflows/build.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 32e4a6b..fe38357 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,7 +22,9 @@ jobs: dotnet-version: 7.0.x - name: Restore dependencies run: dotnet restore - - name: Build - run: dotnet build --configuration Release --no-restore + - name: Build Worker + run: dotnet build aura-scheduler/AuraScheduler.Worker/AuraScheduler.Worker.csproj --configuration Release --no-restore + - name: Build UI + run: dotnet build aura-scheduler/AuraScheduler.UI/AuraScheduler.UI.csproj --configuration Release --no-restore - name: Test run: dotnet test --configuration Release --no-build --verbosity normal From 56e70bd4400557f69539813abae743c90c9e2c17 Mon Sep 17 00:00:00 2001 From: Jimmie Houts Date: Sun, 14 May 2023 10:46:53 -0700 Subject: [PATCH 05/17] point to the correct path? --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fe38357..0cdf7dc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,8 +23,8 @@ jobs: - name: Restore dependencies run: dotnet restore - name: Build Worker - run: dotnet build aura-scheduler/AuraScheduler.Worker/AuraScheduler.Worker.csproj --configuration Release --no-restore + run: dotnet build AuraScheduler.Worker/AuraScheduler.Worker.csproj --configuration Release --no-restore - name: Build UI - run: dotnet build aura-scheduler/AuraScheduler.UI/AuraScheduler.UI.csproj --configuration Release --no-restore + run: dotnet build AuraScheduler.UI/AuraScheduler.UI.csproj --configuration Release --no-restore - name: Test run: dotnet test --configuration Release --no-build --verbosity normal From b39e83b9cf52a9acf4cfd00be14f5783c2bfb139 Mon Sep 17 00:00:00 2001 From: Jimmie Houts Date: Sun, 14 May 2023 10:50:59 -0700 Subject: [PATCH 06/17] Build the test project Build the setup project --- .github/workflows/build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0cdf7dc..60c8c6b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,4 +27,6 @@ jobs: - name: Build UI run: dotnet build AuraScheduler.UI/AuraScheduler.UI.csproj --configuration Release --no-restore - name: Test - run: dotnet test --configuration Release --no-build --verbosity normal + run: dotnet test --configuration Release --verbosity normal + - name: Build Setup project + run: dotnet build Setup/Setup.csproj --configuration Release --no-restore From ca40842a2808265503db4beb27c973cb4a04c78e Mon Sep 17 00:00:00 2001 From: Jimmie Houts Date: Sun, 14 May 2023 10:54:19 -0700 Subject: [PATCH 07/17] Use the correct extension! --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 60c8c6b..4a069d3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,4 +29,4 @@ jobs: - name: Test run: dotnet test --configuration Release --verbosity normal - name: Build Setup project - run: dotnet build Setup/Setup.csproj --configuration Release --no-restore + run: dotnet build Setup/Setup.wixproj --configuration Release --no-restore From 0df1e2784c18f99ed06886628f1a00e44efea39d Mon Sep 17 00:00:00 2001 From: Jimmie Houts Date: Sun, 14 May 2023 11:00:51 -0700 Subject: [PATCH 08/17] Change the bitness! --- Setup/AURASchedulerUIComponents.wxs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Setup/AURASchedulerUIComponents.wxs b/Setup/AURASchedulerUIComponents.wxs index d229727..143067e 100644 --- a/Setup/AURASchedulerUIComponents.wxs +++ b/Setup/AURASchedulerUIComponents.wxs @@ -2,7 +2,7 @@ - + From 562723a3ca34fda61c23abdd78599870e3c4ddd9 Mon Sep 17 00:00:00 2001 From: Jimmie Houts Date: Sun, 14 May 2023 11:09:37 -0700 Subject: [PATCH 09/17] More bitness changes --- Setup/Setup.wixproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Setup/Setup.wixproj b/Setup/Setup.wixproj index 030484f..3a0b88c 100644 --- a/Setup/Setup.wixproj +++ b/Setup/Setup.wixproj @@ -2,7 +2,7 @@ Version=$(BuildVersion) AURAScheduler.$(MSBuildProjectName) - x86;x64 + x64 From b1568cc1f8d4636d413c2b6c0b8b3442d9cd9f90 Mon Sep 17 00:00:00 2001 From: Jimmie Houts Date: Sun, 14 May 2023 11:18:21 -0700 Subject: [PATCH 10/17] Moar bitness --- Setup/Setup.wixproj | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/Setup/Setup.wixproj b/Setup/Setup.wixproj index 3a0b88c..288c8c1 100644 --- a/Setup/Setup.wixproj +++ b/Setup/Setup.wixproj @@ -1,10 +1,11 @@  - - Version=$(BuildVersion) - AURAScheduler.$(MSBuildProjectName) - x64 - - - - + + Version=$(BuildVersion) + AURAScheduler.$(MSBuildProjectName) + x64 + x64 + + + + \ No newline at end of file From 33db46196e0255658f27f4532c6e5c6930969422 Mon Sep 17 00:00:00 2001 From: Jimmie Houts Date: Sun, 14 May 2023 11:29:16 -0700 Subject: [PATCH 11/17] Don't build all the projects again when executing tests --- .github/workflows/build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4a069d3..8c17799 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,7 +26,9 @@ jobs: run: dotnet build AuraScheduler.Worker/AuraScheduler.Worker.csproj --configuration Release --no-restore - name: Build UI run: dotnet build AuraScheduler.UI/AuraScheduler.UI.csproj --configuration Release --no-restore + - name: Build Test Project + run: dotnet build AuraScheduler.Worker.Tests/AuraScheduler.Worker.Tests.csproj --configuration Release --no-restore - name: Test - run: dotnet test --configuration Release --verbosity normal + run: dotnet test --configuration Release --no-build - name: Build Setup project run: dotnet build Setup/Setup.wixproj --configuration Release --no-restore From 3245de6d57da388fa5ba0eac9fe7b253d9dc5e0d Mon Sep 17 00:00:00 2001 From: Jimmie Houts Date: Sun, 14 May 2023 11:33:18 -0700 Subject: [PATCH 12/17] ugh.. bitness strikes again --- AuraScheduler.Worker.Tests/AuraScheduler.Worker.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AuraScheduler.Worker.Tests/AuraScheduler.Worker.Tests.csproj b/AuraScheduler.Worker.Tests/AuraScheduler.Worker.Tests.csproj index 832c708..257302b 100644 --- a/AuraScheduler.Worker.Tests/AuraScheduler.Worker.Tests.csproj +++ b/AuraScheduler.Worker.Tests/AuraScheduler.Worker.Tests.csproj @@ -7,7 +7,7 @@ false true - AnyCPU;x64 + x64 From 4744d0046aefdb0687ca1c059cb2a48bf10fdb63 Mon Sep 17 00:00:00 2001 From: Jimmie Houts Date: Mon, 15 May 2023 08:40:40 -0700 Subject: [PATCH 13/17] And another one --- .../AuraScheduler.Worker.Tests.csproj | 43 ++++++++++--------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/AuraScheduler.Worker.Tests/AuraScheduler.Worker.Tests.csproj b/AuraScheduler.Worker.Tests/AuraScheduler.Worker.Tests.csproj index 257302b..55cfaab 100644 --- a/AuraScheduler.Worker.Tests/AuraScheduler.Worker.Tests.csproj +++ b/AuraScheduler.Worker.Tests/AuraScheduler.Worker.Tests.csproj @@ -1,27 +1,28 @@ - + - - net7.0 - enable - enable + + net7.0 + enable + enable - false - true - x64 - + false + true + x64 + x64 + - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + - - - + + + From 4152fd02b1866eb8a14ea5d25508258c83e3a575 Mon Sep 17 00:00:00 2001 From: Jimmie Houts Date: Mon, 15 May 2023 09:07:50 -0700 Subject: [PATCH 14/17] try the simpler config again --- .github/workflows/build.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8c17799..e170bdc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,13 +22,15 @@ jobs: dotnet-version: 7.0.x - name: Restore dependencies run: dotnet restore - - name: Build Worker - run: dotnet build AuraScheduler.Worker/AuraScheduler.Worker.csproj --configuration Release --no-restore - - name: Build UI - run: dotnet build AuraScheduler.UI/AuraScheduler.UI.csproj --configuration Release --no-restore - - name: Build Test Project - run: dotnet build AuraScheduler.Worker.Tests/AuraScheduler.Worker.Tests.csproj --configuration Release --no-restore + - name: Build Projects + run: dotnet build --configuration Release --no-restore + #- name: Build Worker + # run: dotnet build AuraScheduler.Worker/AuraScheduler.Worker.csproj --configuration Release --no-restore + #- name: Build UI + # run: dotnet build AuraScheduler.UI/AuraScheduler.UI.csproj --configuration Release --no-restore + #- name: Build Test Project + # run: dotnet build AuraScheduler.Worker.Tests/AuraScheduler.Worker.Tests.csproj --configuration Release --no-restore - name: Test - run: dotnet test --configuration Release --no-build + run: dotnet test --configuration Release - name: Build Setup project run: dotnet build Setup/Setup.wixproj --configuration Release --no-restore From f43c7d15bcbff10e3d56c50671d57af368265928 Mon Sep 17 00:00:00 2001 From: Jimmie Houts Date: Mon, 15 May 2023 09:13:07 -0700 Subject: [PATCH 15/17] Undo simpler config --- .github/workflows/build.yml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e170bdc..d4b410a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,14 +22,12 @@ jobs: dotnet-version: 7.0.x - name: Restore dependencies run: dotnet restore - - name: Build Projects - run: dotnet build --configuration Release --no-restore - #- name: Build Worker - # run: dotnet build AuraScheduler.Worker/AuraScheduler.Worker.csproj --configuration Release --no-restore - #- name: Build UI - # run: dotnet build AuraScheduler.UI/AuraScheduler.UI.csproj --configuration Release --no-restore - #- name: Build Test Project - # run: dotnet build AuraScheduler.Worker.Tests/AuraScheduler.Worker.Tests.csproj --configuration Release --no-restore + - name: Build Worker + run: dotnet build AuraScheduler.Worker/AuraScheduler.Worker.csproj --configuration Release --no-restore + - name: Build UI + run: dotnet build AuraScheduler.UI/AuraScheduler.UI.csproj --configuration Release --no-restore + - name: Build Test Project + run: dotnet build AuraScheduler.Worker.Tests/AuraScheduler.Worker.Tests.csproj --configuration Release --no-restore - name: Test run: dotnet test --configuration Release - name: Build Setup project From 2516fc130363f3db58a8cafc9f4b7be5c758da9c Mon Sep 17 00:00:00 2001 From: Jimmie Houts Date: Mon, 15 May 2023 09:43:05 -0700 Subject: [PATCH 16/17] Add status badge --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index a7262f1..b136f7f 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,11 @@ + # aura-scheduler Uses the Asus AURA SDK to turn LEDs on/off on a schedule +# Status +[![.NET](https://github.com/theyo/aura-scheduler/actions/workflows/build.yml/badge.svg)](https://github.com/theyo/aura-scheduler/actions/workflows/build.yml) + + # Requirements The Asus AURA SDK `Interop.AuraServiceLib.dll` needs to be present on the system. Normally this dll is installed with ASUS AURA (through ARMOURY CRATE). From 936d1807084f183180e80bc7bef2b7dd5a51ec95 Mon Sep 17 00:00:00 2001 From: Jimmie Houts Date: Mon, 15 May 2023 09:43:21 -0700 Subject: [PATCH 17/17] File didn't save --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index b136f7f..c98dd90 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,6 @@ # aura-scheduler Uses the Asus AURA SDK to turn LEDs on/off on a schedule -# Status [![.NET](https://github.com/theyo/aura-scheduler/actions/workflows/build.yml/badge.svg)](https://github.com/theyo/aura-scheduler/actions/workflows/build.yml)