Skip to content

Support DSC compilation on Linux. #9834

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TravisEz13 merged 2 commits into from
Jun 7, 2019
Merged

Support DSC compilation on Linux. #9834

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1242510
Support DSC compilation on Linux.
amitsara Jun 4, 2019
f5948c1
Fix DSC compilation tests failures on Linux.
amitsara Jun 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions src/System.Management.Automation/DscSupport/CimDSCParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -648,10 +648,10 @@ public static void Initialize(Collection<Exception> errors, List<string> moduleP
throw new DirectoryNotFoundException("Unable to find DSC schema store at " + dscConfigurationDirectory + ". Please ensure PS DSC for Linux is installed.");
}

var resourceBaseFile = Path.Combine(dscConfigurationDirectory, "baseregistration/baseresource.schema.mof");
var resourceBaseFile = Path.Combine(dscConfigurationDirectory, "BaseRegistration/BaseResource.schema.mof");
ImportClasses(resourceBaseFile, s_defaultModuleInfoForResource, errors);

var metaConfigFile = Path.Combine(dscConfigurationDirectory, "baseregistration/MSFT_DSCMetaConfiguration.mof");
var metaConfigFile = Path.Combine(dscConfigurationDirectory, "BaseRegistration/MSFT_DSCMetaConfiguration.mof");
ImportClasses(metaConfigFile, s_defaultModuleInfoForResource, errors);

var allResourceRoots = new string[] { dscConfigurationDirectory };
Expand Down Expand Up @@ -699,13 +699,13 @@ public static void Initialize(Collection<Exception> errors, List<string> moduleP
// Load the base schema files.
//
ClearCache();
var resourceBaseFile = Path.Combine(systemResourceRoot, "BaseRegistration\\BaseResource.Schema.mof");
var resourceBaseFile = Path.Combine(systemResourceRoot, "BaseRegistration\\BaseResource.schema.mof");
ImportClasses(resourceBaseFile, s_defaultModuleInfoForResource, errors);

var metaConfigFile = Path.Combine(systemResourceRoot, "BaseRegistration\\MSFT_DSCMetaConfiguration.mof");
ImportClasses(metaConfigFile, s_defaultModuleInfoForResource, errors);

var metaConfigExtensionFile = Path.Combine(systemResourceRoot, "BaseRegistration\\MSFT_MetaConfigurationExtensionClasses.Schema.mof");
var metaConfigExtensionFile = Path.Combine(systemResourceRoot, "BaseRegistration\\MSFT_MetaConfigurationExtensionClasses.schema.mof");
ImportClasses(metaConfigExtensionFile, DefaultModuleInfoForMetaConfigResource, errors);

//
Expand Down Expand Up @@ -768,7 +768,7 @@ private static void LoadDSCResourceIntoCache(Collection<Exception> errors, List<
{
if (!Directory.Exists(moduleDir)) continue;

var dscResourcesPath = Path.Combine(moduleDir, "DSCResources");
var dscResourcesPath = Path.Combine(moduleDir, "DscResources");
if (Directory.Exists(dscResourcesPath))
{
foreach (string resourceDir in Directory.EnumerateDirectories(dscResourcesPath))
Expand Down Expand Up @@ -3156,8 +3156,8 @@ public static bool ImportCimKeywordsFromModule(PSModuleInfo module, string resou
throw PSTraceSource.NewArgumentNullException("resourceName");
}

string dscResourcesPath = Path.Combine(module.ModuleBase, "DSCResources");
schemaFilePath = Path.Combine(Path.Combine(dscResourcesPath, resourceName), resourceName + ".Schema.mof");
string dscResourcesPath = Path.Combine(module.ModuleBase, "DscResources");
schemaFilePath = Path.Combine(Path.Combine(dscResourcesPath, resourceName), resourceName + ".schema.mof");

if (File.Exists(schemaFilePath))
{
Expand All @@ -3180,14 +3180,14 @@ public static bool ImportCimKeywordsFromModule(PSModuleInfo module, string resou
{
//
// Cannot find the schema file, then resourceName may be a friendly name,
// try to search all DSCResources' schemas under DSCResources folder
// try to search all DscResources' schemas under DscResources folder
//
try
{
var dscResourceDirectories = Directory.GetDirectories(dscResourcesPath);
foreach (var directory in dscResourceDirectories)
{
var schemaFiles = Directory.GetFiles(directory, "*.Schema.mof", SearchOption.TopDirectoryOnly);
var schemaFiles = Directory.GetFiles(directory, "*.schema.mof", SearchOption.TopDirectoryOnly);
if (schemaFiles.Length > 0)
{
Debug.Assert(schemaFiles.Length == 1, "A valid DSCResource module can have only one schema mof file");
Expand Down Expand Up @@ -3251,7 +3251,7 @@ public static bool ImportScriptKeywordsFromModule(PSModuleInfo module, string re
throw PSTraceSource.NewArgumentNullException("resourceName");
}

schemaFilePath = Path.Combine(Path.Combine(Path.Combine(module.ModuleBase, "DSCResources"), resourceName), resourceName + ".Schema.psm1");
schemaFilePath = Path.Combine(Path.Combine(Path.Combine(module.ModuleBase, "DscResources"), resourceName), resourceName + ".Schema.psm1");

if (File.Exists(schemaFilePath) && !s_currentImportingScriptFiles.Contains(schemaFilePath))
{
Expand Down
0 .../baseregistration/baseresource.schema.mof → .../BaseRegistration/BaseResource.schema.mof
View file
Open in desktop
File renamed without changes.
0 ...egistration/MSFT_DSCMetaConfiguration.mof → ...egistration/MSFT_DSCMetaConfiguration.mof
View file
Open in desktop
File renamed without changes.