Merge branch 'main' into dev/grendel/assembly-blobs-per-rid

* main:
  [ci] Stop building monodroid in builds from forks (#8444)
  [docs] Don't overwrite xml produced by docs build (#8451)
  Bump NDK to r26b (#8450)
  [Tests] Fix TestResolveToolsExists on .NET (#8445)

Author: grendello

build-tools/automation/azure-pipelines.yaml

@@ -37,9 +37,6 @@ resources:
     endpoint: xamarin
 
 parameters:
-- name: provisionatorChannel
-  type: string
-  default: latest           # Support for launching a build against a Provisionator PR (e.g., pr/[github-account-name]/[pr-number]) as a means to test in-progress Provisionator changes
 - name: macTestAgentsUseCleanImages   # Test agents we do not need to clean up when finished because they are not reused
   default: true
 
@@ -83,8 +80,6 @@ variables:
 # Stage and Job "display names" are shortened because they are combined to form the name of the corresponding GitHub check.
 stages:
 - template: yaml-templates/build-macos.yaml
-  parameters:
-    provisionatorChannel: ${{ parameters.provisionatorChannel }}
 
 - template: yaml-templates/build-windows.yaml
 
@@ -107,7 +102,6 @@ stages:
     - template: yaml-templates/setup-test-environment.yaml
       parameters:
         provisionClassic: false
-        provisionatorChannel: ${{ parameters.provisionatorChannel }}
         installLegacyDotNet: false
         restoreNUnitConsole: false
         updateMono: false
@@ -267,8 +261,6 @@ stages:
     - template: yaml-templates/setup-ubuntu.yaml
 
     - template: yaml-templates/setup-test-environment.yaml
-      parameters:
-        provisionatorChannel: ${{ parameters.provisionatorChannel }}
 
     - task: DownloadPipelineArtifact@2
       inputs:
@@ -347,7 +339,6 @@ stages:
       parameters:
         xaSourcePath: $(Build.SourcesDirectory)/xamarin-android
         provisionClassic: false
-        provisionatorChannel: ${{ parameters.provisionatorChannel }}
         installLegacyDotNet: false
         restoreNUnitConsole: false
         updateMono: false

build-tools/automation/yaml-templates/build-macos.yaml

@@ -11,7 +11,6 @@ parameters:
   jobName: mac_build_create_installers
   jobDisplayName: macOS > Build
   nugetArtifactName: $(NuGetArtifactName)
-  provisionatorChannel: latest
   repositoryAlias: self
   stageName: mac_build
   stageDisplayName: Mac
@@ -49,7 +48,6 @@ stages:
       parameters:
         installerArtifactName: ${{ parameters.installerArtifactName }}
         nugetArtifactName: ${{ parameters.nugetArtifactName }}
-        provisionatorChannel: ${{ parameters.provisionatorChannel }}
         testAssembliesArtifactName: ${{ parameters.testAssembliesArtifactName }}
 
     - powershell: |

build-tools/automation/yaml-templates/commercial-build.yaml

@@ -3,7 +3,6 @@ parameters:
   xaSourcePath: $(System.DefaultWorkingDirectory)/xamarin-android
   makeMSBuildArgs: ''
   nugetArtifactName: $(NuGetArtifactName)
-  provisionatorChannel: latest
   testAssembliesArtifactName: $(TestAssembliesArtifactName)
 
 steps:
@@ -19,55 +18,49 @@ steps:
   inputs:
     forceReinstallCredentialProvider: true
 
-- task: provisionator@2
-  displayName: Install Xcode
-  inputs:
-    github_token: $(GitHub.Token)
-    provisioning_script: ${{ parameters.xaSourcePath }}/build-tools/provisioning/xcode.csx
-    provisioning_extra_args: '-v -v -v -v'
-  env:
-    PROVISIONATOR_CHANNEL: ${{ parameters.provisionatorChannel }}
-
 - script: make prepare-update-mono CONFIGURATION=$(XA.Build.Configuration) PREPARE_CI=1 PREPARE_AUTOPROVISION=1
   workingDirectory: ${{ parameters.xaSourcePath }}
   displayName: make prepare-update-mono
 
-# Clone 'monodroid' without submodules
-- checkout: monodroid
-  clean: true
-  path: s/xamarin-android/external/monodroid
-
-# Tell git to ignore the 'xamarin-android' submodule, which is large and unneeded
-- script: git config submodule."external/xamarin-android".update none
-  workingDirectory: xamarin-android/external/monodroid
-  displayName: Ignore XA submodule
-
-# Clone 'monodroid' with the rest of the submodules
-- checkout: monodroid
-  submodules: recursive
-  path: s/xamarin-android/external/monodroid
-  persistCredentials: true
-
-- script: rm -rf external/monodroid/external/xamarin-android
-  workingDirectory: ${{ parameters.xaSourcePath }}
-  displayName: delete legacy xamarin-android submodule
-
-- script: rm -rf external/opentk
-  workingDirectory: ${{ parameters.xaSourcePath }}
-  displayName: delete legacy opentk submodule
-
-- script: rm -rf external/sqlite
-  workingDirectory: ${{ parameters.xaSourcePath }}
-  displayName: delete legacy sqlite submodule
+# Always checkout a second resource to ensure we are using multi-repo checkout behavior
+#  https://learn.microsoft.com/en-us/azure/devops/pipelines/repos/multi-repo-checkout?view=azure-devops#checkout-path
+- checkout: yaml-templates
+
+- ${{ if ne(variables['System.PullRequest.IsFork'], 'True') }}:
+  - script: >
+      ls -l /Applications &&
+      sudo xcode-select --switch /Applications/Xcode_14.2.app &&
+      xcode-select --print-path
+    displayName: Use Xcode 14.2
+
+  # Clone 'monodroid' without submodules
+  - checkout: monodroid
+    clean: true
+    path: s/xamarin-android/external/monodroid
+
+  # Tell git to ignore the 'xamarin-android' submodule, which is large and unneeded
+  - script: git config submodule."external/xamarin-android".update none
+    workingDirectory: xamarin-android/external/monodroid
+    displayName: Ignore XA submodule
+
+  # Clone 'monodroid' with the rest of the submodules
+  - checkout: monodroid
+    submodules: recursive
+    path: s/xamarin-android/external/monodroid
+    persistCredentials: true
+
+  - script: rm -rf external/monodroid/external/xamarin-android
+    workingDirectory: ${{ parameters.xaSourcePath }}
+    displayName: delete legacy xamarin-android submodule
+
+  - script: make prepare-external-git-dependencies PREPARE_CI=1 CONFIGURATION=$(XA.Build.Configuration)
+    workingDirectory: ${{ parameters.xaSourcePath }}
+    displayName: make prepare-external-git-dependencies
 
 - task: CodeQL3000Init@0
   displayName: CodeQL 3000 Init
   condition: and(succeeded(), eq(variables['Codeql.Enabled'], 'true'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
 
-- script: make prepare-external-git-dependencies PREPARE_CI=1 CONFIGURATION=$(XA.Build.Configuration)
-  workingDirectory: ${{ parameters.xaSourcePath }}
-  displayName: make prepare-external-git-dependencies
-
 # Prepare and Build everything
 - script: make jenkins CONFIGURATION=$(XA.Build.Configuration) PREPARE_CI=1 PREPARE_AUTOPROVISION=1 MSBUILD_ARGS='${{ parameters.makeMSBuildArgs }}'
   workingDirectory: ${{ parameters.xaSourcePath }}

build-tools/automation/yaml-templates/run-installer.yaml

@@ -1,6 +1,5 @@
 parameters:
   provisionExtraArgs: -vv -f
-  provisionatorChannel: latest
 
 steps:
 - task: DownloadPipelineArtifact@2
@@ -38,6 +37,4 @@ steps:
     provisioning_script: $(XA.Provisionator.Args)
     provisioning_extra_args: ${{ parameters.provisionExtraArgs }}
   # Disabled on Windows on .NET release branches
-  condition: and(succeeded(), ne(variables['agent.os'], 'Linux'), or(eq(variables.IsRelOrTargetingRel, 'False'), eq(variables['agent.os'], 'Darwin')))
-  env:
-    PROVISIONATOR_CHANNEL: ${{ parameters.provisionatorChannel }}
+  condition: and(succeeded(), ne(variables['System.PullRequest.IsFork'], 'True'), ne(variables['agent.os'], 'Linux'), or(eq(variables.IsRelOrTargetingRel, 'False'), eq(variables['agent.os'], 'Darwin')))

build-tools/automation/yaml-templates/setup-test-environment.yaml

@@ -1,7 +1,6 @@
 parameters:
   configuration: $(XA.Build.Configuration)
   xaSourcePath: $(System.DefaultWorkingDirectory)
-  updateVS: false
   jdkTestFolder: $(JAVA_HOME_11_X64)
   remove_dotnet: false
   installTestSlicer: false
@@ -24,11 +23,6 @@ steps:
     clean: true
     submodules: recursive
 
-- ${{ if eq(parameters.updateVS, true) }}:
-  - template: update-vs.yaml
-    parameters: 
-      xasourcePath: ${{ parameters.xaSourcePath }}
-
 - script: |
     echo "##vso[task.setvariable variable=JI_JAVA_HOME]${{ parameters.jdkTestFolder }}"
     echo "##vso[task.setvariable variable=DOTNET_TOOL_PATH]${{ parameters.xaSourcePath }}/bin/${{ parameters.configuration }}/dotnet/dotnet"

build-tools/automation/yaml-templates/update-vs.yaml

@@ -29,29 +29,11 @@
       <_EarlierFrameworkDir Include="@(_FrameworkDirsThatExist)" Exclude="$(_LatestStableFrameworkDir)" />
     </ItemGroup>
   </Target>
-  <Target Name="_WriteVersionFiles"
-      DependsOnTargets="GetXAVersionInfo" >
-    <WriteLinesToFile
-        File="$(MicrosoftAndroidSdkOutDir)Version"
-        Lines="$(ProductVersion)"
-        Overwrite="True"
-    />
-    <WriteLinesToFile
-        File="$(MicrosoftAndroidSdkOutDir)Version.commit"
-        Lines="$(XARepositoryName)/$(XAVersionBranch)/$(XAVersionHash)"
-        Overwrite="True"
-    />
-    <WriteLinesToFile
-        File="$(MicrosoftAndroidSdkOutDir)Version.rev"
-        Lines="$(XAVersionCommitCount)"
-        Overwrite="True"
-    />
-    <ItemGroup>
-      <VersionFiles Include="$(MicrosoftAndroidSdkOutDir)Version" />
-      <VersionFiles Include="$(MicrosoftAndroidSdkOutDir)Version.commit" />
-      <VersionFiles Include="$(MicrosoftAndroidSdkOutDir)Version.rev" />
-    </ItemGroup>
-  </Target>
+  <ItemGroup>
+    <VersionFiles Include="$(MicrosoftAndroidSdkOutDir)Version" />
+    <VersionFiles Include="$(MicrosoftAndroidSdkOutDir)Version.commit" />
+    <VersionFiles Include="$(MicrosoftAndroidSdkOutDir)Version.rev" />
+  </ItemGroup>
   <ItemGroup>
     <_DesignerFilesUnix Include="$(LegacyMSBuildSrcDir)$(HostOS)\bcl\**\*" />
     <_DesignerFilesWin Include="$(LegacyMSBuildSrcDir)bcl\**\* "/>
@@ -369,7 +351,7 @@
   <Import Project="$(_MonoDroidPath)\tools\scripts\installer-files.projitems" Condition=" '$(_HasCommercialFiles)' == 'True' And Exists ('$(_MonoDroidPath)\tools\scripts\installer-files.projitems') " />
   <!-- end monodroid -->
   <Target Name="ConstructInstallerItems"
-      DependsOnTargets="_FindFrameworkDirs;_WriteVersionFiles"
+      DependsOnTargets="_FindFrameworkDirs"
       Returns="@(FrameworkItemsWin);@(FrameworkItemsUnix);@(MSBuildItemsWin);@(LegacyMSBuildItemsWin);@(MSBuildItemsUnix);@(LegacyMSBuildItemsUnix)">
     <ItemGroup>
       <_FrameworkFiles Include="@(_FrameworkDirsThatExist->'%(Identity)\AndroidApiInfo.xml')" />

build-tools/installers/create-installers.targets

@@ -241,6 +241,7 @@
     <DocsApiLevel Condition=" '$(DocsApiLevel)' == '' ">34</DocsApiLevel>
     <DocsPlatformId Condition=" '$(DocsPlatformId)' == '' ">$(DocsApiLevel)</DocsPlatformId>
     <DocsFxMoniker Condition=" '$(DocsFxMoniker)' == '' ">net-android-$(DocsApiLevel).0</DocsFxMoniker>
+    <DocsExportOutput Condition=" '$(DocsExportOutput)' == '' ">$(_MonoAndroidNETDefaultOutDir)Mono.Android.xml</DocsExportOutput>
     <_LogPrefix>$(MSBuildThisFileDirectory)../../bin/Build$(Configuration)/UpdateApiDocs-$([System.DateTime]::Now.ToString ("yyyyMMddTHHmmss"))</_LogPrefix>
     <_Mdoc Condition=" '$(Pkgmdoc)' != '' ">"$(Pkgmdoc)/tools/mdoc.exe"</_Mdoc>
     <_Mdoc Condition=" '$(Pkgmdoc)' == '' ">"$(XAPackagesDir)/mdoc/$(MdocPackageVersion)/tools/mdoc.exe"</_Mdoc>
@@ -249,7 +250,7 @@
   <!-- Generate documentation using MDoc -->
   <Target Name="UpdateExternalDocumentation">
     <MSBuild Projects="$(MSBuildThisFileDirectory)Mono.Android.csproj"
-        Properties="TargetFramework=$(DotNetTargetFramework)"
+        Properties="TargetFramework=$(DotNetTargetFramework);DocsExportOutput=$(BaseIntermediateOutputPath)Mono.Android.temp.xml"
         Targets="_UpdateExternalDocumentation;_RunMdoc;_ExportMsxDoc;_GenerateApiDocsDiff"
     />
   </Target>
@@ -286,7 +287,7 @@
       <_FxConfig>-fx "$(_RootFxDir)"</_FxConfig>
       <_Lang>--lang fsharp</_Lang>
       <!-- $(FrameworksXmlContent) describes the docs versions found at android-api-docs/tree/master/docs/Mono.Android/en/FrameworksIndex/
-            and https://docs.microsoft.com/en-us/dotnet/api/android?view=xamarin-android-sdk-9 -->
+            and https://learn.microsoft.com/en-us/dotnet/api/android?view=xamarin-android-sdk-13 -->
       <FrameworksXmlContent>
 <![CDATA[
 <Frameworks>
@@ -296,7 +297,7 @@
       </FrameworksXmlContent>
     </PropertyGroup>
     <!-- Create a temporary directory which contains frameworks.xml and our framework assembly.
-         Copy Mono.Android.dll and Java.Interop.dll to the %(Source) path described in frameworks.xml (e.g. xamarin-android-sdk-12) -->
+         Copy Mono.Android.dll and Java.Interop.dll to the %(Source) path described in frameworks.xml (e.g. net-android-34.0) -->
     <RemoveDir Directories="$(_RootFxDir)" />
     <MakeDir Directories="$(_RootFxDir)" />
     <MakeDir Directories="$(_RootFxDir)$(DocsFxMoniker)" />
@@ -338,9 +339,9 @@
   <Target Name="_ExportMsxDoc"
       DependsOnTargets="_FindDocSourceFiles"
       Inputs="@(_MsxDocSourceFile)"
-      Outputs="$(_MonoAndroidNETDefaultOutDir)Mono.Android.xml">
+      Outputs="$(DocsExportOutput)">
     <Exec
-        Command="$(ManagedRuntime) $(ManagedRuntimeArgs) $(_Mdoc) --debug export-msxdoc -o &quot;$(_MonoAndroidNETDefaultOutDir)Mono.Android.xml&quot; &quot;$(XamarinAndroidSourcePath)external/android-api-docs/docs/Mono.Android/en/&quot;"
+        Command="$(ManagedRuntime) $(ManagedRuntimeArgs) $(_Mdoc) --debug export-msxdoc -o &quot;$(DocsExportOutput)&quot; &quot;$(XamarinAndroidSourcePath)external/android-api-docs/docs/Mono.Android/en/&quot;"
     />
   </Target>
 

build-tools/provisioning/vs2019.csx

@@ -124,7 +124,7 @@ public partial class BuildTest : BaseTest
 				/* debugSymbols */     true ,
 				/* optimize */         true ,
 				/* embedassebmlies */  false ,
-				/* expectedResult */   CommercialBuildAvailable ? "debug" : "release",
+				/* expectedResult */   TestEnvironment.CommercialBuildAvailable ? "debug" : "release",
 			},
 			new object[] {
 				/* supportedAbi */     "armeabi-v7a",
@@ -145,7 +145,7 @@ public partial class BuildTest : BaseTest
 				/* debugSymbols */     false ,
 				/* optimize */         null ,
 				/* embedassebmlies */  null ,
-				/* expectedResult */   CommercialBuildAvailable ? "debug" : "release",
+				/* expectedResult */   TestEnvironment.CommercialBuildAvailable ? "debug" : "release",
 			},
 		};
 #pragma warning restore 414

build-tools/provisioning/xcode.csx

@@ -139,12 +139,12 @@ public void DotNetBuild (string runtimeIdentifiers, bool isRelease, bool aot, bo
 			Assert.AreEqual (XABuildConfig.AndroidDefaultTargetDotnetApiLevel.ToString(),
 				uses_sdk.Attribute (ns + "targetSdkVersion").Value);
 
-			bool expectEmbeddedAssembies = !(CommercialBuildAvailable && !isRelease);
+			bool expectEmbeddedAssembies = !(TestEnvironment.CommercialBuildAvailable && !isRelease);
 			var apkPath = Path.Combine (outputPath, $"{proj.PackageName}-Signed.apk");
 			FileAssert.Exists (apkPath);
 			var helper = new ArchiveAssemblyHelper (apkPath, usesAssemblyStore, rids);
 			helper.AssertContainsEntry ($"assemblies/{proj.ProjectName}.dll", shouldContainEntry: expectEmbeddedAssembies);
-			helper.AssertContainsEntry ($"assemblies/{proj.ProjectName}.pdb", shouldContainEntry: !CommercialBuildAvailable && !isRelease);
+			helper.AssertContainsEntry ($"assemblies/{proj.ProjectName}.pdb", shouldContainEntry: !TestEnvironment.CommercialBuildAvailable && !isRelease);
 			helper.AssertContainsEntry ($"assemblies/Mono.Android.dll",        shouldContainEntry: expectEmbeddedAssembies);
 			helper.AssertContainsEntry ($"assemblies/es/{proj.ProjectName}.resources.dll", shouldContainEntry: expectEmbeddedAssembies);
 			foreach (var abi in rids.Select (AndroidRidAbiHelper.RuntimeIdentifierToAbi)) {
@@ -1030,6 +1030,8 @@ public void MicrosoftExtensionsHttp ()
 		[Test]
 		public void FastDeploymentDoesNotAddContentProvider ()
 		{
+			AssertCommercialBuild ();
+
 			var proj = new XamarinAndroidApplicationProject {
 				EmbedAssembliesIntoApk = false,
 			};

src/Mono.Android/Mono.Android.targets

@@ -605,11 +605,10 @@ public void DuplicateManagedNames ()
 		}
 
 		[Test]
-		[Category ("Commercial")]
 		public void LibraryProjectsShouldSkipGetPrimaryCpuAbi ()
 		{
-			if (!CommercialBuildAvailable)
-				Assert.Ignore ("Not required on Open Source Builds");
+			AssertCommercialBuild ();
+
 			const string target = "_GetPrimaryCpuAbi";
 			var proj = new XamarinAndroidLibraryProject ();
 			using (var b = CreateDllBuilder (Path.Combine ("temp", TestName))) {
@@ -619,10 +618,10 @@ public void LibraryProjectsShouldSkipGetPrimaryCpuAbi ()
 		}
 
 		[Test]
-		[Category ("Commercial")]
 		public void LibraryReferenceWithHigherTFVShouldDisplayWarning ([Values (true, false)] bool isRelease)
 		{
-			if (!CommercialBuildAvailable || Builder.UseDotNet)
+
+			if (!TestEnvironment.CommercialBuildAvailable || Builder.UseDotNet)
 				Assert.Ignore ("Not applicable to One .NET or single framework OSS builds.");
 
 			var libproj = new XamarinAndroidLibraryProject () {