Merge branch 'main' into mm-runtime

* main: [ci] Split up signing for files to be notarized (dotnet#7321) [ci] Add support to net7.0 for multi-targeting in VS (dotnet#7311) [ci] Skip classic tests on .NET release branches (dotnet#7312) [tests] Use `$(AndroidSdkPlatformToolsVersion)`=33.0.3 (dotnet#7320) Bump to xamarin/java.interop/main@4f813cb2 (dotnet#7308) Bump to mono/mono.posix@d8994ca, dotnet/android-libzipsharp@98e9173 (dotnet#7309)
grendello · Aug 31, 2022 · e1e59f0 · e1e59f0
2 parents 6b116bf + 7c9c24b
commit e1e59f0
Show file tree

Hide file tree

Showing 20 changed files with 254 additions and 143 deletions.
diff --git a/.external b/.external
@@ -1,2 +1,2 @@
-xamarin/monodroid:main@210073e19b9aa339d2099260e724c1f60df6fd70
+xamarin/monodroid:main@100ccf969e58a633ec85af7627110bab6e9fe13d
 mono/mono:2020-02@dffa5ab92245f2419238a35b7c2052e9a24036b4
diff --git a/Configuration.props b/Configuration.props
@@ -47,7 +47,7 @@
     <DebugType Condition=" '$(DebugType)' == '' ">portable</DebugType>
     <Deterministic Condition=" '$(Deterministic)' == '' ">True</Deterministic>
     <LangVersion Condition=" '$(LangVersion)' == '' ">latest</LangVersion>
-    <AndroidNet6Version Condition=" '$(AndroidNet6Version)' == '' ">32.0.447</AndroidNet6Version>
+    <AndroidNet6Version Condition=" '$(AndroidNet6Version)' == '' ">32.0.465</AndroidNet6Version>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(HostOS)' == '' ">
     <HostOS Condition="$([MSBuild]::IsOSPlatform('windows'))">Windows</HostOS>

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -42,8 +42,8 @@
 
   <!-- Common <PackageReference/> versions -->
   <PropertyGroup>
-    <LibZipSharpVersion>2.0.4</LibZipSharpVersion>
-    <MicroBuildCoreVersion>0.4.1</MicroBuildCoreVersion>
+    <LibZipSharpVersion>2.0.7</LibZipSharpVersion>
+    <MicroBuildCoreVersion>1.0.0</MicroBuildCoreVersion>
     <MonoCecilVersion>0.11.4</MonoCecilVersion>
     <NewtonsoftJsonPackageVersion>13.0.1</NewtonsoftJsonPackageVersion>
     <NuGetApiPackageVersion>5.4.0</NuGetApiPackageVersion>

diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml
@@ -40,6 +40,9 @@ 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: signClassicPkgContent
+  type: boolean
+  default: true             # Queue time variable that can be used to skip classic pkg signing
 
 # Global variables
 variables:
@@ -108,6 +111,7 @@ stages:
     - template: yaml-templates/commercial-build.yaml
       parameters:
         provisionatorChannel: ${{ parameters.provisionatorChannel }}
+        signClassicPkgContent: ${{ parameters.signClassicPkgContent }}
 
     - template: yaml-templates/remove-microbuild-tooling.yaml
       parameters:
@@ -338,6 +342,8 @@ stages:
   # Check - "Xamarin.Android (macOS > Tests > APKs Classic)"
   - job: mac_apk_tests_legacy
     displayName: macOS > Tests > APKs Classic
+    # Disabled on .NET release branches
+    condition: and(succeeded(), not(startsWith(variables['Build.SourceBranch'], '$(DotNetReleaseBranchPrefix)')))
     pool:
       vmImage: $(HostedMacImage)
     timeoutInMinutes: 240
@@ -749,20 +755,24 @@ stages:
   # Xamarin.Android (Smoke Tests MSBuild - Mac-0)
   - template: yaml-templates/run-msbuild-mac-tests.yaml
     parameters:
-      job_name: mac_msbuild_tests_0
-      nunit_categories: '|| cat == SmokeTests'
+      job_name: mac_dotnet_tests_0
+      job_suffix: One .NET
+      nunit_categories: '| (TestCategory = SmokeTests $(DotNetNUnitCategories))'
+      target_framework: $(DotNetStableTargetFramework)
       provisionatorChannel: ${{ parameters.provisionatorChannel }}
 
   # Xamarin.Android (Smoke Tests MSBuild - Win-0)
   - template: yaml-templates\run-msbuild-win-tests.yaml
     parameters:
-      job_name: win_msbuild_tests_0
-      nunit_categories: '|| cat == SmokeTests'
+      job_name: win_dotnet_tests_0
+      job_suffix: One .NET
+      nunit_categories: '| (TestCategory = SmokeTests $(DotNetNUnitCategories))'
+      target_framework: $(DotNetStableTargetFramework)
       provisionatorChannel: ${{ parameters.provisionatorChannel }}
 
   # Check - "Xamarin.Android (macOS > Tests > MSBuild+Emulator)"
   - job: mac_msbuilddevice_tests
-    displayName: macOS > Tests > MSBuild+Emulator
+    displayName: macOS > Tests > MSBuild+Emulator One .NET
     pool:
       vmImage: $(HostedMacImage)
     timeoutInMinutes: 90
@@ -793,9 +803,10 @@ stages:
 
     - template: yaml-templates/run-nunit-tests.yaml
       parameters:
+        useDotNet: true
         testRunTitle: MSBuildDeviceIntegration Smoke - macOS
-        testAssembly: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/MSBuildDeviceIntegration/net472/MSBuildDeviceIntegration.dll
-        nunitConsoleExtraArgs: --where "cat == SmokeTests"
+        testAssembly: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/MSBuildDeviceIntegration/$(DotNetStableTargetFramework)/MSBuildDeviceIntegration.dll
+        nunitConsoleExtraArgs: --filter "TestCategory = SmokeTests $(DotNetNUnitCategories)"
         testResultsFile: TestResult-MSBuildDeviceIntegrationSmoke-$(XA.Build.Configuration).xml
 
     - task: MSBuild@1
@@ -810,7 +821,7 @@ stages:
 
     - template: yaml-templates/upload-results.yaml
       parameters:
-        artifactName: Test Results - MSBuild Smoke With Emulator - macOS
+        artifactName: Test Results - MSBuild Smoke With Emulator - macOS - One .NET
 
     - template: yaml-templates/fail-on-issue.yaml
 
@@ -857,23 +868,22 @@ stages:
 - stage: msbuild_legacy
   displayName: Legacy Tests
   dependsOn: mac_build
-  condition: and(succeeded(), or(eq(variables['RunAllTests'], true), contains(dependencies.mac_build.outputs['mac_build_create_installers.TestConditions.TestAreas'], 'MSBuild')))
+  # Disabled on .NET release branches
+  condition: and(succeeded(), not(startsWith(variables['Build.SourceBranch'], '$(DotNetReleaseBranchPrefix)')), or(eq(variables['RunAllTests'], true), contains(dependencies.mac_build.outputs['mac_build_create_installers.TestConditions.TestAreas'], 'MSBuild')))
   jobs:
   # Xamarin.Android (Test MSBuild Legacy - macOS)
   - template: yaml-templates\run-msbuild-mac-tests.yaml
     parameters:
       node_id: 1
       job_name: mac_msbuild_tests_1
       job_suffix: Legacy
-      nunit_categories: '&& cat != SmokeTests'
       provisionatorChannel: ${{ parameters.provisionatorChannel }}
 
   - template: yaml-templates\run-msbuild-mac-tests.yaml
     parameters:
       node_id: 2
       job_name: mac_msbuild_tests_2
       job_suffix: Legacy
-      nunit_categories: '&& cat != SmokeTests'
       run_extra_tests: true
       provisionatorChannel: ${{ parameters.provisionatorChannel }}
 
@@ -882,31 +892,27 @@ stages:
       node_id: 3
       job_name: mac_msbuild_tests_3
       job_suffix: Legacy
-      nunit_categories: '&& cat != SmokeTests'
       provisionatorChannel: ${{ parameters.provisionatorChannel }}
 
   - template: yaml-templates\run-msbuild-mac-tests.yaml
     parameters:
       node_id: 4
       job_name: mac_msbuild_tests_4
       job_suffix: Legacy
-      nunit_categories: '&& cat != SmokeTests'
       provisionatorChannel: ${{ parameters.provisionatorChannel }}
 
   - template: yaml-templates\run-msbuild-mac-tests.yaml
     parameters:
       node_id: 5
       job_name: mac_msbuild_tests_5
       job_suffix: Legacy
-      nunit_categories: '&& cat != SmokeTests'
       provisionatorChannel: ${{ parameters.provisionatorChannel }}
 
   - template: yaml-templates\run-msbuild-mac-tests.yaml
     parameters:
       node_id: 6
       job_name: mac_msbuild_tests_6
       job_suffix: Legacy
-      nunit_categories: '&& cat != SmokeTests'
       provisionatorChannel: ${{ parameters.provisionatorChannel }}
 
   # Xamarin.Android (Test MSBuild Legacy - Windows)
@@ -916,7 +922,6 @@ stages:
       additional_node_id: 4
       job_name: win_msbuild_tests_1
       job_suffix: Legacy
-      nunit_categories: '&& cat != SmokeTests'
       provisionatorChannel: ${{ parameters.provisionatorChannel }}
 
   - template: yaml-templates\run-msbuild-win-tests.yaml
@@ -925,7 +930,6 @@ stages:
       additional_node_id: 5
       job_name: win_msbuild_tests_2
       job_suffix: Legacy
-      nunit_categories: '&& cat != SmokeTests'
       run_extra_tests: true
       provisionatorChannel: ${{ parameters.provisionatorChannel }}
 
@@ -935,7 +939,6 @@ stages:
       additional_node_id: 6
       job_name: win_msbuild_tests_3
       job_suffix: Legacy
-      nunit_categories: '&& cat != SmokeTests'
       provisionatorChannel: ${{ parameters.provisionatorChannel }}
 
 - stage: msbuild_dotnet
@@ -949,7 +952,7 @@ stages:
       node_id: 1
       job_name: mac_dotnet_tests_1
       job_suffix: One .NET
-      nunit_categories: $(DotNetNUnitCategories)
+      nunit_categories: $(DotNetNUnitCategories) & TestCategory != SmokeTests
       target_framework: $(DotNetStableTargetFramework)
       provisionatorChannel: ${{ parameters.provisionatorChannel }}
 
@@ -958,7 +961,7 @@ stages:
       node_id: 2
       job_name: mac_dotnet_tests_2
       job_suffix: One .NET
-      nunit_categories: $(DotNetNUnitCategories)
+      nunit_categories: $(DotNetNUnitCategories) & TestCategory != SmokeTests
       target_framework: $(DotNetStableTargetFramework)
       provisionatorChannel: ${{ parameters.provisionatorChannel }}
 
@@ -967,7 +970,7 @@ stages:
       node_id: 3
       job_name: mac_dotnet_tests_3
       job_suffix: One .NET
-      nunit_categories: $(DotNetNUnitCategories)
+      nunit_categories: $(DotNetNUnitCategories) & TestCategory != SmokeTests
       target_framework: $(DotNetStableTargetFramework)
       provisionatorChannel: ${{ parameters.provisionatorChannel }}
 
@@ -976,7 +979,7 @@ stages:
       node_id: 4
       job_name: mac_dotnet_tests_4
       job_suffix: One .NET
-      nunit_categories: $(DotNetNUnitCategories)
+      nunit_categories: $(DotNetNUnitCategories) & TestCategory != SmokeTests
       target_framework: $(DotNetStableTargetFramework)
       provisionatorChannel: ${{ parameters.provisionatorChannel }}
 
@@ -985,7 +988,7 @@ stages:
       node_id: 5
       job_name: mac_dotnet_tests_5
       job_suffix: One .NET
-      nunit_categories: $(DotNetNUnitCategories)
+      nunit_categories: $(DotNetNUnitCategories) & TestCategory != SmokeTests
       target_framework: $(DotNetStableTargetFramework)
       provisionatorChannel: ${{ parameters.provisionatorChannel }}
 
@@ -994,7 +997,7 @@ stages:
       node_id: 6
       job_name: mac_dotnet_tests_6
       job_suffix: One .NET
-      nunit_categories: $(DotNetNUnitCategories)
+      nunit_categories: $(DotNetNUnitCategories) & TestCategory != SmokeTests
       target_framework: $(DotNetStableTargetFramework)
       provisionatorChannel: ${{ parameters.provisionatorChannel }}
 
@@ -1005,7 +1008,7 @@ stages:
       additional_node_id: 4
       job_name: win_dotnet_tests_1
       job_suffix: One .NET
-      nunit_categories: $(DotNetNUnitCategories)
+      nunit_categories: $(DotNetNUnitCategories) & TestCategory != SmokeTests
       target_framework: $(DotNetStableTargetFramework)
       provisionatorChannel: ${{ parameters.provisionatorChannel }}
 
@@ -1015,7 +1018,7 @@ stages:
       additional_node_id: 5
       job_name: win_dotnet_tests_2
       job_suffix: One .NET
-      nunit_categories: $(DotNetNUnitCategories)
+      nunit_categories: $(DotNetNUnitCategories) & TestCategory != SmokeTests
       target_framework: $(DotNetStableTargetFramework)
       provisionatorChannel: ${{ parameters.provisionatorChannel }}
 
@@ -1025,7 +1028,7 @@ stages:
       additional_node_id: 6
       job_name: win_dotnet_tests_3
       job_suffix: One .NET
-      nunit_categories: $(DotNetNUnitCategories)
+      nunit_categories: $(DotNetNUnitCategories) & TestCategory != SmokeTests
       target_framework: $(DotNetStableTargetFramework)
       provisionatorChannel: ${{ parameters.provisionatorChannel }}
 
@@ -1042,6 +1045,7 @@ stages:
       job_suffix: Legacy
       nunit_categories: '&& cat != Debugger'
       provisionatorChannel: ${{ parameters.provisionatorChannel }}
+      jobCondition: and(succeeded(), not(startsWith(variables['Build.SourceBranch'], '$(DotNetReleaseBranchPrefix)')))
 
   - template: yaml-templates/run-msbuild-device-tests.yaml
     parameters:
@@ -1050,6 +1054,7 @@ stages:
       job_suffix: Legacy
       nunit_categories: '&& cat != Debugger'
       provisionatorChannel: ${{ parameters.provisionatorChannel }}
+      jobCondition: and(succeeded(), not(startsWith(variables['Build.SourceBranch'], '$(DotNetReleaseBranchPrefix)')))
 
   - template: yaml-templates/run-msbuild-device-tests.yaml
     parameters:
@@ -1058,6 +1063,7 @@ stages:
       job_suffix: Legacy
       nunit_categories: '&& cat != Debugger'
       provisionatorChannel: ${{ parameters.provisionatorChannel }}
+      jobCondition: and(succeeded(), not(startsWith(variables['Build.SourceBranch'], '$(DotNetReleaseBranchPrefix)')))
 
   - template: yaml-templates/run-msbuild-device-tests.yaml
     parameters:
@@ -1067,6 +1073,7 @@ stages:
       jdkTestFolder: $(XA.Jdk11.Folder)
       nunit_categories: '&& cat == Debugger'
       provisionatorChannel: ${{ parameters.provisionatorChannel }}
+      jobCondition: and(succeeded(), not(startsWith(variables['Build.SourceBranch'], '$(DotNetReleaseBranchPrefix)')))
 
   # Check - "Xamarin.Android (macOS > Tests > MSBuild+Emulator One .NET #N)"
   - template: yaml-templates/run-msbuild-device-tests.yaml
@@ -1348,7 +1355,8 @@ stages:
 - stage: bcl_tests
   displayName: BCL Emulator Tests
   dependsOn: mac_build
-  condition: and(succeeded(), or(eq(variables['RunAllTests'], true), contains(dependencies.mac_build.outputs['mac_build_create_installers.TestConditions.TestAreas'], 'BCL')))
+  # Disabled on .NET release branches
+  condition: and(succeeded(), not(startsWith(variables['Build.SourceBranch'], '$(DotNetReleaseBranchPrefix)')), or(eq(variables['RunAllTests'], true), contains(dependencies.mac_build.outputs['mac_build_create_installers.TestConditions.TestAreas'], 'BCL')))
   jobs:
   # Check - "Xamarin.Android (macOS > Tests > BCL (Emulator))"
   - job: mac_bcl_tests
@@ -1441,7 +1449,7 @@ stages:
       usePipelineArtifactTasks: true
 
   # Check - "Xamarin.Android (Prepare .NET Release Convert NuGet to MSI)"
-  - template: nuget-msi-convert/job/v2.yml@yaml
+  - template: nuget-msi-convert/job/v3.yml@yaml
     parameters:
       yamlResourceName: yaml
       dependsOn: sign_net_mac_win
@@ -1450,8 +1458,6 @@ stages:
         !*Darwin*
       propsArtifactName: $(NuGetArtifactName)
       signType: $(MicroBuildSignType)
-      runInParallel: false
-      useDateTimeVersion: true
       postConvertSteps:
       - task: DownloadPipelineArtifact@2
         inputs:
@@ -1536,6 +1542,20 @@ stages:
             artifactName: vsdrop-signed
             downloadPath: $(Build.StagingDirectory)\$(VSDropCommitStatusName)
 
+    - template: templates\common\upload-vs-insertion-artifacts.yml@sdk-insertions
+      parameters:
+        githubToken: $(GitHub.Token)
+        githubContext: $(MultiTargetVSDropCommitStatusName)
+        blobName: $(MultiTargetVSDropCommitStatusName)
+        packagePrefix: xamarin-android
+        artifactsPath: $(Build.StagingDirectory)\$(MultiTargetVSDropCommitStatusName)
+        yamlResourceName: yaml
+        downloadSteps:
+        - task: DownloadPipelineArtifact@2
+          inputs:
+            artifactName: vsdrop-multitarget-signed
+            downloadPath: $(Build.StagingDirectory)\$(MultiTargetVSDropCommitStatusName)
+
     - powershell: >-
         & dotnet build -v:n -c $(XA.Build.Configuration)
         -t:PushManifestToBuildAssetRegistry