From e8006bbe74c946e281dd208917bce55c1f63416c Mon Sep 17 00:00:00 2001 From: Maxim Zaytsev Date: Tue, 18 May 2021 12:30:07 +0300 Subject: [PATCH] [XamarinAndroidV1] Add MSBuild 16.0 option for msbuildVersion input (#14842) --- Tasks/XamarinAndroidV1/task.json | 5 +++-- Tasks/XamarinAndroidV1/task.loc.json | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Tasks/XamarinAndroidV1/task.json b/Tasks/XamarinAndroidV1/task.json index c5cae7618210..27f2ea7c3884 100644 --- a/Tasks/XamarinAndroidV1/task.json +++ b/Tasks/XamarinAndroidV1/task.json @@ -12,7 +12,7 @@ "author": "Microsoft Corporation", "version": { "Major": 1, - "Minor": 186, + "Minor": 188, "Patch": 0 }, "demands": [ @@ -114,6 +114,7 @@ "helpMarkDown": "If the preferred version cannot be found, the latest version found will be used instead. On macOS, xbuild (Mono) or MSBuild (Visual Studio for Mac) will be used.", "options": { "latest": "Latest", + "16.0": "MSBuild 16.0", "15.0": "MSBuild 15.0", "14.0": "MSBuild 14.0", "12.0": "MSBuild 12.0", @@ -251,4 +252,4 @@ "XamarinAndroidSucceeded": "Xamarin.Android task execution completed with no errors.", "MSB_BuildToolNotFound": "MSBuild or xbuild (Mono) were not found on the macOS or Linux agent." } -} \ No newline at end of file +} diff --git a/Tasks/XamarinAndroidV1/task.loc.json b/Tasks/XamarinAndroidV1/task.loc.json index 121af417c2f2..f2fa444b05f4 100644 --- a/Tasks/XamarinAndroidV1/task.loc.json +++ b/Tasks/XamarinAndroidV1/task.loc.json @@ -12,7 +12,7 @@ "author": "Microsoft Corporation", "version": { "Major": 1, - "Minor": 186, + "Minor": 188, "Patch": 0 }, "demands": [ @@ -114,6 +114,7 @@ "helpMarkDown": "ms-resource:loc.input.help.msbuildVersion", "options": { "latest": "Latest", + "16.0": "MSBuild 16.0", "15.0": "MSBuild 15.0", "14.0": "MSBuild 14.0", "12.0": "MSBuild 12.0", @@ -251,4 +252,4 @@ "XamarinAndroidSucceeded": "ms-resource:loc.messages.XamarinAndroidSucceeded", "MSB_BuildToolNotFound": "ms-resource:loc.messages.MSB_BuildToolNotFound" } -} \ No newline at end of file +}