From 7300ee9c4271fcf1d77ebc32e27c44321ad4cc03 Mon Sep 17 00:00:00 2001 From: Darii Nurgaleev Date: Thu, 12 Nov 2020 16:45:43 +0700 Subject: [PATCH 1/6] software_update_week_47 --- images/macos/toolsets/toolset-10.15.json | 15 +++++++++++---- images/macos/toolsets/toolset-11.0.json | 15 +++++++++++---- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index fd0ea45f..e89e2bab 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -11,16 +11,23 @@ "6.12.0.93", "6.10.0.106", "6.8.0.123", "6.6.0.166", "6.4.0.208" ], "ios-versions": [ - "14.2.0.12", "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" + "14.4.1.3", "14.2.0.12", "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" + "6.22.1.26", "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" ], "android-versions": [ - "11.0.2.0", "10.3.1.4", "10.2.0.100", "10.1.3.7", "10.0.6.2" + "11.1.0.17", "11.0.2.0", "10.3.1.4", "10.2.0.100", "10.1.3.7", "10.0.6.2" ], - "bundle-default": "6_12_1", + "bundle-default": "6_12_3", "bundles": [ + { + "symlink": "6_12_3", + "mono":"6.12", + "ios": "14.4", + "mac": "6.22", + "android": "11.1" + }, { "symlink": "6_12_2", "mono":"6.12", diff --git a/images/macos/toolsets/toolset-11.0.json b/images/macos/toolsets/toolset-11.0.json index 02df773b..f19f7587 100644 --- a/images/macos/toolsets/toolset-11.0.json +++ b/images/macos/toolsets/toolset-11.0.json @@ -11,16 +11,23 @@ "6.12.0.93" ], "ios-versions": [ - "14.2.0.12", "14.0.0.0", "13.20.2.2" + "14.4.1.3", "14.2.0.12", "14.0.0.0", "13.20.2.2" ], "mac-versions": [ - "6.20.2.2" + "6.22.1.26", "6.20.2.2" ], "android-versions": [ - "11.0.2.0" + "11.1.0.17", "11.0.2.0" ], - "bundle-default": "6_12_0", + "bundle-default": "6_12_3", "bundles": [ + { + "symlink": "6_12_3", + "mono":"6.12", + "ios": "14.4", + "mac": "6.22", + "android": "11.1" + }, { "symlink": "6_12_2", "mono":"6.12", From 6a632407df40bb5f209b39f8296c0c875de7bfc1 Mon Sep 17 00:00:00 2001 From: Darii Nurgaleev Date: Thu, 12 Nov 2020 16:50:07 +0700 Subject: [PATCH 2/6] changed bundled back. --- images/macos/toolsets/toolset-10.15.json | 2 +- images/macos/toolsets/toolset-11.0.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index e89e2bab..132cad5c 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -19,7 +19,7 @@ "android-versions": [ "11.1.0.17", "11.0.2.0", "10.3.1.4", "10.2.0.100", "10.1.3.7", "10.0.6.2" ], - "bundle-default": "6_12_3", + "bundle-default": "6_12_1", "bundles": [ { "symlink": "6_12_3", diff --git a/images/macos/toolsets/toolset-11.0.json b/images/macos/toolsets/toolset-11.0.json index f19f7587..75dcf1ed 100644 --- a/images/macos/toolsets/toolset-11.0.json +++ b/images/macos/toolsets/toolset-11.0.json @@ -19,7 +19,7 @@ "android-versions": [ "11.1.0.17", "11.0.2.0" ], - "bundle-default": "6_12_3", + "bundle-default": "6_12_0", "bundles": [ { "symlink": "6_12_3", From 11b63456bf531f53e07e5f5be931917590cf2d38 Mon Sep 17 00:00:00 2001 From: Darii Nurgaleev Date: Thu, 12 Nov 2020 19:36:16 +0700 Subject: [PATCH 3/6] added get-osversion for pwsh 7.1 --- images/macos/helpers/Common.Helpers.psm1 | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/images/macos/helpers/Common.Helpers.psm1 b/images/macos/helpers/Common.Helpers.psm1 index f77a8c2b..4ae3cd59 100644 --- a/images/macos/helpers/Common.Helpers.psm1 +++ b/images/macos/helpers/Common.Helpers.psm1 @@ -27,16 +27,17 @@ function Get-EnvironmentVariable($variable) { # It can be used for OS-specific tests function Get-OSVersion { $osVersion = [Environment]::OSVersion + $osVersionMajorMinor = $osVersion.Version.ToString(2) return [PSCustomObject]@{ Version = $osVersion.Version Platform = $osVersion.Platform - IsHighSierra = $osVersion.Version.Major -eq 17 - IsMojave = $osVersion.Version.Major -eq 18 - IsCatalina = $osVersion.Version.Major -eq 19 - IsBigSur = $osVersion.Version.Major -eq 20 - IsLessThanCatalina = $osVersion.Version.Major -lt 19 - IsLessThanBigSur = $osVersion.Version.Major -lt 20 - IsHigherThanMojave = $osVersion.Version.Major -gt 18 + IsHighSierra = $osVersionMajorMinor -eq "10.13" + IsMojave = $osVersionMajorMinor -eq "10.14" + IsCatalina = $osVersionMajorMinor -eq "10.15" + IsBigSur = $osVersionMajorMinor -eq "11.0" + IsLessThanCatalina = $osVersion.Version -lt [SemVer]"10.15" + IsLessThanBigSur = $osVersion.Version -lt [SemVer]"11.0" + IsHigherThanMojave = $osVersion.Version -gt [SemVer]"10.14" } } From 4434a111d218e02a2dba3ccebbf553739aec7157 Mon Sep 17 00:00:00 2001 From: Darii Nurgaleev Date: Fri, 13 Nov 2020 00:54:30 +0700 Subject: [PATCH 4/6] added changes to Get-OSVersion --- images/macos/helpers/Common.Helpers.psm1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/images/macos/helpers/Common.Helpers.psm1 b/images/macos/helpers/Common.Helpers.psm1 index 4ae3cd59..c2e15784 100644 --- a/images/macos/helpers/Common.Helpers.psm1 +++ b/images/macos/helpers/Common.Helpers.psm1 @@ -35,9 +35,9 @@ function Get-OSVersion { IsMojave = $osVersionMajorMinor -eq "10.14" IsCatalina = $osVersionMajorMinor -eq "10.15" IsBigSur = $osVersionMajorMinor -eq "11.0" - IsLessThanCatalina = $osVersion.Version -lt [SemVer]"10.15" - IsLessThanBigSur = $osVersion.Version -lt [SemVer]"11.0" - IsHigherThanMojave = $osVersion.Version -gt [SemVer]"10.14" + IsLessThanCatalina = [SemVer]$osVersion.Version -lt [SemVer]"10.15" + IsLessThanBigSur = [SemVer]$osVersion.Version -lt [SemVer]"11.0" + IsHigherThanMojave = [SemVer]$osVersion.Version -gt [SemVer]"10.14" } } From f7db5a440194ffbf88a4309745e26b458c3acdc7 Mon Sep 17 00:00:00 2001 From: Darii Nurgaleev Date: Fri, 13 Nov 2020 00:57:01 +0700 Subject: [PATCH 5/6] Another changes in Get-OSVersion --- images/macos/helpers/Common.Helpers.psm1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/images/macos/helpers/Common.Helpers.psm1 b/images/macos/helpers/Common.Helpers.psm1 index c2e15784..0ffe1e1a 100644 --- a/images/macos/helpers/Common.Helpers.psm1 +++ b/images/macos/helpers/Common.Helpers.psm1 @@ -35,9 +35,9 @@ function Get-OSVersion { IsMojave = $osVersionMajorMinor -eq "10.14" IsCatalina = $osVersionMajorMinor -eq "10.15" IsBigSur = $osVersionMajorMinor -eq "11.0" - IsLessThanCatalina = [SemVer]$osVersion.Version -lt [SemVer]"10.15" - IsLessThanBigSur = [SemVer]$osVersion.Version -lt [SemVer]"11.0" - IsHigherThanMojave = [SemVer]$osVersion.Version -gt [SemVer]"10.14" + IsLessThanCatalina = [SemVer]$osVersion.Version -lt "10.15" + IsLessThanBigSur = [SemVer]$osVersion.Version -lt "11.0" + IsHigherThanMojave = [SemVer]$osVersion.Version -gt "10.14" } } From 2561b58ef3c0d96d8451a804c520f987f0baa247 Mon Sep 17 00:00:00 2001 From: Darii Nurgaleev Date: Fri, 13 Nov 2020 01:14:19 +0700 Subject: [PATCH 6/6] get-osversion changed --- images/macos/helpers/Common.Helpers.psm1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/helpers/Common.Helpers.psm1 b/images/macos/helpers/Common.Helpers.psm1 index 0ffe1e1a..90981790 100644 --- a/images/macos/helpers/Common.Helpers.psm1 +++ b/images/macos/helpers/Common.Helpers.psm1 @@ -37,7 +37,7 @@ function Get-OSVersion { IsBigSur = $osVersionMajorMinor -eq "11.0" IsLessThanCatalina = [SemVer]$osVersion.Version -lt "10.15" IsLessThanBigSur = [SemVer]$osVersion.Version -lt "11.0" - IsHigherThanMojave = [SemVer]$osVersion.Version -gt "10.14" + IsHigherThanMojave = [SemVer]$osVersion.Version -ge "10.15" } }