Fix for Link options

APLSource/Admin/GetProgramFilesFolder.aplf

@@ -1,15 +1,26 @@
- r←GetProgramFilesFolder add;version;aplVersion;OS
-⍝ Returns standard path for Dyalog's version-specific folder in %USERPROFILE%\Documents\.\\
+  r←{current}GetProgramFilesFolder postFix;version;aplVersion;OS
+⍝ Returns standard path for Dyalog's version-specific program files folder.\\
 ⍝ Works on all platforms but returns different results.\\
 ⍝ Under Windows typically:\\
-⍝ `C:\Users\<⎕AN>\Documents\Dyalog APL[-64] 19.0 Unicode Files'  ←→ GetProgramFilesFolder ''
- OS←3↑⊃# ⎕WG'APLVersion'
- add←{(((~'/\'∊⍨⊃⍵)∧0≠≢⍵)/'/'),⍵}add
+⍝ `C:\Users\<⎕AN>\Documents\Dyalog APL[-64] 19.0 Unicode Files' ←→ GetMyUCMDsFolder
+⍝ ⍺ is optional and defaults to 0, meaning the version-agnostic folder is returned.
+⍝ If ⍺←1, the folder associated with the currently running version of Dyalog is returned.
+ current←{0<⎕NC ⍵:⍎⍵ ⋄ 0}'current'
+ OS←3↑# ⎕WG'APLVersion'
+ postFix←{(((~'/\'∊⍨⊃⍵)∧0≠≢⍵)/'/'),⍵}postFix
  aplVersion←# ⎕WG'APLVersion'
- :If OS≡'Win'
-     version←((∨/'-64'⍷1⊃aplVersion)/'-64'),' ',({⍵/⍨2>+\⍵='.'}2⊃aplVersion),' ',(80=⎕DR' ')/'Unicode'
-     r←(2 ⎕NQ #'GetEnvironment' 'USERPROFILE'),'\Documents\Dyalog APL',version,' Files',add
+ :If current
+     :If OS≡'Win'
+         version←((∨/'-64'⍷1⊃aplVersion)/'-64'),' ',({⍵/⍨2>+\⍵='.'}2⊃aplVersion),' ',(80=⎕DR' ')/'Unicode'
+         r←(2 ⎕NQ #'GetEnvironment' 'USERPROFILE'),'\Documents\Dyalog APL',version,' Files',postFix
+     :Else
+         version←({'.'~⍨⍵/⍨2>+\⍵='.'}2⊃aplVersion),((80=⎕DR' ')/'U'),((1+∨/'-64'⍷1⊃aplVersion)⊃'32' '64')
+         r←(⊃⎕SH'echo $HOME'),'/dyalog.',version,'.files',postFix
+     :EndIf
  :Else
-     version←({'.'~⍨⍵/⍨2>+\⍵='.'}2⊃aplVersion),((80=⎕DR' ')/'U'),((1+∨/'-64'⍷1⊃aplVersion)⊃'32' '64')
-     r←(⊃⎕SH'echo $HOME'),'/dyalog.',version,'.files',add
+     :If OS≡'Win'
+         r←(2 ⎕NQ #'GetEnvironment' 'USERPROFILE'),'\Documents\Dyalog APL Files',postFix
+     :Else
+         r←(⊃⎕SH'echo $HOME'),'/dyalog.files',postFix
+     :EndIf
  :EndIf

APLSource/Cider/AddNuGetDependencies.aplf

@@ -20,7 +20,7 @@
  :If 0<≢nuGetFolder
      nuGetFolder←FilesAndDirs.EnforceSlash nuGetFolder  ⍝ .NET requirement
      {}⎕MKDIR⍣(~⎕NEXISTS nuGetFolder)⊣nuGetFolder
-     'Unable to locate NuGet API'Assert 0≢NuGet←FindNuGetAPI ⍬
+     'Unable to locate NuGet API'Assert 0<≢NuGet←FindNuGetAPI ⍬
      msg←NuGet.Setup nuGetFolder
      msg Assert~∨/'error:'⍷⎕C msg
      list←''

APLSource/Cider/ExtractLinkOptions.aplf

@@ -1,45 +1,58 @@
- options←ExtractLinkOptions config;C;overWrite
+ r←ExtractLinkOptions config;C;options
 ⍝ This is slowly going to disappear because Link 4.0 will come with its own set of features
 ⍝ for setting Link parameters.
  options←⎕SE.Link.U.DefaultOpts ⎕NS''
+ r←⎕NS''
  C←config.LINK
- overWrite←{0=≢⍵:⍺ ⋄ ⍵}
  :If 0<C.⎕NC'arrays'
-     options.arrays(overWrite)←C.arrays
+ :AndIf options.arrays≢C.arrays
+     r.arrays←C.arrays
  :EndIf
  :If 0<C.⎕NC'beforeRead'
-     options.beforeRead(overWrite)←C.beforeRead
+ :AndIf options.beforeRead≢C.beforeRead
+     r.beforeRead←C.beforeRead
  :EndIf
  :If 0<C.⎕NC'beforeWrite'
-     options.beforeWrite(overWrite)←C.beforeWrite
+ :AndIf options.beforeWrite≢C.beforeWrite
+     r.beforeWrite←C.beforeWrite
  :EndIf
  :If 0<C.⎕NC'caseCode'
-     options.caseCode(overWrite)←C.caseCode
+ :AndIf options.caseCode≢C.caseCode
+     r.caseCode←C.caseCode
  :EndIf
  :If 0<C.⎕NC'codeExtensions'
-     options.codeExtensions(overWrite)←C.codeExtensions
+ :AndIf options.codeExtensions≢C.codeExtensions
+     r.codeExtensions←C.codeExtensions
  :EndIf
  :If 0<C.⎕NC'fastLoad'
-     options.fastLoad(overWrite)←C.fastLoad
+ :AndIf options.fastLoad≢C.fastLoad
+     r.fastLoad←C.fastLoad
  :EndIf
  :If 0<C.⎕NC'flatten'
-     options.flatten(overWrite)←C.flatten
+ :AndIf options.flatten≢C.flatten
+     r.flatten←C.flatten
  :EndIf
  :If 0<C.⎕NC'forceExtensions'
-     options.forceExtensions(overWrite)←C.forceExtensions
+ :AndIf options.forceExtensions≢C.forceExtensions
+     r.forceExtensions←C.forceExtensions
  :EndIf
  :If 0<C.⎕NC'forceFilenames'
-     options.forceFilenames(overWrite)←C.forceFilenames
+ :AndIf options.forceFilenames≢C.forceFilenames
+     r.forceFilenames←C.forceFilenames
  :EndIf
  :If 0<C.⎕NC'getFilename'
-     options.getFilename(overWrite)←C.getFilename
+ :AndIf options.getFilename≢C.getFilename
+     r.getFilename←C.getFilename
  :EndIf
  :If 0<C.⎕NC'typeExtensions'
-     options.typeExtensions(overWrite)←↑C.typeExtensions
+ :AndIf options.typeExtensions≢C.typeExtensions
+     r.typeExtensions←↑C.typeExtensions
  :EndIf
  :If 0<C.⎕NC'watch'
-     options.watch←C.watch
+ :AndIf options.watch≢C.watch
+     r.watch←C.watch
  :EndIf
  :If 0<C.⎕NC'fastLoad'
-     options.fastLoad←config.LINK.fastLoad
+ :AndIf options.fastLoad≢C.fastLoad
+     r.fastLoad←config.LINK.fastLoad
  :EndIf

APLSource/Cider/FindNuGetAPI.aplf

@@ -1,7 +1,8 @@
-NuGet←FindNuGetAPI dummy
-⍝ Find a NuGet ns
-
-NuGet←{⊃0,⍨(9=⌊⎕NC ⍵)/⍵} '#.NuGet' '⎕SE.Dyalog.Nuget' '⎕SE.NuGet'
-:If 0≢NuGet
-    NuGet←⍎NuGet
-:EndIf
+ ref←FindNuGetAPI dummy;bool;list
+⍝ Tries to find a NuGet ns somewhere, and returns a ref to the first hit, otherwise ''
+ ref←''
+ list←'#.NuGet' '⎕SE.Dyalog.Nuget' '⎕SE.NuGet'
+ bool←9=⎕NC list
+ :If ∨/bool
+     ref←⍎⊃bool/list
+ :EndIf

APLSource/Cider/ListNuGetDependencies.aplf

@@ -1,14 +1,15 @@
  r←ListNuGetDependencies projectFolder;NuGet;cfg;nuGetFolder
  r←0 2⍴''
- NuGet←FindNuGetAPI''
- :If IsAlias projectFolder
-     projectFolder←GetFolderFromAlias2 projectFolder
- :EndIf
- 'No Cider config file found'Assert F.Exists projectFolder,'/cider.config'
- cfg←ReadProjectConfigFile projectFolder
- :If 0<≢nuGetFolder←⊃GetNuGetDependencyFolders cfg
-     nuGetFolder←{~'='∊2⊃⎕NPARTS ⍵:⍵ ⋄ ⊃{⍺,{⍵↑⍨¯1+⍵⍳'='}⍵}/⎕NPARTS ⍵}nuGetFolder
- :AndIf ⎕NEXISTS projectFolder,'/',nuGetFolder
- :AndIf 0<≢F.ListFiles projectFolder,'/',nuGetFolder,'/*.csproj'
-     r←↑NuGet.Packages projectFolder,'/',nuGetFolder
+ :If 0<≢NuGet←FindNuGetAPI''
+     :If IsAlias projectFolder
+         projectFolder←GetFolderFromAlias2 projectFolder
+     :EndIf
+     'No Cider config file found'Assert F.Exists projectFolder,'/cider.config'
+     cfg←ReadProjectConfigFile projectFolder
+     :If 0<≢nuGetFolder←⊃GetNuGetDependencyFolders cfg
+         nuGetFolder←{~'='∊2⊃⎕NPARTS ⍵:⍵ ⋄ ⊃{⍺,{⍵↑⍨¯1+⍵⍳'='}⍵}/⎕NPARTS ⍵}nuGetFolder
+     :AndIf ⎕NEXISTS projectFolder,'/',nuGetFolder
+     :AndIf 0<≢F.ListFiles projectFolder,'/',nuGetFolder,'/*.csproj'
+         r←↑NuGet.Packages projectFolder,'/',nuGetFolder
+     :EndIf
  :EndIf

APLSource/Cider/LoadNugetDependencies.aplf

@@ -14,7 +14,7 @@
  :If F.IsDir nuGetFolder
  :AndIf 0<≢list2←F.ListFiles nuGetFolder,'/*.csproj'
      p←verbose batch∘{⍺ PrintToSession ⍵}
-     NuGet←FindNuGetAPI ⍬
+ :AndIf 0<≢NuGet←FindNuGetAPI ⍬
      :If 2=⎕NC'ns'
          ns←⍎ns
      :EndIf

APLSource/Cider/Version.aplf

@@ -1,3 +1,3 @@
  r←Version
 ⍝ See als History
- r←'0.36.0+579'
+ r←'0.36.0+581'

TestData/Foo2-Project/packages/apl-buildlist.json

@@ -1 +1 @@
-{  packageID: [    "aplteam-APLTreeUtils2-1.2.0",  ],  principal: [    1,  ],  url: [    "https://tatin.dev/",  ],}
+{  packageID: [    "aplteam-APLTreeUtils2-1.2.0",  ],  principal: [    1,  ],  url: [    "https://tatin.dev/",  ],}

Tests/Test_Open_020/packages/apl-buildlist.json

@@ -1 +1 @@
-{  packageID: [    "aplteam-Tester2-3.1.3",    "aplteam-IniFiles-5.0.2",    "aplteam-APLTreeUtils2-1.1.1",  ],  principal: [    1,    0,    0,  ],  url: [    "https://tatin.dev/",    "https://tatin.dev/",    "https://tatin.dev/",  ],}
+{  packageID: [    "aplteam-Tester2-3.1.3",    "aplteam-IniFiles-5.0.2",    "aplteam-APLTreeUtils2-1.1.1",  ],  principal: [    1,    0,    0,  ],  url: [    "https://tatin.dev/",    "https://tatin.dev/",    "https://tatin.dev/",  ],}

Tests/Test_Open_021/packages/apl-buildlist.json

@@ -1 +1 @@
-{  packageID: [    "aplteam-Tester2-3.2.1",    "aplteam-IniFiles-5.0.2",    "aplteam-APLTreeUtils2-1.1.3",  ],  principal: [    1,    0,    0,  ],  url: [    "https://tatin.dev/",    "https://tatin.dev/",    "https://tatin.dev/",  ],}
+{  packageID: [    "aplteam-Tester2-3.2.1",    "aplteam-IniFiles-5.0.2",    "aplteam-APLTreeUtils2-1.1.3",  ],  principal: [    1,    0,    0,  ],  url: [    "https://tatin.dev/",    "https://tatin.dev/",    "https://tatin.dev/",  ],}

Tests/Test_Open_021/packages_dev/apl-buildlist.json

@@ -1 +1 @@
-{  packageID: [    "aplteam-CodeCoverage-0.7.3",  ],  principal: [    1,  ],  url: [    "https://tatin.dev/",  ],}
+{  packageID: [    "aplteam-CodeCoverage-0.7.3",  ],  principal: [    1,  ],  url: [    "https://tatin.dev/",  ],}

Tests/Test_Open_052/packages/apl-buildlist.json

@@ -1 +1 @@
-{  packageID: [    "aplteam-APLTreeUtils2-1.1.1",  ],  principal: [    1,  ],  url: [    "https://tatin.dev/",  ],}
+{  packageID: [    "aplteam-APLTreeUtils2-1.1.1",  ],  principal: [    1,  ],  url: [    "https://tatin.dev/",  ],}

Tests/Test_Open_052/packages_dev/apl-buildlist.json

@@ -1 +1 @@
-{  packageID: [    "aplteam-CodeCoverage-0.7.3",  ],  principal: [    1,  ],  url: [    "https://tatin.dev/",  ],}
+{  packageID: [    "aplteam-CodeCoverage-0.7.3",  ],  principal: [    1,  ],  url: [    "https://tatin.dev/",  ],}

Tests/Test_Tatin_003/packages_dev/apl-buildlist.json

@@ -1 +1 @@
-{  packageID: [    "aplteam-CodeCoverage-0.7.3",  ],  principal: [    1,  ],  url: [    "https://tatin.dev/",  ],}
+{  packageID: [    "aplteam-CodeCoverage-0.7.3",  ],  principal: [    1,  ],  url: [    "https://tatin.dev/",  ],}

Tests/Test_UC_020/packages/apl-buildlist.json

@@ -1 +1 @@
-{  packageID: [    "aplteam-APLTreeUtils2-1.1.1",  ],  principal: [    1,  ],  url: [    "https://tatin.dev/",  ],}
+{  packageID: [    "aplteam-APLTreeUtils2-1.1.1",  ],  principal: [    1,  ],  url: [    "https://tatin.dev/",  ],}

Tests/Test_UC_020/packages_dev/apl-buildlist.json

@@ -1 +1 @@
-{  packageID: [    "aplteam-CodeCoverage-0.7.3",  ],  principal: [    1,  ],  url: [    "https://tatin.dev/",  ],}
+{  packageID: [    "aplteam-CodeCoverage-0.7.3",  ],  principal: [    1,  ],  url: [    "https://tatin.dev/",  ],}

Tests/Test_UC_021/packages/apl-buildlist.json

@@ -1 +1 @@
-{  packageID: [    "aplteam-APLTreeUtils2-1.1.1",  ],  principal: [    1,  ],  url: [    "https://tatin.dev/",  ],}
+{  packageID: [    "aplteam-APLTreeUtils2-1.1.1",  ],  principal: [    1,  ],  url: [    "https://tatin.dev/",  ],}

Tests/Test_UC_021/packages_dev/apl-buildlist.json

@@ -1 +1 @@
-{  packageID: [    "aplteam-CodeCoverage-0.7.3",  ],  principal: [    1,  ],  url: [    "https://tatin.dev/",  ],}
+{  packageID: [    "aplteam-CodeCoverage-0.7.3",  ],  principal: [    1,  ],  url: [    "https://tatin.dev/",  ],}

Tests/Test_UC_022/packages/apl-buildlist.json

@@ -1 +1 @@
-{  packageID: [    "aplteam-APLTreeUtils2-1.1.1",  ],  principal: [    1,  ],  url: [    "https://tatin.dev/",  ],}
+{  packageID: [    "aplteam-APLTreeUtils2-1.1.1",  ],  principal: [    1,  ],  url: [    "https://tatin.dev/",  ],}

Tests/Test_UC_022/packages_dev/apl-buildlist.json

@@ -1 +1 @@
-{  packageID: [    "aplteam-CodeCoverage-0.7.3",  ],  principal: [    1,  ],  url: [    "https://tatin.dev/",  ],}
+{  packageID: [    "aplteam-CodeCoverage-0.7.3",  ],  principal: [    1,  ],  url: [    "https://tatin.dev/",  ],}

apl-package.json

@@ -19,5 +19,5 @@
   source: "APLSource/Cider/",
   tags: "project-management",
   userCommandScript: "APLSource/Cider_UC.dyalog",
-  version: "0.36.0+579",
+  version: "0.36.0+581",
 }

tatin-packages_dev/apl-buildlist.json

@@ -1 +1 @@
-{  packageID: [    "aplteam-Tester2-3.5.0",    "aplteam-MakeHelpers-0.10.1",    "aplteam-FilesAndDirs-5.5.0",    "aplteam-CommTools-1.7.0",    "aplteam-CodeCoverage-0.10.3",    "aplteam-APLTreeUtils2-1.2.0",    "aplteam-ZipArchive-1.1.0",    "aplteam-OS-3.1.1",    "aplteam-MarkAPL-11.1.0",    "aplteam-IniFiles-5.0.3",    "aplteam-DotNetZip-2.0.2",  ],  principal: [    1,    1,    1,    1,    1,    1,    0,    0,    0,    0,    0,  ],  url: [    "https://tatin.dev/",    "https://tatin.dev/",    "https://tatin.dev/",    "https://tatin.dev/",    "https://tatin.dev/",    "https://tatin.dev/",    "https://tatin.dev/",    "https://tatin.dev/",    "https://tatin.dev/",    "https://tatin.dev/",    "https://tatin.dev/",  ],}
+{  packageID: [    "aplteam-Tester2-3.5.0",    "aplteam-MakeHelpers-0.10.1",    "aplteam-FilesAndDirs-5.5.0",    "aplteam-CommTools-1.7.0",    "aplteam-CodeCoverage-0.10.3",    "aplteam-APLTreeUtils2-1.2.0",    "aplteam-ZipArchive-1.1.0",    "aplteam-OS-3.1.1",    "aplteam-MarkAPL-11.1.0",    "aplteam-IniFiles-5.0.3",    "aplteam-DotNetZip-2.0.2",  ],  principal: [    1,    1,    1,    1,    1,    1,    0,    0,    0,    0,    0,  ],  url: [    "https://tatin.dev/",    "https://tatin.dev/",    "https://tatin.dev/",    "https://tatin.dev/",    "https://tatin.dev/",    "https://tatin.dev/",    "https://tatin.dev/",    "https://tatin.dev/",    "https://tatin.dev/",    "https://tatin.dev/",    "https://tatin.dev/",  ],}