Merge branch 'main' into dev/grendel/perfetto-integration

* main: Bump to dotnet/android-tools@9674590 (#9036) Bump to dotnet/android-libzipsharp@de57dccb (#9010) [Xamarin.Android.Build.Tasks] Support VS "Build Acceleration" (#9042) Bump to dotnet/sdk@ea9243f9cb 9.0.100-preview.7.24323.5 (#9031) Fix places still pointing to xamarin/xamarin-android (#9050) [xaprepare] skip download progress for `dotnet-install` script (#9053) $(AndroidPackVersionSuffix)=preview.7; net9 is 34.99.0.preview.7 (#9052)
dotnet · Jun 27, 2024 · 7f3fc6a · 7f3fc6a
2 parents 369f07d + 1f822a6
commit 7f3fc6a
Show file tree

Hide file tree

Showing 18 changed files with 134 additions and 116 deletions.
diff --git a/.external b/.external
@@ -1 +1 @@
-xamarin/monodroid:main@c6aae9e5a154cfbf2c3a94e046fa2c747c3b82e2
+xamarin/monodroid:main@e11d9a5af8f00a88d15bd87c777608f17c4ece78
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -36,12 +36,12 @@
          * Bump first digit of the patch version for feature releases (and reset the first two digits to 0)
     -->
     <AndroidPackVersion>34.99.0</AndroidPackVersion>
-    <AndroidPackVersionSuffix>preview.6</AndroidPackVersionSuffix>
+    <AndroidPackVersionSuffix>preview.7</AndroidPackVersionSuffix>
   </PropertyGroup>
 
   <!-- Common <PackageReference/> versions -->
   <PropertyGroup>
-    <LibZipSharpVersion>3.1.1</LibZipSharpVersion>
+    <LibZipSharpVersion>3.3.0</LibZipSharpVersion>
     <MicroBuildCoreVersion>1.0.0</MicroBuildCoreVersion>
     <MonoCecilVersion>0.11.4</MonoCecilVersion>
     <NewtonsoftJsonPackageVersion>13.0.3</NewtonsoftJsonPackageVersion>

diff --git a/build-tools/create-packs/License.targets b/build-tools/create-packs/License.targets
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Authors>Microsoft</Authors>
     <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
-    <PackageProjectUrl>https://github.com/xamarin/xamarin-android</PackageProjectUrl>
+    <PackageProjectUrl>https://github.com/dotnet/android</PackageProjectUrl>
     <NuGetLicense Condition="Exists('$(XamarinAndroidSourcePath)external\monodroid\tools\scripts\License.txt')">$(XamarinAndroidSourcePath)external\monodroid\tools\scripts\License.txt</NuGetLicense>
     <NuGetLicense Condition=" '$(NuGetLicense)' == '' or '$(PackageId)' != 'Microsoft.Android.Sdk.$(HostOS)' ">$(XamarinAndroidSourcePath)LICENSE.TXT</NuGetLicense>
     <PackageLicenseFile>LICENSE.TXT</PackageLicenseFile>

diff --git a/build-tools/debian-metadata/control b/build-tools/debian-metadata/control
@@ -5,8 +5,8 @@ Maintainer: Xamarin <[email protected]>
 Build-Depends: debhelper (>=9), cli-common-dev (>= 0.9~)
 Standards-Version: 3.9.6
 Homepage: https://www.xamarin.com/platform
-Vcs-Git: https://github.com/xamarin/xamarin-android.git
-Vcs-Browser: https://github.com/xamarin/xamarin-android
+Vcs-Git: https://github.com/dotnet/android.git
+Vcs-Browser: https://github.com/dotnet/android
 
 Package: xamarin.android-oss
 Architecture: amd64

diff --git a/build-tools/scripts/XAVersionInfo.targets b/build-tools/scripts/XAVersionInfo.targets
@@ -75,7 +75,7 @@
       <Output TaskParameter="Branch"                  PropertyName="XAVersionBranch"        Condition=" '$(XAVersionBranch)' == '' " />
     </GitBranch>
     <PropertyGroup>
-      <XARepositoryName Condition=" '$(XARepositoryName)' == '' ">xamarin-android</XARepositoryName>
+      <XARepositoryName Condition=" '$(XARepositoryName)' == '' ">dotnet/android</XARepositoryName>
       <!-- See Azure Pipelines predefined variables. -->
       <_AndroidPackLabel Condition=" '$(SYSTEM_PULLREQUEST_PULLREQUESTNUMBER)' != '' ">ci.pr.gh$(SYSTEM_PULLREQUEST_PULLREQUESTNUMBER).$(PackVersionCommitCount)</_AndroidPackLabel>
       <_AndroidPackBranch>$([System.Text.RegularExpressions.Regex]::Replace('$(XAVersionBranch)', '[^a-zA-Z0-9-]', '-'))</_AndroidPackBranch>

diff --git a/build-tools/xaprepare/xaprepare/Application/DownloadStatus.cs b/build-tools/xaprepare/xaprepare/Application/DownloadStatus.cs
@@ -10,6 +10,8 @@ class DownloadStatus
 		const uint DefaultUpdateInterval = 1000;
 		readonly object updateLock = new object ();
 
+		public static readonly DownloadStatus Empty = new DownloadStatus (0, _ => { });
+
 		ConcurrentQueue<ulong> byteSnapshots;
 		Stopwatch watch;
 		Action<DownloadStatus> updater;

diff --git a/build-tools/xaprepare/xaprepare/Application/GeneratedSourceLinkJsonFile.cs b/build-tools/xaprepare/xaprepare/Application/GeneratedSourceLinkJsonFile.cs
@@ -33,7 +33,7 @@ public override void Generate (Context context)
 
 				json.AppendLine ($"    \"{localPath}/*\": \"{contentUri.Uri}/*\",");
 			}
