From e478da513cc480a51020f1b2ef83c3cf7b51ad6d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 15 Jul 2024 13:31:41 +0000 Subject: [PATCH 01/18] Update dependencies from https://github.com/dotnet/sdk build 20240715.8 VS.Tools.Net.Core.SDK.Resolver From Version 9.0.100-preview.7.24358.3 -> To Version 9.0.100-preview.7.24365.8 Dependency coherency updates Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport,Microsoft.NET.ILLink.Tasks From Version 9.0.0-preview.7.24352.15 -> To Version 9.0.0-preview.7.24363.5 (parent: VS.Tools.Net.Core.SDK.Resolver --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 770729c517a..a351b4f5751 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,20 +1,20 @@ - + https://github.com/dotnet/sdk - 5e03abbcf74bdef38ca67f04fbd4982e333d1f58 + 658288fb352f997f35640a06a0d6abd5c829d852 - + https://github.com/dotnet/runtime - 1d16fd14fa772621c7b09ebd00f83610207b1abf + 5ab200cd23f23baefc2d7189bf721075400fb7f2 - + https://github.com/dotnet/runtime - 1d16fd14fa772621c7b09ebd00f83610207b1abf + 5ab200cd23f23baefc2d7189bf721075400fb7f2 - + https://github.com/dotnet/emsdk - ffe9afdc046cf7a6f82cc7c5796aade54047af64 + d3583522209829d1ed0440662ba136c7b7700b16 https://github.com/dotnet/cecil diff --git a/eng/Versions.props b/eng/Versions.props index 11ad1903617..10298ea276e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,13 +2,13 @@ - 9.0.100-preview.7.24358.3 + 9.0.100-preview.7.24365.8 $(VSToolsNetCoreSDKResolverPackageVersion) - 9.0.0-preview.7.24352.15 - 9.0.0-preview.7.24352.15 + 9.0.0-preview.7.24363.5 + 9.0.0-preview.7.24363.5 7.0.0-beta.22103.1 8.0.0-beta.24225.1 - 9.0.0-preview.7.24319.4 + 9.0.0-preview.7.24352.2 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion) 7.0.100-rc.1.22410.7 0.11.5-alpha.24324.1 From a430b6f06ee2ef55bb4908a57ebd8619fa78663a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 16 Jul 2024 13:37:59 +0000 Subject: [PATCH 02/18] Update dependencies from https://github.com/dotnet/sdk build 20240716.2 VS.Tools.Net.Core.SDK.Resolver From Version 9.0.100-preview.7.24358.3 -> To Version 9.0.100-preview.7.24366.2 Dependency coherency updates Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport,Microsoft.NET.ILLink.Tasks From Version 9.0.0-preview.7.24352.15 -> To Version 9.0.0-preview.7.24365.1 (parent: VS.Tools.Net.Core.SDK.Resolver --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a351b4f5751..e0dbbe54c06 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + https://github.com/dotnet/sdk - 658288fb352f997f35640a06a0d6abd5c829d852 + ea524b1b8ae205e04c7e1a0c7d6edde497e4b95a - + https://github.com/dotnet/runtime - 5ab200cd23f23baefc2d7189bf721075400fb7f2 + b885a58062434707e7584d29910af429a1ee0107 - + https://github.com/dotnet/runtime - 5ab200cd23f23baefc2d7189bf721075400fb7f2 + b885a58062434707e7584d29910af429a1ee0107 https://github.com/dotnet/emsdk diff --git a/eng/Versions.props b/eng/Versions.props index 10298ea276e..d9aadcc3b7a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,10 +2,10 @@ - 9.0.100-preview.7.24365.8 + 9.0.100-preview.7.24366.2 $(VSToolsNetCoreSDKResolverPackageVersion) - 9.0.0-preview.7.24363.5 - 9.0.0-preview.7.24363.5 + 9.0.0-preview.7.24365.1 + 9.0.0-preview.7.24365.1 7.0.0-beta.22103.1 8.0.0-beta.24225.1 9.0.0-preview.7.24352.2 From 09a88ef84a4ce3186b974959bcc14027c26aee50 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Tue, 16 Jul 2024 09:02:14 -0500 Subject: [PATCH 03/18] Workload manifests, require versioned folder now Any build would fail with: Microsoft.NET.Sdk/targets/Microsoft.NET.Sdk.ImportWorkloads.props(14,38): error MSB4242: SDK Resolver Failure: "The SDK resolver "Microsoft.DotNet.MSBuildWorkloadSdkResolver" failed while attempting to resolve the SDK "Microsoft.NET.SDK.WorkloadAutoImportPropsLocator". Exception: "System.IO.FileNotFoundException: Workload manifest microsoft.net.workload.mono.toolchain.current: 9.0.0-preview.7.24365.1/9.0.100-preview.7 from workload version 9.0.100-preview.7.24366.2 was not installed. Running "dotnet workload repair" may resolve this. Microsoft.NET.Sdk/targets/Microsoft.NET.Sdk.ImportWorkloads.props(14,38): error MSB4242: at Microsoft.NET.Sdk.WorkloadManifestReader.SdkDirectoryWorkloadManifestProvider.GetManifests() Microsoft.NET.Sdk/targets/Microsoft.NET.Sdk.ImportWorkloads.props(14,38): error MSB4242: at Microsoft.NET.Sdk.WorkloadManifestReader.WorkloadResolver.LoadManifestsFromProvider(IWorkloadManifestProvider manifestProvider) Microsoft.NET.Sdk/targets/Microsoft.NET.Sdk.ImportWorkloads.props(14,38): error MSB4242: at Microsoft.NET.Sdk.WorkloadManifestReader.WorkloadResolver.InitializeManifests() Microsoft.NET.Sdk/targets/Microsoft.NET.Sdk.ImportWorkloads.props(14,38): error MSB4242: at Microsoft.NET.Sdk.WorkloadManifestReader.WorkloadResolver.GetInstalledWorkloadPacksOfKind(WorkloadPackKind kind)+MoveNext() Microsoft.NET.Sdk/targets/Microsoft.NET.Sdk.ImportWorkloads.props(14,38): error MSB4242: at Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver.CachingWorkloadResolver.Resolve(String sdkReferenceName, IWorkloadManifestProvider manifestProvider, IWorkloadResolver workloadResolver) Microsoft.NET.Sdk/targets/Microsoft.NET.Sdk.ImportWorkloads.props(14,38): error MSB4242: at Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver.CachingWorkloadResolver.Resolve(String sdkReferenceName, String dotnetRootPath, String sdkVersion, String userProfileDir, String globalJsonPath) Microsoft.NET.Sdk/targets/Microsoft.NET.Sdk.ImportWorkloads.props(14,38): error MSB4242: at Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver.WorkloadSdkResolver.Resolve(SdkReference sdkReference, SdkResolverContext resolverContext, SdkResultFactory factory) Microsoft.NET.Sdk/targets/Microsoft.NET.Sdk.ImportWorkloads.props(14,38): error MSB4242: at Microsoft.Build.BackEnd.SdkResolution.SdkResolverService.TryResolveSdkUsingSpecifiedResolvers(IReadOnlyList`1 resolvers, Int32 submissionId, SdkReference sdk, LoggingContext loggingContext, ElementLocation sdkReferenceLocation, String solutionPath, String projectPath, Boolean interactive, Boolean isRunningInVisualStudio, SdkResult& sdkResult, IEnumerable`1& errors, IEnumerable`1& warnings)" --- .../xaprepare/Steps/Step_InstallDotNetPreview.cs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs b/build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs index 739a87489e1..e1808adc328 100644 --- a/build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs +++ b/build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs @@ -56,12 +56,18 @@ protected override async Task Execute (Context context) // Copy the WorkloadManifest.* files from the latest Microsoft.NET.Workload.* listed in package-download.proj var dotnets = new [] { "net6", "net7", "net8", "current" }; foreach (var dotnet in dotnets) { - var destination = Path.Combine (sdk_manifests, context.Properties.GetRequiredValue (KnownProperties.DotNetMonoManifestVersionBand), $"microsoft.net.workload.mono.toolchain.{dotnet}"); + var destination = Path.Combine (sdk_manifests, + context.Properties.GetRequiredValue (KnownProperties.DotNetMonoManifestVersionBand), + $"microsoft.net.workload.mono.toolchain.{dotnet}", + context.Properties.GetRequiredValue (KnownProperties.MicrosoftNETCoreAppRefPackageVersion)); Utilities.DeleteDirectory (destination, recurse: true); foreach (var file in Directory.GetFiles (string.Format (Configurables.Paths.MicrosoftNETWorkloadMonoToolChainDir, dotnet), "*")) { Utilities.CopyFileToDir (file, destination); } - destination = Path.Combine (sdk_manifests, context.Properties.GetRequiredValue (KnownProperties.DotNetEmscriptenManifestVersionBand), $"microsoft.net.workload.emscripten.{dotnet}"); + destination = Path.Combine (sdk_manifests, + context.Properties.GetRequiredValue (KnownProperties.DotNetEmscriptenManifestVersionBand), + $"microsoft.net.workload.emscripten.{dotnet}", + context.Properties.GetRequiredValue (KnownProperties.MicrosoftNETWorkloadEmscriptenPackageVersion)); Utilities.DeleteDirectory (destination, recurse: true); foreach (var file in Directory.GetFiles (string.Format (Configurables.Paths.MicrosoftNETWorkloadEmscriptenDir, dotnet), "*")) { Utilities.CopyFileToDir (file, destination); From 2ce3d9c440213e37b4119557fb7d788034de2529 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Tue, 16 Jul 2024 11:18:35 -0500 Subject: [PATCH 04/18] [build] set `$(GitCommits)` to 0 Might fix: /Users/builder/.nuget/packages/gitinfo/2.1.2/build/GitInfo.targets(876,4): error MSB4186: Invalid static method invocation syntax: "[MSBuild]::Add('$(GitBaseVersionPatch)', '$(GitCommits)')". Method '[MSBuild]::Add' not found. Static method invocation should be of the form: $([FullTypeName]::Method()), e.g. $([System.IO.Path]::Combine(`a`, `b`)). Check that all parameters are defined, are of the correct type, and are specified in the right order. [/Users/builder/azdo/_work/14/s/xamarin-android/external/xamarin-android-tools/src/Microsoft.Android.Build.BaseTasks/Microsoft.Android.Build.BaseTasks.csproj::TargetFramework=net6.0] --- Directory.Build.props | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Directory.Build.props b/Directory.Build.props index f0b10e8bb60..2702bc6945f 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -26,6 +26,8 @@ true true + + 0 From 705b106abcd53ea289a96390fbd1b6a2aae7fe2c Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Tue, 16 Jul 2024 12:23:03 -0500 Subject: [PATCH 05/18] Update GitCommitsInRange.cs build-tools/scripts/XAVersionInfo.targets(43,5): error MSB4044: The "GitCommitsInRange" task was not given a value for the required parameter "StartCommit". [build-tools/create-packs/Microsoft.Android.Sdk.proj] --- .../GitCommitsInRange.cs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/build-tools/xa-prep-tasks/Xamarin.Android.BuildTools.PrepTasks/GitCommitsInRange.cs b/build-tools/xa-prep-tasks/Xamarin.Android.BuildTools.PrepTasks/GitCommitsInRange.cs index 49933890205..27b8785e33e 100644 --- a/build-tools/xa-prep-tasks/Xamarin.Android.BuildTools.PrepTasks/GitCommitsInRange.cs +++ b/build-tools/xa-prep-tasks/Xamarin.Android.BuildTools.PrepTasks/GitCommitsInRange.cs @@ -10,7 +10,6 @@ public class GitCommitsInRange : Git [Output] public int CommitCount { get; set; } - [Required] public string StartCommit { get; set; } public string EndCommit { get; set; } @@ -30,7 +29,12 @@ public override bool Execute () Log.LogMessage (MessageImportance.Low, $" {nameof (EndCommit)}: {EndCommit}"); Log.LogMessage (MessageImportance.Low, $" {nameof (WorkingDirectory)}: {WorkingDirectory.ItemSpec}"); - base.Execute (); + // Only run if non-empty + if (!string.IsNullOrEmpty (StartCommit)) { + base.Execute (); + } else { + CommitCount = 0; + } Log.LogMessage (MessageImportance.Low, $" [Output] {nameof (CommitCount)}: {CommitCount}"); From a8d8eafe74467bd22260105c37e0d1288093ac78 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Tue, 16 Jul 2024 12:45:48 -0500 Subject: [PATCH 06/18] Revert "Update GitCommitsInRange.cs" This reverts commit 705b106abcd53ea289a96390fbd1b6a2aae7fe2c. --- .../GitCommitsInRange.cs | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/build-tools/xa-prep-tasks/Xamarin.Android.BuildTools.PrepTasks/GitCommitsInRange.cs b/build-tools/xa-prep-tasks/Xamarin.Android.BuildTools.PrepTasks/GitCommitsInRange.cs index 27b8785e33e..49933890205 100644 --- a/build-tools/xa-prep-tasks/Xamarin.Android.BuildTools.PrepTasks/GitCommitsInRange.cs +++ b/build-tools/xa-prep-tasks/Xamarin.Android.BuildTools.PrepTasks/GitCommitsInRange.cs @@ -10,6 +10,7 @@ public class GitCommitsInRange : Git [Output] public int CommitCount { get; set; } + [Required] public string StartCommit { get; set; } public string EndCommit { get; set; } @@ -29,12 +30,7 @@ public override bool Execute () Log.LogMessage (MessageImportance.Low, $" {nameof (EndCommit)}: {EndCommit}"); Log.LogMessage (MessageImportance.Low, $" {nameof (WorkingDirectory)}: {WorkingDirectory.ItemSpec}"); - // Only run if non-empty - if (!string.IsNullOrEmpty (StartCommit)) { - base.Execute (); - } else { - CommitCount = 0; - } + base.Execute (); Log.LogMessage (MessageImportance.Low, $" [Output] {nameof (CommitCount)}: {CommitCount}"); From 1dbf1b8c3771dbdad7dc28dd88e03f62c18c9d25 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Tue, 16 Jul 2024 12:45:53 -0500 Subject: [PATCH 07/18] Revert "[build] set `$(GitCommits)` to 0" This reverts commit 2ce3d9c440213e37b4119557fb7d788034de2529. --- Directory.Build.props | 2 -- 1 file changed, 2 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 2702bc6945f..f0b10e8bb60 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -26,8 +26,6 @@ true true - - 0 From 0d6ba012d7bcd7c322c72566eda6a39c3576408a Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Tue, 16 Jul 2024 12:47:17 -0500 Subject: [PATCH 08/18] Try `$MSBUILDDISABLEFEATURESFROMVERSION=17.10` --- build-tools/automation/yaml-templates/variables.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build-tools/automation/yaml-templates/variables.yaml b/build-tools/automation/yaml-templates/variables.yaml index ef6f3131c90..b8041ed3123 100644 --- a/build-tools/automation/yaml-templates/variables.yaml +++ b/build-tools/automation/yaml-templates/variables.yaml @@ -56,3 +56,5 @@ variables: value: 'cat != SystemApplication & cat != TimeZoneInfo & cat != Localization' - name: RunMAUITestJob value: true +- name: MSBUILDDISABLEFEATURESFROMVERSION + value: 17.10 From 7ad056731dcfbe1f80ee1453053362ff24f5f4b3 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Tue, 16 Jul 2024 14:34:04 -0500 Subject: [PATCH 09/18] Fix ExtractWorkloadPacks target * Add version to manifest folder * Create `$(BuildOutputDirectory)lib\sdk-manifests` if needed --- build-tools/create-packs/Directory.Build.targets | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build-tools/create-packs/Directory.Build.targets b/build-tools/create-packs/Directory.Build.targets index 2456133648b..485e37dbbf7 100644 --- a/build-tools/create-packs/Directory.Build.targets +++ b/build-tools/create-packs/Directory.Build.targets @@ -88,7 +88,7 @@ + DependsOnTargets="DeleteExtractedWorkloadPacks;_GetDefaultPackageVersion"> <_WLManifest Include="$(XamarinAndroidSourcePath)bin\Build$(Configuration)\nuget-unsigned\Microsoft.NET.Sdk.Android.Manifest-*.nupkg" /> @@ -104,7 +104,7 @@ <_WLExtractedFiles Include="$(_SdkManifestsFolder)temp\LICENSE.TXT" /> <_WLExtractedFiles Include="$(_SdkManifestsFolder)temp\data\*" /> - + @@ -132,7 +132,7 @@ <_InstallArguments Include="--source "%(_NuGetSources.Identity)"" /> <_InstallArguments Include="--temp-dir "$(_TempDirectory)"" /> - + Date: Tue, 16 Jul 2024 15:45:17 -0500 Subject: [PATCH 10/18] `MSBUILDDISABLEFEATURESFROMVERSION=17.12` --- build-tools/automation/yaml-templates/variables.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build-tools/automation/yaml-templates/variables.yaml b/build-tools/automation/yaml-templates/variables.yaml index b8041ed3123..8bfc8c49d59 100644 --- a/build-tools/automation/yaml-templates/variables.yaml +++ b/build-tools/automation/yaml-templates/variables.yaml @@ -56,5 +56,6 @@ variables: value: 'cat != SystemApplication & cat != TimeZoneInfo & cat != Localization' - name: RunMAUITestJob value: true +# Workaround: https://github.com/dotnet/msbuild/issues/10378 - name: MSBUILDDISABLEFEATURESFROMVERSION - value: 17.10 + value: 17.12 From 2c9ac6d42f13230d1a2781b824f179c1c0ac6f3b Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Tue, 16 Jul 2024 15:48:37 -0500 Subject: [PATCH 11/18] Update Directory.Build.targets --- build-tools/create-packs/Directory.Build.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-tools/create-packs/Directory.Build.targets b/build-tools/create-packs/Directory.Build.targets index 485e37dbbf7..78fe72f15d3 100644 --- a/build-tools/create-packs/Directory.Build.targets +++ b/build-tools/create-packs/Directory.Build.targets @@ -104,7 +104,7 @@ <_WLExtractedFiles Include="$(_SdkManifestsFolder)temp\LICENSE.TXT" /> <_WLExtractedFiles Include="$(_SdkManifestsFolder)temp\data\*" /> - + From 9536773b19a7d8e6888d5033f38a9e9eb722b369 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Wed, 17 Jul 2024 09:07:48 -0500 Subject: [PATCH 12/18] Delete 9.0.100-preview.6 baseline manifest --- build-tools/create-packs/Directory.Build.targets | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build-tools/create-packs/Directory.Build.targets b/build-tools/create-packs/Directory.Build.targets index 78fe72f15d3..e88aa0f2b3a 100644 --- a/build-tools/create-packs/Directory.Build.targets +++ b/build-tools/create-packs/Directory.Build.targets @@ -148,8 +148,9 @@ <_PackFoldersToDelete Include="$(DotNetPreviewPath)metadata" /> + + <_PackFoldersToDelete Include="$(DotNetPreviewPath)sdk-manifests\$(VersionBand)-preview.6\microsoft.net.sdk.android" /> <_PackFoldersToDelete Include="$(DotNetPreviewPath)sdk-manifests\$(DotNetSdkManifestsFolder)\microsoft.net.sdk.android" /> - <_PackFoldersToDelete Include="$(DotNetPreviewPath)sdk-manifests\$(DotNetSdkManifestsFolder)\microsoft.net.workload.android" /> <_PackFoldersToDelete Include="$(DotNetPreviewPath)packs\Microsoft.Android.Ref.%(_PackApiLevels.Identity)" /> <_PackFoldersToDelete Include="$(DotNetPreviewPath)packs\Microsoft.Android.Runtime.%(_PackApiLevels.Identity).android-arm" /> <_PackFoldersToDelete Include="$(DotNetPreviewPath)packs\Microsoft.Android.Runtime.%(_PackApiLevels.Identity).android-arm64" /> From ed7a983a4eabb616c7eae07f74f2943dff4c40ec Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Wed, 17 Jul 2024 09:53:23 -0500 Subject: [PATCH 13/18] Delete workload set --- build-tools/create-packs/Directory.Build.targets | 1 + 1 file changed, 1 insertion(+) diff --git a/build-tools/create-packs/Directory.Build.targets b/build-tools/create-packs/Directory.Build.targets index e88aa0f2b3a..d6e4588358b 100644 --- a/build-tools/create-packs/Directory.Build.targets +++ b/build-tools/create-packs/Directory.Build.targets @@ -150,6 +150,7 @@ <_PackFoldersToDelete Include="$(DotNetPreviewPath)metadata" /> <_PackFoldersToDelete Include="$(DotNetPreviewPath)sdk-manifests\$(VersionBand)-preview.6\microsoft.net.sdk.android" /> + <_PackFoldersToDelete Include="$(DotNetPreviewPath)sdk-manifests\$(DotNetSdkManifestsFolder)\workloadsets" /> <_PackFoldersToDelete Include="$(DotNetPreviewPath)sdk-manifests\$(DotNetSdkManifestsFolder)\microsoft.net.sdk.android" /> <_PackFoldersToDelete Include="$(DotNetPreviewPath)packs\Microsoft.Android.Ref.%(_PackApiLevels.Identity)" /> <_PackFoldersToDelete Include="$(DotNetPreviewPath)packs\Microsoft.Android.Runtime.%(_PackApiLevels.Identity).android-arm" /> From b57310eeab3446f37cf34b39ac457964f75fca23 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Wed, 17 Jul 2024 12:27:13 -0500 Subject: [PATCH 14/18] Update `.apkdesc` files --- .../BuildReleaseArm64SimpleDotNet.apkdesc | 32 +++---- .../BuildReleaseArm64XFormsDotNet.apkdesc | 88 +++++++++---------- 2 files changed, 60 insertions(+), 60 deletions(-) diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.apkdesc b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.apkdesc index 460971d4d88..1739140e9ac 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.apkdesc +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.apkdesc @@ -11,34 +11,34 @@ "Size": 1114 }, "lib/arm64-v8a/lib_Java.Interop.dll.so": { - "Size": 66250 + "Size": 69368 }, "lib/arm64-v8a/lib_Mono.Android.dll.so": { - "Size": 94741 + "Size": 98691 }, "lib/arm64-v8a/lib_Mono.Android.Runtime.dll.so": { - "Size": 5367 + "Size": 5366 }, "lib/arm64-v8a/lib_System.Console.dll.so": { - "Size": 7226 + "Size": 7304 }, "lib/arm64-v8a/lib_System.Linq.dll.so": { - "Size": 9294 + "Size": 9406 }, "lib/arm64-v8a/lib_System.Private.CoreLib.dll.so": { - "Size": 596083 + "Size": 615029 }, "lib/arm64-v8a/lib_System.Runtime.dll.so": { - "Size": 2969 + "Size": 2965 }, "lib/arm64-v8a/lib_System.Runtime.InteropServices.dll.so": { - "Size": 4475 + "Size": 4507 }, "lib/arm64-v8a/lib_UnnamedProject.dll.so": { - "Size": 3059 + "Size": 2932 }, "lib/arm64-v8a/libarc.bin.so": { - "Size": 1546 + "Size": 1685 }, "lib/arm64-v8a/libmono-component-marshal-ilgen.so": { "Size": 87432 @@ -47,25 +47,25 @@ "Size": 492280 }, "lib/arm64-v8a/libmonosgen-2.0.so": { - "Size": 3163208 + "Size": 3186328 }, "lib/arm64-v8a/libSystem.Globalization.Native.so": { "Size": 67248 }, "lib/arm64-v8a/libSystem.IO.Compression.Native.so": { - "Size": 723560 + "Size": 724048 }, "lib/arm64-v8a/libSystem.Native.so": { "Size": 95680 }, "lib/arm64-v8a/libSystem.Security.Cryptography.Native.Android.so": { - "Size": 159544 + "Size": 159672 }, "lib/arm64-v8a/libxamarin-app.so": { - "Size": 18008 + "Size": 17992 }, "META-INF/BNDLTOOL.RSA": { - "Size": 1213 + "Size": 1221 }, "META-INF/BNDLTOOL.SF": { "Size": 3266 @@ -98,5 +98,5 @@ "Size": 1904 } }, - "PackageSize": 2714133 + "PackageSize": 2742805 } \ No newline at end of file diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsDotNet.apkdesc b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsDotNet.apkdesc index fa599195f71..98a752d8a41 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsDotNet.apkdesc +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsDotNet.apkdesc @@ -35,85 +35,85 @@ "Size": 8330 }, "lib/arm64-v8a/lib_Java.Interop.dll.so": { - "Size": 77620 + "Size": 77784 }, "lib/arm64-v8a/lib_Mono.Android.dll.so": { - "Size": 500856 + "Size": 501839 }, "lib/arm64-v8a/lib_Mono.Android.Runtime.dll.so": { - "Size": 5319 + "Size": 5366 }, "lib/arm64-v8a/lib_mscorlib.dll.so": { - "Size": 4356 + "Size": 4354 }, "lib/arm64-v8a/lib_netstandard.dll.so": { - "Size": 5993 + "Size": 5997 }, "lib/arm64-v8a/lib_System.Collections.Concurrent.dll.so": { - "Size": 12730 + "Size": 12731 }, "lib/arm64-v8a/lib_System.Collections.dll.so": { "Size": 19239 }, "lib/arm64-v8a/lib_System.Collections.NonGeneric.dll.so": { - "Size": 8684 + "Size": 8685 }, "lib/arm64-v8a/lib_System.Collections.Specialized.dll.so": { - "Size": 6768 + "Size": 6773 }, "lib/arm64-v8a/lib_System.ComponentModel.dll.so": { - "Size": 2510 + "Size": 2511 }, "lib/arm64-v8a/lib_System.ComponentModel.Primitives.dll.so": { "Size": 4231 }, "lib/arm64-v8a/lib_System.ComponentModel.TypeConverter.dll.so": { - "Size": 25312 + "Size": 25330 }, "lib/arm64-v8a/lib_System.Console.dll.so": { "Size": 7339 }, "lib/arm64-v8a/lib_System.Core.dll.so": { - "Size": 2368 + "Size": 2370 }, "lib/arm64-v8a/lib_System.Diagnostics.DiagnosticSource.dll.so": { - "Size": 10962 + "Size": 11366 }, "lib/arm64-v8a/lib_System.Diagnostics.TraceSource.dll.so": { "Size": 7614 }, "lib/arm64-v8a/lib_System.dll.so": { - "Size": 2772 + "Size": 2775 }, "lib/arm64-v8a/lib_System.Drawing.dll.so": { - "Size": 2354 + "Size": 2353 }, "lib/arm64-v8a/lib_System.Drawing.Primitives.dll.so": { - "Size": 12570 + "Size": 12574 }, "lib/arm64-v8a/lib_System.Formats.Asn1.dll.so": { - "Size": 32794 + "Size": 32927 }, "lib/arm64-v8a/lib_System.IO.Compression.Brotli.dll.so": { "Size": 12427 }, "lib/arm64-v8a/lib_System.IO.Compression.dll.so": { - "Size": 16838 + "Size": 16842 }, "lib/arm64-v8a/lib_System.IO.IsolatedStorage.dll.so": { - "Size": 11204 + "Size": 11207 }, "lib/arm64-v8a/lib_System.Linq.dll.so": { - "Size": 21391 + "Size": 21392 }, "lib/arm64-v8a/lib_System.Linq.Expressions.dll.so": { - "Size": 168729 + "Size": 168733 }, "lib/arm64-v8a/lib_System.Net.Http.dll.so": { - "Size": 70642 + "Size": 72410 }, "lib/arm64-v8a/lib_System.Net.Primitives.dll.so": { - "Size": 24046 + "Size": 24045 }, "lib/arm64-v8a/lib_System.Net.Requests.dll.so": { "Size": 4475 @@ -122,16 +122,16 @@ "Size": 9990 }, "lib/arm64-v8a/lib_System.Private.CoreLib.dll.so": { - "Size": 932380 + "Size": 937615 }, "lib/arm64-v8a/lib_System.Private.DataContractSerialization.dll.so": { - "Size": 199662 + "Size": 199664 }, "lib/arm64-v8a/lib_System.Private.Uri.dll.so": { - "Size": 45090 + "Size": 45103 }, "lib/arm64-v8a/lib_System.Private.Xml.dll.so": { - "Size": 220082 + "Size": 220077 }, "lib/arm64-v8a/lib_System.Private.Xml.Linq.dll.so": { "Size": 18532 @@ -140,34 +140,34 @@ "Size": 3122 }, "lib/arm64-v8a/lib_System.Runtime.InteropServices.dll.so": { - "Size": 4506 + "Size": 4507 }, "lib/arm64-v8a/lib_System.Runtime.Numerics.dll.so": { - "Size": 37219 + "Size": 37335 }, "lib/arm64-v8a/lib_System.Runtime.Serialization.dll.so": { - "Size": 2276 + "Size": 2275 }, "lib/arm64-v8a/lib_System.Runtime.Serialization.Formatters.dll.so": { - "Size": 3253 + "Size": 3254 }, "lib/arm64-v8a/lib_System.Runtime.Serialization.Primitives.dll.so": { - "Size": 4377 + "Size": 4378 }, "lib/arm64-v8a/lib_System.Security.Cryptography.dll.so": { - "Size": 63163 + "Size": 63419 }, "lib/arm64-v8a/lib_System.Text.RegularExpressions.dll.so": { - "Size": 163853 + "Size": 166617 }, "lib/arm64-v8a/lib_System.Xml.dll.so": { - "Size": 2175 + "Size": 2176 }, "lib/arm64-v8a/lib_System.Xml.Linq.dll.so": { - "Size": 2186 + "Size": 2189 }, "lib/arm64-v8a/lib_UnnamedProject.dll.so": { - "Size": 5005 + "Size": 5007 }, "lib/arm64-v8a/lib_Xamarin.AndroidX.Activity.dll.so": { "Size": 17872 @@ -239,31 +239,31 @@ "Size": 67675 }, "lib/arm64-v8a/libarc.bin.so": { - "Size": 1562 + "Size": 1685 }, "lib/arm64-v8a/libmono-component-marshal-ilgen.so": { "Size": 87432 }, "lib/arm64-v8a/libmonodroid.so": { - "Size": 492344 + "Size": 492280 }, "lib/arm64-v8a/libmonosgen-2.0.so": { - "Size": 3182104 + "Size": 3186328 }, "lib/arm64-v8a/libSystem.Globalization.Native.so": { "Size": 67248 }, "lib/arm64-v8a/libSystem.IO.Compression.Native.so": { - "Size": 723560 + "Size": 724048 }, "lib/arm64-v8a/libSystem.Native.so": { "Size": 95680 }, "lib/arm64-v8a/libSystem.Security.Cryptography.Native.Android.so": { - "Size": 159544 + "Size": 159672 }, "lib/arm64-v8a/libxamarin-app.so": { - "Size": 349520 + "Size": 349552 }, "META-INF/androidx.activity_activity.version": { "Size": 6 @@ -416,7 +416,7 @@ "Size": 6 }, "META-INF/BNDLTOOL.RSA": { - "Size": 1221 + "Size": 1223 }, "META-INF/BNDLTOOL.SF": { "Size": 98577 @@ -2486,5 +2486,5 @@ "Size": 812848 } }, - "PackageSize": 10521867 + "PackageSize": 10534155 } \ No newline at end of file From 73bf89c0b176357de4ec63628ca50ac8bbb9088f Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Wed, 17 Jul 2024 12:27:47 -0500 Subject: [PATCH 15/18] Update Directory.Build.targets --- build-tools/create-packs/Directory.Build.targets | 2 -- 1 file changed, 2 deletions(-) diff --git a/build-tools/create-packs/Directory.Build.targets b/build-tools/create-packs/Directory.Build.targets index d6e4588358b..115e5ceba78 100644 --- a/build-tools/create-packs/Directory.Build.targets +++ b/build-tools/create-packs/Directory.Build.targets @@ -148,8 +148,6 @@ <_PackFoldersToDelete Include="$(DotNetPreviewPath)metadata" /> - - <_PackFoldersToDelete Include="$(DotNetPreviewPath)sdk-manifests\$(VersionBand)-preview.6\microsoft.net.sdk.android" /> <_PackFoldersToDelete Include="$(DotNetPreviewPath)sdk-manifests\$(DotNetSdkManifestsFolder)\workloadsets" /> <_PackFoldersToDelete Include="$(DotNetPreviewPath)sdk-manifests\$(DotNetSdkManifestsFolder)\microsoft.net.sdk.android" /> <_PackFoldersToDelete Include="$(DotNetPreviewPath)packs\Microsoft.Android.Ref.%(_PackApiLevels.Identity)" /> From 17c145ea5ec2bb8e283254d1ebc3a2c1ceafe3d6 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Wed, 17 Jul 2024 13:51:34 -0500 Subject: [PATCH 16/18] [Mono.Android] use `HttpClientHandler._nativeUnderlyingHandler` Context: https://github.com/dotnet/runtime/commit/8b9ea5e18044e8516060d9883bf3c056da7d687c This private field was renamed. --- src/Mono.Android/Xamarin.Android.Net/AndroidClientHandler.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Mono.Android/Xamarin.Android.Net/AndroidClientHandler.cs b/src/Mono.Android/Xamarin.Android.Net/AndroidClientHandler.cs index f12317c1ead..d8f84093ca7 100644 --- a/src/Mono.Android/Xamarin.Android.Net/AndroidClientHandler.cs +++ b/src/Mono.Android/Xamarin.Android.Net/AndroidClientHandler.cs @@ -312,7 +312,7 @@ protected virtual Task SetupRequest (HttpRequestMessage request, HttpURLConnecti [DynamicDependency (DynamicallyAccessedMemberTypes.PublicParameterlessConstructor, typeof (AndroidMessageHandler))] object? GetUnderlyingHandler () { - var fieldName = "_nativeHandler"; + var fieldName = "_nativeUnderlyingHandler"; const BindingFlags flags = BindingFlags.Instance | BindingFlags.NonPublic; FieldInfo? field = typeof (HttpClientHandler).GetField (fieldName, flags) ?? typeof (HttpMessageHandler).GetField (fieldName, flags); From e91fd37dc8f86156068b221c483e337fd648bf16 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 17 Jul 2024 21:33:17 +0000 Subject: [PATCH 17/18] Update dependencies from https://github.com/dotnet/sdk build 20240717.21 VS.Tools.Net.Core.SDK.Resolver From Version 9.0.100-preview.7.24358.3 -> To Version 9.0.100-preview.7.24367.21 Dependency coherency updates Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport,Microsoft.NET.ILLink.Tasks From Version 9.0.0-preview.7.24352.15 -> To Version 9.0.0-preview.7.24366.18 (parent: VS.Tools.Net.Core.SDK.Resolver --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e0dbbe54c06..a6cbea078f9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,20 +1,20 @@ - + https://github.com/dotnet/sdk - ea524b1b8ae205e04c7e1a0c7d6edde497e4b95a + 2f14fea98bd6e87f8583f59495a8a664155f1c8a - + https://github.com/dotnet/runtime - b885a58062434707e7584d29910af429a1ee0107 + 1f70f0cc663b5d45f77840e9728386e5fa7944f9 - + https://github.com/dotnet/runtime - b885a58062434707e7584d29910af429a1ee0107 + 1f70f0cc663b5d45f77840e9728386e5fa7944f9 - + https://github.com/dotnet/emsdk - d3583522209829d1ed0440662ba136c7b7700b16 + 99ea0c06b84d3084d090da537080dd35d2a193cf https://github.com/dotnet/cecil diff --git a/eng/Versions.props b/eng/Versions.props index d9aadcc3b7a..67ebe5e27a5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,13 +2,13 @@ - 9.0.100-preview.7.24366.2 + 9.0.100-preview.7.24367.21 $(VSToolsNetCoreSDKResolverPackageVersion) - 9.0.0-preview.7.24365.1 - 9.0.0-preview.7.24365.1 + 9.0.0-preview.7.24366.18 + 9.0.0-preview.7.24366.18 7.0.0-beta.22103.1 8.0.0-beta.24225.1 - 9.0.0-preview.7.24352.2 + 9.0.0-preview.7.24365.1 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion) 7.0.100-rc.1.22410.7 0.11.5-alpha.24324.1 From 4e753453170ea4848562afdf7a966d8e510274d4 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Thu, 18 Jul 2024 08:52:34 -0500 Subject: [PATCH 18/18] FIXME: https://github.com/dotnet/runtime/issues/105044 --- .../Tests/Xamarin.Android.Build.Tests/BuildTest.cs | 3 ++- .../Tests/Xamarin.Android.Build.Tests/BuildTest2.cs | 4 +++- .../Tests/Xamarin.Android.Build.Tests/CodeBehindTests.cs | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs index e42436ada2d..08fa7fed2de 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs @@ -208,7 +208,8 @@ public void CheckMonoComponentsMask (bool enableProfiler, bool useInterpreter, b using (var b = CreateApkBuilder ()) { Assert.IsTrue (b.Build (proj), "Build should have succeeded."); - b.AssertHasNoWarnings (); + //FIXME: https://github.com/dotnet/runtime/issues/105044 + //b.AssertHasNoWarnings (); string objPath = Path.Combine (Root, b.ProjectDirectory, proj.IntermediateOutputPath); List envFiles = EnvironmentHelper.GatherEnvironmentFiles (objPath, String.Join (";", abis), true); diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs index 30b93598aa9..bef9c03607c 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs @@ -261,7 +261,9 @@ public void BuildHasNoWarnings (bool isRelease, bool xamarinForms, bool multidex proj.SetProperty ("TrimmerSingleWarn", "false"); using (var b = CreateApkBuilder (Path.Combine ("temp", TestName))) { Assert.IsTrue (b.Build (proj), "Build should have succeeded."); - b.AssertHasNoWarnings (); + //FIXME: https://github.com/dotnet/runtime/issues/105044 + if (!xamarinForms) + b.AssertHasNoWarnings (); Assert.IsFalse (StringAssertEx.ContainsText (b.LastBuildOutput, "Warning: end of file not at end of a line"), "Should not get a warning from the task."); var lockFile = Path.Combine (Root, b.ProjectDirectory, proj.IntermediateOutputPath, ".__lock"); diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/CodeBehindTests.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/CodeBehindTests.cs index da088199ffd..c28e9b7be3a 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/CodeBehindTests.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/CodeBehindTests.cs @@ -340,7 +340,8 @@ void SuccessfulBuild_AndroidX (TestProjectInfo testInfo, bool many, bool dtb, Lo CopyLogs (testInfo, true); Assert.That (success, Is.True, "Build should have succeeded"); - Assert.IsTrue (StringAssertEx.ContainsText (builder.LastBuildOutput, " 0 Warning(s)"), $"{builder.BuildLogFile} should have no MSBuild warnings."); + //FIXME: https://github.com/dotnet/runtime/issues/105044 + //Assert.IsTrue (StringAssertEx.ContainsText (builder.LastBuildOutput, " 0 Warning(s)"), $"{builder.BuildLogFile} should have no MSBuild warnings."); CopyGeneratedFiles (testInfo);