Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rearrange MSBuild/VSBuild inputs #4213

Merged
merged 1 commit into from
May 3, 2017
Merged

Rearrange MSBuild/VSBuild inputs #4213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions Tasks/MSBuild/Strings/resources.resjson/en-US/resources.resjson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,13 @@
"loc.group.displayName.advanced": "Advanced",
"loc.input.label.solution": "Project",
"loc.input.help.solution": "Relative path from repo root of the project(s) or solution(s) to run. Wildcards can be used. For example, `**/*.csproj` for all csproj files in all sub folders.",
"loc.input.label.msbuildLocationMethod": "MSBuild",
"loc.input.label.msbuildVersion": "MSBuild Version",
"loc.input.help.msbuildVersion": "If the preferred version cannot be found, the latest version found will be used instead. On an macOS agent, xbuild (Mono) will be used if version is lower than 15.0.",
"loc.input.label.msbuildArchitecture": "MSBuild Architecture",
"loc.input.help.msbuildArchitecture": "Optionally supply the architecture (x86, x64) of MSBuild to run.",
"loc.input.label.msbuildLocation": "Path to MSBuild",
"loc.input.help.msbuildLocation": "Optionally supply the path to MSBuild.",
"loc.input.label.platform": "Platform",
"loc.input.label.configuration": "Configuration",
"loc.input.label.msbuildArguments": "MSBuild Arguments",
Expand All @@ -20,13 +27,6 @@
"loc.input.help.logProjectEvents": "Optionally record timeline details for each project (Windows only).",
"loc.input.label.createLogFile": "Create Log File",
"loc.input.help.createLogFile": "Optionally create a log file (Windows only).",
"loc.input.label.msbuildLocationMethod": "MSBuild",
"loc.input.label.msbuildVersion": "MSBuild Version",
"loc.input.help.msbuildVersion": "If the preferred version cannot be found, the latest version found will be used instead. On an macOS agent, xbuild (Mono) will be used if version is lower than 15.0.",
"loc.input.label.msbuildArchitecture": "MSBuild Architecture",
"loc.input.help.msbuildArchitecture": "Optionally supply the architecture (x86, x64) of MSBuild to run.",
"loc.input.label.msbuildLocation": "Path to MSBuild",
"loc.input.help.msbuildLocation": "Optionally supply the path to MSBuild.",
"loc.messages.RecordProjectDetailsOnlySupportedOnWindows": "`Record Project Details` is only supported on Windows.",
"loc.messages.CreateLogFileOnlySupportedOnWindows": "`Create Log File` is only supported on Windows.",
"loc.messages.MSB_BuildToolNotFound": "MSBuild or xbuild (Mono) were not found on the macOS or Linux agent."
Expand Down
104 changes: 50 additions & 54 deletions Tasks/MSBuild/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"version": {
"Major": 1,
"Minor": 117,
"Patch": 0
"Patch": 1
},
"demands": [
"msbuild"
Expand All @@ -34,6 +34,55 @@
"required": true,
"helpMarkDown": "Relative path from repo root of the project(s) or solution(s) to run. Wildcards can be used. For example, `**/*.csproj` for all csproj files in all sub folders."
},
{
"name": "msbuildLocationMethod",
"type": "radio",
"label": "MSBuild",
"required": false,
"defaultValue": "version",
"options": {
"version": "Version",
"location": "Specify Location"
}
},
{
"name": "msbuildVersion",
"type": "pickList",
"label": "MSBuild Version",
"required": false,
"defaultValue": "15.0",
"helpMarkDown": "If the preferred version cannot be found, the latest version found will be used instead. On an macOS agent, xbuild (Mono) will be used if version is lower than 15.0.",
"visibleRule": "msbuildLocationMethod = version",
"options": {
"latest": "Latest",
"15.0": "MSBuild 15.0",
"14.0": "MSBuild 14.0",
"12.0": "MSBuild 12.0",
"4.0": "MSBuild 4.0"
}
},
{
"name": "msbuildArchitecture",
"type": "pickList",
"label": "MSBuild Architecture",
"defaultValue": "x86",
"required": false,
"helpMarkDown": "Optionally supply the architecture (x86, x64) of MSBuild to run.",
"visibleRule": "msbuildLocationMethod = version",
"options": {
"x86": "MSBuild x86",
"x64": "MSBuild x64"
}
},
{
"name": "msbuildLocation",
"type": "string",
"label": "Path to MSBuild",
"defaultValue": "",
"required": false,
"helpMarkDown": "Optionally supply the path to MSBuild.",
"visibleRule": "msbuildLocationMethod = location"
},
{
"name": "platform",
"type": "string",
Expand Down Expand Up @@ -99,59 +148,6 @@
"required": false,
"helpMarkDown": "Optionally create a log file (Windows only).",
"groupName": "advanced"
},
{
"name": "msbuildLocationMethod",
"type": "radio",
"label": "MSBuild",
"required": false,
"groupName": "advanced",
"defaultValue": "version",
"options": {
"version": "Version",
"location": "Specify Location"
}
},
{
"name": "msbuildVersion",
"type": "pickList",
"label": "MSBuild Version",
"required": false,
"groupName": "advanced",
"defaultValue": "15.0",
"helpMarkDown": "If the preferred version cannot be found, the latest version found will be used instead. On an macOS agent, xbuild (Mono) will be used if version is lower than 15.0.",
"visibleRule": "msbuildLocationMethod = version",
"options": {
"latest": "Latest",
"15.0": "MSBuild 15.0",
"14.0": "MSBuild 14.0",
"12.0": "MSBuild 12.0",
"4.0": "MSBuild 4.0"
}
},
{
"name": "msbuildArchitecture",
"type": "pickList",
"label": "MSBuild Architecture",
"defaultValue": "x86",
"required": false,
"helpMarkDown": "Optionally supply the architecture (x86, x64) of MSBuild to run.",
"groupName": "advanced",
"visibleRule": "msbuildLocationMethod = version",
"options": {
"x86": "MSBuild x86",
"x64": "MSBuild x64"
}
},
{
"name": "msbuildLocation",
"type": "string",
"label": "Path to MSBuild",
"defaultValue": "",
"required": false,
"helpMarkDown": "Optionally supply the path to MSBuild.",
"visibleRule": "msbuildLocationMethod = location",
"groupName": "advanced"
}
],
"instanceNameFormat": "Build solution $(solution)",
Expand Down
104 changes: 50 additions & 54 deletions Tasks/MSBuild/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"version": {
"Major": 1,
"Minor": 117,
"Patch": 0
"Patch": 1
},
"demands": [
"msbuild"
Expand All @@ -34,6 +34,55 @@
"required": true,
"helpMarkDown": "ms-resource:loc.input.help.solution"
},
{
"name": "msbuildLocationMethod",
"type": "radio",
"label": "ms-resource:loc.input.label.msbuildLocationMethod",
"required": false,
"defaultValue": "version",
"options": {
"version": "Version",
"location": "Specify Location"
}
},
{
"name": "msbuildVersion",
"type": "pickList",
"label": "ms-resource:loc.input.label.msbuildVersion",
"required": false,
"defaultValue": "15.0",
"helpMarkDown": "ms-resource:loc.input.help.msbuildVersion",
"visibleRule": "msbuildLocationMethod = version",
"options": {
"latest": "Latest",
"15.0": "MSBuild 15.0",
"14.0": "MSBuild 14.0",
"12.0": "MSBuild 12.0",
"4.0": "MSBuild 4.0"
}
},
{
"name": "msbuildArchitecture",
"type": "pickList",
"label": "ms-resource:loc.input.label.msbuildArchitecture",
"defaultValue": "x86",
"required": false,
"helpMarkDown": "ms-resource:loc.input.help.msbuildArchitecture",
"visibleRule": "msbuildLocationMethod = version",
"options": {
"x86": "MSBuild x86",
"x64": "MSBuild x64"
}
},
{
"name": "msbuildLocation",
"type": "string",
"label": "ms-resource:loc.input.label.msbuildLocation",
"defaultValue": "",
"required": false,
"helpMarkDown": "ms-resource:loc.input.help.msbuildLocation",
"visibleRule": "msbuildLocationMethod = location"
},
{
"name": "platform",
"type": "string",
Expand Down Expand Up @@ -99,59 +148,6 @@
"required": false,
"helpMarkDown": "ms-resource:loc.input.help.createLogFile",
"groupName": "advanced"
},
{
"name": "msbuildLocationMethod",
"type": "radio",
"label": "ms-resource:loc.input.label.msbuildLocationMethod",
"required": false,
"groupName": "advanced",
"defaultValue": "version",
"options": {
"version": "Version",
"location": "Specify Location"
}
},
{
"name": "msbuildVersion",
"type": "pickList",
"label": "ms-resource:loc.input.label.msbuildVersion",
"required": false,
"groupName": "advanced",
"defaultValue": "15.0",
"helpMarkDown": "ms-resource:loc.input.help.msbuildVersion",
"visibleRule": "msbuildLocationMethod = version",
"options": {
"latest": "Latest",
"15.0": "MSBuild 15.0",
"14.0": "MSBuild 14.0",
"12.0": "MSBuild 12.0",
"4.0": "MSBuild 4.0"
}
},
{
"name": "msbuildArchitecture",
"type": "pickList",
"label": "ms-resource:loc.input.label.msbuildArchitecture",
"defaultValue": "x86",
"required": false,
"helpMarkDown": "ms-resource:loc.input.help.msbuildArchitecture",
"groupName": "advanced",
"visibleRule": "msbuildLocationMethod = version",
"options": {
"x86": "MSBuild x86",
"x64": "MSBuild x64"
}
},
{
"name": "msbuildLocation",
"type": "string",
"label": "ms-resource:loc.input.label.msbuildLocation",
"defaultValue": "",
"required": false,
"helpMarkDown": "ms-resource:loc.input.help.msbuildLocation",
"visibleRule": "msbuildLocationMethod = location",
"groupName": "advanced"
}
],
"instanceNameFormat": "ms-resource:loc.instanceNameFormat",
Expand Down
4 changes: 2 additions & 2 deletions Tasks/VSBuild/Strings/resources.resjson/en-US/resources.resjson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
"loc.group.displayName.advanced": "Advanced",
"loc.input.label.solution": "Solution",
"loc.input.help.solution": "Relative path from repo root of the solution(s) or MSBuild project to run. Wildcards can be used. For example, `**\\*.sln` for all sln files in all sub folders.",
"loc.input.label.vsVersion": "Visual Studio Version",
"loc.input.help.vsVersion": "If the preferred version cannot be found, the latest version found will be used instead.",
"loc.input.label.msbuildArgs": "MSBuild Arguments",
"loc.input.help.msbuildArgs": "Additional arguments passed to MSBuild.",
"loc.input.label.platform": "Platform",
Expand All @@ -15,8 +17,6 @@
"loc.input.help.maximumCpuCount": "If your MSBuild target configuration is compatible with building in parallel, you can optionally check this input to pass the /m switch to MSBuild (Windows only). If your target configuration is not compatible with building in parallel, checking this option may cause your build to result in file-in-use errors, or intermittent or inconsistent build failures.",
"loc.input.label.restoreNugetPackages": "Restore NuGet Packages",
"loc.input.help.restoreNugetPackages": "This option is deprecated. To restore NuGet packages, add a NuGet Installer step before the build.",
"loc.input.label.vsVersion": "Visual Studio Version",
"loc.input.help.vsVersion": "If the preferred version cannot be found, the latest version found will be used instead.",
"loc.input.label.msbuildArchitecture": "MSBuild Architecture",
"loc.input.help.msbuildArchitecture": "Optionally supply the architecture (x86, x64) of MSBuild to run.",
"loc.input.label.logProjectEvents": "Record Project Details",
Expand Down
30 changes: 15 additions & 15 deletions Tasks/VSBuild/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,21 @@
"required": true,
"helpMarkDown": "Relative path from repo root of the solution(s) or MSBuild project to run. Wildcards can be used. For example, `**\\*.sln` for all sln files in all sub folders."
},
{
"name": "vsVersion",
"type": "pickList",
"label": "Visual Studio Version",
"required": false,
"helpMarkDown": "If the preferred version cannot be found, the latest version found will be used instead.",
"defaultValue": "15.0",
"options": {
"latest": "Latest",
"15.0": "Visual Studio 2017",
"14.0": "Visual Studio 2015",
"12.0": "Visual Studio 2013",
"11.0": "Visual Studio 2012"
}
},
{
"name": "msbuildArgs",
"type": "string",
Expand Down Expand Up @@ -82,21 +97,6 @@
"groupName": "advanced",
"helpMarkDown": "This option is deprecated. To restore NuGet packages, add a NuGet Installer step before the build."
},
{
"name": "vsVersion",
"type": "pickList",
"label": "Visual Studio Version",
"required": false,
"helpMarkDown": "If the preferred version cannot be found, the latest version found will be used instead.",
"defaultValue": "15.0",
"options": {
"latest": "Latest",
"15.0": "Visual Studio 2017",
"14.0": "Visual Studio 2015",
"12.0": "Visual Studio 2013",
"11.0": "Visual Studio 2012"
}
},
{
"name": "msbuildArchitecture",
"type": "pickList",
Expand Down
30 changes: 15 additions & 15 deletions Tasks/VSBuild/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,21 @@
"required": true,
"helpMarkDown": "ms-resource:loc.input.help.solution"
},
{
"name": "vsVersion",
"type": "pickList",
"label": "ms-resource:loc.input.label.vsVersion",
"required": false,
"helpMarkDown": "ms-resource:loc.input.help.vsVersion",
"defaultValue": "15.0",
"options": {
"latest": "Latest",
"15.0": "Visual Studio 2017",
"14.0": "Visual Studio 2015",
"12.0": "Visual Studio 2013",
"11.0": "Visual Studio 2012"
}
},
{
"name": "msbuildArgs",
"type": "string",
Expand Down Expand Up @@ -82,21 +97,6 @@
"groupName": "advanced",
"helpMarkDown": "ms-resource:loc.input.help.restoreNugetPackages"
},
{
"name": "vsVersion",
"type": "pickList",
"label": "ms-resource:loc.input.label.vsVersion",
"required": false,
"helpMarkDown": "ms-resource:loc.input.help.vsVersion",
"defaultValue": "15.0",
"options": {
"latest": "Latest",
"15.0": "Visual Studio 2017",
"14.0": "Visual Studio 2015",
"12.0": "Visual Studio 2013",
"11.0": "Visual Studio 2012"
}
},
{
"name": "msbuildArchitecture",
"type": "pickList",
Expand Down