updated schema in dsc_default.settings.json

Author: Andrew

dsc/copy_files.txt

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

dsc/dsc_default.settings.json

@@ -1,12 +1,14 @@
 {
-  "resourcePath": {
-    "allowEnvOverride": true,
-    "appendEnvPath": true,
-    "directories": []
-  },
-  "tracing": {
-    "level": "WARN",
-    "format": "Default",
-    "allowOverride": true
+  "1": {
+    "resourcePath": {
+      "allowEnvOverride": true,
+      "appendEnvPath": true,
+      "directories": []
+    },
+    "tracing": {
+      "level": "WARN",
+      "format": "Default",
+      "allowOverride": true
+    }
   }
 }

dsc_lib/src/util.rs

@@ -71,18 +71,21 @@ pub fn parse_input_to_json(value: &str) -> Result<String, DscError> {
 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
+    // Note that default settings file has root nodes as settings schema version that is specific to this version of dsc
     const DEFAULT_SETTINGS_FILE_NAME: &str = "dsc_default.settings.json";
+    const DEFAULT_SETTINGS_SCHEMA_VERSION: &str = "1";
 
     let mut result: DscSettingValue = DscSettingValue::default();
     let mut settings_file_path : PathBuf;
 
     if let Some(exe_home) = env::current_exe()?.parent() {
         // First, get setting from the default settings file
         settings_file_path = exe_home.join(DEFAULT_SETTINGS_FILE_NAME);
-        if let Ok(v) = load_value_from_json(&settings_file_path, value_name) {
-            result.setting = v;
-            debug!("Found setting '{}' in {}", &value_name, settings_file_path.to_string_lossy());
+        if let Ok(v) = load_value_from_json(&settings_file_path, DEFAULT_SETTINGS_SCHEMA_VERSION) {
+            if let Some(n) = v.get(value_name) {
+                result.setting = n.clone();
+                debug!("Found setting '{}' in {}", &value_name, settings_file_path.to_string_lossy());
+            }
         } else {
             debug!("Did not find setting '{}' in {}", &value_name, settings_file_path.to_string_lossy());
         }