From 8fde3b0e7556aa5177c718085c8443ca6b664b9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20H=C3=B6glinger-Stelzer?= Date: Sat, 2 Nov 2024 19:59:46 +0100 Subject: [PATCH 1/3] Update vcpkg-configuration.json --- vcpkg-configuration.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/vcpkg-configuration.json b/vcpkg-configuration.json index d4cd73f..ddb0e3f 100644 --- a/vcpkg-configuration.json +++ b/vcpkg-configuration.json @@ -3,12 +3,13 @@ { "kind": "git", "repository": "https://github.com/nefarius/nefarius-vcpkg-registry.git", - "baseline": "a012f87f807c6c45a372b5a3a2dcf562a356f1dc", + "baseline": "a51cec12849ac113d4b8436c80bcf0b989668f90", "packages": [ "neflib" ] } ], "default-registry": { - "kind": "builtin", - "baseline": "2024.07.12" + "kind": "git", + "repository": "https://github.com/microsoft/vcpkg", + "baseline": "3508985146f1b1d248c67ead13f8f54be5b4f5da" } } From 327a41ab80cc7156a1138b2c89770dd007b1fc74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20H=C3=B6glinger-Stelzer?= Date: Sat, 2 Nov 2024 20:07:57 +0100 Subject: [PATCH 2/3] Added artifacts step --- .github/workflows/msbuild.yml | 6 ++++++ NefConUtil.sln | 2 ++ 2 files changed, 8 insertions(+) diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml index 9c2aee7..b6d175e 100644 --- a/.github/workflows/msbuild.yml +++ b/.github/workflows/msbuild.yml @@ -48,3 +48,9 @@ jobs: # Add additional options to the MSBuild command line here (like platform or verbosity level). # See https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference run: msbuild /m /p:Configuration="Release (WinMain)" /p:Platform=${{env.BUILD_PLATFORM}} ${{env.SOLUTION_FILE_PATH}} + + - name: Upload build artifacts + uses: actions/upload-artifact@v2 + with: + name: nefcon + path: ./bin diff --git a/NefConUtil.sln b/NefConUtil.sln index 775268f..1b9aadc 100644 --- a/NefConUtil.sln +++ b/NefConUtil.sln @@ -10,7 +10,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution .editorconfig = .editorconfig .gitignore = .gitignore LICENSE = LICENSE + .github\workflows\msbuild.yml = .github\workflows\msbuild.yml README.md = README.md + .github\workflows\winget.yml = .github\workflows\winget.yml EndProjectSection EndProject Global From 9b6eb34d4331a1727ae04359aa23f3cd45387cc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20H=C3=B6glinger-Stelzer?= Date: Sat, 2 Nov 2024 20:09:07 +0100 Subject: [PATCH 3/3] Update msbuild.yml --- .github/workflows/msbuild.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml index b6d175e..94ef96e 100644 --- a/.github/workflows/msbuild.yml +++ b/.github/workflows/msbuild.yml @@ -50,7 +50,7 @@ jobs: run: msbuild /m /p:Configuration="Release (WinMain)" /p:Platform=${{env.BUILD_PLATFORM}} ${{env.SOLUTION_FILE_PATH}} - name: Upload build artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: nefcon path: ./bin