-			json.AppendLine ($"    \"{BuildPaths.XamarinAndroidSourceRoot}/*\": \"https://raw.githubusercontent.com/xamarin/xamarin-android/{xaCommit}/*\"");
+			json.AppendLine ($"    \"{BuildPaths.XamarinAndroidSourceRoot}/*\": \"https://raw.githubusercontent.com/dotnet/android/{xaCommit}/*\"");
 			json.AppendLine ("  }");
 			json.AppendLine ("}");
 

diff --git a/build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs b/build-tools/xaprepare/xaprepare/Steps/Step_InstallDotNetPreview.cs
@@ -78,23 +78,13 @@ async Task<bool> DownloadDotNetInstallScript (Context context, string dotnetScri
 
 			Log.StatusLine ("Downloading dotnet-install script...");
 
-			(bool success, ulong size, HttpStatusCode status) = await Utilities.GetDownloadSizeWithStatus (dotnetScriptUrl);
-			if (!success) {
-				if (status == HttpStatusCode.NotFound) {
-					Log.WarningLine ($"dotnet-install URL '{dotnetScriptUrl}' not found.");
-				} else {
-					Log.WarningLine ($"Failed to obtain dotnet-install script size from URL '{dotnetScriptUrl}'. HTTP status code: {status} ({(int) status})");
-				}
-
-				if (File.Exists (dotnetScriptPath)) {
-					Log.WarningLine ($"Using cached installation script found in '{dotnetScriptPath}'");
-					return true;
-				}
+			if (File.Exists (dotnetScriptPath)) {
+				Log.WarningLine ($"Using cached installation script found in '{dotnetScriptPath}'");
+				return true;
 			}
 
-			DownloadStatus downloadStatus = Utilities.SetupDownloadStatus (context, size, context.InteractiveSession);
 			Log.StatusLine ($"  {context.Characters.Link} {dotnetScriptUrl}", ConsoleColor.White);
-			await Download (context, dotnetScriptUrl, tempDotnetScriptPath, "dotnet-install", Path.GetFileName (dotnetScriptUrl.LocalPath), downloadStatus);
+			await Utilities.Download (dotnetScriptUrl, tempDotnetScriptPath, DownloadStatus.Empty);
 
 			if (File.Exists (tempDotnetScriptPath)) {
 				Utilities.CopyFile (tempDotnetScriptPath, dotnetScriptPath);

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -1,24 +1,24 @@
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="VS.Tools.Net.Core.SDK.Resolver" Version="9.0.100-preview.5.24262.2">
-      <Uri>https://github.com/dotnet/installer</Uri>
-      <Sha>1741345c6399ae203d8f259fb12fb873dac5129d</Sha>
+    <Dependency Name="VS.Tools.Net.Core.SDK.Resolver" Version="9.0.100-preview.7.24323.5">
+      <Uri>https://github.com/dotnet/sdk</Uri>
+      <Sha>ea9243f9cb36e56aba4cf6364a4d53a5c2d458fb</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="9.0.0-preview.5.24256.1" CoherentParentDependency="VS.Tools.Net.Core.SDK.Resolver">
+    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="9.0.0-preview.6.24319.11" CoherentParentDependency="VS.Tools.Net.Core.SDK.Resolver">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>84b33395057737db3ea342a5151feb6b90c1b6f6</Sha>
+      <Sha>117cfccdd71abc164e6b933ca7602b509a1365dd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-preview.5.24256.1" CoherentParentDependency="VS.Tools.Net.Core.SDK.Resolver">
+    <Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-preview.6.24319.11" CoherentParentDependency="VS.Tools.Net.Core.SDK.Resolver">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>84b33395057737db3ea342a5151feb6b90c1b6f6</Sha>
+      <Sha>117cfccdd71abc164e6b933ca7602b509a1365dd</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport" Version="9.0.0-preview.5.24223.2" CoherentParentDependency="Microsoft.NETCore.App.Ref">
+    <Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport" Version="9.0.0-preview.6.24317.2" CoherentParentDependency="Microsoft.NETCore.App.Ref">
       <Uri>https://github.com/dotnet/emsdk</Uri>
-      <Sha>53288f87c588907e8ff01f129786820fe998573c</Sha>
+      <Sha>9880d891ddfddee1b1182c149468a43b89c090a0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.4-alpha.24230.1" CoherentParentDependency="Microsoft.NET.ILLink.Tasks">
+    <Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.4-alpha.24313.1" CoherentParentDependency="Microsoft.NET.ILLink.Tasks">
       <Uri>https://github.com/dotnet/cecil</Uri>
-      <Sha>7a4a59f9f66baf6711a6ce2de01d3b2c62ed72d8</Sha>
+      <Sha>d145726036eb9c09a0e3cf03c4f70effd3b31cd7</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -2,16 +2,16 @@
   <!--Package versions-->
   <PropertyGroup>
     <!-- NOTE: $(VSToolsNetCoreSDKResolverPackageVersion) may be temporary -->
-    <VSToolsNetCoreSDKResolverPackageVersion>9.0.100-preview.5.24262.2</VSToolsNetCoreSDKResolverPackageVersion>
+    <VSToolsNetCoreSDKResolverPackageVersion>9.0.100-preview.7.24323.5</VSToolsNetCoreSDKResolverPackageVersion>
     <MicrosoftDotnetSdkInternalPackageVersion>$(VSToolsNetCoreSDKResolverPackageVersion)</MicrosoftDotnetSdkInternalPackageVersion>
-    <MicrosoftNETILLinkTasksPackageVersion>9.0.0-preview.5.24256.1</MicrosoftNETILLinkTasksPackageVersion>
-    <MicrosoftNETCoreAppRefPackageVersion>9.0.0-preview.5.24256.1</MicrosoftNETCoreAppRefPackageVersion>
+    <MicrosoftNETILLinkTasksPackageVersion>9.0.0-preview.6.24319.11</MicrosoftNETILLinkTasksPackageVersion>
+    <MicrosoftNETCoreAppRefPackageVersion>9.0.0-preview.6.24319.11</MicrosoftNETCoreAppRefPackageVersion>
     <MicrosoftDotNetApiCompatPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetApiCompatPackageVersion>
     <MicrosoftDotNetBuildTasksFeedPackageVersion>8.0.0-beta.24225.1</MicrosoftDotNetBuildTasksFeedPackageVersion>
-    <MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>9.0.0-preview.5.24223.2</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>
+    <MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>9.0.0-preview.6.24317.2</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>
     <MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion)</MicrosoftNETWorkloadEmscriptenPackageVersion>
     <MicrosoftTemplateEngineTasksPackageVersion>7.0.100-rc.1.22410.7</MicrosoftTemplateEngineTasksPackageVersion>
-    <MicrosoftDotNetCecilPackageVersion>0.11.4-alpha.24230.1</MicrosoftDotNetCecilPackageVersion>
+    <MicrosoftDotNetCecilPackageVersion>0.11.4-alpha.24313.1</MicrosoftDotNetCecilPackageVersion>
     <SystemIOHashingPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</SystemIOHashingPackageVersion>
   </PropertyGroup>
   <PropertyGroup>

diff --git a/external/xamarin-android-tools b/external/xamarin-android-tools
diff --git a/...rin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Resource.Designer.targets b/...rin.Android.Build.Tasks/MSBuild/Xamarin/Android/Xamarin.Android.Resource.Designer.targets
@@ -196,6 +196,28 @@ Copyright (C) 2016 Xamarin. All rights reserved.
   </ItemGroup>
 </Target>
 
+<!--
+  The Visual Studio FastUpdate check flags the Resource Designer assembly as
+  newer than the output assembly (which it is). But it causes it to incorrectly
+  think the build is out of date. 
+
+  So lets remove it. We MUST remove the item from the @ReferencePathWithRefAssemblies
+  ItemGroup BEFORE the CollectResolvedCompilationReferencesDesignTime target runs.
+  This is because that target uses the Returns functionality. It turns out you cannot
+  modify the ItemGroup that is being returned via a Returns on a target.
+-->
+<Target Name="_RemoveResourceDesignerFromResolvedComilationReferences"
+      BeforeTargets="CollectResolvedCompilationReferencesDesignTime"
+      Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'"
+>
+  <ItemGroup>
+    <_ResourceDesignerFiles Include="%(ReferencePathWithRefAssemblies.Identity)"
+        Condition="'%(ReferencePathWithRefAssemblies.OriginalPath)' == '$(_GenerateResourceDesignerAssemblyOutput)'"
+    />
+    <ReferencePathWithRefAssemblies Remove="@(_ResourceDesignerFiles)" />
+  </ItemGroup>
+</Target>
+
 <Target Name="_BuildResourceDesigner"
     Condition=" '$(AndroidUseDesignerAssembly)' == 'True' "
     DependsOnTargets="$(_BuildResourceDesignerDependsOn)" />

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
@@ -38,10 +38,10 @@ public void DotNetBuild (string runtimeIdentifiers, bool isRelease, bool aot, bo
 				PackageReferences = {
 					new Package { Id = "Xamarin.AndroidX.AppCompat", Version = "1.3.1.1" },
 					// Using * here, so we explicitly get newer packages
-					new Package { Id = "Microsoft.AspNetCore.Components.WebView", Version = "6.0.0-*" },
-					new Package { Id = "Microsoft.Extensions.FileProviders.Embedded", Version = "6.0.0-*" },
-					new Package { Id = "Microsoft.JSInterop", Version = "6.0.0-*" },
-					new Package { Id = "System.Text.Json", Version = "6.0.0-*" },
+					new Package { Id = "Microsoft.AspNetCore.Components.WebView", Version = "8.0.*" },
+					new Package { Id = "Microsoft.Extensions.FileProviders.Embedded", Version = "8.0.*" },
+					new Package { Id = "Microsoft.JSInterop", Version = "8.0.*" },
+					new Package { Id = "System.Text.Json", Version = "8.0.*" },
 				},
 				Sources = {
 					new BuildItem ("EmbeddedResource", "Foo.resx") {

diff --git a/...ild.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.apkdesc b/...ild.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64SimpleDotNet.apkdesc
@@ -5,49 +5,49 @@
       "Size": 3036
     },
     "classes.dex": {
-      "Size": 19476
+      "Size": 22488
     },
     "lib/arm64-v8a/lib__Microsoft.Android.Resource.Designer.dll.so": {
       "Size": 1027
     },
     "lib/arm64-v8a/lib_Java.Interop.dll.so": {
-      "Size": 64655
+      "Size": 64653
     },
     "lib/arm64-v8a/lib_Mono.Android.dll.so": {
-      "Size": 92217
+      "Size": 92659
     },
     "lib/arm64-v8a/lib_Mono.Android.Runtime.dll.so": {
-      "Size": 5320
+      "Size": 5394
     },
     "lib/arm64-v8a/lib_System.Console.dll.so": {
-      "Size": 6541
+      "Size": 6512
     },
     "lib/arm64-v8a/lib_System.Linq.dll.so": {
-      "Size": 8524
+      "Size": 8489
     },
     "lib/arm64-v8a/lib_System.Private.CoreLib.dll.so": {
-      "Size": 571267
+      "Size": 575506
     },
     "lib/arm64-v8a/lib_System.Runtime.dll.so": {
-      "Size": 2544
+      "Size": 2554
     },
     "lib/arm64-v8a/lib_System.Runtime.InteropServices.dll.so": {
-      "Size": 4020
+      "Size": 3999
     },
     "lib/arm64-v8a/lib_UnnamedProject.dll.so": {
-      "Size": 2931
+      "Size": 2934
     },
     "lib/arm64-v8a/libarc.bin.so": {
       "Size": 1586
     },
     "lib/arm64-v8a/libmono-component-marshal-ilgen.so": {
-      "Size": 87352
+      "Size": 87432
     },
     "lib/arm64-v8a/libmonodroid.so": {
       "Size": 492104
     },
     "lib/arm64-v8a/libmonosgen-2.0.so": {
-      "Size": 3154304
+      "Size": 3163208
     },
     "lib/arm64-v8a/libSystem.Globalization.Native.so": {
       "Size": 67248
@@ -56,13 +56,13 @@
       "Size": 723560
     },
     "lib/arm64-v8a/libSystem.Native.so": {
-      "Size": 95296
+      "Size": 95680
     },
     "lib/arm64-v8a/libSystem.Security.Cryptography.Native.Android.so": {
-      "Size": 155568
+      "Size": 159544
     },
     "lib/arm64-v8a/libxamarin-app.so": {
-      "Size": 17952
+      "Size": 17984
     },
     "META-INF/BNDLTOOL.RSA": {
       "Size": 1223
@@ -98,5 +98,5 @@
       "Size": 1904
     }
   },
-  "PackageSize": 2681365
+  "PackageSize": 2693653
 }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		xamarin/monodroid:main@c6aae9e5a154cfbf2c3a94e046fa2c747c3b82e2
		xamarin/monodroid:main@e11d9a5af8f00a88d15bd87c777608f17c4ece78