Skip to content

Commit dc6dab1

Browse files
rolfbjarnemandel-macaquemauroa
authored
[xcode26.0] Merge main into xcode26.0. (#23105)
--------- Co-authored-by: Manuel de la Pena <[email protected]> Co-authored-by: Mauro Agnoletti <[email protected]>
2 parents c9a414c + 582ecb6 commit dc6dab1

File tree

147 files changed

+2754
-122
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

147 files changed

+2754
-122
lines changed

‎Directory.Build.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
<DisableTransitiveFrameworkReferenceDownloads>true</DisableTransitiveFrameworkReferenceDownloads>
55
<MonoCecilPackageVersion>0.11.5</MonoCecilPackageVersion>
66
<MSBuildStructuredLoggerPackageVersion>2.2.158</MSBuildStructuredLoggerPackageVersion>
7-
<MicrosoftBuildPackageVersion>16.10.0</MicrosoftBuildPackageVersion>
7+
<MicrosoftBuildPackageVersion>17.13.1</MicrosoftBuildPackageVersion>
88
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
99
<MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildTasksCorePackageVersion>
1010
<MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
1111
<NUnitXmlTestLoggerPackageVersion>3.1.15</NUnitXmlTestLoggerPackageVersion>
1212
<!-- Fix transient dependency issue found by component governance 4.7.0 -> 4.7.2 brought by Microsoft.Build package -->
1313
<SystemDrawingCommonPackageVersion>4.7.2</SystemDrawingCommonPackageVersion>
1414
<!-- Fix transient dependency issue found by component governance 4.7.0 -> 4.7.1 brought by Microsoft.Build.Tasks.Core package -->
15-
<SystemSecurityCryptographyXmlPackageVersion>4.7.1</SystemSecurityCryptographyXmlPackageVersion>
15+
<SystemSecurityCryptographyXmlPackageVersion>8.0.0</SystemSecurityCryptographyXmlPackageVersion>
1616
</PropertyGroup>
1717
<Import Project="Build.props" Condition="Exists('Build.props')" />
1818
</Project>

‎dotnet/targets/Xamarin.Shared.Sdk.targets‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1314,9 +1314,16 @@
13141314
</ItemGroup>
13151315
</Target>
13161316

1317+
<Target Name="_ComputeDotNetRoot">
1318+
<PropertyGroup>
1319+
<_DotNetRoot Condition="'$(IsMacEnabled)' == 'true'">$(_DotNetRootRemoteDirectory)</_DotNetRoot>
1320+
</PropertyGroup>
1321+
</Target>
1322+
13171323
<PropertyGroup>
13181324
<_AOTCompileDependsOn>
13191325
$(_AOTCompileDependsOn);
1326+
_ComputeDotNetRoot;
13201327
_ComputeVariables;
13211328
_FindAotCompiler;
13221329
_DetectAppManifest;
@@ -1409,6 +1416,7 @@
14091416
SdkIsSimulator="$(_SdkIsSimulator)"
14101417
SdkRoot="$(_SdkRoot)"
14111418
TargetFrameworkMoniker="$(_ComputedTargetFrameworkMoniker)"
1419+
DotNetRoot="$(_DotNetRoot)"
14121420
>
14131421
</CompileNativeCode>
14141422

@@ -1550,6 +1558,7 @@
15501558
<PropertyGroup>
15511559
<_CompileNativeExecutableDependsOn>
15521560
$(_CompileNativeExecutableDependsOn);
1561+
_ComputeDotNetRoot;
15531562
_DetectSdkLocations;
15541563
_ComputeTargetArchitectures;
15551564
_GenerateBundleName;
@@ -1583,6 +1592,7 @@
15831592
SdkIsSimulator="$(_SdkIsSimulator)"
15841593
SdkRoot="$(_SdkRoot)"
15851594
TargetFrameworkMoniker="$(_ComputedTargetFrameworkMoniker)"
1595+
DotNetRoot="$(_DotNetRoot)"
15861596
>
15871597
</CompileNativeCode>
15881598

‎macios/msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.cs.resx‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -638,6 +638,10 @@
638638
<value> Skipping framework assembly: {0}
639639
</value>
640640
</data>
641+
<data name="M0169" xml:space="preserve">
642+
<value>Adjusted path from '{0}' to '{1}'
643+
</value>
644+
</data>
641645
<data name="E0169" xml:space="preserve">
642646
<value>Unknown target framework identifier: {0}.
643647
</value>
@@ -1435,4 +1439,38 @@
14351439
<data name="E7152_InvalidMtouchHttpClientHandler" xml:space="preserve">
14361440
<value>Invalid value for 'MtouchHttpClientHandler' ('{0}', must be either 'NSUrlSessionHandler' or 'CFNetworkHandler' (or not set at all).</value>
14371441
</data>
1442+
<data name="W7154" xml:space="preserve">
1443+
<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>
1444+
<comment>
1445+
{0}: the name of the MSBuild item in question (BundleResource, ImageAsset, SceneKitAsset, etc.).
1446+
{1}: path to a file name (of an item)
1447+
{2}: path to an assembly
1448+
{3}: value of the LogicalName metadata of the item
1449+
</comment>
1450+
</data>
1451+
<data name="W7155" xml:space="preserve">
1452+
<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>
1453+
<comment>
1454+
{0}: the name of the MSBuild item in question (BundleResource, ImageAsset, SceneKitAsset, etc.).
1455+
{1}: path to a file name (of a resource)
1456+
{2}: path to an assembly
1457+
{3}: value of the LogicalName metadata.
1458+
{4}: comma-separated list of assemblies.
1459+
</comment>
1460+
</data>
1461+
<data name="W7156" xml:space="preserve">
1462+
<value>The {0} item '{1}' was ignored, because there's another item with the same LogicalName ('{2}')</value>
1463+
<comment>
1464+
{0}: the name of the MSBuild item in question (BundleResource, ImageAsset, SceneKitAsset, etc.).
1465+
{1}: path to a file name (of a resource)
1466+
{2}: value of the LogicalName metadata.
1467+
</comment>
1468+
</data>
1469+
<data name="E7157" xml:space="preserve">
1470+
<value>The {0} item '{1}' does not have a 'LogicalName' metadata.</value>
1471+
<comment>
1472+
{0}: the name of the MSBuild item in question (BundleResource, ImageAsset, SceneKitAsset, etc.).
1473+
{1}: path to a file name (of a resource)
1474+
</comment>
1475+
</data>
14381476
</root>

‎macios/msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.de.resx‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -638,6 +638,10 @@
638638
<value> Skipping framework assembly: {0}
639639
</value>
640640
</data>
641+
<data name="M0169" xml:space="preserve">
642+
<value>Adjusted path from '{0}' to '{1}'
643+
</value>
644+
</data>
641645
<data name="E0169" xml:space="preserve">
642646
<value>Unknown target framework identifier: {0}.
643647
</value>
@@ -1435,4 +1439,38 @@
14351439
<data name="E7152_InvalidMtouchHttpClientHandler" xml:space="preserve">
14361440
<value>Invalid value for 'MtouchHttpClientHandler' ('{0}', must be either 'NSUrlSessionHandler' or 'CFNetworkHandler' (or not set at all).</value>
14371441
</data>
1442+
<data name="W7154" xml:space="preserve">
1443+
<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>
1444+
<comment>
1445+
{0}: the name of the MSBuild item in question (BundleResource, ImageAsset, SceneKitAsset, etc.).
1446+
{1}: path to a file name (of an item)
1447+
{2}: path to an assembly
1448+
{3}: value of the LogicalName metadata of the item
1449+
</comment>
1450+
</data>
1451+
<data name="W7155" xml:space="preserve">
1452+
<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>
1453+
<comment>
1454+
{0}: the name of the MSBuild item in question (BundleResource, ImageAsset, SceneKitAsset, etc.).
1455+
{1}: path to a file name (of a resource)
1456+
{2}: path to an assembly
1457+
{3}: value of the LogicalName metadata.
1458+
{4}: comma-separated list of assemblies.
1459+
</comment>
1460+
</data>
1461+
<data name="W7156" xml:space="preserve">
1462+
<value>The {0} item '{1}' was ignored, because there's another item with the same LogicalName ('{2}')</value>
1463+
<comment>
1464+
{0}: the name of the MSBuild item in question (BundleResource, ImageAsset, SceneKitAsset, etc.).
1465+
{1}: path to a file name (of a resource)
1466+
{2}: value of the LogicalName metadata.
1467+
</comment>
1468+
</data>
1469+
<data name="E7157" xml:space="preserve">
1470+
<value>The {0} item '{1}' does not have a 'LogicalName' metadata.</value>
1471+
<comment>
1472+
{0}: the name of the MSBuild item in question (BundleResource, ImageAsset, SceneKitAsset, etc.).
1473+
{1}: path to a file name (of a resource)
1474+
</comment>
1475+
</data>
14381476
</root>

‎macios/msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.es.resx‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -638,6 +638,10 @@
638638
<value> Skipping framework assembly: {0}
639639
</value>
640640
</data>
641+
<data name="M0169" xml:space="preserve">
642+
<value>Adjusted path from '{0}' to '{1}'
643+
</value>
644+
</data>
641645
<data name="E0169" xml:space="preserve">
642646
<value>Unknown target framework identifier: {0}.
643647
</value>
@@ -1435,4 +1439,38 @@
14351439
<data name="E7152_InvalidMtouchHttpClientHandler" xml:space="preserve">
14361440
<value>Invalid value for 'MtouchHttpClientHandler' ('{0}', must be either 'NSUrlSessionHandler' or 'CFNetworkHandler' (or not set at all).</value>
14371441
</data>
1442+
<data name="W7154" xml:space="preserve">
1443+
<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>
1444+
<comment>
1445+
{0}: the name of the MSBuild item in question (BundleResource, ImageAsset, SceneKitAsset, etc.).
1446+
{1}: path to a file name (of an item)
1447+
{2}: path to an assembly
1448+
{3}: value of the LogicalName metadata of the item
1449+
</comment>
1450+
</data>
1451+
<data name="W7155" xml:space="preserve">
1452+
<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>
1453+
<comment>
1454+
{0}: the name of the MSBuild item in question (BundleResource, ImageAsset, SceneKitAsset, etc.).
1455+
{1}: path to a file name (of a resource)
1456+
{2}: path to an assembly
1457+
{3}: value of the LogicalName metadata.
1458+
{4}: comma-separated list of assemblies.
1459+
</comment>
1460+
</data>
1461+
<data name="W7156" xml:space="preserve">
1462+
<value>The {0} item '{1}' was ignored, because there's another item with the same LogicalName ('{2}')</value>
1463+
<comment>
1464+
{0}: the name of the MSBuild item in question (BundleResource, ImageAsset, SceneKitAsset, etc.).
1465+
{1}: path to a file name (of a resource)
1466+
{2}: value of the LogicalName metadata.
1467+
</comment>
1468+
</data>
1469+
<data name="E7157" xml:space="preserve">
1470+
<value>The {0} item '{1}' does not have a 'LogicalName' metadata.</value>
1471+
<comment>
1472+
{0}: the name of the MSBuild item in question (BundleResource, ImageAsset, SceneKitAsset, etc.).
1473+
{1}: path to a file name (of a resource)
1474+
</comment>
1475+
</data>
14381476
</root>

‎macios/msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.fr.resx‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -638,6 +638,10 @@
638638
<value> Skipping framework assembly: {0}
639639
</value>
640640
</data>
641+
<data name="M0169" xml:space="preserve">
642+
<value>Adjusted path from '{0}' to '{1}'
643+
</value>
644+
</data>
641645
<data name="E0169" xml:space="preserve">
642646
<value>Unknown target framework identifier: {0}.
643647
</value>
@@ -1435,4 +1439,38 @@
14351439
<data name="E7152_InvalidMtouchHttpClientHandler" xml:space="preserve">
14361440
<value>Invalid value for 'MtouchHttpClientHandler' ('{0}', must be either 'NSUrlSessionHandler' or 'CFNetworkHandler' (or not set at all).</value>
14371441
</data>
1442+
<data name="W7154" xml:space="preserve">
1443+
<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>
1444+
<comment>
1445+
{0}: the name of the MSBuild item in question (BundleResource, ImageAsset, SceneKitAsset, etc.).
1446+
{1}: path to a file name (of an item)
1447+
{2}: path to an assembly
1448+
{3}: value of the LogicalName metadata of the item
1449+
</comment>
1450+
</data>
1451+
<data name="W7155" xml:space="preserve">
1452+
<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>
1453+
<comment>
1454+
{0}: the name of the MSBuild item in question (BundleResource, ImageAsset, SceneKitAsset, etc.).
1455+
{1}: path to a file name (of a resource)
1456+
{2}: path to an assembly
1457+
{3}: value of the LogicalName metadata.
1458+
{4}: comma-separated list of assemblies.
1459+
</comment>
1460+
</data>
1461+
<data name="W7156" xml:space="preserve">
1462+
<value>The {0} item '{1}' was ignored, because there's another item with the same LogicalName ('{2}')</value>
1463+
<comment>
1464+
{0}: the name of the MSBuild item in question (BundleResource, ImageAsset, SceneKitAsset, etc.).
1465+
{1}: path to a file name (of a resource)
1466+
{2}: value of the LogicalName metadata.
1467+
</comment>
1468+
</data>
1469+
<data name="E7157" xml:space="preserve">
1470+
<value>The {0} item '{1}' does not have a 'LogicalName' metadata.</value>
1471+
<comment>
1472+
{0}: the name of the MSBuild item in question (BundleResource, ImageAsset, SceneKitAsset, etc.).
1473+
{1}: path to a file name (of a resource)
1474+
</comment>
1475+
</data>
14381476
</root>

‎macios/msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.it.resx‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -638,6 +638,10 @@
638638
<value> Skipping framework assembly: {0}
639639
</value>
640640
</data>
641+
<data name="M0169" xml:space="preserve">
642+
<value>Adjusted path from '{0}' to '{1}'
643+
</value>
644+
</data>
641645
<data name="E0169" xml:space="preserve">
642646
<value>Unknown target framework identifier: {0}.
643647
</value>
@@ -1435,4 +1439,38 @@
14351439
<data name="E7152_InvalidMtouchHttpClientHandler" xml:space="preserve">
14361440
<value>Invalid value for 'MtouchHttpClientHandler' ('{0}', must be either 'NSUrlSessionHandler' or 'CFNetworkHandler' (or not set at all).</value>
14371441
</data>
1442+
<data name="W7154" xml:space="preserve">
1443+
<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>
1444+
<comment>
1445+
{0}: the name of the MSBuild item in question (BundleResource, ImageAsset, SceneKitAsset, etc.).
1446+
{1}: path to a file name (of an item)
1447+
{2}: path to an assembly
1448+
{3}: value of the LogicalName metadata of the item
1449+
</comment>
1450+
</data>
1451+
<data name="W7155" xml:space="preserve">
1452+
<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>
1453+
<comment>
1454+
{0}: the name of the MSBuild item in question (BundleResource, ImageAsset, SceneKitAsset, etc.).
1455+
{1}: path to a file name (of a resource)
1456+
{2}: path to an assembly
1457+
{3}: value of the LogicalName metadata.
1458+
{4}: comma-separated list of assemblies.
1459+
</comment>
1460+
</data>
1461+
<data name="W7156" xml:space="preserve">
1462+
<value>The {0} item '{1}' was ignored, because there's another item with the same LogicalName ('{2}')</value>
1463+
<comment>
1464+
{0}: the name of the MSBuild item in question (BundleResource, ImageAsset, SceneKitAsset, etc.).
1465+
{1}: path to a file name (of a resource)
1466+
{2}: value of the LogicalName metadata.
1467+
</comment>
1468+
</data>
1469+
<data name="E7157" xml:space="preserve">
1470+
<value>The {0} item '{1}' does not have a 'LogicalName' metadata.</value>
1471+
<comment>
1472+
{0}: the name of the MSBuild item in question (BundleResource, ImageAsset, SceneKitAsset, etc.).
1473+
{1}: path to a file name (of a resource)
1474+
</comment>
1475+
</data>
14381476
</root>

‎macios/msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.ja.resx‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -638,6 +638,10 @@
638638
<value> Skipping framework assembly: {0}
639639
</value>
640640
</data>
641+
<data name="M0169" xml:space="preserve">
642+
<value>Adjusted path from '{0}' to '{1}'
643+
</value>
644+
</data>
641645
<data name="E0169" xml:space="preserve">
642646
<value>Unknown target framework identifier: {0}.
643647
</value>
@@ -1435,4 +1439,38 @@
14351439
<data name="E7152_InvalidMtouchHttpClientHandler" xml:space="preserve">
14361440
<value>Invalid value for 'MtouchHttpClientHandler' ('{0}', must be either 'NSUrlSessionHandler' or 'CFNetworkHandler' (or not set at all).</value>
14371441
</data>
1442+
<data name="W7154" xml:space="preserve">
1443+
<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>
1444+
<comment>
1445+
{0}: the name of the MSBuild item in question (BundleResource, ImageAsset, SceneKitAsset, etc.).
1446+
{1}: path to a file name (of an item)
1447+
{2}: path to an assembly
1448+
{3}: value of the LogicalName metadata of the item
1449+
</comment>
1450+
</data>
1451+
<data name="W7155" xml:space="preserve">
1452+
<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>
1453+
<comment>
1454+
{0}: the name of the MSBuild item in question (BundleResource, ImageAsset, SceneKitAsset, etc.).
1455+
{1}: path to a file name (of a resource)
1456+
{2}: path to an assembly
1457+
{3}: value of the LogicalName metadata.
1458+
{4}: comma-separated list of assemblies.
1459+
</comment>
1460+
</data>
1461+
<data name="W7156" xml:space="preserve">
1462+
<value>The {0} item '{1}' was ignored, because there's another item with the same LogicalName ('{2}')</value>
1463+
<comment>
1464+
{0}: the name of the MSBuild item in question (BundleResource, ImageAsset, SceneKitAsset, etc.).
1465+
{1}: path to a file name (of a resource)
1466+
{2}: value of the LogicalName metadata.
1467+
</comment>
1468+
</data>
1469+
<data name="E7157" xml:space="preserve">
1470+
<value>The {0} item '{1}' does not have a 'LogicalName' metadata.</value>
1471+
<comment>
1472+
{0}: the name of the MSBuild item in question (BundleResource, ImageAsset, SceneKitAsset, etc.).
1473+
{1}: path to a file name (of a resource)
1474+
</comment>
1475+
</data>
14381476
</root>

0 commit comments

Comments
 (0)