diff --git a/NuGet.config b/NuGet.config index eba7ff50d9a9..4b7f099d5946 100644 --- a/NuGet.config +++ b/NuGet.config @@ -21,8 +21,9 @@ - - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index efa241f3b071..bf6e7d887636 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,139 +1,139 @@ - + https://github.com/dotnet/sdk - 9a028e12b90e6a583b09ccb3008fdfaf85761f19 + 812e813ae9785966b854002d35507c123c858ced - + https://github.com/dotnet/runtime - 1f70f0cc663b5d45f77840e9728386e5fa7944f9 + bdcf3ef75e11d22e4973bf37f2d5b660b73aa266 - + https://github.com/dotnet/android - ab412a5629778598f9b33b9b976721898dbacc95 + 0f68e068519bcc9509be88037501f77593222e73 - + https://github.com/xamarin/xamarin-macios - 4741d540eee2390fa075d0bdb49083cb58e43048 + f6a32320a02128b551f1e417b46c28a2722a6479 - + https://github.com/xamarin/xamarin-macios - 4741d540eee2390fa075d0bdb49083cb58e43048 + f6a32320a02128b551f1e417b46c28a2722a6479 - + https://github.com/xamarin/xamarin-macios - 4741d540eee2390fa075d0bdb49083cb58e43048 + f6a32320a02128b551f1e417b46c28a2722a6479 - + https://github.com/xamarin/xamarin-macios - 4741d540eee2390fa075d0bdb49083cb58e43048 + f6a32320a02128b551f1e417b46c28a2722a6479 https://dev.azure.com/microsoft/ProjectReunion/_git/ProjectReunionInternal - + https://github.com/dotnet/emsdk - 99ea0c06b84d3084d090da537080dd35d2a193cf + 75567e63c265cb0a69bb11f8024349eda83f0878 - + https://github.com/dotnet/aspnetcore - ec1594438c33702e564c36252ed11d024b5e6aad + 41a338d8befba633f5349a0344842ae1a9211817 - + https://github.com/dotnet/aspnetcore - ec1594438c33702e564c36252ed11d024b5e6aad + 41a338d8befba633f5349a0344842ae1a9211817 - + https://github.com/dotnet/aspnetcore - ec1594438c33702e564c36252ed11d024b5e6aad + 41a338d8befba633f5349a0344842ae1a9211817 - + https://github.com/dotnet/aspnetcore - ec1594438c33702e564c36252ed11d024b5e6aad + 41a338d8befba633f5349a0344842ae1a9211817 - + https://github.com/dotnet/aspnetcore - ec1594438c33702e564c36252ed11d024b5e6aad + 41a338d8befba633f5349a0344842ae1a9211817 - + https://github.com/dotnet/aspnetcore - ec1594438c33702e564c36252ed11d024b5e6aad + 41a338d8befba633f5349a0344842ae1a9211817 - + https://github.com/dotnet/aspnetcore - ec1594438c33702e564c36252ed11d024b5e6aad + 41a338d8befba633f5349a0344842ae1a9211817 - + https://github.com/dotnet/aspnetcore - ec1594438c33702e564c36252ed11d024b5e6aad + 41a338d8befba633f5349a0344842ae1a9211817 - + https://github.com/dotnet/aspnetcore - ec1594438c33702e564c36252ed11d024b5e6aad + 41a338d8befba633f5349a0344842ae1a9211817 - + https://github.com/dotnet/aspnetcore - ec1594438c33702e564c36252ed11d024b5e6aad + 41a338d8befba633f5349a0344842ae1a9211817 - + https://github.com/dotnet/aspnetcore - ec1594438c33702e564c36252ed11d024b5e6aad + 41a338d8befba633f5349a0344842ae1a9211817 - + https://github.com/dotnet/aspnetcore - ec1594438c33702e564c36252ed11d024b5e6aad + 41a338d8befba633f5349a0344842ae1a9211817 - + https://github.com/dotnet/aspnetcore - ec1594438c33702e564c36252ed11d024b5e6aad + 41a338d8befba633f5349a0344842ae1a9211817 https://github.com/dotnet/templating 3f4da9ced34942d83054e647f3b1d9d7dde281e8 - + https://github.com/dotnet/runtime - e1ab2243b27da4aa8a76372e4384bcd2b5894b3b + bdcf3ef75e11d22e4973bf37f2d5b660b73aa266 - + https://github.com/dotnet/runtime - e1ab2243b27da4aa8a76372e4384bcd2b5894b3b + bdcf3ef75e11d22e4973bf37f2d5b660b73aa266 - + https://github.com/dotnet/runtime - e1ab2243b27da4aa8a76372e4384bcd2b5894b3b + bdcf3ef75e11d22e4973bf37f2d5b660b73aa266 - + https://github.com/dotnet/runtime - e1ab2243b27da4aa8a76372e4384bcd2b5894b3b + bdcf3ef75e11d22e4973bf37f2d5b660b73aa266 - + https://github.com/dotnet/runtime - e1ab2243b27da4aa8a76372e4384bcd2b5894b3b + bdcf3ef75e11d22e4973bf37f2d5b660b73aa266 - + https://github.com/dotnet/runtime - e1ab2243b27da4aa8a76372e4384bcd2b5894b3b + bdcf3ef75e11d22e4973bf37f2d5b660b73aa266 - + https://github.com/dotnet/runtime - e1ab2243b27da4aa8a76372e4384bcd2b5894b3b + bdcf3ef75e11d22e4973bf37f2d5b660b73aa266 - + https://github.com/dotnet/runtime - e1ab2243b27da4aa8a76372e4384bcd2b5894b3b + bdcf3ef75e11d22e4973bf37f2d5b660b73aa266 - + https://github.com/dotnet/runtime - e1ab2243b27da4aa8a76372e4384bcd2b5894b3b + bdcf3ef75e11d22e4973bf37f2d5b660b73aa266 - + https://github.com/dotnet/runtime - e1ab2243b27da4aa8a76372e4384bcd2b5894b3b + bdcf3ef75e11d22e4973bf37f2d5b660b73aa266 - + https://github.com/dotnet/runtime - e1ab2243b27da4aa8a76372e4384bcd2b5894b3b + bdcf3ef75e11d22e4973bf37f2d5b660b73aa266 https://github.com/dotnet/xharness diff --git a/eng/Versions.props b/eng/Versions.props index e414d3488a8a..4be4054af0b2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,56 +29,56 @@ 8.0.70 - 9.0.100-preview.7.24360.5 + 9.0.100-preview.7.24379.15 $(VSToolsNetCoreSDKResolverPackageVersion) - 9.0.0-preview.7.24366.18 + 9.0.0-preview.7.24376.15 $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftNETCoreAppRefPackageVersion) - 9.0.0-preview.7.24365.2 - 9.0.0-preview.7.24365.2 - 9.0.0-preview.7.24365.2 - 9.0.0-preview.7.24365.2 - 9.0.0-preview.7.24365.2 - 9.0.0-preview.7.24365.2 - 9.0.0-preview.7.24365.2 - 9.0.0-preview.7.24365.2 - 9.0.0-preview.7.24365.2 - 9.0.0-preview.7.24365.2 - 9.0.0-preview.7.24365.2 + 9.0.0-preview.7.24376.15 + 9.0.0-preview.7.24376.15 + 9.0.0-preview.7.24376.15 + 9.0.0-preview.7.24376.15 + 9.0.0-preview.7.24376.15 + 9.0.0-preview.7.24376.15 + 9.0.0-preview.7.24376.15 + 9.0.0-preview.7.24376.15 + 9.0.0-preview.7.24376.15 + 9.0.0-preview.7.24376.15 + 9.0.0-preview.7.24376.15 - 35.0.0-preview.7.29 + 35.0.0-preview.7.34 - 17.2.9714-net9-p6 - 14.2.9714-net9-p6 - 17.2.9714-net9-p6 - 17.2.9714-net9-p6 + 17.5.9220-net9-p7 + 14.5.9220-net9-p7 + 17.5.9220-net9-p7 + 17.5.9220-net9-p7 8.0.148 - 9.0.0-preview.7.24365.1 + 9.0.0-preview.7.24373.5 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion) 1.5.240627000 10.0.22621.756 1.2.0 - 9.0.0-preview.7.24366.8 - 9.0.0-preview.7.24366.8 - 9.0.0-preview.7.24366.8 - 9.0.0-preview.7.24366.8 - 9.0.0-preview.7.24366.8 - 9.0.0-preview.7.24366.8 - 9.0.0-preview.7.24366.8 - 9.0.0-preview.7.24366.8 - 9.0.0-preview.7.24366.8 - 9.0.0-preview.7.24366.8 - 9.0.0-preview.7.24366.8 - 9.0.0-preview.7.24366.8 - 9.0.0-preview.7.24366.8 + 9.0.0-preview.7.24379.2 + 9.0.0-preview.7.24379.2 + 9.0.0-preview.7.24379.2 + 9.0.0-preview.7.24379.2 + 9.0.0-preview.7.24379.2 + 9.0.0-preview.7.24379.2 + 9.0.0-preview.7.24379.2 + 9.0.0-preview.7.24379.2 + 9.0.0-preview.7.24379.2 + 9.0.0-preview.7.24379.2 + 9.0.0-preview.7.24379.2 + 9.0.0-preview.7.24379.2 + 9.0.0-preview.7.24379.2 9.0.0-preview* 3.3.4 @@ -146,11 +146,11 @@ $(DotNetVersionBand) $(DotNetVersionBand) $(DotNetVersionBand) - 9.0.100-preview.6 + $(DotNetVersionBand) 9.0.100 - $(MicrosoftMacCatalystSdknet90_172PackageVersion) - $(MicrosoftmacOSSdknet90_142PackageVersion) - $(MicrosoftiOSSdknet90_172PackageVersion) - $(MicrosofttvOSSdknet90_172PackageVersion) + $(MicrosoftMacCatalystSdknet90_175PackageVersion) + $(MicrosoftmacOSSdknet90_145PackageVersion) + $(MicrosoftiOSSdknet90_175PackageVersion) + $(MicrosofttvOSSdknet90_175PackageVersion) diff --git a/src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj b/src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj index ebf4fca2e869..e7da8c59979c 100644 --- a/src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj +++ b/src/Controls/samples/Controls.Sample/Maui.Controls.Sample.csproj @@ -9,7 +9,7 @@ Maui.Controls.Sample Maui.Controls.Sample false - $(NoWarn),CA1416 + $(NoWarn);CA1416;CS0618 enable maccatalyst-x64 diff --git a/src/Essentials/src/Connectivity/Connectivity.ios.tvos.macos.reachability.cs b/src/Essentials/src/Connectivity/Connectivity.ios.tvos.macos.reachability.cs index 291b736b0b03..a95367b74c72 100644 --- a/src/Essentials/src/Connectivity/Connectivity.ios.tvos.macos.reachability.cs +++ b/src/Essentials/src/Connectivity/Connectivity.ios.tvos.macos.reachability.cs @@ -142,8 +142,10 @@ internal ReachabilityListener() { var ip = new IPAddress(0); defaultRouteReachability = new NetworkReachability(ip); +#pragma warning disable CA1422 // obsolete in MacCatalyst 15, iOS 13 defaultRouteReachability.SetNotification(OnChange); defaultRouteReachability.Schedule(CFRunLoop.Main, CFRunLoop.ModeDefault); +#pragma warning restore CA1422 remoteHostReachability = new NetworkReachability(Reachability.HostName); @@ -151,8 +153,10 @@ internal ReachabilityListener() // this only happens when you create NetworkReachability from a hostname remoteHostReachability.TryGetFlags(out var flags); +#pragma warning disable CA1422 // obsolete in MacCatalyst 15, iOS 13 remoteHostReachability.SetNotification(OnChange); remoteHostReachability.Schedule(CFRunLoop.Main, CFRunLoop.ModeDefault); +#pragma warning restore CA1422 #if !(MACCATALYST || MACOS) #pragma warning disable BI1234, CA1416 // Analyzer bug https://github.com/dotnet/roslyn-analyzers/issues/5938 diff --git a/src/Essentials/src/HapticFeedback/HapticFeedback.ios.cs b/src/Essentials/src/HapticFeedback/HapticFeedback.ios.cs index f453f11540c2..27a2c947cc46 100644 --- a/src/Essentials/src/HapticFeedback/HapticFeedback.ios.cs +++ b/src/Essentials/src/HapticFeedback/HapticFeedback.ios.cs @@ -21,7 +21,9 @@ public void Perform(HapticFeedbackType type) void Click() { +#pragma warning disable CA1422 // obsolete in MacCatalyst 13, iOS 13 var impact = new UIImpactFeedbackGenerator(UIImpactFeedbackStyle.Light); +#pragma warning restore CA1422 impact.Prepare(); impact.ImpactOccurred(); impact.Dispose(); @@ -29,7 +31,9 @@ void Click() void LongPress() { +#pragma warning disable CA1422 // obsolete in MacCatalyst 13, iOS 13 var impact = new UIImpactFeedbackGenerator(UIImpactFeedbackStyle.Medium); +#pragma warning restore CA1422 impact.Prepare(); impact.ImpactOccurred(); impact.Dispose(); diff --git a/src/Essentials/src/WebAuthenticator/WebAuthenticator.ios.tvos.cs b/src/Essentials/src/WebAuthenticator/WebAuthenticator.ios.tvos.cs index 81169504e050..742f3098e2ba 100644 --- a/src/Essentials/src/WebAuthenticator/WebAuthenticator.ios.tvos.cs +++ b/src/Essentials/src/WebAuthenticator/WebAuthenticator.ios.tvos.cs @@ -72,7 +72,9 @@ void AuthSessionCallback(NSUrl cbUrl, NSError error) if (OperatingSystem.IsIOSVersionAtLeast(12)) { +#pragma warning disable CA1422 // obsolete in MacCatalyst 13, iOS 12 was = new ASWebAuthenticationSession(WebUtils.GetNativeUrl(url), scheme, AuthSessionCallback); +#pragma warning restore CA1422 if (OperatingSystem.IsIOSVersionAtLeast(13)) {