Skip to content

Commit c6686c7

Browse files
satbaisatbai
authored
Update getFeeds with 'includeUrls=false' and make picklist editable (#14023)
* Update get feeds call to not include urls and change picklist to be editable * update versions to reflect m179
1 parent fd7f7d3 commit c6686c7

File tree

6 files changed

+44
-26
lines changed

6 files changed

+44
-26
lines changed

‎Tasks/DotNetCoreCLIV2/task.json‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"version": {
1919
"Major": 2,
2020
"Minor": 179,
21-
"Patch": 1
21+
"Patch": 2
2222
},
2323
"minimumAgentVersion": "2.115.0",
2424
"instanceNameFormat": "dotnet $(command)",
@@ -309,7 +309,10 @@
309309
"defaultValue": "",
310310
"required": true,
311311
"helpMarkDown": "Select a feed hosted in this organization. You must have Azure Artifacts installed and licensed to select a feed here.",
312-
"visibleRule": "command = push && nuGetFeedType = internal"
312+
"visibleRule": "command = push && nuGetFeedType = internal",
313+
"properties": {
314+
"EditableOptions": "True"
315+
}
313316
},
314317
{
315318
"name": "publishPackageMetadata",
@@ -498,14 +501,14 @@
498501
{
499502
"target": "feedRestore",
500503
"endpointId": "tfs:feed",
501-
"endpointUrl": "{{endpoint.url}}/_apis/packaging/feeds",
504+
"endpointUrl": "{{endpoint.url}}/_apis/packaging/feeds?includeUrls=False",
502505
"resultSelector": "jsonpath:$.value[*]",
503506
"resultTemplate": "{ \"Value\" : \"{{#if project}}{{{project.id}}}\\/{{/if}}{{{id}}}\", \"DisplayValue\" : \"{{{name}}}\" }"
504507
},
505508
{
506509
"target": "feedPublish",
507510
"endpointId": "tfs:feed",
508-
"endpointUrl": "{{endpoint.url}}/_apis/packaging/feeds",
511+
"endpointUrl": "{{endpoint.url}}/_apis/packaging/feeds?includeUrls=False",
509512
"resultSelector": "jsonpath:$.value[*]",
510513
"resultTemplate": "{ \"Value\" : \"{{#if project}}{{{project.id}}}\\/{{/if}}{{{id}}}\", \"DisplayValue\" : \"{{{name}}}\" }"
511514
}

‎Tasks/DotNetCoreCLIV2/task.loc.json‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"version": {
1919
"Major": 2,
2020
"Minor": 179,
21-
"Patch": 1
21+
"Patch": 2
2222
},
2323
"minimumAgentVersion": "2.115.0",
2424
"instanceNameFormat": "ms-resource:loc.instanceNameFormat",
@@ -309,7 +309,10 @@
309309
"defaultValue": "",
310310
"required": true,
311311
"helpMarkDown": "ms-resource:loc.input.help.feedPublish",
312-
"visibleRule": "command = push && nuGetFeedType = internal"
312+
"visibleRule": "command = push && nuGetFeedType = internal",
313+
"properties": {
314+
"EditableOptions": "True"
315+
}
313316
},
314317
{
315318
"name": "publishPackageMetadata",
@@ -498,14 +501,14 @@
498501
{
499502
"target": "feedRestore",
500503
"endpointId": "tfs:feed",
501-
"endpointUrl": "{{endpoint.url}}/_apis/packaging/feeds",
504+
"endpointUrl": "{{endpoint.url}}/_apis/packaging/feeds?includeUrls=False",
502505
"resultSelector": "jsonpath:$.value[*]",
503506
"resultTemplate": "{ \"Value\" : \"{{#if project}}{{{project.id}}}\\/{{/if}}{{{id}}}\", \"DisplayValue\" : \"{{{name}}}\" }"
504507
},
505508
{
506509
"target": "feedPublish",
507510
"endpointId": "tfs:feed",
508-
"endpointUrl": "{{endpoint.url}}/_apis/packaging/feeds",
511+
"endpointUrl": "{{endpoint.url}}/_apis/packaging/feeds?includeUrls=False",
509512
"resultSelector": "jsonpath:$.value[*]",
510513
"resultTemplate": "{ \"Value\" : \"{{#if project}}{{{project.id}}}\\/{{/if}}{{{id}}}\", \"DisplayValue\" : \"{{{name}}}\" }"
511514
}

‎Tasks/NpmV1/task.json‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"version": {
1111
"Major": 1,
1212
"Minor": 179,
13-
"Patch": 0
13+
"Patch": 1
1414
},
1515
"runsOn": [
1616
"Agent",
@@ -96,7 +96,10 @@
9696
"helpMarkDown": "Include the selected feed in the generated .npmrc.",
9797
"type": "pickList",
9898
"visibleRule": "customRegistry = useFeed",
99-
"required": true
99+
"required": true,
100+
"properties": {
101+
"EditableOptions": "True"
102+
}
100103
},
101104
{
102105
"groupName": "customRegistries",
@@ -128,7 +131,10 @@
128131
"helpMarkDown": "Select a registry hosted in this account. You must have Azure Artifacts installed and licensed to select a registry here.",
129132
"type": "pickList",
130133
"visibleRule": "publishRegistry = useFeed",
131-
"required": true
134+
"required": true,
135+
"properties": {
136+
"EditableOptions": "True"
137+
}
132138
},
133139
{
134140
"name": "publishPackageMetadata",
@@ -153,14 +159,14 @@
153159
{
154160
"target": "customFeed",
155161
"endpointId": "tfs:feed",
156-
"endpointUrl": "{{endpoint.url}}/_apis/packaging/feeds",
162+
"endpointUrl": "{{endpoint.url}}/_apis/packaging/feeds?includeUrls=False",
157163
"resultSelector": "jsonpath:$.value[*]",
158164
"resultTemplate": "{ \"Value\" : \"{{#if project}}{{{project.id}}}\\/{{/if}}{{{id}}}\", \"DisplayValue\" : \"{{{name}}}\" }"
159165
},
160166
{
161167
"target": "publishFeed",
162168
"endpointId": "tfs:feed",
163-
"endpointUrl": "{{endpoint.url}}/_apis/packaging/feeds",
169+
"endpointUrl": "{{endpoint.url}}/_apis/packaging/feeds?includeUrls=False",
164170
"resultSelector": "jsonpath:$.value[*]",
165171
"resultTemplate": "{ \"Value\" : \"{{#if project}}{{{project.id}}}\\/{{/if}}{{{id}}}\", \"DisplayValue\" : \"{{{name}}}\" }"
166172
}

‎Tasks/NpmV1/task.loc.json‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"version": {
1111
"Major": 1,
1212
"Minor": 179,
13-
"Patch": 0
13+
"Patch": 1
1414
},
1515
"runsOn": [
1616
"Agent",
@@ -96,7 +96,10 @@
9696
"helpMarkDown": "ms-resource:loc.input.help.customFeed",
9797
"type": "pickList",
9898
"visibleRule": "customRegistry = useFeed",
99-
"required": true
99+
"required": true,
100+
"properties": {
101+
"EditableOptions": "True"
102+
}
100103
},
101104
{
102105
"groupName": "customRegistries",
@@ -128,7 +131,10 @@
128131
"helpMarkDown": "ms-resource:loc.input.help.publishFeed",
129132
"type": "pickList",
130133
"visibleRule": "publishRegistry = useFeed",
131-
"required": true
134+
"required": true,
135+
"properties": {
136+
"EditableOptions": "True"
137+
}
132138
},
133139
{
134140
"name": "publishPackageMetadata",
@@ -153,14 +159,14 @@
153159
{
154160
"target": "customFeed",
155161
"endpointId": "tfs:feed",
156-
"endpointUrl": "{{endpoint.url}}/_apis/packaging/feeds",
162+
"endpointUrl": "{{endpoint.url}}/_apis/packaging/feeds?includeUrls=False",
157163
"resultSelector": "jsonpath:$.value[*]",
158164
"resultTemplate": "{ \"Value\" : \"{{#if project}}{{{project.id}}}\\/{{/if}}{{{id}}}\", \"DisplayValue\" : \"{{{name}}}\" }"
159165
},
160166
{
161167
"target": "publishFeed",
162168
"endpointId": "tfs:feed",
163-
"endpointUrl": "{{endpoint.url}}/_apis/packaging/feeds",
169+
"endpointUrl": "{{endpoint.url}}/_apis/packaging/feeds?includeUrls=False",
164170
"resultSelector": "jsonpath:$.value[*]",
165171
"resultTemplate": "{ \"Value\" : \"{{#if project}}{{{project.id}}}\\/{{/if}}{{{id}}}\", \"DisplayValue\" : \"{{{name}}}\" }"
166172
}
@@ -197,4 +203,4 @@
197203
"WorkingDirectoryNotDirectory": "ms-resource:loc.messages.WorkingDirectoryNotDirectory",
198204
"NGCommon_AreaNotFoundInSps": "ms-resource:loc.messages.NGCommon_AreaNotFoundInSps"
199205
}
200-
}
206+
}

