Skip to content

Commit 49a01f5

Browse files
committed
NuGet tests fixed
1 parent 33d6a20 commit 49a01f5

File tree

106 files changed

+152
-186
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+152
-186
lines changed

APLSource/.linkconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{ LinkVersion: { ID: "4.1.5"}, SourceFlags: [ { Name: "Cider.CheckForGit", Stop: [ 5, ], }, ],}
1+
{ LinkVersion: { ID: "4.1.5"}, SourceFlags: [ { Name: "Cider.CheckForGit", Stop: [ 5, ], }, ],}

APLSource/Cider/History.apla

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
(
2-
'* 0.48.2 ⋄ 2025-06-30'
2+
'* 0.48.2 ⋄ 2025-07-12'
33
' * A rename operation in Tatin required a change in Cider''s `InjectTatinVars` function'
44
'* 0.48.1 ⋄ 2025-06-26'
55
' * Reference added to all help pages regarding the full documentation'

APLSource/Cider/InjectTatinVars.aplf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
ref←⎕NULL
1515
:If ⎕NEXISTS folder,'/',⎕SE._Tatin.Registry.CFG_Name
1616

17-
⍝ With Tatin 120.1 "ReadPackageConfigFile" was renamed to "GetPackageConfigFileAsNS"
17+
⍝ With Tatin 121.0 "ReadPackageConfigFile" was renamed to "GetPackageConfigFileAsNS"
1818
⍝ For compatability we make sure that Cider works with both versions:
1919
:If 3=⎕SE._Tatin.Registry.⎕NC'ReadPackageConfigFile'
2020
cfg←⎕SE._Tatin.Registry.ReadPackageConfigFile folder

APLSource/Cider/OpenProject.aplf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
parms←CreateOpenParms y
2121
:EndIf
2222
'"folder" must be specified'Assert 0<parms.⎕NC'folder'
23+
parms.folder←F.EnforceSlash parms.folder
2324
'"folder" must be specified'Assert 0<≢parms.folder
2425
'"projectSpace" must be specified'Assert 0<parms.⎕NC'projectSpace'
2526
'"watch" must be one of: ns|dir|both'Assert(⊂⎕C parms.watch)∊'ns' 'dir' 'both' 'none' 0

APLSource/TestCases/Cleanup.aplf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77
⎕SE.Cider.DEVELOPMENT←∆QSE_CIDER_DEVELOPMENT
88
⎕←'Restored: ⎕SE.Cider.DEVELOPMENT←',⍕∆QSE_CIDER_DEVELOPMENT
99
:EndIf
10-
⎕EX'∆IsDotNetAvailable'
10+
⎕EX'∆DotNetIsAvailable'
1111
⍝Done

APLSource/TestCases/Initial.aplf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
Initial ps
22
∆LINK_NOTIFY_WAS←⎕SE.Link.NOTIFY
3-
∆IsDotNetAvailable←IsDotNetAvailable
43
⎕SE.Link.NOTIFY←1
54
:If 0<⎕SE.Cider.⎕NC'DEVELOPMENT'
65
∆QSE_CIDER_DEVELOPMENT←⎕SE.Cider.DEVELOPMENT
Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,9 @@
11
r←{x}Initial_NuGet ps;info;rc;netcore
22
r←1
3-
:If netcore←∆IsDotNetAvailable
4-
:If (,1)≡,APLTreeUtils2.ToNum 2 ⎕NQ #'GetEnvironment' 'DYALOG_NETCORE'
5-
rc←2250⌶0
6-
:Select ⊃⊃rc
7-
:Case ¯1
8-
r←0
9-
info←'.NET interface is not supported.'
10-
:Case 0
11-
r←0
12-
info←'.NET interface is not configured.'
13-
:Case 2
14-
r←0
15-
info←'The .NET interface is configured to use .NET Framework - incompatible with NuGet.'
16-
:Else
17-
info←''
18-
:EndSelect
19-
:If 0=2⊃rc
20-
r←0
21-
info←'Could not load the .NET bridge interface.'
22-
:EndIf
23-
:EndIf
24-
:Else
25-
info←'.NET is not available, therefore the NuGet tests cannot be executed.'
26-
:EndIf
3+
∆DotNetIsAvailable←netcore←IsDotNetAvailable
274
:If 0=netcore
285
:AndIf ~ps.batchFlag
296
:AndIf 0<≢info
307
CommTools.Pause info,(⎕UCS 13),'Therefore the NuGet tests cannot be executed.'
318
r←0
329
:EndIf
33-
⍝Done

APLSource/TestCases/IsDotNetAvailable.aplf

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1-
r←IsDotNetAvailable;res;parms;I
1+
r←IsDotNetAvailable;res;parms;I;debug
22
⍝ Checks whether .NET (rather than .NET framework) is available at all.
33
⍝ We cannot do this in the current APL session on Windows because that might use .NET Framework but
44
⍝ .NET might still be available, so we start a process which will exit with 125 for "yes", 126 for "no"
55
⍝ and "123" for "error".
66
:If 'Win'≡APLTreeUtils2.GetOperatingSystem ⍬
7-
:If 0=r←1 1≡2↑2250⌶0 ⍝ The current APL ight already be configured for .NET
8-
parms←∆NuGetTestProcessParms ⍬ ⍬
7+
:If 0=r←1 1≡2↑2250⌶0 ⍝ The current APL might already be configured for .NET, so we know already
8+
debug←0
9+
parms←debug ∆NuGetTestProcessParms ⍬ ⍬
910
I←⎕NEW APLProcess(,⊂parms)
11+
'Something is wrong!'Assert I.ExitCode∊125 126
1012
r←125=I.ExitCode
1113
:EndIf
1214
:Else

APLSource/TestCases/Test_AddTatinDep_001.aplf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
config.CIDER.dependencies.tatin←'tatin-packages'
1414
config ##.Cider.Put_JSON5 configfile
1515

16-
##.Cider.C.YesOrNo_Answers←1 2⍴'ChangeCurrentDir@' 'n'
16+
##.Cider.C.AddAutomation'YesOrNo' 'ChangeCurrentDir@' 'n'
1717
parms←##.Cider.CreateOpenParms''
1818
parms.folder←tempDir
1919
parms.batch←1

APLSource/TestCases/Test_AddTatinDep_002.aplf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
config.CIDER.dependencies.tatin←'tatin-packages'
1414
config ##.Cider.Put_JSON5 configfile
1515

16-
##.Cider.C.YesOrNo_Answers←1 2⍴'ChangeCurrentDir@' 'n'
16+
##.Cider.C.AddAutomation'YesOrNo' 'ChangeCurrentDir@' 'n'
1717
parms←##.Cider.CreateOpenParms''
1818
parms.folder←tempDir
1919
parms.batch←1

0 commit comments

Comments
 (0)