From 389f227e09231f4289f840c84f814037323387d0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 23 Sep 2022 13:34:58 +0000 Subject: [PATCH 01/62] Update dependencies from https://github.com/xamarin/xamarin-android build 7.0.1xx-rc2-82e6010400d4949ab54cf8e998e7ad52831c8108-1 Microsoft.Android.Sdk.Windows From Version 33.0.0-rc.1.151 -> To Version 33.0.0-rc.2.193 Dependency coherency updates Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.100-rc.1.22425.9 -> To Version 7.0.100-rc.2.22466.28 (parent: Microsoft.Android.Sdk.Windows --- NuGet.config | 1 - eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index 70cb39a92dd3..8bf37eead792 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ed95cd8c5a62..b7cd5e0df258 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + https://github.com/dotnet/installer - cd7df40ff129744cc664ea5c83c113ccf2763829 + 60fdbb471da784aebd7b2afd24f2eca40fecd7bf - + https://github.com/dotnet/runtime - 06aceb7015f3bd2ff019ef5920d2354eb2ea2c92 + c623d96fe33cc360bd9981c9e6f6a646d7881d9e - + https://github.com/xamarin/xamarin-android - b9389dc0168e184758c226962a0b270d300c17eb + 82e6010400d4949ab54cf8e998e7ad52831c8108 https://github.com/xamarin/xamarin-macios @@ -28,13 +28,13 @@ https://github.com/xamarin/xamarin-macios e7aa824644021c2ff80d5948f089f399bf7568aa - + https://github.com/dotnet/emsdk - 5ef661392ae7b1595b683df83d63e3a0365fc126 + 76e6b338e87093ddc9b3b650f027706aba65d388 - + https://github.com/dotnet/emsdk - 5ef661392ae7b1595b683df83d63e3a0365fc126 + 76e6b338e87093ddc9b3b650f027706aba65d388 https://dev.azure.com/microsoft/ProjectReunion/_git/ProjectReunionInternal diff --git a/eng/Versions.props b/eng/Versions.props index 228279c237f1..b0a3f9e2f381 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -3,15 +3,15 @@ 6.0.533 - 7.0.100-rc.1.22425.9 + 7.0.100-rc.2.22466.28 - 7.0.0-rc.1.22426.10 + 7.0.0-rc.2.22464.1 7.0.0-rc.2.22430.11 7.0.0-rc.2.22430.11 6.0.0 - 33.0.0-rc.1.151 + 33.0.0-rc.2.193 15.4.1029-rc.1 15.4.1029-rc.1 @@ -20,7 +20,7 @@ 7.0.100-rc.1.22 - 7.0.0-rc.1.22424.1 + 7.0.0-rc.2.22459.3 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion) 1.1.4 From 80f0f4e239cd1a32658441e0605e09058740fce3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 23 Sep 2022 13:37:08 +0000 Subject: [PATCH 02/62] Update dependencies from https://github.com/xamarin/xamarin-macios build 20220922.36 Microsoft.iOS.Sdk , Microsoft.tvOS.Sdk From Version 15.4.1029-rc.1 -> To Version 16.0.1247-rc.2-xcode14 --- NuGet.config | 1 - eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index 70cb39a92dd3..8bf37eead792 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ed95cd8c5a62..f2073795124e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -16,13 +16,13 @@ https://github.com/xamarin/xamarin-macios e7aa824644021c2ff80d5948f089f399bf7568aa - + https://github.com/xamarin/xamarin-macios - e7aa824644021c2ff80d5948f089f399bf7568aa + 40b10a1c18b3d8d0053f188564e52ccf534b7f38 - + https://github.com/xamarin/xamarin-macios - e7aa824644021c2ff80d5948f089f399bf7568aa + 40b10a1c18b3d8d0053f188564e52ccf534b7f38 https://github.com/xamarin/xamarin-macios diff --git a/eng/Versions.props b/eng/Versions.props index 228279c237f1..5a4fcd65d3b7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,10 +13,10 @@ 33.0.0-rc.1.151 - 15.4.1029-rc.1 + 16.0.1247-rc.2-xcode14 15.4.1029-rc.1 12.3.1029-rc.1 - 15.4.1029-rc.1 + 16.0.1247-rc.2-xcode14 7.0.100-rc.1.22 From 0a5795354880a05f10e09b9d6e3474686f84d26c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 23 Sep 2022 14:52:27 +0000 Subject: [PATCH 03/62] Update dependencies from https://github.com/xamarin/xamarin-macios build 20220923.12 Microsoft.iOS.Sdk , Microsoft.tvOS.Sdk From Version 15.4.1029-rc.1 -> To Version 16.0.1250-rc.2-xcode14 --- 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 f2073795124e..f5e7fd6c2735 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -16,13 +16,13 @@ https://github.com/xamarin/xamarin-macios e7aa824644021c2ff80d5948f089f399bf7568aa - + https://github.com/xamarin/xamarin-macios - 40b10a1c18b3d8d0053f188564e52ccf534b7f38 + e8777eb373648cc35f77556bfd61ddf7acf08112 - + https://github.com/xamarin/xamarin-macios - 40b10a1c18b3d8d0053f188564e52ccf534b7f38 + e8777eb373648cc35f77556bfd61ddf7acf08112 https://github.com/xamarin/xamarin-macios diff --git a/eng/Versions.props b/eng/Versions.props index 5a4fcd65d3b7..c5856c3b2e68 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,10 +13,10 @@ 33.0.0-rc.1.151 - 16.0.1247-rc.2-xcode14 + 16.0.1250-rc.2-xcode14 15.4.1029-rc.1 12.3.1029-rc.1 - 16.0.1247-rc.2-xcode14 + 16.0.1250-rc.2-xcode14 7.0.100-rc.1.22 From 29b9fbd287c4ce34c8fc0b7915e26d7941fbfe51 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 23 Sep 2022 14:58:29 +0000 Subject: [PATCH 04/62] Update dependencies from https://github.com/xamarin/xamarin-macios build 20220923.13 Microsoft.iOS.Sdk , Microsoft.tvOS.Sdk From Version 15.4.1029-rc.1 -> To Version 16.0.1251-rc.2-xcode14 --- 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 f5e7fd6c2735..c03d00d6a050 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -16,13 +16,13 @@ https://github.com/xamarin/xamarin-macios e7aa824644021c2ff80d5948f089f399bf7568aa - + https://github.com/xamarin/xamarin-macios - e8777eb373648cc35f77556bfd61ddf7acf08112 + b1394e3b3c65b7a2042c9fe2736cbee97fbe0433 - + https://github.com/xamarin/xamarin-macios - e8777eb373648cc35f77556bfd61ddf7acf08112 + b1394e3b3c65b7a2042c9fe2736cbee97fbe0433 https://github.com/xamarin/xamarin-macios diff --git a/eng/Versions.props b/eng/Versions.props index c5856c3b2e68..45b0aa85e17c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,10 +13,10 @@ 33.0.0-rc.1.151 - 16.0.1250-rc.2-xcode14 + 16.0.1251-rc.2-xcode14 15.4.1029-rc.1 12.3.1029-rc.1 - 16.0.1250-rc.2-xcode14 + 16.0.1251-rc.2-xcode14 7.0.100-rc.1.22 From f17597f8cd8f78e18326f8b2f30da8be1c342f04 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 23 Sep 2022 23:25:46 +0000 Subject: [PATCH 05/62] Update dependencies from https://github.com/xamarin/xamarin-macios build 20220923.30 Microsoft.iOS.Sdk , Microsoft.tvOS.Sdk From Version 15.4.1029-rc.1 -> To Version 16.0.1252-rc.2-xcode14 --- 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 c03d00d6a050..972aedbb1f70 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -16,13 +16,13 @@ https://github.com/xamarin/xamarin-macios e7aa824644021c2ff80d5948f089f399bf7568aa - + https://github.com/xamarin/xamarin-macios - b1394e3b3c65b7a2042c9fe2736cbee97fbe0433 + 3be2af2701af750b052ba23a1d7804eab989fdde - + https://github.com/xamarin/xamarin-macios - b1394e3b3c65b7a2042c9fe2736cbee97fbe0433 + 3be2af2701af750b052ba23a1d7804eab989fdde https://github.com/xamarin/xamarin-macios diff --git a/eng/Versions.props b/eng/Versions.props index 45b0aa85e17c..8727fdd56efb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,10 +13,10 @@ 33.0.0-rc.1.151 - 16.0.1251-rc.2-xcode14 + 16.0.1252-rc.2-xcode14 15.4.1029-rc.1 12.3.1029-rc.1 - 16.0.1251-rc.2-xcode14 + 16.0.1252-rc.2-xcode14 7.0.100-rc.1.22 From 993afa68fa60524687e9e6db7c151c12d4259551 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 23 Sep 2022 23:57:24 +0000 Subject: [PATCH 06/62] Update dependencies from https://github.com/xamarin/xamarin-macios build 20220923.32 Microsoft.iOS.Sdk , Microsoft.tvOS.Sdk From Version 15.4.1029-rc.1 -> To Version 16.0.1253-rc.2-xcode14 --- 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 972aedbb1f70..0bf46f599c6a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -16,13 +16,13 @@ https://github.com/xamarin/xamarin-macios e7aa824644021c2ff80d5948f089f399bf7568aa - + https://github.com/xamarin/xamarin-macios - 3be2af2701af750b052ba23a1d7804eab989fdde + b1796765278c02ce37fad8d222656c99e18321fe - + https://github.com/xamarin/xamarin-macios - 3be2af2701af750b052ba23a1d7804eab989fdde + b1796765278c02ce37fad8d222656c99e18321fe https://github.com/xamarin/xamarin-macios diff --git a/eng/Versions.props b/eng/Versions.props index 8727fdd56efb..47f36cd87f8c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,10 +13,10 @@ 33.0.0-rc.1.151 - 16.0.1252-rc.2-xcode14 + 16.0.1253-rc.2-xcode14 15.4.1029-rc.1 12.3.1029-rc.1 - 16.0.1252-rc.2-xcode14 + 16.0.1253-rc.2-xcode14 7.0.100-rc.1.22 From 21b6df4f3b448f6f4df7cdafc601ffcb6b002422 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 24 Sep 2022 00:07:29 +0000 Subject: [PATCH 07/62] Update dependencies from https://github.com/xamarin/xamarin-macios build 20220923.33 Microsoft.iOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.macOS.Sdk , Microsoft.tvOS.Sdk From Version 15.4.1029-rc.1 -> To Version 15.4.1172-rc.2 --- 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 0bf46f599c6a..5201d04f0f92 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -12,21 +12,21 @@ https://github.com/xamarin/xamarin-android b9389dc0168e184758c226962a0b270d300c17eb - + https://github.com/xamarin/xamarin-macios - e7aa824644021c2ff80d5948f089f399bf7568aa + 48df7dda9cd08bef68a5298c419064449cbd29d6 - + https://github.com/xamarin/xamarin-macios - b1796765278c02ce37fad8d222656c99e18321fe + 48df7dda9cd08bef68a5298c419064449cbd29d6 - + https://github.com/xamarin/xamarin-macios - b1796765278c02ce37fad8d222656c99e18321fe + 48df7dda9cd08bef68a5298c419064449cbd29d6 - + https://github.com/xamarin/xamarin-macios - e7aa824644021c2ff80d5948f089f399bf7568aa + 48df7dda9cd08bef68a5298c419064449cbd29d6 https://github.com/dotnet/emsdk diff --git a/eng/Versions.props b/eng/Versions.props index 47f36cd87f8c..5dc947ac2faf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,10 +13,10 @@ 33.0.0-rc.1.151 - 16.0.1253-rc.2-xcode14 - 15.4.1029-rc.1 - 12.3.1029-rc.1 - 16.0.1253-rc.2-xcode14 + 15.4.1172-rc.2 + 15.4.1172-rc.2 + 12.3.1172-rc.2 + 15.4.1172-rc.2 7.0.100-rc.1.22 From 6694695ecff06cb0d61a30fbb43098dffab298c9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 24 Sep 2022 00:22:10 +0000 Subject: [PATCH 08/62] Update dependencies from https://github.com/xamarin/xamarin-macios build 20220923.31 Microsoft.iOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.macOS.Sdk , Microsoft.tvOS.Sdk From Version 15.4.1029-rc.1 -> To Version 15.4.1171-rc.2 --- 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 5201d04f0f92..d0d877eb74fe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -12,21 +12,21 @@ https://github.com/xamarin/xamarin-android b9389dc0168e184758c226962a0b270d300c17eb - + https://github.com/xamarin/xamarin-macios - 48df7dda9cd08bef68a5298c419064449cbd29d6 + 8fab54b7dd18673da36622a6de6c4ca655eca498 - + https://github.com/xamarin/xamarin-macios - 48df7dda9cd08bef68a5298c419064449cbd29d6 + 8fab54b7dd18673da36622a6de6c4ca655eca498 - + https://github.com/xamarin/xamarin-macios - 48df7dda9cd08bef68a5298c419064449cbd29d6 + 8fab54b7dd18673da36622a6de6c4ca655eca498 - + https://github.com/xamarin/xamarin-macios - 48df7dda9cd08bef68a5298c419064449cbd29d6 + 8fab54b7dd18673da36622a6de6c4ca655eca498 https://github.com/dotnet/emsdk diff --git a/eng/Versions.props b/eng/Versions.props index 5dc947ac2faf..992ab752e58c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,10 +13,10 @@ 33.0.0-rc.1.151 - 15.4.1172-rc.2 - 15.4.1172-rc.2 - 12.3.1172-rc.2 - 15.4.1172-rc.2 + 15.4.1171-rc.2 + 15.4.1171-rc.2 + 12.3.1171-rc.2 + 15.4.1171-rc.2 7.0.100-rc.1.22 From 61940fe3fe1a1b09fd13654d286cfc4fa36fbc54 Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Sat, 24 Sep 2022 14:07:28 +0100 Subject: [PATCH 09/62] Bump tizen --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 8ecafd832ebf..d8de8a9aa60e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -18,7 +18,7 @@ 12.3.1171-rc.2 15.4.1171-rc.2 - 7.0.100-rc.1.22 + 7.0.100-rc.2.24 7.0.0-rc.2.22459.3 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion) From ab74f64daa44a106bb35f20177086ce093acd354 Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Sun, 25 Sep 2022 12:26:02 +0100 Subject: [PATCH 10/62] Fixes for iOS API's --- src/Core/src/Platform/iOS/MauiPageControl.cs | 2 +- src/Essentials/src/DeviceDisplay/DeviceDisplay.ios.cs | 2 +- .../src/WebAuthenticator/WebAuthenticator.shared.cs | 10 ++++++++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/Core/src/Platform/iOS/MauiPageControl.cs b/src/Core/src/Platform/iOS/MauiPageControl.cs index 8ad57efe2f72..91b4405a66df 100644 --- a/src/Core/src/Platform/iOS/MauiPageControl.cs +++ b/src/Core/src/Platform/iOS/MauiPageControl.cs @@ -15,7 +15,7 @@ public class MauiPageControl : UIPageControl public MauiPageControl() { ValueChanged += MauiPageControlValueChanged; - if (OperatingSystem.IsIOSVersionAtLeast(14) || OperatingSystem.IsTvOSVersionAtLeast(14)) + if (OperatingSystem.IsIOSVersionAtLeast(14) || OperatingSystem.IsMacCatalystVersionAtLeast(14) || OperatingSystem.IsTvOSVersionAtLeast(14)) { AllowsContinuousInteraction = false; BackgroundStyle = UIPageControlBackgroundStyle.Minimal; diff --git a/src/Essentials/src/DeviceDisplay/DeviceDisplay.ios.cs b/src/Essentials/src/DeviceDisplay/DeviceDisplay.ios.cs index 8288d10936c0..00ee927be616 100644 --- a/src/Essentials/src/DeviceDisplay/DeviceDisplay.ios.cs +++ b/src/Essentials/src/DeviceDisplay/DeviceDisplay.ios.cs @@ -18,7 +18,7 @@ protected override DisplayInfo GetMainDisplayInfo() var bounds = UIScreen.MainScreen.Bounds; var scale = UIScreen.MainScreen.Scale; - var rate = (OperatingSystem.IsIOSVersionAtLeast(10, 3) || OperatingSystem.IsTvOSVersionAtLeast(10, 3)) + var rate = (OperatingSystem.IsIOSVersionAtLeast(10, 3) || OperatingSystem.IsMacCatalystVersionAtLeast(10, 3) || OperatingSystem.IsTvOSVersionAtLeast(10, 3)) ? UIScreen.MainScreen.MaximumFramesPerSecond : 0; diff --git a/src/Essentials/src/WebAuthenticator/WebAuthenticator.shared.cs b/src/Essentials/src/WebAuthenticator/WebAuthenticator.shared.cs index eb12ee874617..9a11c0263564 100644 --- a/src/Essentials/src/WebAuthenticator/WebAuthenticator.shared.cs +++ b/src/Essentials/src/WebAuthenticator/WebAuthenticator.shared.cs @@ -57,8 +57,14 @@ 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) + { + if(url?.AbsoluteString != null) + { + return webAuthenticator.OpenUrl(new Uri(url.AbsoluteString)); + } + return false; + } public static bool ContinueUserActivity(this IWebAuthenticator webAuthenticator, UIKit.UIApplication application, Foundation.NSUserActivity userActivity, UIKit.UIApplicationRestorationHandler completionHandler) { From 5fb573321e7eab32619b543539dcf3afeb1692fd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 26 Sep 2022 13:24:21 +0000 Subject: [PATCH 11/62] Update dependencies from https://github.com/xamarin/xamarin-macios build 20220926.1 Microsoft.iOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.macOS.Sdk , Microsoft.tvOS.Sdk From Version 15.4.1029-rc.1 -> To Version 15.4.1173-rc.2 --- 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 d0d877eb74fe..abc9f5a6ea12 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -12,21 +12,21 @@ https://github.com/xamarin/xamarin-android b9389dc0168e184758c226962a0b270d300c17eb - + https://github.com/xamarin/xamarin-macios - 8fab54b7dd18673da36622a6de6c4ca655eca498 + e1d4531253a0c0ffa041b5f1473dec91a764d27f - + https://github.com/xamarin/xamarin-macios - 8fab54b7dd18673da36622a6de6c4ca655eca498 + e1d4531253a0c0ffa041b5f1473dec91a764d27f - + https://github.com/xamarin/xamarin-macios - 8fab54b7dd18673da36622a6de6c4ca655eca498 + e1d4531253a0c0ffa041b5f1473dec91a764d27f - + https://github.com/xamarin/xamarin-macios - 8fab54b7dd18673da36622a6de6c4ca655eca498 + e1d4531253a0c0ffa041b5f1473dec91a764d27f https://github.com/dotnet/emsdk diff --git a/eng/Versions.props b/eng/Versions.props index 992ab752e58c..8f16bfb4450e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,10 +13,10 @@ 33.0.0-rc.1.151 - 15.4.1171-rc.2 - 15.4.1171-rc.2 - 12.3.1171-rc.2 - 15.4.1171-rc.2 + 15.4.1173-rc.2 + 15.4.1173-rc.2 + 12.3.1173-rc.2 + 15.4.1173-rc.2 7.0.100-rc.1.22 From e708fa7cf87cad8f677f018e495b62c945a52bef Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Tue, 13 Sep 2022 08:37:40 -0500 Subject: [PATCH 12/62] Workaround CA1416 repo-wide Context: https://github.com/dotnet/roslyn-analyzers/issues/6158 --- Directory.Build.targets | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Directory.Build.targets b/Directory.Build.targets index 381c6000ea68..b09a7de6ec0b 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -16,14 +16,20 @@ 10.0 10.0 + + $(NoWarn);CA1416 10.0 10.0 + + $(NoWarn);CA1416 13.1 13.1 + + $(NoWarn);CA1416 10.14 From 47d0d99eaa6a30ee3ab5c9f05a5408a5cb967ff9 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Thu, 15 Sep 2022 08:42:03 -0500 Subject: [PATCH 13/62] Fix for Resizetizer/Catalyst interaction Context: https://github.com/dotnet/maui/pull/9968#issuecomment-1248103786 --- .nuspec/Microsoft.Maui.Resizetizer.targets | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.nuspec/Microsoft.Maui.Resizetizer.targets b/.nuspec/Microsoft.Maui.Resizetizer.targets index e3d597213113..6532d119fe7a 100644 --- a/.nuspec/Microsoft.Maui.Resizetizer.targets +++ b/.nuspec/Microsoft.Maui.Resizetizer.targets @@ -123,6 +123,7 @@ $(ResizetizeCollectItemsBeforeTargets); _CollectBundleResources; + _RemoveProcessedImageAssets; _BeforeCoreCompileImageAssets; @@ -133,6 +134,7 @@ $(ProcessMauiFontsBeforeTargets); + _RemoveProcessedImageAssets; _BeforeCoreCompileImageAssets; From d30574f7c75b173108024b12e8b53c3d06f2b251 Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Mon, 26 Sep 2022 15:16:55 +0100 Subject: [PATCH 14/62] Fix other nullable Uri --- src/BlazorWebView/src/Maui/iOS/BlazorWebViewHandler.iOS.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BlazorWebView/src/Maui/iOS/BlazorWebViewHandler.iOS.cs b/src/BlazorWebView/src/Maui/iOS/BlazorWebViewHandler.iOS.cs index ef46a3cdb405..fccd1e37b2d3 100644 --- a/src/BlazorWebView/src/Maui/iOS/BlazorWebViewHandler.iOS.cs +++ b/src/BlazorWebView/src/Maui/iOS/BlazorWebViewHandler.iOS.cs @@ -190,7 +190,7 @@ public SchemeHandler(BlazorWebViewHandler webViewHandler) [SupportedOSPlatform("ios11.0")] public void StartUrlSchemeTask(WKWebView webView, IWKUrlSchemeTask urlSchemeTask) { - var responseBytes = GetResponseBytes(urlSchemeTask.Request.Url.AbsoluteString, out var contentType, statusCode: out var statusCode); + var responseBytes = GetResponseBytes(urlSchemeTask.Request.Url?.AbsoluteString ?? "", out var contentType, statusCode: out var statusCode); if (statusCode == 200) { using (var dic = new NSMutableDictionary()) From 82301b03c1a2ca1c90e22efc8cffadad0bcbc41e Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Mon, 26 Sep 2022 15:28:08 +0100 Subject: [PATCH 15/62] other fix for null Url --- .../src/Maui/iOS/BlazorWebViewHandler.iOS.cs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/BlazorWebView/src/Maui/iOS/BlazorWebViewHandler.iOS.cs b/src/BlazorWebView/src/Maui/iOS/BlazorWebViewHandler.iOS.cs index fccd1e37b2d3..4c9edc85fc50 100644 --- a/src/BlazorWebView/src/Maui/iOS/BlazorWebViewHandler.iOS.cs +++ b/src/BlazorWebView/src/Maui/iOS/BlazorWebViewHandler.iOS.cs @@ -199,8 +199,12 @@ public void StartUrlSchemeTask(WKWebView webView, IWKUrlSchemeTask urlSchemeTask dic.Add((NSString)"Content-Type", (NSString)contentType); // Disable local caching. This will prevent user scripts from executing correctly. dic.Add((NSString)"Cache-Control", (NSString)"no-cache, max-age=0, must-revalidate, no-store"); - using var response = new NSHttpUrlResponse(urlSchemeTask.Request.Url, statusCode, "HTTP/1.1", dic); - urlSchemeTask.DidReceiveResponse(response); + if(urlSchemeTask.Request.Url != null) + { + using var response = new NSHttpUrlResponse(urlSchemeTask.Request.Url, statusCode, "HTTP/1.1", dic); + urlSchemeTask.DidReceiveResponse(response); + } + } urlSchemeTask.DidReceiveData(NSData.FromArray(responseBytes)); urlSchemeTask.DidFinish(); From d6bc269c7680c2575e763c346373be248d3605fe Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Mon, 26 Sep 2022 17:54:05 +0100 Subject: [PATCH 16/62] Fix targets for iOS # Conflicts: # .nuspec/Microsoft.Maui.Resizetizer.targets --- .nuspec/Microsoft.Maui.Resizetizer.targets | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/.nuspec/Microsoft.Maui.Resizetizer.targets b/.nuspec/Microsoft.Maui.Resizetizer.targets index 6532d119fe7a..107f9c5cbc41 100644 --- a/.nuspec/Microsoft.Maui.Resizetizer.targets +++ b/.nuspec/Microsoft.Maui.Resizetizer.targets @@ -122,9 +122,8 @@ $(ResizetizeCollectItemsBeforeTargets); - _CollectBundleResources; - _RemoveProcessedImageAssets; - _BeforeCoreCompileImageAssets; + $(CollectBundleResourcesDependsOn); + $(CompileImageAssetsDependsOn); @@ -134,8 +133,7 @@ $(ProcessMauiFontsBeforeTargets); - _RemoveProcessedImageAssets; - _BeforeCoreCompileImageAssets; + $(CompileImageAssetsDependsOn); @@ -143,6 +141,16 @@ ProcessMauiSplashScreens; $(CollectAppManifestsDependsOn) + + + $(CollectBundleResourcesDependsOn); + ResizetizeCollectItems; + + + + $(CompileImageAssetsDependsOn); + ResizetizeCollectItems; + From bc559680058382cb9139aba6240cd91632b12777 Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Mon, 26 Sep 2022 18:32:24 +0100 Subject: [PATCH 17/62] Move targets to correct place --- .nuspec/Microsoft.Maui.Resizetizer.targets | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.nuspec/Microsoft.Maui.Resizetizer.targets b/.nuspec/Microsoft.Maui.Resizetizer.targets index 107f9c5cbc41..bf9d8b92fc95 100644 --- a/.nuspec/Microsoft.Maui.Resizetizer.targets +++ b/.nuspec/Microsoft.Maui.Resizetizer.targets @@ -120,6 +120,16 @@ ios + + $(CollectBundleResourcesDependsOn); + ResizetizeCollectItems; + + + + $(CompileImageAssetsDependsOn); + ResizetizeCollectItems; + + $(ResizetizeCollectItemsBeforeTargets); $(CollectBundleResourcesDependsOn); @@ -141,16 +151,6 @@ ProcessMauiSplashScreens; $(CollectAppManifestsDependsOn) - - - $(CollectBundleResourcesDependsOn); - ResizetizeCollectItems; - - - - $(CompileImageAssetsDependsOn); - ResizetizeCollectItems; - From f90f0667697c488da478809ffefe9496c6ab66c3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 26 Sep 2022 17:48:05 +0000 Subject: [PATCH 18/62] Update dependencies from https://github.com/xamarin/xamarin-macios build 20220926.7 Microsoft.iOS.Sdk , Microsoft.tvOS.Sdk From Version 15.4.1029-rc.1 -> To Version 16.0.1254-rc.2-xcode14 --- 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 abc9f5a6ea12..20980a8e2775 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -16,13 +16,13 @@ https://github.com/xamarin/xamarin-macios e1d4531253a0c0ffa041b5f1473dec91a764d27f - + https://github.com/xamarin/xamarin-macios - e1d4531253a0c0ffa041b5f1473dec91a764d27f + 42c635b7aac6c21207c4ca25c2fa66ddd6875a3f - + https://github.com/xamarin/xamarin-macios - e1d4531253a0c0ffa041b5f1473dec91a764d27f + 42c635b7aac6c21207c4ca25c2fa66ddd6875a3f https://github.com/xamarin/xamarin-macios diff --git a/eng/Versions.props b/eng/Versions.props index 8f16bfb4450e..5f492b8ea257 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,10 +13,10 @@ 33.0.0-rc.1.151 - 15.4.1173-rc.2 + 16.0.1254-rc.2-xcode14 15.4.1173-rc.2 12.3.1173-rc.2 - 15.4.1173-rc.2 + 16.0.1254-rc.2-xcode14 7.0.100-rc.1.22 From ba106c648be32c370c9cc4cefa5eb51cb8a10133 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 27 Sep 2022 01:41:19 +0000 Subject: [PATCH 19/62] Update dependencies from https://github.com/xamarin/xamarin-android build 7.0.1xx-rc2-a42584443720bc98eab46a61dd372ee17efc0e65-1 Microsoft.Android.Sdk.Windows From Version 33.0.0-rc.1.151 -> To Version 33.0.0-rc.2.194 Dependency coherency updates Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.100-rc.1.22425.9 -> To Version 7.0.100-rc.2.22472.26 (parent: Microsoft.Android.Sdk.Windows --- 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 b7cd5e0df258..d4f0d028b0e5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + https://github.com/dotnet/installer - 60fdbb471da784aebd7b2afd24f2eca40fecd7bf + f9eb82eef1f9e0903e4b67cf48768cba1c193101 https://github.com/dotnet/runtime c623d96fe33cc360bd9981c9e6f6a646d7881d9e - + https://github.com/xamarin/xamarin-android - 82e6010400d4949ab54cf8e998e7ad52831c8108 + a42584443720bc98eab46a61dd372ee17efc0e65 https://github.com/xamarin/xamarin-macios diff --git a/eng/Versions.props b/eng/Versions.props index b0a3f9e2f381..05125f8b5542 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -3,7 +3,7 @@ 6.0.533 - 7.0.100-rc.2.22466.28 + 7.0.100-rc.2.22472.26 7.0.0-rc.2.22464.1 @@ -11,7 +11,7 @@ 7.0.0-rc.2.22430.11 6.0.0 - 33.0.0-rc.2.193 + 33.0.0-rc.2.194 15.4.1029-rc.1 15.4.1029-rc.1 From 30b4653a7e3a7efd124f8a9a4c68bd1a058d4580 Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Tue, 27 Sep 2022 11:32:31 +0100 Subject: [PATCH 20/62] Bump 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 dbba305b3b15..087a21421b42 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 - name: LocBranchPrefix value: 'loc-hb' - name: isMainBranch From ec1e2f786a00f806e122fb03f1c468ca67f0ed3f Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Tue, 27 Sep 2022 18:40:33 +0800 Subject: [PATCH 21/62] Update Microsoft.Maui.Resizetizer.targets --- .nuspec/Microsoft.Maui.Resizetizer.targets | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/.nuspec/Microsoft.Maui.Resizetizer.targets b/.nuspec/Microsoft.Maui.Resizetizer.targets index bf9d8b92fc95..abb39e823144 100644 --- a/.nuspec/Microsoft.Maui.Resizetizer.targets +++ b/.nuspec/Microsoft.Maui.Resizetizer.targets @@ -130,22 +130,11 @@ ResizetizeCollectItems; - - $(ResizetizeCollectItemsBeforeTargets); - $(CollectBundleResourcesDependsOn); - $(CompileImageAssetsDependsOn); - - $(ResizetizeAfterTargets); ResizetizeCollectItems; - - $(ProcessMauiFontsBeforeTargets); - $(CompileImageAssetsDependsOn); - - ProcessMauiFonts; ProcessMauiSplashScreens; From b13c7941792e219c46da38f0236fc4b14de8451a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 27 Sep 2022 11:12:03 +0000 Subject: [PATCH 22/62] Update dependencies from https://github.com/xamarin/xamarin-macios build 20220927.7 Microsoft.iOS.Sdk , Microsoft.tvOS.Sdk From Version 15.4.1029-rc.1 -> To Version 16.0.1255-rc.2-xcode14 --- 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 20980a8e2775..7977b28541b1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -16,13 +16,13 @@ https://github.com/xamarin/xamarin-macios e1d4531253a0c0ffa041b5f1473dec91a764d27f - + https://github.com/xamarin/xamarin-macios - 42c635b7aac6c21207c4ca25c2fa66ddd6875a3f + 2555313b52092ebee4d782b531ab347eaddc379a - + https://github.com/xamarin/xamarin-macios - 42c635b7aac6c21207c4ca25c2fa66ddd6875a3f + 2555313b52092ebee4d782b531ab347eaddc379a https://github.com/xamarin/xamarin-macios diff --git a/eng/Versions.props b/eng/Versions.props index 5f492b8ea257..a572dc4842e3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,10 +13,10 @@ 33.0.0-rc.1.151 - 16.0.1254-rc.2-xcode14 + 16.0.1255-rc.2-xcode14 15.4.1173-rc.2 12.3.1173-rc.2 - 16.0.1254-rc.2-xcode14 + 16.0.1255-rc.2-xcode14 7.0.100-rc.1.22 From 48ad4ba02eb718a54f488ecedd1a37f05b0cafc4 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Wed, 28 Sep 2022 00:32:58 +0800 Subject: [PATCH 23/62] Disable the resizetizer for inner builds of universal iOS/Mac Catalyst apps. Co-authored-by: Rolf Bjarne Kvinge --- .nuspec/Microsoft.Maui.Resizetizer.targets | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.nuspec/Microsoft.Maui.Resizetizer.targets b/.nuspec/Microsoft.Maui.Resizetizer.targets index abb39e823144..6fec428d4b66 100644 --- a/.nuspec/Microsoft.Maui.Resizetizer.targets +++ b/.nuspec/Microsoft.Maui.Resizetizer.targets @@ -120,14 +120,17 @@ ios + + true + - $(CollectBundleResourcesDependsOn); - ResizetizeCollectItems; + $(CollectBundleResourcesDependsOn); + ResizetizeCollectItems; - $(CompileImageAssetsDependsOn); - ResizetizeCollectItems; + $(CompileImageAssetsDependsOn); + ResizetizeCollectItems; @@ -238,7 +241,7 @@ From ebaf2d2c313a7b293d8a1fded8302cf99955614a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 27 Sep 2022 16:59:12 +0000 Subject: [PATCH 24/62] Update dependencies from https://github.com/xamarin/xamarin-macios build 20220927.12 Microsoft.iOS.Sdk , Microsoft.tvOS.Sdk From Version 15.4.1029-rc.1 -> To Version 16.0.1256-rc.2-xcode14 --- 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 7977b28541b1..0927ea7ba94e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -16,13 +16,13 @@ https://github.com/xamarin/xamarin-macios e1d4531253a0c0ffa041b5f1473dec91a764d27f - + https://github.com/xamarin/xamarin-macios - 2555313b52092ebee4d782b531ab347eaddc379a + 958f73061d29a67d0477dbd3eca41beac4d7c49c - + https://github.com/xamarin/xamarin-macios - 2555313b52092ebee4d782b531ab347eaddc379a + 958f73061d29a67d0477dbd3eca41beac4d7c49c https://github.com/xamarin/xamarin-macios diff --git a/eng/Versions.props b/eng/Versions.props index a572dc4842e3..d6cec508d68f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,10 +13,10 @@ 33.0.0-rc.1.151 - 16.0.1255-rc.2-xcode14 + 16.0.1256-rc.2-xcode14 15.4.1173-rc.2 12.3.1173-rc.2 - 16.0.1255-rc.2-xcode14 + 16.0.1256-rc.2-xcode14 7.0.100-rc.1.22 From a685b9e2e15069f3392f5edb1c04019e63b1afae Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 27 Sep 2022 17:26:44 +0000 Subject: [PATCH 25/62] Update dependencies from https://github.com/xamarin/xamarin-macios build 20220927.10 Microsoft.iOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.macOS.Sdk , Microsoft.tvOS.Sdk From Version 15.4.1029-rc.1 -> To Version 15.4.1174-rc.2 --- 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 0927ea7ba94e..7014677a30fd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -12,21 +12,21 @@ https://github.com/xamarin/xamarin-android b9389dc0168e184758c226962a0b270d300c17eb - + https://github.com/xamarin/xamarin-macios - e1d4531253a0c0ffa041b5f1473dec91a764d27f + f0db214ab3798147fe2fb1895faa8bdd1d587c06 - + https://github.com/xamarin/xamarin-macios - 958f73061d29a67d0477dbd3eca41beac4d7c49c + f0db214ab3798147fe2fb1895faa8bdd1d587c06 - + https://github.com/xamarin/xamarin-macios - 958f73061d29a67d0477dbd3eca41beac4d7c49c + f0db214ab3798147fe2fb1895faa8bdd1d587c06 - + https://github.com/xamarin/xamarin-macios - e1d4531253a0c0ffa041b5f1473dec91a764d27f + f0db214ab3798147fe2fb1895faa8bdd1d587c06 https://github.com/dotnet/emsdk diff --git a/eng/Versions.props b/eng/Versions.props index d6cec508d68f..2c285625513f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,10 +13,10 @@ 33.0.0-rc.1.151 - 16.0.1256-rc.2-xcode14 - 15.4.1173-rc.2 - 12.3.1173-rc.2 - 16.0.1256-rc.2-xcode14 + 15.4.1174-rc.2 + 15.4.1174-rc.2 + 12.3.1174-rc.2 + 15.4.1174-rc.2 7.0.100-rc.1.22 From c97e1b5d7667112b652380a11780353748b5e64d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 27 Sep 2022 18:53:52 +0000 Subject: [PATCH 26/62] Update dependencies from https://github.com/xamarin/xamarin-macios build 20220927.17 Microsoft.iOS.Sdk , Microsoft.tvOS.Sdk From Version 15.4.1029-rc.1 -> To Version 16.0.1257-rc.2-xcode14 --- 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 7014677a30fd..8229710e9a15 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -16,13 +16,13 @@ https://github.com/xamarin/xamarin-macios f0db214ab3798147fe2fb1895faa8bdd1d587c06 - + https://github.com/xamarin/xamarin-macios - f0db214ab3798147fe2fb1895faa8bdd1d587c06 + 32b55eeff4a129e454c439380329437d16657ca4 - + https://github.com/xamarin/xamarin-macios - f0db214ab3798147fe2fb1895faa8bdd1d587c06 + 32b55eeff4a129e454c439380329437d16657ca4 https://github.com/xamarin/xamarin-macios diff --git a/eng/Versions.props b/eng/Versions.props index 2c285625513f..29cb8920c00d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,10 +13,10 @@ 33.0.0-rc.1.151 - 15.4.1174-rc.2 + 16.0.1257-rc.2-xcode14 15.4.1174-rc.2 12.3.1174-rc.2 - 15.4.1174-rc.2 + 16.0.1257-rc.2-xcode14 7.0.100-rc.1.22 From 50e8c153f3654dcf86aa424dbf21eede58923386 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 27 Sep 2022 20:39:10 +0000 Subject: [PATCH 27/62] Update dependencies from https://github.com/xamarin/xamarin-macios build 20220927.19 Microsoft.iOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.macOS.Sdk , Microsoft.tvOS.Sdk From Version 15.4.1029-rc.1 -> To Version 15.4.1176-rc.2 --- 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 8229710e9a15..a7dc161bb6d5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -12,21 +12,21 @@ https://github.com/xamarin/xamarin-android b9389dc0168e184758c226962a0b270d300c17eb - + https://github.com/xamarin/xamarin-macios - f0db214ab3798147fe2fb1895faa8bdd1d587c06 + 27eaf6dce74f1270eabf86879356c84900146951 - + https://github.com/xamarin/xamarin-macios - 32b55eeff4a129e454c439380329437d16657ca4 + 27eaf6dce74f1270eabf86879356c84900146951 - + https://github.com/xamarin/xamarin-macios - 32b55eeff4a129e454c439380329437d16657ca4 + 27eaf6dce74f1270eabf86879356c84900146951 - + https://github.com/xamarin/xamarin-macios - f0db214ab3798147fe2fb1895faa8bdd1d587c06 + 27eaf6dce74f1270eabf86879356c84900146951 https://github.com/dotnet/emsdk diff --git a/eng/Versions.props b/eng/Versions.props index 29cb8920c00d..c11ca23aed9b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,10 +13,10 @@ 33.0.0-rc.1.151 - 16.0.1257-rc.2-xcode14 - 15.4.1174-rc.2 - 12.3.1174-rc.2 - 16.0.1257-rc.2-xcode14 + 15.4.1176-rc.2 + 15.4.1176-rc.2 + 12.3.1176-rc.2 + 15.4.1176-rc.2 7.0.100-rc.1.22 From b86fc39525e1e8b9b98c0e9f1e8d7622a3ec6a40 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 27 Sep 2022 22:15:00 +0000 Subject: [PATCH 28/62] Update dependencies from https://github.com/xamarin/xamarin-android build 7.0.1xx-rc2-cd05e83c73b1a9a33ec741cda17e9e596087604e-1 Microsoft.Android.Sdk.Windows From Version 33.0.0-rc.1.151 -> To Version 33.0.0-rc.2.197 Dependency coherency updates Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.100-rc.1.22425.9 -> To Version 7.0.100-rc.2.22472.26 (parent: Microsoft.Android.Sdk.Windows --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d4f0d028b0e5..0967ca804352 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,9 +8,9 @@ https://github.com/dotnet/runtime c623d96fe33cc360bd9981c9e6f6a646d7881d9e - + https://github.com/xamarin/xamarin-android - a42584443720bc98eab46a61dd372ee17efc0e65 + cd05e83c73b1a9a33ec741cda17e9e596087604e https://github.com/xamarin/xamarin-macios diff --git a/eng/Versions.props b/eng/Versions.props index 05125f8b5542..ac068474fdc0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,7 +11,7 @@ 7.0.0-rc.2.22430.11 6.0.0 - 33.0.0-rc.2.194 + 33.0.0-rc.2.197 15.4.1029-rc.1 15.4.1029-rc.1 From d24df25efbc96ed6d3c8da0bce4768e35e431e9a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 27 Sep 2022 23:22:34 +0000 Subject: [PATCH 29/62] Update dependencies from https://github.com/xamarin/xamarin-android build 7.0.1xx-rc2-16569e7dd221336368d0185eb329a144af58d2bd-1 Microsoft.Android.Sdk.Windows From Version 33.0.0-rc.1.151 -> To Version 33.0.0-rc.2.198 Dependency coherency updates Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.100-rc.1.22425.9 -> To Version 7.0.100-rc.2.22472.26 (parent: Microsoft.Android.Sdk.Windows --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0967ca804352..5b9fd7f06d66 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,9 +8,9 @@ https://github.com/dotnet/runtime c623d96fe33cc360bd9981c9e6f6a646d7881d9e - + https://github.com/xamarin/xamarin-android - cd05e83c73b1a9a33ec741cda17e9e596087604e + 16569e7dd221336368d0185eb329a144af58d2bd https://github.com/xamarin/xamarin-macios diff --git a/eng/Versions.props b/eng/Versions.props index ac068474fdc0..3e096fe48907 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,7 +11,7 @@ 7.0.0-rc.2.22430.11 6.0.0 - 33.0.0-rc.2.197 + 33.0.0-rc.2.198 15.4.1029-rc.1 15.4.1029-rc.1 From 4ac6674daa93365b68eb9a9650e6db3652225d42 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 28 Sep 2022 01:32:09 +0000 Subject: [PATCH 30/62] Update dependencies from https://github.com/xamarin/xamarin-macios build 20220927.28 Microsoft.iOS.Sdk , Microsoft.tvOS.Sdk From Version 15.4.1029-rc.1 -> To Version 16.0.1258-rc.2-xcode14 --- 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 a7dc161bb6d5..a01e163674f6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -16,13 +16,13 @@ https://github.com/xamarin/xamarin-macios 27eaf6dce74f1270eabf86879356c84900146951 - + https://github.com/xamarin/xamarin-macios - 27eaf6dce74f1270eabf86879356c84900146951 + 14fc993227fb4dd3cd3436306a11fb94a5bc250f - + https://github.com/xamarin/xamarin-macios - 27eaf6dce74f1270eabf86879356c84900146951 + 14fc993227fb4dd3cd3436306a11fb94a5bc250f https://github.com/xamarin/xamarin-macios diff --git a/eng/Versions.props b/eng/Versions.props index c11ca23aed9b..dff95b8d1157 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,10 +13,10 @@ 33.0.0-rc.1.151 - 15.4.1176-rc.2 + 16.0.1258-rc.2-xcode14 15.4.1176-rc.2 12.3.1176-rc.2 - 15.4.1176-rc.2 + 16.0.1258-rc.2-xcode14 7.0.100-rc.1.22 From b43cd5dabe762bb16cebb4f27d8f3a995a2ca294 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 28 Sep 2022 05:06:51 +0000 Subject: [PATCH 31/62] Update dependencies from https://github.com/xamarin/xamarin-android build 7.0.1xx-rc2-edc4ba97c7f79cd135a4a63d6cac39c6a09dd130-1 Microsoft.Android.Sdk.Windows From Version 33.0.0-rc.1.151 -> To Version 33.0.0-rc.2.199 Dependency coherency updates Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.100-rc.1.22425.9 -> To Version 7.0.100-rc.2.22472.26 (parent: Microsoft.Android.Sdk.Windows --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5b9fd7f06d66..6aabbdc21950 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,9 +8,9 @@ https://github.com/dotnet/runtime c623d96fe33cc360bd9981c9e6f6a646d7881d9e - + https://github.com/xamarin/xamarin-android - 16569e7dd221336368d0185eb329a144af58d2bd + edc4ba97c7f79cd135a4a63d6cac39c6a09dd130 https://github.com/xamarin/xamarin-macios diff --git a/eng/Versions.props b/eng/Versions.props index 3e096fe48907..00cdb949e929 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,7 +11,7 @@ 7.0.0-rc.2.22430.11 6.0.0 - 33.0.0-rc.2.198 + 33.0.0-rc.2.199 15.4.1029-rc.1 15.4.1029-rc.1 From 98e98c031d0a75ee89ebf59241b71b5981af2b45 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 28 Sep 2022 06:27:51 +0000 Subject: [PATCH 32/62] Update dependencies from https://github.com/xamarin/xamarin-android build 7.0.1xx-rc2-27c554e59ccda7092f64cf05bd03d7cb1283946f-1 Microsoft.Android.Sdk.Windows From Version 33.0.0-rc.1.151 -> To Version 33.0.0-rc.2.200 Dependency coherency updates Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.100-rc.1.22425.9 -> To Version 7.0.100-rc.2.22472.26 (parent: Microsoft.Android.Sdk.Windows --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6aabbdc21950..3895dfa258de 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,9 +8,9 @@ https://github.com/dotnet/runtime c623d96fe33cc360bd9981c9e6f6a646d7881d9e - + https://github.com/xamarin/xamarin-android - edc4ba97c7f79cd135a4a63d6cac39c6a09dd130 + 27c554e59ccda7092f64cf05bd03d7cb1283946f https://github.com/xamarin/xamarin-macios diff --git a/eng/Versions.props b/eng/Versions.props index 00cdb949e929..b4229edc5383 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,7 +11,7 @@ 7.0.0-rc.2.22430.11 6.0.0 - 33.0.0-rc.2.199 + 33.0.0-rc.2.200 15.4.1029-rc.1 15.4.1029-rc.1 From 2a0a42e14c482f31805eb0943757cbb16afb1861 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Wed, 28 Sep 2022 14:42:15 +0800 Subject: [PATCH 33/62] Not yet iOS 16, but will always use the new API --- .../src/Graphics/Platforms/iOS/PlatformPdfExportContext.cs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Graphics/src/Graphics/Platforms/iOS/PlatformPdfExportContext.cs b/src/Graphics/src/Graphics/Platforms/iOS/PlatformPdfExportContext.cs index 40c6fcb0bf2d..0a970ef9e250 100644 --- a/src/Graphics/src/Graphics/Platforms/iOS/PlatformPdfExportContext.cs +++ b/src/Graphics/src/Graphics/Platforms/iOS/PlatformPdfExportContext.cs @@ -68,11 +68,7 @@ private void Close() { try { -#if IOS16_0_OR_GREATER UIGraphics.EndPDFContext(); -#else - UIGraphics.EndPDFContent(); -#endif } catch (Exception exc) { From 88f73732af20789eaff7247203e7c413442a76d2 Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Wed, 28 Sep 2022 11:47:49 +0100 Subject: [PATCH 34/62] Revert "Merge branch 'darc-release/7.0.1xx-rc2-1c7d3b69-cff6-41c2-bb77-7222ce464abc' into maestro-rc2" This reverts commit 43fa1065bf2bee7468e19ac958128c4a9abc6341, reversing changes made to d8d8cfb49315f2bbc3e121dedc0bd54b85f24faa. --- 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 9107e34e08bf..d8528472b8b3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -16,13 +16,13 @@ https://github.com/xamarin/xamarin-macios 27eaf6dce74f1270eabf86879356c84900146951 - + https://github.com/xamarin/xamarin-macios - 14fc993227fb4dd3cd3436306a11fb94a5bc250f + 27eaf6dce74f1270eabf86879356c84900146951 - + https://github.com/xamarin/xamarin-macios - 14fc993227fb4dd3cd3436306a11fb94a5bc250f + 27eaf6dce74f1270eabf86879356c84900146951 https://github.com/xamarin/xamarin-macios diff --git a/eng/Versions.props b/eng/Versions.props index 74a102293307..fdf49e9b582a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,10 +13,10 @@ 33.0.0-rc.2.200 - 16.0.1258-rc.2-xcode14 + 15.4.1176-rc.2 15.4.1176-rc.2 12.3.1176-rc.2 - 16.0.1258-rc.2-xcode14 + 15.4.1176-rc.2 7.0.100-rc.2.24 From 9c13e2e7fef09530b3c973d1f770acb68200eb11 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 28 Sep 2022 10:54:52 +0000 Subject: [PATCH 35/62] Update dependencies from https://github.com/xamarin/xamarin-macios build 20220927.31 Microsoft.iOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.macOS.Sdk , Microsoft.tvOS.Sdk From Version 15.4.1029-rc.1 -> To Version 15.4.1177-rc.2 --- 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 a01e163674f6..a20b11df3efc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -12,21 +12,21 @@ https://github.com/xamarin/xamarin-android b9389dc0168e184758c226962a0b270d300c17eb - + https://github.com/xamarin/xamarin-macios - 27eaf6dce74f1270eabf86879356c84900146951 + 6d3aa9e3ea67c7ea4d229d5c16764fc54594fa98 - + https://github.com/xamarin/xamarin-macios - 14fc993227fb4dd3cd3436306a11fb94a5bc250f + 6d3aa9e3ea67c7ea4d229d5c16764fc54594fa98 - + https://github.com/xamarin/xamarin-macios - 14fc993227fb4dd3cd3436306a11fb94a5bc250f + 6d3aa9e3ea67c7ea4d229d5c16764fc54594fa98 - + https://github.com/xamarin/xamarin-macios - 27eaf6dce74f1270eabf86879356c84900146951 + 6d3aa9e3ea67c7ea4d229d5c16764fc54594fa98 https://github.com/dotnet/emsdk diff --git a/eng/Versions.props b/eng/Versions.props index dff95b8d1157..4276dabf4c6c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,10 +13,10 @@ 33.0.0-rc.1.151 - 16.0.1258-rc.2-xcode14 - 15.4.1176-rc.2 - 12.3.1176-rc.2 - 16.0.1258-rc.2-xcode14 + 15.4.1177-rc.2 + 15.4.1177-rc.2 + 12.3.1177-rc.2 + 15.4.1177-rc.2 7.0.100-rc.1.22 From dda2d856aa32c333b0877b2b2a89943226a86f76 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 28 Sep 2022 11:06:56 +0000 Subject: [PATCH 36/62] Update dependencies from https://github.com/xamarin/xamarin-macios build 20220928.7 Microsoft.iOS.Sdk , Microsoft.tvOS.Sdk From Version 15.4.1029-rc.1 -> To Version 16.0.1259-rc.2-xcode14 --- 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 a20b11df3efc..4cc6dd106007 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -16,13 +16,13 @@ https://github.com/xamarin/xamarin-macios 6d3aa9e3ea67c7ea4d229d5c16764fc54594fa98 - + https://github.com/xamarin/xamarin-macios - 6d3aa9e3ea67c7ea4d229d5c16764fc54594fa98 + 641f901a18ff53f49ab279b3592adaef02796e8a - + https://github.com/xamarin/xamarin-macios - 6d3aa9e3ea67c7ea4d229d5c16764fc54594fa98 + 641f901a18ff53f49ab279b3592adaef02796e8a https://github.com/xamarin/xamarin-macios diff --git a/eng/Versions.props b/eng/Versions.props index 4276dabf4c6c..73dc9b7cce45 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,10 +13,10 @@ 33.0.0-rc.1.151 - 15.4.1177-rc.2 + 16.0.1259-rc.2-xcode14 15.4.1177-rc.2 12.3.1177-rc.2 - 15.4.1177-rc.2 + 16.0.1259-rc.2-xcode14 7.0.100-rc.1.22 From b2990a692871e339c682a59be58728bb190a6bb1 Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Wed, 28 Sep 2022 12:33:32 +0100 Subject: [PATCH 37/62] Revert "Revert "Merge branch 'darc-release/7.0.1xx-rc2-1c7d3b69-cff6-41c2-bb77-7222ce464abc' into maestro-rc2"" This reverts commit 88f73732af20789eaff7247203e7c413442a76d2. --- 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 d8528472b8b3..9107e34e08bf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -16,13 +16,13 @@ https://github.com/xamarin/xamarin-macios 27eaf6dce74f1270eabf86879356c84900146951 - + https://github.com/xamarin/xamarin-macios - 27eaf6dce74f1270eabf86879356c84900146951 + 14fc993227fb4dd3cd3436306a11fb94a5bc250f - + https://github.com/xamarin/xamarin-macios - 27eaf6dce74f1270eabf86879356c84900146951 + 14fc993227fb4dd3cd3436306a11fb94a5bc250f https://github.com/xamarin/xamarin-macios diff --git a/eng/Versions.props b/eng/Versions.props index fdf49e9b582a..74a102293307 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,10 +13,10 @@ 33.0.0-rc.2.200 - 15.4.1176-rc.2 + 16.0.1258-rc.2-xcode14 15.4.1176-rc.2 12.3.1176-rc.2 - 15.4.1176-rc.2 + 16.0.1258-rc.2-xcode14 7.0.100-rc.2.24 From aabf42877507a0ecc4357d3e4038a53b0685ce69 Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Wed, 28 Sep 2022 14:45:38 +0100 Subject: [PATCH 38/62] Add missing feeds for 6.0.10 --- NuGet.config | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/NuGet.config b/NuGet.config index 8bf37eead792..fee59eaf0e52 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,11 @@ + + + + From 01f9de16aecce1399222089730428bd6c71d6364 Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Wed, 28 Sep 2022 15:47:43 +0100 Subject: [PATCH 39/62] Add DisableTransitiveFrameworkReferenceDownloads for wpf/winforms packages not being restored --- Directory.Build.props | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Directory.Build.props b/Directory.Build.props index 151b1ccd0f17..266714005b0c 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -152,4 +152,10 @@ + + + true + + true + From 28f6bb9343458aae2330bf9211a31a6d849f436d Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Wed, 28 Sep 2022 17:00:54 +0100 Subject: [PATCH 40/62] [Android] remove uses-sdk --- src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj | 2 ++ .../tests/DeviceTests/Platforms/Android/AndroidManifest.xml | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj b/src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj index 8c8d19fe2dd5..27fa08a3ec2a 100644 --- a/src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj +++ b/src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj @@ -22,6 +22,8 @@ + 21.0 + diff --git a/src/Controls/tests/DeviceTests/Platforms/Android/AndroidManifest.xml b/src/Controls/tests/DeviceTests/Platforms/Android/AndroidManifest.xml index d68d0f0621a1..ddf3fbc76cca 100644 --- a/src/Controls/tests/DeviceTests/Platforms/Android/AndroidManifest.xml +++ b/src/Controls/tests/DeviceTests/Platforms/Android/AndroidManifest.xml @@ -1,6 +1,5 @@  - From d08d02924a933db23041473c9d06c3b30d306147 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 28 Sep 2022 19:56:34 +0000 Subject: [PATCH 41/62] Update dependencies from https://github.com/xamarin/xamarin-macios build 20220928.18 Microsoft.iOS.Sdk , Microsoft.tvOS.Sdk From Version 15.4.1029-rc.1 -> To Version 16.0.1260-rc.2-xcode14 --- 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 4cc6dd106007..ee5845a26e50 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -16,13 +16,13 @@ https://github.com/xamarin/xamarin-macios 6d3aa9e3ea67c7ea4d229d5c16764fc54594fa98 - + https://github.com/xamarin/xamarin-macios - 641f901a18ff53f49ab279b3592adaef02796e8a + 0d920cb0eedd72ca7113ebb8ec623cce277cc457 - + https://github.com/xamarin/xamarin-macios - 641f901a18ff53f49ab279b3592adaef02796e8a + 0d920cb0eedd72ca7113ebb8ec623cce277cc457 https://github.com/xamarin/xamarin-macios diff --git a/eng/Versions.props b/eng/Versions.props index 73dc9b7cce45..eea4901f9b9a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,10 +13,10 @@ 33.0.0-rc.1.151 - 16.0.1259-rc.2-xcode14 + 16.0.1260-rc.2-xcode14 15.4.1177-rc.2 12.3.1177-rc.2 - 16.0.1259-rc.2-xcode14 + 16.0.1260-rc.2-xcode14 7.0.100-rc.1.22 From 957ca8c41ac08016ab3e49717e2564b6f9c14307 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 28 Sep 2022 20:02:42 +0000 Subject: [PATCH 42/62] Update dependencies from https://github.com/xamarin/xamarin-macios build 20220928.19 Microsoft.iOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.macOS.Sdk , Microsoft.tvOS.Sdk From Version 15.4.1029-rc.1 -> To Version 15.4.1179-rc.2 --- 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 ee5845a26e50..7d4e3d9ae503 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -12,21 +12,21 @@ https://github.com/xamarin/xamarin-android b9389dc0168e184758c226962a0b270d300c17eb - + https://github.com/xamarin/xamarin-macios - 6d3aa9e3ea67c7ea4d229d5c16764fc54594fa98 + 48972a271f111f25ab7699a9286eeaf3028daa30 - + https://github.com/xamarin/xamarin-macios - 0d920cb0eedd72ca7113ebb8ec623cce277cc457 + 48972a271f111f25ab7699a9286eeaf3028daa30 - + https://github.com/xamarin/xamarin-macios - 0d920cb0eedd72ca7113ebb8ec623cce277cc457 + 48972a271f111f25ab7699a9286eeaf3028daa30 - + https://github.com/xamarin/xamarin-macios - 6d3aa9e3ea67c7ea4d229d5c16764fc54594fa98 + 48972a271f111f25ab7699a9286eeaf3028daa30 https://github.com/dotnet/emsdk diff --git a/eng/Versions.props b/eng/Versions.props index eea4901f9b9a..f87a9c69019f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,10 +13,10 @@ 33.0.0-rc.1.151 - 16.0.1260-rc.2-xcode14 - 15.4.1177-rc.2 - 12.3.1177-rc.2 - 16.0.1260-rc.2-xcode14 + 15.4.1179-rc.2 + 15.4.1179-rc.2 + 12.3.1179-rc.2 + 15.4.1179-rc.2 7.0.100-rc.1.22 From 58c291223d9311bd1d141d744665597739f15f70 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 28 Sep 2022 20:34:26 +0000 Subject: [PATCH 43/62] Update dependencies from https://github.com/xamarin/xamarin-macios build 20220928.14 Microsoft.iOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.macOS.Sdk , Microsoft.tvOS.Sdk From Version 15.4.1029-rc.1 -> To Version 15.4.1178-rc.2 --- 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 7d4e3d9ae503..7f026663fa23 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -12,21 +12,21 @@ https://github.com/xamarin/xamarin-android b9389dc0168e184758c226962a0b270d300c17eb - + https://github.com/xamarin/xamarin-macios - 48972a271f111f25ab7699a9286eeaf3028daa30 + 79193a6cab67b5f27517624107117f2ae0e58e0b - + https://github.com/xamarin/xamarin-macios - 48972a271f111f25ab7699a9286eeaf3028daa30 + 79193a6cab67b5f27517624107117f2ae0e58e0b - + https://github.com/xamarin/xamarin-macios - 48972a271f111f25ab7699a9286eeaf3028daa30 + 79193a6cab67b5f27517624107117f2ae0e58e0b - + https://github.com/xamarin/xamarin-macios - 48972a271f111f25ab7699a9286eeaf3028daa30 + 79193a6cab67b5f27517624107117f2ae0e58e0b https://github.com/dotnet/emsdk diff --git a/eng/Versions.props b/eng/Versions.props index f87a9c69019f..c63baa49a488 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,10 +13,10 @@ 33.0.0-rc.1.151 - 15.4.1179-rc.2 - 15.4.1179-rc.2 - 12.3.1179-rc.2 - 15.4.1179-rc.2 + 15.4.1178-rc.2 + 15.4.1178-rc.2 + 12.3.1178-rc.2 + 15.4.1178-rc.2 7.0.100-rc.1.22 From d5096e96d90293f10617f67d9ee55b504a7d3090 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 28 Sep 2022 20:42:55 +0000 Subject: [PATCH 44/62] Update dependencies from https://github.com/xamarin/xamarin-android build 7.0.1xx-rc2-4ac2ae3d2a218c5539b2ab1425f7678b5db1a478-1 Microsoft.Android.Sdk.Windows From Version 33.0.0-rc.1.151 -> To Version 33.0.0-rc.2.201 Dependency coherency updates Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.100-rc.1.22425.9 -> To Version 7.0.100-rc.2.22472.26 (parent: Microsoft.Android.Sdk.Windows --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3895dfa258de..323b075527ce 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://github.com/dotnet/installer f9eb82eef1f9e0903e4b67cf48768cba1c193101 - + https://github.com/dotnet/runtime - c623d96fe33cc360bd9981c9e6f6a646d7881d9e + 550605cc93d9b903c4fbaf8f1f83e387d2f79dbe - + https://github.com/xamarin/xamarin-android - 27c554e59ccda7092f64cf05bd03d7cb1283946f + 4ac2ae3d2a218c5539b2ab1425f7678b5db1a478 https://github.com/xamarin/xamarin-macios @@ -28,13 +28,13 @@ https://github.com/xamarin/xamarin-macios e7aa824644021c2ff80d5948f089f399bf7568aa - + https://github.com/dotnet/emsdk - 76e6b338e87093ddc9b3b650f027706aba65d388 + 6625add9a3eadc2954af0311be35290cfefcddb0 - + https://github.com/dotnet/emsdk - 76e6b338e87093ddc9b3b650f027706aba65d388 + 6625add9a3eadc2954af0311be35290cfefcddb0 https://dev.azure.com/microsoft/ProjectReunion/_git/ProjectReunionInternal diff --git a/eng/Versions.props b/eng/Versions.props index b4229edc5383..29a99a09d011 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -5,13 +5,13 @@ 7.0.100-rc.2.22472.26 - 7.0.0-rc.2.22464.1 + 7.0.0-rc.2.22472.3 7.0.0-rc.2.22430.11 7.0.0-rc.2.22430.11 6.0.0 - 33.0.0-rc.2.200 + 33.0.0-rc.2.201 15.4.1029-rc.1 15.4.1029-rc.1 @@ -20,7 +20,7 @@ 7.0.100-rc.1.22 - 7.0.0-rc.2.22459.3 + 7.0.0-rc.2.22465.1 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion) 1.1.4 From 03190b6c29a7341b0d8f57ab1d983e736536bb6e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 28 Sep 2022 20:56:22 +0000 Subject: [PATCH 45/62] Update dependencies from https://github.com/xamarin/xamarin-android build 7.0.1xx-rc2-bf10ce5525d97f2303993d631003df54f2837617-1 Microsoft.Android.Sdk.Windows From Version 33.0.0-rc.1.151 -> To Version 33.0.0-rc.2.202 Dependency coherency updates Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.100-rc.1.22425.9 -> To Version 7.0.100-rc.2.22477.20 (parent: Microsoft.Android.Sdk.Windows --- 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 323b075527ce..de1870906479 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + https://github.com/dotnet/installer - f9eb82eef1f9e0903e4b67cf48768cba1c193101 + 915e3f711083de58b3142d6be77d48cc64da6c38 https://github.com/dotnet/runtime 550605cc93d9b903c4fbaf8f1f83e387d2f79dbe - + https://github.com/xamarin/xamarin-android - 4ac2ae3d2a218c5539b2ab1425f7678b5db1a478 + bf10ce5525d97f2303993d631003df54f2837617 https://github.com/xamarin/xamarin-macios diff --git a/eng/Versions.props b/eng/Versions.props index 29a99a09d011..3ae852fcf6d9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -3,7 +3,7 @@ 6.0.533 - 7.0.100-rc.2.22472.26 + 7.0.100-rc.2.22477.20 7.0.0-rc.2.22472.3 @@ -11,7 +11,7 @@ 7.0.0-rc.2.22430.11 6.0.0 - 33.0.0-rc.2.201 + 33.0.0-rc.2.202 15.4.1029-rc.1 15.4.1029-rc.1 From d860f27dc4d073e4b8f34a37b106ccd08181986b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 29 Sep 2022 02:35:04 +0000 Subject: [PATCH 46/62] Update dependencies from https://github.com/xamarin/xamarin-macios build 20220928.34 Microsoft.iOS.Sdk , Microsoft.tvOS.Sdk From Version 15.4.1029-rc.1 -> To Version 16.0.1261-rc.2-xcode14 --- 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 7f026663fa23..ded46dc917e7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -16,13 +16,13 @@ https://github.com/xamarin/xamarin-macios 79193a6cab67b5f27517624107117f2ae0e58e0b - + https://github.com/xamarin/xamarin-macios - 79193a6cab67b5f27517624107117f2ae0e58e0b + da4a2bd854879150394a7c8f3d834ec20ee81def - + https://github.com/xamarin/xamarin-macios - 79193a6cab67b5f27517624107117f2ae0e58e0b + da4a2bd854879150394a7c8f3d834ec20ee81def https://github.com/xamarin/xamarin-macios diff --git a/eng/Versions.props b/eng/Versions.props index c63baa49a488..1c2b7c4ebcbe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,10 +13,10 @@ 33.0.0-rc.1.151 - 15.4.1178-rc.2 + 16.0.1261-rc.2-xcode14 15.4.1178-rc.2 12.3.1178-rc.2 - 15.4.1178-rc.2 + 16.0.1261-rc.2-xcode14 7.0.100-rc.1.22 From 6bf34cfaf520f7589d512cd3a8ba0c1677d4b284 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 29 Sep 2022 03:11:02 +0000 Subject: [PATCH 47/62] Update dependencies from https://github.com/xamarin/xamarin-macios build 20220928.33 Microsoft.iOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.macOS.Sdk , Microsoft.tvOS.Sdk From Version 15.4.1029-rc.1 -> To Version 15.4.1180-rc.2 --- 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 ded46dc917e7..72414340c60b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -12,21 +12,21 @@ https://github.com/xamarin/xamarin-android b9389dc0168e184758c226962a0b270d300c17eb - + https://github.com/xamarin/xamarin-macios - 79193a6cab67b5f27517624107117f2ae0e58e0b + 90f75bc307e5cba22bf1472f51cf6f4bdb624a1b - + https://github.com/xamarin/xamarin-macios - da4a2bd854879150394a7c8f3d834ec20ee81def + 90f75bc307e5cba22bf1472f51cf6f4bdb624a1b - + https://github.com/xamarin/xamarin-macios - da4a2bd854879150394a7c8f3d834ec20ee81def + 90f75bc307e5cba22bf1472f51cf6f4bdb624a1b - + https://github.com/xamarin/xamarin-macios - 79193a6cab67b5f27517624107117f2ae0e58e0b + 90f75bc307e5cba22bf1472f51cf6f4bdb624a1b https://github.com/dotnet/emsdk diff --git a/eng/Versions.props b/eng/Versions.props index 1c2b7c4ebcbe..574fa0d20352 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,10 +13,10 @@ 33.0.0-rc.1.151 - 16.0.1261-rc.2-xcode14 - 15.4.1178-rc.2 - 12.3.1178-rc.2 - 16.0.1261-rc.2-xcode14 + 15.4.1180-rc.2 + 15.4.1180-rc.2 + 12.3.1180-rc.2 + 15.4.1180-rc.2 7.0.100-rc.1.22 From 616108f08956a2f6d097eb02cb41d8aa38fb0e04 Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Thu, 29 Sep 2022 10:24:10 +0100 Subject: [PATCH 48/62] Fix csproj --- .../tests/DeviceTests/Controls.DeviceTests.csproj | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj b/src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj index 27fa08a3ec2a..2a95001a170e 100644 --- a/src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj +++ b/src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj @@ -21,9 +21,11 @@ - - 21.0 - + + + 21.0 + + From 3d1cabc44cd26efee16300e747bbec1a90785f6c Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Thu, 29 Sep 2022 15:05:45 +0100 Subject: [PATCH 49/62] Try again --- .nuspec/Microsoft.Maui.Resizetizer.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.nuspec/Microsoft.Maui.Resizetizer.targets b/.nuspec/Microsoft.Maui.Resizetizer.targets index 6fec428d4b66..d69ad1c317bb 100644 --- a/.nuspec/Microsoft.Maui.Resizetizer.targets +++ b/.nuspec/Microsoft.Maui.Resizetizer.targets @@ -410,7 +410,7 @@ <_MauiSplashScreens Include="$(_MauiIntermediateSplashScreen)splash\*" /> - + From 9d628300cf36aaf0297d7e774dab04fb235a30a7 Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Thu, 29 Sep 2022 16:28:03 +0100 Subject: [PATCH 50/62] Remove uses-sdk --- .../ControlGallery/src/Android/Properties/AndroidManifest.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Compatibility/ControlGallery/src/Android/Properties/AndroidManifest.xml b/src/Compatibility/ControlGallery/src/Android/Properties/AndroidManifest.xml index d833eaa7f446..373632615c29 100644 --- a/src/Compatibility/ControlGallery/src/Android/Properties/AndroidManifest.xml +++ b/src/Compatibility/ControlGallery/src/Android/Properties/AndroidManifest.xml @@ -1,6 +1,5 @@  - From 920eeaa9977325a3ac88a17fea67c13a4d4b995d Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Thu, 29 Sep 2022 16:31:14 +0100 Subject: [PATCH 51/62] DisableTransitiveFrameworkReferenceDownloads --- eng/cake/dotnet.cake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/eng/cake/dotnet.cake b/eng/cake/dotnet.cake index 8b63fc4a0bcf..a22ed7302b0d 100644 --- a/eng/cake/dotnet.cake +++ b/eng/cake/dotnet.cake @@ -133,6 +133,8 @@ Task("dotnet-templates") // Avoid iOS build warning as error on Windows: There is no available connection to the Mac. Task 'VerifyXcodeVersion' will not be executed { "CustomBeforeMicrosoftCSharpTargets", MakeAbsolute(File("./src/Templates/TemplateTestExtraTargets.targets")).FullPath }, + //Try not restore dependecies of 6.0.10 + { "DisableTransitiveFrameworkReferenceDownloads", "true" }, }; var templates = new Dictionary> { From e7e9ea53d6dfd85326045d482d2e80c0cda46389 Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Thu, 29 Sep 2022 17:37:13 +0100 Subject: [PATCH 52/62] Don't try to BuildInParallel the sample app --- src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj b/src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj index 05ad55b47484..6c95cd0aae72 100644 --- a/src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj +++ b/src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj @@ -8,6 +8,7 @@ Maui.Controls.Sample false $(NoWarn),CA1416 + false From 0b2b7a21b3ca552865142205506cd23de1ca5e2d Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Thu, 29 Sep 2022 18:34:27 +0100 Subject: [PATCH 53/62] Remove PublishTrimmed on Benchmark project --- src/Core/tests/Benchmarks.Droid/Benchmarks.Droid.csproj | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Core/tests/Benchmarks.Droid/Benchmarks.Droid.csproj b/src/Core/tests/Benchmarks.Droid/Benchmarks.Droid.csproj index a98a054466a1..1614cd6f3695 100644 --- a/src/Core/tests/Benchmarks.Droid/Benchmarks.Droid.csproj +++ b/src/Core/tests/Benchmarks.Droid/Benchmarks.Droid.csproj @@ -9,7 +9,6 @@ com.microsoft.maui.benchmarks 1 1.0 - false android-arm64 From ab0f9b6d4ba68800eb2e3c02c89bbb131471e0b8 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Thu, 29 Sep 2022 12:53:11 -0500 Subject: [PATCH 54/62] Revert "Remove PublishTrimmed on Benchmark project" This reverts commit 0b2b7a21b3ca552865142205506cd23de1ca5e2d. --- src/Core/tests/Benchmarks.Droid/Benchmarks.Droid.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Core/tests/Benchmarks.Droid/Benchmarks.Droid.csproj b/src/Core/tests/Benchmarks.Droid/Benchmarks.Droid.csproj index 1614cd6f3695..a98a054466a1 100644 --- a/src/Core/tests/Benchmarks.Droid/Benchmarks.Droid.csproj +++ b/src/Core/tests/Benchmarks.Droid/Benchmarks.Droid.csproj @@ -9,6 +9,7 @@ com.microsoft.maui.benchmarks 1 1.0 + false android-arm64 From 7961b8f091a2ca56929afbb1ba032fb38455863d Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Thu, 29 Sep 2022 12:54:24 -0500 Subject: [PATCH 55/62] Disable AOT for Benchmarks.Droid.csproj I might be the only one that ever uses this project, but I believe we opted into AOT the default for Android and this project shouldn't use it. --- src/Core/tests/Benchmarks.Droid/Benchmarks.Droid.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Core/tests/Benchmarks.Droid/Benchmarks.Droid.csproj b/src/Core/tests/Benchmarks.Droid/Benchmarks.Droid.csproj index a98a054466a1..2edbefb55c31 100644 --- a/src/Core/tests/Benchmarks.Droid/Benchmarks.Droid.csproj +++ b/src/Core/tests/Benchmarks.Droid/Benchmarks.Droid.csproj @@ -10,6 +10,7 @@ 1 1.0 false + false android-arm64 From e0ba479abde8fc714c78290466085f8be0775a0e Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Thu, 29 Sep 2022 12:56:24 -0500 Subject: [PATCH 56/62] Set sandbox sample to a single catalyst RID --- .../Controls.Sample.Sandbox/Maui.Controls.Sample.Sandbox.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Controls/samples/Controls.Sample.Sandbox/Maui.Controls.Sample.Sandbox.csproj b/src/Controls/samples/Controls.Sample.Sandbox/Maui.Controls.Sample.Sandbox.csproj index 05a4b3e42ea0..7d905ad6d983 100644 --- a/src/Controls/samples/Controls.Sample.Sandbox/Maui.Controls.Sample.Sandbox.csproj +++ b/src/Controls/samples/Controls.Sample.Sandbox/Maui.Controls.Sample.Sandbox.csproj @@ -5,6 +5,7 @@ Exe true false + maccatalyst-x64 From b17eab12c8c1a56115eede1b422bd9a0656341bb Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Thu, 29 Sep 2022 13:53:31 -0500 Subject: [PATCH 57/62] Revert "Don't try to BuildInParallel the sample app" This reverts commit e7e9ea53d6dfd85326045d482d2e80c0cda46389. --- src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj b/src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj index 6c95cd0aae72..05ad55b47484 100644 --- a/src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj +++ b/src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj @@ -8,7 +8,6 @@ Maui.Controls.Sample false $(NoWarn),CA1416 - false From 765d0b4db1569e573d9e9669e36e03b6d7e85e10 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Thu, 29 Sep 2022 13:54:52 -0500 Subject: [PATCH 58/62] Update MauiRazorClassLibrarySample.csproj Try multi-targeting this project --- .../MauiRazorClassLibrarySample.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BlazorWebView/samples/MauiRazorClassLibrarySample/MauiRazorClassLibrarySample.csproj b/src/BlazorWebView/samples/MauiRazorClassLibrarySample/MauiRazorClassLibrarySample.csproj index 24648effda0e..12d99837a9ae 100644 --- a/src/BlazorWebView/samples/MauiRazorClassLibrarySample/MauiRazorClassLibrarySample.csproj +++ b/src/BlazorWebView/samples/MauiRazorClassLibrarySample/MauiRazorClassLibrarySample.csproj @@ -1,7 +1,7 @@ - $(_MauiDotNetTfm) + $(MauiPlatforms);$(_MauiDotNetTfm) false From b4f2f71bc76698e4e548a3edeffa22aecb95cef7 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Thu, 29 Sep 2022 14:58:00 -0500 Subject: [PATCH 59/62] Revert "Update MauiRazorClassLibrarySample.csproj" This reverts commit 765d0b4db1569e573d9e9669e36e03b6d7e85e10. --- .../MauiRazorClassLibrarySample.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BlazorWebView/samples/MauiRazorClassLibrarySample/MauiRazorClassLibrarySample.csproj b/src/BlazorWebView/samples/MauiRazorClassLibrarySample/MauiRazorClassLibrarySample.csproj index 12d99837a9ae..24648effda0e 100644 --- a/src/BlazorWebView/samples/MauiRazorClassLibrarySample/MauiRazorClassLibrarySample.csproj +++ b/src/BlazorWebView/samples/MauiRazorClassLibrarySample/MauiRazorClassLibrarySample.csproj @@ -1,7 +1,7 @@ - $(MauiPlatforms);$(_MauiDotNetTfm) + $(_MauiDotNetTfm) false From 3b4ecbb3f9e5056ae16930a4e67984e06e0fd7b5 Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Thu, 29 Sep 2022 22:26:45 +0100 Subject: [PATCH 60/62] Allow set MaxCpuCount --- eng/cake/dotnet.cake | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/eng/cake/dotnet.cake b/eng/cake/dotnet.cake index a22ed7302b0d..f2cd7e6e75d4 100644 --- a/eng/cake/dotnet.cake +++ b/eng/cake/dotnet.cake @@ -87,9 +87,9 @@ Task("dotnet-build") { RunMSBuildWithDotNet("./Microsoft.Maui.BuildTasks.slnf"); if (IsRunningOnWindows()) - RunMSBuildWithDotNet("./Microsoft.Maui.sln"); + RunMSBuildWithDotNet("./Microsoft.Maui.sln", maxCpuCount:1); else - RunMSBuildWithDotNet("./Microsoft.Maui-mac.slnf"); + RunMSBuildWithDotNet("./Microsoft.Maui-mac.slnf", maxCpuCount:1); }); Task("dotnet-samples") @@ -598,7 +598,8 @@ void RunMSBuildWithDotNet( bool warningsAsError = false, bool restore = true, string targetFramework = null, - bool forceDotNetBuild = false) + bool forceDotNetBuild = false, + int maxCpuCount = 0) { var useDotNetBuild = forceDotNetBuild || !IsRunningOnWindows() || target == "Run"; @@ -613,7 +614,7 @@ void RunMSBuildWithDotNet( var msbuildSettings = new DotNetCoreMSBuildSettings() .SetConfiguration(configuration) - .SetMaxCpuCount(0) + .SetMaxCpuCount(maxCpuCount) .WithTarget(target) .EnableBinaryLogger(binlog); From 864423b772a30783ee8b60263ea4f6dee87bba1c Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Thu, 29 Sep 2022 20:54:56 -0500 Subject: [PATCH 61/62] Revert "Set sandbox sample to a single catalyst RID" This reverts commit e0ba479abde8fc714c78290466085f8be0775a0e. --- .../Controls.Sample.Sandbox/Maui.Controls.Sample.Sandbox.csproj | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Controls/samples/Controls.Sample.Sandbox/Maui.Controls.Sample.Sandbox.csproj b/src/Controls/samples/Controls.Sample.Sandbox/Maui.Controls.Sample.Sandbox.csproj index 7d905ad6d983..05a4b3e42ea0 100644 --- a/src/Controls/samples/Controls.Sample.Sandbox/Maui.Controls.Sample.Sandbox.csproj +++ b/src/Controls/samples/Controls.Sample.Sandbox/Maui.Controls.Sample.Sandbox.csproj @@ -5,7 +5,6 @@ Exe true false - maccatalyst-x64 From bbf822ce3f7587d3e76ae902c1e50ff817161a52 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Thu, 29 Sep 2022 21:00:44 -0500 Subject: [PATCH 62/62] Samples also need `-maxCpuCount: 1` Plus some C# formatting --- eng/cake/dotnet.cake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/cake/dotnet.cake b/eng/cake/dotnet.cake index f2cd7e6e75d4..90fc72d1546d 100644 --- a/eng/cake/dotnet.cake +++ b/eng/cake/dotnet.cake @@ -87,9 +87,9 @@ Task("dotnet-build") { RunMSBuildWithDotNet("./Microsoft.Maui.BuildTasks.slnf"); if (IsRunningOnWindows()) - RunMSBuildWithDotNet("./Microsoft.Maui.sln", maxCpuCount:1); + RunMSBuildWithDotNet("./Microsoft.Maui.sln", maxCpuCount: 1); else - RunMSBuildWithDotNet("./Microsoft.Maui-mac.slnf", maxCpuCount:1); + RunMSBuildWithDotNet("./Microsoft.Maui-mac.slnf", maxCpuCount: 1); }); Task("dotnet-samples") @@ -101,7 +101,7 @@ Task("dotnet-samples") ["UseWorkload"] = "true", // ["GenerateAppxPackageOnBuild"] = "true", ["RestoreConfigFile"] = tempDir.CombineWithFilePath("NuGet.config").FullPath, - }); + }, maxCpuCount: 1); }); Task("dotnet-templates")