maxmustermann/PowerShell
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source 
Update CimDSCParser to fix Configuration compilation for DSC
This commit is contained in:
Mariah 2018-03-02 17:01:59 -08:00 committed by Travis Plunk
parent d91fe0074d
commit 8dc62afb5f
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/System.Management.Automation/DscSupport/CimDSCParser.cs
View file

@ -667,7 +667,18 @@ namespace Microsoft.PowerShell.DesiredStateConfiguration.Internal
}
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");
@ -708,7 +719,7 @@ namespace Microsoft.PowerShell.DesiredStateConfiguration.Internal
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