Bug fixes in AddTatinDependencies and UpdatePackages

Author: aplteam

APLSource/Cider/AddAlias.aplf

@@ -17,7 +17,7 @@
          :If 0=+/(alias,'=')∘{⍺≡(≢⍺)↑⍵}¨data
              ind←({⍵↓⍨⍵⍳'='}¨data)⍳⊂folder
              :If ind≤≢data
-                 DropAlias{⍵↑⍨¯1+⍵⍳'='}ind⊃data
+                 DropAliasRemoveTargetDefinition ind⊃data
                  data←⊃F.NGET ciderAliasFilename 1
              :EndIf
              (⊂data,⊂(⎕C alias),'=',folder)F.NPUT ciderAliasFilename 1

APLSource/Cider/AddTatinDependencies.aplf

@@ -10,6 +10,6 @@
  :Else
      ref←cfg.CIDER.dependencies
  :EndIf
- targetFolder←projectFolder,'/',{⍵↑⍨¯1+⍵⍳'='}ref.tatin
+ targetFolder←projectFolder,'/',RemoveTargetDefinition ref.tatin
  r←⎕SE.Tatin.InstallPackages packageIDs targetFolder
 ⍝Done

APLSource/Cider/ListNuGetDependencies.aplf

@@ -7,7 +7,7 @@
      '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
+         nuGetFolder←{~'='∊2⊃⎕NPARTS ⍵:⍵ ⋄ ⊃{⍺,RemoveTargetDefinition ⍵}/⎕NPARTS ⍵}nuGetFolder
          folder←projectFolder,'/',nuGetFolder
      :AndIf ⎕NEXISTS folder
      :AndIf 0<≢F.ListFiles folder,'/*.csproj'

APLSource/Cider/ListTatinDependencies.aplf

@@ -10,7 +10,7 @@
  cfg←ReadProjectConfigFile cfgFilename
  tatinFolders←GetTatinDependencyFolders cfg
  :If 0<≢tatinFolders
-     tatinFolders←{⍵↑⍨¯1+⍵⍳'='}¨tatinFolders
+     tatinFolders←RemoveTargetDefinition¨tatinFolders
      buildFolders←(⊂projectFolder,'/'),¨tatinFolders
      buildFilenames←buildFolders,¨⊂'/apl-buildlist.json'
      b←F.Exists¨buildFilenames

APLSource/Cider/RemoveTargetDefinition.aplf

@@ -0,0 +1,4 @@
+ path←RemoveTargetDefinition def
+ ⍝ 'C:\Path\2\project' ← RemoveTargetDefinition 'C:\Path\2\project'
+ ⍝ 'C:\Path\2\project' ← RemoveTargetDefinition 'C:\Path\2\project=TestCases'
+ path←{⍵↑⍨¯1+⍵⍳'='}def

APLSource/Cider/UpdatePackages.aplf

@@ -8,7 +8,7 @@
  :For i :In ⍳≢reports
      report←i⊃reports
      :If 0<≢report
-         folder←{⍵↑⍨¯1+⍵⍳'='}i⊃folders
+         folder←RemoveTargetDefinition i⊃folders
          1 parms.batch p'Later versions in <',(AddSlash folder),'> :'
          1 parms.batch p ⎕FMT↑{(1⊃⍵),' ==> ',(2⊃⍵)}¨↓report
          :If ~updateFlag←2≡parms.checkPackageVersions