diff --git a/src/System.Management.Automation/DscSupport/CimDSCParser.cs b/src/System.Management.Automation/DscSupport/CimDSCParser.cs index 6214522b792..ea7501a8a2d 100644 --- a/src/System.Management.Automation/DscSupport/CimDSCParser.cs +++ b/src/System.Management.Automation/DscSupport/CimDSCParser.cs @@ -648,10 +648,10 @@ public static void Initialize(Collection errors, List 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 }; @@ -699,13 +699,13 @@ public static void Initialize(Collection errors, List 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); // @@ -768,7 +768,7 @@ private static void LoadDSCResourceIntoCache(Collection 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)) @@ -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)) { @@ -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"); @@ -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)) { diff --git a/test/powershell/Modules/PSDesiredStateConfiguration/assets/dsc/baseregistration/baseresource.schema.mof b/test/powershell/Modules/PSDesiredStateConfiguration/assets/dsc/BaseRegistration/BaseResource.schema.mof similarity index 100% rename from test/powershell/Modules/PSDesiredStateConfiguration/assets/dsc/baseregistration/baseresource.schema.mof rename to test/powershell/Modules/PSDesiredStateConfiguration/assets/dsc/BaseRegistration/BaseResource.schema.mof diff --git a/test/powershell/Modules/PSDesiredStateConfiguration/assets/dsc/baseregistration/MSFT_DSCMetaConfiguration.mof b/test/powershell/Modules/PSDesiredStateConfiguration/assets/dsc/BaseRegistration/MSFT_DSCMetaConfiguration.mof similarity index 100% rename from test/powershell/Modules/PSDesiredStateConfiguration/assets/dsc/baseregistration/MSFT_DSCMetaConfiguration.mof rename to test/powershell/Modules/PSDesiredStateConfiguration/assets/dsc/BaseRegistration/MSFT_DSCMetaConfiguration.mof