Skip to content

Commit 9698472

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Update dependencies from dotnet/installer (#5830)
[main] Update dependencies from dotnet/installer - Update dotnet apkdesc, CheckIncludedAssemblies test - Merge remote-tracking branch 'origin/main' into darc-main-65998f2a-6cbb-40ce-874f-d9e4964f7051 - Actually fix CheckIncludedAssemblies - [xaprepare] Fix IndexOutOfRangeException Context: https://devdiv.visualstudio.com/DevDiv/_build/results?buildId=4651587&view=logs&j=96fd57f5-f69e-53c7-3d47-f67e6cf9b93e&t=17818c58-7ce3-5786-ae89-adf017dab0ca The **determine which test stages to run** step is failing (?!): Determining test jobs to run... Step Xamarin.Android.Prepare.Step_DetermineAzurePipelinesTestJobs failed: Index was outside the bounds of the array. System.InvalidOperationException: Step Xamarin.Android.Prepare.Step_DetermineAzurePipelinesTestJobs failed: Index was outside the bounds of the array. ---> System.IndexOutOfRangeException: Index was outside the bounds of the array. at Xamarin.Android.Prepare.Step_DetermineAzurePipelinesTestJobs.Execute (Xamarin.Android.Prepare.Context context) [0x000db] in <57f6c34b3bb14f7fa916671a4c4f9705>:0 at Xamarin.Android.Prepare.Step.Run (Xamarin.Android.Prepare.Context context) [0x00079] in <57f6c34b3bb14f7fa916671a4c4f9705>:0 at Xamarin.Android.Prepare.Scenario.Run (Xamarin.Android.Prepare.Context context, Xamarin.Android.Prepare.Log log) [0x000e7] in <57f6c34b3bb14f7fa916671a4c4f9705>:0 --- End of inner exception stack trace --- at Xamarin.Android.Prepare.Scenario.Run (Xamarin.Android.Prepare.Context context, Xamarin.Android.Prepare.Log log) [0x0014b] in <57f6c34b3bb14f7fa916671a4c4f9705>:0 at Xamarin.Android.Prepare.Context.Execute () [0x000ee] in <57f6c34b3bb14f7fa916671a4c4f9705>:0 at Xamarin.Android.Prepare.App.Run (System.String[] args) [0x00848] in <57f6c34b3bb14f7fa916671a4c4f9705>:0 I *think* this is from `commitMessagePieces[3]`; add some `commitMessagePieces.Length` checks to avoid the exception. - [tests] fixed CheckTimestamps The path to the linker directory was expecting: obj\Debug\net6.0-android\linked When we are now using: obj\Debug\net6.0-android\[RID]\linked I updated the test to just check for a parent directory named `linked`. This was passing in past .NET 6 builds, but looking a the MSBuild targets in dotnet/sdk, it does not seem like they even care about the timestamps on linker output: https://github.com/dotnet/sdk/blob/a245b6ff06b483927e57d953b803a390ad31db95/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.ILLink.targets#L113-L116 `Outputs="$(_LinkSemaphore)"` will likely be the only file that gets "touch"-ed. - Bump to dotnet/installer@96ec2df 6.0.100-preview.4.21214.14 Changes: http://github.com/dotnet/installer/compare/c6e6c1b...96ec2df - Merge remote-tracking branch 'origin/main' into darc-main-65998f2a-6cbb-40ce-874f-d9e4964f7051 - Use new runtime pack names, user projects default to UseMonoRuntime=true - Fix xa_build_configuration.cmake - Bump apkdesc files - Merge remote-tracking branch 'origin/main' into darc-main-65998f2a-6cbb-40ce-874f-d9e4964f7051
1 parent 11ba5f4 commit 9698472

File tree

10 files changed

+103
-78
lines changed

10 files changed

+103
-78
lines changed

‎build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ static string GetNetcoreAppRuntimePath (Context ctx, string androidTarget)
404404
{
405405
return Path.Combine (
406406
XAPackagesDir,
407-
$"microsoft.netcore.app.runtime.android-{androidTarget}",
407+
$"microsoft.netcore.app.runtime.mono.android-{androidTarget}",
408408
ctx.BundledPreviewRuntimePackVersion,
409409
"runtimes",
410410
$"android-{androidTarget}"

‎build-tools/xaprepare/xaprepare/Steps/Step_DetermineAzurePipelinesTestJobs.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ protected override async Task<bool> Execute (Context context)
3030
// Assume we're building a merge commit as part of an Azure Pipelines PR build. Otherwise, run all tests.
3131
// Example: Merge 0b66502c8b9f33cbb8d21b2dab7c100629aec081 into 0bef8aa5cd74d83d77c4e2b3f63975a0deb804b3
3232
var commitMessagePieces = commitMessage.Split (new string [] { " " }, StringSplitOptions.RemoveEmptyEntries);
33-
if (string.IsNullOrEmpty (commitMessagePieces [3])) {
33+
if (commitMessagePieces.Length <= 3 || string.IsNullOrEmpty (commitMessagePieces [3])) {
3434
Log.WarningLine ($"Unable to parse merge commit message from: '{commitMessage}'.");
3535
Log.MessageLine (runAllTestsLoggingCommand);
3636
return true;

‎build-tools/xaprepare/xaprepare/package-download.proj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ dotnet\sdk\$(MicrosoftDotnetSdkInternalPackageVersion)\Microsoft.NETCoreSdk.Bund
1616
</PropertyGroup>
1717

1818
<ItemGroup>
19-
<PackageDownload Include="Microsoft.NETCore.App.Runtime.android-arm" Version="[$(DotNetRuntimePacksVersion)]" />
20-
<PackageDownload Include="Microsoft.NETCore.App.Runtime.android-arm64" Version="[$(DotNetRuntimePacksVersion)]" />
21-
<PackageDownload Include="Microsoft.NETCore.App.Runtime.android-x86" Version="[$(DotNetRuntimePacksVersion)]" />
22-
<PackageDownload Include="Microsoft.NETCore.App.Runtime.android-x64" Version="[$(DotNetRuntimePacksVersion)]" />
19+
<PackageDownload Include="Microsoft.NETCore.App.Runtime.Mono.android-arm" Version="[$(DotNetRuntimePacksVersion)]" />
20+
<PackageDownload Include="Microsoft.NETCore.App.Runtime.Mono.android-arm64" Version="[$(DotNetRuntimePacksVersion)]" />
21+
<PackageDownload Include="Microsoft.NETCore.App.Runtime.Mono.android-x86" Version="[$(DotNetRuntimePacksVersion)]" />
22+
<PackageDownload Include="Microsoft.NETCore.App.Runtime.Mono.android-x64" Version="[$(DotNetRuntimePacksVersion)]" />
2323
</ItemGroup>
2424

2525
</Project>

‎eng/Version.Details.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Dependencies>
22
<ProductDependencies>
3-
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.100-preview.4.21179.4">
3+
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.100-preview.4.21214.14">
44
<Uri>https://github.com/dotnet/installer</Uri>
5-
<Sha>4b7fdd1b32953dca9cb935092f46e5ab1ee5f62a</Sha>
5+
<Sha>96ec2dfcbf28a768e19801f006cda23d23f00d7d</Sha>
66
</Dependency>
77
<Dependency Name="Microsoft.NET.ILLink" Version="6.0.100-preview.2.21212.1">
88
<Uri>https://github.com/mono/linker</Uri>

‎eng/Versions.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22
<!--Package versions-->
33
<PropertyGroup>
4-
<MicrosoftDotnetSdkInternalPackageVersion>6.0.100-preview.4.21179.4</MicrosoftDotnetSdkInternalPackageVersion>
4+
<MicrosoftDotnetSdkInternalPackageVersion>6.0.100-preview.4.21214.14</MicrosoftDotnetSdkInternalPackageVersion>
55
<MicrosoftNETILLinkPackageVersion>6.0.100-preview.2.21212.1</MicrosoftNETILLinkPackageVersion>
66
<MicrosoftDotNetApiCompatPackageVersion>5.0.0-beta.20181.7</MicrosoftDotNetApiCompatPackageVersion>
77
<MicrosoftDotNetBuildTasksFeedPackageVersion>6.0.0-beta.21212.6</MicrosoftDotNetBuildTasksFeedPackageVersion>

‎src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.DefaultProperties.targets‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
See: https://github.com/dotnet/sdk/blob/955c0fc7b06e2fa34bacd076ed39f61e4fb61716/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Publish.targets#L16
2626
-->
2727
<_GetChildProjectCopyToPublishDirectoryItems>false</_GetChildProjectCopyToPublishDirectoryItems>
28+
<UseMonoRuntime Condition=" '$(UseMonoRuntime)' == '' ">true</UseMonoRuntime>
2829
</PropertyGroup>
2930

3031
<!-- User-facing configuration-specific defaults -->

‎src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -757,10 +757,10 @@ public void CheckTimestamps ([Values (true, false)] bool isRelease)
757757

758758
// None of these files should be *older* than the starting time of this test!
759759
var files = Directory.EnumerateFiles (intermediate, "*", SearchOption.AllDirectories).ToList ();
760-
var linkerOutput = Path.Combine (intermediate, "linked") + Path.DirectorySeparatorChar;
761760
foreach (var file in files) {
762-
//NOTE: ILLink in .NET 5+ currently copies assemblies with older timestamps
763-
if (Builder.UseDotNet && file.StartsWith (linkerOutput)) {
761+
//NOTE: ILLink from the dotnet/sdk currently copies assemblies with older timestamps, and only $(_LinkSemaphore) is touched
762+
//see: https://github.com/dotnet/sdk/blob/a245b6ff06b483927e57d953b803a390ad31db95/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.ILLink.targets#L113-L116
763+
if (Builder.UseDotNet && Directory.GetParent (file).Name == "linked") {
764764
continue;
765765
}
766766
var info = new FileInfo (file);

‎src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/PackagingTest.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public void CheckIncludedAssemblies ()
8787
"Java.Interop.dll",
8888
"Mono.Android.dll",
8989
"System.Private.CoreLib.dll",
90-
"System.Runtime.CompilerServices.Unsafe.dll",
90+
"System.Runtime.dll",
9191
"System.Linq.dll",
9292
"UnnamedProject.dll",
9393
} :

‎src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.apkdesc‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,22 +29,22 @@
2929
"Size": 316728
3030
},
3131
"assemblies/UnnamedProject.dll": {
32-
"Size": 3091
32+
"Size": 3174
3333
},
3434
"assemblies/System.Linq.dll": {
35-
"Size": 10651
35+
"Size": 10627
3636
},
37-
"assemblies/System.Runtime.CompilerServices.Unsafe.dll": {
38-
"Size": 3382
37+
"assemblies/System.Runtime.dll": {
38+
"Size": 2419
3939
},
4040
"assemblies/System.Private.CoreLib.dll": {
41-
"Size": 519045
41+
"Size": 514284
4242
},
4343
"assemblies/Java.Interop.dll": {
44-
"Size": 57089
44+
"Size": 57083
4545
},
4646
"assemblies/Mono.Android.dll": {
47-
"Size": 82055
47+
"Size": 82088
4848
},
4949
"lib/arm64-v8a/libxamarin-app.so": {
5050
"Size": 68560
@@ -56,10 +56,10 @@
5656
"Size": 75824
5757
},
5858
"lib/arm64-v8a/libSystem.Security.Cryptography.Native.OpenSsl.so": {
59-
"Size": 137672
59+
"Size": 145864
6060
},
6161
"lib/arm64-v8a/libmonosgen-2.0.so": {
62-
"Size": 3708520
62+
"Size": 3720720
6363
},
6464
"lib/arm64-v8a/libmonodroid.so": {
6565
"Size": 346800
@@ -68,14 +68,14 @@
6868
"Size": 37104
6969
},
7070
"META-INF/ANDROIDD.SF": {
71-
"Size": 2429
71+
"Size": 2405
7272
},
7373
"META-INF/ANDROIDD.RSA": {
7474
"Size": 1213
7575
},
7676
"META-INF/MANIFEST.MF": {
77-
"Size": 2302
77+
"Size": 2278
7878
}
7979
},
80-
"PackageSize": 2877318
80+
"PackageSize": 2877294
8181
}

0 commit comments

Comments
 (0)