From 89773de42106a0fed8d769bb65e925578486d5f3 Mon Sep 17 00:00:00 2001 From: nor0x Date: Thu, 17 Oct 2024 10:08:30 +0200 Subject: [PATCH 1/2] #33 quickfix --- src/ViewModels/MainViewModel.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ViewModels/MainViewModel.cs b/src/ViewModels/MainViewModel.cs index c9bb107..c9a27e5 100644 --- a/src/ViewModels/MainViewModel.cs +++ b/src/ViewModels/MainViewModel.cs @@ -304,7 +304,7 @@ public async Task CheckSdks(bool force = false) if (Sdks is not null) Sdks.FilterHandler -= Sdks_FilterHandler; IsBusy = true; var sdkList = await _dotnet.GetSdks(force); - Sdks = new ObservableView(sdkList); + Sdks = new ObservableView(sdkList.DistinctBy(s => s.VersionDisplay)); Sdks.SearchSpecification.Add(x => x.VersionDisplay, BinaryOperator.Contains); Sdks.SearchSpecification.Add(x => x.Path, BinaryOperator.Contains); Sdks.FilterHandler += Sdks_FilterHandler; From e927d39afcf3485bcc6a15d6c0038a71c2dcb3fe Mon Sep 17 00:00:00 2001 From: nor0x Date: Thu, 17 Oct 2024 10:13:46 +0200 Subject: [PATCH 2/2] versioning and workflow updates manual trigger + auto tagging --- .github/workflows/release.yml | 30 ++++++++++++++++-------------- version.txt | 2 +- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c8e5b42..1f47cba 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,9 +1,8 @@ name: build and release on: - push: - tags: - - '*' + workflow_dispatch: + env: APPLE_ID: ${{ secrets.APPLE_ID }} @@ -118,15 +117,12 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4.1.1 - - name: Log GITHUB_WORKSPACE + - name: Get Version via powershell + id: get_version run: | - echo "GITHUB_WORKSPACE is $GITHUB_WORKSPACE" - echo "current directory" - ls - echo "GITHUB_WORKSPACE directory" - ls $GITHUB_WORKSPACE - echo "src directory" - ls $GITHUB_WORKSPACE/src + $version = Get-Content -Path $env:GITHUB_WORKSPACE/version.txt + $env:CURRENT_VERSION = $version.ToString() + echo "::set-output name=CURRENT_VERSION::$env:CURRENT_VERSION" - name: run housekeeping scripts run: | cd $GITHUB_WORKSPACE/scripts @@ -156,12 +152,18 @@ jobs: run: | cd $GITHUB_WORKSPACE ls - + - name: Create GitHub Tag + id: tag_version + uses: mathieudutour/github-tag-action@v6.2 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + default_bump: false + custom_tag: ${{ steps.get_version.outputs.CURRENT_VERSION }} - name: Create Release - uses: ncipollo/release-action@v1.13.0 + uses: ncipollo/release-action@v1 with: artifacts: | $GITHUB_WORKSPACE/*.zip token: ${{ secrets.GITHUB_TOKEN }} generateReleaseNotes: true - draft: true + draft: true \ No newline at end of file diff --git a/version.txt b/version.txt index f93ea0c..6acdb44 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -2.0.2 \ No newline at end of file +2.0.3 \ No newline at end of file