From f94d05fd89aae3fc90c51f2eac256f38ad496789 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 12 Sep 2022 21:58:46 +0000 Subject: [PATCH 01/26] Update dependencies from https://github.com/xamarin/xamarin-macios build 20220909.2 Microsoft.iOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.macOS.Sdk , Microsoft.tvOS.Sdk From Version 15.4.454 -> To Version 15.4.455 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b65fb483b466..a691e8964c9f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -12,21 +12,21 @@ https://github.com/xamarin/xamarin-android 04623cdc317c3da5efce46cb16d94befe4833125 - + https://github.com/xamarin/xamarin-macios - 4bd34d034c8c5a4e092c8bd3c8868153d94277b4 + 9ed77490baef852ec98513d2b791884b0242715e - + https://github.com/xamarin/xamarin-macios - 4bd34d034c8c5a4e092c8bd3c8868153d94277b4 + 9ed77490baef852ec98513d2b791884b0242715e - + https://github.com/xamarin/xamarin-macios - 4bd34d034c8c5a4e092c8bd3c8868153d94277b4 + 9ed77490baef852ec98513d2b791884b0242715e - + https://github.com/xamarin/xamarin-macios - 4bd34d034c8c5a4e092c8bd3c8868153d94277b4 + 9ed77490baef852ec98513d2b791884b0242715e https://github.com/dotnet/emsdk diff --git a/eng/Versions.props b/eng/Versions.props index e1784c7c9b7a..7776fd95c354 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,10 +11,10 @@ 32.0.468 - 15.4.454 - 15.4.454 - 12.3.454 - 15.4.454 + 15.4.455 + 15.4.455 + 12.3.455 + 15.4.455 7.0.400-preview.1.0 From 24b0aa597ec5d8e11aaf30379b4cc93bed3cc43c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 18 Sep 2022 19:07:55 +0000 Subject: [PATCH 02/26] Update dependencies from https://github.com/xamarin/xamarin-macios build 20220918.1 Microsoft.iOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.macOS.Sdk , Microsoft.tvOS.Sdk From Version 15.4.454 -> To Version 15.4.456 --- NuGet.config | 4 ---- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8d1e18b667ef..43b6c8313d71 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,14 +6,10 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a691e8964c9f..269d682f7457 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -12,21 +12,21 @@ https://github.com/xamarin/xamarin-android 04623cdc317c3da5efce46cb16d94befe4833125 - + https://github.com/xamarin/xamarin-macios - 9ed77490baef852ec98513d2b791884b0242715e + c173012adce89f6e94baeae9623182990eeed524 - + https://github.com/xamarin/xamarin-macios - 9ed77490baef852ec98513d2b791884b0242715e + c173012adce89f6e94baeae9623182990eeed524 - + https://github.com/xamarin/xamarin-macios - 9ed77490baef852ec98513d2b791884b0242715e + c173012adce89f6e94baeae9623182990eeed524 - + https://github.com/xamarin/xamarin-macios - 9ed77490baef852ec98513d2b791884b0242715e + c173012adce89f6e94baeae9623182990eeed524 https://github.com/dotnet/emsdk diff --git a/eng/Versions.props b/eng/Versions.props index 7776fd95c354..5b75591c8259 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,10 +11,10 @@ 32.0.468 - 15.4.455 - 15.4.455 - 12.3.455 - 15.4.455 + 15.4.456 + 15.4.456 + 12.3.456 + 15.4.456 7.0.400-preview.1.0 From 3991a05e479fa4c7396adaf510da573feaaf169d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 20 Sep 2022 18:12:21 +0000 Subject: [PATCH 03/26] Update dependencies from https://github.com/xamarin/xamarin-macios build 20220920.26 Microsoft.iOS.Sdk , Microsoft.tvOS.Sdk From Version 15.4.454 -> To Version 16.0.504 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 269d682f7457..ea92975547c6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -16,13 +16,13 @@ https://github.com/xamarin/xamarin-macios c173012adce89f6e94baeae9623182990eeed524 - + https://github.com/xamarin/xamarin-macios - c173012adce89f6e94baeae9623182990eeed524 + e9c25bb4d0181629a14494a96c34d47fb6e1adea - + https://github.com/xamarin/xamarin-macios - c173012adce89f6e94baeae9623182990eeed524 + e9c25bb4d0181629a14494a96c34d47fb6e1adea https://github.com/xamarin/xamarin-macios diff --git a/eng/Versions.props b/eng/Versions.props index 5b75591c8259..e36c68557d31 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,10 +11,10 @@ 32.0.468 - 15.4.456 + 16.0.504 15.4.456 12.3.456 - 15.4.456 + 16.0.504 7.0.400-preview.1.0 From 466620ebfd2f5744633521ae920ed14c23706b8f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 21 Sep 2022 06:27:08 +0000 Subject: [PATCH 04/26] Update dependencies from https://github.com/xamarin/xamarin-macios build 20220921.1 Microsoft.iOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.macOS.Sdk , Microsoft.tvOS.Sdk From Version 15.4.454 -> To Version 15.4.457 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ea92975547c6..4f397ae4721c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -12,21 +12,21 @@ https://github.com/xamarin/xamarin-android 04623cdc317c3da5efce46cb16d94befe4833125 - + https://github.com/xamarin/xamarin-macios - c173012adce89f6e94baeae9623182990eeed524 + cb23a94d7cb457306d70163e2ab5293cb61c4d16 - + https://github.com/xamarin/xamarin-macios - e9c25bb4d0181629a14494a96c34d47fb6e1adea + cb23a94d7cb457306d70163e2ab5293cb61c4d16 - + https://github.com/xamarin/xamarin-macios - e9c25bb4d0181629a14494a96c34d47fb6e1adea + cb23a94d7cb457306d70163e2ab5293cb61c4d16 - + https://github.com/xamarin/xamarin-macios - c173012adce89f6e94baeae9623182990eeed524 + cb23a94d7cb457306d70163e2ab5293cb61c4d16 https://github.com/dotnet/emsdk diff --git a/eng/Versions.props b/eng/Versions.props index e36c68557d31..3a2825627ef8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,10 +11,10 @@ 32.0.468 - 16.0.504 - 15.4.456 - 12.3.456 - 16.0.504 + 15.4.457 + 15.4.457 + 12.3.457 + 15.4.457 7.0.400-preview.1.0 From 1f09ead3f5dafb8e94000e545d68a7387b740ff3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 21 Sep 2022 14:31:26 +0000 Subject: [PATCH 05/26] Update dependencies from https://github.com/xamarin/xamarin-macios build 20220921.3 Microsoft.iOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.macOS.Sdk , Microsoft.tvOS.Sdk From Version 15.4.454 -> To Version 15.4.458 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4f397ae4721c..e875a9676543 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -12,21 +12,21 @@ https://github.com/xamarin/xamarin-android 04623cdc317c3da5efce46cb16d94befe4833125 - + https://github.com/xamarin/xamarin-macios - cb23a94d7cb457306d70163e2ab5293cb61c4d16 + 1334a336292f23db0a9f6312bef31d66fdcbebe9 - + https://github.com/xamarin/xamarin-macios - cb23a94d7cb457306d70163e2ab5293cb61c4d16 + 1334a336292f23db0a9f6312bef31d66fdcbebe9 - + https://github.com/xamarin/xamarin-macios - cb23a94d7cb457306d70163e2ab5293cb61c4d16 + 1334a336292f23db0a9f6312bef31d66fdcbebe9 - + https://github.com/xamarin/xamarin-macios - cb23a94d7cb457306d70163e2ab5293cb61c4d16 + 1334a336292f23db0a9f6312bef31d66fdcbebe9 https://github.com/dotnet/emsdk diff --git a/eng/Versions.props b/eng/Versions.props index 3a2825627ef8..fb9e2cc78e8b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,10 +11,10 @@ 32.0.468 - 15.4.457 - 15.4.457 - 12.3.457 - 15.4.457 + 15.4.458 + 15.4.458 + 12.3.458 + 15.4.458 7.0.400-preview.1.0 From d55ff1a4e880e08f0652810285a4bee6860866ce Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 21 Sep 2022 15:04:38 +0000 Subject: [PATCH 06/26] Update dependencies from https://github.com/xamarin/xamarin-macios build 20220921.2 Microsoft.iOS.Sdk , Microsoft.tvOS.Sdk From Version 15.4.454 -> To Version 16.0.505 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e875a9676543..920383d2ab27 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -16,13 +16,13 @@ https://github.com/xamarin/xamarin-macios 1334a336292f23db0a9f6312bef31d66fdcbebe9 - + https://github.com/xamarin/xamarin-macios - 1334a336292f23db0a9f6312bef31d66fdcbebe9 + 38d9b51d5db8efc9449aa4afe2e156a35b1adf9f - + https://github.com/xamarin/xamarin-macios - 1334a336292f23db0a9f6312bef31d66fdcbebe9 + 38d9b51d5db8efc9449aa4afe2e156a35b1adf9f https://github.com/xamarin/xamarin-macios diff --git a/eng/Versions.props b/eng/Versions.props index fb9e2cc78e8b..7b08e9fd910b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,10 +11,10 @@ 32.0.468 - 15.4.458 + 16.0.505 15.4.458 12.3.458 - 15.4.458 + 16.0.505 7.0.400-preview.1.0 From 676219c1b725beb2104396d1761d3978dd87df2f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 21 Sep 2022 16:22:06 +0000 Subject: [PATCH 07/26] Update dependencies from https://github.com/xamarin/xamarin-macios build 20220921.11 Microsoft.iOS.Sdk , Microsoft.tvOS.Sdk From Version 15.4.454 -> To Version 16.0.507 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 920383d2ab27..f15bd1c3f07b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -16,13 +16,13 @@ https://github.com/xamarin/xamarin-macios 1334a336292f23db0a9f6312bef31d66fdcbebe9 - + https://github.com/xamarin/xamarin-macios - 38d9b51d5db8efc9449aa4afe2e156a35b1adf9f + 6756a11462d8aa6e73d4a320712b276caba159c1 - + https://github.com/xamarin/xamarin-macios - 38d9b51d5db8efc9449aa4afe2e156a35b1adf9f + 6756a11462d8aa6e73d4a320712b276caba159c1 https://github.com/xamarin/xamarin-macios diff --git a/eng/Versions.props b/eng/Versions.props index 7b08e9fd910b..55a9fb306639 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,10 +11,10 @@ 32.0.468 - 16.0.505 + 16.0.507 15.4.458 12.3.458 - 16.0.505 + 16.0.507 7.0.400-preview.1.0 From 3f65714ec4ce580d3fd22ef055ac3885b55c26de Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 21 Sep 2022 16:29:41 +0000 Subject: [PATCH 08/26] Update dependencies from https://github.com/xamarin/xamarin-macios build 20220921.10 Microsoft.iOS.Sdk , Microsoft.tvOS.Sdk From Version 15.4.454 -> To Version 16.0.506 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f15bd1c3f07b..21ce3deab3e0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -16,13 +16,13 @@ https://github.com/xamarin/xamarin-macios 1334a336292f23db0a9f6312bef31d66fdcbebe9 - + https://github.com/xamarin/xamarin-macios - 6756a11462d8aa6e73d4a320712b276caba159c1 + a670036c72a76d4a461c00aba7fdafed8f06972b - + https://github.com/xamarin/xamarin-macios - 6756a11462d8aa6e73d4a320712b276caba159c1 + a670036c72a76d4a461c00aba7fdafed8f06972b https://github.com/xamarin/xamarin-macios diff --git a/eng/Versions.props b/eng/Versions.props index 55a9fb306639..19e751ed6a72 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,10 +11,10 @@ 32.0.468 - 16.0.507 + 16.0.506 15.4.458 12.3.458 - 16.0.507 + 16.0.506 7.0.400-preview.1.0 From 86738f044bf7c6dc476bc1a96e91a02a54e005ac Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 22 Sep 2022 01:20:15 +0000 Subject: [PATCH 09/26] Update dependencies from https://github.com/xamarin/xamarin-macios build 20220921.28 Microsoft.iOS.Sdk , Microsoft.tvOS.Sdk From Version 15.4.454 -> To Version 16.0.508 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 21ce3deab3e0..5dc3fc5bdc1a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -16,13 +16,13 @@ https://github.com/xamarin/xamarin-macios 1334a336292f23db0a9f6312bef31d66fdcbebe9 - + https://github.com/xamarin/xamarin-macios - a670036c72a76d4a461c00aba7fdafed8f06972b + 1a3a7cb84509255024fc7d8ac5dabe5886b68f1e - + https://github.com/xamarin/xamarin-macios - a670036c72a76d4a461c00aba7fdafed8f06972b + 1a3a7cb84509255024fc7d8ac5dabe5886b68f1e https://github.com/xamarin/xamarin-macios diff --git a/eng/Versions.props b/eng/Versions.props index 19e751ed6a72..4305505e1619 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,10 +11,10 @@ 32.0.468 - 16.0.506 + 16.0.508 15.4.458 12.3.458 - 16.0.506 + 16.0.508 7.0.400-preview.1.0 From a9ee17e3e821972b4e80168801dc380c360e9861 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 22 Sep 2022 09:17:46 +0000 Subject: [PATCH 10/26] Update dependencies from https://github.com/xamarin/xamarin-macios build 20220922.5 Microsoft.iOS.Sdk , Microsoft.tvOS.Sdk From Version 15.4.454 -> To Version 16.0.509 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5dc3fc5bdc1a..acca885b48f8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -16,13 +16,13 @@ https://github.com/xamarin/xamarin-macios 1334a336292f23db0a9f6312bef31d66fdcbebe9 - + https://github.com/xamarin/xamarin-macios - 1a3a7cb84509255024fc7d8ac5dabe5886b68f1e + 73d65a93012cb0f95d67efe00c559ba49b725a1d - + https://github.com/xamarin/xamarin-macios - 1a3a7cb84509255024fc7d8ac5dabe5886b68f1e + 73d65a93012cb0f95d67efe00c559ba49b725a1d https://github.com/xamarin/xamarin-macios diff --git a/eng/Versions.props b/eng/Versions.props index 4305505e1619..725cb6086ade 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,10 +11,10 @@ 32.0.468 - 16.0.508 + 16.0.509 15.4.458 12.3.458 - 16.0.508 + 16.0.509 7.0.400-preview.1.0 From 117295dd5a1d7d9fb2d542f00a0102b846b7f8e8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 22 Sep 2022 13:37:15 +0000 Subject: [PATCH 11/26] Update dependencies from https://github.com/xamarin/xamarin-macios build 20220922.13 Microsoft.iOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.macOS.Sdk , Microsoft.tvOS.Sdk From Version 15.4.454 -> To Version 15.4.459 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index acca885b48f8..2dcfc97ae904 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -12,21 +12,21 @@ https://github.com/xamarin/xamarin-android 04623cdc317c3da5efce46cb16d94befe4833125 - + https://github.com/xamarin/xamarin-macios - 1334a336292f23db0a9f6312bef31d66fdcbebe9 + 173e52fb3feabb6536f77300679f701112c3ea68 - + https://github.com/xamarin/xamarin-macios - 73d65a93012cb0f95d67efe00c559ba49b725a1d + 173e52fb3feabb6536f77300679f701112c3ea68 - + https://github.com/xamarin/xamarin-macios - 73d65a93012cb0f95d67efe00c559ba49b725a1d + 173e52fb3feabb6536f77300679f701112c3ea68 - + https://github.com/xamarin/xamarin-macios - 1334a336292f23db0a9f6312bef31d66fdcbebe9 + 173e52fb3feabb6536f77300679f701112c3ea68 https://github.com/dotnet/emsdk diff --git a/eng/Versions.props b/eng/Versions.props index 725cb6086ade..21c5256dc69d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,10 +11,10 @@ 32.0.468 - 16.0.509 - 15.4.458 - 12.3.458 - 16.0.509 + 15.4.459 + 15.4.459 + 12.3.459 + 15.4.459 7.0.400-preview.1.0 From ff22225b1f0cb977c678ffb52044a3f80ac8fd34 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 22 Sep 2022 18:11:42 +0000 Subject: [PATCH 12/26] Update dependencies from https://github.com/xamarin/xamarin-macios build 20220922.26 Microsoft.iOS.Sdk , Microsoft.tvOS.Sdk From Version 15.4.454 -> To Version 16.0.511 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2dcfc97ae904..ea6989000da2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -16,13 +16,13 @@ https://github.com/xamarin/xamarin-macios 173e52fb3feabb6536f77300679f701112c3ea68 - + https://github.com/xamarin/xamarin-macios - 173e52fb3feabb6536f77300679f701112c3ea68 + 994c06f3ebff316033763ca23b9d3df7edba6c55 - + https://github.com/xamarin/xamarin-macios - 173e52fb3feabb6536f77300679f701112c3ea68 + 994c06f3ebff316033763ca23b9d3df7edba6c55 https://github.com/xamarin/xamarin-macios diff --git a/eng/Versions.props b/eng/Versions.props index 21c5256dc69d..4f600630a96f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,10 +11,10 @@ 32.0.468 - 15.4.459 + 16.0.511 15.4.459 12.3.459 - 15.4.459 + 16.0.511 7.0.400-preview.1.0 From 76a1ec22f51f2179acaacd1fe02dab4f6438c4ff Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 22 Sep 2022 18:30:43 +0000 Subject: [PATCH 13/26] Update dependencies from https://github.com/xamarin/xamarin-macios build 20220922.25 Microsoft.iOS.Sdk , Microsoft.tvOS.Sdk From Version 15.4.454 -> To Version 16.0.510 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ea6989000da2..4fea50aba5ad 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -16,13 +16,13 @@ https://github.com/xamarin/xamarin-macios 173e52fb3feabb6536f77300679f701112c3ea68 - + https://github.com/xamarin/xamarin-macios - 994c06f3ebff316033763ca23b9d3df7edba6c55 + e4f48bed7f0567ed1a8a15d63b68f2bdaacb7eb5 - + https://github.com/xamarin/xamarin-macios - 994c06f3ebff316033763ca23b9d3df7edba6c55 + e4f48bed7f0567ed1a8a15d63b68f2bdaacb7eb5 https://github.com/xamarin/xamarin-macios diff --git a/eng/Versions.props b/eng/Versions.props index 4f600630a96f..fec8fd0daf35 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,10 +11,10 @@ 32.0.468 - 16.0.511 + 16.0.510 15.4.459 12.3.459 - 16.0.511 + 16.0.510 7.0.400-preview.1.0 From ed2b15f1df87a6d58088bdf459d2c5ab9d6cc20e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 23 Sep 2022 09:20:05 +0000 Subject: [PATCH 14/26] Update dependencies from https://github.com/xamarin/xamarin-macios build 20220923.2 Microsoft.iOS.Sdk , Microsoft.tvOS.Sdk From Version 15.4.454 -> To Version 16.0.512 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4fea50aba5ad..beb7bfc32d5d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -16,13 +16,13 @@ https://github.com/xamarin/xamarin-macios 173e52fb3feabb6536f77300679f701112c3ea68 - + https://github.com/xamarin/xamarin-macios - e4f48bed7f0567ed1a8a15d63b68f2bdaacb7eb5 + 3804b3d2b1f113a408071c90eb08739f5d11b2e5 - + https://github.com/xamarin/xamarin-macios - e4f48bed7f0567ed1a8a15d63b68f2bdaacb7eb5 + 3804b3d2b1f113a408071c90eb08739f5d11b2e5 https://github.com/xamarin/xamarin-macios diff --git a/eng/Versions.props b/eng/Versions.props index fec8fd0daf35..cc415e7423eb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,10 +11,10 @@ 32.0.468 - 16.0.510 + 16.0.512 15.4.459 12.3.459 - 16.0.510 + 16.0.512 7.0.400-preview.1.0 From a1eb058b6273944ea597c2d5192e0fa50a9306d7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 23 Sep 2022 10:03:07 +0000 Subject: [PATCH 15/26] Update dependencies from https://github.com/xamarin/xamarin-macios build 20220923.4 Microsoft.iOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.macOS.Sdk , Microsoft.tvOS.Sdk From Version 15.4.454 -> To Version 15.4.460 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index beb7bfc32d5d..f6c2bb5a6c81 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -12,21 +12,21 @@ https://github.com/xamarin/xamarin-android 04623cdc317c3da5efce46cb16d94befe4833125 - + https://github.com/xamarin/xamarin-macios - 173e52fb3feabb6536f77300679f701112c3ea68 + 55f0667f841c5c4e69031c791d915da2f4a7a98f - + https://github.com/xamarin/xamarin-macios - 3804b3d2b1f113a408071c90eb08739f5d11b2e5 + 55f0667f841c5c4e69031c791d915da2f4a7a98f - + https://github.com/xamarin/xamarin-macios - 3804b3d2b1f113a408071c90eb08739f5d11b2e5 + 55f0667f841c5c4e69031c791d915da2f4a7a98f - + https://github.com/xamarin/xamarin-macios - 173e52fb3feabb6536f77300679f701112c3ea68 + 55f0667f841c5c4e69031c791d915da2f4a7a98f https://github.com/dotnet/emsdk diff --git a/eng/Versions.props b/eng/Versions.props index cc415e7423eb..4caa8a94e84c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,10 +11,10 @@ 32.0.468 - 16.0.512 - 15.4.459 - 12.3.459 - 16.0.512 + 15.4.460 + 15.4.460 + 12.3.460 + 15.4.460 7.0.400-preview.1.0 From 63b17311c2f7bef6ea8faa7990dfefe174869a06 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 23 Sep 2022 23:38:50 +0000 Subject: [PATCH 16/26] Update dependencies from https://github.com/xamarin/xamarin-macios build 20220923.29 Microsoft.iOS.Sdk , Microsoft.tvOS.Sdk From Version 15.4.454 -> To Version 16.0.513 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f6c2bb5a6c81..0dbf6d97651c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -16,13 +16,13 @@ https://github.com/xamarin/xamarin-macios 55f0667f841c5c4e69031c791d915da2f4a7a98f - + https://github.com/xamarin/xamarin-macios - 55f0667f841c5c4e69031c791d915da2f4a7a98f + 85b1fdf9efdb20cb7ac10468cf4147da2ea53c55 - + https://github.com/xamarin/xamarin-macios - 55f0667f841c5c4e69031c791d915da2f4a7a98f + 85b1fdf9efdb20cb7ac10468cf4147da2ea53c55 https://github.com/xamarin/xamarin-macios diff --git a/eng/Versions.props b/eng/Versions.props index 4caa8a94e84c..fe42d2507fd9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,10 +11,10 @@ 32.0.468 - 15.4.460 + 16.0.513 15.4.460 12.3.460 - 15.4.460 + 16.0.513 7.0.400-preview.1.0 From 5d2797ae823d218aa4a33b1d916752ff1ef5706a Mon Sep 17 00:00:00 2001 From: redth Date: Mon, 26 Sep 2022 18:56:41 -0400 Subject: [PATCH 17/26] Work around OperatingSystem check failures --- .../Handlers/ListView/iOS/ListViewRenderer.cs | 12 +++++++++-- .../Shell/iOS/ShellFlyoutLayoutManager.cs | 8 ++++++- .../Shell/iOS/ShellScrollViewTracker.cs | 16 ++++++++++---- .../Shell/iOS/ShellSectionRootRenderer.cs | 21 ++++++++++++++++--- .../Shell/iOS/ShellTableViewController.cs | 8 ++++++- .../Handlers/Items/iOS/ItemsViewController.cs | 6 +++++- .../Handlers/Items/iOS/ItemsViewLayout.cs | 12 +++++++++-- .../GestureManager/GestureManager.iOS.cs | 8 +++++-- .../src/Handlers/ViewHandlerExtensions.iOS.cs | 8 ++++++- .../Handlers/WebView/WebViewHandler.iOS.cs | 2 +- src/Core/src/Platform/iOS/MauiPageControl.cs | 7 ++++++- src/Core/src/Platform/iOS/MauiWKWebView.cs | 2 +- ...ials.Sample.Server.WebAuthenticator.csproj | 3 ++- .../Properties/launchSettings.json | 4 ++-- .../src/DeviceDisplay/DeviceDisplay.ios.cs | 13 +++++++++--- .../WebAuthenticator.shared.cs | 9 ++++++-- 16 files changed, 111 insertions(+), 28 deletions(-) diff --git a/src/Controls/src/Core/Compatibility/Handlers/ListView/iOS/ListViewRenderer.cs b/src/Controls/src/Core/Compatibility/Handlers/ListView/iOS/ListViewRenderer.cs index 5b7aa309466b..007d59034384 100644 --- a/src/Controls/src/Core/Compatibility/Handlers/ListView/iOS/ListViewRenderer.cs +++ b/src/Controls/src/Core/Compatibility/Handlers/ListView/iOS/ListViewRenderer.cs @@ -221,7 +221,11 @@ protected override void OnElementChanged(ElementChangedEventArgs e) { if (Control == null) { - if (OperatingSystem.IsIOSVersionAtLeast(11) || OperatingSystem.IsTvOSVersionAtLeast(11)) + if (OperatingSystem.IsIOSVersionAtLeast(11) || OperatingSystem.IsMacCatalystVersionAtLeast(11) +#if TVOS + || OperatingSystem.IsTvOSVersionAtLeast(11) +#endif + ) { var parentNav = e.NewElement.FindParentOfType(); _usingLargeTitles = (parentNav != null && parentNav.OnThisPlatform().PrefersLargeTitles()); @@ -229,7 +233,11 @@ protected override void OnElementChanged(ElementChangedEventArgs e) _tableViewController = new FormsUITableViewController(e.NewElement, _usingLargeTitles); SetNativeControl(_tableViewController.TableView); - if (OperatingSystem.IsIOSVersionAtLeast(15) || OperatingSystem.IsTvOSVersionAtLeast(15)) + if (OperatingSystem.IsIOSVersionAtLeast(15) || OperatingSystem.IsMacCatalystVersionAtLeast(15) +#if TVOS + || OperatingSystem.IsTvOSVersionAtLeast(15) +#endif + ) _tableViewController.TableView.SectionHeaderTopPadding = new nfloat(0); _backgroundUIView = _tableViewController.TableView.BackgroundView; diff --git a/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellFlyoutLayoutManager.cs b/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellFlyoutLayoutManager.cs index cc05f9978014..dbe5a228db51 100644 --- a/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellFlyoutLayoutManager.cs +++ b/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellFlyoutLayoutManager.cs @@ -127,8 +127,14 @@ private set else if (ContentView is IPlatformViewHandler ver && ver.PlatformView is UIScrollView uIScroll) ScrollView = uIScroll; - if (ScrollView != null && (OperatingSystem.IsIOSVersionAtLeast(11) || OperatingSystem.IsTvOSVersionAtLeast(11))) + if (ScrollView != null && (OperatingSystem.IsIOSVersionAtLeast(11) || OperatingSystem.IsMacCatalystVersionAtLeast(11) +#if TVOS + || OperatingSystem.IsTvOSVersionAtLeast(11) +#endif + )) + { ScrollView.ContentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentBehavior.Never; + } LayoutParallax(); SetHeaderContentInset(); diff --git a/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellScrollViewTracker.cs b/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellScrollViewTracker.cs index 996a2d5e2aea..c9fe9c92bb54 100644 --- a/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellScrollViewTracker.cs +++ b/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellScrollViewTracker.cs @@ -68,7 +68,11 @@ public void OnLayoutSubviews() if (!_isInShell) return; - if (OperatingSystem.IsIOSVersionAtLeast(11) || OperatingSystem.IsTvOSVersionAtLeast(11)) + if (OperatingSystem.IsIOSVersionAtLeast(11) || OperatingSystem.IsMacCatalystVersionAtLeast(11) +#if TVOS + || OperatingSystem.IsTvOSVersionAtLeast(11) +#endif + ) { var newBounds = _scrollView.AdjustedContentInset.InsetRect(_scrollView.Bounds).ToRectangle(); newBounds.X = 0; @@ -108,7 +112,11 @@ void UpdateContentInset(Thickness inset, double tabThickness) { _lastInset = inset; _tabThickness = tabThickness; - if (OperatingSystem.IsIOSVersionAtLeast(11) || OperatingSystem.IsTvOSVersionAtLeast(11)) + if (OperatingSystem.IsIOSVersionAtLeast(11) || OperatingSystem.IsMacCatalystVersionAtLeast(11) +#if TVOS + || OperatingSystem.IsTvOSVersionAtLeast(11) +#endif + ) { if (ShellSectionController.GetItems().Count > 1 && _isInItems) { @@ -173,7 +181,7 @@ void UpdateVerticalBounce() } } - #region IDisposable Support +#region IDisposable Support public void Dispose() { @@ -197,6 +205,6 @@ protected virtual void Dispose(bool disposing) } } - #endregion IDisposable Support +#endregion IDisposable Support } } \ No newline at end of file diff --git a/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellSectionRootRenderer.cs b/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellSectionRootRenderer.cs index 22c8242f836b..b78ce2cd9bf0 100644 --- a/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellSectionRootRenderer.cs +++ b/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellSectionRootRenderer.cs @@ -74,8 +74,14 @@ public override void ViewDidLoad() base.ViewDidLoad(); _containerArea = new UIView(); - if (OperatingSystem.IsIOSVersionAtLeast(11) || OperatingSystem.IsTvOSVersionAtLeast(11)) + if (OperatingSystem.IsIOSVersionAtLeast(11) || OperatingSystem.IsMacCatalystVersionAtLeast(11) +#if TVOS + || OperatingSystem.IsTvOSVersionAtLeast(11) +#endif + ) + { _containerArea.InsetsLayoutMarginsFromSafeArea = false; + } View.AddSubview(_containerArea); @@ -508,7 +514,12 @@ void LayoutHeader() if (_header != null) { tabThickness = HeaderHeight; - var headerTop = (OperatingSystem.IsIOSVersionAtLeast(11) || OperatingSystem.IsTvOSVersionAtLeast(11)) ? View.SafeAreaInsets.Top : TopLayoutGuide.Length; + var headerTop = (OperatingSystem.IsIOSVersionAtLeast(11) || OperatingSystem.IsMacCatalystVersionAtLeast(11) +#if TVOS + || OperatingSystem.IsTvOSVersionAtLeast(11) +#endif + ) ? View.SafeAreaInsets.Top : TopLayoutGuide.Length; + CGRect frame = new CGRect(View.Bounds.X, headerTop, View.Bounds.Width, HeaderHeight); _blurView.Frame = frame; _header.ViewController.View.Frame = frame; @@ -518,7 +529,11 @@ void LayoutHeader() nfloat top; nfloat right; nfloat bottom; - if (OperatingSystem.IsIOSVersionAtLeast(11) || OperatingSystem.IsTvOSVersionAtLeast(11)) + if (OperatingSystem.IsIOSVersionAtLeast(11) || OperatingSystem.IsMacCatalystVersionAtLeast(11) +#if TVOS + || OperatingSystem.IsTvOSVersionAtLeast(11) +#endif + ) { left = View.SafeAreaInsets.Left; top = View.SafeAreaInsets.Top; diff --git a/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellTableViewController.cs b/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellTableViewController.cs index d60d01798d87..64280281898e 100644 --- a/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellTableViewController.cs +++ b/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellTableViewController.cs @@ -76,8 +76,14 @@ public override void ViewDidLoad() base.ViewDidLoad(); TableView.SeparatorStyle = UITableViewCellSeparatorStyle.None; - if (OperatingSystem.IsIOSVersionAtLeast(11) || OperatingSystem.IsTvOSVersionAtLeast(11)) + if (OperatingSystem.IsIOSVersionAtLeast(11) || OperatingSystem.IsMacCatalystVersionAtLeast(11) +#if TVOS + || OperatingSystem.IsTvOSVersionAtLeast(11) +#endif + ) + { TableView.ContentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentBehavior.Never; + } TableView.Source = _source; ShellFlyoutContentManager.ViewDidLoad(); diff --git a/src/Controls/src/Core/Handlers/Items/iOS/ItemsViewController.cs b/src/Controls/src/Core/Handlers/Items/iOS/ItemsViewController.cs index 9ea7c84f3f9c..21b0ac6a01cd 100644 --- a/src/Controls/src/Core/Handlers/Items/iOS/ItemsViewController.cs +++ b/src/Controls/src/Core/Handlers/Items/iOS/ItemsViewController.cs @@ -134,7 +134,11 @@ public override void ViewDidLoad() ItemsSource = CreateItemsViewSource(); - if (!(OperatingSystem.IsIOSVersionAtLeast(11) || OperatingSystem.IsTvOSVersionAtLeast(11))) + if (!(OperatingSystem.IsIOSVersionAtLeast(11) || OperatingSystem.IsMacCatalystVersionAtLeast(11) +#if TVOS + || OperatingSystem.IsTvOSVersionAtLeast(11) +#endif + )) { AutomaticallyAdjustsScrollViewInsets = false; } diff --git a/src/Controls/src/Core/Handlers/Items/iOS/ItemsViewLayout.cs b/src/Controls/src/Core/Handlers/Items/iOS/ItemsViewLayout.cs index cc173dcf9084..7998540ab947 100644 --- a/src/Controls/src/Core/Handlers/Items/iOS/ItemsViewLayout.cs +++ b/src/Controls/src/Core/Handlers/Items/iOS/ItemsViewLayout.cs @@ -44,7 +44,11 @@ protected ItemsViewLayout(ItemsLayout itemsLayout, ItemSizingStrategy itemSizing Initialize(scrollDirection); - if (OperatingSystem.IsIOSVersionAtLeast(11) || OperatingSystem.IsTvOSVersionAtLeast(11)) + if (OperatingSystem.IsIOSVersionAtLeast(11) || OperatingSystem.IsMacCatalystVersionAtLeast(11) +#if TVOS + || OperatingSystem.IsTvOSVersionAtLeast(11) +#endif + ) { // `ContentInset` is actually the default value, but I'm leaving this here as a note to // future maintainers; it's likely that someone will want a Platform Specific to change this behavior @@ -563,7 +567,11 @@ public override bool ShouldInvalidateLayoutForBoundsChange(CGRect newBounds) return base.ShouldInvalidateLayoutForBoundsChange(newBounds); } - if (OperatingSystem.IsIOSVersionAtLeast(11) || OperatingSystem.IsTvOSVersionAtLeast(11)) + if (OperatingSystem.IsIOSVersionAtLeast(11) || OperatingSystem.IsMacCatalystVersionAtLeast(11) +#if TVOS + || OperatingSystem.IsTvOSVersionAtLeast(11) +#endif + ) { UpdateConstraints(CollectionView.AdjustedContentInset.InsetRect(newBounds).Size); } diff --git a/src/Controls/src/Core/Platform/GestureManager/GestureManager.iOS.cs b/src/Controls/src/Core/Platform/GestureManager/GestureManager.iOS.cs index e76e32c59418..ff4712e50d7a 100644 --- a/src/Controls/src/Core/Platform/GestureManager/GestureManager.iOS.cs +++ b/src/Controls/src/Core/Platform/GestureManager/GestureManager.iOS.cs @@ -412,7 +412,11 @@ _handler.VirtualView is View v && { _platformView.AccessibilityTraits |= UIAccessibilityTrait.Button; _addedFlags |= UIAccessibilityTrait.Button; - if (OperatingSystem.IsIOSVersionAtLeast(13) || OperatingSystem.IsTvOSVersionAtLeast(13)) + if (OperatingSystem.IsIOSVersionAtLeast(13) || OperatingSystem.IsMacCatalystVersionAtLeast(13) +#if TVOS + || OperatingSystem.IsTvOSVersionAtLeast(11) +#endif + ) { _defaultAccessibilityRespondsToUserInteraction = _platformView.AccessibilityRespondsToUserInteraction; _platformView.AccessibilityRespondsToUserInteraction = true; @@ -528,7 +532,7 @@ void GestureRecognizersOnCollectionChanged(object? sender, NotifyCollectionChang { _platformView.AccessibilityTraits &= ~_addedFlags; - if (OperatingSystem.IsIOSVersionAtLeast(13) || OperatingSystem.IsTvOSVersionAtLeast(13)) + if (OperatingSystem.IsIOSVersionAtLeast(13) || OperatingSystem.IsMacCatalystVersionAtLeast(13)) { if (_defaultAccessibilityRespondsToUserInteraction != null) _platformView.AccessibilityRespondsToUserInteraction = _defaultAccessibilityRespondsToUserInteraction.Value; diff --git a/src/Core/src/Handlers/ViewHandlerExtensions.iOS.cs b/src/Core/src/Handlers/ViewHandlerExtensions.iOS.cs index 270d067021dc..12c80dd0fa82 100644 --- a/src/Core/src/Handlers/ViewHandlerExtensions.iOS.cs +++ b/src/Core/src/Handlers/ViewHandlerExtensions.iOS.cs @@ -23,7 +23,13 @@ internal static void LayoutVirtualView( } bounds = bounds ?? platformView.Bounds; - if (virtualView is ISafeAreaView sav && !sav.IgnoreSafeArea && (System.OperatingSystem.IsIOSVersionAtLeast(11) || System.OperatingSystem.IsTvOSVersionAtLeast(11))) + + if (virtualView is ISafeAreaView sav && !sav.IgnoreSafeArea + && (System.OperatingSystem.IsIOSVersionAtLeast(11) || System.OperatingSystem.IsMacCatalystVersionAtLeast(11) +#if TVOS + || OperatingSystem.IsTvOSVersionAtLeast(11) +#endif + )) { bounds = platformView.SafeAreaInsets.InsetRect(bounds.Value); } diff --git a/src/Core/src/Handlers/WebView/WebViewHandler.iOS.cs b/src/Core/src/Handlers/WebView/WebViewHandler.iOS.cs index d9e865526828..f6f8f27d0a2c 100644 --- a/src/Core/src/Handlers/WebView/WebViewHandler.iOS.cs +++ b/src/Core/src/Handlers/WebView/WebViewHandler.iOS.cs @@ -158,7 +158,7 @@ internal async Task FirstLoadUrlAsync(string url) var safeHostUri = new Uri($"{uri.Scheme}://{uri.Authority}", UriKind.Absolute); var safeRelativeUri = new Uri($"{uri.PathAndQuery}{uri.Fragment}", UriKind.Relative); - NSUrlRequest request = new NSUrlRequest(new Uri(safeHostUri, safeRelativeUri)); + var request = new NSUrlRequest(new NSUrl(new Uri(safeHostUri, safeRelativeUri).AbsoluteUri)); if (HasCookiesToLoad(url) && !(OperatingSystem.IsIOSVersionAtLeast(11) || OperatingSystem.IsTvOSVersionAtLeast(11))) return; diff --git a/src/Core/src/Platform/iOS/MauiPageControl.cs b/src/Core/src/Platform/iOS/MauiPageControl.cs index 8ad57efe2f72..edf73aefaaf1 100644 --- a/src/Core/src/Platform/iOS/MauiPageControl.cs +++ b/src/Core/src/Platform/iOS/MauiPageControl.cs @@ -15,7 +15,12 @@ public class MauiPageControl : UIPageControl public MauiPageControl() { ValueChanged += MauiPageControlValueChanged; - if (OperatingSystem.IsIOSVersionAtLeast(14) || OperatingSystem.IsTvOSVersionAtLeast(14)) + + if (OperatingSystem.IsIOSVersionAtLeast(14) || OperatingSystem.IsMacCatalystVersionAtLeast(14) +#if TVOS + || OperatingSystem.IsTvOSVersionAtLeast(14) +#endif + ) { AllowsContinuousInteraction = false; BackgroundStyle = UIPageControlBackgroundStyle.Minimal; diff --git a/src/Core/src/Platform/iOS/MauiWKWebView.cs b/src/Core/src/Platform/iOS/MauiWKWebView.cs index 455818148f29..deee1d19985f 100644 --- a/src/Core/src/Platform/iOS/MauiWKWebView.cs +++ b/src/Core/src/Platform/iOS/MauiWKWebView.cs @@ -77,7 +77,7 @@ public void LoadUrl(string? url) var uri = new Uri(url ?? string.Empty); var safeHostUri = new Uri($"{uri.Scheme}://{uri.Authority}", UriKind.Absolute); var safeRelativeUri = new Uri($"{uri.PathAndQuery}{uri.Fragment}", UriKind.Relative); - NSUrlRequest request = new NSUrlRequest(new Uri(safeHostUri, safeRelativeUri)); + NSUrlRequest request = new NSUrlRequest(new NSUrl(new Uri(safeHostUri, safeRelativeUri).AbsoluteUri)); LoadRequest(request); } diff --git a/src/Essentials/samples/Sample.Server.WebAuthenticator/Essentials.Sample.Server.WebAuthenticator.csproj b/src/Essentials/samples/Sample.Server.WebAuthenticator/Essentials.Sample.Server.WebAuthenticator.csproj index 9eae47013c1d..d69f3925f5ce 100644 --- a/src/Essentials/samples/Sample.Server.WebAuthenticator/Essentials.Sample.Server.WebAuthenticator.csproj +++ b/src/Essentials/samples/Sample.Server.WebAuthenticator/Essentials.Sample.Server.WebAuthenticator.csproj @@ -4,12 +4,13 @@ $(_MauiDotNetTfm) + - + diff --git a/src/Essentials/samples/Sample.Server.WebAuthenticator/Properties/launchSettings.json b/src/Essentials/samples/Sample.Server.WebAuthenticator/Properties/launchSettings.json index 1047368dfb59..6c0ef8184858 100644 --- a/src/Essentials/samples/Sample.Server.WebAuthenticator/Properties/launchSettings.json +++ b/src/Essentials/samples/Sample.Server.WebAuthenticator/Properties/launchSettings.json @@ -18,10 +18,10 @@ "Sample.Server.WebAuthenticator": { "commandName": "Project", "launchBrowser": true, + "applicationUrl": "https://localhost:5001;http://localhost:5000", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" - }, - "applicationUrl": "https://localhost:5001;http://localhost:5000" + } } } } \ No newline at end of file diff --git a/src/Essentials/src/DeviceDisplay/DeviceDisplay.ios.cs b/src/Essentials/src/DeviceDisplay/DeviceDisplay.ios.cs index 8288d10936c0..045224cd25ee 100644 --- a/src/Essentials/src/DeviceDisplay/DeviceDisplay.ios.cs +++ b/src/Essentials/src/DeviceDisplay/DeviceDisplay.ios.cs @@ -18,9 +18,16 @@ protected override DisplayInfo GetMainDisplayInfo() var bounds = UIScreen.MainScreen.Bounds; var scale = UIScreen.MainScreen.Scale; - var rate = (OperatingSystem.IsIOSVersionAtLeast(10, 3) || OperatingSystem.IsTvOSVersionAtLeast(10, 3)) - ? UIScreen.MainScreen.MaximumFramesPerSecond - : 0; + nint rate = 0; + + if (OperatingSystem.IsIOSVersionAtLeast(10, 3) || OperatingSystem.IsMacCatalystVersionAtLeast(10, 3) +#if TVOS + || OperatingSystem.IsTvOSVersionAtLeast(11) +#endif + ) + { + rate = UIScreen.MainScreen.MaximumFramesPerSecond; + } return new DisplayInfo( width: bounds.Width * scale, diff --git a/src/Essentials/src/WebAuthenticator/WebAuthenticator.shared.cs b/src/Essentials/src/WebAuthenticator/WebAuthenticator.shared.cs index eb12ee874617..b592d2e973f1 100644 --- a/src/Essentials/src/WebAuthenticator/WebAuthenticator.shared.cs +++ b/src/Essentials/src/WebAuthenticator/WebAuthenticator.shared.cs @@ -57,8 +57,13 @@ public static Task AuthenticateAsync(this IWebAuthentica public static bool OpenUrl(this IWebAuthenticator webAuthenticator, Uri uri) => webAuthenticator.AsPlatformCallback().OpenUrlCallback(uri); - public static bool OpenUrl(this IWebAuthenticator webAuthenticator, UIKit.UIApplication app, Foundation.NSUrl url, Foundation.NSDictionary options) => - webAuthenticator.OpenUrl(new Uri(url.AbsoluteString)); + public static bool OpenUrl(this IWebAuthenticator webAuthenticator, UIKit.UIApplication app, Foundation.NSUrl url, Foundation.NSDictionary options) + { + var absUri = url?.AbsoluteString; + if (!string.IsNullOrEmpty(absUri)) + return webAuthenticator.OpenUrl(new Uri(absUri)); + return false; + } public static bool ContinueUserActivity(this IWebAuthenticator webAuthenticator, UIKit.UIApplication application, Foundation.NSUserActivity userActivity, UIKit.UIApplicationRestorationHandler completionHandler) { From 0b8cf7daf977cbf86ce80f27a64c53f2122a0039 Mon Sep 17 00:00:00 2001 From: redth Date: Mon, 26 Sep 2022 19:21:47 -0400 Subject: [PATCH 18/26] Compilation fixes for xcode14 --- src/BlazorWebView/src/Maui/iOS/BlazorWebViewHandler.iOS.cs | 2 +- src/BlazorWebView/src/Maui/iOS/IOSWebViewManager.cs | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/BlazorWebView/src/Maui/iOS/BlazorWebViewHandler.iOS.cs b/src/BlazorWebView/src/Maui/iOS/BlazorWebViewHandler.iOS.cs index ef46a3cdb405..9e367d0deccd 100644 --- a/src/BlazorWebView/src/Maui/iOS/BlazorWebViewHandler.iOS.cs +++ b/src/BlazorWebView/src/Maui/iOS/BlazorWebViewHandler.iOS.cs @@ -207,7 +207,7 @@ public void StartUrlSchemeTask(WKWebView webView, IWKUrlSchemeTask urlSchemeTask } } - private byte[] GetResponseBytes(string url, out string contentType, out int statusCode) + private byte[] GetResponseBytes(string? url, out string contentType, out int statusCode) { var allowFallbackOnHostPage = AppOriginUri.IsBaseOfPage(url); url = QueryStringHelper.RemovePossibleQueryString(url); diff --git a/src/BlazorWebView/src/Maui/iOS/IOSWebViewManager.cs b/src/BlazorWebView/src/Maui/iOS/IOSWebViewManager.cs index b28f0aa65269..193e82cfb33c 100644 --- a/src/BlazorWebView/src/Maui/iOS/IOSWebViewManager.cs +++ b/src/BlazorWebView/src/Maui/iOS/IOSWebViewManager.cs @@ -266,8 +266,11 @@ public override void DidReceiveServerRedirectForProvisionalNavigation(WKWebView var uri = _currentUri; _currentUri = null; _currentNavigation = null; - var request = new NSUrlRequest(uri); - webView.LoadRequest(request); + if (uri is not null) + { + var request = new NSUrlRequest(new NSUrl(uri.AbsoluteUri)); + webView.LoadRequest(request); + } } } From c9ce003b9e679f9c63a44fb1d389b48c07b4b796 Mon Sep 17 00:00:00 2001 From: redth Date: Mon, 26 Sep 2022 20:06:10 -0400 Subject: [PATCH 19/26] Provision xcode 14 --- eng/pipelines/common/variables.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/eng/pipelines/common/variables.yml b/eng/pipelines/common/variables.yml index dbba305b3b15..1c449052401c 100644 --- a/eng/pipelines/common/variables.yml +++ b/eng/pipelines/common/variables.yml @@ -7,6 +7,8 @@ variables: value: true - name: DOTNET_VERSION value: 5.0.201 +- name: REQUIRED_XCODE + value: 14.0.0 - name: LocBranchPrefix value: 'loc-hb' - name: isMainBranch From f5c0fdbc8628f65e3a87a4fb96e5b49073522c5e Mon Sep 17 00:00:00 2001 From: redth Date: Mon, 26 Sep 2022 20:07:34 -0400 Subject: [PATCH 20/26] Extra space --- eng/pipelines/common/variables.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/common/variables.yml b/eng/pipelines/common/variables.yml index 1c449052401c..1800e07c0bf5 100644 --- a/eng/pipelines/common/variables.yml +++ b/eng/pipelines/common/variables.yml @@ -8,7 +8,7 @@ variables: - name: DOTNET_VERSION value: 5.0.201 - name: REQUIRED_XCODE - value: 14.0.0 + value: 14.0.0 - name: LocBranchPrefix value: 'loc-hb' - name: isMainBranch From 101a24efd25a92a54e911ad71776e355b03e5444 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 27 Sep 2022 10:53:25 +0000 Subject: [PATCH 21/26] Update dependencies from https://github.com/xamarin/xamarin-macios build 20220927.2 Microsoft.iOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.macOS.Sdk , Microsoft.tvOS.Sdk From Version 15.4.454 -> To Version 15.4.464 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0dbf6d97651c..8754dfdbd2c2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -12,21 +12,21 @@ https://github.com/xamarin/xamarin-android 04623cdc317c3da5efce46cb16d94befe4833125 - + https://github.com/xamarin/xamarin-macios - 55f0667f841c5c4e69031c791d915da2f4a7a98f + 1534bfa33ff658632b969bf2479ec2627c8a7e0a - + https://github.com/xamarin/xamarin-macios - 85b1fdf9efdb20cb7ac10468cf4147da2ea53c55 + 1534bfa33ff658632b969bf2479ec2627c8a7e0a - + https://github.com/xamarin/xamarin-macios - 85b1fdf9efdb20cb7ac10468cf4147da2ea53c55 + 1534bfa33ff658632b969bf2479ec2627c8a7e0a - + https://github.com/xamarin/xamarin-macios - 55f0667f841c5c4e69031c791d915da2f4a7a98f + 1534bfa33ff658632b969bf2479ec2627c8a7e0a https://github.com/dotnet/emsdk diff --git a/eng/Versions.props b/eng/Versions.props index fe42d2507fd9..5fed4421be01 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,10 +11,10 @@ 32.0.468 - 16.0.513 - 15.4.460 - 12.3.460 - 16.0.513 + 15.4.464 + 15.4.464 + 12.3.464 + 15.4.464 7.0.400-preview.1.0 From a53d39368a47f86e78bff2c2d7a55f5f57d3c9d6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 27 Sep 2022 11:11:31 +0000 Subject: [PATCH 22/26] Update dependencies from https://github.com/xamarin/xamarin-macios build 20220927.4 Microsoft.iOS.Sdk , Microsoft.tvOS.Sdk From Version 15.4.454 -> To Version 16.0.514 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8754dfdbd2c2..01704952a283 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -16,13 +16,13 @@ https://github.com/xamarin/xamarin-macios 1534bfa33ff658632b969bf2479ec2627c8a7e0a - + https://github.com/xamarin/xamarin-macios - 1534bfa33ff658632b969bf2479ec2627c8a7e0a + d84d07446e1163cb15012e3a6d181599a1054192 - + https://github.com/xamarin/xamarin-macios - 1534bfa33ff658632b969bf2479ec2627c8a7e0a + d84d07446e1163cb15012e3a6d181599a1054192 https://github.com/xamarin/xamarin-macios diff --git a/eng/Versions.props b/eng/Versions.props index 5fed4421be01..44aa2c2ee18f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,10 +11,10 @@ 32.0.468 - 15.4.464 + 16.0.514 15.4.464 12.3.464 - 15.4.464 + 16.0.514 7.0.400-preview.1.0 From 0c54cde6269d0c93432b620fddf6b34be69e9943 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 27 Sep 2022 11:14:56 +0000 Subject: [PATCH 23/26] Update dependencies from https://github.com/xamarin/xamarin-macios build 20220927.3 Microsoft.iOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.macOS.Sdk , Microsoft.tvOS.Sdk From Version 15.4.454 -> To Version 15.4.465 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 01704952a283..b4d421646327 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -12,21 +12,21 @@ https://github.com/xamarin/xamarin-android 04623cdc317c3da5efce46cb16d94befe4833125 - + https://github.com/xamarin/xamarin-macios - 1534bfa33ff658632b969bf2479ec2627c8a7e0a + ad955c0d4f7c1e680fddae23707c94faf3cb2802 - + https://github.com/xamarin/xamarin-macios - d84d07446e1163cb15012e3a6d181599a1054192 + ad955c0d4f7c1e680fddae23707c94faf3cb2802 - + https://github.com/xamarin/xamarin-macios - d84d07446e1163cb15012e3a6d181599a1054192 + ad955c0d4f7c1e680fddae23707c94faf3cb2802 - + https://github.com/xamarin/xamarin-macios - 1534bfa33ff658632b969bf2479ec2627c8a7e0a + ad955c0d4f7c1e680fddae23707c94faf3cb2802 https://github.com/dotnet/emsdk diff --git a/eng/Versions.props b/eng/Versions.props index 44aa2c2ee18f..e2bdf482224b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,10 +11,10 @@ 32.0.468 - 16.0.514 - 15.4.464 - 12.3.464 - 16.0.514 + 15.4.465 + 15.4.465 + 12.3.465 + 15.4.465 7.0.400-preview.1.0 From a69bcb0890acdd1a25cab4d3ddf9bd12dc5881fb Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Tue, 27 Sep 2022 14:06:33 +0100 Subject: [PATCH 24/26] Use Xcode14 for iOS and tvOS --- eng/Version.Details.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b4d421646327..82ecbb99c770 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -16,13 +16,13 @@ https://github.com/xamarin/xamarin-macios ad955c0d4f7c1e680fddae23707c94faf3cb2802 - + https://github.com/xamarin/xamarin-macios - ad955c0d4f7c1e680fddae23707c94faf3cb2802 + d84d07446e1163cb15012e3a6d181599a1054192 - + https://github.com/xamarin/xamarin-macios - ad955c0d4f7c1e680fddae23707c94faf3cb2802 + d84d07446e1163cb15012e3a6d181599a1054192 https://github.com/xamarin/xamarin-macios From 4ca1e52f3937661f9c1290bb722eb5209bc5b83c Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Tue, 27 Sep 2022 15:02:06 +0100 Subject: [PATCH 25/26] Push missing file --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index e2bdf482224b..ce4b0d78f6fb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,10 +11,10 @@ 32.0.468 - 15.4.465 + 16.0.514 15.4.465 12.3.465 - 15.4.465 + 16.0.514 7.0.400-preview.1.0 From 95c501eea3dfac0563ca0822d1e9463e5e13fef0 Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Tue, 27 Sep 2022 15:44:24 +0100 Subject: [PATCH 26/26] Device tests need xcode14 too DEVICETESTS_REQUIRED_XCODE --- eng/pipelines/common/variables.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/eng/pipelines/common/variables.yml b/eng/pipelines/common/variables.yml index 1800e07c0bf5..a7bceb223817 100644 --- a/eng/pipelines/common/variables.yml +++ b/eng/pipelines/common/variables.yml @@ -9,6 +9,8 @@ variables: value: 5.0.201 - name: REQUIRED_XCODE value: 14.0.0 +- name: DEVICETESTS_REQUIRED_XCODE + value: 14.0.0 - name: LocBranchPrefix value: 'loc-hb' - name: isMainBranch