From 6d566b736ef9c34988a197fbf7e632a749ff182f Mon Sep 17 00:00:00 2001 From: Lamparter <71598437+Lamparter@users.noreply.github.com> Date: Mon, 16 Dec 2024 18:46:29 +0000 Subject: [PATCH 01/56] Add package metadata --- .../Files.App.Controls.csproj | 29 ++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/src/Files.App.Controls/Files.App.Controls.csproj b/src/Files.App.Controls/Files.App.Controls.csproj index e2f44e087d4d..b3b2ba19ea2a 100644 --- a/src/Files.App.Controls/Files.App.Controls.csproj +++ b/src/Files.App.Controls/Files.App.Controls.csproj @@ -1,4 +1,4 @@ - + @@ -12,6 +12,33 @@ true + + True + Files UI Controls + yaira, files-community, mdta + Files Community + Copyright (c) 2024 Files Community + README.md + https://github.com/files-community/Files + git + files, files-community + Stunningly designed UI controls to enhance the experience of organizing files and folders. + MIT + True + True + snupkg + + https://files.community + StoreLogo.scale-400.png + + + + + True + \ + + + From 371f28bc23872665a1c1da4e1ca7014669a0868c Mon Sep 17 00:00:00 2001 From: Lamparter <71598437+Lamparter@users.noreply.github.com> Date: Mon, 16 Dec 2024 18:46:39 +0000 Subject: [PATCH 02/56] Add package README --- src/Files.App.Controls/Files.App.Controls.csproj | 7 +++++++ src/Files.App.Controls/README.md | 11 +++++++++++ 2 files changed, 18 insertions(+) create mode 100644 src/Files.App.Controls/README.md diff --git a/src/Files.App.Controls/Files.App.Controls.csproj b/src/Files.App.Controls/Files.App.Controls.csproj index b3b2ba19ea2a..5a0e1d6af0b8 100644 --- a/src/Files.App.Controls/Files.App.Controls.csproj +++ b/src/Files.App.Controls/Files.App.Controls.csproj @@ -52,4 +52,11 @@ + + + True + \ + + + diff --git a/src/Files.App.Controls/README.md b/src/Files.App.Controls/README.md new file mode 100644 index 000000000000..ca4ab929a93a --- /dev/null +++ b/src/Files.App.Controls/README.md @@ -0,0 +1,11 @@ +# 📁 Files UI Controls + +##### Stunningly designed UI controls to enhance the experience of organizing files and folders. + +--- + +This package contains various controls for the [Files app](https://files.community), including `ThemedIcon`, `Toolbar` and various storage controls. +It is available [on NuGet](https://www.nuget.org/packages/Files.App.Controls), however is unlisted and can only be installed by manually typing the package name and version number into the MSBuild project file. + +Please do not open issues on the Files repository about this package, as it is not officially supported by the Files team and is kept online for reference. +If you have questions about the design or implementation of these controls, please ask [on Discord](https://discord.gg/files). From f69df1dfcafb39c8c5d5b68be564d021a8ac50d8 Mon Sep 17 00:00:00 2001 From: Lamparter <71598437+Lamparter@users.noreply.github.com> Date: Mon, 16 Dec 2024 21:42:48 +0000 Subject: [PATCH 03/56] New package description --- src/Files.App.Controls/Files.App.Controls.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Files.App.Controls/Files.App.Controls.csproj b/src/Files.App.Controls/Files.App.Controls.csproj index 5a0e1d6af0b8..ae15bfef43bd 100644 --- a/src/Files.App.Controls/Files.App.Controls.csproj +++ b/src/Files.App.Controls/Files.App.Controls.csproj @@ -22,7 +22,7 @@ https://github.com/files-community/Files git files, files-community - Stunningly designed UI controls to enhance the experience of organizing files and folders. + Elevate your WinUI applications with our collection of custom-built controls, crafted specifically to address our needs in Files. These controls are provided "as is," with no guaranteed support, but we hope they prove useful to the developer community. MIT True True From bd148fdc7fee86fadd751ce25070b3ac7ddd97c8 Mon Sep 17 00:00:00 2001 From: Lamparter <71598437+Lamparter@users.noreply.github.com> Date: Mon, 16 Dec 2024 21:44:00 +0000 Subject: [PATCH 04/56] Change package description in README --- src/Files.App.Controls/README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Files.App.Controls/README.md b/src/Files.App.Controls/README.md index ca4ab929a93a..3984bab59618 100644 --- a/src/Files.App.Controls/README.md +++ b/src/Files.App.Controls/README.md @@ -1,6 +1,8 @@ -# 📁 Files UI Controls +> These controls are provided "as is," with no guaranteed support, but we hope they prove useful to the developer community. + +# 📁 Files UI Controls -##### Stunningly designed UI controls to enhance the experience of organizing files and folders. +##### Elevate your WinUI applications with our collection of custom-built controls, crafted specifically to address our needs in Files. --- From ae0a7126f33691a5fba97df92eb2b421ab21c85b Mon Sep 17 00:00:00 2001 From: Lamparter <71598437+Lamparter@users.noreply.github.com> Date: Tue, 17 Dec 2024 07:27:26 +0000 Subject: [PATCH 05/56] Change authors to just "files-community" Co-authored-by: Yair <39923744+yaira2@users.noreply.github.com> --- src/Files.App.Controls/Files.App.Controls.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Files.App.Controls/Files.App.Controls.csproj b/src/Files.App.Controls/Files.App.Controls.csproj index ae15bfef43bd..4d681487cda7 100644 --- a/src/Files.App.Controls/Files.App.Controls.csproj +++ b/src/Files.App.Controls/Files.App.Controls.csproj @@ -15,7 +15,7 @@ True Files UI Controls - yaira, files-community, mdta + files-community Files Community Copyright (c) 2024 Files Community README.md From 74cf1f111382106006f23a6845c3770e78b28a60 Mon Sep 17 00:00:00 2001 From: Lamparter <71598437+Lamparter@users.noreply.github.com> Date: Tue, 17 Dec 2024 07:58:28 +0000 Subject: [PATCH 06/56] Initial addition of CI --- .github/workflows/cd-controls.yml | 70 +++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 .github/workflows/cd-controls.yml diff --git a/.github/workflows/cd-controls.yml b/.github/workflows/cd-controls.yml new file mode 100644 index 000000000000..a3f30285714f --- /dev/null +++ b/.github/workflows/cd-controls.yml @@ -0,0 +1,70 @@ +# Copyright (c) 2024 Files Community +# Licensed under the MIT License. See the LICENSE. + +# Abstract: +# Deploys the Files UI Controls library to NuGet +# +# Workflow: +# 1. Restore and build Files UI Controls +# 2. Generate a NuGet package and symbols +# 3. Publish the artifacts to NuGet + +name: Files CD (UI Controls) + +on: + push: + branches: + - main + workflow_dispatch: + +jobs: + build: + runs-on: windows-latest + environment: Deployments + strategy: + fail-fast: false + env: + SOLUTION_NAME: 'Files.sln' + CONFIGURATION: 'Release' # It's not necessary to use a matrix as the package method will always be Release + WORKING_DIR: '${{ github.workspace }}' # D:\a\Files\Files\ + PROJECT_DIR: '${{ github.workspace }}\src\Files.App.Controls' + PACKAGE_PROJECT_PATH: '${{ github.workspace }}\src\Files.App.Controls\Files.App.Controls.csproj' + + steps: + - name: Checkout the repository + uses: actions/checkout@v4 + - name: Setup MSBuild + uses: microsoft/setup-msbuild@v2 + - name: Setup NuGet + uses: NuGet/setup-nuget@v2 + - name: Setup .NET 8 + uses: actions/setup-dotnet@v4 + with: + global-json-file: global.json + + - name: Use Windows SDK Preview + shell: cmd + run: | + for /f %%a in ('dir /b /a:d %localappdata%\Microsoft\VisualStudio\17*') do echo UsePreviews=True>%localappdata%\Microsoft\VisualStudio\%%a\sdk.txt + + - name: Extract Version from Package.appxmanifest + id: extract_version + shell: pwsh + run: | + $xml = [xml](Get-Content Package.appxmanifest) + $version = $xml.Package.Identity.Version + Write-Output "Found package version, $version" + echo "::set-output name=version::$version" + + - name: Restore NuGet + shell: pwsh + run: 'dotnet restore $env:PACKAGE_PROJECT_PATH' + + - name: Build Files UI Controls + run: dotnet build ${{ matrix.project }}.csproj --configuration Release --no-restore + + - name: Package Files UI Controls + run: dotnet pack ${{ PACKAGE_PROJECT_PATH }}.csproj --configuration Release --no-build -o ./output -p:Version=${{ steps.extract_version.outputs.version }} + + - name: Publish package to NuGet + run: dotnet nuget push ./output/*.nupkg --api-key ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json From 55b2a56d26ee22be44c856240f14b6781abba466 Mon Sep 17 00:00:00 2001 From: Lamparter <71598437+Lamparter@users.noreply.github.com> Date: Tue, 17 Dec 2024 08:00:06 +0000 Subject: [PATCH 07/56] Add PR run for CI to test --- .github/workflows/cd-controls.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/cd-controls.yml b/.github/workflows/cd-controls.yml index a3f30285714f..5b542efbfdc6 100644 --- a/.github/workflows/cd-controls.yml +++ b/.github/workflows/cd-controls.yml @@ -16,6 +16,8 @@ on: branches: - main workflow_dispatch: + pull_request: + branches: [ "main" ] jobs: build: From e4d1896496c7a3acb870de53679908e6a2f599f0 Mon Sep 17 00:00:00 2001 From: Lamparter <71598437+Lamparter@users.noreply.github.com> Date: Tue, 17 Dec 2024 08:18:40 +0000 Subject: [PATCH 08/56] Update cd-controls.yml --- .github/workflows/cd-controls.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cd-controls.yml b/.github/workflows/cd-controls.yml index 5b542efbfdc6..4ac11e87aec9 100644 --- a/.github/workflows/cd-controls.yml +++ b/.github/workflows/cd-controls.yml @@ -60,13 +60,13 @@ jobs: - name: Restore NuGet shell: pwsh - run: 'dotnet restore $env:PACKAGE_PROJECT_PATH' + run: dotnet restore ${{ env.PACKAGE_PROJECT_PATH }} - name: Build Files UI Controls run: dotnet build ${{ matrix.project }}.csproj --configuration Release --no-restore - name: Package Files UI Controls - run: dotnet pack ${{ PACKAGE_PROJECT_PATH }}.csproj --configuration Release --no-build -o ./output -p:Version=${{ steps.extract_version.outputs.version }} + run: dotnet pack ${{ env.PACKAGE_PROJECT_PATH }}.csproj --configuration Release --no-build -o ./output -p:Version=${{ steps.extract_version.outputs.version }} - name: Publish package to NuGet run: dotnet nuget push ./output/*.nupkg --api-key ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json From 32bd9c6c22f9b94415f21ce42ef6ad16e3ed3a7c Mon Sep 17 00:00:00 2001 From: Lamparter <71598437+Lamparter@users.noreply.github.com> Date: Tue, 17 Dec 2024 08:19:35 +0000 Subject: [PATCH 09/56] Update cd-controls.yml --- .github/workflows/cd-controls.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cd-controls.yml b/.github/workflows/cd-controls.yml index 4ac11e87aec9..20ea25aab131 100644 --- a/.github/workflows/cd-controls.yml +++ b/.github/workflows/cd-controls.yml @@ -22,7 +22,7 @@ on: jobs: build: runs-on: windows-latest - environment: Deployments + #environment: Deployments strategy: fail-fast: false env: From 1ef395784412aed9a7cbfd4f4eb22c12824d5db2 Mon Sep 17 00:00:00 2001 From: Lamparter <71598437+Lamparter@users.noreply.github.com> Date: Tue, 17 Dec 2024 08:21:42 +0000 Subject: [PATCH 10/56] Fix version script --- .github/workflows/cd-controls.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cd-controls.yml b/.github/workflows/cd-controls.yml index 20ea25aab131..5568a00cca56 100644 --- a/.github/workflows/cd-controls.yml +++ b/.github/workflows/cd-controls.yml @@ -53,7 +53,7 @@ jobs: id: extract_version shell: pwsh run: | - $xml = [xml](Get-Content Package.appxmanifest) + $xml = [xml](Get-Content $env:PROJECT_DIR\Package.appxmanifest) $version = $xml.Package.Identity.Version Write-Output "Found package version, $version" echo "::set-output name=version::$version" From af8c126027ac84772f99e3f4a451281b262dc639 Mon Sep 17 00:00:00 2001 From: Lamparter <71598437+Lamparter@users.noreply.github.com> Date: Tue, 17 Dec 2024 08:24:41 +0000 Subject: [PATCH 11/56] Fix appxpackage reference --- .github/workflows/cd-controls.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cd-controls.yml b/.github/workflows/cd-controls.yml index 5568a00cca56..350d96541039 100644 --- a/.github/workflows/cd-controls.yml +++ b/.github/workflows/cd-controls.yml @@ -31,6 +31,7 @@ jobs: WORKING_DIR: '${{ github.workspace }}' # D:\a\Files\Files\ PROJECT_DIR: '${{ github.workspace }}\src\Files.App.Controls' PACKAGE_PROJECT_PATH: '${{ github.workspace }}\src\Files.App.Controls\Files.App.Controls.csproj' + PACKAGE_MANIFEST_PATH: '${{ github.workspace }}\src\Files.App (Package)\Package.appxmanifest' steps: - name: Checkout the repository @@ -53,7 +54,7 @@ jobs: id: extract_version shell: pwsh run: | - $xml = [xml](Get-Content $env:PROJECT_DIR\Package.appxmanifest) + $xml = [xml](Get-Content $env:PACKAGE_MANIFEST_PATH) $version = $xml.Package.Identity.Version Write-Output "Found package version, $version" echo "::set-output name=version::$version" From 7c207f22345503f593ac7176962bb790f40b7170 Mon Sep 17 00:00:00 2001 From: Lamparter <71598437+Lamparter@users.noreply.github.com> Date: Tue, 17 Dec 2024 08:28:19 +0000 Subject: [PATCH 12/56] Fix reference to UI controls project --- .github/workflows/cd-controls.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cd-controls.yml b/.github/workflows/cd-controls.yml index 350d96541039..a8275b3a844b 100644 --- a/.github/workflows/cd-controls.yml +++ b/.github/workflows/cd-controls.yml @@ -64,7 +64,7 @@ jobs: run: dotnet restore ${{ env.PACKAGE_PROJECT_PATH }} - name: Build Files UI Controls - run: dotnet build ${{ matrix.project }}.csproj --configuration Release --no-restore + run: dotnet build ${{ env.PACKAGE_PROJECT_PATH }}.csproj --configuration Release --no-restore - name: Package Files UI Controls run: dotnet pack ${{ env.PACKAGE_PROJECT_PATH }}.csproj --configuration Release --no-build -o ./output -p:Version=${{ steps.extract_version.outputs.version }} From 6f1583c4784fc34a5fdbe12972c2368102d0dc65 Mon Sep 17 00:00:00 2001 From: Lamparter <71598437+Lamparter@users.noreply.github.com> Date: Tue, 17 Dec 2024 08:30:54 +0000 Subject: [PATCH 13/56] Update cd-controls.yml --- .github/workflows/cd-controls.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cd-controls.yml b/.github/workflows/cd-controls.yml index a8275b3a844b..f1120a6e976a 100644 --- a/.github/workflows/cd-controls.yml +++ b/.github/workflows/cd-controls.yml @@ -64,10 +64,10 @@ jobs: run: dotnet restore ${{ env.PACKAGE_PROJECT_PATH }} - name: Build Files UI Controls - run: dotnet build ${{ env.PACKAGE_PROJECT_PATH }}.csproj --configuration Release --no-restore + run: dotnet build ${{ env.PACKAGE_PROJECT_PATH }} --configuration Release --no-restore - name: Package Files UI Controls - run: dotnet pack ${{ env.PACKAGE_PROJECT_PATH }}.csproj --configuration Release --no-build -o ./output -p:Version=${{ steps.extract_version.outputs.version }} + run: dotnet pack ${{ env.PACKAGE_PROJECT_PATH }} --configuration Release --no-build -o ./output -p:Version=${{ steps.extract_version.outputs.version }} - name: Publish package to NuGet run: dotnet nuget push ./output/*.nupkg --api-key ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json From 089990a0ef5f050d8975989cdb5706cb65b2fc76 Mon Sep 17 00:00:00 2001 From: Lamparter <71598437+Lamparter@users.noreply.github.com> Date: Sat, 21 Dec 2024 17:33:11 +0000 Subject: [PATCH 14/56] Update cd-controls.yml --- .github/workflows/cd-controls.yml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cd-controls.yml b/.github/workflows/cd-controls.yml index f1120a6e976a..aa93786ad99b 100644 --- a/.github/workflows/cd-controls.yml +++ b/.github/workflows/cd-controls.yml @@ -28,6 +28,7 @@ jobs: env: SOLUTION_NAME: 'Files.sln' CONFIGURATION: 'Release' # It's not necessary to use a matrix as the package method will always be Release + PLATFORM: 'x64' WORKING_DIR: '${{ github.workspace }}' # D:\a\Files\Files\ PROJECT_DIR: '${{ github.workspace }}\src\Files.App.Controls' PACKAGE_PROJECT_PATH: '${{ github.workspace }}\src\Files.App.Controls\Files.App.Controls.csproj' @@ -61,10 +62,18 @@ jobs: - name: Restore NuGet shell: pwsh - run: dotnet restore ${{ env.PACKAGE_PROJECT_PATH }} + run: | + msbuild $env:PACKAGE_PROJECT_PATH ` + -t:Restore ` + -p:Platform=$env:PLATFORM ` + -p:Configuration=$env:CONFIGURATION ` - name: Build Files UI Controls - run: dotnet build ${{ env.PACKAGE_PROJECT_PATH }} --configuration Release --no-restore + run: | + msbuild "$env:PACKAGE_PROJECT_PATH" ` + -t:Build ` + -p:Platform=$env:PLATFORM ` + -p:Configuration=$env:CONFIGURATION - name: Package Files UI Controls run: dotnet pack ${{ env.PACKAGE_PROJECT_PATH }} --configuration Release --no-build -o ./output -p:Version=${{ steps.extract_version.outputs.version }} From 9e8992be8f00f454b698445832970aed60596a81 Mon Sep 17 00:00:00 2001 From: Lamparter <71598437+Lamparter@users.noreply.github.com> Date: Tue, 24 Dec 2024 20:03:13 +0000 Subject: [PATCH 15/56] Move comma Co-authored-by: Yair <39923744+yaira2@users.noreply.github.com> --- src/Files.App.Controls/Files.App.Controls.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Files.App.Controls/Files.App.Controls.csproj b/src/Files.App.Controls/Files.App.Controls.csproj index 4d681487cda7..8b9879b48178 100644 --- a/src/Files.App.Controls/Files.App.Controls.csproj +++ b/src/Files.App.Controls/Files.App.Controls.csproj @@ -22,7 +22,7 @@ https://github.com/files-community/Files git files, files-community - Elevate your WinUI applications with our collection of custom-built controls, crafted specifically to address our needs in Files. These controls are provided "as is," with no guaranteed support, but we hope they prove useful to the developer community. + Elevate your WinUI applications with our collection of custom-built controls, crafted specifically to address our needs in Files. These controls are provided "as is", with no guaranteed support, but we hope they prove useful to the developer community. MIT True True From b37ab4e9f9f0de5922a873901bf49c89b96d2ec2 Mon Sep 17 00:00:00 2001 From: Lamparter <71598437+Lamparter@users.noreply.github.com> Date: Tue, 24 Dec 2024 20:43:08 +0000 Subject: [PATCH 16/56] Move comma in `README.md` Co-authored-by: Yair <39923744+yaira2@users.noreply.github.com> --- src/Files.App.Controls/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Files.App.Controls/README.md b/src/Files.App.Controls/README.md index 3984bab59618..ff7a398dde9e 100644 --- a/src/Files.App.Controls/README.md +++ b/src/Files.App.Controls/README.md @@ -1,4 +1,4 @@ -> These controls are provided "as is," with no guaranteed support, but we hope they prove useful to the developer community. +> These controls are provided "as is", with no guaranteed support, but we hope they prove useful to the developer community. # 📁 Files UI Controls From 3949f4322dad3565763356ae1dd614ab0acecf13 Mon Sep 17 00:00:00 2001 From: Lamparter <71598437+Lamparter@users.noreply.github.com> Date: Tue, 24 Dec 2024 20:44:50 +0000 Subject: [PATCH 17/56] Add more tags Co-authored-by: Yair <39923744+yaira2@users.noreply.github.com> --- src/Files.App.Controls/Files.App.Controls.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Files.App.Controls/Files.App.Controls.csproj b/src/Files.App.Controls/Files.App.Controls.csproj index 8b9879b48178..5538dc230b93 100644 --- a/src/Files.App.Controls/Files.App.Controls.csproj +++ b/src/Files.App.Controls/Files.App.Controls.csproj @@ -21,7 +21,7 @@ README.md https://github.com/files-community/Files git - files, files-community + files, files-community, winui, winappsdk Elevate your WinUI applications with our collection of custom-built controls, crafted specifically to address our needs in Files. These controls are provided "as is", with no guaranteed support, but we hope they prove useful to the developer community. MIT True From de9eb161b6ed4f283769743d891a54f429b67380 Mon Sep 17 00:00:00 2001 From: Lamparter <71598437+Lamparter@users.noreply.github.com> Date: Sun, 2 Feb 2025 08:30:46 +0000 Subject: [PATCH 18/56] Replace secret direct link with placeholder --- .github/workflows/cd-controls.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cd-controls.yml b/.github/workflows/cd-controls.yml index aa93786ad99b..ae9be6593692 100644 --- a/.github/workflows/cd-controls.yml +++ b/.github/workflows/cd-controls.yml @@ -79,4 +79,4 @@ jobs: run: dotnet pack ${{ env.PACKAGE_PROJECT_PATH }} --configuration Release --no-build -o ./output -p:Version=${{ steps.extract_version.outputs.version }} - name: Publish package to NuGet - run: dotnet nuget push ./output/*.nupkg --api-key ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json + run: dotnet nuget push ./output/*.nupkg --api-key (SECRET GOES HERE) --source https://api.nuget.org/v3/index.json From f0b0bdadf07e6f47b4a3aca3a0ea485e1b04f73c Mon Sep 17 00:00:00 2001 From: Lamparter <71598437+Lamparter@users.noreply.github.com> Date: Sun, 2 Feb 2025 08:40:22 +0000 Subject: [PATCH 19/56] Update license header Signed-off-by: Lamparter <71598437+Lamparter@users.noreply.github.com> --- .github/workflows/cd-controls.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cd-controls.yml b/.github/workflows/cd-controls.yml index ae9be6593692..95c5ee191fc1 100644 --- a/.github/workflows/cd-controls.yml +++ b/.github/workflows/cd-controls.yml @@ -1,5 +1,5 @@ -# Copyright (c) 2024 Files Community -# Licensed under the MIT License. See the LICENSE. +# Copyright (c) Files Community +# Licensed under the MIT License. # Abstract: # Deploys the Files UI Controls library to NuGet From a3ad397a55df13e08cfc4a8b13544a9c35d51803 Mon Sep 17 00:00:00 2001 From: Lamparter <71598437+Lamparter@users.noreply.github.com> Date: Sun, 2 Feb 2025 08:40:41 +0000 Subject: [PATCH 20/56] Rename potential deployment space to "NuGet" Signed-off-by: Lamparter <71598437+Lamparter@users.noreply.github.com> --- .github/workflows/cd-controls.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cd-controls.yml b/.github/workflows/cd-controls.yml index 95c5ee191fc1..7fcbf5a7b7a1 100644 --- a/.github/workflows/cd-controls.yml +++ b/.github/workflows/cd-controls.yml @@ -22,7 +22,7 @@ on: jobs: build: runs-on: windows-latest - #environment: Deployments + #environment: NuGet strategy: fail-fast: false env: From 25a550158fc7e1ea4e11160eb1a582f3f0881e78 Mon Sep 17 00:00:00 2001 From: Lamparter <71598437+Lamparter@users.noreply.github.com> Date: Sun, 2 Feb 2025 08:42:05 +0000 Subject: [PATCH 21/56] Remove accidental space Signed-off-by: Lamparter <71598437+Lamparter@users.noreply.github.com> --- src/Files.App.Controls/README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Files.App.Controls/README.md b/src/Files.App.Controls/README.md index ff7a398dde9e..60d06e000ddb 100644 --- a/src/Files.App.Controls/README.md +++ b/src/Files.App.Controls/README.md @@ -1,5 +1,4 @@ > These controls are provided "as is", with no guaranteed support, but we hope they prove useful to the developer community. - # 📁 Files UI Controls ##### Elevate your WinUI applications with our collection of custom-built controls, crafted specifically to address our needs in Files. From 4b75ccff5d0c419db8d5ec7099891308f2f3382a Mon Sep 17 00:00:00 2001 From: Lamparter <71598437+Lamparter@users.noreply.github.com> Date: Sun, 2 Feb 2025 08:44:24 +0000 Subject: [PATCH 22/56] Replace tab formatting with spaces [skip ci] --- .../Files.App.Controls.csproj | 58 +++++++++---------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/src/Files.App.Controls/Files.App.Controls.csproj b/src/Files.App.Controls/Files.App.Controls.csproj index 5538dc230b93..52ba208c1efc 100644 --- a/src/Files.App.Controls/Files.App.Controls.csproj +++ b/src/Files.App.Controls/Files.App.Controls.csproj @@ -12,32 +12,32 @@ true - - True - Files UI Controls - files-community - Files Community - Copyright (c) 2024 Files Community - README.md - https://github.com/files-community/Files - git - files, files-community, winui, winappsdk - Elevate your WinUI applications with our collection of custom-built controls, crafted specifically to address our needs in Files. These controls are provided "as is", with no guaranteed support, but we hope they prove useful to the developer community. - MIT - True - True - snupkg - - https://files.community - StoreLogo.scale-400.png - + + True + Files UI Controls + files-community + Files Community + Copyright (c) 2024 Files Community + README.md + https://github.com/files-community/Files + git + files, files-community, winui, winappsdk + Elevate your WinUI applications with our collection of custom-built controls, crafted specifically to address our needs in Files. These controls are provided "as is", with no guaranteed support, but we hope they prove useful to the developer community. + MIT + True + True + snupkg + + https://files.community + StoreLogo.scale-400.png + - - - True - \ - - + + + True + \ + + @@ -53,10 +53,10 @@ - - True - \ - + + True + \ + From 744ab9dfb0bb80c90ed0c1d62c955e17316578d1 Mon Sep 17 00:00:00 2001 From: Lamparter <71598437+Lamparter@users.noreply.github.com> Date: Mon, 3 Feb 2025 13:42:49 +0000 Subject: [PATCH 23/56] Include README via `Include=` rather than `Update=` Signed-off-by: Lamparter <71598437+Lamparter@users.noreply.github.com> --- src/Files.App.Controls/Files.App.Controls.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Files.App.Controls/Files.App.Controls.csproj b/src/Files.App.Controls/Files.App.Controls.csproj index 52ba208c1efc..672fc300ef4b 100644 --- a/src/Files.App.Controls/Files.App.Controls.csproj +++ b/src/Files.App.Controls/Files.App.Controls.csproj @@ -53,7 +53,7 @@ - + True \ From a8a757e5078947bd5e611c26497c9630d62ef552 Mon Sep 17 00:00:00 2001 From: Lamparter <71598437+Lamparter@users.noreply.github.com> Date: Sat, 8 Feb 2025 19:00:29 +0000 Subject: [PATCH 24/56] Add versioning file --- .github/workflows/cd-controls.yml | 11 +++++------ src/Files.App.Controls/CurrentVersion.props | 15 +++++++++++++++ 2 files changed, 20 insertions(+), 6 deletions(-) create mode 100644 src/Files.App.Controls/CurrentVersion.props diff --git a/.github/workflows/cd-controls.yml b/.github/workflows/cd-controls.yml index 7fcbf5a7b7a1..e8726b05bccc 100644 --- a/.github/workflows/cd-controls.yml +++ b/.github/workflows/cd-controls.yml @@ -32,7 +32,6 @@ jobs: WORKING_DIR: '${{ github.workspace }}' # D:\a\Files\Files\ PROJECT_DIR: '${{ github.workspace }}\src\Files.App.Controls' PACKAGE_PROJECT_PATH: '${{ github.workspace }}\src\Files.App.Controls\Files.App.Controls.csproj' - PACKAGE_MANIFEST_PATH: '${{ github.workspace }}\src\Files.App (Package)\Package.appxmanifest' steps: - name: Checkout the repository @@ -51,13 +50,13 @@ jobs: run: | for /f %%a in ('dir /b /a:d %localappdata%\Microsoft\VisualStudio\17*') do echo UsePreviews=True>%localappdata%\Microsoft\VisualStudio\%%a\sdk.txt - - name: Extract Version from Package.appxmanifest + - name: Extract Version from CurrentVersion.props id: extract_version shell: pwsh run: | - $xml = [xml](Get-Content $env:PACKAGE_MANIFEST_PATH) - $version = $xml.Package.Identity.Version - Write-Output "Found package version, $version" + $xml = [xml](Get-Content $env:PROJECT_DIR\CurrentVersion.props) + $version = $xml.Project.PropertyGroup.Version + Write-Output "Found publish version, $version" echo "::set-output name=version::$version" - name: Restore NuGet @@ -76,7 +75,7 @@ jobs: -p:Configuration=$env:CONFIGURATION - name: Package Files UI Controls - run: dotnet pack ${{ env.PACKAGE_PROJECT_PATH }} --configuration Release --no-build -o ./output -p:Version=${{ steps.extract_version.outputs.version }} + run: dotnet pack ${{ env.PACKAGE_PROJECT_PATH }} --configuration ${{ env.CONFIGURATION }} --no-build -o ./output -p:Version=${{ steps.extract_version.outputs.version }} - name: Publish package to NuGet run: dotnet nuget push ./output/*.nupkg --api-key (SECRET GOES HERE) --source https://api.nuget.org/v3/index.json diff --git a/src/Files.App.Controls/CurrentVersion.props b/src/Files.App.Controls/CurrentVersion.props new file mode 100644 index 000000000000..002f769c7283 --- /dev/null +++ b/src/Files.App.Controls/CurrentVersion.props @@ -0,0 +1,15 @@ + + + + + 1 + 0 + + 0 + + $(MajorVersion).$(MinorVersion).$(MicroVersion) + + \ No newline at end of file From ed56c285c878d10fefbb0ba7d6a0b7a48e901458 Mon Sep 17 00:00:00 2001 From: Lamparter <71598437+Lamparter@users.noreply.github.com> Date: Sun, 9 Feb 2025 07:49:11 +0000 Subject: [PATCH 25/56] Remove 'extract version' step --- .github/workflows/cd-controls.yml | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/.github/workflows/cd-controls.yml b/.github/workflows/cd-controls.yml index e8726b05bccc..eb839017cda6 100644 --- a/.github/workflows/cd-controls.yml +++ b/.github/workflows/cd-controls.yml @@ -50,15 +50,6 @@ jobs: run: | for /f %%a in ('dir /b /a:d %localappdata%\Microsoft\VisualStudio\17*') do echo UsePreviews=True>%localappdata%\Microsoft\VisualStudio\%%a\sdk.txt - - name: Extract Version from CurrentVersion.props - id: extract_version - shell: pwsh - run: | - $xml = [xml](Get-Content $env:PROJECT_DIR\CurrentVersion.props) - $version = $xml.Project.PropertyGroup.Version - Write-Output "Found publish version, $version" - echo "::set-output name=version::$version" - - name: Restore NuGet shell: pwsh run: | @@ -75,7 +66,7 @@ jobs: -p:Configuration=$env:CONFIGURATION - name: Package Files UI Controls - run: dotnet pack ${{ env.PACKAGE_PROJECT_PATH }} --configuration ${{ env.CONFIGURATION }} --no-build -o ./output -p:Version=${{ steps.extract_version.outputs.version }} + run: dotnet pack ${{ env.PACKAGE_PROJECT_PATH }} --configuration ${{ env.CONFIGURATION }} --no-build -o ./output - name: Publish package to NuGet run: dotnet nuget push ./output/*.nupkg --api-key (SECRET GOES HERE) --source https://api.nuget.org/v3/index.json From a0dc89fd20b2b6931098ed8fc7d16eca24c527d1 Mon Sep 17 00:00:00 2001 From: Lamparter <71598437+Lamparter@users.noreply.github.com> Date: Sun, 9 Feb 2025 08:18:07 +0000 Subject: [PATCH 26/56] Reference version in project [skip ci] --- src/Files.App.Controls/CurrentVersion.props | 10 +++++----- src/Files.App.Controls/Files.App.Controls.csproj | 3 +-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/Files.App.Controls/CurrentVersion.props b/src/Files.App.Controls/CurrentVersion.props index 002f769c7283..82872135757b 100644 --- a/src/Files.App.Controls/CurrentVersion.props +++ b/src/Files.App.Controls/CurrentVersion.props @@ -1,15 +1,15 @@ - + 1 0 0 - $(MajorVersion).$(MinorVersion).$(MicroVersion) \ No newline at end of file diff --git a/src/Files.App.Controls/Files.App.Controls.csproj b/src/Files.App.Controls/Files.App.Controls.csproj index 672fc300ef4b..d0c4ad2fbd3f 100644 --- a/src/Files.App.Controls/Files.App.Controls.csproj +++ b/src/Files.App.Controls/Files.App.Controls.csproj @@ -1,6 +1,6 @@ - + $(WindowsTargetFramework) $(MinimalWindowsVersion) @@ -27,7 +27,6 @@ True True snupkg - https://files.community StoreLogo.scale-400.png From bc1aab5212d725392fa3149eee077cd64357b312 Mon Sep 17 00:00:00 2001 From: Lamparter <71598437+Lamparter@users.noreply.github.com> Date: Sun, 9 Feb 2025 08:18:27 +0000 Subject: [PATCH 27/56] New workflow --- .github/workflows/bump-controls.yml | 84 +++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100644 .github/workflows/bump-controls.yml diff --git a/.github/workflows/bump-controls.yml b/.github/workflows/bump-controls.yml new file mode 100644 index 000000000000..d27ae533ea29 --- /dev/null +++ b/.github/workflows/bump-controls.yml @@ -0,0 +1,84 @@ +# Copyright (c) Files Community +# Licensed under the MIT License. + +# Abstract: +# Bumps the version of the Files UI Controls library +# +# Workflow: +# 1. Find the version of the Files UI Controls library +# 2. Bump the version of the Files UI Controls library +# 3. Commit the changes to a new branch in the repo +# 4. Push the changes to the repo +# 5. Create a pull request and request a review + +name: Bump Files UI Controls + +on: + workflow_dispatch: + pull_request: + branches: [ "main" ] + +jobs: + bump: + runs-on: windows-latest + strategy: + fail-fast: false + env: + WORKING_DIR: '${{ github.workspace }}' # D:\a\Files\Files\ + PROPS_PATH: '${{ github.workspace }}\src\Files.App.Controls\CurrentVersion.props' + + steps: + - name: Checkout the repository + uses: actions/checkout@v4 + + - name: Bump Version + id: bump_version + shell: pwsh + run: | + $xml = [xml](Get-Content $env:PROPS_PATH) + $version = [int]$xml.Project.PropertyGroup.MicroVersion + $newVersion = $version + 1 + $xml.Project.PropertyGroup.MicroVersion = $newVersion + $xml.Save($env:PROPS_PATH) + Write-Output "Bumped version to $newVersion" + echo "::set-output name=new_version::$newVersion" + + - uses: EndBug/add-and-commit@v9 + with: + # The arguments for the `git add` command + # Default: '.' + add: '${{ env.PROPS_PATH }}' + + # The name of the user that will be displayed as the author of the commit. + # Default: depends on the default_author input + author_name: files-community-bot[bot] + + # The email of the user that will be displayed as the author of the commit. + # Default: depends on the default_author input + author_email: 152337890+files-community-bot[bot]@users.noreply.github.com + + # Determines the way the action fills missing author name and email. Three options are available: + # - github_actor -> UserName + # - user_info -> Your Display Name + # - github_actions -> github-actions + # Default: github_actor + default_author: github_actor + + # The message for the commit. + # Default: 'Commit from GitHub Actions (name of the workflow)' + message: 'Bump Files UI controls micro version to ${{ steps.bump_version.outputs.new_version }}' + + # If this input is set, the action will push the commit to a new branch with this name. + # Default: '' + new_branch: 'files/ui-controls/micro${{ steps.bump_version.outputs.new_version }}' + + # The way the action should handle pathspec errors from the add and remove commands. Three options are available: + # - ignore -> errors will be logged but the step won't fail + # - exitImmediately -> the action will stop right away, and the step will fail + # - exitAtEnd -> the action will go on, every pathspec error will be logged at the end, the step will fail. + # Default: ignore + pathspec_error_handling: ignore + + # Whether to push the commit and, if any, its tags to the repo. It can also be used to set the git push arguments (see the paragraph below for more info) + # Default: true + push: true \ No newline at end of file From 6f86b5411c58d38145fe26ba016c4c2da13ea3a6 Mon Sep 17 00:00:00 2001 From: Lamparter <71598437+Lamparter@users.noreply.github.com> Date: Sun, 9 Feb 2025 08:42:17 +0000 Subject: [PATCH 28/56] Add PR creation step [skip ci] --- .github/workflows/bump-controls.yml | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/.github/workflows/bump-controls.yml b/.github/workflows/bump-controls.yml index d27ae533ea29..1c67b9da4543 100644 --- a/.github/workflows/bump-controls.yml +++ b/.github/workflows/bump-controls.yml @@ -43,7 +43,20 @@ jobs: Write-Output "Bumped version to $newVersion" echo "::set-output name=new_version::$newVersion" - - uses: EndBug/add-and-commit@v9 + - name: Get version for PR message + id: get_version + shell: pwsh + run: | + $xml = [xml](Get-Content $env:PROPS_PATH) + $microVersion = [int]$xml.Project.PropertyGroup.MicroVersion + $minorVersion = [int]$xml.Project.PropertyGroup.MinorVersion + $majorVersion = [int]$xml.Project.PropertyGroup.MajorVersion + $fullVersion = "$majorVersion.$minorVersion.$microVersion" + Write-Output "Found publish version, $fullVersion" + echo "::set-output name=full_version::$fullVersion" + + - name: Add and commit changes + uses: EndBug/add-and-commit@v9 with: # The arguments for the `git add` command # Default: '.' @@ -66,11 +79,11 @@ jobs: # The message for the commit. # Default: 'Commit from GitHub Actions (name of the workflow)' - message: 'Bump Files UI controls micro version to ${{ steps.bump_version.outputs.new_version }}' + message: 'Bump Files UI controls version to ${{ steps.get_version.outputs.full_version }}' # If this input is set, the action will push the commit to a new branch with this name. # Default: '' - new_branch: 'files/ui-controls/micro${{ steps.bump_version.outputs.new_version }}' + new_branch: 'files/ui-controls/${{ steps.get_version.outputs.full_version }}' # The way the action should handle pathspec errors from the add and remove commands. Three options are available: # - ignore -> errors will be logged but the step won't fail @@ -81,4 +94,9 @@ jobs: # Whether to push the commit and, if any, its tags to the repo. It can also be used to set the git push arguments (see the paragraph below for more info) # Default: true - push: true \ No newline at end of file + push: true + + - name: Create Pull Request + shell: pwsh + run: | + gh pr create --title "NuGet: Bumped Files UI controls version to `${{ steps.get_version.outputs.full_version }}`" --body "This PR bumps the Files UI controls micro version to `${{ steps.bump_version.outputs.new_version }}`, with publish version ${{ steps.get_version.outputs.full_version }}" --base main --head files/ui-controls/${{ steps.get_version.outputs.full_version }} \ No newline at end of file From 7539ba2d79a5fc16479d095ab41f9c79532aa365 Mon Sep 17 00:00:00 2001 From: Lamparter <71598437+Lamparter@users.noreply.github.com> Date: Sun, 9 Feb 2025 08:45:11 +0000 Subject: [PATCH 29/56] Remove `` [skip ci] --- .github/workflows/bump-controls.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bump-controls.yml b/.github/workflows/bump-controls.yml index 1c67b9da4543..0408a9e02d3d 100644 --- a/.github/workflows/bump-controls.yml +++ b/.github/workflows/bump-controls.yml @@ -99,4 +99,4 @@ jobs: - name: Create Pull Request shell: pwsh run: | - gh pr create --title "NuGet: Bumped Files UI controls version to `${{ steps.get_version.outputs.full_version }}`" --body "This PR bumps the Files UI controls micro version to `${{ steps.bump_version.outputs.new_version }}`, with publish version ${{ steps.get_version.outputs.full_version }}" --base main --head files/ui-controls/${{ steps.get_version.outputs.full_version }} \ No newline at end of file + gh pr create --title "NuGet: Bumped Files UI controls version to `${{ steps.get_version.outputs.full_version }}`" --body "This PR bumps the Files UI controls micro version to ${{ steps.bump_version.outputs.new_version }}, with publish version ${{ steps.get_version.outputs.full_version }}" --base main --head files/ui-controls/${{ steps.get_version.outputs.full_version }} \ No newline at end of file From 15437edbc6f622da0d02dc5d245e1d3bc1cbb028 Mon Sep 17 00:00:00 2001 From: Lamparter <71598437+Lamparter@users.noreply.github.com> Date: Sun, 9 Feb 2025 08:57:05 +0000 Subject: [PATCH 30/56] Remove `--body` [skip ci] --- .github/workflows/bump-controls.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bump-controls.yml b/.github/workflows/bump-controls.yml index 0408a9e02d3d..c29383d22602 100644 --- a/.github/workflows/bump-controls.yml +++ b/.github/workflows/bump-controls.yml @@ -99,4 +99,4 @@ jobs: - name: Create Pull Request shell: pwsh run: | - gh pr create --title "NuGet: Bumped Files UI controls version to `${{ steps.get_version.outputs.full_version }}`" --body "This PR bumps the Files UI controls micro version to ${{ steps.bump_version.outputs.new_version }}, with publish version ${{ steps.get_version.outputs.full_version }}" --base main --head files/ui-controls/${{ steps.get_version.outputs.full_version }} \ No newline at end of file + gh pr create --title "NuGet: Bumped Files UI controls version to `${{ steps.get_version.outputs.full_version }}`" --base main --head files/ui-controls/${{ steps.get_version.outputs.full_version }} \ No newline at end of file From 66352310fc440a335049b7739fc4093b5d02739e Mon Sep 17 00:00:00 2001 From: Lamparter <71598437+Lamparter@users.noreply.github.com> Date: Sun, 9 Feb 2025 08:59:54 +0000 Subject: [PATCH 31/56] `""` > `''` [skip ci] --- .github/workflows/bump-controls.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bump-controls.yml b/.github/workflows/bump-controls.yml index c29383d22602..4453a3355229 100644 --- a/.github/workflows/bump-controls.yml +++ b/.github/workflows/bump-controls.yml @@ -99,4 +99,4 @@ jobs: - name: Create Pull Request shell: pwsh run: | - gh pr create --title "NuGet: Bumped Files UI controls version to `${{ steps.get_version.outputs.full_version }}`" --base main --head files/ui-controls/${{ steps.get_version.outputs.full_version }} \ No newline at end of file + gh pr create --title 'NuGet: Bumped Files UI controls version to `${{ steps.get_version.outputs.full_version }}`' --base main --head files/ui-controls/${{ steps.get_version.outputs.full_version }} \ No newline at end of file From b7e23da81d1d7f87accb3f081e32dd43d4fcb89d Mon Sep 17 00:00:00 2001 From: Lamparter <71598437+Lamparter@users.noreply.github.com> Date: Sun, 9 Feb 2025 09:02:51 +0000 Subject: [PATCH 32/56] `GH_TOKEN` [skip ci] --- .github/workflows/bump-controls.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/bump-controls.yml b/.github/workflows/bump-controls.yml index 4453a3355229..c645bf8c30e8 100644 --- a/.github/workflows/bump-controls.yml +++ b/.github/workflows/bump-controls.yml @@ -98,5 +98,7 @@ jobs: - name: Create Pull Request shell: pwsh + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | gh pr create --title 'NuGet: Bumped Files UI controls version to `${{ steps.get_version.outputs.full_version }}`' --base main --head files/ui-controls/${{ steps.get_version.outputs.full_version }} \ No newline at end of file From d16e0c1a909c78f0d3c21b1faa829deefb51cf67 Mon Sep 17 00:00:00 2001 From: Lamparter <71598437+Lamparter@users.noreply.github.com> Date: Sun, 9 Feb 2025 09:05:46 +0000 Subject: [PATCH 33/56] Example [skip ci] --- .github/workflows/bump-controls.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bump-controls.yml b/.github/workflows/bump-controls.yml index c645bf8c30e8..128e035718ec 100644 --- a/.github/workflows/bump-controls.yml +++ b/.github/workflows/bump-controls.yml @@ -101,4 +101,4 @@ jobs: env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | - gh pr create --title 'NuGet: Bumped Files UI controls version to `${{ steps.get_version.outputs.full_version }}`' --base main --head files/ui-controls/${{ steps.get_version.outputs.full_version }} \ No newline at end of file + gh pr create --title "NuGet: Bumped Files UI controls version to ${{ steps.get_version.outputs.full_version }}" --body "hello" --base main --head files/ui-controls/${{ steps.get_version.outputs.full_version }} \ No newline at end of file From ef8140a5f34cb7f1047a671c4b9a5bc5f793cbfe Mon Sep 17 00:00:00 2001 From: Lamparter <71598437+Lamparter@users.noreply.github.com> Date: Sun, 9 Feb 2025 09:15:26 +0000 Subject: [PATCH 34/56] Sample bot [skip ci] --- .github/workflows/bump-controls.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/bump-controls.yml b/.github/workflows/bump-controls.yml index 128e035718ec..73b940c4ef01 100644 --- a/.github/workflows/bump-controls.yml +++ b/.github/workflows/bump-controls.yml @@ -31,6 +31,18 @@ jobs: - name: Checkout the repository uses: actions/checkout@v4 + - name: Generate GitHub Apps token + if: github.repository_owner == 'Lamparter' + id: generate + uses: actions/create-github-app-token@v1 + with: + app-id: ${{ secrets.BOT_APP_ID }} + private-key: ${{ secrets.BOT_PRIVATE_KEY }} + + - name: Login to gh cli + run: | + "GH_TOKEN=${{ steps.generate.outputs.token }}" + - name: Bump Version id: bump_version shell: pwsh From 0414517ecb367773aa176a16ce654dc89b868c6c Mon Sep 17 00:00:00 2001 From: Lamparter <71598437+Lamparter@users.noreply.github.com> Date: Sun, 9 Feb 2025 09:20:40 +0000 Subject: [PATCH 35/56] Fix custom actor --- .github/workflows/bump-controls.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/bump-controls.yml b/.github/workflows/bump-controls.yml index 73b940c4ef01..3a3625b5ac2a 100644 --- a/.github/workflows/bump-controls.yml +++ b/.github/workflows/bump-controls.yml @@ -39,10 +39,6 @@ jobs: app-id: ${{ secrets.BOT_APP_ID }} private-key: ${{ secrets.BOT_PRIVATE_KEY }} - - name: Login to gh cli - run: | - "GH_TOKEN=${{ steps.generate.outputs.token }}" - - name: Bump Version id: bump_version shell: pwsh @@ -111,6 +107,6 @@ jobs: - name: Create Pull Request shell: pwsh env: - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GH_TOKEN: ${{ steps.generate.outputs.token }} run: | gh pr create --title "NuGet: Bumped Files UI controls version to ${{ steps.get_version.outputs.full_version }}" --body "hello" --base main --head files/ui-controls/${{ steps.get_version.outputs.full_version }} \ No newline at end of file From cb632a5b02e9f523b9f988c9440463d47dfaf5c8 Mon Sep 17 00:00:00 2001 From: Lamparter <71598437+Lamparter@users.noreply.github.com> Date: Sun, 9 Feb 2025 09:30:14 +0000 Subject: [PATCH 36/56] Improve message [skip ci] --- .github/workflows/bump-controls.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bump-controls.yml b/.github/workflows/bump-controls.yml index 3a3625b5ac2a..99cce3761236 100644 --- a/.github/workflows/bump-controls.yml +++ b/.github/workflows/bump-controls.yml @@ -109,4 +109,4 @@ jobs: env: GH_TOKEN: ${{ steps.generate.outputs.token }} run: | - gh pr create --title "NuGet: Bumped Files UI controls version to ${{ steps.get_version.outputs.full_version }}" --body "hello" --base main --head files/ui-controls/${{ steps.get_version.outputs.full_version }} \ No newline at end of file + gh pr create --title "NuGet: Bumped Files UI controls version to ${{ steps.get_version.outputs.full_version }}" --body "This is an automated PR that bumps the version of the Files UI controls project." --base main --head files/ui-controls/${{ steps.get_version.outputs.full_version }} \ No newline at end of file From e65e3428322610002e2aa649e52860e409f8c824 Mon Sep 17 00:00:00 2001 From: Lamparter <71598437+Lamparter@users.noreply.github.com> Date: Sun, 9 Feb 2025 16:36:39 +0000 Subject: [PATCH 37/56] Change PR prefix Co-authored-by: Yair <39923744+yaira2@users.noreply.github.com> Signed-off-by: Lamparter <71598437+Lamparter@users.noreply.github.com> --- .github/workflows/bump-controls.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bump-controls.yml b/.github/workflows/bump-controls.yml index 99cce3761236..ab0b60a89eef 100644 --- a/.github/workflows/bump-controls.yml +++ b/.github/workflows/bump-controls.yml @@ -109,4 +109,4 @@ jobs: env: GH_TOKEN: ${{ steps.generate.outputs.token }} run: | - gh pr create --title "NuGet: Bumped Files UI controls version to ${{ steps.get_version.outputs.full_version }}" --body "This is an automated PR that bumps the version of the Files UI controls project." --base main --head files/ui-controls/${{ steps.get_version.outputs.full_version }} \ No newline at end of file + gh pr create --title "Controls: Bumped Controls version to ${{ steps.get_version.outputs.full_version }}" --body "This is an automated PR that bumps the version of the Files UI controls project." --base main --head files/ui-controls/${{ steps.get_version.outputs.full_version }} \ No newline at end of file From 1b0a7c5c108b4280b0095e94455e1e93a82c8fe4 Mon Sep 17 00:00:00 2001 From: Lamparter <71598437+Lamparter@users.noreply.github.com> Date: Sun, 9 Feb 2025 18:07:51 +0000 Subject: [PATCH 38/56] Remove CLI newline switch [skip ci] Signed-off-by: Lamparter <71598437+Lamparter@users.noreply.github.com> --- .github/workflows/cd-controls.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cd-controls.yml b/.github/workflows/cd-controls.yml index eb839017cda6..e3d86ab5a8fb 100644 --- a/.github/workflows/cd-controls.yml +++ b/.github/workflows/cd-controls.yml @@ -56,7 +56,7 @@ jobs: msbuild $env:PACKAGE_PROJECT_PATH ` -t:Restore ` -p:Platform=$env:PLATFORM ` - -p:Configuration=$env:CONFIGURATION ` + -p:Configuration=$env:CONFIGURATION - name: Build Files UI Controls run: | From 7309b90f78b4ea1842c5f9d39b044b3080dde385 Mon Sep 17 00:00:00 2001 From: Lamparter <71598437+Lamparter@users.noreply.github.com> Date: Mon, 17 Mar 2025 16:14:55 +0000 Subject: [PATCH 39/56] Update copyright year Co-authored-by: Yair <39923744+yaira2@users.noreply.github.com> Signed-off-by: Lamparter <71598437+Lamparter@users.noreply.github.com> --- src/Files.App.Controls/Files.App.Controls.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Files.App.Controls/Files.App.Controls.csproj b/src/Files.App.Controls/Files.App.Controls.csproj index d0c4ad2fbd3f..42fe002083fa 100644 --- a/src/Files.App.Controls/Files.App.Controls.csproj +++ b/src/Files.App.Controls/Files.App.Controls.csproj @@ -17,7 +17,7 @@ Files UI Controls files-community Files Community - Copyright (c) 2024 Files Community + Copyright(c) Files Community README.md https://github.com/files-community/Files git From 6ae0c0d7b18b38a9fddf055a3aae5311e4c57deb Mon Sep 17 00:00:00 2001 From: Lamparter <71598437+Lamparter@users.noreply.github.com> Date: Mon, 17 Mar 2025 16:15:17 +0000 Subject: [PATCH 40/56] Reword warning Co-authored-by: Yair <39923744+yaira2@users.noreply.github.com> Signed-off-by: Lamparter <71598437+Lamparter@users.noreply.github.com> --- src/Files.App.Controls/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Files.App.Controls/README.md b/src/Files.App.Controls/README.md index 60d06e000ddb..e5a8ed636dcc 100644 --- a/src/Files.App.Controls/README.md +++ b/src/Files.App.Controls/README.md @@ -8,5 +8,5 @@ This package contains various controls for the [Files app](https://files.community), including `ThemedIcon`, `Toolbar` and various storage controls. It is available [on NuGet](https://www.nuget.org/packages/Files.App.Controls), however is unlisted and can only be installed by manually typing the package name and version number into the MSBuild project file. -Please do not open issues on the Files repository about this package, as it is not officially supported by the Files team and is kept online for reference. +Please do not open issues on the Files repository about this package, as it is not officially supported by the Files team and is provided as is. If you have questions about the design or implementation of these controls, please ask [on Discord](https://discord.gg/files). From 84b1b685184deffd2fad3ea7750b797a576f9ec7 Mon Sep 17 00:00:00 2001 From: Lamparter <71598437+Lamparter@users.noreply.github.com> Date: Tue, 18 Mar 2025 19:06:02 +0000 Subject: [PATCH 41/56] Update to SLNX --- .github/workflows/cd-controls.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cd-controls.yml b/.github/workflows/cd-controls.yml index e3d86ab5a8fb..e450a6009466 100644 --- a/.github/workflows/cd-controls.yml +++ b/.github/workflows/cd-controls.yml @@ -26,7 +26,7 @@ jobs: strategy: fail-fast: false env: - SOLUTION_NAME: 'Files.sln' + SOLUTION_NAME: 'Files.slnx' CONFIGURATION: 'Release' # It's not necessary to use a matrix as the package method will always be Release PLATFORM: 'x64' WORKING_DIR: '${{ github.workspace }}' # D:\a\Files\Files\ From d708c177898bb201e0a1d1389a45be7d9b13bc74 Mon Sep 17 00:00:00 2001 From: Lamparter <71598437+Lamparter@users.noreply.github.com> Date: Tue, 18 Mar 2025 19:06:12 +0000 Subject: [PATCH 42/56] Merge steps --- .github/workflows/cd-controls.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cd-controls.yml b/.github/workflows/cd-controls.yml index e450a6009466..a0c28b6a0ed1 100644 --- a/.github/workflows/cd-controls.yml +++ b/.github/workflows/cd-controls.yml @@ -63,10 +63,8 @@ jobs: msbuild "$env:PACKAGE_PROJECT_PATH" ` -t:Build ` -p:Platform=$env:PLATFORM ` - -p:Configuration=$env:CONFIGURATION - - - name: Package Files UI Controls - run: dotnet pack ${{ env.PACKAGE_PROJECT_PATH }} --configuration ${{ env.CONFIGURATION }} --no-build -o ./output + -p:Configuration=$env:CONFIGURATION ` + -p:PackageOutputPath="$env:WORKING_DIR\output" - name: Publish package to NuGet run: dotnet nuget push ./output/*.nupkg --api-key (SECRET GOES HERE) --source https://api.nuget.org/v3/index.json From cd6717301bd4baf5df4273b2f711ba4c44fbd7d6 Mon Sep 17 00:00:00 2001 From: Lamparter <71598437+Lamparter@users.noreply.github.com> Date: Tue, 18 Mar 2025 20:58:44 +0000 Subject: [PATCH 43/56] Update .github/workflows/bump-controls.yml Co-authored-by: Yair <39923744+yaira2@users.noreply.github.com> Signed-off-by: Lamparter <71598437+Lamparter@users.noreply.github.com> --- .github/workflows/bump-controls.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/bump-controls.yml b/.github/workflows/bump-controls.yml index ab0b60a89eef..093977c55e91 100644 --- a/.github/workflows/bump-controls.yml +++ b/.github/workflows/bump-controls.yml @@ -21,6 +21,7 @@ on: jobs: bump: runs-on: windows-latest + environment: Pull Requests strategy: fail-fast: false env: From 11de1fa07ab443139af9fb4e1525090b2ce50892 Mon Sep 17 00:00:00 2001 From: Lamparter <71598437+Lamparter@users.noreply.github.com> Date: Tue, 25 Mar 2025 18:03:13 +0000 Subject: [PATCH 44/56] Set environment to NuGet --- .github/workflows/cd-controls.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cd-controls.yml b/.github/workflows/cd-controls.yml index a0c28b6a0ed1..a6eda2ea4c55 100644 --- a/.github/workflows/cd-controls.yml +++ b/.github/workflows/cd-controls.yml @@ -22,7 +22,7 @@ on: jobs: build: runs-on: windows-latest - #environment: NuGet + environment: NuGet strategy: fail-fast: false env: From 954223e4fcb349c71a471b9984ba01231d589e62 Mon Sep 17 00:00:00 2001 From: Lamparter <71598437+Lamparter@users.noreply.github.com> Date: Tue, 25 Mar 2025 18:05:39 +0000 Subject: [PATCH 45/56] Only run the CD workflow when CurrentVersion.props gets edited --- .github/workflows/cd-controls.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cd-controls.yml b/.github/workflows/cd-controls.yml index a6eda2ea4c55..c458b5bc7967 100644 --- a/.github/workflows/cd-controls.yml +++ b/.github/workflows/cd-controls.yml @@ -15,9 +15,9 @@ on: push: branches: - main + paths: + - src/Files.App.Controls/CurrentVersion.props workflow_dispatch: - pull_request: - branches: [ "main" ] jobs: build: From f7264e686f634d27e6105c623b5b5945f56e2d6a Mon Sep 17 00:00:00 2001 From: Lamparter <71598437+Lamparter@users.noreply.github.com> Date: Tue, 25 Mar 2025 18:06:22 +0000 Subject: [PATCH 46/56] Only run the Bump Controls action on manual trigger --- .github/workflows/bump-controls.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/bump-controls.yml b/.github/workflows/bump-controls.yml index 093977c55e91..6964597edb49 100644 --- a/.github/workflows/bump-controls.yml +++ b/.github/workflows/bump-controls.yml @@ -15,8 +15,6 @@ name: Bump Files UI Controls on: workflow_dispatch: - pull_request: - branches: [ "main" ] jobs: bump: @@ -110,4 +108,4 @@ jobs: env: GH_TOKEN: ${{ steps.generate.outputs.token }} run: | - gh pr create --title "Controls: Bumped Controls version to ${{ steps.get_version.outputs.full_version }}" --body "This is an automated PR that bumps the version of the Files UI controls project." --base main --head files/ui-controls/${{ steps.get_version.outputs.full_version }} \ No newline at end of file + gh pr create --title "Controls: Bumped Controls version to ${{ steps.get_version.outputs.full_version }}" --body "This is an automated PR that bumps the version of the Files UI controls project." --base main --head files/ui-controls/${{ steps.get_version.outputs.full_version }} From 85c834479387606cb12e63b1a5a690e5c4b879bc Mon Sep 17 00:00:00 2001 From: Lamparter <71598437+Lamparter@users.noreply.github.com> Date: Tue, 25 Mar 2025 18:09:45 +0000 Subject: [PATCH 47/56] Change repo owner check to `files-community` --- .github/workflows/bump-controls.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bump-controls.yml b/.github/workflows/bump-controls.yml index 6964597edb49..0a8c8fdd2dbe 100644 --- a/.github/workflows/bump-controls.yml +++ b/.github/workflows/bump-controls.yml @@ -31,7 +31,7 @@ jobs: uses: actions/checkout@v4 - name: Generate GitHub Apps token - if: github.repository_owner == 'Lamparter' + if: github.repository_owner == 'files-community' id: generate uses: actions/create-github-app-token@v1 with: From a9b04708eb4ca6bd0047eb27fe25b0e695756257 Mon Sep 17 00:00:00 2001 From: Lamparter <71598437+Lamparter@users.noreply.github.com> Date: Tue, 25 Mar 2025 18:19:07 +0000 Subject: [PATCH 48/56] Update .github/workflows/bump-controls.yml Signed-off-by: Lamparter <71598437+Lamparter@users.noreply.github.com> --- .github/workflows/bump-controls.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bump-controls.yml b/.github/workflows/bump-controls.yml index 0a8c8fdd2dbe..18086a07baf4 100644 --- a/.github/workflows/bump-controls.yml +++ b/.github/workflows/bump-controls.yml @@ -108,4 +108,4 @@ jobs: env: GH_TOKEN: ${{ steps.generate.outputs.token }} run: | - gh pr create --title "Controls: Bumped Controls version to ${{ steps.get_version.outputs.full_version }}" --body "This is an automated PR that bumps the version of the Files UI controls project." --base main --head files/ui-controls/${{ steps.get_version.outputs.full_version }} + gh pr create --title "Controls: Bumped Controls version to ${{ steps.get_version.outputs.full_version }}" --body "This is an automated PR that bumps the version of the Files UI controls project." --base main --head bot/ui-controls/${{ steps.get_version.outputs.full_version }} From 47a23c51df448da08da626214b307047bb503bb0 Mon Sep 17 00:00:00 2001 From: Lamparter <71598437+Lamparter@users.noreply.github.com> Date: Tue, 25 Mar 2025 18:29:56 +0000 Subject: [PATCH 49/56] Actual secret --- .github/workflows/cd-controls.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cd-controls.yml b/.github/workflows/cd-controls.yml index c458b5bc7967..789516e94a93 100644 --- a/.github/workflows/cd-controls.yml +++ b/.github/workflows/cd-controls.yml @@ -67,4 +67,4 @@ jobs: -p:PackageOutputPath="$env:WORKING_DIR\output" - name: Publish package to NuGet - run: dotnet nuget push ./output/*.nupkg --api-key (SECRET GOES HERE) --source https://api.nuget.org/v3/index.json + run: dotnet nuget push ./output/*.nupkg --api-key ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json From 4f5e7fefbf3659b3ee7254e8269a6942a824dca1 Mon Sep 17 00:00:00 2001 From: Lamparter <71598437+Lamparter@users.noreply.github.com> Date: Tue, 25 Mar 2025 18:30:29 +0000 Subject: [PATCH 50/56] Rename environment --- .github/workflows/cd-controls.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cd-controls.yml b/.github/workflows/cd-controls.yml index 789516e94a93..989d8d71aacb 100644 --- a/.github/workflows/cd-controls.yml +++ b/.github/workflows/cd-controls.yml @@ -22,7 +22,7 @@ on: jobs: build: runs-on: windows-latest - environment: NuGet + environment: Deployments strategy: fail-fast: false env: From 1338cf5e46d343924cbd2a1291711244dc1c5a48 Mon Sep 17 00:00:00 2001 From: Lamparter <71598437+Lamparter@users.noreply.github.com> Date: Tue, 25 Mar 2025 18:35:00 +0000 Subject: [PATCH 51/56] Rename action --- .github/workflows/cd-controls.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cd-controls.yml b/.github/workflows/cd-controls.yml index 989d8d71aacb..0324656e5c7f 100644 --- a/.github/workflows/cd-controls.yml +++ b/.github/workflows/cd-controls.yml @@ -40,7 +40,7 @@ jobs: uses: microsoft/setup-msbuild@v2 - name: Setup NuGet uses: NuGet/setup-nuget@v2 - - name: Setup .NET 8 + - name: Setup .NET uses: actions/setup-dotnet@v4 with: global-json-file: global.json From 0784f2da68ee7946456f22f971d02220bfda4b6b Mon Sep 17 00:00:00 2001 From: Lamparter <71598437+Lamparter@users.noreply.github.com> Date: Tue, 25 Mar 2025 18:36:48 +0000 Subject: [PATCH 52/56] Space Signed-off-by: Lamparter <71598437+Lamparter@users.noreply.github.com> --- src/Files.App.Controls/Files.App.Controls.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Files.App.Controls/Files.App.Controls.csproj b/src/Files.App.Controls/Files.App.Controls.csproj index 42fe002083fa..faf36135b50c 100644 --- a/src/Files.App.Controls/Files.App.Controls.csproj +++ b/src/Files.App.Controls/Files.App.Controls.csproj @@ -17,7 +17,7 @@ Files UI Controls files-community Files Community - Copyright(c) Files Community + Copyright (c) Files Community README.md https://github.com/files-community/Files git From cd8d9a5586d93915f4317883db95941d8cd05df5 Mon Sep 17 00:00:00 2001 From: Yair <39923744+yaira2@users.noreply.github.com> Date: Wed, 26 Mar 2025 10:23:44 -0400 Subject: [PATCH 53/56] Update .github/workflows/bump-controls.yml Co-authored-by: 0x5BFA <62196528+0x5bfa@users.noreply.github.com> Signed-off-by: Yair <39923744+yaira2@users.noreply.github.com> --- .github/workflows/bump-controls.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bump-controls.yml b/.github/workflows/bump-controls.yml index 18086a07baf4..cf70bf393505 100644 --- a/.github/workflows/bump-controls.yml +++ b/.github/workflows/bump-controls.yml @@ -11,7 +11,7 @@ # 4. Push the changes to the repo # 5. Create a pull request and request a review -name: Bump Files UI Controls +name: Bump Files.App.Controls on: workflow_dispatch: From d463b580a20797b4aaa4255c78d10e88957cadbb Mon Sep 17 00:00:00 2001 From: Lamparter <71598437+Lamparter@users.noreply.github.com> Date: Wed, 26 Mar 2025 17:37:07 +0000 Subject: [PATCH 54/56] Remove unnecessary comments --- .github/workflows/bump-controls.yml | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/.github/workflows/bump-controls.yml b/.github/workflows/bump-controls.yml index cf70bf393505..8eb660330f9d 100644 --- a/.github/workflows/bump-controls.yml +++ b/.github/workflows/bump-controls.yml @@ -65,42 +65,16 @@ jobs: - name: Add and commit changes uses: EndBug/add-and-commit@v9 with: - # The arguments for the `git add` command - # Default: '.' add: '${{ env.PROPS_PATH }}' - # The name of the user that will be displayed as the author of the commit. - # Default: depends on the default_author input author_name: files-community-bot[bot] - - # The email of the user that will be displayed as the author of the commit. - # Default: depends on the default_author input author_email: 152337890+files-community-bot[bot]@users.noreply.github.com - - # Determines the way the action fills missing author name and email. Three options are available: - # - github_actor -> UserName - # - user_info -> Your Display Name - # - github_actions -> github-actions - # Default: github_actor default_author: github_actor - # The message for the commit. - # Default: 'Commit from GitHub Actions (name of the workflow)' message: 'Bump Files UI controls version to ${{ steps.get_version.outputs.full_version }}' - - # If this input is set, the action will push the commit to a new branch with this name. - # Default: '' new_branch: 'files/ui-controls/${{ steps.get_version.outputs.full_version }}' - # The way the action should handle pathspec errors from the add and remove commands. Three options are available: - # - ignore -> errors will be logged but the step won't fail - # - exitImmediately -> the action will stop right away, and the step will fail - # - exitAtEnd -> the action will go on, every pathspec error will be logged at the end, the step will fail. - # Default: ignore pathspec_error_handling: ignore - - # Whether to push the commit and, if any, its tags to the repo. It can also be used to set the git push arguments (see the paragraph below for more info) - # Default: true push: true - name: Create Pull Request From 3e218fc5cf61b052178f35021934676fc86ecf33 Mon Sep 17 00:00:00 2001 From: Lamparter <71598437+Lamparter@users.noreply.github.com> Date: Wed, 26 Mar 2025 17:37:47 +0000 Subject: [PATCH 55/56] Rename `PROPS_PATH` to `VERSION_PROPS_PATH` --- .github/workflows/bump-controls.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/bump-controls.yml b/.github/workflows/bump-controls.yml index 8eb660330f9d..85d4578e7784 100644 --- a/.github/workflows/bump-controls.yml +++ b/.github/workflows/bump-controls.yml @@ -24,7 +24,7 @@ jobs: fail-fast: false env: WORKING_DIR: '${{ github.workspace }}' # D:\a\Files\Files\ - PROPS_PATH: '${{ github.workspace }}\src\Files.App.Controls\CurrentVersion.props' + VERSION_PROPS_PATH: '${{ github.workspace }}\src\Files.App.Controls\CurrentVersion.props' steps: - name: Checkout the repository @@ -65,7 +65,7 @@ jobs: - name: Add and commit changes uses: EndBug/add-and-commit@v9 with: - add: '${{ env.PROPS_PATH }}' + add: '${{ env.VERSION_PROPS_PATH }}' author_name: files-community-bot[bot] author_email: 152337890+files-community-bot[bot]@users.noreply.github.com From 0f0f4b8074490be27ce067dfa1207f2eaf44ebac Mon Sep 17 00:00:00 2001 From: Lamparter <71598437+Lamparter@users.noreply.github.com> Date: Tue, 1 Apr 2025 19:06:30 +0100 Subject: [PATCH 56/56] Nitpick --- src/Files.App.Controls/Themes/Generic.xaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Files.App.Controls/Themes/Generic.xaml b/src/Files.App.Controls/Themes/Generic.xaml index daf619f687ea..c5287566c9a2 100644 --- a/src/Files.App.Controls/Themes/Generic.xaml +++ b/src/Files.App.Controls/Themes/Generic.xaml @@ -33,7 +33,7 @@ - +