Update CimDSCParser to fix Configuration compilation for DSC (PowerShell#6225)

mbreakey3 · TravisEz13 · commit fb6cd6a22161 · 2018-03-12T16:33:30.000-07:00
Update CimDSCParser to fix Configuration compilation for DSC
diff --git a/src/System.Management.Automation/DscSupport/CimDSCParser.cs b/src/System.Management.Automation/DscSupport/CimDSCParser.cs
@@ -663,7 +663,18 @@ public static void Initialize(Collection<Exception> errors, List<string> moduleP
             }
             else
             {
-                var systemResourceRoot = Path.Combine(Platform.GetFolderPath(Environment.SpecialFolder.System), "Configuration");
+                // DSC SxS scenario
+                var configSystemPath = Utils.DefaultPowerShellAppBase;
+                var systemResourceRoot = Path.Combine(configSystemPath, "Configuration");
+                var inboxModulePath = "Modules\\PSDesiredStateConfiguration";
+
+                if (!Directory.Exists(systemResourceRoot))
+                {
+                     configSystemPath = Platform.GetFolderPath(Environment.SpecialFolder.System);
+                     systemResourceRoot = Path.Combine(configSystemPath, "Configuration");
+                     inboxModulePath = InboxDscResourceModulePath;
+                }
+
                 var programFilesDirectory = Platform.GetFolderPath(Environment.SpecialFolder.ProgramFiles);
                 Debug.Assert(programFilesDirectory != null, "Program Files environment variable does not exist!");
                 var customResourceRoot = Path.Combine(programFilesDirectory, "WindowsPowerShell\\Configuration");
@@ -704,7 +715,7 @@ public static void Initialize(Collection<Exception> errors, List<string> moduleP
                 List<string> modulePaths = new List<string>();
                 if (modulePathList == null || modulePathList.Count == 0)
                 {
-                    modulePaths.Add(Path.Combine(Platform.GetFolderPath(Environment.SpecialFolder.System), InboxDscResourceModulePath));
+                    modulePaths.Add(Path.Combine(configSystemPath, inboxModulePath));
                     isInboxResource = true;
                 }
                 else
