Skip to content

Commit

Permalink
Resolve conficts
Browse files Browse the repository at this point in the history
  • Loading branch information
Gijsreyn committed Nov 13, 2024
1 parent 007bc8d commit bccf27c
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 13 deletions.
13 changes: 6 additions & 7 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -115,13 +115,12 @@ If you're feature (or module) has not yet been created, follow these steps:

1. Fork the repository if you haven't already.
2. Clone your fork locally.
3. Dot-source the `New-DscResourceModule.ps` in your PowerShell session.
4. Create a new module scaffolding by executing: `New-DscResourceModule -DscResourceModule '<moduleName>' -Description 'DSC Resource for <description>'`
5. Work on your changes and write tests.
6. Build and test to see if it works.
7. Create & push a feature branch.
8. Create a [Draft Pull Request (PR)](https://github.blog/2019-02-14-introducing-draft-pull-requests/).
9. If you are finished with your changes and you want a review, change the state.
3. Open a PowerShell terminal session and execute: `.\utilities\tools\New-DscResourceModule.ps1 -DscResourceModule '<moduleName>' -Description 'DSC Resource for <description>'`
4. Work on your changes and write tests.
5. Build and test to see if it works.
6. Create & push a feature branch.
7. Create a [Draft Pull Request (PR)](https://github.blog/2019-02-14-introducing-draft-pull-requests/).
8. If you are finished with your changes and you want a review, change the state.

> [!TIP]
> Don't forget to add the `DscResourcesToExport` and `Tags`.
Expand Down
11 changes: 5 additions & 6 deletions resources/PythonPip3Dsc/PythonPip3Dsc.psd1
Original file line number Diff line number Diff line change
Expand Up @@ -97,13 +97,13 @@
PSData = @{

# Tags applied to this module. These help with module discovery in online galleries.
Tags = @('PSDscResource_Pip3Package')
Tags = @('PSDscResource_Pip3Package')

# A URL to the license for this module.
LicenseUri = 'https://github.com/microsoft/winget-dsc/blob/main/LICENSE'
LicenseUri = 'https://github.com/microsoft/winget-dsc/blob/main/LICENSE'

# A URL to the main website for this project.
ProjectUri = 'https://github.com/microsoft/winget-dsc'
ProjectUri = 'https://github.com/microsoft/winget-dsc'

# A URL to an icon representing this module.
# IconUri = ''
Expand All @@ -112,13 +112,14 @@
# ReleaseNotes = ''

# Prerelease string of this module
Prerelease = 'alpha'
Prerelease = 'alpha'

# Flag to indicate whether the module requires explicit user acceptance for install/update/save
# RequireLicenseAcceptance = $false

# External dependent modules of this module
# ExternalModuleDependencies = @()
DscCapabilities = @('Get', 'Set', 'Test', 'Export', 'WhatIf')

} # End of PSData hashtable

Expand All @@ -131,5 +132,3 @@
# DefaultCommandPrefix = ''

}


0 comments on commit bccf27c

Please sign in to comment.