Skip to content

[net10.0] Merge main into net10.0. #23104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: net10.0
Choose a base branch
from
Open

[net10.0] Merge main into net10.0. #23104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
416c828
[AuthenticationServices] Fix nullability in the delegates. (#23080)
mandel-macaque Jun 19, 2025
329cccf
[AVFoundation] Fix nullability in some delegate signatures. (#23062)
mandel-macaque Jun 19, 2025
c9a87d1
Localized file check-in by OneLocBuild Task: Build definition ID 1441…
vs-mobiletools-engineering-service2 Jun 20, 2025
dcc8a98
[devops] Don't fail the build if failing to add GitHub comments. (#23…
rolfbjarne Jun 20, 2025
dce0586
[net10.0] Merge main into net10.0.
rolfbjarne Jun 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions macios/msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.cs.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,6 +638,10 @@
<value> Skipping framework assembly: {0}
</value>
</data>
<data name="M0169" xml:space="preserve">
<value>Adjusted path from '{0}' to '{1}'
</value>
</data>
<data name="E0169" xml:space="preserve">
<value>Unknown target framework identifier: {0}.
</value>
Expand Down
4 changes: 4 additions & 0 deletions macios/msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.de.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,6 +638,10 @@
<value> Skipping framework assembly: {0}
</value>
</data>
<data name="M0169" xml:space="preserve">
<value>Adjusted path from '{0}' to '{1}'
</value>
</data>
<data name="E0169" xml:space="preserve">
<value>Unknown target framework identifier: {0}.
</value>
Expand Down
4 changes: 4 additions & 0 deletions macios/msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.es.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,6 +638,10 @@
<value> Skipping framework assembly: {0}
</value>
</data>
<data name="M0169" xml:space="preserve">
<value>Adjusted path from '{0}' to '{1}'
</value>
</data>
<data name="E0169" xml:space="preserve">
<value>Unknown target framework identifier: {0}.
</value>
Expand Down
4 changes: 4 additions & 0 deletions macios/msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.fr.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,6 +638,10 @@
<value> Skipping framework assembly: {0}
</value>
</data>
<data name="M0169" xml:space="preserve">
<value>Adjusted path from '{0}' to '{1}'
</value>
</data>
<data name="E0169" xml:space="preserve">
<value>Unknown target framework identifier: {0}.
</value>
Expand Down
4 changes: 4 additions & 0 deletions macios/msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.it.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,6 +638,10 @@
<value> Skipping framework assembly: {0}
</value>
</data>
<data name="M0169" xml:space="preserve">
<value>Adjusted path from '{0}' to '{1}'
</value>
</data>
<data name="E0169" xml:space="preserve">
<value>Unknown target framework identifier: {0}.
</value>
Expand Down
4 changes: 4 additions & 0 deletions macios/msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.ja.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,6 +638,10 @@
<value> Skipping framework assembly: {0}
</value>
</data>
<data name="M0169" xml:space="preserve">
<value>Adjusted path from '{0}' to '{1}'
</value>
</data>
<data name="E0169" xml:space="preserve">
<value>Unknown target framework identifier: {0}.
</value>
Expand Down
4 changes: 4 additions & 0 deletions macios/msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.ko.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,6 +638,10 @@
<value> Skipping framework assembly: {0}
</value>
</data>
<data name="M0169" xml:space="preserve">
<value>Adjusted path from '{0}' to '{1}'
</value>
</data>
<data name="E0169" xml:space="preserve">
<value>Unknown target framework identifier: {0}.
</value>
Expand Down
4 changes: 4 additions & 0 deletions macios/msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.pl.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,6 +638,10 @@
<value> Skipping framework assembly: {0}
</value>
</data>
<data name="M0169" xml:space="preserve">
<value>Adjusted path from '{0}' to '{1}'
</value>
</data>
<data name="E0169" xml:space="preserve">
<value>Unknown target framework identifier: {0}.
</value>
Expand Down
4 changes: 4 additions & 0 deletions macios/msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.pt-BR.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,6 +638,10 @@
<value> Skipping framework assembly: {0}
</value>
</data>
<data name="M0169" xml:space="preserve">
<value>Adjusted path from '{0}' to '{1}'
</value>
</data>
<data name="E0169" xml:space="preserve">
<value>Unknown target framework identifier: {0}.
</value>
Expand Down
4 changes: 4 additions & 0 deletions macios/msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.ru.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,6 +638,10 @@
<value> Skipping framework assembly: {0}
</value>
</data>
<data name="M0169" xml:space="preserve">
<value>Adjusted path from '{0}' to '{1}'
</value>
</data>
<data name="E0169" xml:space="preserve">
<value>Unknown target framework identifier: {0}.
</value>
Expand Down
4 changes: 4 additions & 0 deletions macios/msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.tr.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,6 +638,10 @@
<value> Skipping framework assembly: {0}
</value>
</data>
<data name="M0169" xml:space="preserve">
<value>Adjusted path from '{0}' to '{1}'
</value>
</data>
<data name="E0169" xml:space="preserve">
<value>Unknown target framework identifier: {0}.
</value>
Expand Down
4 changes: 4 additions & 0 deletions macios/msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.zh-Hans.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,6 +638,10 @@
<value> Skipping framework assembly: {0}
</value>
</data>
<data name="M0169" xml:space="preserve">
<value>Adjusted path from '{0}' to '{1}'
</value>
</data>
<data name="E0169" xml:space="preserve">
<value>Unknown target framework identifier: {0}.
</value>
Expand Down
4 changes: 4 additions & 0 deletions macios/msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.zh-Hant.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,6 +638,10 @@
<value> Skipping framework assembly: {0}
</value>
</data>
<data name="M0169" xml:space="preserve">
<value>Adjusted path from '{0}' to '{1}'
</value>
</data>
<data name="E0169" xml:space="preserve">
<value>Unknown target framework identifier: {0}.
</value>
Expand Down
2 changes: 1 addition & 1 deletion src/authenticationservices.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ public enum ASAuthorizationProviderExtensionUserSecureEnclaveKeyBiometricPolicy
}

/// <summary>Delegate used in callbacks by <see cref="AuthenticationServices.ASCredentialIdentityStore" />.</summary>
delegate void ASCredentialIdentityStoreCompletionHandler (bool success, NSError error);
delegate void ASCredentialIdentityStoreCompletionHandler (bool success, [NullAllowed] NSError error);
delegate void ASCredentialIdentityStoreGetCredentialIdentitiesHandler (IASCredentialIdentity [] credentialIdentities);

/// <summary>A class whose shared instance (see <see cref="AuthenticationServices.ASCredentialIdentityStore.SharedStore" />) holds credentials across providers.</summary>
Expand Down
8 changes: 4 additions & 4 deletions src/avfoundation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,10 @@ namespace AVFoundation {
/// <param name="error">To be added.</param>
/// <summary>A delegate that defines the handler for <see cref="AVFoundation.AVAssetImageGenerator.GenerateCGImagesAsynchronously(Foundation.NSValue[],AVFoundation.AVAssetImageGeneratorCompletionHandler)" />.</summary>
/// <remarks>To be added.</remarks>
delegate void AVAssetImageGeneratorCompletionHandler (CMTime requestedTime, IntPtr imageRef, CMTime actualTime, AVAssetImageGeneratorResult result, NSError error);
delegate void AVAssetImageGeneratorCompletionHandler2 (CMTime requestedTime, CGImage imageRef, CMTime actualTime, AVAssetImageGeneratorResult result, NSError error);
delegate void AVAssetImageGeneratorCompletionHandler (CMTime requestedTime, IntPtr imageRef, CMTime actualTime, AVAssetImageGeneratorResult result, [NullAllowed] NSError error);
delegate void AVAssetImageGeneratorCompletionHandler2 (CMTime requestedTime, [NullAllowed] CGImage imageRef, CMTime actualTime, AVAssetImageGeneratorResult result, [NullAllowed] NSError error);
#endif
delegate void AVAssetImageGenerateAsynchronouslyForTimeCompletionHandler (CGImage imageRef, CMTime actualTime, NSError error);
delegate void AVAssetImageGenerateAsynchronouslyForTimeCompletionHandler ([NullAllowed] CGImage imageRef, CMTime actualTime, [NullAllowed] NSError error);
/// <param name="finished">To be added.</param>
/// <summary>A delegate that defines the completion handler for various methods in <see cref="AVFoundation.AVPlayer" /> and <see cref="AVFoundation.AVPlayerItem" /></summary>
/// <remarks>To be added.</remarks>
Expand Down Expand Up @@ -18548,7 +18548,7 @@ interface AVCaptureDeviceFormat {
}

/// <summary>A delegate for the completion handler of <see cref="AVFoundation.AVCaptureStillImageOutput.CaptureStillImageAsynchronously(AVFoundation.AVCaptureConnection,AVFoundation.AVCaptureCompletionHandler)" />.</summary>
delegate void AVCaptureCompletionHandler (CMSampleBuffer imageDataSampleBuffer, NSError error);
delegate void AVCaptureCompletionHandler (CMSampleBuffer imageDataSampleBuffer, [NullAllowed] NSError error);

[TV (15, 0), iOS (15, 0), MacCatalyst (15, 0)]
enum AVPlayerRateDidChangeReason {
Expand Down
8 changes: 4 additions & 4 deletions ...crosoft.Macios.Generator.Tests/Classes/Data/ExpectedTrampolinePropertyTestsTrampolines.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@ internal static unsafe void Invoke (global::System.IntPtr block_ptr, global::Obj
var del = global::ObjCRuntime.BlockLiteral.GetTarget<global::AVFoundation.AVAssetImageGenerateAsynchronouslyForTimeCompletionHandler> (block_ptr);
if (del is null)
throw ErrorHelper.CreateError (8059, Errors.MX8059, block_ptr, typeof (global::AVFoundation.AVAssetImageGenerateAsynchronouslyForTimeCompletionHandler));
del (global::ObjCRuntime.Runtime.GetINativeObject<global::CoreGraphics.CGImage> (imageRef, false)!, actualTime, global::ObjCRuntime.Runtime.GetNSObject<global::Foundation.NSError> (error)!);
del (global::ObjCRuntime.Runtime.GetINativeObject<global::CoreGraphics.CGImage> (imageRef, false), actualTime, global::ObjCRuntime.Runtime.GetNSObject<global::Foundation.NSError> (error));
}

internal static unsafe global::ObjCRuntime.BlockLiteral CreateNullableBlock (global::AVFoundation.AVAssetImageGenerateAsynchronouslyForTimeCompletionHandler? callback)
Expand Down Expand Up @@ -426,10 +426,10 @@ public unsafe NIDAVAssetImageGenerateAsynchronouslyForTimeCompletionHandler (glo
return del ?? new NIDAVAssetImageGenerateAsynchronouslyForTimeCompletionHandler ((global::ObjCRuntime.BlockLiteral *) block).Invoke;
}

unsafe void Invoke (global::CoreGraphics.CGImage imageRef, global::CoreMedia.CMTime actualTime, global::Foundation.NSError error)
unsafe void Invoke (global::CoreGraphics.CGImage? imageRef, global::CoreMedia.CMTime actualTime, global::Foundation.NSError? error)
{
var imageRef__handle__ = imageRef!.GetNonNullHandle (nameof (imageRef));
var error__handle__ = error!.GetNonNullHandle (nameof (error));
var imageRef__handle__ = imageRef?.GetHandle ();
var error__handle__ = error?.GetHandle ();
invoker (BlockLiteral, imageRef__handle__, actualTime, error__handle__);
global::System.GC.KeepAlive (imageRef);
global::System.GC.KeepAlive (error);
Expand Down
1 change: 1 addition & 0 deletions tools/devops/automation/templates/build/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,7 @@ steps:
$githubComments.NewCommentFromMessage($commentTitle, $commentIcon, $commentMessage.ToString(), "build $(System.JobDisplayName)")
condition: always()
displayName: 'Report build result'
continueOnError: true
env:
${{ if eq(parameters.repositoryAlias, 'self') }}:
COMMENT_HASH: $(fix_commit.GIT_HASH)
Expand Down
1 change: 1 addition & 0 deletions tools/devops/automation/templates/tests/publish-html.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,5 +93,6 @@ steps:
${{ else }}:
COMMENT_HASH: $(Build.SourceVersion)
displayName: 'Add summaries'
continueOnError: true
condition: always()
timeoutInMinutes: 15
Loading