.config/configuration.winget | 4 +---
.config/jenkins.winget | 6 ++----
.vsconfig | 2 +-
3 files changed, 4 insertions(+), 8 deletions(-)
New commits:
commit b4fd0468f62cfe7c4a2b2ed1208e6e3b1e16c06b
Author: Muhammad Danish <mdanishkh...@gmail.com>
AuthorDate: Sun Mar 9 02:43:58 2025 +0500
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Wed Mar 12 14:37:59 2025 +0100
Make WinGet config files consistent with new recommendations
The new file naming conventions for WinGet configurations files are:
- Use the `.winget` extension instead of `.dsc.yaml`. This allows user to
run the configuration directly
from the file explorer.
- The configurations should be placed in a `.config` directory in the root
of the repository.
Reference:
https://learn.microsoft.com/en-us/windows/package-manager/configuration/create#file-naming-convention
This commit also removes `allowPrerelease: true` directive from the
`Microsoft.WinGet.DSC` resource.
The Microsoft.WinGet.DSC module is GA (stable) so the directive is no
longer needed.
See https://www.powershellgallery.com/packages/Microsoft.WinGet.DSC/
For reference, maintainers may see these recommendations enacted in the
following Microsoft repositories:
- WinGet CLI: https://github.com/microsoft/winget-cli/tree/master/.config
- WinGet Packages:
https://github.com/microsoft/winget-pkgs/tree/master/.config
- WinGet Create:
https://github.com/microsoft/winget-create/tree/main/.config
- PowerToys: https://github.com/microsoft/PowerToys/tree/main/.config
Change-Id: Ib88598f5fb93b1bb0ed1b608e0d690c196cf9b80
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182675
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
Tested-by: Jenkins
diff --git a/.configurations/2022.vsconfig b/.config/2022.vsconfig
similarity index 100%
rename from .configurations/2022.vsconfig
rename to .config/2022.vsconfig
diff --git a/.configurations/2022_cross.vsconfig b/.config/2022_cross.vsconfig
similarity index 100%
rename from .configurations/2022_cross.vsconfig
rename to .config/2022_cross.vsconfig
diff --git a/.configurations/admin_java_and_deps.dsc.yaml
b/.config/admin_java_and_deps.winget
similarity index 100%
rename from .configurations/admin_java_and_deps.dsc.yaml
rename to .config/admin_java_and_deps.winget
diff --git a/.configurations/configuration.dsc.yaml
b/.config/configuration.winget
similarity index 88%
rename from .configurations/configuration.dsc.yaml
rename to .config/configuration.winget
index 711fa297f011..a8ae21ea0169 100644
--- a/.configurations/configuration.dsc.yaml
+++ b/.config/configuration.winget
@@ -4,7 +4,6 @@
# required components to build LibreOffice, excluding the components to
cross-compile for ARM64
# It includes recommended packages as if you had selected the "Desktop
development with C++"
# workload in the in the UI driven installer.
-# (the allowPrerelease directive refers to the DSC module)
properties:
resources:
@@ -12,12 +11,11 @@ properties:
id: VisualStudio
directives:
description: Install Visual Studio 2022 Community
- allowPrerelease: true
settings:
id: Microsoft.VisualStudio.2022.Community
source: winget
- resource: Microsoft.VisualStudio.DSC/VSComponents
- id: LibreOffice Components including recommended packages
+ id: LibreOffice Components including recommended packages
dependsOn:
- VisualStudio
directives:
diff --git a/.configurations/jenkins.dsc.yaml b/.config/jenkins.winget
similarity index 82%
rename from .configurations/jenkins.dsc.yaml
rename to .config/jenkins.winget
index e1576eae552a..325658296e1c 100644
--- a/.configurations/jenkins.dsc.yaml
+++ b/.config/jenkins.winget
@@ -3,9 +3,8 @@
# This configuration is for a minimal installation of Visual Studio meant for
CI use or setups with
# remote access with no need for convenience features of the IDE. It installs
the dependencies
# without additional recommended packages. If you want to use the IDE to edit
code, you probably
-# want to use the regular configuration.dsc.yaml (or launch Visual Studio
Installer afterwards, pick
+# want to use the regular configuration.winget (or launch Visual Studio
Installer afterwards, pick
# modify and then unselect and reselect the "Desktop Development with C++"
workload)
-# (the allowPrerelease directive refers to the DSC module)
properties:
resources:
@@ -13,12 +12,11 @@ properties:
id: VisualStudio
directives:
description: Install Visual Studio 2022 Community
- allowPrerelease: true
settings:
id: Microsoft.VisualStudio.2022.Community
source: winget
- resource: Microsoft.VisualStudio.DSC/VSComponents
- id: minimal LibreOffice Components
+ id: minimal LibreOffice Components
dependsOn:
- VisualStudio
directives:
diff --git a/.configurations/user_steps.dsc.yaml b/.config/user_steps.winget
similarity index 100%
rename from .configurations/user_steps.dsc.yaml
rename to .config/user_steps.winget
diff --git a/.vsconfig b/.vsconfig
index 13260a166f77..85a7f5efb4fa 120000
--- a/.vsconfig
+++ b/.vsconfig
@@ -1 +1 @@
-.configurations/2022.vsconfig
\ No newline at end of file
+.config/2022.vsconfig
\ No newline at end of file
