From 5dcdd5b778cfef8c31a4e47935014f89da8ee201 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/38] 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 10a03c18178e..4ebe1dfd3809 100644 --- a/src/Files.App.Controls/Files.App.Controls.csproj +++ b/src/Files.App.Controls/Files.App.Controls.csproj @@ -1,4 +1,4 @@ - + @@ -15,6 +15,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 ef8576bd46db0222799d18571153ea27b30ec529 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/38] 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 4ebe1dfd3809..6711980f654e 100644 --- a/src/Files.App.Controls/Files.App.Controls.csproj +++ b/src/Files.App.Controls/Files.App.Controls.csproj @@ -53,4 +53,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 c5b9cb7ec336effeaaca49e44f577baf730c6fdf 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/38] 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 6711980f654e..b2b9b2260cd0 100644 --- a/src/Files.App.Controls/Files.App.Controls.csproj +++ b/src/Files.App.Controls/Files.App.Controls.csproj @@ -25,7 +25,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 69c567f09374024f6619fa112ea8eb3ba2d55195 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/38] 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 f7e676a87168f04eeade112960f92a29ea0bd79d 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/38] 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 b2b9b2260cd0..f29c14a43ae8 100644 --- a/src/Files.App.Controls/Files.App.Controls.csproj +++ b/src/Files.App.Controls/Files.App.Controls.csproj @@ -18,7 +18,7 @@ True Files UI Controls - yaira, files-community, mdta + files-community Files Community Copyright (c) 2024 Files Community README.md From de27f307cf75703709c3e35f3912f5c392bf57e6 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/38] 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 71de3ae89b1c2ebc64aef607f13d46112ddbfab8 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/38] 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 6ed100854d639a84d67e14a281bf4f3d3570333c 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/38] 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 a89dc6ba670634df5b5bd4bf82d4129833b90b1d 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/38] 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 b40745c76ba1a2131021648ea245d2518c64e01e 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/38] 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 00b55a24c192f22cd1769a56558474152a5717c5 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/38] 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 f7fc57b409b7b2dc80018fdf358bf52546e0d02f 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/38] 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 36e822a1d7e32b4912558d48158a18cc41d822e7 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/38] 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 fdb18d3cc56c69362c42ad694a760c93d1e7c8cb 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/38] 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 86dd2943ed09d67992baff84b9a60232ba6f4c39 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/38] 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 f29c14a43ae8..e0982cd7d7d5 100644 --- a/src/Files.App.Controls/Files.App.Controls.csproj +++ b/src/Files.App.Controls/Files.App.Controls.csproj @@ -25,7 +25,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 5a1786ae4ec790ea52ed1ec4d8fe2c5a9f53f54a 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/38] 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 44cfa57ff2cfca07d58531a8555600468cee0177 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/38] 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 e0982cd7d7d5..6943aebd9433 100644 --- a/src/Files.App.Controls/Files.App.Controls.csproj +++ b/src/Files.App.Controls/Files.App.Controls.csproj @@ -24,7 +24,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 749eea7d0e12e7d8beee2008ccd515c383365ce4 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/38] 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 bd80e638c508c99aa2aaec6f736466db5c9f5083 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/38] 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 7e6303332b1a6cf5bed4abae056037002b868c6a 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/38] 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 c399efbb87fdfe14b8564ed990e548a1606fc524 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/38] 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 f948c70308a45a124931e19e20a6a2548f35bee6 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/38] 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 6943aebd9433..b7a4660210ad 100644 --- a/src/Files.App.Controls/Files.App.Controls.csproj +++ b/src/Files.App.Controls/Files.App.Controls.csproj @@ -15,32 +15,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 + \ + + @@ -54,10 +54,10 @@ - - True - \ - + + True + \ + From c53aaec7347347eb2b53ff8c4147b8d4bf135205 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/38] 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 b7a4660210ad..52a0e344dc88 100644 --- a/src/Files.App.Controls/Files.App.Controls.csproj +++ b/src/Files.App.Controls/Files.App.Controls.csproj @@ -54,7 +54,7 @@ - + True \ From 2d9f49aeee24f22a9c8ba815aab635583f7e6b5f 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/38] 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 cc87f46f9bb511ae49b3e09a7476aee448e82381 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/38] 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 b7f2f1318bb4b5293989e47c28bb2c8f757152cc 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/38] 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 52a0e344dc88..d3152569b04c 100644 --- a/src/Files.App.Controls/Files.App.Controls.csproj +++ b/src/Files.App.Controls/Files.App.Controls.csproj @@ -1,6 +1,6 @@ - + net8.0-windows10.0.22621.0 10.0.19041.0 @@ -30,7 +30,6 @@ True True snupkg - https://files.community StoreLogo.scale-400.png From 78a3fa3472eb041ee36ee007cf7d075cafa0fa47 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/38] 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 4dd6f3523a526af30dc04b09fea0a96e2e661ab9 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/38] 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 0dff0a9db4a518eee4b92cfc33758f7e34c46aa6 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/38] 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 61a92d098112ae9346ba2eed322e354a4d66bc2b 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/38] 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 e377cd43817b6287ce4eb29efc94d0e080cae04d 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/38] `""` > `''` [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 1f7fb19ba34a51cae37cdf289a8925dbc2f519e7 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/38] `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 b9d656a0c9f4c18fd2e3ba767b7f0050bb27c42b 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/38] 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 7b13e70be2d014cb0e8324ee96f09ebc8a1921bd 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/38] 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 9c7a67ac6e7153e99e37b7f21dc00f1eff3ff3eb 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/38] 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 b7904135731c11c7240e5a9fb521b21628b40b0b 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/38] 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 c6e6eea088bc96ccd2e6f7f7fa95fbec9e0e5c06 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/38] 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 75f49a7cc00b49bf9b4a32e6d7c752a14085393d 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/38] 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: |