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; 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 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 fd9d9b90baf5..17d10f9009ed 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,40 +1,40 @@ - + https://github.com/dotnet/installer - cd7df40ff129744cc664ea5c83c113ccf2763829 + fbaf01806695d66444f36203b475ce6d34193488 - + https://github.com/dotnet/runtime - 06aceb7015f3bd2ff019ef5920d2354eb2ea2c92 + d25158d0dffd699340cedcfd43324c87a809a214 - + https://github.com/xamarin/xamarin-android - b9389dc0168e184758c226962a0b270d300c17eb + 04fe9838ab79392b219e20ba689445cea16d0e74 - + https://github.com/xamarin/xamarin-macios - e7aa824644021c2ff80d5948f089f399bf7568aa + c5e1b9301f56f8380146f4e437c37baab3bf8f88 - + https://github.com/xamarin/xamarin-macios - e7aa824644021c2ff80d5948f089f399bf7568aa + c5e1b9301f56f8380146f4e437c37baab3bf8f88 - + https://github.com/xamarin/xamarin-macios - e7aa824644021c2ff80d5948f089f399bf7568aa + c5e1b9301f56f8380146f4e437c37baab3bf8f88 - + https://github.com/xamarin/xamarin-macios - e7aa824644021c2ff80d5948f089f399bf7568aa + c5e1b9301f56f8380146f4e437c37baab3bf8f88 - + https://github.com/dotnet/emsdk - 5ef661392ae7b1595b683df83d63e3a0365fc126 + daca2015ce74956591df9c9dc7ee732af7863b42 - + https://github.com/dotnet/emsdk - 5ef661392ae7b1595b683df83d63e3a0365fc126 + daca2015ce74956591df9c9dc7ee732af7863b42 https://dev.azure.com/microsoft/ProjectReunion/_git/ProjectReunionInternal diff --git a/eng/Versions.props b/eng/Versions.props index 5e687c4c4c03..492ba5415599 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -3,24 +3,24 @@ 6.0.533 - 7.0.100-rc.1.22425.9 + 7.0.100-rtm.22513.13 - 7.0.0-rc.1.22426.10 + 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-rc.1.151 + 33.0.2 - 15.4.1029-rc.1 - 15.4.1029-rc.1 - 12.3.1029-rc.1 - 15.4.1029-rc.1 + 15.4.1153-rc.2 + 15.4.1153-rc.2 + 12.3.1153-rc.2 + 15.4.1153-rc.2 - 7.0.100-rc.1.22 + 7.0.100-rc.2.24 - 7.0.0-rc.1.22424.1 + 7.0.0-rtm.22504.3 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion) 1.1.4 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 eb12ee874617..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) {