Skip to content

Commit 5b052eb

Browse files
DenisNikulin5DenisNikulin5
authored
Merge branch 'master' into users/v-denikulin/customer-issue-for-script-tasks
2 parents f550930 + 60a19ae commit 5b052eb

File tree

17 files changed

+73
-73
lines changed

17 files changed

+73
-73
lines changed

‎Tasks/DotNetCoreCLIV2/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ The only prerequisite for the task is that .NET Core must be installed on Azure
1616

1717
* **Command\*:** The task can be use to run any [dotnet core command](https://docs.microsoft.com/en-us/dotnet/core/tools/?tabs=netcore2x).
1818

19-
* **Projects\*:** Depending on the version of .NET Core, the task can work with either project.json or a csproj file. You can pass a relative path of the .csproj file(s) from repo root. Wildcards can be used too. For example, **/*.csproj for all .csproj files in all the sub folders.
19+
* **Projects\*:** Depending on the version of .NET Core, the task can work with either project.json or a csproj and sln file. You can pass a relative path of the .csproj file(s) from repo root. Wildcards can be used too. For example, **/*.csproj for all .csproj files in all the sub folders.
2020

2121
* **Arguments\:** Pass arguments to the selected dotnet core command. For example, build configuration, output folder, runtime. The arguments depend on the command selected.
2222

‎Tasks/DotNetCoreCLIV2/Strings/resources.resjson/en-US/resources.resjson

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
"loc.input.help.command": "The dotnet command to run. Select 'Custom' to add arguments or use a command not listed here.",
1515
"loc.input.label.publishWebProjects": "Publish web projects",
1616
"loc.input.help.publishWebProjects": "If true, the task will try to find the web projects in the repository and run the publish command on them. Web projects are identified by presence of either a web.config file or wwwroot folder in the directory.",
17-
"loc.input.label.projects": "Path to project(s)",
18-
"loc.input.help.projects": "The path to the csproj file(s) to use. You can use wildcards (e.g. **/*.csproj for all .csproj files in all subfolders). **This field follows glob pattern, and is run against root of the repository at all times irrespective of Working Directory.**",
17+
"loc.input.label.projects": "Path to project(s) or solution(s)",
18+
"loc.input.help.projects": "The path to the csproj or sln file(s) to use. You can use wildcards (e.g. **/*.csproj for all .csproj files in all subfolders). **This field follows glob pattern, and is run against root of the repository at all times irrespective of Working Directory.**",
1919
"loc.input.label.custom": "Custom command",
2020
"loc.input.help.custom": "The command to pass to dotnet.exe for execution.",
2121
"loc.input.label.arguments": "Arguments",

‎Tasks/DotNetCoreCLIV2/_buildConfigs/Node20/package-lock.json

+15-15
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Tasks/DotNetCoreCLIV2/package-lock.json

+6-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Tasks/DotNetCoreCLIV2/task.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"demands": [],
1818
"version": {
1919
"Major": 2,
20-
"Minor": 232,
20+
"Minor": 235,
2121
"Patch": 0
2222
},
2323
"minimumAgentVersion": "2.144.0",
@@ -100,11 +100,11 @@
100100
{
101101
"name": "projects",
102102
"type": "multiLine",
103-
"label": "Path to project(s)",
103+
"label": "Path to project(s) or solution(s)",
104104
"defaultValue": "",
105105
"visibleRule": "command = build || command = restore || command = run || command = test || command = custom || publishWebProjects = false",
106106
"required": false,
107-
"helpMarkDown": "The path to the csproj file(s) to use. You can use wildcards (e.g. **/*.csproj for all .csproj files in all subfolders). **This field follows glob pattern, and is run against root of the repository at all times irrespective of Working Directory.**"
107+
"helpMarkDown": "The path to the csproj or sln file(s) to use. You can use wildcards (e.g. **/*.csproj for all .csproj files in all subfolders). **This field follows glob pattern, and is run against root of the repository at all times irrespective of Working Directory.**"
108108
},
109109
{
110110
"name": "custom",

‎Tasks/DotNetCoreCLIV2/task.loc.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"demands": [],
1818
"version": {
1919
"Major": 2,
20-
"Minor": 232,
20+
"Minor": 235,
2121
"Patch": 0
2222
},
2323
"minimumAgentVersion": "2.144.0",

‎_generated/DotNetCoreCLIV2.versionmap.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Default|2.232.0
2-
Node20_229_2|2.232.1
1+
Default|2.235.0
2+
Node20_229_2|2.235.1

‎_generated/DotNetCoreCLIV2/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ The only prerequisite for the task is that .NET Core must be installed on Azure
1616

1717
* **Command\*:** The task can be use to run any [dotnet core command](https://docs.microsoft.com/en-us/dotnet/core/tools/?tabs=netcore2x).
1818

19-
* **Projects\*:** Depending on the version of .NET Core, the task can work with either project.json or a csproj file. You can pass a relative path of the .csproj file(s) from repo root. Wildcards can be used too. For example, **/*.csproj for all .csproj files in all the sub folders.
19+
* **Projects\*:** Depending on the version of .NET Core, the task can work with either project.json or a csproj and sln file. You can pass a relative path of the .csproj file(s) from repo root. Wildcards can be used too. For example, **/*.csproj for all .csproj files in all the sub folders.
2020

2121
* **Arguments\:** Pass arguments to the selected dotnet core command. For example, build configuration, output folder, runtime. The arguments depend on the command selected.
2222

‎_generated/DotNetCoreCLIV2/Strings/resources.resjson/en-US/resources.resjson

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
"loc.input.help.command": "The dotnet command to run. Select 'Custom' to add arguments or use a command not listed here.",
1515
"loc.input.label.publishWebProjects": "Publish web projects",
1616
"loc.input.help.publishWebProjects": "If true, the task will try to find the web projects in the repository and run the publish command on them. Web projects are identified by presence of either a web.config file or wwwroot folder in the directory.",
17-
"loc.input.label.projects": "Path to project(s)",
18-
"loc.input.help.projects": "The path to the csproj file(s) to use. You can use wildcards (e.g. **/*.csproj for all .csproj files in all subfolders). **This field follows glob pattern, and is run against root of the repository at all times irrespective of Working Directory.**",
17+
"loc.input.label.projects": "Path to project(s) or solution(s)",
18+
"loc.input.help.projects": "The path to the csproj or sln file(s) to use. You can use wildcards (e.g. **/*.csproj for all .csproj files in all subfolders). **This field follows glob pattern, and is run against root of the repository at all times irrespective of Working Directory.**",
1919
"loc.input.label.custom": "Custom command",
2020
"loc.input.help.custom": "The command to pass to dotnet.exe for execution.",
2121
"loc.input.label.arguments": "Arguments",

‎_generated/DotNetCoreCLIV2/package-lock.json

+6-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎_generated/DotNetCoreCLIV2/task.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"demands": [],
1818
"version": {
1919
"Major": 2,
20-
"Minor": 232,
20+
"Minor": 235,
2121
"Patch": 0
2222
},
2323
"minimumAgentVersion": "2.144.0",
@@ -100,11 +100,11 @@
100100
{
101101
"name": "projects",
102102
"type": "multiLine",
103-
"label": "Path to project(s)",
103+
"label": "Path to project(s) or solution(s)",
104104
"defaultValue": "",
105105
"visibleRule": "command = build || command = restore || command = run || command = test || command = custom || publishWebProjects = false",
106106
"required": false,
107-
"helpMarkDown": "The path to the csproj file(s) to use. You can use wildcards (e.g. **/*.csproj for all .csproj files in all subfolders). **This field follows glob pattern, and is run against root of the repository at all times irrespective of Working Directory.**"
107+
"helpMarkDown": "The path to the csproj or sln file(s) to use. You can use wildcards (e.g. **/*.csproj for all .csproj files in all subfolders). **This field follows glob pattern, and is run against root of the repository at all times irrespective of Working Directory.**"
108108
},
109109
{
110110
"name": "custom",
@@ -582,7 +582,7 @@
582582
"Error_IncludeNuGetOrgEnabled": "Packages failed to restore. Edit your build task and set 'includeNuGetOrg' to 'false' or deselect 'Use packages from NuGet.org'."
583583
},
584584
"_buildConfigMapping": {
585-
"Default": "2.232.0",
586-
"Node20_229_2": "2.232.1"
585+
"Default": "2.235.0",
586+
"Node20_229_2": "2.235.1"
587587
}
588588
}

‎_generated/DotNetCoreCLIV2/task.loc.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"demands": [],
1818
"version": {
1919
"Major": 2,
20-
"Minor": 232,
20+
"Minor": 235,
2121
"Patch": 0
2222
},
2323
"minimumAgentVersion": "2.144.0",
@@ -582,7 +582,7 @@
582582
"Error_IncludeNuGetOrgEnabled": "ms-resource:loc.messages.Error_IncludeNuGetOrgEnabled"
583583
},
584584
"_buildConfigMapping": {
585-
"Default": "2.232.0",
586-
"Node20_229_2": "2.232.1"
585+
"Default": "2.235.0",
586+
"Node20_229_2": "2.235.1"
587587
}
588588
}

