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