From 831f7c54befa5393386c54b52717db0816ca0041 Mon Sep 17 00:00:00 2001 From: Osiris-Team <59899645+Osiris-Team@users.noreply.github.com> Date: Sat, 2 Mar 2024 13:21:47 +0100 Subject: [PATCH 01/26] Create dotnet-desktop.yml --- .github/workflows/dotnet-desktop.yml | 49 ++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 .github/workflows/dotnet-desktop.yml diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml new file mode 100644 index 0000000..1945fc7 --- /dev/null +++ b/.github/workflows/dotnet-desktop.yml @@ -0,0 +1,49 @@ +name: .NET Core Desktop + +on: + release: + types: [released] + +jobs: + + build: + + strategy: + matrix: + configuration: [Release] + + runs-on: windows-latest + + env: + Solution_Name: p2pconn.sln + Test_Project_Path: p2pconn/p2pconn.csproj + + steps: + - name: Checkout + uses: actions/checkout@v3 + with: + fetch-depth: 0 + + - name: Install .NET Core + uses: actions/setup-dotnet@v3 + with: + dotnet-version: 6.0.x + + - name: Setup MSBuild.exe + uses: microsoft/setup-msbuild@v1.0.2 + + - name: Restore the application + run: msbuild $env:Solution_Name /t:Restore /p:Configuration=$env:Configuration + env: + Configuration: ${{ matrix.configuration }} + + - name: Create the app package + run: msbuild $env:Solution_Name /t:Publish /p:Configuration=$env:Configuration + env: + Configuration: ${{ matrix.configuration }} + + - name: Upload build artifacts + uses: actions/upload-artifact@v3 + with: + name: Published Application + path: ${{ env.Solution_Name }}/bin/$env:Configuration/netcoreapp3.1/publish/ From 844090fa2bdc5b46ee8f165841cf399efebf0e7b Mon Sep 17 00:00:00 2001 From: Osiris-Team <59899645+Osiris-Team@users.noreply.github.com> Date: Sat, 2 Mar 2024 13:32:06 +0100 Subject: [PATCH 02/26] Update dotnet-desktop.yml --- .github/workflows/dotnet-desktop.yml | 59 +++++++++++----------------- 1 file changed, 24 insertions(+), 35 deletions(-) diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml index 1945fc7..9a16b8c 100644 --- a/.github/workflows/dotnet-desktop.yml +++ b/.github/workflows/dotnet-desktop.yml @@ -1,49 +1,38 @@ -name: .NET Core Desktop +name: Release Workflow on: release: - types: [released] + types: + - created jobs: - build: - - strategy: - matrix: - configuration: [Release] - - runs-on: windows-latest - - env: - Solution_Name: p2pconn.sln - Test_Project_Path: p2pconn/p2pconn.csproj + runs-on: ubuntu-latest steps: - - name: Checkout - uses: actions/checkout@v3 - with: - fetch-depth: 0 + - name: Checkout repository + uses: actions/checkout@v2 - - name: Install .NET Core - uses: actions/setup-dotnet@v3 + - name: Set up .NET Core + uses: actions/setup-dotnet@v1 with: - dotnet-version: 6.0.x - - - name: Setup MSBuild.exe - uses: microsoft/setup-msbuild@v1.0.2 + dotnet-version: '3.1' # Update to the version you're using - - name: Restore the application - run: msbuild $env:Solution_Name /t:Restore /p:Configuration=$env:Configuration - env: - Configuration: ${{ matrix.configuration }} + - name: Build + run: dotnet build -c Release - - name: Create the app package - run: msbuild $env:Solution_Name /t:Publish /p:Configuration=$env:Configuration - env: - Configuration: ${{ matrix.configuration }} + upload: + runs-on: ubuntu-latest + needs: build + steps: + - name: List contents of bin/Release + run: ls -R bin/Release - - name: Upload build artifacts - uses: actions/upload-artifact@v3 + - name: Upload Release Asset + id: upload-release-asset + uses: actions/upload-release-asset@v1 with: - name: Published Application - path: ${{ env.Solution_Name }}/bin/$env:Configuration/netcoreapp3.1/publish/ + upload_url: https://uploads.github.com/repos/${{ github.repository }}/releases/${{ github.event.release.id }}/assets + asset_path: ./bin/Release/p2p.exe # Update this path + asset_name: p2p.exe # Update this name + asset_content_type: application/octet-stream From 40ba6fe98d36b6f1ac3f3efe6457da5b4be7ead9 Mon Sep 17 00:00:00 2001 From: Osiris-Team <59899645+Osiris-Team@users.noreply.github.com> Date: Sat, 2 Mar 2024 13:35:36 +0100 Subject: [PATCH 03/26] Update dotnet-desktop.yml --- .github/workflows/dotnet-desktop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml index 9a16b8c..8aa26b5 100644 --- a/.github/workflows/dotnet-desktop.yml +++ b/.github/workflows/dotnet-desktop.yml @@ -7,7 +7,7 @@ on: jobs: build: - runs-on: ubuntu-latest + runs-on: windows-latest steps: - name: Checkout repository From 8a95ee9537a59172ca1068dce713070ef74df0c1 Mon Sep 17 00:00:00 2001 From: Osiris-Team <59899645+Osiris-Team@users.noreply.github.com> Date: Sat, 2 Mar 2024 13:36:33 +0100 Subject: [PATCH 04/26] Update dotnet-desktop.yml --- .github/workflows/dotnet-desktop.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml index 8aa26b5..e9842d6 100644 --- a/.github/workflows/dotnet-desktop.yml +++ b/.github/workflows/dotnet-desktop.yml @@ -1,6 +1,8 @@ name: Release Workflow on: + workflow_dispatch: + # This event allows manual triggering release: types: - created From 2ffa41458cd5204a96c7b1021a8855f28271893a Mon Sep 17 00:00:00 2001 From: Osiris-Team <59899645+Osiris-Team@users.noreply.github.com> Date: Sat, 2 Mar 2024 13:40:28 +0100 Subject: [PATCH 05/26] Update dotnet-desktop.yml --- .github/workflows/dotnet-desktop.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml index e9842d6..4dc8d9b 100644 --- a/.github/workflows/dotnet-desktop.yml +++ b/.github/workflows/dotnet-desktop.yml @@ -9,19 +9,22 @@ on: jobs: build: - runs-on: windows-latest + runs-on: windows-latest # Use a Windows runner for .NET Framework projects steps: - name: Checkout repository uses: actions/checkout@v2 - - name: Set up .NET Core - uses: actions/setup-dotnet@v1 + - name: Set up MSBuild + uses: microsoft/setup-msbuild@v1 with: - dotnet-version: '3.1' # Update to the version you're using + msbuild-version: '16.0' # Adjust to the version your project requires + + - name: Restore NuGet packages + run: nuget restore - name: Build - run: dotnet build -c Release + run: msbuild /p:Configuration=Release upload: runs-on: ubuntu-latest From 5260810bc2120dc23fa8ed2899058153f3db22b3 Mon Sep 17 00:00:00 2001 From: Osiris-Team <59899645+Osiris-Team@users.noreply.github.com> Date: Sat, 2 Mar 2024 13:43:45 +0100 Subject: [PATCH 06/26] Update dotnet-desktop.yml --- .github/workflows/dotnet-desktop.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml index 4dc8d9b..82339ab 100644 --- a/.github/workflows/dotnet-desktop.yml +++ b/.github/workflows/dotnet-desktop.yml @@ -30,14 +30,14 @@ jobs: runs-on: ubuntu-latest needs: build steps: - - name: List contents of bin/Release - run: ls -R bin/Release + - name: List contents of p2pconn/bin/Release + run: ls -R p2pconn/bin/Release - name: Upload Release Asset id: upload-release-asset uses: actions/upload-release-asset@v1 with: upload_url: https://uploads.github.com/repos/${{ github.repository }}/releases/${{ github.event.release.id }}/assets - asset_path: ./bin/Release/p2p.exe # Update this path + asset_path: .p2pconn/bin/Release/p2p.exe # Update this path asset_name: p2p.exe # Update this name asset_content_type: application/octet-stream From a29dc8a519dc1932942dbb919c2a94416f75fe94 Mon Sep 17 00:00:00 2001 From: Osiris-Team <59899645+Osiris-Team@users.noreply.github.com> Date: Sat, 2 Mar 2024 13:46:43 +0100 Subject: [PATCH 07/26] Update dotnet-desktop.yml --- .github/workflows/dotnet-desktop.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml index 82339ab..1a9405b 100644 --- a/.github/workflows/dotnet-desktop.yml +++ b/.github/workflows/dotnet-desktop.yml @@ -1,4 +1,4 @@ -name: Release Workflow +name: Build and Attach to Release on: workflow_dispatch: @@ -26,10 +26,6 @@ jobs: - name: Build run: msbuild /p:Configuration=Release - upload: - runs-on: ubuntu-latest - needs: build - steps: - name: List contents of p2pconn/bin/Release run: ls -R p2pconn/bin/Release From ceb7833c6b5b3672aab842108679da78b6a48e06 Mon Sep 17 00:00:00 2001 From: Osiris-Team <59899645+Osiris-Team@users.noreply.github.com> Date: Sat, 2 Mar 2024 13:49:47 +0100 Subject: [PATCH 08/26] Update dotnet-desktop.yml --- .github/workflows/dotnet-desktop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml index 1a9405b..1b9c2fb 100644 --- a/.github/workflows/dotnet-desktop.yml +++ b/.github/workflows/dotnet-desktop.yml @@ -34,6 +34,6 @@ jobs: uses: actions/upload-release-asset@v1 with: upload_url: https://uploads.github.com/repos/${{ github.repository }}/releases/${{ github.event.release.id }}/assets - asset_path: .p2pconn/bin/Release/p2p.exe # Update this path + asset_path: p2pconn/bin/Release/p2p.exe # Update this path asset_name: p2p.exe # Update this name asset_content_type: application/octet-stream From 8af193cf0b7482c23f3a3dffcec86a3c66e4a571 Mon Sep 17 00:00:00 2001 From: Osiris-Team <59899645+Osiris-Team@users.noreply.github.com> Date: Sat, 2 Mar 2024 13:57:57 +0100 Subject: [PATCH 09/26] Update dotnet-desktop.yml --- .github/workflows/dotnet-desktop.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml index 1b9c2fb..73f3dc0 100644 --- a/.github/workflows/dotnet-desktop.yml +++ b/.github/workflows/dotnet-desktop.yml @@ -9,6 +9,7 @@ on: jobs: build: + permissions: write-all runs-on: windows-latest # Use a Windows runner for .NET Framework projects steps: @@ -29,11 +30,8 @@ jobs: - name: List contents of p2pconn/bin/Release run: ls -R p2pconn/bin/Release - - name: Upload Release Asset - id: upload-release-asset - uses: actions/upload-release-asset@v1 + - name: Release + uses: softprops/action-gh-release@v1 + if: startsWith(github.ref, 'refs/tags/') with: - upload_url: https://uploads.github.com/repos/${{ github.repository }}/releases/${{ github.event.release.id }}/assets - asset_path: p2pconn/bin/Release/p2p.exe # Update this path - asset_name: p2p.exe # Update this name - asset_content_type: application/octet-stream + files: p2pconn/bin/Release/p2p.exe From da28677ae0e4768bd52eb741485bc8a096c5e086 Mon Sep 17 00:00:00 2001 From: Osiris-Team <59899645+Osiris-Team@users.noreply.github.com> Date: Sat, 2 Mar 2024 14:02:29 +0100 Subject: [PATCH 10/26] Update dotnet-desktop.yml --- .github/workflows/dotnet-desktop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml index 73f3dc0..a0bc9d2 100644 --- a/.github/workflows/dotnet-desktop.yml +++ b/.github/workflows/dotnet-desktop.yml @@ -32,6 +32,6 @@ jobs: - name: Release uses: softprops/action-gh-release@v1 - if: startsWith(github.ref, 'refs/tags/') + if: true with: files: p2pconn/bin/Release/p2p.exe From 5ee9377554604e598e7f9635bc2f98ffb69ca660 Mon Sep 17 00:00:00 2001 From: Osiris-Team <59899645+Osiris-Team@users.noreply.github.com> Date: Sat, 2 Mar 2024 14:06:14 +0100 Subject: [PATCH 11/26] Update dotnet-desktop.yml --- .github/workflows/dotnet-desktop.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml index a0bc9d2..1669bcb 100644 --- a/.github/workflows/dotnet-desktop.yml +++ b/.github/workflows/dotnet-desktop.yml @@ -30,8 +30,12 @@ jobs: - name: List contents of p2pconn/bin/Release run: ls -R p2pconn/bin/Release + - name: Get latest release tag + id: get_tag + run: echo "::set-output name=TAG::$(gh release list --limit 1 --json tag_name --repo $GITHUB_REPOSITORY)" + - name: Release uses: softprops/action-gh-release@v1 - if: true with: files: p2pconn/bin/Release/p2p.exe + tag_name: ${{ steps.get_tag.outputs.TAG }} From e2a5e8bdad6512731efb125a844ec2e6a8840eae Mon Sep 17 00:00:00 2001 From: Osiris-Team <59899645+Osiris-Team@users.noreply.github.com> Date: Sat, 2 Mar 2024 14:12:10 +0100 Subject: [PATCH 12/26] Update dotnet-desktop.yml --- .github/workflows/dotnet-desktop.yml | 29 ++++++---------------------- 1 file changed, 6 insertions(+), 23 deletions(-) diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml index 1669bcb..1077882 100644 --- a/.github/workflows/dotnet-desktop.yml +++ b/.github/workflows/dotnet-desktop.yml @@ -16,26 +16,9 @@ jobs: - name: Checkout repository uses: actions/checkout@v2 - - name: Set up MSBuild - uses: microsoft/setup-msbuild@v1 - with: - msbuild-version: '16.0' # Adjust to the version your project requires - - - name: Restore NuGet packages - run: nuget restore - - - name: Build - run: msbuild /p:Configuration=Release - - - name: List contents of p2pconn/bin/Release - run: ls -R p2pconn/bin/Release - - - name: Get latest release tag - id: get_tag - run: echo "::set-output name=TAG::$(gh release list --limit 1 --json tag_name --repo $GITHUB_REPOSITORY)" - - - name: Release - uses: softprops/action-gh-release@v1 - with: - files: p2pconn/bin/Release/p2p.exe - tag_name: ${{ steps.get_tag.outputs.TAG }} + - name: Set env + run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV + - name: Test + run: | + echo $RELEASE_VERSION + echo ${{ env.RELEASE_VERSION }} From fd3635cd7ca284ed1edb0713c1cba81a9848d616 Mon Sep 17 00:00:00 2001 From: Osiris-Team <59899645+Osiris-Team@users.noreply.github.com> Date: Sat, 2 Mar 2024 14:21:35 +0100 Subject: [PATCH 13/26] Update dotnet-desktop.yml --- .github/workflows/dotnet-desktop.yml | 29 ++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml index 1077882..2d2ff02 100644 --- a/.github/workflows/dotnet-desktop.yml +++ b/.github/workflows/dotnet-desktop.yml @@ -16,9 +16,26 @@ jobs: - name: Checkout repository uses: actions/checkout@v2 - - name: Set env - run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV - - name: Test - run: | - echo $RELEASE_VERSION - echo ${{ env.RELEASE_VERSION }} + - name: Set up MSBuild + uses: microsoft/setup-msbuild@v1 + with: + msbuild-version: '16.0' # Adjust to the version your project requires + + - name: Restore NuGet packages + run: nuget restore + + - name: Build + run: msbuild /p:Configuration=Release + + - name: List contents of p2pconn/bin/Release + run: ls -R p2pconn/bin/Release + + - name: Get latest tag + id: get-latest-tag + uses: actions-ecosystem/action-get-latest-tag@v1 + + - name: Release + uses: softprops/action-gh-release@v1 + with: + files: p2pconn/bin/Release/p2p.exe + tag_name: ${{ steps.get-latest-tag.outputs.tag }} From 9f21304d0cdfc1c3090cb007d47f5a64578117a7 Mon Sep 17 00:00:00 2001 From: Osiris-Team <59899645+Osiris-Team@users.noreply.github.com> Date: Sat, 2 Mar 2024 14:24:48 +0100 Subject: [PATCH 14/26] Update dotnet-desktop.yml --- .github/workflows/dotnet-desktop.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml index 2d2ff02..fe4cf5f 100644 --- a/.github/workflows/dotnet-desktop.yml +++ b/.github/workflows/dotnet-desktop.yml @@ -30,9 +30,15 @@ jobs: - name: List contents of p2pconn/bin/Release run: ls -R p2pconn/bin/Release - - name: Get latest tag - id: get-latest-tag - uses: actions-ecosystem/action-get-latest-tag@v1 + - name: Get latest release tag + run: | + LATEST_TAG=$(git describe --tags `git rev-list --tags --max-count=1`) + + - name: Release + uses: softprops/action-gh-release@v1 + with: + files: p2pconn/bin/Release/p2p.exe + tag_name: ${{ env.LATEST_TAG }} - name: Release uses: softprops/action-gh-release@v1 From 636615056694968641acefe2efd086e8d5a589b0 Mon Sep 17 00:00:00 2001 From: Osiris-Team <59899645+Osiris-Team@users.noreply.github.com> Date: Sat, 2 Mar 2024 14:28:49 +0100 Subject: [PATCH 15/26] Update dotnet-desktop.yml --- .github/workflows/dotnet-desktop.yml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml index fe4cf5f..14168a8 100644 --- a/.github/workflows/dotnet-desktop.yml +++ b/.github/workflows/dotnet-desktop.yml @@ -1,8 +1,6 @@ name: Build and Attach to Release on: - workflow_dispatch: - # This event allows manual triggering release: types: - created @@ -30,18 +28,7 @@ jobs: - name: List contents of p2pconn/bin/Release run: ls -R p2pconn/bin/Release - - name: Get latest release tag - run: | - LATEST_TAG=$(git describe --tags `git rev-list --tags --max-count=1`) - - - name: Release - uses: softprops/action-gh-release@v1 - with: - files: p2pconn/bin/Release/p2p.exe - tag_name: ${{ env.LATEST_TAG }} - - name: Release uses: softprops/action-gh-release@v1 with: files: p2pconn/bin/Release/p2p.exe - tag_name: ${{ steps.get-latest-tag.outputs.tag }} From ce9c39b76ffe4f4b1d9dadf92af64329a2c94251 Mon Sep 17 00:00:00 2001 From: Osiris-Team <59899645+Osiris-Team@users.noreply.github.com> Date: Sat, 2 Mar 2024 14:42:02 +0100 Subject: [PATCH 16/26] Update dotnet-desktop.yml --- .github/workflows/dotnet-desktop.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml index 14168a8..4c8f9ac 100644 --- a/.github/workflows/dotnet-desktop.yml +++ b/.github/workflows/dotnet-desktop.yml @@ -22,6 +22,12 @@ jobs: - name: Restore NuGet packages run: nuget restore + - name: Copy packages to output directory + run: | + mkdir "./packages" + mkdir "./bin/Release/" + Copy-Item -Path "./packages" -Destination "./bin/Release/" + - name: Build run: msbuild /p:Configuration=Release From d2e07622d22c5c9f2d71d67caa060a5f8eef1b61 Mon Sep 17 00:00:00 2001 From: Osiris-Team <59899645+Osiris-Team@users.noreply.github.com> Date: Sat, 2 Mar 2024 14:44:38 +0100 Subject: [PATCH 17/26] Update dotnet-desktop.yml --- .github/workflows/dotnet-desktop.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml index 4c8f9ac..e71ae3c 100644 --- a/.github/workflows/dotnet-desktop.yml +++ b/.github/workflows/dotnet-desktop.yml @@ -24,8 +24,8 @@ jobs: - name: Copy packages to output directory run: | - mkdir "./packages" - mkdir "./bin/Release/" + mkdir -p "./packages" + mkdir -p "./bin/Release/" Copy-Item -Path "./packages" -Destination "./bin/Release/" - name: Build From 6d46e42114a2444c251846d4ac0443bc296bad8c Mon Sep 17 00:00:00 2001 From: Osiris-Team <59899645+Osiris-Team@users.noreply.github.com> Date: Sat, 2 Mar 2024 15:08:55 +0100 Subject: [PATCH 18/26] Update dotnet-desktop.yml --- .github/workflows/dotnet-desktop.yml | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml index e71ae3c..6364612 100644 --- a/.github/workflows/dotnet-desktop.yml +++ b/.github/workflows/dotnet-desktop.yml @@ -20,21 +20,18 @@ jobs: msbuild-version: '16.0' # Adjust to the version your project requires - name: Restore NuGet packages - run: nuget restore - - - name: Copy packages to output directory - run: | - mkdir -p "./packages" - mkdir -p "./bin/Release/" - Copy-Item -Path "./packages" -Destination "./bin/Release/" + run: nuget restore p2pconn.sln - name: Build - run: msbuild /p:Configuration=Release + run: | + msbuild p2pconn.sln /p:Configuration=Release + cd ./p2pconn + msbuild /t:Publish /p:Configuration=Release - name: List contents of p2pconn/bin/Release - run: ls -R p2pconn/bin/Release + run: ls -R ./ - name: Release uses: softprops/action-gh-release@v1 with: - files: p2pconn/bin/Release/p2p.exe + files: p2pconn/bin/ReleasePublish/p2p.exe From 531dc73a99a2e5b8df79136a4bf5e7fab9e5335e Mon Sep 17 00:00:00 2001 From: Osiris-Team <59899645+Osiris-Team@users.noreply.github.com> Date: Sat, 2 Mar 2024 16:24:20 +0100 Subject: [PATCH 19/26] Update dotnet-desktop.yml --- .github/workflows/dotnet-desktop.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml index 6364612..72f5af6 100644 --- a/.github/workflows/dotnet-desktop.yml +++ b/.github/workflows/dotnet-desktop.yml @@ -28,10 +28,18 @@ jobs: cd ./p2pconn msbuild /t:Publish /p:Configuration=Release + - name: Install ILMerge + run: | + nuget install ILMerge.Console -Version 3.0.30 -OutputDirectory .\ilmerge + Set-Location .\ilmerge\ILMerge.Console.3.0.30\tools\net461 + + - name: Merge assemblies with ILMerge + run: ./ILMerge.exe /out:p2p-portable.exe ./bin/Release/p2p.exe ./bin/Release/*.dll + - name: List contents of p2pconn/bin/Release run: ls -R ./ - name: Release uses: softprops/action-gh-release@v1 with: - files: p2pconn/bin/ReleasePublish/p2p.exe + files: p2pconn/bin/Release/*.exe From 75ef2ce737f292e60e7bead020f5355e58b35aee Mon Sep 17 00:00:00 2001 From: Osiris-Team <59899645+Osiris-Team@users.noreply.github.com> Date: Sat, 2 Mar 2024 16:27:58 +0100 Subject: [PATCH 20/26] Update dotnet-desktop.yml --- .github/workflows/dotnet-desktop.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml index 72f5af6..062f515 100644 --- a/.github/workflows/dotnet-desktop.yml +++ b/.github/workflows/dotnet-desktop.yml @@ -28,13 +28,10 @@ jobs: cd ./p2pconn msbuild /t:Publish /p:Configuration=Release - - name: Install ILMerge + - name: ILMerge run: | nuget install ILMerge.Console -Version 3.0.30 -OutputDirectory .\ilmerge - Set-Location .\ilmerge\ILMerge.Console.3.0.30\tools\net461 - - - name: Merge assemblies with ILMerge - run: ./ILMerge.exe /out:p2p-portable.exe ./bin/Release/p2p.exe ./bin/Release/*.dll + ./ilmerge/ILMerge.Console.3.0.30/tools/net461/ILMerge.exe /out:./bin/Release/p2p-portable.exe ./bin/Release/p2p.exe ./bin/Release/*.dll - name: List contents of p2pconn/bin/Release run: ls -R ./ From 047d1e5deb67320da8c05429d73c71882682b10c Mon Sep 17 00:00:00 2001 From: Osiris-Team <59899645+Osiris-Team@users.noreply.github.com> Date: Sat, 2 Mar 2024 16:41:25 +0100 Subject: [PATCH 21/26] Update dotnet-desktop.yml --- .github/workflows/dotnet-desktop.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml index 062f515..14d49c4 100644 --- a/.github/workflows/dotnet-desktop.yml +++ b/.github/workflows/dotnet-desktop.yml @@ -23,14 +23,12 @@ jobs: run: nuget restore p2pconn.sln - name: Build - run: | - msbuild p2pconn.sln /p:Configuration=Release - cd ./p2pconn - msbuild /t:Publish /p:Configuration=Release + run: msbuild p2pconn.sln /p:Configuration=Release - name: ILMerge run: | nuget install ILMerge.Console -Version 3.0.30 -OutputDirectory .\ilmerge + ls -R ./ ./ilmerge/ILMerge.Console.3.0.30/tools/net461/ILMerge.exe /out:./bin/Release/p2p-portable.exe ./bin/Release/p2p.exe ./bin/Release/*.dll - name: List contents of p2pconn/bin/Release From 7e05fba4ad31d4bfa582040791597e74a7bab144 Mon Sep 17 00:00:00 2001 From: Osiris-Team <59899645+Osiris-Team@users.noreply.github.com> Date: Sat, 2 Mar 2024 16:43:33 +0100 Subject: [PATCH 22/26] Update dotnet-desktop.yml --- .github/workflows/dotnet-desktop.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml index 14d49c4..dc6b97f 100644 --- a/.github/workflows/dotnet-desktop.yml +++ b/.github/workflows/dotnet-desktop.yml @@ -27,9 +27,9 @@ jobs: - name: ILMerge run: | - nuget install ILMerge.Console -Version 3.0.30 -OutputDirectory .\ilmerge + nuget install ILMerge.Console -Version 3.0.29 -OutputDirectory ./ilmerge ls -R ./ - ./ilmerge/ILMerge.Console.3.0.30/tools/net461/ILMerge.exe /out:./bin/Release/p2p-portable.exe ./bin/Release/p2p.exe ./bin/Release/*.dll + ./ilmerge/ILMerge.Console.3.0.29/tools/net461/ILMerge.exe /out:./bin/Release/p2p-portable.exe ./bin/Release/p2p.exe ./bin/Release/*.dll - name: List contents of p2pconn/bin/Release run: ls -R ./ From 65f332d7e1bcd97611a8d02b234c63ad6a306432 Mon Sep 17 00:00:00 2001 From: Osiris-Team <59899645+Osiris-Team@users.noreply.github.com> Date: Sat, 2 Mar 2024 16:48:27 +0100 Subject: [PATCH 23/26] Update dotnet-desktop.yml --- .github/workflows/dotnet-desktop.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml index dc6b97f..201f1b4 100644 --- a/.github/workflows/dotnet-desktop.yml +++ b/.github/workflows/dotnet-desktop.yml @@ -27,9 +27,9 @@ jobs: - name: ILMerge run: | - nuget install ILMerge.Console -Version 3.0.29 -OutputDirectory ./ilmerge + nuget install ilmerge -Version 3.0.41 -OutputDirectory ./ilmerge ls -R ./ - ./ilmerge/ILMerge.Console.3.0.29/tools/net461/ILMerge.exe /out:./bin/Release/p2p-portable.exe ./bin/Release/p2p.exe ./bin/Release/*.dll + ./ilmerge/ILMerge.Console.3.0.41/tools/net461/ILMerge.exe /out:./bin/Release/p2p-portable.exe ./bin/Release/p2p.exe ./bin/Release/*.dll - name: List contents of p2pconn/bin/Release run: ls -R ./ From f564eb0258cca650a2edf772c76993d5a382c18a Mon Sep 17 00:00:00 2001 From: Osiris-Team <59899645+Osiris-Team@users.noreply.github.com> Date: Sat, 2 Mar 2024 16:53:43 +0100 Subject: [PATCH 24/26] Update dotnet-desktop.yml --- .github/workflows/dotnet-desktop.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml index 201f1b4..33f952a 100644 --- a/.github/workflows/dotnet-desktop.yml +++ b/.github/workflows/dotnet-desktop.yml @@ -29,7 +29,9 @@ jobs: run: | nuget install ilmerge -Version 3.0.41 -OutputDirectory ./ilmerge ls -R ./ - ./ilmerge/ILMerge.Console.3.0.41/tools/net461/ILMerge.exe /out:./bin/Release/p2p-portable.exe ./bin/Release/p2p.exe ./bin/Release/*.dll + ./ilmerge/ILMerge.3.0.41/tools/net452/ILMerge.exe /out:p2p-portable.exe ./bin/Release/p2p.exe ./bin/Release/*.dll + move p2p-portable.exe .\bin\Release\ + - name: List contents of p2pconn/bin/Release run: ls -R ./ From 634a3b71c34bbdc025ca364e7a1ca7b344753ab5 Mon Sep 17 00:00:00 2001 From: Osiris-Team <59899645+Osiris-Team@users.noreply.github.com> Date: Sat, 2 Mar 2024 17:00:07 +0100 Subject: [PATCH 25/26] Update dotnet-desktop.yml --- .github/workflows/dotnet-desktop.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml index 33f952a..9392f93 100644 --- a/.github/workflows/dotnet-desktop.yml +++ b/.github/workflows/dotnet-desktop.yml @@ -29,8 +29,8 @@ jobs: run: | nuget install ilmerge -Version 3.0.41 -OutputDirectory ./ilmerge ls -R ./ - ./ilmerge/ILMerge.3.0.41/tools/net452/ILMerge.exe /out:p2p-portable.exe ./bin/Release/p2p.exe ./bin/Release/*.dll - move p2p-portable.exe .\bin\Release\ + ./ilmerge/ILMerge.3.0.41/tools/net452/ILMerge.exe /out:p2p-portable.exe ./p2pconn/bin/Release/p2p.exe ./p2pconn/bin/Release/*.dll + move p2p-portable.exe ./p2pconn/bin/Release/ - name: List contents of p2pconn/bin/Release From bcf2552ee4137e43491d22f5e39af11cb938515e Mon Sep 17 00:00:00 2001 From: Osiris-Team <59899645+Osiris-Team@users.noreply.github.com> Date: Sat, 2 Mar 2024 17:05:15 +0100 Subject: [PATCH 26/26] Update dotnet-desktop.yml --- .github/workflows/dotnet-desktop.yml | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml index 9392f93..891c611 100644 --- a/.github/workflows/dotnet-desktop.yml +++ b/.github/workflows/dotnet-desktop.yml @@ -8,7 +8,7 @@ on: jobs: build: permissions: write-all - runs-on: windows-latest # Use a Windows runner for .NET Framework projects + runs-on: windows-latest steps: - name: Checkout repository @@ -17,7 +17,7 @@ jobs: - name: Set up MSBuild uses: microsoft/setup-msbuild@v1 with: - msbuild-version: '16.0' # Adjust to the version your project requires + msbuild-version: '16.0' - name: Restore NuGet packages run: nuget restore p2pconn.sln @@ -25,18 +25,14 @@ jobs: - name: Build run: msbuild p2pconn.sln /p:Configuration=Release - - name: ILMerge + - name: Zip files in p2pconn/bin/Release run: | - nuget install ilmerge -Version 3.0.41 -OutputDirectory ./ilmerge - ls -R ./ - ./ilmerge/ILMerge.3.0.41/tools/net452/ILMerge.exe /out:p2p-portable.exe ./p2pconn/bin/Release/p2p.exe ./p2pconn/bin/Release/*.dll - move p2p-portable.exe ./p2pconn/bin/Release/ - + Compress-Archive -Path ./p2pconn/bin/Release/* -DestinationPath ./p2pconn/bin/Release/p2p-portable.zip - name: List contents of p2pconn/bin/Release - run: ls -R ./ + run: ls -R ./p2pconn/bin/Release - name: Release uses: softprops/action-gh-release@v1 with: - files: p2pconn/bin/Release/*.exe + files: p2pconn/bin/Release/p2p-portable.zip