‎_generated/DotNetCoreCLIV2_Node20/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ The only prerequisite for the task is that .NET Core must be installed on Azure
1616

1717
* **Command\*:** The task can be use to run any [dotnet core command](https://docs.microsoft.com/en-us/dotnet/core/tools/?tabs=netcore2x).
1818

19-
* **Projects\*:** Depending on the version of .NET Core, the task can work with either project.json or a csproj file. You can pass a relative path of the .csproj file(s) from repo root. Wildcards can be used too. For example, **/*.csproj for all .csproj files in all the sub folders.
19+
* **Projects\*:** Depending on the version of .NET Core, the task can work with either project.json or a csproj and sln file. You can pass a relative path of the .csproj file(s) from repo root. Wildcards can be used too. For example, **/*.csproj for all .csproj files in all the sub folders.
2020

2121
* **Arguments\:** Pass arguments to the selected dotnet core command. For example, build configuration, output folder, runtime. The arguments depend on the command selected.
2222

‎_generated/DotNetCoreCLIV2_Node20/Strings/resources.resjson/en-US/resources.resjson

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
"loc.input.help.command": "The dotnet command to run. Select 'Custom' to add arguments or use a command not listed here.",
1515
"loc.input.label.publishWebProjects": "Publish web projects",
1616
"loc.input.help.publishWebProjects": "If true, the task will try to find the web projects in the repository and run the publish command on them. Web projects are identified by presence of either a web.config file or wwwroot folder in the directory.",
17-
"loc.input.label.projects": "Path to project(s)",
18-
"loc.input.help.projects": "The path to the csproj file(s) to use. You can use wildcards (e.g. **/*.csproj for all .csproj files in all subfolders). **This field follows glob pattern, and is run against root of the repository at all times irrespective of Working Directory.**",
17+
"loc.input.label.projects": "Path to project(s) or solution(s)",
18+
"loc.input.help.projects": "The path to the csproj or sln file(s) to use. You can use wildcards (e.g. **/*.csproj for all .csproj files in all subfolders). **This field follows glob pattern, and is run against root of the repository at all times irrespective of Working Directory.**",
1919
"loc.input.label.custom": "Custom command",
2020
"loc.input.help.custom": "The command to pass to dotnet.exe for execution.",
2121
"loc.input.label.arguments": "Arguments",

0 commit comments

Comments
 (0)