Merge branch 'fix-capabilities-discover-psadapter' of https://github.com/Gijsreyn/operation-methods into fix-capabilities-discover-psadapter

Author: Gijsreyn

.github/workflows/rust.yml

@@ -2,9 +2,9 @@ name: Rust
 
 on:
   push:
-    branches: [ "main", "release/v3.0.0", "release/v3.1" ]
+    branches: [ "main", "release/*" ]
   pull_request:
-    branches: [ "main", "release/v3.0.0", "release/v3.1" ]
+    branches: [ "main", "release/*" ]
     paths-ignore:
       - "docs/**"
       - "*.md"

.pipelines/DSC-Official.yml

@@ -133,9 +133,14 @@ extends:
         variables:
           ob_outputDirectory: '$(Build.ArtifactStagingDirectory)'
           ob_sdl_tsa_configFile: '$(Build.SourcesDirectory)\DSC\.config\tsaoptions.json'
-          ob_sdl_sbom_enabled: true
-          ob_signing_setup_enabled: true
-          ob_sdl_codeql_compiled_enabled: true
+          ob_symbolsPublishing_enabled: true
+          ob_symbolsPublishing_symbolsFolder: '$(Build.SourcesDirectory)\DSC\bin'
+          ob_symbolsPublishing_searchPattern: '**/*.pdb'
+          ob_symbolsPublishing_indexSources: true
+          ob_sdl_sbom_enabled: false
+          ob_signing_setup_enabled: false
+          ob_sdl_codeql_compiled_enabled: false
+          ob_restore_phase: true
         pool:
           type: windows
         steps:
@@ -152,17 +157,39 @@ extends:
             Copy-Item "$(Pipeline.Workspace)/drop_BuildAndSign_BuildWin_x64/*.msix" ./bin/msix -Verbose
             Copy-Item "$(Pipeline.Workspace)/drop_BuildAndSign_BuildWin_arm64/*.msix" ./bin/msix -Verbose
             ./build.ps1 -PackageType msixbundle
-            Copy-Item ./bin/*.msixbundle "$(ob_outputDirectory)"
+            Copy-Item "$(Build.SourcesDirectory)/DSC/bin/*.msixbundle" "$(ob_outputDirectory)"
           displayName: 'Create msixbundle'
           condition: succeeded()
+
+      - job: SignMsixBundle
+        dependsOn: CreateMsixBundle
+        variables:
+          ob_outputDirectory: '$(Build.ArtifactStagingDirectory)'
+          ob_sdl_sbom_enabled: false
+          ob_signing_setup_enabled: true
+          ob_sdl_codeql_compiled_enabled: false
+        pool:
+          type: windows
+        steps:
+        - task: DownloadPipelineArtifact@2
+          inputs:
+            buildType: 'current'
+            artifact: drop_BuildAndSign_CreateMsixBundle
+            itemPattern: |
+              **/*.msixbundle
+            targetPath: '$(Build.ArtifactStagingDirectory)/downloads'
+          displayName: Download MsixBundle
         - task: onebranch.pipeline.signing@1
           displayName: Sign MsixBundle
           condition: succeeded()
           inputs:
             command: 'sign'
-            signing_profile: $(MSIXProfile)
+            signing_profile: 'Dynamic-WINMSAPP1ST'
             files_to_sign: '*.msixbundle'
-            search_root: '$(ob_outputDirectory)'
+            search_root: '$(Build.ArtifactStagingDirectory)/downloads'
+        - pwsh: |
+            Copy-Item "$(Build.ArtifactStagingDirectory)/downloads/*.msixbundle" "$(ob_outputDirectory)"
+          displayName: 'Copy MsixBundle to output directory'
 
       - job: BuildLinuxMusl
         dependsOn: SetPackageVersion
@@ -171,6 +198,9 @@ extends:
           PackageVersion: $[ dependencies.SetPackageVersion.outputs['Package.Version'] ]
           AzToken: $[ dependencies.SetPackageVersion.outputs['AzToken'] ]
           ob_outputDirectory: '$(Build.ArtifactStagingDirectory)'
+          ob_linuxSymbolsPublishing_enabled: true
+          ob_linuxSymbolsPublishing_symbolsFolder: '$(Build.SourcesDirectory)/DSC/bin'
+          ob_linuxSymbolsPublishing_searchPattern: '**/*.dbg'
         displayName: Linux-x64-musl
         pool:
           type: linux
@@ -202,6 +232,9 @@ extends:
           PackageVersion: $[ dependencies.SetPackageVersion.outputs['Package.Version'] ]
           AzToken: $[ dependencies.SetPackageVersion.outputs['AzToken'] ]
           ob_outputDirectory: '$(Build.ArtifactStagingDirectory)'
+          ob_linuxSymbolsPublishing_enabled: true
+          ob_linuxSymbolsPublishing_symbolsFolder: '$(Build.SourcesDirectory)/DSC/bin'
+          ob_linuxSymbolsPublishing_searchPattern: '**/*.dbg'
         displayName: Linux-ARM64-musl
         pool:
           type: linux

