From 8aa4328c6cddcc363fd5527fb8652aa9c5f689b6 Mon Sep 17 00:00:00 2001 From: Robert McRackan Date: Wed, 7 Dec 2022 13:09:02 -0500 Subject: [PATCH 1/3] update dependencies --- Source/AudibleUtilities/AudibleUtilities.csproj | 2 +- Source/DataLayer/DataLayer.csproj | 2 +- Source/FileManager/FileManager.csproj | 2 +- Source/LibationWinForms/LibationWinForms.csproj | 2 +- Source/LoadByOS/WindowsConfigApp/WindowsConfigApp.csproj | 2 +- .../CrossPlatformClientExe/CrossPlatformClientExe.csproj | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Source/AudibleUtilities/AudibleUtilities.csproj b/Source/AudibleUtilities/AudibleUtilities.csproj index bdd7a08f..48c77309 100644 --- a/Source/AudibleUtilities/AudibleUtilities.csproj +++ b/Source/AudibleUtilities/AudibleUtilities.csproj @@ -5,7 +5,7 @@ - + diff --git a/Source/DataLayer/DataLayer.csproj b/Source/DataLayer/DataLayer.csproj index 848a6f35..7d01ec0a 100644 --- a/Source/DataLayer/DataLayer.csproj +++ b/Source/DataLayer/DataLayer.csproj @@ -10,7 +10,7 @@ - + all diff --git a/Source/FileManager/FileManager.csproj b/Source/FileManager/FileManager.csproj index 2827e340..3f84f3ed 100644 --- a/Source/FileManager/FileManager.csproj +++ b/Source/FileManager/FileManager.csproj @@ -5,7 +5,7 @@ - + diff --git a/Source/LibationWinForms/LibationWinForms.csproj b/Source/LibationWinForms/LibationWinForms.csproj index 5f318f12..6e417f8e 100644 --- a/Source/LibationWinForms/LibationWinForms.csproj +++ b/Source/LibationWinForms/LibationWinForms.csproj @@ -44,7 +44,7 @@ - + diff --git a/Source/LoadByOS/WindowsConfigApp/WindowsConfigApp.csproj b/Source/LoadByOS/WindowsConfigApp/WindowsConfigApp.csproj index a033b1bf..9dfa0c94 100644 --- a/Source/LoadByOS/WindowsConfigApp/WindowsConfigApp.csproj +++ b/Source/LoadByOS/WindowsConfigApp/WindowsConfigApp.csproj @@ -32,7 +32,7 @@ - + diff --git a/Source/_Demos/LoadByOS/CrossPlatformClientExe/CrossPlatformClientExe.csproj b/Source/_Demos/LoadByOS/CrossPlatformClientExe/CrossPlatformClientExe.csproj index 8ffb5672..37b40d10 100644 --- a/Source/_Demos/LoadByOS/CrossPlatformClientExe/CrossPlatformClientExe.csproj +++ b/Source/_Demos/LoadByOS/CrossPlatformClientExe/CrossPlatformClientExe.csproj @@ -19,7 +19,7 @@ - + From f5f1dc483b172d785fd0d19529e914becaed733f Mon Sep 17 00:00:00 2001 From: Robert McRackan Date: Wed, 7 Dec 2022 13:34:30 -0500 Subject: [PATCH 2/3] publish debugging. create new version --- Source/AppScaffolding/AppScaffolding.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/AppScaffolding/AppScaffolding.csproj b/Source/AppScaffolding/AppScaffolding.csproj index 4f698bd3..14eaab47 100644 --- a/Source/AppScaffolding/AppScaffolding.csproj +++ b/Source/AppScaffolding/AppScaffolding.csproj @@ -2,7 +2,7 @@ net7.0 - 8.6.2.1 + 8.6.3.1 From 86efe631fead4d0034bebda8f58c2695cf09d5db Mon Sep 17 00:00:00 2001 From: Robert McRackan Date: Wed, 7 Dec 2022 13:49:05 -0500 Subject: [PATCH 3/3] restore yaml --- .github/workflows/dotnet-build.yml | 88 ++++++------- .github/workflows/dotnet-release.yml | 133 ++++++++++---------- .github/workflows/dotnet-validate.yml | 39 +++--- Source/AppScaffolding/AppScaffolding.csproj | 2 +- 4 files changed, 130 insertions(+), 132 deletions(-) diff --git a/.github/workflows/dotnet-build.yml b/.github/workflows/dotnet-build.yml index 7212da64..6ae3c87a 100644 --- a/.github/workflows/dotnet-build.yml +++ b/.github/workflows/dotnet-build.yml @@ -1,44 +1,44 @@ -# # 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: -# -# env: -# 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: -# - uses: actions/checkout@v3 -# - name: Setup .NET -# uses: actions/setup-dotnet@v3 -# with: -# 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\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 -# uses: actions/upload-artifact@v3 -# with: -# 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 +# 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: + +env: + 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: + - uses: actions/checkout@v3 + - name: Setup .NET + uses: actions/setup-dotnet@v3 + with: + 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\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 + uses: actions/upload-artifact@v3 + with: + 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-release.yml b/.github/workflows/dotnet-release.yml index e63cff15..c747b782 100644 --- a/.github/workflows/dotnet-release.yml +++ b/.github/workflows/dotnet-release.yml @@ -1,67 +1,66 @@ -# # 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: release -# -# on: -# push: -# tags: -# - 'v*' -# -# env: -# DOTNET_VERSION: '7' # The .NET SDK version to use -# DOTNET_SOURCE: './Source' -# DOTNET_CONFIGURATION: 'Release' -# -# jobs: -# build: -# uses: ./.github/workflows/dotnet-build.yml -# -# release: -# needs: build -# runs-on: ubuntu-latest -# steps: -# - 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 -# mv Libation.${{ steps.version.outputs.version }}-windows-classic Classic-Libation.${{ steps.version.outputs.version }}-windows-classic -# -# - 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 -# 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 ${{ steps.version.outputs.version }} -# body: -# draft: true -# prerelease: false -# -# - 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/assets -# \ No newline at end of file +# 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: release + +on: + push: + tags: + - 'v*' + +env: + DOTNET_VERSION: '7' # The .NET SDK version to use + DOTNET_SOURCE: './Source' + DOTNET_CONFIGURATION: 'Release' + +jobs: + build: + uses: ./.github/workflows/dotnet-build.yml + + release: + needs: build + runs-on: ubuntu-latest + steps: + - 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 + mv Libation.${{ steps.version.outputs.version }}-windows-classic Classic-Libation.${{ steps.version.outputs.version }}-windows-classic + + - 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 + 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 ${{ steps.version.outputs.version }} + body: + draft: true + prerelease: false + + - 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/assets diff --git a/.github/workflows/dotnet-validate.yml b/.github/workflows/dotnet-validate.yml index 0a5f3ad1..16313d20 100644 --- a/.github/workflows/dotnet-validate.yml +++ b/.github/workflows/dotnet-validate.yml @@ -1,20 +1,19 @@ -# # 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: '7' # The .NET SDK version to use -# DOTNET_SLN: './Source/Libation.sln' -# DOTNET_CONFIGURATION: 'Release' -# -# jobs: -# build: -# uses: ./.github/workflows/dotnet-build.yml -# \ No newline at end of file +# 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: '7' # The .NET SDK version to use + DOTNET_SLN: './Source/Libation.sln' + DOTNET_CONFIGURATION: 'Release' + +jobs: + build: + uses: ./.github/workflows/dotnet-build.yml diff --git a/Source/AppScaffolding/AppScaffolding.csproj b/Source/AppScaffolding/AppScaffolding.csproj index 14eaab47..7e226eed 100644 --- a/Source/AppScaffolding/AppScaffolding.csproj +++ b/Source/AppScaffolding/AppScaffolding.csproj @@ -2,7 +2,7 @@ net7.0 - 8.6.3.1 + 8.6.4.1