pepperdash/PepperDashCore
1
0
Fork 0
mirror of https://github.com/PepperDash/PepperDashCore.git synced 2026-02-15 20:54:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/development' into HEAD

Browse Source 
# Conflicts:
#	Pepperdash Core/Pepperdash Core/JsonToSimpl/JsonToSimplFileMaster.cs
This commit is contained in:
Neil Dorin
2019-10-15 12:37:15 -06:00
parent 3a054be26a 074bcd0423
commit fcf59f7b4c
3 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Pepperdash Core/Pepperdash Core/JsonToSimpl/JsonToSimplFileMaster.cs
View File

@@ -77,12 +77,10 @@ namespace PepperDash.Core.JsonToSimpl
OnStringChange(ActualFilePath, 0, JsonToSimplConstants.ActualFilePathChange);
Debug.Console(1, "Actual JSON file is {0}", ActualFilePath);
// TODO: pdc-20: added to retrun filename to SIMPL
Filename = actualFile.Name;
OnStringChange(Filename, 0, JsonToSimplConstants.FilenameResolvedChange);
Debug.Console(1, "JSON Filename is {0}", Filename);
// TODO: pdc-20: added to return the file path to SIMPL
FilePathName = string.Format(@"{0}\", actualFile.DirectoryName);
OnStringChange(FilePathName, 0, JsonToSimplConstants.FilePathResolvedChange);
Debug.Console(1, "JSON File Path is {0}", FilePathName);