CHANGELOG.md

@@ -121,7 +121,7 @@ changes since the last release, see the [diff on GitHub][unreleased].
 - Added support for extensions to DSC. You can now use the `dsc extension list` command to
   enumerate available extensions. DSC now supports a single extension capability, `discover`, which
   returns JSON objects indicating where to find DSC resource manifests that aren't in the `PATH` or
-  `DSC_PATH`, as with resources installed as Appx packages.
+  `DSC_RESOURCE_PATH`, as with resources installed as Appx packages.
 
   Now when DSC performs discovery, it recursively discovers extensions and resources on the system.
 
@@ -135,7 +135,7 @@ changes since the last release, see the [diff on GitHub][unreleased].
     - [#760][#760]
     - [#762][#762]
 
-- Addes support for passing parameters to the `dsc config` commands from stdin. You can pass
+- Adds support for passing parameters to the `dsc config` commands from stdin. You can pass
   _either_ the configuration document or parameters file contents to the command from stdin, but
   not both. This enables securely passing sensitive parameters to DSC without writing them to a
   file or defining them as an environment variable.

CONTRIBUTING.md

@@ -26,7 +26,11 @@ Please read the rest of this document to ensure a smooth contribution process.
 
 ### Contributing to documentation related to DSC
 
-Please see the [PowerShell-Docs-DSC](https://github.com/MicrosoftDocs/PowerShell-Docs-DSC/) repository for details.
+You can contribute to documentation either in the `docs` folder of this repository
+or in the [PowerShell-Docs-DSC](https://github.com/MicrosoftDocs/PowerShell-Docs-DSC/) repository.
+
+> [!NOTE]
+> Documentation contributed to the `docs` folder in this repository is periodically synced to the [PowerShell-Docs-DSC](https://github.com/MicrosoftDocs/PowerShell-Docs-DSC/) repository.
 
 ### Contributing to documentation related to maintaining or contributing to the DSC project
 

README.md

@@ -1,8 +1,9 @@
 # DSCv3
 
 > [!NOTE]
-> This repo isn't accepting code contributions. It's public and open source to show progress and
-> enable feedback. Once we're at a feature complete state, we can start taking code contributions.
+> We welcome code contributions to this repository. For guidelines on how to contribute,
+> see our [CONTRIBUTING.md](CONTRIBUTING.md).
+> Your feedback and participation help us improve DSCv3 for everyone.
 
 ## What's DSCv3?
 
@@ -22,7 +23,7 @@ DSCv3 differs from PowerShell DSC in a few important ways:
 
 - DSCv3 doesn't depend on PowerShell. You can use DSCv3 without PowerShell installed and manage
   resources written in bash, python, C#, Go, or any other language.
-- DSCv3 use of PowerShell based resources does not depend on PSDesiredStateConfiguration module
+- DSCv3 use of PowerShell based resources does not depend on [PSDesiredStateConfiguration][00] module
 - DSCv3 doesn't include a local configuration manager. DSCv3 is invoked as a command. It doesn't
   run as a service.
 - Non-PowerShell resources define their schemas with JSON files, not MOF files.

build.ps1

@@ -53,17 +53,23 @@ $filesForWindowsPackage = @(
     'osinfo.dsc.resource.json',
     'powershell.dsc.resource.json',
     'psDscAdapter/',
+    'psscript.ps1',
+    'psscript.dsc.resource.json',
+    'winpsscript.dsc.resource.json',
     'reboot_pending.dsc.resource.json',
     'reboot_pending.resource.ps1',
     'registry.dsc.resource.json',
     'registry.exe',
     'RunCommandOnSet.dsc.resource.json',
     'RunCommandOnSet.exe',
     'sshdconfig.exe',
-    'sshdconfig.dsc.resource.json',
+    'sshd-windows.dsc.resource.json',
+    'sshd_config.dsc.resource.json',
     'windowspowershell.dsc.resource.json',
     'wmi.dsc.resource.json',
     'wmi.resource.ps1',
+    'wmiAdapter.psd1',
+    'wmiAdapter.psm1',
     'windows_baseline.dsc.yaml',
     'windows_inventory.dsc.yaml'
 )
@@ -84,10 +90,12 @@ $filesForLinuxPackage = @(
     'osinfo.dsc.resource.json',
     'powershell.dsc.resource.json',
     'psDscAdapter/',
+    'psscript.ps1',
+    'psscript.dsc.resource.json',
     'RunCommandOnSet.dsc.resource.json',
     'runcommandonset',
     'sshdconfig',
-    'sshdconfig.dsc.resource.json'
+    'sshd_config.dsc.resource.json'
 )
 
 $filesForMacPackage = @(
@@ -106,10 +114,12 @@ $filesForMacPackage = @(
     'osinfo.dsc.resource.json',
     'powershell.dsc.resource.json',
     'psDscAdapter/',
+    'psscript.ps1',
+    'psscript.dsc.resource.json',
     'RunCommandOnSet.dsc.resource.json',
     'runcommandonset',
     'sshdconfig',
-    'sshdconfig.dsc.resource.json'
+    'sshd_config.dsc.resource.json'
 )
 
 # the list of files other than the binaries which need to be executable
@@ -172,6 +182,27 @@ if ($null -ne $packageType) {
     $BuildToolsPath = "${env:ProgramFiles(x86)}\Microsoft Visual Studio\2022\BuildTools\VC\Tools\MSVC"
 
     & $rustup default stable
+
+    ## Test if Node is installed
+    ## Skipping upgrade as users may have a specific version they want to use
+    if (!(Get-Command 'node' -ErrorAction Ignore)) {
+        Write-Verbose -Verbose "Node.js not found, installing..."
+        if (!$IsWindows) {
+            if (Get-Command 'brew' -ErrorAction Ignore) {
+                brew install node@24
+            } else {
+                Write-Warning "Homebrew not found, please install Node.js manually"
+            }
+        }
+        else {
+            if (Get-Command 'winget' -ErrorAction Ignore) {
+                Write-Verbose -Verbose "Using winget to install Node.js"
+                winget install OpenJS.NodeJS --accept-source-agreements --accept-package-agreements --source winget --silent
+            } else {
+                Write-Warning "winget not found, please install Node.js manually"
+            }
+        }
+    }
 }
 
 if (!$SkipBuild -and !$SkipLinkCheck -and $IsWindows -and !(Get-Command 'link.exe' -ErrorAction Ignore)) {
@@ -276,6 +307,7 @@ if (!$SkipBuild) {
         "dscecho",
         "osinfo",
         "powershell-adapter",
+        'resources/PSScript',
         "process",
         "runcommandonset",
         "sshdconfig",
@@ -398,7 +430,8 @@ if (!$SkipBuild) {
                 Copy-Item "*.dsc.resource.json" $target -Force -ErrorAction Ignore
             }
             else { # don't copy WindowsPowerShell resource manifest
-                Copy-Item "*.dsc.resource.json" $target -Exclude 'windowspowershell.dsc.resource.json' -Force -ErrorAction Ignore
+                $exclude = @('windowspowershell.dsc.resource.json', 'winpsscript.dsc.resource.json')
+                Copy-Item "*.dsc.resource.json" $target -Exclude $exclude -Force -ErrorAction Ignore
             }
 
             # be sure that the files that should be executable are executable

docs/reference/cli/config/export.md

@@ -31,6 +31,18 @@ dsc config export [Options] --input <INPUT>
 cat <FILE> | dsc config export [Options] --file -
 ```
 
+### Configuration document from file with parameters from stdin
+
+```sh
+cat <PARAMETERS_FILE> | dsc config --parameters-file - export [Options] --file <FILE>
+```
+
+### Configuration document from option string with parameters from stdin
+
+```sh
+cat <PARAMETERS_FILE> | dsc config --parameters-file - export [Options] --input <INPUT>
+```
+
 ## Description
 
 The `export` subcommand generates a configuration document that includes every instance of a set of

docs/reference/cli/config/get.md

@@ -31,6 +31,18 @@ dsc config get [Options] --input <INPUT>
 cat <FILE> | dsc config get [Options] --file -
 ```
 
+### Configuration document from file with parameters from stdin
+
+```sh
+cat <PARAMETERS_FILE> | dsc config --parameters-file - get [Options] --file <FILE>
+```
+
+### Configuration document from option string with parameters from stdin
+
+```sh
+cat <PARAMETERS_FILE> | dsc config --parameters-file - get [Options] --input <INPUT>
+```
+
 ## Description
 
 The `get` subcommand returns the actual state of the resource instances in a configuration

docs/reference/cli/config/index.md

@@ -78,6 +78,11 @@ for that parameter.
 
 This option is mutually exclusive with the `--parameters` option.
 
+Starting with DSC version 3.1.0, you can pass the parameters data to a subcommand over stdin. When
+you do, you must pass the configuration document as an input string or the path to a file on the
+system. You can't pass both the parameters file and the configuration document to a command from
+stdin.
+
 For more information about defining parameters in a configuration document, see
 [DSC Configuration document parameter schema][06]. For more information about using parameters in
 configuration document, see the [parameters function reference][07].

docs/reference/cli/config/set.md

@@ -31,6 +31,19 @@ dsc config set [Options] --input <INPUT>
 cat <FILE> | dsc config set [Options] --file -
 ```
 
+### Configuration document from file with parameters from stdin
+
+```sh
+cat <PARAMETERS_FILE> | dsc config --parameters-file - set [Options] --file <FILE>
+```
+
+### Configuration document from option string with parameters from stdin
+
+```sh
+cat <PARAMETERS_FILE> | dsc config --parameters-file - set [Options] --input <INPUT>
+```
+
+
 ## Description
 
 The `set` subcommand enforces the desired state of the resource instances in a configuration