From c87fe3d0dc63711d7c47e5c870245d41885e90f8 Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Wed, 28 Apr 2021 12:58:04 -0400 Subject: [PATCH 1/9] [One .NET] Target net6.0 instead of netcoreapp3.1 Projects which were multitargetd to support .NET 6 have been updated to target `net6.0` instead of `netcoreapp3.1`. CI has been updated to install .NET 6 preview 3 instead of .NET 5. --- .../CheckApiCompatibility.cs | 2 +- .../automation/azure-pipelines-nightly.yaml | 2 +- .../automation/azure-pipelines-oss.yaml | 6 +---- build-tools/automation/azure-pipelines.yaml | 26 +++++++------------ .../yaml-templates/commercial-build.yaml | 1 - .../run-msbuild-device-tests.yaml | 2 +- .../yaml-templates/run-msbuild-mac-tests.yaml | 6 ++--- .../yaml-templates/run-msbuild-win-tests.yaml | 6 ++--- .../setup-test-environment.yaml | 7 ----- .../yaml-templates/use-dot-net.yaml | 2 +- .../create-packs/Directory.Build.targets | 2 +- .../create-packs/Microsoft.Android.Sdk.proj | 2 +- .../Configuration.Java.Interop.Override.props | 2 +- .../scripts/JavaCallableWrappers.targets | 4 +-- build-tools/scripts/NUnitReferences.projitems | 2 +- .../scripts/UpdateApkSizeReference.ps1 | 2 +- .../xaprepare/ConfigAndData/Configurables.cs | 2 +- global.json | 3 +++ .../Microsoft.Android.Sdk.ILLink.csproj | 2 +- .../Mono.Android.Export.csproj | 8 +++--- src/Mono.Android/Mono.Android.csproj | 10 +++---- src/Mono.Android/Mono.Android.targets | 2 +- .../Utilities/BaseTest.cs | 2 +- .../Xamarin.Android.Build.Tests.csproj | 2 +- ...n.Android.NamingCustomAttributes.projitems | 4 +-- .../MSBuildDeviceIntegration.csproj | 2 +- tools/javadoc2mdoc/javadoc2mdoc.csproj | 2 +- 27 files changed, 49 insertions(+), 64 deletions(-) diff --git a/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/CheckApiCompatibility.cs b/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/CheckApiCompatibility.cs index 5443421a555..697d1e9fd19 100644 --- a/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/CheckApiCompatibility.cs +++ b/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/CheckApiCompatibility.cs @@ -33,7 +33,7 @@ public sealed class CheckApiCompatibility : Task static readonly string assemblyToValidate = "Mono.Android.dll"; - static readonly string netCoreAppVersion = "netcoreapp3.1"; + static readonly string netCoreAppVersion = "net6.0"; static string compatApiCommand = null; // Path where Microsoft.DotNet.ApiCompat nuget package is located diff --git a/build-tools/automation/azure-pipelines-nightly.yaml b/build-tools/automation/azure-pipelines-nightly.yaml index 5a1c0c9c6b2..de6dbec6099 100644 --- a/build-tools/automation/azure-pipelines-nightly.yaml +++ b/build-tools/automation/azure-pipelines-nightly.yaml @@ -40,7 +40,7 @@ variables: InstallerArtifactName: installers-unsigned TestAssembliesArtifactName: test-assemblies DotNetCoreVersion: 3.1.405 - DotNet5Version: 5.0.201 + DotNet6Version: 6.0.100-preview.3.21202.5 HostedMacImage: macOS-10.15 GitHub.Token: $(github--pat--vs-mobiletools-engineering-service2) NUnit.NumberOfTestWorkers: 4 diff --git a/build-tools/automation/azure-pipelines-oss.yaml b/build-tools/automation/azure-pipelines-oss.yaml index 8aea9636787..adaeb1fd029 100644 --- a/build-tools/automation/azure-pipelines-oss.yaml +++ b/build-tools/automation/azure-pipelines-oss.yaml @@ -27,7 +27,7 @@ variables: EXTRA_MSBUILD_ARGS: /p:AutoProvision=True /p:AutoProvisionUsesSudo=True /p:IgnoreMaxMonoVersion=False PREPARE_FLAGS: PREPARE_CI=1 PREPARE_CI_PR=1 DotNetCoreVersion: 3.1.405 - DotNet5Version: 5.0.201 + DotNet6Version: 6.0.100-preview.3.21202.5 GitHub.Token: $(github--pat--vs-mobiletools-engineering-service2) stages: @@ -54,7 +54,6 @@ stages: - template: yaml-templates/use-dot-net.yaml parameters: - version: $(DotNet5Version) remove_dotnet: true - template: yaml-templates/use-dot-net.yaml @@ -174,9 +173,6 @@ stages: submodules: recursive - template: yaml-templates/use-dot-net.yaml - parameters: - version: $(DotNet5Version) - remove_dotnet: true - template: yaml-templates/use-dot-net.yaml parameters: diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index c8fa220eb75..d8e2b75ec94 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -54,7 +54,7 @@ variables: TestAssembliesArtifactName: test-assemblies NUnitConsoleVersion: 3.11.1 DotNetCoreVersion: 3.1.405 - DotNet5Version: 5.0.201 + DotNet6Version: 6.0.100-preview.3.21202.5 HostedMacImage: macOS-10.15 HostedWinVS2019: Hosted Windows 2019 with VS2019 VSEngWinVS2019: Xamarin-Android-Win2019 @@ -193,8 +193,6 @@ stages: displayName: set JI_JAVA_HOME - template: yaml-templates\use-dot-net.yaml - parameters: - version: $(DotNet5Version) - template: yaml-templates\use-dot-net.yaml parameters: @@ -319,8 +317,6 @@ stages: displayName: set JI_JAVA_HOME - template: yaml-templates\use-dot-net.yaml - parameters: - version: $(DotNet5Version) - template: yaml-templates\use-dot-net.yaml parameters: @@ -411,7 +407,7 @@ stages: parameters: useDotNet: true testRunTitle: Smoke MSBuild Tests - Windows Dotnet Build - testAssembly: $(System.DefaultWorkingDirectory)\bin\Test$(XA.Build.Configuration)\netcoreapp3.1\Xamarin.Android.Build.Tests.dll + testAssembly: $(System.DefaultWorkingDirectory)\bin\Test$(XA.Build.Configuration)\net6.0\Xamarin.Android.Build.Tests.dll testResultsFile: TestResult-SmokeMSBuildTests-WinDotnetBuildTree-$(XA.Build.Configuration).xml dotNetTestExtraArgs: --filter "TestCategory = SmokeTests $(DotNetNUnitCategories)" @@ -449,8 +445,6 @@ stages: displayName: delete external xamarin-android submodule - template: yaml-templates/use-dot-net.yaml - parameters: - version: $(DotNet5Version) - template: yaml-templates/use-dot-net.yaml parameters: @@ -511,7 +505,7 @@ stages: parameters: useDotNet: true testRunTitle: Xamarin.Android.Build.Tests - Linux .NET 6 Smoke Tests - testAssembly: $(System.DefaultWorkingDirectory)/xamarin-android/bin/Test$(XA.Build.Configuration)/netcoreapp3.1/Xamarin.Android.Build.Tests.dll + testAssembly: $(System.DefaultWorkingDirectory)/xamarin-android/bin/Test$(XA.Build.Configuration)/net6.0/Xamarin.Android.Build.Tests.dll dotNetTestExtraArgs: --filter CheckSignApk # TODO: Add more tests (e.g. "TestCategory = SmokeTests $(DotNetNUnitCategories)" ) testResultsFile: TestResult-NET6SmokeMSBuildTests-Linux-$(XA.Build.Configuration).xml @@ -1019,7 +1013,7 @@ stages: job_name: mac_dotnet_tests_1 job_suffix: One .NET nunit_categories: $(DotNetNUnitCategories) - target_framework: 'netcoreapp3.1' + target_framework: 'net6.0' - template: yaml-templates\run-msbuild-mac-tests.yaml parameters: @@ -1027,7 +1021,7 @@ stages: job_name: mac_dotnet_tests_2 job_suffix: One .NET nunit_categories: $(DotNetNUnitCategories) - target_framework: 'netcoreapp3.1' + target_framework: 'net6.0' - template: yaml-templates\run-msbuild-mac-tests.yaml parameters: @@ -1035,7 +1029,7 @@ stages: job_name: mac_dotnet_tests_3 job_suffix: One .NET nunit_categories: $(DotNetNUnitCategories) - target_framework: 'netcoreapp3.1' + target_framework: 'net6.0' # Xamarin.Android (Test MSBuild One .NET - Windows) - template: yaml-templates\run-msbuild-win-tests.yaml @@ -1044,7 +1038,7 @@ stages: job_name: win_dotnet_tests_1 job_suffix: One .NET nunit_categories: $(DotNetNUnitCategories) - target_framework: 'netcoreapp3.1' + target_framework: 'net6.0' - template: yaml-templates\run-msbuild-win-tests.yaml parameters: @@ -1052,7 +1046,7 @@ stages: job_name: win_dotnet_tests_2 job_suffix: One .NET nunit_categories: $(DotNetNUnitCategories) - target_framework: 'netcoreapp3.1' + target_framework: 'net6.0' - template: yaml-templates\run-msbuild-win-tests.yaml parameters: @@ -1060,7 +1054,7 @@ stages: job_name: win_dotnet_tests_3 job_suffix: One .NET nunit_categories: $(DotNetNUnitCategories) - target_framework: 'netcoreapp3.1' + target_framework: 'net6.0' - stage: msbuilddevice_tests displayName: MSBuild Emulator Tests @@ -1080,7 +1074,7 @@ stages: job_name: mac_dotnetdevice_tests job_suffix: One .NET nunit_categories: $(DotNetNUnitCategories) - target_framework: 'netcoreapp3.1' + target_framework: 'net6.0' - stage: designer_tests displayName: Designer Tests diff --git a/build-tools/automation/yaml-templates/commercial-build.yaml b/build-tools/automation/yaml-templates/commercial-build.yaml index f044c4a0fe7..484d3b81e27 100644 --- a/build-tools/automation/yaml-templates/commercial-build.yaml +++ b/build-tools/automation/yaml-templates/commercial-build.yaml @@ -8,7 +8,6 @@ steps: - template: use-dot-net.yaml parameters: - version: $(DotNet5Version) remove_dotnet: true - template: use-dot-net.yaml diff --git a/build-tools/automation/yaml-templates/run-msbuild-device-tests.yaml b/build-tools/automation/yaml-templates/run-msbuild-device-tests.yaml index 12eaf147673..92376221e17 100644 --- a/build-tools/automation/yaml-templates/run-msbuild-device-tests.yaml +++ b/build-tools/automation/yaml-templates/run-msbuild-device-tests.yaml @@ -55,7 +55,7 @@ jobs: - template: run-nunit-tests.yaml parameters: - useDotNet: ${{ eq(parameters.target_framework, 'netcoreapp3.1') }} + useDotNet: ${{ eq(parameters.target_framework, 'net6.0') }} testRunTitle: MSBuildDeviceIntegration On Device - macOS - ${{ parameters.job_suffix }} testAssembly: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/MSBuildDeviceIntegration/${{ parameters.target_framework }}/MSBuildDeviceIntegration.dll nunitConsoleExtraArgs: --where "cat != SystemApplication && cat != TimeZoneInfo && cat != SmokeTests ${{ parameters.nunit_categories }}" diff --git a/build-tools/automation/yaml-templates/run-msbuild-mac-tests.yaml b/build-tools/automation/yaml-templates/run-msbuild-mac-tests.yaml index 5615bf34164..39e482d62cb 100644 --- a/build-tools/automation/yaml-templates/run-msbuild-mac-tests.yaml +++ b/build-tools/automation/yaml-templates/run-msbuild-mac-tests.yaml @@ -36,7 +36,7 @@ jobs: - template: run-nunit-tests.yaml parameters: - useDotNet: ${{ eq(parameters.target_framework, 'netcoreapp3.1') }} + useDotNet: ${{ eq(parameters.target_framework, 'net6.0') }} testRunTitle: Xamarin.Android.Build.Tests - macOS-${{ parameters.node_id }} - ${{ parameters.job_suffix }} testAssembly: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/${{ parameters.target_framework }}/Xamarin.Android.Build.Tests.dll nunitConsoleExtraArgs: --where "cat == Node-${{ parameters.node_id }} ${{ parameters.nunit_categories }}" @@ -47,7 +47,7 @@ jobs: - ${{ if eq(parameters.run_extra_tests, true) }}: - template: run-nunit-tests.yaml parameters: - useDotNet: ${{ eq(parameters.target_framework, 'netcoreapp3.1') }} + useDotNet: ${{ eq(parameters.target_framework, 'net6.0') }} testRunTitle: Xamarin.Android.Build.Tests - macOS - No Node testAssembly: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/${{ parameters.target_framework }}/Xamarin.Android.Build.Tests.dll nunitConsoleExtraArgs: --where "cat != Node-1 && cat != Node-2 && cat != Node-3" @@ -58,7 +58,7 @@ jobs: - ${{ if eq(parameters.run_extra_tests, true) }}: - template: run-nunit-tests.yaml parameters: - useDotNet: ${{ eq(parameters.target_framework, 'netcoreapp3.1') }} + useDotNet: ${{ eq(parameters.target_framework, 'net6.0') }} testRunTitle: Xamarin.Android.Tools.Aidl-Tests - macOS testAssembly: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/${{ parameters.target_framework }}/Xamarin.Android.Tools.Aidl-Tests.dll testResultsFile: TestResult-Aidl-Tests-macOS-$(XA.Build.Configuration).xml diff --git a/build-tools/automation/yaml-templates/run-msbuild-win-tests.yaml b/build-tools/automation/yaml-templates/run-msbuild-win-tests.yaml index 7fff779b329..5a3e0a24ece 100644 --- a/build-tools/automation/yaml-templates/run-msbuild-win-tests.yaml +++ b/build-tools/automation/yaml-templates/run-msbuild-win-tests.yaml @@ -44,7 +44,7 @@ jobs: # Using all available cores seems to occasionally bog down our machines and cause parallel test execution to slow down dramatically. - template: run-nunit-tests.yaml parameters: - useDotNet: ${{ eq(parameters.target_framework, 'netcoreapp3.1') }} + useDotNet: ${{ eq(parameters.target_framework, 'net6.0') }} testRunTitle: Xamarin.Android.Build.Tests - Windows-${{ parameters.node_id }} - ${{ parameters.job_suffix }} testAssembly: $(System.DefaultWorkingDirectory)\bin\Test$(XA.Build.Configuration)\${{ parameters.target_framework }}\Xamarin.Android.Build.Tests.dll nunitConsoleExtraArgs: --where "cat == Node-${{ parameters.node_id }} ${{ parameters.nunit_categories }}" @@ -55,7 +55,7 @@ jobs: - ${{ if eq(parameters.run_extra_tests, true) }}: - template: run-nunit-tests.yaml parameters: - useDotNet: ${{ eq(parameters.target_framework, 'netcoreapp3.1') }} + useDotNet: ${{ eq(parameters.target_framework, 'net6.0') }} testRunTitle: Xamarin.Android.Build.Tests - Windows - No Node testAssembly: $(System.DefaultWorkingDirectory)\bin\Test$(XA.Build.Configuration)\${{ parameters.target_framework }}\Xamarin.Android.Build.Tests.dll nunitConsoleExtraArgs: --where "cat != Node-1 && cat != Node-2 && cat != Node-3" @@ -66,7 +66,7 @@ jobs: - ${{ if eq(parameters.run_extra_tests, true) }}: - template: run-nunit-tests.yaml parameters: - useDotNet: ${{ eq(parameters.target_framework, 'netcoreapp3.1') }} + useDotNet: ${{ eq(parameters.target_framework, 'net6.0') }} testRunTitle: Xamarin.Android.Tools.Aidl-Tests - Windows testAssembly: $(System.DefaultWorkingDirectory)\bin\Test$(XA.Build.Configuration)\${{ parameters.target_framework }}\Xamarin.Android.Tools.Aidl-Tests.dll testResultsFile: TestResult-Aidl-Tests-Windows-$(XA.Build.Configuration).xml diff --git a/build-tools/automation/yaml-templates/setup-test-environment.yaml b/build-tools/automation/yaml-templates/setup-test-environment.yaml index b3399357ab5..a64aa092012 100644 --- a/build-tools/automation/yaml-templates/setup-test-environment.yaml +++ b/build-tools/automation/yaml-templates/setup-test-environment.yaml @@ -29,13 +29,6 @@ steps: condition: and(succeeded(), eq(variables['agent.os'], 'Windows_NT')) - template: use-dot-net.yaml - parameters: - version: $(DotNet5Version) - remove_dotnet: true - -- template: use-dot-net.yaml - parameters: - version: $(DotNetCoreVersion) - task: MSBuild@1 displayName: build xaprepare diff --git a/build-tools/automation/yaml-templates/use-dot-net.yaml b/build-tools/automation/yaml-templates/use-dot-net.yaml index 301a254d4b6..3dd00128d92 100644 --- a/build-tools/automation/yaml-templates/use-dot-net.yaml +++ b/build-tools/automation/yaml-templates/use-dot-net.yaml @@ -2,7 +2,7 @@ # We prefer this over the UseDotNet task so that we can always clean up old/unstable versions on disk. parameters: - version: $(DotNetCoreVersion) + version: $(DotNet6Version) remove_dotnet: false steps: diff --git a/build-tools/create-packs/Directory.Build.targets b/build-tools/create-packs/Directory.Build.targets index 4eaa9de02cb..4f5a70e95e2 100644 --- a/build-tools/create-packs/Directory.Build.targets +++ b/build-tools/create-packs/Directory.Build.targets @@ -14,7 +14,7 @@ - <_MonoAndroidNETOutputDir>$(XAInstallPrefix)xbuild-frameworks\Microsoft.Android\netcoreapp3.1\ + <_MonoAndroidNETOutputDir>$(XAInstallPrefix)xbuild-frameworks\Microsoft.Android\net6.0\ <_WorkloadResolverFlagFile>$(DotNetPreviewPath)sdk\$(MicrosoftDotnetSdkInternalPackageVersion)\EnableWorkloadResolver.sentinel diff --git a/build-tools/create-packs/Microsoft.Android.Sdk.proj b/build-tools/create-packs/Microsoft.Android.Sdk.proj index efd7e7d2ed4..26364035692 100644 --- a/build-tools/create-packs/Microsoft.Android.Sdk.proj +++ b/build-tools/create-packs/Microsoft.Android.Sdk.proj @@ -26,7 +26,7 @@ core workload sdk packs imported by Microsoft.NET.Workload.Android. DependsOnTargets="ConstructInstallerItems;_GenerateBundledVersions;_GetLicense"> $(XamarinAndroidSourcePath)bin\Build$(Configuration)\packs\tools\ - $(XamarinAndroidSourcePath)bin\$(Configuration)-netcoreapp3.1\ + $(XamarinAndroidSourcePath)bin\$(Configuration)-net6.0\ diff --git a/build-tools/scripts/Configuration.Java.Interop.Override.props b/build-tools/scripts/Configuration.Java.Interop.Override.props index b0c4534a52c..299041652cc 100644 --- a/build-tools/scripts/Configuration.Java.Interop.Override.props +++ b/build-tools/scripts/Configuration.Java.Interop.Override.props @@ -3,7 +3,7 @@ $(MSBuildThisFileDirectory)..\..\external\mono\external\cecil $(MSBuildThisFileDirectory)..\..\bin\$(Configuration)\lib\xamarin.android\xbuild\Xamarin\Android\ - $(MSBuildThisFileDirectory)..\..\bin\$(Configuration)-netcoreapp3.1\ + $(MSBuildThisFileDirectory)..\..\bin\$(Configuration)-net6.0\ $(MSBuildThisFileDirectory)..\..\external\xamarin-android-tools diff --git a/build-tools/scripts/JavaCallableWrappers.targets b/build-tools/scripts/JavaCallableWrappers.targets index 7d181e7c653..558eac42d14 100644 --- a/build-tools/scripts/JavaCallableWrappers.targets +++ b/build-tools/scripts/JavaCallableWrappers.targets @@ -14,8 +14,8 @@ $(MSBuildProjectDirectory)\$(OutputPath) "$(XAInstallPrefix)xbuild\Xamarin\Android\jcw-gen.exe" -v10 <_LibDirs>-L "$(OutputPathAbs.TrimEnd('\'))" - <_LibDirs Condition=" '$(TargetFramework)' != 'netcoreapp3.1' ">$(_LibDirs) -L "$(OutputPathAbs)..\v1.0" -L "$(OutputPathAbs)..\v1.0\Facades" - <_LibDirs Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">$(_LibDirs) -L "$(_CorlibDir.TrimEnd('\'))" + <_LibDirs Condition=" '$(TargetFramework)' != 'net6.0' ">$(_LibDirs) -L "$(OutputPathAbs)..\v1.0" -L "$(OutputPathAbs)..\v1.0\Facades" + <_LibDirs Condition=" '$(TargetFramework)' == 'net6.0' ">$(_LibDirs) -L "$(_CorlibDir.TrimEnd('\'))" <_Out>-o "$(MSBuildProjectDirectory)\$(IntermediateOutputPath)jcw\src" - + diff --git a/build-tools/scripts/UpdateApkSizeReference.ps1 b/build-tools/scripts/UpdateApkSizeReference.ps1 index 6c0930ea88a..48538644ace 100644 --- a/build-tools/scripts/UpdateApkSizeReference.ps1 +++ b/build-tools/scripts/UpdateApkSizeReference.ps1 @@ -10,6 +10,6 @@ msbuild /p:Configuration=Release /restore .\tools\xabuild\xabuild.csproj Write-Output "Building legacy BuildReleaseArm64 tests" msbuild /p:Configuration=Release Xamarin.Android.sln /t:RunNunitTests /p:TEST="Xamarin.Android.Build.Tests.BuildTest.BuildReleaseArm64" Write-Output "Building DotNet BuildReleaseArm64 tests" -~\android-toolchain\dotnet\dotnet test -p:Configuration=Release --filter BuildTest.BuildReleaseArm64 .\bin\TestRelease\netcoreapp3.1\Xamarin.Android.Build.Tests.dll +~\android-toolchain\dotnet\dotnet test -p:Configuration=Release --filter BuildTest.BuildReleaseArm64 .\bin\TestRelease\net6.0\Xamarin.Android.Build.Tests.dll Write-Output "Updating reference files" Copy-Item -Verbose bin\TestRelease\BuildReleaseArm64*.apkdesc -Destination src\Xamarin.Android.Build.Tasks\Tests\Xamarin.ProjectTools\Resources\Base\ diff --git a/build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs b/build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs index da09b853682..7667b99677e 100644 --- a/build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs +++ b/build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs @@ -320,7 +320,7 @@ public static partial class Paths public static string TestBinDir => GetCachedPath (ref testBinDir, () => Path.Combine (Configurables.Paths.BinDirRoot, $"Test{ctx.Configuration}")); public static string BinDir => GetCachedPath (ref binDir, () => Path.Combine (Configurables.Paths.BinDirRoot, ctx.Configuration)); - public static string NetCoreBinDir => GetCachedPath (ref netCoreBinDir, () => Path.Combine (Configurables.Paths.BinDirRoot, $"{ctx.Configuration}-netcoreapp3.1")); + public static string NetCoreBinDir => GetCachedPath (ref netCoreBinDir, () => Path.Combine (Configurables.Paths.BinDirRoot, $"{ctx.Configuration}-net6.0")); public static string BuildBinDir => GetCachedPath (ref buildBinDir, () => Path.Combine (Configurables.Paths.BinDirRoot, $"Build{ctx.Configuration}")); public static string MingwBinDir => GetCachedPath (ref mingwBinDir, () => Path.Combine (ctx.Properties.GetRequiredValue (KnownProperties.AndroidMxeFullPath), "bin")); public static string ProfileAssembliesProjitemsPath => GetCachedPath (ref profileAssembliesProjitemsPath, () => Path.Combine (BuildBinDir, "ProfileAssemblies.projitems")); diff --git a/global.json b/global.json index d1c05a8b8ae..f86eb36a4f8 100644 --- a/global.json +++ b/global.json @@ -1,4 +1,7 @@ { + "sdk": { + "allowPrerelease": true + }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "2.0.1", "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20555.6" diff --git a/src/Microsoft.Android.Sdk.ILLink/Microsoft.Android.Sdk.ILLink.csproj b/src/Microsoft.Android.Sdk.ILLink/Microsoft.Android.Sdk.ILLink.csproj index 48d3eaf93de..39ddab0d226 100644 --- a/src/Microsoft.Android.Sdk.ILLink/Microsoft.Android.Sdk.ILLink.csproj +++ b/src/Microsoft.Android.Sdk.ILLink/Microsoft.Android.Sdk.ILLink.csproj @@ -1,7 +1,7 @@  - net5.0 + net6.0 NET5_LINKER false $(XAInstallPrefix)xbuild\Xamarin\Android\ diff --git a/src/Mono.Android.Export/Mono.Android.Export.csproj b/src/Mono.Android.Export/Mono.Android.Export.csproj index 714cb8dbe4a..83ccc2066c5 100644 --- a/src/Mono.Android.Export/Mono.Android.Export.csproj +++ b/src/Mono.Android.Export/Mono.Android.Export.csproj @@ -3,9 +3,9 @@ - + monoandroid10 - monoandroid10;netcoreapp3.1 + monoandroid10;net6.0 true ..\..\product.snk true @@ -21,7 +21,7 @@ false - + $(XAInstallPrefix)xbuild-frameworks\Microsoft.Android\ @@ -52,7 +52,7 @@ - + diff --git a/src/Mono.Android/Mono.Android.csproj b/src/Mono.Android/Mono.Android.csproj index 54ef7cd4030..e895b336844 100644 --- a/src/Mono.Android/Mono.Android.csproj +++ b/src/Mono.Android/Mono.Android.csproj @@ -5,7 +5,7 @@ - monoandroid10;netcoreapp3.1 + monoandroid10;net6.0 Android true ..\..\product.snk @@ -41,7 +41,7 @@ $(XAInstallPrefix)xbuild-frameworks\MonoAndroid\$(AndroidFrameworkVersion)\ - + $(XAInstallPrefix)xbuild-frameworks\Microsoft.Android\$(TargetFramework)\ @@ -92,7 +92,7 @@ - + ILLink.LinkAttributes.xml @@ -375,8 +375,8 @@ - - + + diff --git a/src/Mono.Android/Mono.Android.targets b/src/Mono.Android/Mono.Android.targets index 3b6e14ad8cd..725b7fdabb3 100644 --- a/src/Mono.Android/Mono.Android.targets +++ b/src/Mono.Android/Mono.Android.targets @@ -43,7 +43,7 @@ <_PackageVersion>$(ProductVersion) <_PackageVersionBuild>$(XAVersionCommitCount) - + <_PackageVersion>$(AndroidPackVersion) <_PackageVersionBuild>$(PackVersionCommitCount) diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Utilities/BaseTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Utilities/BaseTest.cs index 06a56115d4a..ac484fa2aed 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Utilities/BaseTest.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Utilities/BaseTest.cs @@ -49,7 +49,7 @@ public static string AndroidMSBuildDirectory { static SetUp () { -#if NETCOREAPP3_1 +#if NET6 Builder.UseDotNet = true; #else Builder.UseDotNet = false; diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Xamarin.Android.Build.Tests.csproj b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Xamarin.Android.Build.Tests.csproj index 8cef187dea6..52d97dc4810 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Xamarin.Android.Build.Tests.csproj +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Xamarin.Android.Build.Tests.csproj @@ -1,7 +1,7 @@ - net472;netcoreapp3.1 + net472;net6.0 true ..\..\..\..\bin\Test$(Configuration) diff --git a/src/Xamarin.Android.NamingCustomAttributes/Xamarin.Android.NamingCustomAttributes.projitems b/src/Xamarin.Android.NamingCustomAttributes/Xamarin.Android.NamingCustomAttributes.projitems index 47f4d0485b7..85216201174 100644 --- a/src/Xamarin.Android.NamingCustomAttributes/Xamarin.Android.NamingCustomAttributes.projitems +++ b/src/Xamarin.Android.NamingCustomAttributes/Xamarin.Android.NamingCustomAttributes.projitems @@ -22,8 +22,8 @@ - - + + diff --git a/tests/MSBuildDeviceIntegration/MSBuildDeviceIntegration.csproj b/tests/MSBuildDeviceIntegration/MSBuildDeviceIntegration.csproj index 8bbcc740013..7ef8aa426da 100644 --- a/tests/MSBuildDeviceIntegration/MSBuildDeviceIntegration.csproj +++ b/tests/MSBuildDeviceIntegration/MSBuildDeviceIntegration.csproj @@ -1,7 +1,7 @@ - net472;netcoreapp3.1 + net472;net6.0 Xamarin.Android.Build.Tests true ..\..\bin\Test$(Configuration)\MSBuildDeviceIntegration\ diff --git a/tools/javadoc2mdoc/javadoc2mdoc.csproj b/tools/javadoc2mdoc/javadoc2mdoc.csproj index c6ffa087438..edcd8d05a50 100644 --- a/tools/javadoc2mdoc/javadoc2mdoc.csproj +++ b/tools/javadoc2mdoc/javadoc2mdoc.csproj @@ -1,6 +1,6 @@ - net472;netcoreapp3.1 + net472;net6.0 false Exe Xamarin.Android.Tools.JavadocToMDoc From d3f6ce1460b49ef45883bda8ea130592499e40f2 Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Wed, 28 Apr 2021 22:56:38 -0400 Subject: [PATCH 2/9] Bump xat --- external/xamarin-android-tools | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/xamarin-android-tools b/external/xamarin-android-tools index c5732a0e9f4..316ca735746 160000 --- a/external/xamarin-android-tools +++ b/external/xamarin-android-tools @@ -1 +1 @@ -Subproject commit c5732a0e9f4bd4176f43b0568880cfe453fc78de +Subproject commit 316ca7357460400679b562a370146095885a88d0 From d13df57c46c01f49536e1b8f6b0f130b93accb85 Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Wed, 28 Apr 2021 23:16:16 -0400 Subject: [PATCH 3/9] Revert xat bump --- external/xamarin-android-tools | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/xamarin-android-tools b/external/xamarin-android-tools index 316ca735746..c5732a0e9f4 160000 --- a/external/xamarin-android-tools +++ b/external/xamarin-android-tools @@ -1 +1 @@ -Subproject commit 316ca7357460400679b562a370146095885a88d0 +Subproject commit c5732a0e9f4bd4176f43b0568880cfe453fc78de From 79084b2affc45a007b1bab41e8d50d9246f342e3 Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Wed, 28 Apr 2021 23:21:25 -0400 Subject: [PATCH 4/9] Revert test tf updates --- build-tools/automation/azure-pipelines.yaml | 18 +++++++++--------- .../run-msbuild-device-tests.yaml | 2 +- .../yaml-templates/run-msbuild-mac-tests.yaml | 6 +++--- .../yaml-templates/run-msbuild-win-tests.yaml | 6 +++--- build-tools/scripts/UpdateApkSizeReference.ps1 | 2 +- .../Utilities/BaseTest.cs | 2 +- .../Xamarin.Android.Build.Tests.csproj | 2 +- .../MSBuildDeviceIntegration.csproj | 2 +- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index 026ba3c3a15..1c553aeb16e 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -403,7 +403,7 @@ stages: parameters: useDotNet: true testRunTitle: Smoke MSBuild Tests - Windows Dotnet Build - testAssembly: $(System.DefaultWorkingDirectory)\bin\Test$(XA.Build.Configuration)\net6.0\Xamarin.Android.Build.Tests.dll + testAssembly: $(System.DefaultWorkingDirectory)\bin\Test$(XA.Build.Configuration)\netcoreapp3.1\Xamarin.Android.Build.Tests.dll testResultsFile: TestResult-SmokeMSBuildTests-WinDotnetBuildTree-$(XA.Build.Configuration).xml dotNetTestExtraArgs: --filter "TestCategory = SmokeTests $(DotNetNUnitCategories)" @@ -499,7 +499,7 @@ stages: parameters: useDotNet: true testRunTitle: Xamarin.Android.Build.Tests - Linux .NET 6 Smoke Tests - testAssembly: $(System.DefaultWorkingDirectory)/xamarin-android/bin/Test$(XA.Build.Configuration)/net6.0/Xamarin.Android.Build.Tests.dll + testAssembly: $(System.DefaultWorkingDirectory)/xamarin-android/bin/Test$(XA.Build.Configuration)/netcoreapp3.1/Xamarin.Android.Build.Tests.dll dotNetTestExtraArgs: --filter CheckSignApk # TODO: Add more tests (e.g. "TestCategory = SmokeTests $(DotNetNUnitCategories)" ) testResultsFile: TestResult-NET6SmokeMSBuildTests-Linux-$(XA.Build.Configuration).xml @@ -999,7 +999,7 @@ stages: job_name: mac_dotnet_tests_1 job_suffix: One .NET nunit_categories: $(DotNetNUnitCategories) - target_framework: 'net6.0' + target_framework: 'netcoreapp3.1' - template: yaml-templates\run-msbuild-mac-tests.yaml parameters: @@ -1007,7 +1007,7 @@ stages: job_name: mac_dotnet_tests_2 job_suffix: One .NET nunit_categories: $(DotNetNUnitCategories) - target_framework: 'net6.0' + target_framework: 'netcoreapp3.1' - template: yaml-templates\run-msbuild-mac-tests.yaml parameters: @@ -1015,7 +1015,7 @@ stages: job_name: mac_dotnet_tests_3 job_suffix: One .NET nunit_categories: $(DotNetNUnitCategories) - target_framework: 'net6.0' + target_framework: 'netcoreapp3.1' # Xamarin.Android (Test MSBuild One .NET - Windows) - template: yaml-templates\run-msbuild-win-tests.yaml @@ -1024,7 +1024,7 @@ stages: job_name: win_dotnet_tests_1 job_suffix: One .NET nunit_categories: $(DotNetNUnitCategories) - target_framework: 'net6.0' + target_framework: 'netcoreapp3.1' - template: yaml-templates\run-msbuild-win-tests.yaml parameters: @@ -1032,7 +1032,7 @@ stages: job_name: win_dotnet_tests_2 job_suffix: One .NET nunit_categories: $(DotNetNUnitCategories) - target_framework: 'net6.0' + target_framework: 'netcoreapp3.1' - template: yaml-templates\run-msbuild-win-tests.yaml parameters: @@ -1040,7 +1040,7 @@ stages: job_name: win_dotnet_tests_3 job_suffix: One .NET nunit_categories: $(DotNetNUnitCategories) - target_framework: 'net6.0' + target_framework: 'netcoreapp3.1' - stage: msbuilddevice_tests displayName: MSBuild Emulator Tests @@ -1060,7 +1060,7 @@ stages: job_name: mac_dotnetdevice_tests job_suffix: One .NET nunit_categories: $(DotNetNUnitCategories) - target_framework: 'net6.0' + target_framework: 'netcoreapp3.1' - stage: designer_tests displayName: Designer Tests diff --git a/build-tools/automation/yaml-templates/run-msbuild-device-tests.yaml b/build-tools/automation/yaml-templates/run-msbuild-device-tests.yaml index 92376221e17..12eaf147673 100644 --- a/build-tools/automation/yaml-templates/run-msbuild-device-tests.yaml +++ b/build-tools/automation/yaml-templates/run-msbuild-device-tests.yaml @@ -55,7 +55,7 @@ jobs: - template: run-nunit-tests.yaml parameters: - useDotNet: ${{ eq(parameters.target_framework, 'net6.0') }} + useDotNet: ${{ eq(parameters.target_framework, 'netcoreapp3.1') }} testRunTitle: MSBuildDeviceIntegration On Device - macOS - ${{ parameters.job_suffix }} testAssembly: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/MSBuildDeviceIntegration/${{ parameters.target_framework }}/MSBuildDeviceIntegration.dll nunitConsoleExtraArgs: --where "cat != SystemApplication && cat != TimeZoneInfo && cat != SmokeTests ${{ parameters.nunit_categories }}" diff --git a/build-tools/automation/yaml-templates/run-msbuild-mac-tests.yaml b/build-tools/automation/yaml-templates/run-msbuild-mac-tests.yaml index 713452b523e..400809caa06 100644 --- a/build-tools/automation/yaml-templates/run-msbuild-mac-tests.yaml +++ b/build-tools/automation/yaml-templates/run-msbuild-mac-tests.yaml @@ -30,7 +30,7 @@ jobs: - template: run-nunit-tests.yaml parameters: - useDotNet: ${{ eq(parameters.target_framework, 'net6.0') }} + useDotNet: ${{ eq(parameters.target_framework, 'netcoreapp3.1') }} testRunTitle: Xamarin.Android.Build.Tests - macOS-${{ parameters.node_id }} - ${{ parameters.job_suffix }} testAssembly: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/${{ parameters.target_framework }}/Xamarin.Android.Build.Tests.dll nunitConsoleExtraArgs: --where "cat == Node-${{ parameters.node_id }} ${{ parameters.nunit_categories }}" @@ -41,7 +41,7 @@ jobs: - ${{ if eq(parameters.run_extra_tests, true) }}: - template: run-nunit-tests.yaml parameters: - useDotNet: ${{ eq(parameters.target_framework, 'net6.0') }} + useDotNet: ${{ eq(parameters.target_framework, 'netcoreapp3.1') }} testRunTitle: Xamarin.Android.Build.Tests - macOS - No Node testAssembly: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/${{ parameters.target_framework }}/Xamarin.Android.Build.Tests.dll nunitConsoleExtraArgs: --where "cat != Node-1 && cat != Node-2 && cat != Node-3" @@ -52,7 +52,7 @@ jobs: - ${{ if eq(parameters.run_extra_tests, true) }}: - template: run-nunit-tests.yaml parameters: - useDotNet: ${{ eq(parameters.target_framework, 'net6.0') }} + useDotNet: ${{ eq(parameters.target_framework, 'netcoreapp3.1') }} testRunTitle: Xamarin.Android.Tools.Aidl-Tests - macOS testAssembly: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/${{ parameters.target_framework }}/Xamarin.Android.Tools.Aidl-Tests.dll testResultsFile: TestResult-Aidl-Tests-macOS-$(XA.Build.Configuration).xml diff --git a/build-tools/automation/yaml-templates/run-msbuild-win-tests.yaml b/build-tools/automation/yaml-templates/run-msbuild-win-tests.yaml index 7da11993810..9ebfd2855ef 100644 --- a/build-tools/automation/yaml-templates/run-msbuild-win-tests.yaml +++ b/build-tools/automation/yaml-templates/run-msbuild-win-tests.yaml @@ -38,7 +38,7 @@ jobs: # Using all available cores seems to occasionally bog down our machines and cause parallel test execution to slow down dramatically. - template: run-nunit-tests.yaml parameters: - useDotNet: ${{ eq(parameters.target_framework, 'net6.0') }} + useDotNet: ${{ eq(parameters.target_framework, 'netcoreapp3.1') }} testRunTitle: Xamarin.Android.Build.Tests - Windows-${{ parameters.node_id }} - ${{ parameters.job_suffix }} testAssembly: $(System.DefaultWorkingDirectory)\bin\Test$(XA.Build.Configuration)\${{ parameters.target_framework }}\Xamarin.Android.Build.Tests.dll nunitConsoleExtraArgs: --where "cat == Node-${{ parameters.node_id }} ${{ parameters.nunit_categories }}" @@ -49,7 +49,7 @@ jobs: - ${{ if eq(parameters.run_extra_tests, true) }}: - template: run-nunit-tests.yaml parameters: - useDotNet: ${{ eq(parameters.target_framework, 'net6.0') }} + useDotNet: ${{ eq(parameters.target_framework, 'netcoreapp3.1') }} testRunTitle: Xamarin.Android.Build.Tests - Windows - No Node testAssembly: $(System.DefaultWorkingDirectory)\bin\Test$(XA.Build.Configuration)\${{ parameters.target_framework }}\Xamarin.Android.Build.Tests.dll nunitConsoleExtraArgs: --where "cat != Node-1 && cat != Node-2 && cat != Node-3" @@ -60,7 +60,7 @@ jobs: - ${{ if eq(parameters.run_extra_tests, true) }}: - template: run-nunit-tests.yaml parameters: - useDotNet: ${{ eq(parameters.target_framework, 'net6.0') }} + useDotNet: ${{ eq(parameters.target_framework, 'netcoreapp3.1') }} testRunTitle: Xamarin.Android.Tools.Aidl-Tests - Windows testAssembly: $(System.DefaultWorkingDirectory)\bin\Test$(XA.Build.Configuration)\${{ parameters.target_framework }}\Xamarin.Android.Tools.Aidl-Tests.dll testResultsFile: TestResult-Aidl-Tests-Windows-$(XA.Build.Configuration).xml diff --git a/build-tools/scripts/UpdateApkSizeReference.ps1 b/build-tools/scripts/UpdateApkSizeReference.ps1 index 48538644ace..c8838dd9d8d 100644 --- a/build-tools/scripts/UpdateApkSizeReference.ps1 +++ b/build-tools/scripts/UpdateApkSizeReference.ps1 @@ -10,6 +10,6 @@ msbuild /p:Configuration=Release /restore .\tools\xabuild\xabuild.csproj Write-Output "Building legacy BuildReleaseArm64 tests" msbuild /p:Configuration=Release Xamarin.Android.sln /t:RunNunitTests /p:TEST="Xamarin.Android.Build.Tests.BuildTest.BuildReleaseArm64" Write-Output "Building DotNet BuildReleaseArm64 tests" -~\android-toolchain\dotnet\dotnet test -p:Configuration=Release --filter BuildTest.BuildReleaseArm64 .\bin\TestRelease\net6.0\Xamarin.Android.Build.Tests.dll +~\android-toolchain\dotnet\dotnet test -p:Configuration=Release --filter BuildTest.BuildReleaseArm64 .\bin\TestRelease\netcoreap3.1\Xamarin.Android.Build.Tests.dll Write-Output "Updating reference files" Copy-Item -Verbose bin\TestRelease\BuildReleaseArm64*.apkdesc -Destination src\Xamarin.Android.Build.Tasks\Tests\Xamarin.ProjectTools\Resources\Base\ diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Utilities/BaseTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Utilities/BaseTest.cs index ac484fa2aed..06a56115d4a 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Utilities/BaseTest.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Utilities/BaseTest.cs @@ -49,7 +49,7 @@ public static string AndroidMSBuildDirectory { static SetUp () { -#if NET6 +#if NETCOREAPP3_1 Builder.UseDotNet = true; #else Builder.UseDotNet = false; diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Xamarin.Android.Build.Tests.csproj b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Xamarin.Android.Build.Tests.csproj index 52d97dc4810..8cef187dea6 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Xamarin.Android.Build.Tests.csproj +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Xamarin.Android.Build.Tests.csproj @@ -1,7 +1,7 @@ - net472;net6.0 + net472;netcoreapp3.1 true ..\..\..\..\bin\Test$(Configuration) diff --git a/tests/MSBuildDeviceIntegration/MSBuildDeviceIntegration.csproj b/tests/MSBuildDeviceIntegration/MSBuildDeviceIntegration.csproj index 7ef8aa426da..8bbcc740013 100644 --- a/tests/MSBuildDeviceIntegration/MSBuildDeviceIntegration.csproj +++ b/tests/MSBuildDeviceIntegration/MSBuildDeviceIntegration.csproj @@ -1,7 +1,7 @@ - net472;net6.0 + net472;netcoreapp3.1 Xamarin.Android.Build.Tests true ..\..\bin\Test$(Configuration)\MSBuildDeviceIntegration\ From 4b71a4427fb1ffd4836fb2591788b88364518b69 Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Wed, 28 Apr 2021 23:24:16 -0400 Subject: [PATCH 5/9] Fix typo --- build-tools/scripts/UpdateApkSizeReference.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-tools/scripts/UpdateApkSizeReference.ps1 b/build-tools/scripts/UpdateApkSizeReference.ps1 index c8838dd9d8d..6c0930ea88a 100644 --- a/build-tools/scripts/UpdateApkSizeReference.ps1 +++ b/build-tools/scripts/UpdateApkSizeReference.ps1 @@ -10,6 +10,6 @@ msbuild /p:Configuration=Release /restore .\tools\xabuild\xabuild.csproj Write-Output "Building legacy BuildReleaseArm64 tests" msbuild /p:Configuration=Release Xamarin.Android.sln /t:RunNunitTests /p:TEST="Xamarin.Android.Build.Tests.BuildTest.BuildReleaseArm64" Write-Output "Building DotNet BuildReleaseArm64 tests" -~\android-toolchain\dotnet\dotnet test -p:Configuration=Release --filter BuildTest.BuildReleaseArm64 .\bin\TestRelease\netcoreap3.1\Xamarin.Android.Build.Tests.dll +~\android-toolchain\dotnet\dotnet test -p:Configuration=Release --filter BuildTest.BuildReleaseArm64 .\bin\TestRelease\netcoreapp3.1\Xamarin.Android.Build.Tests.dll Write-Output "Updating reference files" Copy-Item -Verbose bin\TestRelease\BuildReleaseArm64*.apkdesc -Destination src\Xamarin.Android.Build.Tasks\Tests\Xamarin.ProjectTools\Resources\Base\ From 26a09ec73d11435dd049bb42d3bc2a060dbc7822 Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Thu, 29 Apr 2021 09:56:53 -0400 Subject: [PATCH 6/9] Fix missing test assembly --- build-tools/scripts/NUnitReferences.projitems | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-tools/scripts/NUnitReferences.projitems b/build-tools/scripts/NUnitReferences.projitems index e59d60100c6..1ca056a8474 100644 --- a/build-tools/scripts/NUnitReferences.projitems +++ b/build-tools/scripts/NUnitReferences.projitems @@ -6,7 +6,7 @@ - + From 2ff340765be219552a2b4a05b92b4c410b9fad94 Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Thu, 29 Apr 2021 14:30:19 -0400 Subject: [PATCH 7/9] Install .NET 6 for .NET 6 installer creation, bump xat --- build-tools/automation/azure-pipelines.yaml | 6 ++++++ external/xamarin-android-tools | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index 1c553aeb16e..cd1ca7ad41f 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -1310,6 +1310,10 @@ stages: - checkout: release_scripts clean: true + - template: use-dot-net.yaml + parameters: + remove_dotnet: true + - template: yaml-templates/use-dot-net.yaml parameters: version: $(DotNetCoreVersion) @@ -1409,6 +1413,8 @@ stages: - checkout: self submodules: recursive + - template: use-dot-net.yaml + - task: DownloadPipelineArtifact@2 inputs: ${{ if eq(variables['MicroBuildSignType'], 'Real') }}: diff --git a/external/xamarin-android-tools b/external/xamarin-android-tools index c5732a0e9f4..23f09ac77ee 160000 --- a/external/xamarin-android-tools +++ b/external/xamarin-android-tools @@ -1 +1 @@ -Subproject commit c5732a0e9f4bd4176f43b0568880cfe453fc78de +Subproject commit 23f09ac77ee9a2a69df94f57cc861852705f1441 From 12e51a1b75f8d4839977f4b7bc62f91364135ed8 Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Thu, 29 Apr 2021 14:34:24 -0400 Subject: [PATCH 8/9] Fix template path --- build-tools/automation/azure-pipelines.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index cd1ca7ad41f..aa86a1ad65f 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -1310,7 +1310,7 @@ stages: - checkout: release_scripts clean: true - - template: use-dot-net.yaml + - template: yaml-templates/use-dot-net.yaml parameters: remove_dotnet: true @@ -1413,7 +1413,7 @@ stages: - checkout: self submodules: recursive - - template: use-dot-net.yaml + - template: yaml-templates/use-dot-net.yaml - task: DownloadPipelineArtifact@2 inputs: From e5a0315978c3de690414d36abf5ae2bde85c7db6 Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Thu, 29 Apr 2021 17:38:21 -0400 Subject: [PATCH 9/9] Bump to xamarin/xamarin-android-tools@683f375 --- external/xamarin-android-tools | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/xamarin-android-tools b/external/xamarin-android-tools index 23f09ac77ee..683f37508b5 160000 --- a/external/xamarin-android-tools +++ b/external/xamarin-android-tools @@ -1 +1 @@ -Subproject commit 23f09ac77ee9a2a69df94f57cc861852705f1441 +Subproject commit 683f37508b56c76c24b3287a5687743438625341