PowerShell · daxian-dbw · Feb 2, 2021 · Aug 11, 2020 · Aug 11, 2020 · Aug 12, 2020
@@ -587,8 +587,10 @@ Fix steps:
         -not ($Runtime -like 'fxdependent*')) {
 
         $json = & $publishPath\pwsh -noprofile -command {
-            $expFeatures = [System.Collections.Generic.List[string]]::new()
-            Get-ExperimentalFeature | ForEach-Object { $expFeatures.Add($_.Name) }
+            # Special case for DSC code in PS;
+            # this experimental feature requires new DSC module that is not inbox,
+            # so we don't want default DSC use case be broken
+            $expFeatures = Get-ExperimentalFeature | Where-Object Name -NE PS7DscSupport | ForEach-Object -MemberName Name
 
             # Make sure ExperimentalFeatures from modules in PSHome are added
             # https://github.com/PowerShell/PowerShell/issues/10550
@@ -598,7 +600,7 @@ Fix steps:
                 }
             }
 
-            ConvertTo-Json $expFeatures.ToArray()
+            ConvertTo-Json $expFeatures
         }
 
         $config += @{ ExperimentalFeatures = ([string[]] ($json | ConvertFrom-Json)) }

@@ -41,9 +41,7 @@ public static object ConvertCimInstanceToObject(Type targetType, CimInstance ins
 
             using (System.Management.Automation.PowerShell powerShell = System.Management.Automation.PowerShell.Create(RunspaceMode.CurrentRunspace))
             {
-                const string script = "param($targetType,$moduleName) & (Microsoft.PowerShell.Core\\Get-Module $moduleName) { New-Object $targetType } ";
-
-                powerShell.AddScript(script);
+                powerShell.AddScript("param($targetType,$moduleName) & (Microsoft.PowerShell.Core\\Get-Module $moduleName) { New-Object $targetType } ");
                 powerShell.AddArgument(targetType);
                 powerShell.AddArgument(moduleName);
 
@@ -945,6 +943,20 @@ private static CimClass MyClassCallback(string serverName, string namespaceName,
             return null;
         }
 
+        /// <summary>
+        /// Reads CIM MOF schema file and returns classes defined in it.
+        /// This is used MOF->PSClass conversion tool.
+        /// </summary>
+        /// <param name="mofPath">
+        /// Path to CIM MOF schema file for reading.
+        /// </param>
+        /// <returns>List of classes from MOF schema file.</returns>
+        public static List<CimClass> ReadCimSchemaMof(string mofPath)
+        {
+            var parser = new Microsoft.PowerShell.DesiredStateConfiguration.CimDSCParser(MyClassCallback);
+            return parser.ParseSchemaMof(mofPath);
+        }
+
         /// <summary>
         /// Import CIM classes from the given file.
         /// </summary>

@@ -0,0 +1,68 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.IO;
+using System.Management.Automation;
+using System.Security;
+
+namespace Microsoft.PowerShell.DesiredStateConfiguration.Internal.CrossPlatform
+{
+    /// <summary>
+    /// Class that does high level Cim schema parsing.
+    /// </summary>
+    internal class CimDSCParser
+    {
+        private readonly JsonDeserializer _jsonDeserializer;
+
+        internal CimDSCParser()
+        {
+            _jsonDeserializer = JsonDeserializer.Create();
+        }
+
+        internal IEnumerable<PSObject> ParseSchemaJson(string filePath, bool useNewRunspace = false)
+        {
+            try
+            {
+                string json = File.ReadAllText(filePath);
+                string fileNameDefiningClass = Path.GetFileNameWithoutExtension(filePath);
+                int dotIndex = fileNameDefiningClass.IndexOf(".schema", StringComparison.InvariantCultureIgnoreCase);
+                if (dotIndex != -1)
+                {
+                    fileNameDefiningClass = fileNameDefiningClass.Substring(0, dotIndex);
+                }
+
+                IEnumerable<PSObject> result = _jsonDeserializer.DeserializeClasses(json, useNewRunspace);
+                foreach (dynamic classObject in result)
+                {
+                    string superClassName = classObject.SuperClassName;
+                    string className = classObject.ClassName;
+                    if (string.Equals(superClassName, "OMI_BaseResource", StringComparison.OrdinalIgnoreCase))
+                    {
+                        // Get the name of the file without schema.mof/json extension
+                        if (!className.Equals(fileNameDefiningClass, StringComparison.OrdinalIgnoreCase))
+                        {
+                            PSInvalidOperationException e = PSTraceSource.NewInvalidOperationException(
+                                ParserStrings.ClassNameNotSameAsDefiningFile, className, fileNameDefiningClass);
+                            throw e;
+                        }
+                    }
+                }
+
+                return result;
+            }
+            catch (Exception exception)
+            {
+                PSInvalidOperationException e = PSTraceSource.NewInvalidOperationException(
+                    exception, ParserStrings.CimDeserializationError, filePath);
+
+                e.SetErrorId("CimDeserializationError");
+                throw e;
+            }
+        }
+    }
+}
@@ -0,0 +1,72 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Management.Automation;
+using System.Management.Automation.Runspaces;
+
+namespace Microsoft.PowerShell.DesiredStateConfiguration.Internal.CrossPlatform
+{
+    internal class JsonDeserializer
+    {
+        #region Constructors
+
+        /// <summary>
+        /// Instantiates a default deserializer.
+        /// </summary>
+        /// <returns>Default deserializer.</returns>
+        public static JsonDeserializer Create()
+        {
+            return new JsonDeserializer();
+        }
+
+        #endregion Constructors
+
+        #region Methods
+
+        /// <summary>
+        /// Returns schema of Cim classes from specified json file.
+        /// </summary>
+        /// <param name="json">Json text to deserialize.</param>
+        /// <param name="useNewRunspace">If a new runspace should be used.</param>
+        /// <returns>Deserialized PSObjects.</returns>
+        public IEnumerable<PSObject> DeserializeClasses(string json, bool useNewRunspace = false)
+        {
+            if (string.IsNullOrEmpty(json))
+            {
+                throw new ArgumentNullException(nameof(json));
+            }
+
+            System.Management.Automation.PowerShell powerShell = null;
+
+            if (useNewRunspace)
+            {
+                // currently using RunspaceMode.NewRunspace will reset PSModulePath env var for the entire process
+                // this is something we want to avoid in DSC GuestConfigAgent scenario, so we use following workaround
+                var s_iss = InitialSessionState.CreateDefault();
+                s_iss.EnvironmentVariables.Add(
+                    new SessionStateVariableEntry(
+                        "PSModulePath",
+                        Environment.GetEnvironmentVariable("PSModulePath"),
+                        description: null));
+                powerShell = System.Management.Automation.PowerShell.Create(s_iss);
+            }
+            else
+            {
+                powerShell = System.Management.Automation.PowerShell.Create(RunspaceMode.CurrentRunspace);
+            }
+
+            using (powerShell)
+            {
+                return powerShell.AddCommand("Microsoft.PowerShell.Utility\\ConvertFrom-Json")
+                    .AddParameter("InputObject", json)
+                    .AddParameter("Depth", 100) // maximum supported by cmdlet
+                    .Invoke();
+            }
+        }
+
+        #endregion Methods
+    }
+}