diff --git a/.nuspec/Microsoft.Maui.Resizetizer.targets b/.nuspec/Microsoft.Maui.Resizetizer.targets index e3d597213113..d69ad1c317bb 100644 --- a/.nuspec/Microsoft.Maui.Resizetizer.targets +++ b/.nuspec/Microsoft.Maui.Resizetizer.targets @@ -120,22 +120,24 @@ ios - - $(ResizetizeCollectItemsBeforeTargets); - _CollectBundleResources; - _BeforeCoreCompileImageAssets; - + + true + + + $(CollectBundleResourcesDependsOn); + ResizetizeCollectItems; + + + + $(CompileImageAssetsDependsOn); + ResizetizeCollectItems; + $(ResizetizeAfterTargets); ResizetizeCollectItems; - - $(ProcessMauiFontsBeforeTargets); - _BeforeCoreCompileImageAssets; - - ProcessMauiFonts; ProcessMauiSplashScreens; @@ -239,7 +241,7 @@ @@ -408,7 +410,7 @@ <_MauiSplashScreens Include="$(_MauiIntermediateSplashScreen)splash\*" /> - + 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 + 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..fee59eaf0e52 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,8 +10,11 @@ - + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 25327876c7e1..aff9fe686705 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,40 +1,40 @@ - + https://github.com/dotnet/installer - cd7df40ff129744cc664ea5c83c113ccf2763829 + 915e3f711083de58b3142d6be77d48cc64da6c38 - + https://github.com/dotnet/runtime - 06aceb7015f3bd2ff019ef5920d2354eb2ea2c92 + 550605cc93d9b903c4fbaf8f1f83e387d2f79dbe - + https://github.com/xamarin/xamarin-android - b9389dc0168e184758c226962a0b270d300c17eb + bf10ce5525d97f2303993d631003df54f2837617 - + https://github.com/xamarin/xamarin-macios - e7aa824644021c2ff80d5948f089f399bf7568aa + 90f75bc307e5cba22bf1472f51cf6f4bdb624a1b - + https://github.com/xamarin/xamarin-macios - e7aa824644021c2ff80d5948f089f399bf7568aa + 90f75bc307e5cba22bf1472f51cf6f4bdb624a1b - + https://github.com/xamarin/xamarin-macios - e7aa824644021c2ff80d5948f089f399bf7568aa + 90f75bc307e5cba22bf1472f51cf6f4bdb624a1b - + https://github.com/xamarin/xamarin-macios - e7aa824644021c2ff80d5948f089f399bf7568aa + 90f75bc307e5cba22bf1472f51cf6f4bdb624a1b - + https://github.com/dotnet/emsdk - 5ef661392ae7b1595b683df83d63e3a0365fc126 + 6625add9a3eadc2954af0311be35290cfefcddb0 - + https://github.com/dotnet/emsdk - 5ef661392ae7b1595b683df83d63e3a0365fc126 + 6625add9a3eadc2954af0311be35290cfefcddb0 https://dev.azure.com/microsoft/ProjectReunion/_git/ProjectReunionInternal diff --git a/eng/Versions.props b/eng/Versions.props index b74bf7e206ea..f64771227f7a 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-rc.2.22477.20 - 7.0.0-rc.1.22426.10 + 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.1.151 + 33.0.0-rc.2.202 - 15.4.1029-rc.1 - 15.4.1029-rc.1 - 12.3.1029-rc.1 - 15.4.1029-rc.1 + 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 + 7.0.100-rc.2.24 - 7.0.0-rc.1.22424.1 + 7.0.0-rc.2.22465.1 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion) 1.1.4 diff --git a/eng/cake/dotnet.cake b/eng/cake/dotnet.cake index 8b63fc4a0bcf..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"); + RunMSBuildWithDotNet("./Microsoft.Maui.sln", maxCpuCount: 1); else - RunMSBuildWithDotNet("./Microsoft.Maui-mac.slnf"); + 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") @@ -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> { @@ -596,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"; @@ -611,7 +614,7 @@ void RunMSBuildWithDotNet( var msbuildSettings = new DotNetCoreMSBuildSettings() .SetConfiguration(configuration) - .SetMaxCpuCount(0) + .SetMaxCpuCount(maxCpuCount) .WithTarget(target) .EnableBinaryLogger(binlog); diff --git a/src/BlazorWebView/src/Maui/iOS/BlazorWebViewHandler.iOS.cs b/src/BlazorWebView/src/Maui/iOS/BlazorWebViewHandler.iOS.cs index 9e367d0deccd..078a153b29f5 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()) @@ -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(); 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 @@  - diff --git a/src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj b/src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj index 8c8d19fe2dd5..2a95001a170e 100644 --- a/src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj +++ b/src/Controls/tests/DeviceTests/Controls.DeviceTests.csproj @@ -21,7 +21,11 @@ - + + + 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 @@  - diff --git a/src/Core/src/Platform/iOS/MauiPageControl.cs b/src/Core/src/Platform/iOS/MauiPageControl.cs index edf73aefaaf1..91b4405a66df 100644 --- a/src/Core/src/Platform/iOS/MauiPageControl.cs +++ b/src/Core/src/Platform/iOS/MauiPageControl.cs @@ -15,12 +15,7 @@ public class MauiPageControl : UIPageControl public MauiPageControl() { ValueChanged += MauiPageControlValueChanged; - - if (OperatingSystem.IsIOSVersionAtLeast(14) || OperatingSystem.IsMacCatalystVersionAtLeast(14) -#if TVOS - || OperatingSystem.IsTvOSVersionAtLeast(14) -#endif - ) + if (OperatingSystem.IsIOSVersionAtLeast(14) || OperatingSystem.IsMacCatalystVersionAtLeast(14) || OperatingSystem.IsTvOSVersionAtLeast(14)) { AllowsContinuousInteraction = false; BackgroundStyle = UIPageControlBackgroundStyle.Minimal; 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 diff --git a/src/Essentials/src/DeviceDisplay/DeviceDisplay.ios.cs b/src/Essentials/src/DeviceDisplay/DeviceDisplay.ios.cs index 045224cd25ee..00ee927be616 100644 --- a/src/Essentials/src/DeviceDisplay/DeviceDisplay.ios.cs +++ b/src/Essentials/src/DeviceDisplay/DeviceDisplay.ios.cs @@ -18,16 +18,9 @@ protected override DisplayInfo GetMainDisplayInfo() var bounds = UIScreen.MainScreen.Bounds; var scale = UIScreen.MainScreen.Scale; - nint rate = 0; - - if (OperatingSystem.IsIOSVersionAtLeast(10, 3) || OperatingSystem.IsMacCatalystVersionAtLeast(10, 3) -#if TVOS - || OperatingSystem.IsTvOSVersionAtLeast(11) -#endif - ) - { - rate = UIScreen.MainScreen.MaximumFramesPerSecond; - } + var rate = (OperatingSystem.IsIOSVersionAtLeast(10, 3) || OperatingSystem.IsMacCatalystVersionAtLeast(10, 3) || OperatingSystem.IsTvOSVersionAtLeast(10, 3)) + ? UIScreen.MainScreen.MaximumFramesPerSecond + : 0; return new DisplayInfo( width: bounds.Width * scale, diff --git a/src/Essentials/src/WebAuthenticator/WebAuthenticator.shared.cs b/src/Essentials/src/WebAuthenticator/WebAuthenticator.shared.cs index b592d2e973f1..9a11c0263564 100644 --- a/src/Essentials/src/WebAuthenticator/WebAuthenticator.shared.cs +++ b/src/Essentials/src/WebAuthenticator/WebAuthenticator.shared.cs @@ -57,11 +57,12 @@ 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) + public static bool OpenUrl(this IWebAuthenticator webAuthenticator, UIKit.UIApplication app, Foundation.NSUrl url, Foundation.NSDictionary options) { - var absUri = url?.AbsoluteString; - if (!string.IsNullOrEmpty(absUri)) - return webAuthenticator.OpenUrl(new Uri(absUri)); + if(url?.AbsoluteString != null) + { + return webAuthenticator.OpenUrl(new Uri(url.AbsoluteString)); + } return false; }