renamed file to dsc_default.settings.json

Author: Andrew

build.ps1

@@ -48,7 +48,7 @@ $filesForWindowsPackage = @(
     'wmi.resource.ps1',
     'windows_baseline.dsc.yaml',
     'windows_inventory.dsc.yaml'
-    'default_settings.v1.dsc.json',
+    'dsc_default.settings.json',
     'settings.dsc.json'
 )
 
@@ -65,7 +65,7 @@ $filesForLinuxPackage = @(
     'psDscAdapter/',
     'RunCommandOnSet.dsc.resource.json',
     'runcommandonset',
-    'default_settings.v1.dsc.json',
+    'dsc_default.settings.json',
     'settings.dsc.json'
 )
 
@@ -82,7 +82,7 @@ $filesForMacPackage = @(
     'psDscAdapter/',
     'RunCommandOnSet.dsc.resource.json',
     'runcommandonset',
-    'default_settings.v1.dsc.json',
+    'dsc_default.settings.json',
     'settings.dsc.json'
 )
 

dsc/copy_files.txt

@@ -1,2 +1,2 @@
 settings.dsc.json
-default_settings.v1.dsc.json
+dsc_default.settings.json

dsc/default_settings.v1.dsc.json renamed to dsc/dsc_default.settings.json

@@ -12,7 +12,7 @@ Describe 'tests for dsc settings' {
 
         $script:dscHome = (Get-Command dsc).Path | Split-Path
         $script:dscSettingsFilePath = Join-Path $script:dscHome "dsc.settings.json"
-        $script:dscDefaultv1SettingsFilePath = Join-Path $script:dscHome "default_settings.v1.dsc.json"
+        $script:dscDefaultv1SettingsFilePath = Join-Path $script:dscHome "dsc_default.settings.json"
         $script:dscDefaultv1SettingsJson = Get-Content -Raw -Path $script:dscDefaultv1SettingsFilePath
 
         if ($IsWindows) { #"Setting policy on Linux requires sudo"
@@ -22,7 +22,7 @@ Describe 'tests for dsc settings' {
 
         #create backups of settings files
         $script:dscSettingsFilePath_backup = Join-Path $script:dscHome "settings.dsc.json.backup"
-        $script:dscDefaultv1SettingsFilePath_backup = Join-Path $script:dscHome "default_settings.v1.dsc.json.backup"
+        $script:dscDefaultv1SettingsFilePath_backup = Join-Path $script:dscHome "dsc_default.settings.json.backup"
         Copy-Item -Force -Path $script:dscSettingsFilePath -Destination $script:dscSettingsFilePath_backup
         Copy-Item -Force -Path $script:dscDefaultv1SettingsFilePath -Destination $script:dscDefaultv1SettingsFilePath_backup
     }

dsc/tests/dsc_settings.tests.ps1

@@ -72,7 +72,7 @@ pub fn get_setting(value_name: &str) -> Result<DscSettingValue, DscError> {
 
     const SETTINGS_FILE_NAME: &str = "dsc.settings.json";
     // Note that default settings file name has a version that is specific to this version of dsc
-    const DEFAULT_SETTINGS_FILE_NAME: &str = "default_settings.v1.dsc.json";
+    const DEFAULT_SETTINGS_FILE_NAME: &str = "dsc_default.settings.json";
 
     let mut result: DscSettingValue = DscSettingValue::default();
     let mut settings_file_path : PathBuf;