diff --git a/.github/workflows/dotnet-build.yml b/.github/workflows/dotnet-build.yml index 6ae3c87a..7212da64 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 c747b782..e63cff15 100644 --- a/.github/workflows/dotnet-release.yml +++ b/.github/workflows/dotnet-release.yml @@ -1,66 +1,67 @@ -# 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 +# # 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 diff --git a/.github/workflows/dotnet-validate.yml b/.github/workflows/dotnet-validate.yml index 16313d20..0a5f3ad1 100644 --- a/.github/workflows/dotnet-validate.yml +++ b/.github/workflows/dotnet-validate.yml @@ -1,19 +1,20 @@ -# 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 +# # 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 diff --git a/Source/AppScaffolding/AppScaffolding.csproj b/Source/AppScaffolding/AppScaffolding.csproj index 9e6412c7..b842847f 100644 --- a/Source/AppScaffolding/AppScaffolding.csproj +++ b/Source/AppScaffolding/AppScaffolding.csproj @@ -2,7 +2,7 @@ net7.0 - 8.6.0.1 + 8.6.1.1