From 083046a33cd6c680382c237c02ce81c934836154 Mon Sep 17 00:00:00 2001 From: Darii Nurgaleev Date: Thu, 24 Sep 2020 19:05:39 +0700 Subject: [PATCH 1/4] added toolsets --- images/macos/toolsets/toolset-10.15.json | 4 ++-- images/macos/toolsets/toolset-11.0.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index e7b17989..26c0cf19 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -6,12 +6,12 @@ ] }, "xamarin": { - "vsmac": "8.7.7.10", + "vsmac": "8.7.8.4", "mono-versions": [ "6.12.0.93", "6.10.0.106", "6.8.0.123", "6.6.0.166", "6.4.0.208" ], "ios-versions": [ - "13.20.2.2", "13.18.2.1", "13.16.0.13", "13.14.1.39", "13.10.0.21", "13.8.3.0", "13.6.0.12", "13.4.0.2", "13.2.0.47" + "14.0.0.0", "13.20.2.2", "13.18.2.1", "13.16.0.13", "13.14.1.39", "13.10.0.21", "13.8.3.0", "13.6.0.12", "13.4.0.2", "13.2.0.47" ], "mac-versions": [ "6.20.2.2", "6.18.3.2", "6.16.0.13", "6.14.1.39", "6.10.0.21", "6.8.3.0", "6.6.0.12", "6.4.0.2", "6.2.0.47" diff --git a/images/macos/toolsets/toolset-11.0.json b/images/macos/toolsets/toolset-11.0.json index fa7a65a5..3f139910 100644 --- a/images/macos/toolsets/toolset-11.0.json +++ b/images/macos/toolsets/toolset-11.0.json @@ -6,12 +6,12 @@ ] }, "xamarin": { - "vsmac": "8.7.7.10", + "vsmac": "8.7.8.4", "mono-versions": [ "6.12.0.93" ], "ios-versions": [ - "13.20.2.2" + "14.0.0.0", "13.20.2.2" ], "mac-versions": [ "6.20.2.2" From 9cc2c6a139e1babe44f0ccebca0efe4bc73add51 Mon Sep 17 00:00:00 2001 From: Darii Nurgaleev Date: Thu, 24 Sep 2020 22:24:23 +0700 Subject: [PATCH 2/4] added bundles --- images/macos/toolsets/toolset-10.15.json | 7 +++++++ images/macos/toolsets/toolset-11.0.json | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 26c0cf19..587da961 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -21,6 +21,13 @@ ], "bundle-default": "latest", "bundles": [ + { + "symlink": "6_12_1", + "mono":"6.12", + "ios": "14.0", + "mac": "6.20", + "android": "11.0" + }, { "symlink": "6_12_0", "mono":"6.12", diff --git a/images/macos/toolsets/toolset-11.0.json b/images/macos/toolsets/toolset-11.0.json index 3f139910..c8988a4b 100644 --- a/images/macos/toolsets/toolset-11.0.json +++ b/images/macos/toolsets/toolset-11.0.json @@ -21,6 +21,13 @@ ], "bundle-default": "latest", "bundles": [ + { + "symlink": "6_12_1", + "mono":"6.12", + "ios": "14.0", + "mac": "6.20", + "android": "11.0" + }, { "symlink": "6_12_0", "mono":"6.12", From 3ffe5b2edcd856a68b35fad13b872437cfea67b5 Mon Sep 17 00:00:00 2001 From: Darii Nurgaleev Date: Fri, 25 Sep 2020 12:09:37 +0700 Subject: [PATCH 3/4] xcode 12.0.1 --- images/macos/toolsets/toolset-10.15.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index 587da961..e4c92cce 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -2,7 +2,7 @@ "xcode": { "default": "11.7", "versions": [ - "12.2_beta", "12", "12_beta", "11.7", "11.6", "11.5", "11.4.1", "11.4", "11.3.1", "11.2.1", "11.1", "11", "10.3" + "12.2_beta", "12.0.1", "12", "12_beta", "11.7", "11.6", "11.5", "11.4.1", "11.4", "11.3.1", "11.2.1", "11.1", "11", "10.3" ] }, "xamarin": { From 2f4d3598593f05840832ac695bfc421c51424671 Mon Sep 17 00:00:00 2001 From: Darii Nurgaleev Date: Fri, 25 Sep 2020 19:08:50 +0700 Subject: [PATCH 4/4] removed 12.0.1 --- images/macos/toolsets/toolset-10.15.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index e4c92cce..587da961 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -2,7 +2,7 @@ "xcode": { "default": "11.7", "versions": [ - "12.2_beta", "12.0.1", "12", "12_beta", "11.7", "11.6", "11.5", "11.4.1", "11.4", "11.3.1", "11.2.1", "11.1", "11", "10.3" + "12.2_beta", "12", "12_beta", "11.7", "11.6", "11.5", "11.4.1", "11.4", "11.3.1", "11.2.1", "11.1", "11", "10.3" ] }, "xamarin": {