Skip to content

Commit

Permalink
Remove prerelease: true (#142)
Browse files Browse the repository at this point in the history
The Microsoft.WinGet.DSC resource is GA. Removing the pre-release: true as they are no longer necessary for this resource.
  • Loading branch information
denelon authored Dec 20, 2024
1 parent 2c383a4 commit 583d2c7
Show file tree
Hide file tree
Showing 19 changed files with 20 additions and 57 deletions.
3 changes: 1 addition & 2 deletions samples/DscResources/GitDsc/CloneWingetRepository.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ properties:
- resource: Microsoft.WinGet.DSC/WinGetPackage
directives:
description: Install Git
allowPrerelease: true
settings:
id: Git.Git
source: winget
Expand All @@ -20,7 +19,7 @@ properties:
allowPrerelease: true
settings:
HttpsUrl: https://github.com/microsoft/winget-cli.git
RootDirectory: '${WingetConfigRoot}/SampleRepos/'
RootDirectory: "${WingetConfigRoot}/SampleRepos/"
# - resource: GitDsc/GitRemote
# directives:
# description: Add a remote repository to the cloned winget-cli repository.
Expand Down
1 change: 0 additions & 1 deletion samples/DscResources/PowerToysConfigure/PowerToys.dsc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ properties:
- resource: Microsoft.WinGet.DSC/WinGetPackage
directives:
description: Install PowerToys
allowPrerelease: true
settings:
id: Microsoft.PowerToys
source: winget
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ properties:
- resource: Microsoft.WinGet.DSC/WinGetPackage
directives:
description: Install Visual Studio 2022 Community
allowPrerelease: true
settings:
id: Microsoft.VisualStudio.2022.Community
source: winget
Expand All @@ -16,4 +15,4 @@ properties:
settings:
id: Microsoft.DotNet.SDK.Preview
source: winget
configurationVersion: 0.2.0
configurationVersion: 0.2.0
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# yaml-language-server: $schema=https://aka.ms/configuration-dsc-schema/0.2


##########################################################################################################
# This configuration will install the tools necessary to get started with Node.js development on Windows #
# Reference: https://learn.microsoft.com/windows/dev-environment/javascript/nodejs-on-windows #
Expand All @@ -9,30 +8,26 @@
# prompted to either allow NVM to manage that installation or remove it. #
##########################################################################################################


properties:
resources:
- resource: Microsoft.WinGet.DSC/WinGetPackage
id: Git
directives:
description: Install Git
allowPrerelease: true
settings:
id: Git.Git
source: winget
- resource: Microsoft.WinGet.DSC/WinGetPackage
id: VSCode
directives:
description: Install Visual Studio Code
allowPrerelease: true
settings:
id: Microsoft.VisualStudioCode
source: winget
- resource: Microsoft.WinGet.DSC/WinGetPackage
id: NVM
directives:
description: Install NVM for Windows
allowPrerelease: true
settings:
id: CoreyButler.NVMforWindows
source: winget
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,29 +5,25 @@ properties:
- resource: Microsoft.WinGet.DSC/WinGetPackage
directives:
description: Install Microsoft Open JDK 17
allowPrerelease: true
settings:
id: Microsoft.OpenJDK.17
source: winget
- resource: Microsoft.WinGet.DSC/WinGetPackage
directives:
description: Install Yarn
allowPrerelease: true
settings:
id: Yarn.Yarn
source: winget
- resource: Microsoft.WinGet.DSC/WinGetPackage
directives:
description: Install Node.js
allowPrerelease: true
settings:
id: OpenJS.NodeJS
source: winget
- resource: Microsoft.WinGet.DSC/WinGetPackage
id: vsPackage
directives:
description: Install Visual Studio 2022 Community
allowPrerelease: true
settings:
id: Microsoft.VisualStudio.2022.Community
source: winget
Expand All @@ -41,4 +37,4 @@ properties:
productId: Microsoft.VisualStudio.Product.Community
channelId: VisualStudio.17.Release
vsConfigFile: '${WinGetConfigRoot}\..\.vsconfig'
configurationVersion: 0.2.0
configurationVersion: 0.2.0
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ properties:
id: vsPackage
directives:
description: Install Visual Studio 2022 (any edition is OK)
allowPrerelease: true
settings:
id: Microsoft.VisualStudio.2022.Community
source: winget
Expand All @@ -31,4 +30,4 @@ properties:
# Next steps:
# Open a terminal
# Navigate to the folder you cloned PowerToys to.
# Run git submodule update --init --recursive
# Run git submodule update --init --recursive
4 changes: 1 addition & 3 deletions samples/Repositories/microsoft/gdk/configuration.dsc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ properties:
directives:
description: Install Visual Studio 2022 Community
module: Microsoft.WinGet.DSC
allowPrerelease: true
settings:
id: Microsoft.VisualStudio.2022.Community
source: winget
Expand All @@ -30,8 +29,7 @@ properties:
directives:
description: Install Microsoft GDK
module: Microsoft.WinGet.DSC
allowPrerelease: true
settings:
id: Microsoft.Gaming.GDK
source: winget
configurationVersion: 0.2.0
configurationVersion: 0.2.0
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,19 @@ properties:
- resource: Microsoft.WinGet.DSC/WinGetPackage
directives:
description: Install PowerShell 7
allowPrerelease: true
settings:
id: Microsoft.PowerShell
source: winget
- resource: Microsoft.WinGet.DSC/WinGetPackage
directives:
description: Install Windows 11 (10.0.22621.0) SDK
allowPrerelease: true
settings:
id: Microsoft.WindowsSDK
source: winget
- resource: Microsoft.WinGet.DSC/WinGetPackage
id: vsPackage
directives:
description: Install Visual Studio 2022 (any edition is OK)
allowPrerelease: true
settings:
id: Microsoft.VisualStudio.2022.Community
source: winget
Expand Down
7 changes: 2 additions & 5 deletions samples/Repositories/microsoft/vscode/configuration.dsc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ properties:
id: npm
directives:
description: Install NodeJS version >=16.17.x and <17
allowPrerelease: true
settings:
id: OpenJS.NodeJS.LTS
version: "16.20.0"
Expand All @@ -19,21 +18,19 @@ properties:
description: Install Yarn
allowPrerelease: true
settings:
Name: 'yarn'
Name: "yarn"
Global: true
PackageDirectory: '${WinGetConfigRoot}\..\'
- resource: Microsoft.WinGet.DSC/WinGetPackage
directives:
description: Install Python 3.10
allowPrerelease: true
settings:
id: Python.Python.3.10
source: winget
- resource: Microsoft.WinGet.DSC/WinGetPackage
id: vsPackage
directives:
description: Install Visual Studio 2022 (any edition is OK)
allowPrerelease: true
settings:
id: Microsoft.VisualStudio.2022.BuildTools
source: winget
Expand All @@ -49,4 +46,4 @@ properties:
includeRecommended: true
components:
- Microsoft.VisualStudio.Workload.VCTools
configurationVersion: 0.2.0
configurationVersion: 0.2.0
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,12 @@ properties:
id: vsPackage
directives:
description: Install Visual Studio 2019 (any edition is OK)
allowPrerelease: true
settings:
id: Microsoft.VisualStudio.2019.Professional
source: winget
- resource: Microsoft.WinGet.DSC/WinGetPackage
directives:
description: Install .NET SDK 3.1
allowPrerelease: true
settings:
id: Microsoft.DotNet.SDK.3_1
source: winget
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ properties:
id: vsPackage
directives:
description: Install Visual Studio 2022 (any edition is OK)
allowPrerelease: true
settings:
id: Microsoft.VisualStudio.2022.Community
source: winget
Expand All @@ -26,4 +25,4 @@ properties:
productId: Microsoft.VisualStudio.Product.Community
channelId: VisualStudio.17.Release
vsConfigFile: '${WinGetConfigRoot}\..\.vsconfig'
configurationVersion: 0.2.0
configurationVersion: 0.2.0
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ properties:
id: vsPackage
directives:
description: Install Visual Studio 2022 Community
allowPrerelease: true
settings:
id: Microsoft.VisualStudio.2022.Community
source: winget
Expand Down
5 changes: 2 additions & 3 deletions samples/Repositories/redux/reduxjs/configuration.dsc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ properties:
id: npm
directives:
description: Install Node >=v18.10
allowPrerelease: true
settings:
id: OpenJS.NodeJS
source: winget
Expand All @@ -18,7 +17,7 @@ properties:
description: Install Yarn
allowPrerelease: true
settings:
Name: 'yarn'
Name: "yarn"
Global: true
PackageDirectory: '${WinGetConfigRoot}\..\'
- resource: YarnDsc/YarnInstall
Expand All @@ -29,4 +28,4 @@ properties:
allowPrerelease: true
settings:
PackageDirectory: '${WinGetConfigRoot}\..\'
configurationVersion: 0.2.0
configurationVersion: 0.2.0
3 changes: 1 addition & 2 deletions samples/Repositories/tastejs/todomvc/configuration.dsc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ properties:
id: npm
directives:
description: Install Node version 14+
allowPrerelease: true
settings:
id: OpenJS.NodeJS
source: winget
Expand All @@ -18,4 +17,4 @@ properties:
allowPrerelease: true
settings:
PackageDirectory: '${WinGetConfigRoot}\..\'
configurationVersion: 0.2.0
configurationVersion: 0.2.0
3 changes: 1 addition & 2 deletions samples/Repositories/videojs/videojs/configuration.dsc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ properties:
id: npm
directives:
description: Install Node
allowPrerelease: true
settings:
id: OpenJS.NodeJS
source: winget
Expand All @@ -17,6 +16,6 @@ properties:
description: Run 'npm install'
allowPrerelease: true
settings:
Ensure: 'Present'
Ensure: "Present"
PackageDirectory: '${WinGetConfigRoot}\..\'
configurationVersion: 0.2.0
8 changes: 3 additions & 5 deletions samples/Templates/Introduction/C#/configuration.dsc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,13 @@ properties:
id: GitHub Desktop
directives:
description: Install GitHub Desktop
allowPrerelease: true
settings:
id: GitHub.GitHubDesktop
source: winget
- resource: Microsoft.WinGet.DSC/WinGetPackage
id: Visual Studio
directives:
description: Install Visual Studio 2022 Community
allowPrerelease: true
settings:
id: Microsoft.VisualStudio.2022.Community
source: winget
Expand All @@ -46,7 +44,7 @@ properties:
allowPrerelease: true
settings:
productId: Microsoft.VisualStudio.Product.Community
channelId: VisualStudio.17.Release
channelId: VisualStudio.17.Release
components:
- Microsoft.VisualStudio.Workload.ManagedDesktop
- resource: Microsoft.VisualStudio.DSC/VSComponents
Expand All @@ -58,7 +56,7 @@ properties:
allowPrerelease: true
settings:
productId: Microsoft.VisualStudio.Product.Community
channelId: VisualStudio.17.Release
channelId: VisualStudio.17.Release
components:
- Microsoft.VisualStudio.Workload.Universal
configurationVersion: 0.2.0
configurationVersion: 0.2.0
9 changes: 3 additions & 6 deletions samples/Templates/Introduction/C++/configuration.dsc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,13 @@ properties:
id: GitHub Desktop
directives:
description: Install GitHub Desktop
allowPrerelease: true
settings:
id: GitHub.GitHubDesktop
source: winget
- resource: Microsoft.WinGet.DSC/WinGetPackage
id: VisualStudio
directives:
description: Install Visual Studio 2022 Community
allowPrerelease: true
settings:
id: Microsoft.VisualStudio.2022.Community
source: winget
Expand All @@ -48,7 +46,7 @@ properties:
allowPrerelease: true
settings:
productId: Microsoft.VisualStudio.Product.Community
channelId: VisualStudio.17.Release
channelId: VisualStudio.17.Release
components:
- Microsoft.VisualStudio.Workload.NativeDesktop
- resource: Microsoft.VisualStudio.DSC/VSComponents
Expand All @@ -61,7 +59,7 @@ properties:
allowPrerelease: true
settings:
productId: Microsoft.VisualStudio.Product.Community
channelId: VisualStudio.17.Release
channelId: VisualStudio.17.Release
components:
- Microsoft.VisualStudio.Workload.Universal
- resource: Microsoft.WinGet.DSC/WinGetPackage
Expand All @@ -70,8 +68,7 @@ properties:
- VisualStudio
directives:
description: Install Windows SDK
allowPrerelease: true
settings:
id: Microsoft.WindowsSDK.10.0.22621
source: winget
configurationVersion: 0.2.0
configurationVersion: 0.2.0
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ properties:
id: Visual Studio Code
directives:
description: Install Visual Studio Code
allowPrerelease: true
settings:
id: Microsoft.VisualStudioCode
source: winget
configurationVersion: 0.2.0
configurationVersion: 0.2.0
Loading

0 comments on commit 583d2c7

Please sign in to comment.