From 064801380b6c8c9e75f18be21840dc1390141238 Mon Sep 17 00:00:00 2001 From: pixil98 <46978190+pixil98@users.noreply.github.com> Date: Wed, 16 Nov 2022 11:44:15 -0600 Subject: [PATCH 1/9] Add workflows (#1) Adds basic workflows --- .github/workflows/dotnet-publish.yml | 48 +++++++++++++++++++++++++++ .github/workflows/dotnet-validate.yml | 37 +++++++++++++++++++++ 2 files changed, 85 insertions(+) create mode 100644 .github/workflows/dotnet-publish.yml create mode 100644 .github/workflows/dotnet-validate.yml diff --git a/.github/workflows/dotnet-publish.yml b/.github/workflows/dotnet-publish.yml new file mode 100644 index 00000000..5bd0e3f3 --- /dev/null +++ b/.github/workflows/dotnet-publish.yml @@ -0,0 +1,48 @@ +# 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: publish + +on: + push: + tags: + - 'v*' + +env: + DOTNET_VERSION: '6.0.x' # The .NET SDK version to use + DOTNET_SLN: './Source/Libation.sln' + DOTNET_CONFIGURATION: 'Release' + +jobs: + build: + + runs-on: windows-latest + + steps: + - uses: actions/checkout@v3 + - name: Setup .NET + uses: actions/setup-dotnet@v3 + with: + dotnet-version: ${{ env.DOTNET_VERSION }} + source-url: https://nuget.pkg.github.com//index.json + env: + NUGET_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: Restore dependencies + run: dotnet restore ${{ DOTNET_SLN }} + + - name: Build + run: dotnet build --configuration ${{ env.DOTNET_CONFIGURATION }} --no-restore ${{ DOTNET_SLN }} + + - name: Test + run: dotnet test --configuration ${{ env.DOTNET_CONFIGURATION }} --no-build --verbosity normal ${{ DOTNET_SLN }} + + - name: Zip Artifact + run: zip -r Libation.${{ github.ref_name }}.zip ./Source/bin/${{ env.DOTNET_CONFIGURATION }}/* + + - name: Publish Artifact + uses: actions/upload-artifact@v3 + with: + name: Libation ${{ github.ref_name }} + path: Libation.${{ github.ref_name }}.zip + if-no-files-found: error \ No newline at end of file diff --git a/.github/workflows/dotnet-validate.yml b/.github/workflows/dotnet-validate.yml new file mode 100644 index 00000000..87fca7ea --- /dev/null +++ b/.github/workflows/dotnet-validate.yml @@ -0,0 +1,37 @@ +# 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: validate + +on: + push: + branches: [ "master" ] + pull_request: + branches: [ "master" ] + +env: + DOTNET_VERSION: '6.0.x' # The .NET SDK version to use + DOTNET_SLN: './Source/Libation.sln' + DOTNET_CONFIGURATION: 'Release' + +jobs: + build: + + runs-on: windows-latest + + steps: + - uses: actions/checkout@v3 + - name: Setup .NET + uses: actions/setup-dotnet@v3 + with: + dotnet-version: ${{ env.DOTNET_VERSION }} + + - name: Restore dependencies + run: dotnet restore ${{ env.DOTNET_SLN }} + + - name: Build + run: dotnet build --configuration ${{ env.DOTNET_CONFIGURATION }} --no-restore ${{ env.DOTNET_SLN }} + + - name: Test + run: dotnet test --configuration ${{ env.DOTNET_CONFIGURATION }} --no-build --verbosity normal ${{ env.DOTNET_SLN }} + \ No newline at end of file From 8a82c294a1c7c5ebd1fe241d6d97fe08ccac28ca Mon Sep 17 00:00:00 2001 From: pixil98 <46978190+pixil98@users.noreply.github.com> Date: Wed, 16 Nov 2022 13:40:57 -0600 Subject: [PATCH 2/9] Fix publish workflow (#2) * Add dotnet test workflow * main -> master * Try a different workflow * Add working-directory * use windows runner * use env var * Fix build and test order * Specify configuration * Specify sln instead of working dir * Specify that DOTNET_SLN is an env var * Add publish workflow * Add env.DOTNET_SLN to publish workflow * Add publish job * Combine publish into one job * Just create an artifact * Remove unused nuget lines * Add Publish job back Co-authored-by: Aaron Reisman --- .github/workflows/dotnet-publish.yml | 57 +++++++++++++++++++--------- 1 file changed, 40 insertions(+), 17 deletions(-) diff --git a/.github/workflows/dotnet-publish.yml b/.github/workflows/dotnet-publish.yml index 5bd0e3f3..79025913 100644 --- a/.github/workflows/dotnet-publish.yml +++ b/.github/workflows/dotnet-publish.yml @@ -15,34 +15,57 @@ env: jobs: build: - runs-on: windows-latest - steps: - uses: actions/checkout@v3 - name: Setup .NET uses: actions/setup-dotnet@v3 with: dotnet-version: ${{ env.DOTNET_VERSION }} - source-url: https://nuget.pkg.github.com//index.json env: NUGET_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Restore dependencies - run: dotnet restore ${{ DOTNET_SLN }} - + run: dotnet restore ${{ env.DOTNET_SLN }} - name: Build - run: dotnet build --configuration ${{ env.DOTNET_CONFIGURATION }} --no-restore ${{ DOTNET_SLN }} - - - name: Test - run: dotnet test --configuration ${{ env.DOTNET_CONFIGURATION }} --no-build --verbosity normal ${{ DOTNET_SLN }} - - - name: Zip Artifact - run: zip -r Libation.${{ github.ref_name }}.zip ./Source/bin/${{ env.DOTNET_CONFIGURATION }}/* - + run: dotnet build --configuration ${{ env.DOTNET_CONFIGURATION }} --no-restore ${{ env.DOTNET_SLN }} - name: Publish Artifact uses: actions/upload-artifact@v3 with: - name: Libation ${{ github.ref_name }} - path: Libation.${{ github.ref_name }}.zip - if-no-files-found: error \ No newline at end of file + name: LibationZip + path: ./Source/bin/${{ env.DOTNET_CONFIGURATION }}/ + if-no-files-found: error + + publish: + needs: build + runs-on: ubuntu-latest + steps: + - name: Download artifact + uses: actions/download-artifact@v3 + with: + name: LibationZip + path: ./Libation-${{ github.ref_name }} + - name: Zip Artifact + run: zip -r Libation.${{ github.ref_name }}.zip ./Libation-${{ github.ref_name }} + + - name: Create release + id: create_release + uses: actions/create-release@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token + with: + tag_name: ${{ github.ref }} + release_name: Libation ${{ github.ref }} + body: + draft: false + prerelease: false + + - name: Upload Release Asset + id: upload-release-asset + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} + asset_path: Libation.${{ github.ref_name }}.zip + asset_name: Libation.${{ github.ref_name }}.zip + asset_content_type: application/zip \ No newline at end of file From 78fd09aa91e33c5ff7b6211862ec5681c320e021 Mon Sep 17 00:00:00 2001 From: pixil98 <46978190+pixil98@users.noreply.github.com> Date: Tue, 22 Nov 2022 10:45:33 -0600 Subject: [PATCH 3/9] Proper build Builds all packages properly --- .github/workflows/dotnet-build.yml | 58 +++++++++++++++++++ .github/workflows/dotnet-publish.yml | 47 ++++----------- .github/workflows/dotnet-validate.yml | 24 ++------ .releaseindex.json | 8 +-- .../PublishProfiles/LinuxProfile.pubxml | 2 +- .../PublishProfiles/MacOSProfile.pubxml | 2 +- .../PublishProfiles/WindowsProfile.pubxml | 2 +- .../PublishProfiles/LinuxProfile.pubxml | 2 +- .../PublishProfiles/MacOSProfile.pubxml | 2 +- .../PublishProfiles/WindowsProfile.pubxml | 2 +- .../PublishProfiles/LinuxProfile.pubxml | 2 +- .../PublishProfiles/MacOSProfile.pubxml | 2 +- .../PublishProfiles/WindowsProfile.pubxml | 2 +- .../PublishProfiles/LinuxProfile.pubxml | 2 +- .../PublishProfiles/MacOSProfile.pubxml | 2 +- 15 files changed, 89 insertions(+), 70 deletions(-) create mode 100644 .github/workflows/dotnet-build.yml diff --git a/.github/workflows/dotnet-build.yml b/.github/workflows/dotnet-build.yml new file mode 100644 index 00000000..3214f625 --- /dev/null +++ b/.github/workflows/dotnet-build.yml @@ -0,0 +1,58 @@ +# 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: build + +on: + workflow_call: + inputs: + version: + type: string + description: 'Libation version' + required: true + +env: + DOTNET_VERSION: '7' # The .NET SDK version to use + DOTNET_CONFIGURATION: 'Release' + +jobs: + build: + runs-on: windows-latest + strategy: + matrix: + os: [Linux, MacOS, Windows] + ui: [Avalonia] + release_name: [chardonnay] + include: + - os: Windows + ui: WinForms + release_name: classic + steps: + - name: Lowercase os + run: | + echo "REPO=${GITHUB_REPOSITORY,,}" >>${GITHUB_ENV} + - uses: actions/checkout@v3 + - name: Setup .NET + uses: actions/setup-dotnet@v3 + with: + dotnet-version: ${{ env.DOTNET_VERSION }} + env: + NUGET_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Build + working-directory: ./Source + run: | + dotnet publish -c ${{ env.DOTNET_CONFIGURATION }} -o bin\Publish\${{ matrix.os }}-${{ matrix.release_name }} Libation${{ matrix.ui }}\Libation${{ matrix.ui }}.csproj -p:PublishProfile=Libation${{ matrix.ui }}\Properties\PublishProfiles\${{ matrix.os }}Profile.pubxml + dotnet publish -c ${{ env.DOTNET_CONFIGURATION }} -o bin\Publish\${{ matrix.os }}-${{ matrix.release_name }} LoadByOS\${{ matrix.os }}ConfigApp\${{ matrix.os }}ConfigApp.csproj -p:PublishProfile=LoadByOS\${{ matrix.os }}ConfigApp\PublishProfiles\${{ matrix.os }}Profile.pubxml + dotnet publish -c ${{ env.DOTNET_CONFIGURATION }} -o bin\Publish\${{ matrix.os }}-${{ matrix.release_name }} LibationCli\LibationCli.csproj -p:PublishProfile=LibationCli\Properties\PublishProfiles\${{ matrix.os }}Profile.pubxml + dotnet publish -c ${{ env.DOTNET_CONFIGURATION }} -o bin\Publish\${{ matrix.os }}-${{ matrix.release_name }} Hangover${{ matrix.ui }}\Hangover${{ matrix.ui }}.csproj -p:PublishProfile=Hangover${{ matrix.ui }}\Properties\PublishProfiles\${{ matrix.os }}Profile.pubxml + - name: Rename release folder + working-directory: ./Source + run: ren ./bin/Publish/${{ matrix.os }}-${{ matrix.release_name }} Libation.${{ inputs.version }}-${{ matrix.os }}-${{ matrix.release_name }} + - name: Zip artifact + run: Compress-Archive ./Source/bin/Publish/Libation.${{ inputs.version }}-${{ matrix.os }}-${{ matrix.release_name }} Libation.${{ inputs.version }}-${{ matrix.os }}-${{ matrix.release_name }}.zip + - name: Publish artifact + uses: actions/upload-artifact@v3 + with: + name: Libation.${{ inputs.version }}-${{ matrix.os }}-${{ matrix.release_name }} + path: Libation.${{ inputs.version }}-${{ matrix.os }}-${{ matrix.release_name }}.zip + if-no-files-found: error \ No newline at end of file diff --git a/.github/workflows/dotnet-publish.yml b/.github/workflows/dotnet-publish.yml index 79025913..09414e93 100644 --- a/.github/workflows/dotnet-publish.yml +++ b/.github/workflows/dotnet-publish.yml @@ -9,31 +9,15 @@ on: - 'v*' env: - DOTNET_VERSION: '6.0.x' # The .NET SDK version to use - DOTNET_SLN: './Source/Libation.sln' + DOTNET_VERSION: '7' # The .NET SDK version to use + DOTNET_SOURCE: './Source' DOTNET_CONFIGURATION: 'Release' jobs: build: - runs-on: windows-latest - steps: - - uses: actions/checkout@v3 - - name: Setup .NET - uses: actions/setup-dotnet@v3 - with: - dotnet-version: ${{ env.DOTNET_VERSION }} - env: - NUGET_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Restore dependencies - run: dotnet restore ${{ env.DOTNET_SLN }} - - name: Build - run: dotnet build --configuration ${{ env.DOTNET_CONFIGURATION }} --no-restore ${{ env.DOTNET_SLN }} - - name: Publish Artifact - uses: actions/upload-artifact@v3 - with: - name: LibationZip - path: ./Source/bin/${{ env.DOTNET_CONFIGURATION }}/ - if-no-files-found: error + uses: ./.github/workflows/dotnet-build.yml + with: + version: ${{ github.ref_name }} publish: needs: build @@ -42,11 +26,7 @@ jobs: - name: Download artifact uses: actions/download-artifact@v3 with: - name: LibationZip - path: ./Libation-${{ github.ref_name }} - - name: Zip Artifact - run: zip -r Libation.${{ github.ref_name }}.zip ./Libation-${{ github.ref_name }} - + path: artifacts - name: Create release id: create_release uses: actions/create-release@v1 @@ -56,16 +36,13 @@ jobs: tag_name: ${{ github.ref }} release_name: Libation ${{ github.ref }} body: - draft: false + draft: true prerelease: false - - - name: Upload Release Asset - id: upload-release-asset - uses: actions/upload-release-asset@v1 + - name: Upload Release Assets + id: upload-release-assets + uses: dwenegar/upload-release-assets@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: Libation.${{ github.ref_name }}.zip - asset_name: Libation.${{ github.ref_name }}.zip - asset_content_type: application/zip \ No newline at end of file + release_id: ${{ steps.create_release.outputs.id }} + assets_path: ./artifacts \ No newline at end of file diff --git a/.github/workflows/dotnet-validate.yml b/.github/workflows/dotnet-validate.yml index 87fca7ea..9b32845f 100644 --- a/.github/workflows/dotnet-validate.yml +++ b/.github/workflows/dotnet-validate.yml @@ -10,28 +10,12 @@ on: branches: [ "master" ] env: - DOTNET_VERSION: '6.0.x' # The .NET SDK version to use + DOTNET_VERSION: '7' # The .NET SDK version to use DOTNET_SLN: './Source/Libation.sln' DOTNET_CONFIGURATION: 'Release' jobs: build: - - runs-on: windows-latest - - steps: - - uses: actions/checkout@v3 - - name: Setup .NET - uses: actions/setup-dotnet@v3 - with: - dotnet-version: ${{ env.DOTNET_VERSION }} - - - name: Restore dependencies - run: dotnet restore ${{ env.DOTNET_SLN }} - - - name: Build - run: dotnet build --configuration ${{ env.DOTNET_CONFIGURATION }} --no-restore ${{ env.DOTNET_SLN }} - - - name: Test - run: dotnet test --configuration ${{ env.DOTNET_CONFIGURATION }} --no-build --verbosity normal ${{ env.DOTNET_SLN }} - \ No newline at end of file + uses: ./.github/workflows/dotnet-build.yml + with: + version: ${{ github.sha }} \ No newline at end of file diff --git a/.releaseindex.json b/.releaseindex.json index d3a35438..c9b05167 100644 --- a/.releaseindex.json +++ b/.releaseindex.json @@ -1,6 +1,6 @@ { - "WindowsClassic": "Libation\\.\\d+\\.\\d+\\.\\d+-win-classic\\.zip", - "WindowsAvalonia":"Libation\\.\\d+\\.\\d+\\.\\d+-win-chardonnay\\.zip", - "LinuxAvalonia": "Libation\\.\\d+\\.\\d+\\.\\d+-linux-chardonnay", - "MacOSAvalonia": "Libation\\.\\d+\\.\\d+\\.\\d+-macos-chardonnay" + "WindowsClassic": "Libation\\.v\\d+\\.\\d+\\.\\d+-Windows-chardonnay\\.zip", + "WindowsAvalonia":"Libation\\.v\\d+\\.\\d+\\.\\d+-Windows-chardonnay\\.zip", + "LinuxAvalonia": "Libation\\.v\\d+\\.\\d+\\.\\d+-Linux-chardonnay", + "MacOSAvalonia": "Libation\\.v\\d+\\.\\d+\\.\\d+-MacOS-chardonnay" } diff --git a/Source/HangoverAvalonia/Properties/PublishProfiles/LinuxProfile.pubxml b/Source/HangoverAvalonia/Properties/PublishProfiles/LinuxProfile.pubxml index 9b2a3ee4..cd35f42e 100644 --- a/Source/HangoverAvalonia/Properties/PublishProfiles/LinuxProfile.pubxml +++ b/Source/HangoverAvalonia/Properties/PublishProfiles/LinuxProfile.pubxml @@ -6,7 +6,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Release Any CPU - ..\bin\Publish\linux-chardonnay + ..\bin\Publish\Linux-chardonnay FileSystem net6.0 linux-x64 diff --git a/Source/HangoverAvalonia/Properties/PublishProfiles/MacOSProfile.pubxml b/Source/HangoverAvalonia/Properties/PublishProfiles/MacOSProfile.pubxml index 375935b6..53a83413 100644 --- a/Source/HangoverAvalonia/Properties/PublishProfiles/MacOSProfile.pubxml +++ b/Source/HangoverAvalonia/Properties/PublishProfiles/MacOSProfile.pubxml @@ -6,7 +6,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Release Any CPU - ..\bin\Publish\macos-chardonnay + ..\bin\Publish\MacOS-chardonnay FileSystem net6.0 osx-x64 diff --git a/Source/HangoverAvalonia/Properties/PublishProfiles/WindowsProfile.pubxml b/Source/HangoverAvalonia/Properties/PublishProfiles/WindowsProfile.pubxml index bdce48eb..8f28c798 100644 --- a/Source/HangoverAvalonia/Properties/PublishProfiles/WindowsProfile.pubxml +++ b/Source/HangoverAvalonia/Properties/PublishProfiles/WindowsProfile.pubxml @@ -6,7 +6,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Release Any CPU - ..\bin\Publish\win-chardonnay + ..\bin\Publish\Windows-chardonnay FileSystem net6.0 win-x64 diff --git a/Source/LibationAvalonia/Properties/PublishProfiles/LinuxProfile.pubxml b/Source/LibationAvalonia/Properties/PublishProfiles/LinuxProfile.pubxml index 9b2a3ee4..cd35f42e 100644 --- a/Source/LibationAvalonia/Properties/PublishProfiles/LinuxProfile.pubxml +++ b/Source/LibationAvalonia/Properties/PublishProfiles/LinuxProfile.pubxml @@ -6,7 +6,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Release Any CPU - ..\bin\Publish\linux-chardonnay + ..\bin\Publish\Linux-chardonnay FileSystem net6.0 linux-x64 diff --git a/Source/LibationAvalonia/Properties/PublishProfiles/MacOSProfile.pubxml b/Source/LibationAvalonia/Properties/PublishProfiles/MacOSProfile.pubxml index 375935b6..53a83413 100644 --- a/Source/LibationAvalonia/Properties/PublishProfiles/MacOSProfile.pubxml +++ b/Source/LibationAvalonia/Properties/PublishProfiles/MacOSProfile.pubxml @@ -6,7 +6,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Release Any CPU - ..\bin\Publish\macos-chardonnay + ..\bin\Publish\MacOS-chardonnay FileSystem net6.0 osx-x64 diff --git a/Source/LibationAvalonia/Properties/PublishProfiles/WindowsProfile.pubxml b/Source/LibationAvalonia/Properties/PublishProfiles/WindowsProfile.pubxml index bdce48eb..8f28c798 100644 --- a/Source/LibationAvalonia/Properties/PublishProfiles/WindowsProfile.pubxml +++ b/Source/LibationAvalonia/Properties/PublishProfiles/WindowsProfile.pubxml @@ -6,7 +6,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Release Any CPU - ..\bin\Publish\win-chardonnay + ..\bin\Publish\Windows-chardonnay FileSystem net6.0 win-x64 diff --git a/Source/LibationCli/Properties/PublishProfiles/LinuxProfile.pubxml b/Source/LibationCli/Properties/PublishProfiles/LinuxProfile.pubxml index 9b2a3ee4..cd35f42e 100644 --- a/Source/LibationCli/Properties/PublishProfiles/LinuxProfile.pubxml +++ b/Source/LibationCli/Properties/PublishProfiles/LinuxProfile.pubxml @@ -6,7 +6,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Release Any CPU - ..\bin\Publish\linux-chardonnay + ..\bin\Publish\Linux-chardonnay FileSystem net6.0 linux-x64 diff --git a/Source/LibationCli/Properties/PublishProfiles/MacOSProfile.pubxml b/Source/LibationCli/Properties/PublishProfiles/MacOSProfile.pubxml index 375935b6..53a83413 100644 --- a/Source/LibationCli/Properties/PublishProfiles/MacOSProfile.pubxml +++ b/Source/LibationCli/Properties/PublishProfiles/MacOSProfile.pubxml @@ -6,7 +6,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Release Any CPU - ..\bin\Publish\macos-chardonnay + ..\bin\Publish\MacOS-chardonnay FileSystem net6.0 osx-x64 diff --git a/Source/LibationCli/Properties/PublishProfiles/WindowsProfile.pubxml b/Source/LibationCli/Properties/PublishProfiles/WindowsProfile.pubxml index bdce48eb..8f28c798 100644 --- a/Source/LibationCli/Properties/PublishProfiles/WindowsProfile.pubxml +++ b/Source/LibationCli/Properties/PublishProfiles/WindowsProfile.pubxml @@ -6,7 +6,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Release Any CPU - ..\bin\Publish\win-chardonnay + ..\bin\Publish\Windows-chardonnay FileSystem net6.0 win-x64 diff --git a/Source/LoadByOS/LinuxConfigApp/PublishProfiles/LinuxProfile.pubxml b/Source/LoadByOS/LinuxConfigApp/PublishProfiles/LinuxProfile.pubxml index 87456e98..034694b5 100644 --- a/Source/LoadByOS/LinuxConfigApp/PublishProfiles/LinuxProfile.pubxml +++ b/Source/LoadByOS/LinuxConfigApp/PublishProfiles/LinuxProfile.pubxml @@ -6,7 +6,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Release Any CPU - ..\..\bin\Publish\linux-chardonnay + ..\..\bin\Publish\Linux-chardonnay FileSystem net6.0 linux-x64 diff --git a/Source/LoadByOS/MacOSConfigApp/PublishProfiles/MacOSProfile.pubxml b/Source/LoadByOS/MacOSConfigApp/PublishProfiles/MacOSProfile.pubxml index 7d7e53ee..6322c994 100644 --- a/Source/LoadByOS/MacOSConfigApp/PublishProfiles/MacOSProfile.pubxml +++ b/Source/LoadByOS/MacOSConfigApp/PublishProfiles/MacOSProfile.pubxml @@ -6,7 +6,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Release Any CPU - ..\..\bin\Publish\macos-chardonnay + ..\..\bin\Publish\MacOS-chardonnay FileSystem net6.0 osx-x64 From 2fa0bcb765865802c243d02b0cd1116e66b4d618 Mon Sep 17 00:00:00 2001 From: pixil98 <46978190+pixil98@users.noreply.github.com> Date: Wed, 23 Nov 2022 15:48:37 -0600 Subject: [PATCH 4/9] Near final workflows Updated workflows to release zips with the correct file names. --- .github/workflows/dotnet-build.yml | 17 ++------------ .github/workflows/dotnet-publish.yml | 33 ++++++++++++++++++++------- .github/workflows/dotnet-validate.yml | 4 +--- .releaseindex.json | 8 +++---- 4 files changed, 32 insertions(+), 30 deletions(-) diff --git a/.github/workflows/dotnet-build.yml b/.github/workflows/dotnet-build.yml index 3214f625..7a5fc62d 100644 --- a/.github/workflows/dotnet-build.yml +++ b/.github/workflows/dotnet-build.yml @@ -5,11 +5,6 @@ name: build on: workflow_call: - inputs: - version: - type: string - description: 'Libation version' - required: true env: DOTNET_VERSION: '7' # The .NET SDK version to use @@ -28,9 +23,6 @@ jobs: ui: WinForms release_name: classic steps: - - name: Lowercase os - run: | - echo "REPO=${GITHUB_REPOSITORY,,}" >>${GITHUB_ENV} - uses: actions/checkout@v3 - name: Setup .NET uses: actions/setup-dotnet@v3 @@ -45,14 +37,9 @@ jobs: dotnet publish -c ${{ env.DOTNET_CONFIGURATION }} -o bin\Publish\${{ matrix.os }}-${{ matrix.release_name }} LoadByOS\${{ matrix.os }}ConfigApp\${{ matrix.os }}ConfigApp.csproj -p:PublishProfile=LoadByOS\${{ matrix.os }}ConfigApp\PublishProfiles\${{ matrix.os }}Profile.pubxml dotnet publish -c ${{ env.DOTNET_CONFIGURATION }} -o bin\Publish\${{ matrix.os }}-${{ matrix.release_name }} LibationCli\LibationCli.csproj -p:PublishProfile=LibationCli\Properties\PublishProfiles\${{ matrix.os }}Profile.pubxml dotnet publish -c ${{ env.DOTNET_CONFIGURATION }} -o bin\Publish\${{ matrix.os }}-${{ matrix.release_name }} Hangover${{ matrix.ui }}\Hangover${{ matrix.ui }}.csproj -p:PublishProfile=Hangover${{ matrix.ui }}\Properties\PublishProfiles\${{ matrix.os }}Profile.pubxml - - name: Rename release folder - working-directory: ./Source - run: ren ./bin/Publish/${{ matrix.os }}-${{ matrix.release_name }} Libation.${{ inputs.version }}-${{ matrix.os }}-${{ matrix.release_name }} - - name: Zip artifact - run: Compress-Archive ./Source/bin/Publish/Libation.${{ inputs.version }}-${{ matrix.os }}-${{ matrix.release_name }} Libation.${{ inputs.version }}-${{ matrix.os }}-${{ matrix.release_name }}.zip - name: Publish artifact uses: actions/upload-artifact@v3 with: - name: Libation.${{ inputs.version }}-${{ matrix.os }}-${{ matrix.release_name }} - path: Libation.${{ inputs.version }}-${{ matrix.os }}-${{ matrix.release_name }}.zip + name: ${{ matrix.os }}-${{ matrix.release_name }} + path: ./Source/bin/Publish/${{ matrix.os }}-${{ matrix.release_name }}/* if-no-files-found: error \ No newline at end of file diff --git a/.github/workflows/dotnet-publish.yml b/.github/workflows/dotnet-publish.yml index 09414e93..de307eb1 100644 --- a/.github/workflows/dotnet-publish.yml +++ b/.github/workflows/dotnet-publish.yml @@ -16,17 +16,34 @@ env: jobs: build: uses: ./.github/workflows/dotnet-build.yml - with: - version: ${{ github.ref_name }} - publish: + release: needs: build runs-on: ubuntu-latest steps: - - name: Download artifact + - name: Calculate version + id: version + run: | + export TAG=${{ github.ref_name }} + echo "version=${TAG#v}" >> $GITHUB_OUTPUT + + - name: Download artifacts uses: actions/download-artifact@v3 with: path: artifacts + + - name: Rename artifacts + id: rename + working-directory: ./artifacts + run: for FILENAME in *; do mv ${FILENAME} Libation.${{ steps.version.outputs.version }}-${FILENAME,,}; done + + - name: Zip assets + working-directory: ./artifacts + run: | + for FILENAME in *; do zip -r ${FILENAME}.zip ${FILENAME}; done + mkdir ./assets + mv *.zip ./assets + - name: Create release id: create_release uses: actions/create-release@v1 @@ -34,15 +51,15 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token with: tag_name: ${{ github.ref }} - release_name: Libation ${{ github.ref }} + release_name: Libation ${{ steps.version.outputs.version }} body: draft: true prerelease: false - - name: Upload Release Assets - id: upload-release-assets + + - name: Upload release assets uses: dwenegar/upload-release-assets@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: release_id: ${{ steps.create_release.outputs.id }} - assets_path: ./artifacts \ No newline at end of file + assets_path: ./artifacts/assets \ No newline at end of file diff --git a/.github/workflows/dotnet-validate.yml b/.github/workflows/dotnet-validate.yml index 9b32845f..fa1ef57d 100644 --- a/.github/workflows/dotnet-validate.yml +++ b/.github/workflows/dotnet-validate.yml @@ -16,6 +16,4 @@ env: jobs: build: - uses: ./.github/workflows/dotnet-build.yml - with: - version: ${{ github.sha }} \ No newline at end of file + uses: ./.github/workflows/dotnet-build.yml \ No newline at end of file diff --git a/.releaseindex.json b/.releaseindex.json index c9b05167..4b0f776a 100644 --- a/.releaseindex.json +++ b/.releaseindex.json @@ -1,6 +1,6 @@ { - "WindowsClassic": "Libation\\.v\\d+\\.\\d+\\.\\d+-Windows-chardonnay\\.zip", - "WindowsAvalonia":"Libation\\.v\\d+\\.\\d+\\.\\d+-Windows-chardonnay\\.zip", - "LinuxAvalonia": "Libation\\.v\\d+\\.\\d+\\.\\d+-Linux-chardonnay", - "MacOSAvalonia": "Libation\\.v\\d+\\.\\d+\\.\\d+-MacOS-chardonnay" + "WindowsClassic": "Libation\\.\\d+\\.\\d+\\.\\d+-Windows-classic\\.zip", + "WindowsAvalonia":"Libation\\.\\d+\\.\\d+\\.\\d+-Windows-chardonnay\\.zip", + "LinuxAvalonia": "Libation\\.\\d+\\.\\d+\\.\\d+-Linux-chardonnay", + "MacOSAvalonia": "Libation\\.\\d+\\.\\d+\\.\\d+-MacOS-chardonnay" } From 34fac30b2b7b09b6f0debed969a54e099b33710d Mon Sep 17 00:00:00 2001 From: pixil98 <46978190+pixil98@users.noreply.github.com> Date: Thu, 24 Nov 2022 23:53:00 -0600 Subject: [PATCH 5/9] Merge official updates (#6) Pull latest Libation updates, fix move to net7 --- .github/workflows/dotnet-build.yml | 5 ++-- .github/workflows/dotnet-publish.yml | 2 +- .github/workflows/dotnet-validate.yml | 2 +- Source/AaxDecrypter/AaxDecrypter.csproj | 2 +- Source/AppScaffolding/AppScaffolding.csproj | 2 +- .../ApplicationServices.csproj | 6 ++-- .../AudibleUtilities/AudibleUtilities.csproj | 4 +-- Source/DataLayer/DataLayer.csproj | 12 ++++---- .../DtoImporterService.csproj | 2 +- Source/FileLiberator/FileLiberator.csproj | 2 +- Source/FileManager/FileManager.csproj | 4 +-- .../HangoverAvalonia/HangoverAvalonia.csproj | 4 +-- .../PublishProfiles/LinuxProfile.pubxml | 2 +- .../PublishProfiles/MacOSProfile.pubxml | 2 +- .../PublishProfiles/WindowsProfile.pubxml | 2 +- Source/HangoverBase/HangoverBase.csproj | 2 +- .../HangoverWinForms/HangoverWinForms.csproj | 2 +- .../PublishProfiles/WindowsProfile.pubxml | 2 +- .../LibationAvalonia/LibationAvalonia.csproj | 4 +-- .../PublishProfiles/LinuxProfile.pubxml | 2 +- .../PublishProfiles/MacOSProfile.pubxml | 2 +- .../PublishProfiles/WindowsProfile.pubxml | 2 +- Source/LibationCli/LibationCli.csproj | 4 +-- .../PublishProfiles/LinuxProfile.pubxml | 2 +- .../PublishProfiles/MacOSProfile.pubxml | 2 +- .../PublishProfiles/WindowsProfile.pubxml | 2 +- .../LibationFileManager.csproj | 4 +-- .../LibationSearchEngine.csproj | 2 +- .../LibationWinForms/LibationWinForms.csproj | 4 +-- .../PublishProfiles/WindowsProfile.pubxml | 2 +- .../LinuxConfigApp/LinuxConfigApp.csproj | 2 +- .../PublishProfiles/LinuxProfile.pubxml | 2 +- .../MacOSConfigApp/MacOSConfigApp.csproj | 2 +- .../PublishProfiles/MacOSProfile.pubxml | 2 +- .../PublishProfiles/WindowsProfile.pubxml | 2 +- .../WindowsConfigApp/WindowsConfigApp.csproj | 4 +-- .../CrossPlatformClientExe.csproj | 30 ++++++++++--------- .../LinuxConfigApp/LinuxConfigApp.csproj | 2 +- .../WindowsConfigApp/WindowsConfigApp.csproj | 2 +- .../AudibleUtilities.Tests.csproj | 4 +-- .../FileLiberator.Tests.csproj | 4 +-- .../FileManager.Tests.csproj | 4 +-- .../LibationFileManager.Tests.csproj | 4 +-- .../LibationSearchEngine.Tests.csproj | 4 +-- 44 files changed, 80 insertions(+), 79 deletions(-) rename Source/LoadByOS/LinuxConfigApp/{ => Properties}/PublishProfiles/LinuxProfile.pubxml (92%) rename Source/LoadByOS/MacOSConfigApp/{ => Properties}/PublishProfiles/MacOSProfile.pubxml (92%) rename Source/LoadByOS/WindowsConfigApp/{ => Properties}/PublishProfiles/WindowsProfile.pubxml (89%) diff --git a/.github/workflows/dotnet-build.yml b/.github/workflows/dotnet-build.yml index 7a5fc62d..6ae3c87a 100644 --- a/.github/workflows/dotnet-build.yml +++ b/.github/workflows/dotnet-build.yml @@ -7,7 +7,6 @@ on: workflow_call: env: - DOTNET_VERSION: '7' # The .NET SDK version to use DOTNET_CONFIGURATION: 'Release' jobs: @@ -27,14 +26,14 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v3 with: - dotnet-version: ${{ env.DOTNET_VERSION }} + dotnet-version: '7.x' env: NUGET_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Build working-directory: ./Source run: | dotnet publish -c ${{ env.DOTNET_CONFIGURATION }} -o bin\Publish\${{ matrix.os }}-${{ matrix.release_name }} Libation${{ matrix.ui }}\Libation${{ matrix.ui }}.csproj -p:PublishProfile=Libation${{ matrix.ui }}\Properties\PublishProfiles\${{ matrix.os }}Profile.pubxml - dotnet publish -c ${{ env.DOTNET_CONFIGURATION }} -o bin\Publish\${{ matrix.os }}-${{ matrix.release_name }} LoadByOS\${{ matrix.os }}ConfigApp\${{ matrix.os }}ConfigApp.csproj -p:PublishProfile=LoadByOS\${{ matrix.os }}ConfigApp\PublishProfiles\${{ matrix.os }}Profile.pubxml + dotnet publish -c ${{ env.DOTNET_CONFIGURATION }} -o bin\Publish\${{ matrix.os }}-${{ matrix.release_name }} LoadByOS\${{ matrix.os }}ConfigApp\${{ matrix.os }}ConfigApp.csproj -p:PublishProfile=LoadByOS\Properties\${{ matrix.os }}ConfigApp\PublishProfiles\${{ matrix.os }}Profile.pubxml dotnet publish -c ${{ env.DOTNET_CONFIGURATION }} -o bin\Publish\${{ matrix.os }}-${{ matrix.release_name }} LibationCli\LibationCli.csproj -p:PublishProfile=LibationCli\Properties\PublishProfiles\${{ matrix.os }}Profile.pubxml dotnet publish -c ${{ env.DOTNET_CONFIGURATION }} -o bin\Publish\${{ matrix.os }}-${{ matrix.release_name }} Hangover${{ matrix.ui }}\Hangover${{ matrix.ui }}.csproj -p:PublishProfile=Hangover${{ matrix.ui }}\Properties\PublishProfiles\${{ matrix.os }}Profile.pubxml - name: Publish artifact diff --git a/.github/workflows/dotnet-publish.yml b/.github/workflows/dotnet-publish.yml index de307eb1..134a6dcc 100644 --- a/.github/workflows/dotnet-publish.yml +++ b/.github/workflows/dotnet-publish.yml @@ -62,4 +62,4 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: release_id: ${{ steps.create_release.outputs.id }} - assets_path: ./artifacts/assets \ No newline at end of file + assets_path: ./artifacts/assets diff --git a/.github/workflows/dotnet-validate.yml b/.github/workflows/dotnet-validate.yml index fa1ef57d..16313d20 100644 --- a/.github/workflows/dotnet-validate.yml +++ b/.github/workflows/dotnet-validate.yml @@ -16,4 +16,4 @@ env: jobs: build: - uses: ./.github/workflows/dotnet-build.yml \ No newline at end of file + uses: ./.github/workflows/dotnet-build.yml diff --git a/Source/AaxDecrypter/AaxDecrypter.csproj b/Source/AaxDecrypter/AaxDecrypter.csproj index 5161a357..7a885fb2 100644 --- a/Source/AaxDecrypter/AaxDecrypter.csproj +++ b/Source/AaxDecrypter/AaxDecrypter.csproj @@ -1,7 +1,7 @@  - net6.0 + net7.0 diff --git a/Source/AppScaffolding/AppScaffolding.csproj b/Source/AppScaffolding/AppScaffolding.csproj index 61400c70..2c1c3052 100644 --- a/Source/AppScaffolding/AppScaffolding.csproj +++ b/Source/AppScaffolding/AppScaffolding.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 8.5.1.1 diff --git a/Source/ApplicationServices/ApplicationServices.csproj b/Source/ApplicationServices/ApplicationServices.csproj index 9ac7be2f..91084ca4 100644 --- a/Source/ApplicationServices/ApplicationServices.csproj +++ b/Source/ApplicationServices/ApplicationServices.csproj @@ -1,12 +1,12 @@  - net6.0 + net7.0 - - + + diff --git a/Source/AudibleUtilities/AudibleUtilities.csproj b/Source/AudibleUtilities/AudibleUtilities.csproj index d8ff5281..bdd7a08f 100644 --- a/Source/AudibleUtilities/AudibleUtilities.csproj +++ b/Source/AudibleUtilities/AudibleUtilities.csproj @@ -1,11 +1,11 @@  - net6.0 + net7.0 - + diff --git a/Source/DataLayer/DataLayer.csproj b/Source/DataLayer/DataLayer.csproj index 963b1dfe..848a6f35 100644 --- a/Source/DataLayer/DataLayer.csproj +++ b/Source/DataLayer/DataLayer.csproj @@ -1,7 +1,7 @@  - net6.0 + net7.0 @@ -10,14 +10,14 @@ - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Source/DtoImporterService/DtoImporterService.csproj b/Source/DtoImporterService/DtoImporterService.csproj index aba836a6..201f603b 100644 --- a/Source/DtoImporterService/DtoImporterService.csproj +++ b/Source/DtoImporterService/DtoImporterService.csproj @@ -1,7 +1,7 @@  - net6.0 + net7.0 diff --git a/Source/FileLiberator/FileLiberator.csproj b/Source/FileLiberator/FileLiberator.csproj index 524efe12..859d2ff3 100644 --- a/Source/FileLiberator/FileLiberator.csproj +++ b/Source/FileLiberator/FileLiberator.csproj @@ -1,7 +1,7 @@  - net6.0 + net7.0 diff --git a/Source/FileManager/FileManager.csproj b/Source/FileManager/FileManager.csproj index b179c3d3..2827e340 100644 --- a/Source/FileManager/FileManager.csproj +++ b/Source/FileManager/FileManager.csproj @@ -1,11 +1,11 @@  - net6.0 + net7.0 - + diff --git a/Source/HangoverAvalonia/HangoverAvalonia.csproj b/Source/HangoverAvalonia/HangoverAvalonia.csproj index 9a9a3329..a78f4fe2 100644 --- a/Source/HangoverAvalonia/HangoverAvalonia.csproj +++ b/Source/HangoverAvalonia/HangoverAvalonia.csproj @@ -1,7 +1,7 @@  WinExe - net6.0 + net7.0 copyused true @@ -68,7 +68,7 @@ - + diff --git a/Source/HangoverAvalonia/Properties/PublishProfiles/LinuxProfile.pubxml b/Source/HangoverAvalonia/Properties/PublishProfiles/LinuxProfile.pubxml index cd35f42e..0b59245a 100644 --- a/Source/HangoverAvalonia/Properties/PublishProfiles/LinuxProfile.pubxml +++ b/Source/HangoverAvalonia/Properties/PublishProfiles/LinuxProfile.pubxml @@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Any CPU ..\bin\Publish\Linux-chardonnay FileSystem - net6.0 + net7.0 linux-x64 true false diff --git a/Source/HangoverAvalonia/Properties/PublishProfiles/MacOSProfile.pubxml b/Source/HangoverAvalonia/Properties/PublishProfiles/MacOSProfile.pubxml index 53a83413..edc665dd 100644 --- a/Source/HangoverAvalonia/Properties/PublishProfiles/MacOSProfile.pubxml +++ b/Source/HangoverAvalonia/Properties/PublishProfiles/MacOSProfile.pubxml @@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Any CPU ..\bin\Publish\MacOS-chardonnay FileSystem - net6.0 + net7.0 osx-x64 true false diff --git a/Source/HangoverAvalonia/Properties/PublishProfiles/WindowsProfile.pubxml b/Source/HangoverAvalonia/Properties/PublishProfiles/WindowsProfile.pubxml index 8f28c798..0a5269ea 100644 --- a/Source/HangoverAvalonia/Properties/PublishProfiles/WindowsProfile.pubxml +++ b/Source/HangoverAvalonia/Properties/PublishProfiles/WindowsProfile.pubxml @@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Any CPU ..\bin\Publish\Windows-chardonnay FileSystem - net6.0 + net7.0 win-x64 true false diff --git a/Source/HangoverBase/HangoverBase.csproj b/Source/HangoverBase/HangoverBase.csproj index 12b4b19e..340e1006 100644 --- a/Source/HangoverBase/HangoverBase.csproj +++ b/Source/HangoverBase/HangoverBase.csproj @@ -1,7 +1,7 @@  - net6.0 + net7.0 enable diff --git a/Source/HangoverWinForms/HangoverWinForms.csproj b/Source/HangoverWinForms/HangoverWinForms.csproj index da3934ca..c08bed6b 100644 --- a/Source/HangoverWinForms/HangoverWinForms.csproj +++ b/Source/HangoverWinForms/HangoverWinForms.csproj @@ -2,7 +2,7 @@ WinExe - net6.0-windows + net7.0-windows true hangover.ico enable diff --git a/Source/HangoverWinForms/Properties/PublishProfiles/WindowsProfile.pubxml b/Source/HangoverWinForms/Properties/PublishProfiles/WindowsProfile.pubxml index 708a4cb7..7d5103f3 100644 --- a/Source/HangoverWinForms/Properties/PublishProfiles/WindowsProfile.pubxml +++ b/Source/HangoverWinForms/Properties/PublishProfiles/WindowsProfile.pubxml @@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Any CPU ..\bin\Publish\classic FileSystem - net6.0-windows + net7.0-windows win-x64 true false diff --git a/Source/LibationAvalonia/LibationAvalonia.csproj b/Source/LibationAvalonia/LibationAvalonia.csproj index dfe2f0cb..09aa80f2 100644 --- a/Source/LibationAvalonia/LibationAvalonia.csproj +++ b/Source/LibationAvalonia/LibationAvalonia.csproj @@ -3,7 +3,7 @@ WinExe - net6.0 + net7.0 copyused true @@ -129,7 +129,7 @@ - + diff --git a/Source/LibationAvalonia/Properties/PublishProfiles/LinuxProfile.pubxml b/Source/LibationAvalonia/Properties/PublishProfiles/LinuxProfile.pubxml index cd35f42e..0b59245a 100644 --- a/Source/LibationAvalonia/Properties/PublishProfiles/LinuxProfile.pubxml +++ b/Source/LibationAvalonia/Properties/PublishProfiles/LinuxProfile.pubxml @@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Any CPU ..\bin\Publish\Linux-chardonnay FileSystem - net6.0 + net7.0 linux-x64 true false diff --git a/Source/LibationAvalonia/Properties/PublishProfiles/MacOSProfile.pubxml b/Source/LibationAvalonia/Properties/PublishProfiles/MacOSProfile.pubxml index 53a83413..edc665dd 100644 --- a/Source/LibationAvalonia/Properties/PublishProfiles/MacOSProfile.pubxml +++ b/Source/LibationAvalonia/Properties/PublishProfiles/MacOSProfile.pubxml @@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Any CPU ..\bin\Publish\MacOS-chardonnay FileSystem - net6.0 + net7.0 osx-x64 true false diff --git a/Source/LibationAvalonia/Properties/PublishProfiles/WindowsProfile.pubxml b/Source/LibationAvalonia/Properties/PublishProfiles/WindowsProfile.pubxml index 8f28c798..0a5269ea 100644 --- a/Source/LibationAvalonia/Properties/PublishProfiles/WindowsProfile.pubxml +++ b/Source/LibationAvalonia/Properties/PublishProfiles/WindowsProfile.pubxml @@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Any CPU ..\bin\Publish\Windows-chardonnay FileSystem - net6.0 + net7.0 win-x64 true false diff --git a/Source/LibationCli/LibationCli.csproj b/Source/LibationCli/LibationCli.csproj index ef5b0954..b61341eb 100644 --- a/Source/LibationCli/LibationCli.csproj +++ b/Source/LibationCli/LibationCli.csproj @@ -3,7 +3,7 @@ Exe - net6.0 + net7.0 true false false @@ -44,7 +44,7 @@ - + diff --git a/Source/LibationCli/Properties/PublishProfiles/LinuxProfile.pubxml b/Source/LibationCli/Properties/PublishProfiles/LinuxProfile.pubxml index cd35f42e..0b59245a 100644 --- a/Source/LibationCli/Properties/PublishProfiles/LinuxProfile.pubxml +++ b/Source/LibationCli/Properties/PublishProfiles/LinuxProfile.pubxml @@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Any CPU ..\bin\Publish\Linux-chardonnay FileSystem - net6.0 + net7.0 linux-x64 true false diff --git a/Source/LibationCli/Properties/PublishProfiles/MacOSProfile.pubxml b/Source/LibationCli/Properties/PublishProfiles/MacOSProfile.pubxml index 53a83413..edc665dd 100644 --- a/Source/LibationCli/Properties/PublishProfiles/MacOSProfile.pubxml +++ b/Source/LibationCli/Properties/PublishProfiles/MacOSProfile.pubxml @@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Any CPU ..\bin\Publish\MacOS-chardonnay FileSystem - net6.0 + net7.0 osx-x64 true false diff --git a/Source/LibationCli/Properties/PublishProfiles/WindowsProfile.pubxml b/Source/LibationCli/Properties/PublishProfiles/WindowsProfile.pubxml index 8f28c798..0a5269ea 100644 --- a/Source/LibationCli/Properties/PublishProfiles/WindowsProfile.pubxml +++ b/Source/LibationCli/Properties/PublishProfiles/WindowsProfile.pubxml @@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Any CPU ..\bin\Publish\Windows-chardonnay FileSystem - net6.0 + net7.0 win-x64 true false diff --git a/Source/LibationFileManager/LibationFileManager.csproj b/Source/LibationFileManager/LibationFileManager.csproj index 5f1b6be1..c7cb0609 100644 --- a/Source/LibationFileManager/LibationFileManager.csproj +++ b/Source/LibationFileManager/LibationFileManager.csproj @@ -1,11 +1,11 @@  - net6.0 + net7.0 - + diff --git a/Source/LibationSearchEngine/LibationSearchEngine.csproj b/Source/LibationSearchEngine/LibationSearchEngine.csproj index cf14f994..6e17c84d 100644 --- a/Source/LibationSearchEngine/LibationSearchEngine.csproj +++ b/Source/LibationSearchEngine/LibationSearchEngine.csproj @@ -1,7 +1,7 @@  - net6.0 + net7.0 diff --git a/Source/LibationWinForms/LibationWinForms.csproj b/Source/LibationWinForms/LibationWinForms.csproj index d420ec8a..5f318f12 100644 --- a/Source/LibationWinForms/LibationWinForms.csproj +++ b/Source/LibationWinForms/LibationWinForms.csproj @@ -3,7 +3,7 @@ WinExe - net6.0-windows + net7.0-windows true libation.ico Libation @@ -44,7 +44,7 @@ - + diff --git a/Source/LibationWinForms/Properties/PublishProfiles/WindowsProfile.pubxml b/Source/LibationWinForms/Properties/PublishProfiles/WindowsProfile.pubxml index e3a5e4e2..5e3f4318 100644 --- a/Source/LibationWinForms/Properties/PublishProfiles/WindowsProfile.pubxml +++ b/Source/LibationWinForms/Properties/PublishProfiles/WindowsProfile.pubxml @@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Any CPU ..\bin\Publish\classic FileSystem - net6.0-windows + net7.0-windows win-x64 true false diff --git a/Source/LoadByOS/LinuxConfigApp/LinuxConfigApp.csproj b/Source/LoadByOS/LinuxConfigApp/LinuxConfigApp.csproj index 72fc3206..9a7e5ba2 100644 --- a/Source/LoadByOS/LinuxConfigApp/LinuxConfigApp.csproj +++ b/Source/LoadByOS/LinuxConfigApp/LinuxConfigApp.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net7.0 enable true linux-x64 diff --git a/Source/LoadByOS/LinuxConfigApp/PublishProfiles/LinuxProfile.pubxml b/Source/LoadByOS/LinuxConfigApp/Properties/PublishProfiles/LinuxProfile.pubxml similarity index 92% rename from Source/LoadByOS/LinuxConfigApp/PublishProfiles/LinuxProfile.pubxml rename to Source/LoadByOS/LinuxConfigApp/Properties/PublishProfiles/LinuxProfile.pubxml index 034694b5..f3a25bb3 100644 --- a/Source/LoadByOS/LinuxConfigApp/PublishProfiles/LinuxProfile.pubxml +++ b/Source/LoadByOS/LinuxConfigApp/Properties/PublishProfiles/LinuxProfile.pubxml @@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Any CPU ..\..\bin\Publish\Linux-chardonnay FileSystem - net6.0 + net7.0 linux-x64 true false diff --git a/Source/LoadByOS/MacOSConfigApp/MacOSConfigApp.csproj b/Source/LoadByOS/MacOSConfigApp/MacOSConfigApp.csproj index cf6d1f79..55bb69bf 100644 --- a/Source/LoadByOS/MacOSConfigApp/MacOSConfigApp.csproj +++ b/Source/LoadByOS/MacOSConfigApp/MacOSConfigApp.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net7.0 enable true osx-x64 diff --git a/Source/LoadByOS/MacOSConfigApp/PublishProfiles/MacOSProfile.pubxml b/Source/LoadByOS/MacOSConfigApp/Properties/PublishProfiles/MacOSProfile.pubxml similarity index 92% rename from Source/LoadByOS/MacOSConfigApp/PublishProfiles/MacOSProfile.pubxml rename to Source/LoadByOS/MacOSConfigApp/Properties/PublishProfiles/MacOSProfile.pubxml index 6322c994..ea9e44d8 100644 --- a/Source/LoadByOS/MacOSConfigApp/PublishProfiles/MacOSProfile.pubxml +++ b/Source/LoadByOS/MacOSConfigApp/Properties/PublishProfiles/MacOSProfile.pubxml @@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Any CPU ..\..\bin\Publish\MacOS-chardonnay FileSystem - net6.0 + net7.0 osx-x64 true false diff --git a/Source/LoadByOS/WindowsConfigApp/PublishProfiles/WindowsProfile.pubxml b/Source/LoadByOS/WindowsConfigApp/Properties/PublishProfiles/WindowsProfile.pubxml similarity index 89% rename from Source/LoadByOS/WindowsConfigApp/PublishProfiles/WindowsProfile.pubxml rename to Source/LoadByOS/WindowsConfigApp/Properties/PublishProfiles/WindowsProfile.pubxml index 46581a34..03ef4015 100644 --- a/Source/LoadByOS/WindowsConfigApp/PublishProfiles/WindowsProfile.pubxml +++ b/Source/LoadByOS/WindowsConfigApp/Properties/PublishProfiles/WindowsProfile.pubxml @@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Any CPU ..\..\bin\Publish\classic FileSystem - net6.0-windows + net7.0-windows win-x64 true false diff --git a/Source/LoadByOS/WindowsConfigApp/WindowsConfigApp.csproj b/Source/LoadByOS/WindowsConfigApp/WindowsConfigApp.csproj index 5a27ff40..a033b1bf 100644 --- a/Source/LoadByOS/WindowsConfigApp/WindowsConfigApp.csproj +++ b/Source/LoadByOS/WindowsConfigApp/WindowsConfigApp.csproj @@ -2,7 +2,7 @@ WinExe - net6.0-windows + net7.0-windows true enable true @@ -32,7 +32,7 @@ - + diff --git a/Source/_Demos/LoadByOS/CrossPlatformClientExe/CrossPlatformClientExe.csproj b/Source/_Demos/LoadByOS/CrossPlatformClientExe/CrossPlatformClientExe.csproj index abb684bd..8ffb5672 100644 --- a/Source/_Demos/LoadByOS/CrossPlatformClientExe/CrossPlatformClientExe.csproj +++ b/Source/_Demos/LoadByOS/CrossPlatformClientExe/CrossPlatformClientExe.csproj @@ -2,22 +2,24 @@ Exe - net6.0 - false - false + net7.0 + enable + false + false + + + + ..\bin\Debug + embedded - - ..\bin\Debug - embedded - - - ..\bin\Release - embedded - + + ..\bin\Release + embedded + - - - + + + diff --git a/Source/_Demos/LoadByOS/LinuxConfigApp/LinuxConfigApp.csproj b/Source/_Demos/LoadByOS/LinuxConfigApp/LinuxConfigApp.csproj index 1c150006..b90c3c04 100644 --- a/Source/_Demos/LoadByOS/LinuxConfigApp/LinuxConfigApp.csproj +++ b/Source/_Demos/LoadByOS/LinuxConfigApp/LinuxConfigApp.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net7.0 enable false false diff --git a/Source/_Demos/LoadByOS/WindowsConfigApp/WindowsConfigApp.csproj b/Source/_Demos/LoadByOS/WindowsConfigApp/WindowsConfigApp.csproj index de6f17b7..96fabc93 100644 --- a/Source/_Demos/LoadByOS/WindowsConfigApp/WindowsConfigApp.csproj +++ b/Source/_Demos/LoadByOS/WindowsConfigApp/WindowsConfigApp.csproj @@ -2,7 +2,7 @@ WinExe - net6.0-windows + net7.0-windows true enable false diff --git a/Source/_Tests/AudibleUtilities.Tests/AudibleUtilities.Tests.csproj b/Source/_Tests/AudibleUtilities.Tests/AudibleUtilities.Tests.csproj index 5d425e06..6dee5c6d 100644 --- a/Source/_Tests/AudibleUtilities.Tests/AudibleUtilities.Tests.csproj +++ b/Source/_Tests/AudibleUtilities.Tests/AudibleUtilities.Tests.csproj @@ -1,13 +1,13 @@ - net6.0-windows + net7.0 false - + diff --git a/Source/_Tests/FileLiberator.Tests/FileLiberator.Tests.csproj b/Source/_Tests/FileLiberator.Tests/FileLiberator.Tests.csproj index da4a4118..d2b567e0 100644 --- a/Source/_Tests/FileLiberator.Tests/FileLiberator.Tests.csproj +++ b/Source/_Tests/FileLiberator.Tests/FileLiberator.Tests.csproj @@ -1,13 +1,13 @@ - net6.0-windows + net7.0 false - + diff --git a/Source/_Tests/FileManager.Tests/FileManager.Tests.csproj b/Source/_Tests/FileManager.Tests/FileManager.Tests.csproj index faff9c59..bf335980 100644 --- a/Source/_Tests/FileManager.Tests/FileManager.Tests.csproj +++ b/Source/_Tests/FileManager.Tests/FileManager.Tests.csproj @@ -1,14 +1,14 @@ - net6.0 + net7.0 false - + diff --git a/Source/_Tests/LibationFileManager.Tests/LibationFileManager.Tests.csproj b/Source/_Tests/LibationFileManager.Tests/LibationFileManager.Tests.csproj index bd54c556..f0ebf32d 100644 --- a/Source/_Tests/LibationFileManager.Tests/LibationFileManager.Tests.csproj +++ b/Source/_Tests/LibationFileManager.Tests/LibationFileManager.Tests.csproj @@ -1,14 +1,14 @@ - net6.0-windows + net7.0 false - + diff --git a/Source/_Tests/LibationSearchEngine.Tests/LibationSearchEngine.Tests.csproj b/Source/_Tests/LibationSearchEngine.Tests/LibationSearchEngine.Tests.csproj index 86ec7676..229430fc 100644 --- a/Source/_Tests/LibationSearchEngine.Tests/LibationSearchEngine.Tests.csproj +++ b/Source/_Tests/LibationSearchEngine.Tests/LibationSearchEngine.Tests.csproj @@ -1,14 +1,14 @@ - net6.0-windows + net7.0 false - + From db93980cd5f1fcba953ef347f112df116f182425 Mon Sep 17 00:00:00 2001 From: Aaron Reisman Date: Thu, 24 Nov 2022 23:54:49 -0600 Subject: [PATCH 6/9] Rename publish to release --- .github/workflows/{dotnet-publish.yml => dotnet-release.yml} | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) rename .github/workflows/{dotnet-publish.yml => dotnet-release.yml} (99%) diff --git a/.github/workflows/dotnet-publish.yml b/.github/workflows/dotnet-release.yml similarity index 99% rename from .github/workflows/dotnet-publish.yml rename to .github/workflows/dotnet-release.yml index 134a6dcc..67f8b9de 100644 --- a/.github/workflows/dotnet-publish.yml +++ b/.github/workflows/dotnet-release.yml @@ -1,7 +1,6 @@ # 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: publish +name: release on: push: From 1e4d1d1973e0071a57cb5c13278afe8f5ed9f37c Mon Sep 17 00:00:00 2001 From: Aaron Reisman Date: Mon, 28 Nov 2022 12:44:48 -0600 Subject: [PATCH 7/9] Lowercase OS names in releaseindex --- .releaseindex.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.releaseindex.json b/.releaseindex.json index 4b0f776a..37a967f8 100644 --- a/.releaseindex.json +++ b/.releaseindex.json @@ -1,6 +1,6 @@ { - "WindowsClassic": "Libation\\.\\d+\\.\\d+\\.\\d+-Windows-classic\\.zip", - "WindowsAvalonia":"Libation\\.\\d+\\.\\d+\\.\\d+-Windows-chardonnay\\.zip", - "LinuxAvalonia": "Libation\\.\\d+\\.\\d+\\.\\d+-Linux-chardonnay", - "MacOSAvalonia": "Libation\\.\\d+\\.\\d+\\.\\d+-MacOS-chardonnay" + "WindowsClassic": "Libation\\.\\d+\\.\\d+\\.\\d+-windows-classic\\.zip", + "WindowsAvalonia":"Libation\\.\\d+\\.\\d+\\.\\d+-windows-chardonnay\\.zip", + "LinuxAvalonia": "Libation\\.\\d+\\.\\d+\\.\\d+-linux-chardonnay", + "MacOSAvalonia": "Libation\\.\\d+\\.\\d+\\.\\d+-macos-chardonnay" } From ef71e297f4b7a266326a04ae3a327af27a60658b Mon Sep 17 00:00:00 2001 From: Aaron Reisman Date: Mon, 28 Nov 2022 12:54:17 -0600 Subject: [PATCH 8/9] Add special handling for classic build --- .github/workflows/dotnet-release.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dotnet-release.yml b/.github/workflows/dotnet-release.yml index 67f8b9de..da313dd3 100644 --- a/.github/workflows/dotnet-release.yml +++ b/.github/workflows/dotnet-release.yml @@ -34,7 +34,9 @@ jobs: - name: Rename artifacts id: rename working-directory: ./artifacts - run: for FILENAME in *; do mv ${FILENAME} Libation.${{ steps.version.outputs.version }}-${FILENAME,,}; done + run: | + for FILENAME in *; do mv ${FILENAME} Libation.${{ steps.version.outputs.version }}-${FILENAME,,}; done + mv Libation.${{ steps.version.outputs.version }}-windows-classic.zip Classic-Libation.${{ steps.version.outputs.version }}-windows-classic.zip - name: Zip assets working-directory: ./artifacts From 11d59beeedd5b3940e8f262734fa6093f2533bd0 Mon Sep 17 00:00:00 2001 From: Aaron Reisman Date: Mon, 28 Nov 2022 13:08:57 -0600 Subject: [PATCH 9/9] Rename happens before zipping --- .github/workflows/dotnet-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet-release.yml b/.github/workflows/dotnet-release.yml index da313dd3..c747b782 100644 --- a/.github/workflows/dotnet-release.yml +++ b/.github/workflows/dotnet-release.yml @@ -36,7 +36,7 @@ jobs: working-directory: ./artifacts run: | for FILENAME in *; do mv ${FILENAME} Libation.${{ steps.version.outputs.version }}-${FILENAME,,}; done - mv Libation.${{ steps.version.outputs.version }}-windows-classic.zip Classic-Libation.${{ steps.version.outputs.version }}-windows-classic.zip + mv Libation.${{ steps.version.outputs.version }}-windows-classic Classic-Libation.${{ steps.version.outputs.version }}-windows-classic - name: Zip assets working-directory: ./artifacts