Merge pull request #577 from SteveL-MSFT/config-pkg

update build script to account for configuration files

build.ps1

@@ -45,8 +45,8 @@ $filesForWindowsPackage = @(
     'windowspowershell.dsc.resource.json',
     'wmi.dsc.resource.json',
     'wmi.resource.ps1',
-    'configurations/windows_baseline.dsc.yaml',
-    'configurations/windows_inventory.dsc.yaml'
+    'windows_baseline.dsc.yaml',
+    'windows_inventory.dsc.yaml'
 )
 
 $filesForLinuxPackage = @(
@@ -211,7 +211,7 @@ if (!$SkipBuild) {
     }
 
     # make sure dependencies are built first so clippy runs correctly
-    $windows_projects = @("pal", "registry", "reboot_pending", "wmi-adapter")
+    $windows_projects = @("pal", "registry", "reboot_pending", "wmi-adapter", "configurations/windows")
     $macOS_projects = @("resources/brew")
     $linux_projects = @("resources/apt")
 

configurations/windows/copy_files.txt

@@ -0,0 +1,2 @@
+windows_baseline.dsc.yaml
+windows_inventory.dsc.yaml

tree-sitter-dscexpression/package.json

@@ -0,0 +1,52 @@
+{
+  "name": "tree-sitter-dscexpression",
+  "version": "1.0.0",
+  "description": "Dscexpression grammar for tree-sitter",
+  "repository": "github:tree-sitter/tree-sitter-dscexpression",
+  "license": "MIT",
+  "main": "bindings/node",
+  "types": "bindings/node",
+  "keywords": [
+    "incremental",
+    "parsing",
+    "tree-sitter",
+    "dscexpression"
+  ],
+  "files": [
+    "grammar.js",
+    "binding.gyp",
+    "prebuilds/**",
+    "bindings/node/*",
+    "queries/*",
+    "src/**",
+    "*.wasm"
+  ],
+  "dependencies": {
+    "node-addon-api": "^8.1.0",
+    "node-gyp-build": "^4.8.2"
+  },
+  "devDependencies": {
+    "prebuildify": "^6.0.1",
+    "tree-sitter-cli": "^0.24.3"
+  },
+  "peerDependencies": {
+    "tree-sitter": "^0.21.1"
+  },
+  "peerDependenciesMeta": {
+    "tree-sitter": {
+      "optional": true
+    }
+  },
+  "scripts": {
+    "install": "node-gyp-build",
+    "prestart": "tree-sitter build --wasm",
+    "start": "tree-sitter playground",
+    "test": "node --test bindings/node/*_test.js"
+  },
+  "tree-sitter": [
+    {
+      "scope": "source.dscexpression",
+      "injection-regex": "^dscexpression$"
+    }
+  ]
+}

wmi-adapter/Tests/wmi.tests.ps1

@@ -47,7 +47,7 @@ Describe 'WMI adapter resource tests' {
     }
 
     It 'Example config works' -Skip:(!$IsWindows) {
-        $configPath = Join-Path $PSScriptRoot '..\..\configurations\windows_inventory.dsc.yaml'
+        $configPath = Join-Path $PSScriptRoot '..\..\configurations\windows\windows_inventory.dsc.yaml'
         $r = dsc config get -p $configPath
         $LASTEXITCODE | Should -Be 0
         $r | Should -Not -BeNullOrEmpty