From ddc53bd06ba61787f1c7b24361aa22865c419f8a 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/17] 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 a1995d03b9cd..4432e3568519 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 e0032d6acdc18274862cbc4d70aed9e6a1e4b6a4 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/17] Add package README --- src/Files.App.Controls/Files.App.Controls.csproj | 9 ++++++++- src/Files.App.Controls/README.md | 11 +++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) 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 4432e3568519..010166074ec9 100644 --- a/src/Files.App.Controls/Files.App.Controls.csproj +++ b/src/Files.App.Controls/Files.App.Controls.csproj @@ -1,4 +1,4 @@ - + @@ -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 1ebbc36dedfb49bb923c723fcf4cdc77d0581185 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/17] 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 010166074ec9..a1e6b1860c50 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 b1cd2bcb16ea8e16f15e66ade9c00ea6b2a82c68 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/17] 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 4a667d3aadd843fef7becc0691f7b14d130f74fa 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/17] 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 a1e6b1860c50..5035a1e751ff 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 7d30b86e06391d9ba960aa402e1e13b75f4d07ac 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/17] 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 b42e61ead1a239e4787d273b0bc7830e71a6aa1e 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/17] 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 bbad4baa39ac232945b7ff302edec99c7c5516c4 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/17] 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 c9e3e6b72d219c0857e575643a79cfa9b1908382 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/17] 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 35f5fea7239b945354643a6dec110e4ef457dbf4 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/17] 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 a725e905b6e9a5c746b47b31a2215c6bda611f21 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/17] 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 e623e59182f6ee15cb253a1b6f7842bb0907d5f1 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/17] 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 cc9d35e4d632247eb535aaa252faef37bdec2162 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/17] 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 5909b7ba704adeccc63a1620bb5876c5c81f44aa 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/17] 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 e7d756b790ebdc6981c5f9d8fb2a5544414360f0 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/17] 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 5035a1e751ff..e268494bcb85 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 849d610e7f45f8d37d2e8dd34316e2d44b48b508 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/17] 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 40be6eb58856b69f8de057ce5b13d8262b7d2e19 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/17] 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 e268494bcb85..d904903e5726 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