Skip to content

[release/10.0.1xx-preview6] Merge main into release/10.0.1xx-preview6. #23085

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 6 commits into
base: release/10.0.1xx-preview6
Choose a base branch
from
Open

[release/10.0.1xx-preview6] Merge main into release/10.0.1xx-preview6. #23085

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d281b3c
[src/runtime] Don't allow native code to resolve a weak reference for…
rolfbjarne Jun 19, 2025
671268a
Localized file check-in by OneLocBuild Task: Build definition ID 1441…
vs-mobiletools-engineering-service2 Jun 19, 2025
ad89e10
[release/10.0.1xx-preview6] Merge main into release/10.0.1xx-preview6.
rolfbjarne Jun 19, 2025
38e4bc3
[RGen] Correctly cast enum results from the native invocation. (#23079)
mandel-macaque Jun 19, 2025
b29bbfe
Update Xamarin.Messaging and renamed Xamarin paths (#22803)
mauroa Jun 19, 2025
2084384
Merge remote-tracking branch 'origin/main' into dev/rolf/bump-main-in…
rolfbjarne Jun 19, 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: 2 additions & 2 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
<DisableTransitiveFrameworkReferenceDownloads>true</DisableTransitiveFrameworkReferenceDownloads>
<MonoCecilPackageVersion>0.11.5</MonoCecilPackageVersion>
<MSBuildStructuredLoggerPackageVersion>2.2.158</MSBuildStructuredLoggerPackageVersion>
<MicrosoftBuildPackageVersion>16.10.0</MicrosoftBuildPackageVersion>
<MicrosoftBuildPackageVersion>17.13.1</MicrosoftBuildPackageVersion>
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
<MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildTasksCorePackageVersion>
<MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
<NUnitXmlTestLoggerPackageVersion>3.1.15</NUnitXmlTestLoggerPackageVersion>
<!-- Fix transient dependency issue found by component governance 4.7.0 -> 4.7.2 brought by Microsoft.Build package -->
<SystemDrawingCommonPackageVersion>4.7.2</SystemDrawingCommonPackageVersion>
<!-- Fix transient dependency issue found by component governance 4.7.0 -> 4.7.1 brought by Microsoft.Build.Tasks.Core package -->
<SystemSecurityCryptographyXmlPackageVersion>4.7.1</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>8.0.0</SystemSecurityCryptographyXmlPackageVersion>
</PropertyGroup>
<Import Project="Build.props" Condition="Exists('Build.props')" />
</Project>
10 changes: 10 additions & 0 deletions dotnet/targets/Xamarin.Shared.Sdk.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1314,9 +1314,16 @@
</ItemGroup>
</Target>

<Target Name="_ComputeDotNetRoot">
<PropertyGroup>
<_DotNetRoot Condition="'$(IsMacEnabled)' == 'true'">$(_DotNetRootRemoteDirectory)</_DotNetRoot>
</PropertyGroup>
</Target>

<PropertyGroup>
<_AOTCompileDependsOn>
$(_AOTCompileDependsOn);
_ComputeDotNetRoot;
_ComputeVariables;
_FindAotCompiler;
_DetectAppManifest;
Expand Down Expand Up @@ -1409,6 +1416,7 @@
SdkIsSimulator="$(_SdkIsSimulator)"
SdkRoot="$(_SdkRoot)"
TargetFrameworkMoniker="$(_ComputedTargetFrameworkMoniker)"
DotNetRoot="$(_DotNetRoot)"
>
</CompileNativeCode>

Expand Down Expand Up @@ -1541,6 +1549,7 @@
<PropertyGroup>
<_CompileNativeExecutableDependsOn>
$(_CompileNativeExecutableDependsOn);
_ComputeDotNetRoot;
_DetectSdkLocations;
_ComputeTargetArchitectures;
_GenerateBundleName;
Expand Down Expand Up @@ -1574,6 +1583,7 @@
SdkIsSimulator="$(_SdkIsSimulator)"
SdkRoot="$(_SdkRoot)"
TargetFrameworkMoniker="$(_ComputedTargetFrameworkMoniker)"
DotNetRoot="$(_DotNetRoot)"
>
</CompileNativeCode>

Expand Down
34 changes: 34 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 @@ -1435,4 +1435,38 @@
<data name="E7152_InvalidMtouchHttpClientHandler" xml:space="preserve">
<value>Invalid value for 'MtouchHttpClientHandler' ('{0}', must be either 'NSUrlSessionHandler' or 'CFNetworkHandler' (or not set at all).</value>
</data>
<data name="W7154" xml:space="preserve">
<value>The {0} item '{1}' imported from '{2}' was ignored, because there's already an existing item from the current project with the same LogicalName ('{3}')</value>
<comment>
{0}: the name of the MSBuild item in question (BundleResource, ImageAsset, SceneKitAsset, etc.).
{1}: path to a file name (of an item)
{2}: path to an assembly
{3}: value of the LogicalName metadata of the item
</comment>
</data>
<data name="W7155" xml:space="preserve">
<value>The {0} item '{1}' imported from '{2}' was ignored, because there's another item from a different assembly ({4}) with the same LogicalName ('{3}')</value>
<comment>
{0}: the name of the MSBuild item in question (BundleResource, ImageAsset, SceneKitAsset, etc.).
{1}: path to a file name (of a resource)
{2}: path to an assembly
{3}: value of the LogicalName metadata.
{4}: comma-separated list of assemblies.
</comment>
</data>
<data name="W7156" xml:space="preserve">
<value>The {0} item '{1}' was ignored, because there's another item with the same LogicalName ('{2}')</value>
<comment>
{0}: the name of the MSBuild item in question (BundleResource, ImageAsset, SceneKitAsset, etc.).
{1}: path to a file name (of a resource)
{2}: value of the LogicalName metadata.
</comment>
</data>
<data name="E7157" xml:space="preserve">
<value>The {0} item '{1}' does not have a 'LogicalName' metadata.</value>
<comment>
{0}: the name of the MSBuild item in question (BundleResource, ImageAsset, SceneKitAsset, etc.).
{1}: path to a file name (of a resource)
</comment>
</data>
</root>
34 changes: 34 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 @@ -1435,4 +1435,38 @@
<data name="E7152_InvalidMtouchHttpClientHandler" xml:space="preserve">
<value>Invalid value for 'MtouchHttpClientHandler' ('{0}', must be either 'NSUrlSessionHandler' or 'CFNetworkHandler' (or not set at all).</value>
</data>
<data name="W7154" xml:space="preserve">
<value>The {0} item '{1}' imported from '{2}' was ignored, because there's already an existing item from the current project with the same LogicalName ('{3}')</value>
<comment>
{0}: the name of the MSBuild item in question (BundleResource, ImageAsset, SceneKitAsset, etc.).
{1}: path to a file name (of an item)
{2}: path to an assembly
{3}: value of the LogicalName metadata of the item
</comment>
</data>
<data name="W7155" xml:space="preserve">
<value>The {0} item '{1}' imported from '{2}' was ignored, because there's another item from a different assembly ({4}) with the same LogicalName ('{3}')</value>
<comment>
{0}: the name of the MSBuild item in question (BundleResource, ImageAsset, SceneKitAsset, etc.).
{1}: path to a file name (of a resource)
{2}: path to an assembly
{3}: value of the LogicalName metadata.
{4}: comma-separated list of assemblies.
</comment>
</data>
<data name="W7156" xml:space="preserve">
<value>The {0} item '{1}' was ignored, because there's another item with the same LogicalName ('{2}')</value>
<comment>
{0}: the name of the MSBuild item in question (BundleResource, ImageAsset, SceneKitAsset, etc.).
{1}: path to a file name (of a resource)
{2}: value of the LogicalName metadata.
</comment>
</data>
<data name="E7157" xml:space="preserve">
<value>The {0} item '{1}' does not have a 'LogicalName' metadata.</value>
<comment>
{0}: the name of the MSBuild item in question (BundleResource, ImageAsset, SceneKitAsset, etc.).
{1}: path to a file name (of a resource)
</comment>
</data>
</root>
34 changes: 34 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 @@ -1435,4 +1435,38 @@
<data name="E7152_InvalidMtouchHttpClientHandler" xml:space="preserve">
<value>Invalid value for 'MtouchHttpClientHandler' ('{0}', must be either 'NSUrlSessionHandler' or 'CFNetworkHandler' (or not set at all).</value>
</data>
<data name="W7154" xml:space="preserve">
<value>The {0} item '{1}' imported from '{2}' was ignored, because there's already an existing item from the current project with the same LogicalName ('{3}')</value>
<comment>
{0}: the name of the MSBuild item in question (BundleResource, ImageAsset, SceneKitAsset, etc.).
{1}: path to a file name (of an item)
{2}: path to an assembly
{3}: value of the LogicalName metadata of the item
</comment>
</data>
<data name="W7155" xml:space="preserve">
<value>The {0} item '{1}' imported from '{2}' was ignored, because there's another item from a different assembly ({4}) with the same LogicalName ('{3}')</value>
<comment>
{0}: the name of the MSBuild item in question (BundleResource, ImageAsset, SceneKitAsset, etc.).
{1}: path to a file name (of a resource)
{2}: path to an assembly
{3}: value of the LogicalName metadata.
{4}: comma-separated list of assemblies.
</comment>
</data>
<data name="W7156" xml:space="preserve">
<value>The {0} item '{1}' was ignored, because there's another item with the same LogicalName ('{2}')</value>
<comment>
{0}: the name of the MSBuild item in question (BundleResource, ImageAsset, SceneKitAsset, etc.).
{1}: path to a file name (of a resource)
{2}: value of the LogicalName metadata.
</comment>
</data>
<data name="E7157" xml:space="preserve">
<value>The {0} item '{1}' does not have a 'LogicalName' metadata.</value>
<comment>
{0}: the name of the MSBuild item in question (BundleResource, ImageAsset, SceneKitAsset, etc.).
{1}: path to a file name (of a resource)
</comment>
</data>
</root>
34 changes: 34 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 @@ -1435,4 +1435,38 @@
<data name="E7152_InvalidMtouchHttpClientHandler" xml:space="preserve">
<value>Invalid value for 'MtouchHttpClientHandler' ('{0}', must be either 'NSUrlSessionHandler' or 'CFNetworkHandler' (or not set at all).</value>
</data>
<data name="W7154" xml:space="preserve">
<value>The {0} item '{1}' imported from '{2}' was ignored, because there's already an existing item from the current project with the same LogicalName ('{3}')</value>
<comment>
{0}: the name of the MSBuild item in question (BundleResource, ImageAsset, SceneKitAsset, etc.).
{1}: path to a file name (of an item)
{2}: path to an assembly
{3}: value of the LogicalName metadata of the item
</comment>
</data>
<data name="W7155" xml:space="preserve">
<value>The {0} item '{1}' imported from '{2}' was ignored, because there's another item from a different assembly ({4}) with the same LogicalName ('{3}')</value>
<comment>
{0}: the name of the MSBuild item in question (BundleResource, ImageAsset, SceneKitAsset, etc.).
{1}: path to a file name (of a resource)
{2}: path to an assembly
{3}: value of the LogicalName metadata.
{4}: comma-separated list of assemblies.
</comment>
</data>
<data name="W7156" xml:space="preserve">
<value>The {0} item '{1}' was ignored, because there's another item with the same LogicalName ('{2}')</value>
<comment>
{0}: the name of the MSBuild item in question (BundleResource, ImageAsset, SceneKitAsset, etc.).
{1}: path to a file name (of a resource)
{2}: value of the LogicalName metadata.
</comment>
</data>
<data name="E7157" xml:space="preserve">
<value>The {0} item '{1}' does not have a 'LogicalName' metadata.</value>
<comment>
{0}: the name of the MSBuild item in question (BundleResource, ImageAsset, SceneKitAsset, etc.).
{1}: path to a file name (of a resource)
</comment>
</data>
</root>
34 changes: 34 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 @@ -1435,4 +1435,38 @@
<data name="E7152_InvalidMtouchHttpClientHandler" xml:space="preserve">
<value>Invalid value for 'MtouchHttpClientHandler' ('{0}', must be either 'NSUrlSessionHandler' or 'CFNetworkHandler' (or not set at all).</value>
</data>
<data name="W7154" xml:space="preserve">
<value>The {0} item '{1}' imported from '{2}' was ignored, because there's already an existing item from the current project with the same LogicalName ('{3}')</value>
<comment>
{0}: the name of the MSBuild item in question (BundleResource, ImageAsset, SceneKitAsset, etc.).
{1}: path to a file name (of an item)
{2}: path to an assembly
{3}: value of the LogicalName metadata of the item
</comment>
</data>
<data name="W7155" xml:space="preserve">
<value>The {0} item '{1}' imported from '{2}' was ignored, because there's another item from a different assembly ({4}) with the same LogicalName ('{3}')</value>
<comment>
{0}: the name of the MSBuild item in question (BundleResource, ImageAsset, SceneKitAsset, etc.).
{1}: path to a file name (of a resource)
{2}: path to an assembly
{3}: value of the LogicalName metadata.
{4}: comma-separated list of assemblies.
</comment>
</data>
<data name="W7156" xml:space="preserve">
<value>The {0} item '{1}' was ignored, because there's another item with the same LogicalName ('{2}')</value>
<comment>
{0}: the name of the MSBuild item in question (BundleResource, ImageAsset, SceneKitAsset, etc.).
{1}: path to a file name (of a resource)
{2}: value of the LogicalName metadata.
</comment>
</data>
<data name="E7157" xml:space="preserve">
<value>The {0} item '{1}' does not have a 'LogicalName' metadata.</value>
<comment>
{0}: the name of the MSBuild item in question (BundleResource, ImageAsset, SceneKitAsset, etc.).
{1}: path to a file name (of a resource)
</comment>
</data>
</root>
34 changes: 34 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 @@ -1435,4 +1435,38 @@
<data name="E7152_InvalidMtouchHttpClientHandler" xml:space="preserve">
<value>Invalid value for 'MtouchHttpClientHandler' ('{0}', must be either 'NSUrlSessionHandler' or 'CFNetworkHandler' (or not set at all).</value>
</data>
<data name="W7154" xml:space="preserve">
<value>The {0} item '{1}' imported from '{2}' was ignored, because there's already an existing item from the current project with the same LogicalName ('{3}')</value>
<comment>
{0}: the name of the MSBuild item in question (BundleResource, ImageAsset, SceneKitAsset, etc.).
{1}: path to a file name (of an item)
{2}: path to an assembly
{3}: value of the LogicalName metadata of the item
</comment>
</data>
<data name="W7155" xml:space="preserve">
<value>The {0} item '{1}' imported from '{2}' was ignored, because there's another item from a different assembly ({4}) with the same LogicalName ('{3}')</value>
<comment>
{0}: the name of the MSBuild item in question (BundleResource, ImageAsset, SceneKitAsset, etc.).
{1}: path to a file name (of a resource)
{2}: path to an assembly
{3}: value of the LogicalName metadata.
{4}: comma-separated list of assemblies.
</comment>
</data>
<data name="W7156" xml:space="preserve">
<value>The {0} item '{1}' was ignored, because there's another item with the same LogicalName ('{2}')</value>
<comment>
{0}: the name of the MSBuild item in question (BundleResource, ImageAsset, SceneKitAsset, etc.).
{1}: path to a file name (of a resource)
{2}: value of the LogicalName metadata.
</comment>
</data>
<data name="E7157" xml:space="preserve">
<value>The {0} item '{1}' does not have a 'LogicalName' metadata.</value>
<comment>
{0}: the name of the MSBuild item in question (BundleResource, ImageAsset, SceneKitAsset, etc.).
{1}: path to a file name (of a resource)
</comment>
</data>
</root>
34 changes: 34 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 @@ -1435,4 +1435,38 @@
<data name="E7152_InvalidMtouchHttpClientHandler" xml:space="preserve">
<value>Invalid value for 'MtouchHttpClientHandler' ('{0}', must be either 'NSUrlSessionHandler' or 'CFNetworkHandler' (or not set at all).</value>
</data>
<data name="W7154" xml:space="preserve">
<value>The {0} item '{1}' imported from '{2}' was ignored, because there's already an existing item from the current project with the same LogicalName ('{3}')</value>
<comment>
{0}: the name of the MSBuild item in question (BundleResource, ImageAsset, SceneKitAsset, etc.).
{1}: path to a file name (of an item)
{2}: path to an assembly
{3}: value of the LogicalName metadata of the item
</comment>
</data>
<data name="W7155" xml:space="preserve">
<value>The {0} item '{1}' imported from '{2}' was ignored, because there's another item from a different assembly ({4}) with the same LogicalName ('{3}')</value>
<comment>
{0}: the name of the MSBuild item in question (BundleResource, ImageAsset, SceneKitAsset, etc.).
{1}: path to a file name (of a resource)
{2}: path to an assembly
{3}: value of the LogicalName metadata.
{4}: comma-separated list of assemblies.
</comment>
</data>
<data name="W7156" xml:space="preserve">
<value>The {0} item '{1}' was ignored, because there's another item with the same LogicalName ('{2}')</value>
<comment>
{0}: the name of the MSBuild item in question (BundleResource, ImageAsset, SceneKitAsset, etc.).
{1}: path to a file name (of a resource)
{2}: value of the LogicalName metadata.
</comment>
</data>
<data name="E7157" xml:space="preserve">
<value>The {0} item '{1}' does not have a 'LogicalName' metadata.</value>
<comment>
{0}: the name of the MSBuild item in question (BundleResource, ImageAsset, SceneKitAsset, etc.).
{1}: path to a file name (of a resource)
</comment>
</data>
</root>
34 changes: 34 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 @@ -1435,4 +1435,38 @@
<data name="E7152_InvalidMtouchHttpClientHandler" xml:space="preserve">
<value>Invalid value for 'MtouchHttpClientHandler' ('{0}', must be either 'NSUrlSessionHandler' or 'CFNetworkHandler' (or not set at all).</value>
</data>
<data name="W7154" xml:space="preserve">
<value>The {0} item '{1}' imported from '{2}' was ignored, because there's already an existing item from the current project with the same LogicalName ('{3}')</value>
<comment>
{0}: the name of the MSBuild item in question (BundleResource, ImageAsset, SceneKitAsset, etc.).
{1}: path to a file name (of an item)
{2}: path to an assembly
{3}: value of the LogicalName metadata of the item
</comment>
</data>
<data name="W7155" xml:space="preserve">
<value>The {0} item '{1}' imported from '{2}' was ignored, because there's another item from a different assembly ({4}) with the same LogicalName ('{3}')</value>
<comment>
{0}: the name of the MSBuild item in question (BundleResource, ImageAsset, SceneKitAsset, etc.).
{1}: path to a file name (of a resource)
{2}: path to an assembly
{3}: value of the LogicalName metadata.
{4}: comma-separated list of assemblies.
</comment>
</data>
<data name="W7156" xml:space="preserve">
<value>The {0} item '{1}' was ignored, because there's another item with the same LogicalName ('{2}')</value>
<comment>
{0}: the name of the MSBuild item in question (BundleResource, ImageAsset, SceneKitAsset, etc.).
{1}: path to a file name (of a resource)
{2}: value of the LogicalName metadata.
</comment>
</data>
<data name="E7157" xml:space="preserve">
<value>The {0} item '{1}' does not have a 'LogicalName' metadata.</value>
<comment>
{0}: the name of the MSBuild item in question (BundleResource, ImageAsset, SceneKitAsset, etc.).
{1}: path to a file name (of a resource)
</comment>
</data>
</root>
Loading
Loading