diff --git a/build-tools/automation/azure-pipelines-public.yaml b/build-tools/automation/azure-pipelines-public.yaml index f0b9c75fdf4..57b4eeab796 100644 --- a/build-tools/automation/azure-pipelines-public.yaml +++ b/build-tools/automation/azure-pipelines-public.yaml @@ -553,13 +553,9 @@ stages: displayName: Create MAUI template continueOnError: false - - powershell: | - $project = '$(Build.StagingDirectory)/MauiTestProj/MauiTestProj.csproj' - [xml] $xml = Get-Content $project - $node = $xml.SelectSingleNode('/Project/PropertyGroup/TargetFrameworks') - $node.InnerText = '$(DotNetTargetFramework)-android' - $xml.Save($project) - displayName: set TargetFrameworks to Android-only + - template: /build-tools/automation/yaml-templates/set-maui-target-framework-android.yaml + parameters: + project: $(Build.StagingDirectory)/MauiTestProj/MauiTestProj.csproj - template: /build-tools/automation/yaml-templates/run-dotnet-preview.yaml parameters: diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index 9f4bdd1eddd..838d197661f 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -189,13 +189,9 @@ extends: displayName: Create MAUI template continueOnError: false - - powershell: | - $project = '$(Build.StagingDirectory)/MauiTestProj/MauiTestProj.csproj' - [xml] $xml = Get-Content $project - $node = $xml.SelectSingleNode('/Project/PropertyGroup/TargetFrameworks') - $node.InnerText = '$(DotNetTargetFramework)-android' - $xml.Save($project) - displayName: set TargetFrameworks to Android-only + - template: /build-tools/automation/yaml-templates/set-maui-target-framework-android.yaml@self + parameters: + project: $(Build.StagingDirectory)/MauiTestProj/MauiTestProj.csproj - template: /build-tools/automation/yaml-templates/run-dotnet-preview.yaml@self parameters: diff --git a/build-tools/automation/yaml-templates/set-maui-target-framework-android.yaml b/build-tools/automation/yaml-templates/set-maui-target-framework-android.yaml new file mode 100644 index 00000000000..cb059774d13 --- /dev/null +++ b/build-tools/automation/yaml-templates/set-maui-target-framework-android.yaml @@ -0,0 +1,17 @@ +parameters: + project: + +steps: +- powershell: | + $project = '${{ parameters.project }}' + [xml] $xml = Get-Content $project + # The MAUI template has multiple conditional nodes; keep only one. + $nodes = @($xml.SelectNodes('/Project/PropertyGroup/TargetFrameworks')) + if ($nodes.Count -eq 0) { throw "No node found in $project" } + for ($i = $nodes.Count - 1; $i -ge 1; $i--) { + $nodes[$i].ParentNode.RemoveChild($nodes[$i]) | Out-Null + } + if ($nodes[0].HasAttribute('Condition')) { $nodes[0].RemoveAttribute('Condition') } + $nodes[0].InnerText = '$(DotNetTargetFramework)-android' + $xml.Save($project) + displayName: set TargetFrameworks to Android-only diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d00d9a5861e..d1adb5229cf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,20 +1,20 @@ - + https://github.com/dotnet/dotnet - d8addc1562ad98c7cab19ed654e9caabd1112d87 + 4e63ed688b0db806aa962c318a237b22aa069435 - + https://github.com/dotnet/dotnet - d8addc1562ad98c7cab19ed654e9caabd1112d87 + 4e63ed688b0db806aa962c318a237b22aa069435 - + https://github.com/dotnet/dotnet - d8addc1562ad98c7cab19ed654e9caabd1112d87 + 4e63ed688b0db806aa962c318a237b22aa069435 - + https://github.com/dotnet/dotnet - d8addc1562ad98c7cab19ed654e9caabd1112d87 + 4e63ed688b0db806aa962c318a237b22aa069435 https://github.com/dotnet/dotnet @@ -36,17 +36,17 @@ - + https://github.com/dotnet/dotnet - d8addc1562ad98c7cab19ed654e9caabd1112d87 + 4e63ed688b0db806aa962c318a237b22aa069435 - + https://github.com/dotnet/dotnet - d8addc1562ad98c7cab19ed654e9caabd1112d87 + 4e63ed688b0db806aa962c318a237b22aa069435 - + https://github.com/dotnet/dotnet - d8addc1562ad98c7cab19ed654e9caabd1112d87 + 4e63ed688b0db806aa962c318a237b22aa069435 https://github.com/microsoft/testfx diff --git a/eng/Versions.props b/eng/Versions.props index da9a1241b94..92c4f9f0446 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,20 +1,20 @@ - 11.0.100-preview.6.26322.111 + 11.0.100-preview.6.26328.106 $(MicrosoftNETSdkPackageVersion) - 11.0.0-preview.6.26322.111 - 11.0.0-preview.6.26322.111 + 11.0.0-preview.6.26328.106 + 11.0.0-preview.6.26328.106 7.0.0-beta.22103.1 11.0.0-beta.26060.102 - 11.0.0-beta.26322.111 + 11.0.0-beta.26328.106 11.0.100-preview.4.26215.121 11.0.100-preview.4.26215.121 $(MicrosoftNETWorkloadMonoToolChainCurrentManifest110100preview4PackageVersion) $(MicrosoftNETWorkloadEmscriptenCurrentManifest110100preview4PackageVersion) - 11.0.100-preview.6.26322.111 - 0.11.5-preview.26322.111 + 11.0.100-preview.6.26328.106 + 0.11.5-preview.26328.106 4.3.0-preview.26321.1 10.0.9 11.0.0-preview.1.26104.118 diff --git a/global.json b/global.json index c96ed83ffba..16c25b342d5 100644 --- a/global.json +++ b/global.json @@ -4,6 +4,6 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.134", - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26322.111" + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26328.106" } } 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 0bce8de3328..2d449e73fc1 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 @@ -762,7 +762,7 @@ public void BuildAfterUpgradingNuget ([Values (AndroidRuntime.CoreCLR, AndroidRu public void BuildInDesignTimeMode ( [Values (false, true)] bool useManagedParser, - [Values] + [Values (AndroidRuntime.CoreCLR, AndroidRuntime.NativeAOT)] AndroidRuntime runtime ) {