From f8f4b5fcb5cedab7b9476c91bb53be65cac202b9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 7 Sep 2022 13:29:44 +0000 Subject: [PATCH 01/40] Update dependencies from https://github.com/xamarin/xamarin-android build main-8398005ab952658fee7a060cf042e6ebb1c017b5-1 Microsoft.Android.Sdk.Windows From Version 33.0.0-rc.1.151 -> To Version 33.0.0-rc.2.162 Dependency coherency updates Microsoft.Dotnet.Sdk.Internal,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.22454.1 (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 c4c8f1f8fa45..8ecb5c33edc2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b0196947cad4..99231c022cb4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + https://github.com/dotnet/installer - cd7df40ff129744cc664ea5c83c113ccf2763829 + 330dee39e5e4dcf765f4c41c76b94c8e4497e91c - + https://github.com/dotnet/runtime - 06aceb7015f3bd2ff019ef5920d2354eb2ea2c92 + 01708feb89968aa919f20d4c84c03ac480803b34 - + https://github.com/xamarin/xamarin-android - b9389dc0168e184758c226962a0b270d300c17eb + 8398005ab952658fee7a060cf042e6ebb1c017b5 https://github.com/xamarin/xamarin-macios @@ -28,13 +28,13 @@ https://github.com/xamarin/xamarin-macios fca8b10f73d022d649b8985f046fb927adbdedac - + https://github.com/dotnet/emsdk - 5ef661392ae7b1595b683df83d63e3a0365fc126 + 3e431e984cbfefe5593ffe1d9b9942b5730ecd24 - + https://github.com/dotnet/emsdk - 5ef661392ae7b1595b683df83d63e3a0365fc126 + 3e431e984cbfefe5593ffe1d9b9942b5730ecd24 https://dev.azure.com/microsoft/ProjectReunion/_git/ProjectReunionInternal diff --git a/eng/Versions.props b/eng/Versions.props index 537d79d490ff..b3e228afccd8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -3,15 +3,15 @@ 6.0.532 - 7.0.100-rc.1.22425.9 + 7.0.100-rc.2.22454.1 - 7.0.0-rc.1.22426.10 + 7.0.0-rc.2.22425.17 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.162 15.4.1024-rc.1 15.4.1024-rc.1 @@ -20,7 +20,7 @@ 7.0.100-rc.1.22 - 7.0.0-rc.1.22424.1 + 7.0.0-rc.2.22424.4 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion) 1.1.4 From 06165ad41357352969983ed668ff59917038757b Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Thu, 8 Sep 2022 15:38:24 +0100 Subject: [PATCH 02/40] Update eng/Versions.props Co-authored-by: Kangho Hur --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index b3e228afccd8..0ea2d28e78f6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -18,7 +18,7 @@ 12.3.1024-rc.1 15.4.1024-rc.1 - 7.0.100-rc.1.22 + 7.0.100-rc.2.24 7.0.0-rc.2.22424.4 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion) From 9d2a804ca0e44f3f6f3c31e6470799192ed05377 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 9 Sep 2022 12:45:10 +0000 Subject: [PATCH 03/40] Update dependencies from https://github.com/xamarin/xamarin-android build main-c2534cca35b9c7105d9427f9e20bd8f3615f7516-1 Microsoft.Android.Sdk.Windows From Version 33.0.0-rc.1.151 -> To Version 33.0.0-rc.2.172 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.22457.6 (parent: Microsoft.Android.Sdk.Windows --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 99231c022cb4..ff7d2f2aebfa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + https://github.com/dotnet/installer - 330dee39e5e4dcf765f4c41c76b94c8e4497e91c + dd355bb777249689beba30978ac26e15c96da642 - + https://github.com/dotnet/runtime - 01708feb89968aa919f20d4c84c03ac480803b34 + 6d10e4c8bcd9f96ccd73748ff827561afa09af57 - + https://github.com/xamarin/xamarin-android - 8398005ab952658fee7a060cf042e6ebb1c017b5 + c2534cca35b9c7105d9427f9e20bd8f3615f7516 https://github.com/xamarin/xamarin-macios @@ -28,13 +28,13 @@ https://github.com/xamarin/xamarin-macios fca8b10f73d022d649b8985f046fb927adbdedac - + https://github.com/dotnet/emsdk - 3e431e984cbfefe5593ffe1d9b9942b5730ecd24 + 8d8d2122b16c81df4b158fe43995f958e8fe115e - + https://github.com/dotnet/emsdk - 3e431e984cbfefe5593ffe1d9b9942b5730ecd24 + 8d8d2122b16c81df4b158fe43995f958e8fe115e https://dev.azure.com/microsoft/ProjectReunion/_git/ProjectReunionInternal diff --git a/eng/Versions.props b/eng/Versions.props index 0ea2d28e78f6..9498e696c1b6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -3,15 +3,15 @@ 6.0.532 - 7.0.100-rc.2.22454.1 + 7.0.100-rc.2.22457.6 - 7.0.0-rc.2.22425.17 + 7.0.0-rc.2.22451.11 7.0.0-rc.2.22430.11 7.0.0-rc.2.22430.11 6.0.0 - 33.0.0-rc.2.162 + 33.0.0-rc.2.172 15.4.1024-rc.1 15.4.1024-rc.1 @@ -20,7 +20,7 @@ 7.0.100-rc.2.24 - 7.0.0-rc.2.22424.4 + 7.0.0-rc.2.22430.5 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion) 1.1.4 From e584f88bfcb46e6c57eab565026b508e426395f8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 9 Sep 2022 12:00:34 -0500 Subject: [PATCH 04/40] Update dependencies from https://github.com/xamarin/xamarin-macios build 20220831.12 (#10021) Microsoft.iOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.macOS.Sdk , Microsoft.tvOS.Sdk From Version 15.4.1029-rc.1 -> To Version 15.4.1051-rc.2 Co-authored-by: dotnet-maestro[bot] --- 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 a5091d6a931f..688ee43f29ac 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -12,21 +12,21 @@ https://github.com/xamarin/xamarin-android c2534cca35b9c7105d9427f9e20bd8f3615f7516 - + https://github.com/xamarin/xamarin-macios - e7aa824644021c2ff80d5948f089f399bf7568aa + 2ddb7a6d681ce2f659b796184aee7e4a2991ae0c - + https://github.com/xamarin/xamarin-macios - e7aa824644021c2ff80d5948f089f399bf7568aa + 2ddb7a6d681ce2f659b796184aee7e4a2991ae0c - + https://github.com/xamarin/xamarin-macios - e7aa824644021c2ff80d5948f089f399bf7568aa + 2ddb7a6d681ce2f659b796184aee7e4a2991ae0c - + https://github.com/xamarin/xamarin-macios - e7aa824644021c2ff80d5948f089f399bf7568aa + 2ddb7a6d681ce2f659b796184aee7e4a2991ae0c https://github.com/dotnet/emsdk diff --git a/eng/Versions.props b/eng/Versions.props index 35374556a7bb..a9bc0c1d6a5d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,10 +13,10 @@ 33.0.0-rc.2.172 - 15.4.1029-rc.1 - 15.4.1029-rc.1 - 12.3.1029-rc.1 - 15.4.1029-rc.1 + 15.4.1051-rc.2 + 15.4.1051-rc.2 + 12.3.1051-rc.2 + 15.4.1051-rc.2 7.0.100-rc.2.24 From 03b893f4aa525ab45fe82d8d2b7523a47e70c2d4 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Mon, 12 Sep 2022 16:08:53 -0500 Subject: [PATCH 05/40] NRT annotation for iOS src\WebAuthenticator\WebAuthenticator.shared.cs(61,37): error CS8604: Possible null reference argument for parameter 'uriString' in 'Uri.Uri(string uriString)'. --- src/Essentials/src/WebAuthenticator/WebAuthenticator.shared.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Essentials/src/WebAuthenticator/WebAuthenticator.shared.cs b/src/Essentials/src/WebAuthenticator/WebAuthenticator.shared.cs index eb12ee874617..7cd1ab7af9e5 100644 --- a/src/Essentials/src/WebAuthenticator/WebAuthenticator.shared.cs +++ b/src/Essentials/src/WebAuthenticator/WebAuthenticator.shared.cs @@ -58,7 +58,7 @@ 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)); + webAuthenticator.OpenUrl(new Uri(url.AbsoluteString!)); public static bool ContinueUserActivity(this IWebAuthenticator webAuthenticator, UIKit.UIApplication application, Foundation.NSUserActivity userActivity, UIKit.UIApplicationRestorationHandler completionHandler) { From 22d0f1bee76ccf76afd5d17d793ad3728d073ede Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Mon, 12 Sep 2022 16:09:40 -0500 Subject: [PATCH 06/40] Attempt to workaround iOS analyzer check src\DeviceDisplay\DeviceDisplay.ios.cs(22,7): error CA1416: This call site is reachable on: 'iOS' 10.0 and later, 'maccatalyst' 10.0 and later. 'UIScreen.MaximumFramesPerSecond' is only supported on: 'ios' 10.3 and later, 'maccatalyst' 10.3 and later, 'tvos' 10.2 and later. --- src/Essentials/src/DeviceDisplay/DeviceDisplay.ios.cs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Essentials/src/DeviceDisplay/DeviceDisplay.ios.cs b/src/Essentials/src/DeviceDisplay/DeviceDisplay.ios.cs index 8288d10936c0..7796f2caec82 100644 --- a/src/Essentials/src/DeviceDisplay/DeviceDisplay.ios.cs +++ b/src/Essentials/src/DeviceDisplay/DeviceDisplay.ios.cs @@ -17,10 +17,12 @@ protected override DisplayInfo GetMainDisplayInfo() { var bounds = UIScreen.MainScreen.Bounds; var scale = UIScreen.MainScreen.Scale; + float rate = 0; - var rate = (OperatingSystem.IsIOSVersionAtLeast(10, 3) || OperatingSystem.IsTvOSVersionAtLeast(10, 3)) - ? UIScreen.MainScreen.MaximumFramesPerSecond - : 0; + if (OperatingSystem.IsIOSVersionAtLeast(10, 3) || OperatingSystem.IsTvOSVersionAtLeast(10, 3)) + { + rate = UIScreen.MainScreen.MaximumFramesPerSecond; + } return new DisplayInfo( width: bounds.Width * scale, From db165c64b062bd865454ebf1ed217b8a4cec25e7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 12 Sep 2022 21:50:04 +0000 Subject: [PATCH 07/40] Update dependencies from https://github.com/xamarin/xamarin-android build main-34986b9a7257ad8d7659722f8dda5512df0da68c-1 Microsoft.Android.Sdk.Windows From Version 33.0.0-rc.1.151 -> To Version 33.0.0-rc.2.175 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.22457.6 (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 688ee43f29ac..41ddd13ce3fe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,9 +8,9 @@ https://github.com/dotnet/runtime 6d10e4c8bcd9f96ccd73748ff827561afa09af57 - + https://github.com/xamarin/xamarin-android - c2534cca35b9c7105d9427f9e20bd8f3615f7516 + 34986b9a7257ad8d7659722f8dda5512df0da68c https://github.com/xamarin/xamarin-macios diff --git a/eng/Versions.props b/eng/Versions.props index a9bc0c1d6a5d..109d5fa0b924 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.172 + 33.0.0-rc.2.175 15.4.1051-rc.2 15.4.1051-rc.2 From 2c86de888b96a3350340eccaf5e2fc9a03b7d552 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Mon, 12 Sep 2022 21:38:00 -0500 Subject: [PATCH 08/40] Revert "Attempt to workaround iOS analyzer check" This reverts commit 22d0f1bee76ccf76afd5d17d793ad3728d073ede. --- src/Essentials/src/DeviceDisplay/DeviceDisplay.ios.cs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/Essentials/src/DeviceDisplay/DeviceDisplay.ios.cs b/src/Essentials/src/DeviceDisplay/DeviceDisplay.ios.cs index 7796f2caec82..8288d10936c0 100644 --- a/src/Essentials/src/DeviceDisplay/DeviceDisplay.ios.cs +++ b/src/Essentials/src/DeviceDisplay/DeviceDisplay.ios.cs @@ -17,12 +17,10 @@ protected override DisplayInfo GetMainDisplayInfo() { var bounds = UIScreen.MainScreen.Bounds; var scale = UIScreen.MainScreen.Scale; - float rate = 0; - if (OperatingSystem.IsIOSVersionAtLeast(10, 3) || OperatingSystem.IsTvOSVersionAtLeast(10, 3)) - { - rate = UIScreen.MainScreen.MaximumFramesPerSecond; - } + var rate = (OperatingSystem.IsIOSVersionAtLeast(10, 3) || OperatingSystem.IsTvOSVersionAtLeast(10, 3)) + ? UIScreen.MainScreen.MaximumFramesPerSecond + : 0; return new DisplayInfo( width: bounds.Width * scale, From 99e15aa10399bea390ab6211fbcb893fdfef62d4 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Mon, 12 Sep 2022 21:40:01 -0500 Subject: [PATCH 09/40] #pragma for CA1416 --- src/Essentials/src/DeviceDisplay/DeviceDisplay.ios.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Essentials/src/DeviceDisplay/DeviceDisplay.ios.cs b/src/Essentials/src/DeviceDisplay/DeviceDisplay.ios.cs index 8288d10936c0..73fbbe1b9035 100644 --- a/src/Essentials/src/DeviceDisplay/DeviceDisplay.ios.cs +++ b/src/Essentials/src/DeviceDisplay/DeviceDisplay.ios.cs @@ -18,9 +18,13 @@ protected override DisplayInfo GetMainDisplayInfo() var bounds = UIScreen.MainScreen.Bounds; var scale = UIScreen.MainScreen.Scale; + // TODO: warning doesn't seem correct, file an issue? + // error CA1416: This call site is reachable on: 'iOS' 10.0 and later, 'maccatalyst' 10.0 and later. 'UIScreen.MaximumFramesPerSecond' is only supported on: 'ios' 10.3 and later, 'maccatalyst' 10.3 and later, 'tvos' 10.2 and later. +#pragma warning disable CA1416 var rate = (OperatingSystem.IsIOSVersionAtLeast(10, 3) || OperatingSystem.IsTvOSVersionAtLeast(10, 3)) ? UIScreen.MainScreen.MaximumFramesPerSecond : 0; +#pragma warning restore CA1416 return new DisplayInfo( width: bounds.Width * scale, From 65c648eda571ce1c6225c650e333ea31a000ac14 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Mon, 12 Sep 2022 21:43:03 -0500 Subject: [PATCH 10/40] OperatingSystem.IsMacCatalystVersionAtLeast(14) --- src/Core/src/Platform/iOS/MauiPageControl.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; From 58a5cfb3eabcb9e435e107bf263d4c3cd55c0395 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Mon, 12 Sep 2022 22:29:34 -0500 Subject: [PATCH 11/40] Revert "OperatingSystem.IsMacCatalystVersionAtLeast(14)" This reverts commit 65c648eda571ce1c6225c650e333ea31a000ac14. --- src/Core/src/Platform/iOS/MauiPageControl.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Core/src/Platform/iOS/MauiPageControl.cs b/src/Core/src/Platform/iOS/MauiPageControl.cs index 91b4405a66df..8ad57efe2f72 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.IsMacCatalystVersionAtLeast(14) || OperatingSystem.IsTvOSVersionAtLeast(14)) + if (OperatingSystem.IsIOSVersionAtLeast(14) || OperatingSystem.IsTvOSVersionAtLeast(14)) { AllowsContinuousInteraction = false; BackgroundStyle = UIPageControlBackgroundStyle.Minimal; From 78bfd4dd6f852d5f441d08f2ce3a6e622b1d8aae Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Mon, 12 Sep 2022 22:32:55 -0500 Subject: [PATCH 12/40] #pragma warning disable CA1416 --- src/Core/src/Handlers/ViewHandlerExtensions.iOS.cs | 3 +++ src/Core/src/Platform/iOS/MauiPageControl.cs | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/Core/src/Handlers/ViewHandlerExtensions.iOS.cs b/src/Core/src/Handlers/ViewHandlerExtensions.iOS.cs index 07d78d5bc659..2911984cbf5b 100644 --- a/src/Core/src/Handlers/ViewHandlerExtensions.iOS.cs +++ b/src/Core/src/Handlers/ViewHandlerExtensions.iOS.cs @@ -25,7 +25,10 @@ internal static void LayoutVirtualView( bounds = bounds ?? platformView.Bounds; if (virtualView is ISafeAreaView sav && !sav.IgnoreSafeArea && (System.OperatingSystem.IsIOSVersionAtLeast(11) || System.OperatingSystem.IsTvOSVersionAtLeast(11))) { + // TODO: warning doesn't seem correct, file an issue? +#pragma warning disable CA1416 bounds = platformView.SafeAreaInsets.InsetRect(bounds.Value); +#pragma warning restore CA1416 } var rect = bounds.Value.ToRectangle(); diff --git a/src/Core/src/Platform/iOS/MauiPageControl.cs b/src/Core/src/Platform/iOS/MauiPageControl.cs index 8ad57efe2f72..a4f54957af29 100644 --- a/src/Core/src/Platform/iOS/MauiPageControl.cs +++ b/src/Core/src/Platform/iOS/MauiPageControl.cs @@ -17,8 +17,11 @@ public MauiPageControl() ValueChanged += MauiPageControlValueChanged; if (OperatingSystem.IsIOSVersionAtLeast(14) || OperatingSystem.IsTvOSVersionAtLeast(14)) { + // TODO: warning doesn't seem correct, file an issue? +#pragma warning disable CA1416 AllowsContinuousInteraction = false; BackgroundStyle = UIPageControlBackgroundStyle.Minimal; +#pragma warning restore CA1416 } } From 596421f97e01c03705340588358bd972e45f70f6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 13 Sep 2022 12:54:24 +0000 Subject: [PATCH 13/40] Update dependencies from https://github.com/xamarin/xamarin-android build main-93411cf25c4cb3b0ffeb68bac90a9978af55cf55-1 Microsoft.Android.Sdk.Windows From Version 33.0.0-rc.1.151 -> To Version 33.0.0-rc.2.176 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.22457.6 (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 41ddd13ce3fe..10ae9d53b43d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,9 +8,9 @@ https://github.com/dotnet/runtime 6d10e4c8bcd9f96ccd73748ff827561afa09af57 - + https://github.com/xamarin/xamarin-android - 34986b9a7257ad8d7659722f8dda5512df0da68c + 93411cf25c4cb3b0ffeb68bac90a9978af55cf55 https://github.com/xamarin/xamarin-macios diff --git a/eng/Versions.props b/eng/Versions.props index 109d5fa0b924..b8fec29047ec 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.175 + 33.0.0-rc.2.176 15.4.1051-rc.2 15.4.1051-rc.2 From f7686b759d06107c8460547bf5cfd948f63b8827 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Tue, 13 Sep 2022 08:18:23 -0500 Subject: [PATCH 14/40] Revert "#pragma warning disable CA1416" This reverts commit 78bfd4dd6f852d5f441d08f2ce3a6e622b1d8aae. --- src/Core/src/Handlers/ViewHandlerExtensions.iOS.cs | 3 --- src/Core/src/Platform/iOS/MauiPageControl.cs | 3 --- 2 files changed, 6 deletions(-) diff --git a/src/Core/src/Handlers/ViewHandlerExtensions.iOS.cs b/src/Core/src/Handlers/ViewHandlerExtensions.iOS.cs index 2911984cbf5b..07d78d5bc659 100644 --- a/src/Core/src/Handlers/ViewHandlerExtensions.iOS.cs +++ b/src/Core/src/Handlers/ViewHandlerExtensions.iOS.cs @@ -25,10 +25,7 @@ internal static void LayoutVirtualView( bounds = bounds ?? platformView.Bounds; if (virtualView is ISafeAreaView sav && !sav.IgnoreSafeArea && (System.OperatingSystem.IsIOSVersionAtLeast(11) || System.OperatingSystem.IsTvOSVersionAtLeast(11))) { - // TODO: warning doesn't seem correct, file an issue? -#pragma warning disable CA1416 bounds = platformView.SafeAreaInsets.InsetRect(bounds.Value); -#pragma warning restore CA1416 } var rect = bounds.Value.ToRectangle(); diff --git a/src/Core/src/Platform/iOS/MauiPageControl.cs b/src/Core/src/Platform/iOS/MauiPageControl.cs index a4f54957af29..8ad57efe2f72 100644 --- a/src/Core/src/Platform/iOS/MauiPageControl.cs +++ b/src/Core/src/Platform/iOS/MauiPageControl.cs @@ -17,11 +17,8 @@ public MauiPageControl() ValueChanged += MauiPageControlValueChanged; if (OperatingSystem.IsIOSVersionAtLeast(14) || OperatingSystem.IsTvOSVersionAtLeast(14)) { - // TODO: warning doesn't seem correct, file an issue? -#pragma warning disable CA1416 AllowsContinuousInteraction = false; BackgroundStyle = UIPageControlBackgroundStyle.Minimal; -#pragma warning restore CA1416 } } From 6ec4b935621b408fd23695f9843ce41b47e8975b Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Tue, 13 Sep 2022 08:18:39 -0500 Subject: [PATCH 15/40] Revert "#pragma for CA1416" This reverts commit 99e15aa10399bea390ab6211fbcb893fdfef62d4. --- src/Essentials/src/DeviceDisplay/DeviceDisplay.ios.cs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Essentials/src/DeviceDisplay/DeviceDisplay.ios.cs b/src/Essentials/src/DeviceDisplay/DeviceDisplay.ios.cs index 73fbbe1b9035..8288d10936c0 100644 --- a/src/Essentials/src/DeviceDisplay/DeviceDisplay.ios.cs +++ b/src/Essentials/src/DeviceDisplay/DeviceDisplay.ios.cs @@ -18,13 +18,9 @@ protected override DisplayInfo GetMainDisplayInfo() var bounds = UIScreen.MainScreen.Bounds; var scale = UIScreen.MainScreen.Scale; - // TODO: warning doesn't seem correct, file an issue? - // error CA1416: This call site is reachable on: 'iOS' 10.0 and later, 'maccatalyst' 10.0 and later. 'UIScreen.MaximumFramesPerSecond' is only supported on: 'ios' 10.3 and later, 'maccatalyst' 10.3 and later, 'tvos' 10.2 and later. -#pragma warning disable CA1416 var rate = (OperatingSystem.IsIOSVersionAtLeast(10, 3) || OperatingSystem.IsTvOSVersionAtLeast(10, 3)) ? UIScreen.MainScreen.MaximumFramesPerSecond : 0; -#pragma warning restore CA1416 return new DisplayInfo( width: bounds.Width * scale, From 015374fec133038757e36633cf5cc667cdf1b20e Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Tue, 13 Sep 2022 08:37:40 -0500 Subject: [PATCH 16/40] 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 dc2a5b942df49f756b619704ba311fba4fe7f1a4 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Tue, 13 Sep 2022 08:38:10 -0500 Subject: [PATCH 17/40] Fix NRT warnings for NSUrl.AbsoluteString --- src/BlazorWebView/src/Maui/iOS/BlazorWebViewHandler.iOS.cs | 2 +- src/Essentials/src/WebAuthenticator/WebAuthenticator.shared.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/BlazorWebView/src/Maui/iOS/BlazorWebViewHandler.iOS.cs b/src/BlazorWebView/src/Maui/iOS/BlazorWebViewHandler.iOS.cs index ef46a3cdb405..db9903e3310b 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()) diff --git a/src/Essentials/src/WebAuthenticator/WebAuthenticator.shared.cs b/src/Essentials/src/WebAuthenticator/WebAuthenticator.shared.cs index 7cd1ab7af9e5..26b78560e045 100644 --- a/src/Essentials/src/WebAuthenticator/WebAuthenticator.shared.cs +++ b/src/Essentials/src/WebAuthenticator/WebAuthenticator.shared.cs @@ -58,7 +58,7 @@ 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!)); + webAuthenticator.OpenUrl(new Uri(url.AbsoluteString ?? "")); public static bool ContinueUserActivity(this IWebAuthenticator webAuthenticator, UIKit.UIApplication application, Foundation.NSUserActivity userActivity, UIKit.UIApplicationRestorationHandler completionHandler) { From 2ceb54b3371c47a13b67ec1fe0d8e603687a9428 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 10 Sep 2022 13:03:49 +0000 Subject: [PATCH 18/40] Update dependencies from https://github.com/xamarin/xamarin-macios build 20220909.15 Microsoft.iOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.macOS.Sdk , Microsoft.tvOS.Sdk From Version 15.4.1029-rc.1 -> To Version 15.4.1126-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 10ae9d53b43d..e1b6e1f0b810 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -12,21 +12,21 @@ https://github.com/xamarin/xamarin-android 93411cf25c4cb3b0ffeb68bac90a9978af55cf55 - + https://github.com/xamarin/xamarin-macios - 2ddb7a6d681ce2f659b796184aee7e4a2991ae0c + e45ebce9be4e9195581c6a19e77a8024c6cac4b2 - + https://github.com/xamarin/xamarin-macios - 2ddb7a6d681ce2f659b796184aee7e4a2991ae0c + e45ebce9be4e9195581c6a19e77a8024c6cac4b2 - + https://github.com/xamarin/xamarin-macios - 2ddb7a6d681ce2f659b796184aee7e4a2991ae0c + e45ebce9be4e9195581c6a19e77a8024c6cac4b2 - + https://github.com/xamarin/xamarin-macios - 2ddb7a6d681ce2f659b796184aee7e4a2991ae0c + e45ebce9be4e9195581c6a19e77a8024c6cac4b2 https://github.com/dotnet/emsdk diff --git a/eng/Versions.props b/eng/Versions.props index b8fec29047ec..579d7063c47f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,10 +13,10 @@ 33.0.0-rc.2.176 - 15.4.1051-rc.2 - 15.4.1051-rc.2 - 12.3.1051-rc.2 - 15.4.1051-rc.2 + 15.4.1126-rc.2 + 15.4.1126-rc.2 + 12.3.1126-rc.2 + 15.4.1126-rc.2 7.0.100-rc.2.24 From 4475671498022958474ab22c84ecd9e7b8ed4cd9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 12 Sep 2022 21:49:43 +0000 Subject: [PATCH 19/40] Update dependencies from https://github.com/xamarin/xamarin-macios build 20220912.11 Microsoft.iOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.macOS.Sdk , Microsoft.tvOS.Sdk From Version 15.4.1029-rc.1 -> To Version 15.4.1153-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 e1b6e1f0b810..6b678f8f33ec 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -12,21 +12,21 @@ https://github.com/xamarin/xamarin-android 93411cf25c4cb3b0ffeb68bac90a9978af55cf55 - + https://github.com/xamarin/xamarin-macios - e45ebce9be4e9195581c6a19e77a8024c6cac4b2 + c5e1b9301f56f8380146f4e437c37baab3bf8f88 - + https://github.com/xamarin/xamarin-macios - e45ebce9be4e9195581c6a19e77a8024c6cac4b2 + c5e1b9301f56f8380146f4e437c37baab3bf8f88 - + https://github.com/xamarin/xamarin-macios - e45ebce9be4e9195581c6a19e77a8024c6cac4b2 + c5e1b9301f56f8380146f4e437c37baab3bf8f88 - + https://github.com/xamarin/xamarin-macios - e45ebce9be4e9195581c6a19e77a8024c6cac4b2 + c5e1b9301f56f8380146f4e437c37baab3bf8f88 https://github.com/dotnet/emsdk diff --git a/eng/Versions.props b/eng/Versions.props index 579d7063c47f..3024932caa52 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,10 +13,10 @@ 33.0.0-rc.2.176 - 15.4.1126-rc.2 - 15.4.1126-rc.2 - 12.3.1126-rc.2 - 15.4.1126-rc.2 + 15.4.1153-rc.2 + 15.4.1153-rc.2 + 12.3.1153-rc.2 + 15.4.1153-rc.2 7.0.100-rc.2.24 From bdaaa9cc94b7157e66285ab2bcd137d4e72b01a7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 14 Sep 2022 13:02:19 +0000 Subject: [PATCH 20/40] Update dependencies from https://github.com/xamarin/xamarin-android build main-1526df0115351020902710feeb9903c5387869ea-1 Microsoft.Android.Sdk.Windows From Version 33.0.0-rc.1.151 -> To Version 33.0.0-rc.2.178 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.22457.6 (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 6b678f8f33ec..783f15ff0a86 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,9 +8,9 @@ https://github.com/dotnet/runtime 6d10e4c8bcd9f96ccd73748ff827561afa09af57 - + https://github.com/xamarin/xamarin-android - 93411cf25c4cb3b0ffeb68bac90a9978af55cf55 + 1526df0115351020902710feeb9903c5387869ea https://github.com/xamarin/xamarin-macios diff --git a/eng/Versions.props b/eng/Versions.props index 3024932caa52..80fc1374e467 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.176 + 33.0.0-rc.2.178 15.4.1153-rc.2 15.4.1153-rc.2 From 397c14b3ac203aa759aa5d1c644a284c1a58ef50 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Wed, 14 Sep 2022 15:06:14 -0500 Subject: [PATCH 21/40] Set $(RuntimeIdentifier) for maccatalyst-x64 /Users/builder/azdo/_work/3/s/bin/dotnet/packs/Microsoft.MacCatalyst.Sdk/15.4.1153-rc.2/targets/Xamarin.Shared.Sdk.targets(371,3): error : Unable to merge the file 'Contents/Resources/Assets.car', it's different between the input app bundles. [/Users/builder/azdo/_work/3/s/src/Controls/samples/Controls.Sample.Sandbox/Maui.Controls.Sample.Sandbox.csproj::TargetFramework=net7.0-maccatalyst] /Users/builder/azdo/_work/3/s/bin/dotnet/packs/Microsoft.MacCatalyst.Sdk/15.4.1153-rc.2/targets/Xamarin.Shared.Sdk.targets(371,3): error : App bundle file #1: /Users/builder/azdo/_work/3/s/src/Controls/samples/Controls.Sample.Sandbox/bin/Release/net7.0-maccatalyst/maccatalyst-x64/Maui.Controls.Sample.Sandbox.app/Contents/Resources/Assets.car [/Users/builder/azdo/_work/3/s/src/Controls/samples/Controls.Sample.Sandbox/Maui.Controls.Sample.Sandbox.csproj::TargetFramework=net7.0-maccatalyst] /Users/builder/azdo/_work/3/s/bin/dotnet/packs/Microsoft.MacCatalyst.Sdk/15.4.1153-rc.2/targets/Xamarin.Shared.Sdk.targets(371,3): error : App bundle file #2: /Users/builder/azdo/_work/3/s/src/Controls/samples/Controls.Sample.Sandbox/bin/Release/net7.0-maccatalyst/maccatalyst-arm64/Maui.Controls.Sample.Sandbox.app/Contents/Resources/Assets.car [/Users/builder/azdo/_work/3/s/src/Controls/samples/Controls.Sample.Sandbox/Maui.Controls.Sample.Sandbox.csproj::TargetFramework=net7.0-maccatalyst] --- Directory.Build.targets | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Directory.Build.targets b/Directory.Build.targets index b09a7de6ec0b..003ac6290586 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -30,6 +30,8 @@ 13.1 $(NoWarn);CA1416 + + maccatalyst-x64 10.14 From cc05c020cf13b12ad5880cfcc2fbd342ad88cb6b Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Wed, 14 Sep 2022 16:19:35 -0500 Subject: [PATCH 22/40] Revert "Set $(RuntimeIdentifier) for maccatalyst-x64" This reverts commit 397c14b3ac203aa759aa5d1c644a284c1a58ef50. --- Directory.Build.targets | 2 -- 1 file changed, 2 deletions(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index 003ac6290586..b09a7de6ec0b 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -30,8 +30,6 @@ 13.1 $(NoWarn);CA1416 - - maccatalyst-x64 10.14 From 96221aac9e81d5a386611e07c3c2570febce38be Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Wed, 14 Sep 2022 16:26:13 -0500 Subject: [PATCH 23/40] Revert "Update dependencies from https://github.com/xamarin/xamarin-macios build 20220912.11" This reverts commit 4475671498022958474ab22c84ecd9e7b8ed4cd9. --- 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 783f15ff0a86..8126dc23732c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -12,21 +12,21 @@ https://github.com/xamarin/xamarin-android 1526df0115351020902710feeb9903c5387869ea - + https://github.com/xamarin/xamarin-macios - c5e1b9301f56f8380146f4e437c37baab3bf8f88 + e45ebce9be4e9195581c6a19e77a8024c6cac4b2 - + https://github.com/xamarin/xamarin-macios - c5e1b9301f56f8380146f4e437c37baab3bf8f88 + e45ebce9be4e9195581c6a19e77a8024c6cac4b2 - + https://github.com/xamarin/xamarin-macios - c5e1b9301f56f8380146f4e437c37baab3bf8f88 + e45ebce9be4e9195581c6a19e77a8024c6cac4b2 - + https://github.com/xamarin/xamarin-macios - c5e1b9301f56f8380146f4e437c37baab3bf8f88 + e45ebce9be4e9195581c6a19e77a8024c6cac4b2 https://github.com/dotnet/emsdk diff --git a/eng/Versions.props b/eng/Versions.props index 80fc1374e467..e51fe9756696 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,10 +13,10 @@ 33.0.0-rc.2.178 - 15.4.1153-rc.2 - 15.4.1153-rc.2 - 12.3.1153-rc.2 - 15.4.1153-rc.2 + 15.4.1126-rc.2 + 15.4.1126-rc.2 + 12.3.1126-rc.2 + 15.4.1126-rc.2 7.0.100-rc.2.24 From c3d616de0e447a189aa1cc802a959515b167a14c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 15 Sep 2022 12:46:10 +0000 Subject: [PATCH 24/40] Update dependencies from https://github.com/xamarin/xamarin-android build main-8059e30f6174a077b393c54bfa657f3c8b0287f4-1 Microsoft.Android.Sdk.Windows From Version 33.0.0-rc.1.151 -> To Version 33.0.0-rc.2.181 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.22457.6 (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 8126dc23732c..17927e8ba4b7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,9 +8,9 @@ https://github.com/dotnet/runtime 6d10e4c8bcd9f96ccd73748ff827561afa09af57 - + https://github.com/xamarin/xamarin-android - 1526df0115351020902710feeb9903c5387869ea + 8059e30f6174a077b393c54bfa657f3c8b0287f4 https://github.com/xamarin/xamarin-macios diff --git a/eng/Versions.props b/eng/Versions.props index e51fe9756696..7c1520ff2550 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.178 + 33.0.0-rc.2.181 15.4.1126-rc.2 15.4.1126-rc.2 From 79f0dbff46cc8570e804761f1a107adf01d9b6c7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 12 Sep 2022 21:49:43 +0000 Subject: [PATCH 25/40] Update dependencies from https://github.com/xamarin/xamarin-macios build 20220912.11 Microsoft.iOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.macOS.Sdk , Microsoft.tvOS.Sdk From Version 15.4.1029-rc.1 -> To Version 15.4.1153-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 17927e8ba4b7..277f8c0e394d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -12,21 +12,21 @@ https://github.com/xamarin/xamarin-android 8059e30f6174a077b393c54bfa657f3c8b0287f4 - + https://github.com/xamarin/xamarin-macios - e45ebce9be4e9195581c6a19e77a8024c6cac4b2 + c5e1b9301f56f8380146f4e437c37baab3bf8f88 - + https://github.com/xamarin/xamarin-macios - e45ebce9be4e9195581c6a19e77a8024c6cac4b2 + c5e1b9301f56f8380146f4e437c37baab3bf8f88 - + https://github.com/xamarin/xamarin-macios - e45ebce9be4e9195581c6a19e77a8024c6cac4b2 + c5e1b9301f56f8380146f4e437c37baab3bf8f88 - + https://github.com/xamarin/xamarin-macios - e45ebce9be4e9195581c6a19e77a8024c6cac4b2 + c5e1b9301f56f8380146f4e437c37baab3bf8f88 https://github.com/dotnet/emsdk diff --git a/eng/Versions.props b/eng/Versions.props index 7c1520ff2550..f1a7d5520b07 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,10 +13,10 @@ 33.0.0-rc.2.181 - 15.4.1126-rc.2 - 15.4.1126-rc.2 - 12.3.1126-rc.2 - 15.4.1126-rc.2 + 15.4.1153-rc.2 + 15.4.1153-rc.2 + 12.3.1153-rc.2 + 15.4.1153-rc.2 7.0.100-rc.2.24 From 93efde390cb61725e761428bf12ccf089c3188c7 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Thu, 15 Sep 2022 08:42:03 -0500 Subject: [PATCH 26/40] 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 d3c21d25e186109e18cee16f6ec56bb9ae4af3d6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 16 Sep 2022 13:01:13 +0000 Subject: [PATCH 27/40] Update dependencies from https://github.com/xamarin/xamarin-android build main-e4a4d245f5395c17d8f36d9c848758095181396b-1 Microsoft.Android.Sdk.Windows From Version 33.0.0-rc.1.151 -> To Version 33.0.0-rc.2.183 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.22457.6 (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 277f8c0e394d..20ad6b8ab61c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,9 +8,9 @@ https://github.com/dotnet/runtime 6d10e4c8bcd9f96ccd73748ff827561afa09af57 - + https://github.com/xamarin/xamarin-android - 8059e30f6174a077b393c54bfa657f3c8b0287f4 + e4a4d245f5395c17d8f36d9c848758095181396b https://github.com/xamarin/xamarin-macios diff --git a/eng/Versions.props b/eng/Versions.props index f1a7d5520b07..64483dc8c480 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.181 + 33.0.0-rc.2.183 15.4.1153-rc.2 15.4.1153-rc.2 From 0a75a35e5a1b630c4d16652e200851b6e2c28d2c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 17 Sep 2022 12:55:04 +0000 Subject: [PATCH 28/40] Update dependencies from https://github.com/xamarin/xamarin-android build main-5374e3a59cb516332ce1ff6d96d261dddc769b3c-1 Microsoft.Android.Sdk.Windows From Version 33.0.0-rc.1.151 -> To Version 33.0.0-rc.2.191 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.22459.2 (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 20ad6b8ab61c..20825d8a43c2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + https://github.com/dotnet/installer - dd355bb777249689beba30978ac26e15c96da642 + 11f6b8f7129e34d5317f47ccbc110b2b11c05749 https://github.com/dotnet/runtime 6d10e4c8bcd9f96ccd73748ff827561afa09af57 - + https://github.com/xamarin/xamarin-android - e4a4d245f5395c17d8f36d9c848758095181396b + 5374e3a59cb516332ce1ff6d96d261dddc769b3c https://github.com/xamarin/xamarin-macios diff --git a/eng/Versions.props b/eng/Versions.props index 64483dc8c480..7dc11ff846cf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -3,7 +3,7 @@ 6.0.533 - 7.0.100-rc.2.22457.6 + 7.0.100-rc.2.22459.2 7.0.0-rc.2.22451.11 @@ -11,7 +11,7 @@ 7.0.0-rc.2.22430.11 6.0.0 - 33.0.0-rc.2.183 + 33.0.0-rc.2.191 15.4.1153-rc.2 15.4.1153-rc.2 From 829d0b5acff58a6a8dee2269ca5aa58c24b2e978 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 19 Sep 2022 12:42:40 +0000 Subject: [PATCH 29/40] Update dependencies from https://github.com/xamarin/xamarin-android build 7.0.1xx-2ed3bfce2331e42d874d789906bbc9ab0d240c61-1 Microsoft.Android.Sdk.Windows From Version 33.0.0-rc.1.151 -> To Version 33.0.0-rtm.192 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.22459.2 (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 20825d8a43c2..7a2fb3e6f42b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,9 +8,9 @@ https://github.com/dotnet/runtime 6d10e4c8bcd9f96ccd73748ff827561afa09af57 - + https://github.com/xamarin/xamarin-android - 5374e3a59cb516332ce1ff6d96d261dddc769b3c + 2ed3bfce2331e42d874d789906bbc9ab0d240c61 https://github.com/xamarin/xamarin-macios diff --git a/eng/Versions.props b/eng/Versions.props index 7dc11ff846cf..81f8b40af5fa 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.191 + 33.0.0-rtm.192 15.4.1153-rc.2 15.4.1153-rc.2 From 08ee17a9d4b18341c06b159595b35a12f4876b0f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 20 Sep 2022 12:57:13 +0000 Subject: [PATCH 30/40] Update dependencies from https://github.com/xamarin/xamarin-android build 7.0.1xx-5a85bd76bf3d45f7b841501a1c4fd38eb1c3f4fe-1 Microsoft.Android.Sdk.Windows From Version 33.0.0-rc.1.151 -> To Version 33.0.0-rtm.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-rtm.22468.5 (parent: Microsoft.Android.Sdk.Windows --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7a2fb3e6f42b..fe3ca1d20cec 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + https://github.com/dotnet/installer - 11f6b8f7129e34d5317f47ccbc110b2b11c05749 + 0c5c5d3bc4d21cfeb345781e69a33b30e124334d - + https://github.com/dotnet/runtime - 6d10e4c8bcd9f96ccd73748ff827561afa09af57 + ee6cde5defb8d697d4a28602d072a3784890728f - + https://github.com/xamarin/xamarin-android - 2ed3bfce2331e42d874d789906bbc9ab0d240c61 + 5a85bd76bf3d45f7b841501a1c4fd38eb1c3f4fe https://github.com/xamarin/xamarin-macios @@ -28,13 +28,13 @@ https://github.com/xamarin/xamarin-macios c5e1b9301f56f8380146f4e437c37baab3bf8f88 - + https://github.com/dotnet/emsdk - 8d8d2122b16c81df4b158fe43995f958e8fe115e + 76e6b338e87093ddc9b3b650f027706aba65d388 - + https://github.com/dotnet/emsdk - 8d8d2122b16c81df4b158fe43995f958e8fe115e + 76e6b338e87093ddc9b3b650f027706aba65d388 https://dev.azure.com/microsoft/ProjectReunion/_git/ProjectReunionInternal diff --git a/eng/Versions.props b/eng/Versions.props index 81f8b40af5fa..35c881baa412 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -3,15 +3,15 @@ 6.0.533 - 7.0.100-rc.2.22459.2 + 7.0.100-rtm.22468.5 - 7.0.0-rc.2.22451.11 + 7.0.0-rtm.22465.3 7.0.0-rc.2.22430.11 7.0.0-rc.2.22430.11 6.0.0 - 33.0.0-rtm.192 + 33.0.0-rtm.194 15.4.1153-rc.2 15.4.1153-rc.2 @@ -20,7 +20,7 @@ 7.0.100-rc.2.24 - 7.0.0-rc.2.22430.5 + 7.0.0-rc.2.22459.3 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion) 1.1.4 From 480234eb2e675893036f60d89b123d5373684442 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 22 Sep 2022 13:02:56 +0000 Subject: [PATCH 31/40] Update dependencies from https://github.com/xamarin/xamarin-android build 7.0.1xx-0c223fdebb76feb6f46c4d2356d6b64f88f52f86-1 Microsoft.Android.Sdk.Windows From Version 33.0.0-rc.1.151 -> To Version 33.0.0-rtm.195 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-rtm.22470.23 (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 fe3ca1d20cec..99f2f35542fc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + https://github.com/dotnet/installer - 0c5c5d3bc4d21cfeb345781e69a33b30e124334d + 585d4d01cc1d326bf5fcb0ef6eb105a2a9e2a437 https://github.com/dotnet/runtime ee6cde5defb8d697d4a28602d072a3784890728f - + https://github.com/xamarin/xamarin-android - 5a85bd76bf3d45f7b841501a1c4fd38eb1c3f4fe + 0c223fdebb76feb6f46c4d2356d6b64f88f52f86 https://github.com/xamarin/xamarin-macios diff --git a/eng/Versions.props b/eng/Versions.props index 35c881baa412..6c6142984857 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -3,7 +3,7 @@ 6.0.533 - 7.0.100-rtm.22468.5 + 7.0.100-rtm.22470.23 7.0.0-rtm.22465.3 @@ -11,7 +11,7 @@ 7.0.0-rc.2.22430.11 6.0.0 - 33.0.0-rtm.194 + 33.0.0-rtm.195 15.4.1153-rc.2 15.4.1153-rc.2 From 619ae039ca17cd6107cd6a044691cb956a66b711 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 27 Sep 2022 12:54:43 +0000 Subject: [PATCH 32/40] Update dependencies from https://github.com/xamarin/xamarin-android build 7.0.1xx-5fe527ced18a205d7126dc4af76ab379240e765b-1 Microsoft.Android.Sdk.Windows From Version 33.0.0-rc.1.151 -> To Version 33.0.0-rtm.196 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-rtm.22473.5 (parent: Microsoft.Android.Sdk.Windows --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 99f2f35542fc..bd15cee429be 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + https://github.com/dotnet/installer - 585d4d01cc1d326bf5fcb0ef6eb105a2a9e2a437 + e607eccbb47bb3e75fc78eadd926f73a08b2ca7f - + https://github.com/dotnet/runtime - ee6cde5defb8d697d4a28602d072a3784890728f + 43a11661ae9bacdd847663207bef79fe93d69df7 - + https://github.com/xamarin/xamarin-android - 0c223fdebb76feb6f46c4d2356d6b64f88f52f86 + 5fe527ced18a205d7126dc4af76ab379240e765b https://github.com/xamarin/xamarin-macios diff --git a/eng/Versions.props b/eng/Versions.props index 6c6142984857..a55b447c7aaa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -3,15 +3,15 @@ 6.0.533 - 7.0.100-rtm.22470.23 + 7.0.100-rtm.22473.5 - 7.0.0-rtm.22465.3 + 7.0.0-rtm.22466.6 7.0.0-rc.2.22430.11 7.0.0-rc.2.22430.11 6.0.0 - 33.0.0-rtm.195 + 33.0.0-rtm.196 15.4.1153-rc.2 15.4.1153-rc.2 From 69263f974d1d3dbe21d33b2c99c0cf6bb5f4e0dc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 28 Sep 2022 12:55:22 +0000 Subject: [PATCH 33/40] Update dependencies from https://github.com/xamarin/xamarin-android build 7.0.1xx-a9d4ee77c56607a0f301429e3fe66bb85561233e-1 Microsoft.Android.Sdk.Windows From Version 33.0.0-rc.1.151 -> To Version 33.0.0-rtm.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-rtm.22473.5 (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 bd15cee429be..71da61bc71ff 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,9 +8,9 @@ https://github.com/dotnet/runtime 43a11661ae9bacdd847663207bef79fe93d69df7 - + https://github.com/xamarin/xamarin-android - 5fe527ced18a205d7126dc4af76ab379240e765b + a9d4ee77c56607a0f301429e3fe66bb85561233e https://github.com/xamarin/xamarin-macios diff --git a/eng/Versions.props b/eng/Versions.props index a55b447c7aaa..443201be493a 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-rtm.196 + 33.0.0-rtm.202 15.4.1153-rc.2 15.4.1153-rc.2 From c7013a01c584682ae1e4fd336ef705e81f8f1516 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 30 Sep 2022 12:53:10 +0000 Subject: [PATCH 34/40] Update dependencies from https://github.com/xamarin/xamarin-android build 7.0.1xx-9aab64eaa0c46bb9aeacfb4f0d4e09733bcbf377-1 Microsoft.Android.Sdk.Windows From Version 33.0.0-rc.1.151 -> To Version 33.0.0-rtm.205 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-rtm.22478.24 (parent: Microsoft.Android.Sdk.Windows --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 71da61bc71ff..649fb6f037b0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + https://github.com/dotnet/installer - e607eccbb47bb3e75fc78eadd926f73a08b2ca7f + 8153d0b879cf60de1e8ffaecf08c3e5595855de8 - + https://github.com/dotnet/runtime - 43a11661ae9bacdd847663207bef79fe93d69df7 + 915dc2723565b176dfec058665c5f8ecc250479a - + https://github.com/xamarin/xamarin-android - a9d4ee77c56607a0f301429e3fe66bb85561233e + 9aab64eaa0c46bb9aeacfb4f0d4e09733bcbf377 https://github.com/xamarin/xamarin-macios @@ -28,13 +28,13 @@ https://github.com/xamarin/xamarin-macios c5e1b9301f56f8380146f4e437c37baab3bf8f88 - + https://github.com/dotnet/emsdk - 76e6b338e87093ddc9b3b650f027706aba65d388 + 77c2667993976295017e2759f075550bcf606fc1 - + https://github.com/dotnet/emsdk - 76e6b338e87093ddc9b3b650f027706aba65d388 + 77c2667993976295017e2759f075550bcf606fc1 https://dev.azure.com/microsoft/ProjectReunion/_git/ProjectReunionInternal diff --git a/eng/Versions.props b/eng/Versions.props index 443201be493a..97ecabc02cde 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -3,15 +3,15 @@ 6.0.533 - 7.0.100-rtm.22473.5 + 7.0.100-rtm.22478.24 - 7.0.0-rtm.22466.6 + 7.0.0-rtm.22476.12 7.0.0-rc.2.22430.11 7.0.0-rc.2.22430.11 6.0.0 - 33.0.0-rtm.202 + 33.0.0-rtm.205 15.4.1153-rc.2 15.4.1153-rc.2 @@ -20,7 +20,7 @@ 7.0.100-rc.2.24 - 7.0.0-rc.2.22459.3 + 7.0.0-rtm.22476.2 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion) 1.1.4 From a1622ee519ab93807be6e7d92734ce1d50d21baa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 1 Oct 2022 12:54:51 +0000 Subject: [PATCH 35/40] Update dependencies from https://github.com/xamarin/xamarin-android build 7.0.1xx-0e33557a3a363feed0e1a08798754bd77ffe2df3-1 Microsoft.Android.Sdk.Windows From Version 33.0.0-rc.2.202 -> To Version 33.0.0-rtm.211 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.2.22477.20 -> To Version 7.0.100-rtm.22478.24 (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 649fb6f037b0..d833a43c3df1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,9 +8,9 @@ https://github.com/dotnet/runtime 915dc2723565b176dfec058665c5f8ecc250479a - + https://github.com/xamarin/xamarin-android - 9aab64eaa0c46bb9aeacfb4f0d4e09733bcbf377 + 0e33557a3a363feed0e1a08798754bd77ffe2df3 https://github.com/xamarin/xamarin-macios diff --git a/eng/Versions.props b/eng/Versions.props index 97ecabc02cde..81d2a5c610ec 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-rtm.205 + 33.0.0-rtm.211 15.4.1153-rc.2 15.4.1153-rc.2 From d60ebe85c91eb641d54193140136d04ddf419f93 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 11 Oct 2022 12:37:30 +0000 Subject: [PATCH 36/40] Update dependencies from https://github.com/xamarin/xamarin-android build 7.0.1xx-56e31f5e07868ea5c2df23c473a601932418f05c-1 Microsoft.Android.Sdk.Windows From Version 33.0.0-rc.2.202 -> To Version 33.0.0-rtm.212 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.2.22477.20 -> To Version 7.0.100-rtm.22478.24 (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 d833a43c3df1..93f4c071858a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,9 +8,9 @@ https://github.com/dotnet/runtime 915dc2723565b176dfec058665c5f8ecc250479a - + https://github.com/xamarin/xamarin-android - 0e33557a3a363feed0e1a08798754bd77ffe2df3 + 56e31f5e07868ea5c2df23c473a601932418f05c https://github.com/xamarin/xamarin-macios diff --git a/eng/Versions.props b/eng/Versions.props index 81d2a5c610ec..145442c14115 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-rtm.211 + 33.0.0-rtm.212 15.4.1153-rc.2 15.4.1153-rc.2 From 33436ad5d23a0be85cd7475e0311d8635c679b9b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Oct 2022 13:09:11 +0000 Subject: [PATCH 37/40] Update dependencies from https://github.com/xamarin/xamarin-android build 7.0.1xx-759b16ac78c36cbf41873b8596dcced54d7b101b-1 Microsoft.Android.Sdk.Windows From Version 33.0.0-rc.2.202 -> To Version 33.0.0-rtm.214 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.2.22477.20 -> To Version 7.0.100-rtm.22478.24 (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 93f4c071858a..ef6766f11d89 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,9 +8,9 @@ https://github.com/dotnet/runtime 915dc2723565b176dfec058665c5f8ecc250479a - + https://github.com/xamarin/xamarin-android - 56e31f5e07868ea5c2df23c473a601932418f05c + 759b16ac78c36cbf41873b8596dcced54d7b101b https://github.com/xamarin/xamarin-macios diff --git a/eng/Versions.props b/eng/Versions.props index 145442c14115..784957e9b146 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-rtm.212 + 33.0.0-rtm.214 15.4.1153-rc.2 15.4.1153-rc.2 From 9a9d0d2b82655afc28732ca0aaf16889421c71cb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 13 Oct 2022 13:24:03 +0000 Subject: [PATCH 38/40] Update dependencies from https://github.com/xamarin/xamarin-android build 7.0.1xx-004feec48dee9587ef5ee1ccd7845dd4f1514278-1 Microsoft.Android.Sdk.Windows From Version 33.0.0-rc.2.202 -> To Version 33.0.0-rtm.218 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.2.22477.20 -> To Version 7.0.100-rtm.22511.20 (parent: Microsoft.Android.Sdk.Windows --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ef6766f11d89..273730d19729 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + https://github.com/dotnet/installer - 8153d0b879cf60de1e8ffaecf08c3e5595855de8 + 5633822a17aef84365ba4e2457ee3a9c046f1014 - + https://github.com/dotnet/runtime - 915dc2723565b176dfec058665c5f8ecc250479a + b8a4363ecd194d4e7906648a505701a9d2b7aeae - + https://github.com/xamarin/xamarin-android - 759b16ac78c36cbf41873b8596dcced54d7b101b + 004feec48dee9587ef5ee1ccd7845dd4f1514278 https://github.com/xamarin/xamarin-macios @@ -28,13 +28,13 @@ https://github.com/xamarin/xamarin-macios c5e1b9301f56f8380146f4e437c37baab3bf8f88 - + https://github.com/dotnet/emsdk - 77c2667993976295017e2759f075550bcf606fc1 + daca2015ce74956591df9c9dc7ee732af7863b42 - + https://github.com/dotnet/emsdk - 77c2667993976295017e2759f075550bcf606fc1 + daca2015ce74956591df9c9dc7ee732af7863b42 https://dev.azure.com/microsoft/ProjectReunion/_git/ProjectReunionInternal diff --git a/eng/Versions.props b/eng/Versions.props index 784957e9b146..c002886832cd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -3,15 +3,15 @@ 6.0.533 - 7.0.100-rtm.22478.24 + 7.0.100-rtm.22511.20 - 7.0.0-rtm.22476.12 + 7.0.0-rtm.22507.1 7.0.0-rc.2.22430.11 7.0.0-rc.2.22430.11 6.0.0 - 33.0.0-rtm.214 + 33.0.0-rtm.218 15.4.1153-rc.2 15.4.1153-rc.2 @@ -20,7 +20,7 @@ 7.0.100-rc.2.24 - 7.0.0-rtm.22476.2 + 7.0.0-rtm.22504.3 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion) 1.1.4 From 6e314b97160b250c61107e9e9f90059ffc9ec101 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 14 Oct 2022 12:54:10 +0000 Subject: [PATCH 39/40] Update dependencies from https://github.com/xamarin/xamarin-android build 7.0.1xx-30bfeafacfaceb8021539ea33e4d244dd476e504-1 Microsoft.Android.Sdk.Windows From Version 33.0.0-rc.2.202 -> To Version 33.0.0-rtm.220 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.2.22477.20 -> To Version 7.0.100-rtm.22512.33 (parent: Microsoft.Android.Sdk.Windows --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 273730d19729..18303726a0e9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + https://github.com/dotnet/installer - 5633822a17aef84365ba4e2457ee3a9c046f1014 + 5d80bf0a6550a89a16204013471290b02c7cb765 - + https://github.com/dotnet/runtime - b8a4363ecd194d4e7906648a505701a9d2b7aeae + d25158d0dffd699340cedcfd43324c87a809a214 - + https://github.com/xamarin/xamarin-android - 004feec48dee9587ef5ee1ccd7845dd4f1514278 + 30bfeafacfaceb8021539ea33e4d244dd476e504 https://github.com/xamarin/xamarin-macios diff --git a/eng/Versions.props b/eng/Versions.props index c002886832cd..ad2dcd6343a3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -3,15 +3,15 @@ 6.0.533 - 7.0.100-rtm.22511.20 + 7.0.100-rtm.22512.33 - 7.0.0-rtm.22507.1 + 7.0.0-rtm.22511.4 7.0.0-rc.2.22430.11 7.0.0-rc.2.22430.11 6.0.0 - 33.0.0-rtm.218 + 33.0.0-rtm.220 15.4.1153-rc.2 15.4.1153-rc.2 From bef3b653d31b4507f532bce33788984d70ed2114 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 15 Oct 2022 12:50:40 +0000 Subject: [PATCH 40/40] Update dependencies from https://github.com/xamarin/xamarin-android build 7.0.1xx-04fe9838ab79392b219e20ba689445cea16d0e74-1 Microsoft.Android.Sdk.Windows From Version 33.0.0-rc.2.202 -> To Version 33.0.2 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.2.22477.20 -> To Version 7.0.100-rtm.22513.13 (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 18303726a0e9..17d10f9009ed 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + https://github.com/dotnet/installer - 5d80bf0a6550a89a16204013471290b02c7cb765 + fbaf01806695d66444f36203b475ce6d34193488 https://github.com/dotnet/runtime d25158d0dffd699340cedcfd43324c87a809a214 - + https://github.com/xamarin/xamarin-android - 30bfeafacfaceb8021539ea33e4d244dd476e504 + 04fe9838ab79392b219e20ba689445cea16d0e74 https://github.com/xamarin/xamarin-macios diff --git a/eng/Versions.props b/eng/Versions.props index ad2dcd6343a3..492ba5415599 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -3,7 +3,7 @@ 6.0.533 - 7.0.100-rtm.22512.33 + 7.0.100-rtm.22513.13 7.0.0-rtm.22511.4 @@ -11,7 +11,7 @@ 7.0.0-rc.2.22430.11 6.0.0 - 33.0.0-rtm.220 + 33.0.2 15.4.1153-rc.2 15.4.1153-rc.2