Allow module without version #600
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| # Copyright (c) Microsoft Corporation. | ||
| # Licensed under the MIT License. | ||
|
|
||
| @{ | ||
|
|
||
| # Script module or binary module file associated with this manifest. | ||
| RootModule = 'TestClassNoVersion.psm1' | ||
|
|
||
| # Version number of this module. | ||
| ModuleVersion = '0.0.1' | ||
|
|
||
| # Supported PSEditions | ||
| # CompatiblePSEditions = @() | ||
|
|
||
| # ID used to uniquely identify this module | ||
| GUID = 'ec985d60-82f4-4d45-83e0-b6f935654350' | ||
|
|
||
| # Author of this module | ||
| Author = 'Microsoft' | ||
|
|
||
| # Company or vendor of this module | ||
| CompanyName = 'Microsoft Corporation' | ||
|
|
||
| # Copyright statement for this module | ||
| Copyright = '(c) Microsoft. All rights reserved.' | ||
|
|
||
| # Functions to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no functions to export. | ||
| FunctionsToExport = @() | ||
|
|
||
| # Cmdlets to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no cmdlets to export. | ||
| CmdletsToExport = @() | ||
|
|
||
| # Variables to export from this module | ||
| VariablesToExport = @() | ||
|
|
||
| # Aliases to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no aliases to export. | ||
| AliasesToExport = @() | ||
|
|
||
| # DSC resources to export from this module | ||
| DscResourcesToExport = 'TestClassNoVersion' | ||
|
|
||
| # Private data to pass to the module specified in RootModule/ModuleToProcess. This may also contain a PSData hashtable with additional module metadata used by PowerShell. | ||
| PrivateData = @{ | ||
|
|
||
| PSData = @{ | ||
| DscCapabilities = @('Get', 'Test', 'Set') | ||
|
|
||
| } # End of PSData hashtable | ||
|
|
||
| } # End of PrivateData hashtable | ||
| } | ||
|
|
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| [DscResource()] | ||
| class TestClassNoVersion | ||
| { | ||
| [DscProperty(Key)] | ||
| [string] $Name | ||
|
|
||
| [void] Set() | ||
| { | ||
| } | ||
|
|
||
| [bool] Test() | ||
| { | ||
| return $true | ||
| } | ||
|
|
||
| [TestClassNoVersion] Get() | ||
| { | ||
| return $this | ||
| } | ||
| } |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -32,15 +32,17 @@ function Get-DSCResourceModules | |
| { | ||
| continue | ||
| } | ||
| # Partially re-used code from the original DSCv2 Get-DSCResource code | ||
| # Get-Module -ListAvailable is slow and has a bug causing incorrect reporting | ||
| $moduleFolders = Get-ChildItem $folder -Directory | ||
| if (-not $moduleFolders) { | ||
| $moduleFolders = Get-ChildItem (Split-Path $folder -Parent) | Where-Object { $_.Name -eq (Split-Path $folder -Leaf) } | ||
|
There was a problem hiding this comment. The
Contributor
Author
There was a problem hiding this comment. When working in the winget-dsc repository, I often found myself doing something like: $env:PSModulePath += ";C:\source\winget-dsc\resources\Microsoft.DotNet.Dsc"
# Call function
Get-DscResourcesModules
# Old code did not list out the moduleHope that sheds some light on it. There was a problem hiding this comment. Can you please post an output of
Contributor
Author
There was a problem hiding this comment. There you go:
I have added both. The left is the main branch, and the right is the current one in this pull request. There was a problem hiding this comment. Thank you; in the right picture - what is the full path to
Contributor
Author
There was a problem hiding this comment. Thanks for the explanation, Andrew. I tried it in the past, and that works. But sometimes, I want only particular modules to be found, with the structure mentioned in this PR and in the test. What are your thoughts on those?
Member
There was a problem hiding this comment. @Gijsreyn I think the problem is that this is contrary to how module discovery works with PS7 and it would be preferable to not deviate from that. Is this only for development purposes or do you have a real scenario where you want to limit the discovery?
Contributor
Author
There was a problem hiding this comment. I can understand, and this was the use case. Feel free to abandon the pull request. I appreciated the time you guys looked into it.
Contributor
Author
There was a problem hiding this comment. Hi @SteveL-MSFT. After testing for a while, I got a scenario that breaks the current testing cycle. Imagine the following use case found while developing in winget-dsc. To test out both cases by either using When modules are being discovered in the lower levels, so say C:\source\winget-dsc\resources\NpmDsc, it correctly loads the PS C:\Users\User> $env:PSModulePath += ";C:\source\winget-dsc\resources\Microsoft.Windows.Setting.Language" I know you've closed down the ticket, but perhaps we can still consider it. Thanks. There was a problem hiding this comment. @Gijsreyn Please open a new issue and copy-paste your last post there. |
||
| } | ||
|
|
||
| foreach ($moduleFolder in $moduleFolders) { | ||
| foreach ($psd1 in Get-ChildItem -Recurse -Filter "$($moduleFolder.Name).psd1" -Path $moduleFolder.fullname -Depth 2) { | ||
| $containsDSCResource = Select-String -LiteralPath $psd1 -Pattern '^[^#]*\bDscResourcesToExport\b.*' | ||
| if ($null -ne $containsDSCResource) { | ||
| $dscModulePsd1List.Add($psd1) | Out-Null | ||
| } | ||
| } | ||
|
|
||
Uh oh!
There was an error while loading. Please reload this page.