‎Tasks/UniversalPackagesV0/task.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"version": {
1111
"Major": 0,
1212
"Minor": 179,
13-
"Patch": 0
13+
"Patch": 1
1414
},
1515
"runsOn": [
1616
"Agent",
@@ -364,7 +364,7 @@
364364
{
365365
"target": "feedListDownload",
366366
"endpointId": "tfs:feed",
367-
"endpointUrl": "{{endpoint.url}}/_apis/packaging/feeds",
367+
"endpointUrl": "{{endpoint.url}}/_apis/packaging/feeds?includeUrls=False",
368368
"resultSelector": "jsonpath:$.value[*]",
369369
"resultTemplate": "{ \"Value\" : \"{{#if project}}{{{project.id}}}\\/{{/if}}{{{id}}}\", \"DisplayValue\" : \"{{{name}}}\" }"
370370
},
@@ -392,7 +392,7 @@
392392
{
393393
"target": "feedListPublish",
394394
"endpointId": "tfs:feed",
395-
"endpointUrl": "{{endpoint.url}}/_apis/packaging/feeds",
395+
"endpointUrl": "{{endpoint.url}}/_apis/packaging/feeds?includeUrls=False",
396396
"resultSelector": "jsonpath:$.value[*]",
397397
"resultTemplate": "{ \"Value\" : \"{{#if project}}{{{project.id}}}\\/{{/if}}{{{id}}}\", \"DisplayValue\" : \"{{{name}}}\" }"
398398
},

‎Tasks/UniversalPackagesV0/task.loc.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"version": {
1111
"Major": 0,
1212
"Minor": 179,
13-
"Patch": 0
13+
"Patch": 1
1414
},
1515
"runsOn": [
1616
"Agent",
@@ -364,7 +364,7 @@
364364
{
365365
"target": "feedListDownload",
366366
"endpointId": "tfs:feed",
367-
"endpointUrl": "{{endpoint.url}}/_apis/packaging/feeds",
367+
"endpointUrl": "{{endpoint.url}}/_apis/packaging/feeds?includeUrls=False",
368368
"resultSelector": "jsonpath:$.value[*]",
369369
"resultTemplate": "{ \"Value\" : \"{{#if project}}{{{project.id}}}\\/{{/if}}{{{id}}}\", \"DisplayValue\" : \"{{{name}}}\" }"
370370
},
@@ -392,7 +392,7 @@
392392
{
393393
"target": "feedListPublish",
394394
"endpointId": "tfs:feed",
395-
"endpointUrl": "{{endpoint.url}}/_apis/packaging/feeds",
395+
"endpointUrl": "{{endpoint.url}}/_apis/packaging/feeds?includeUrls=False",
396396
"resultSelector": "jsonpath:$.value[*]",
397397
"resultTemplate": "{ \"Value\" : \"{{#if project}}{{{project.id}}}\\/{{/if}}{{{id}}}\", \"DisplayValue\" : \"{{{name}}}\" }"
398398
},
@@ -452,4 +452,4 @@
452452
"Error_UniversalPackagesNotSupportedOnPrem": "ms-resource:loc.messages.Error_UniversalPackagesNotSupportedOnPrem",
453453
"Error_ProcessorArchitectureNotSupported": "ms-resource:loc.messages.Error_ProcessorArchitectureNotSupported"
454454
}
455-
}
455+
}

0 commit comments

Comments
 (0)