Skip to content

[release/11.0.1xx-preview6] Update dependencies from dotnet/dotnet #11765

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jonathanpeppers merged 6 commits into from
Jun 30, 2026
Merged

[release/11.0.1xx-preview6] Update dependencies from dotnet/dotnet #11765

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
942204c
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] Jun 27, 2026
4beb6ec
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] Jun 28, 2026
289379f
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] Jun 29, 2026
eeeae9d
[tests] Skip MonoVM in BuildInDesignTimeMode
jonathanpeppers Jun 25, 2026
4fa079c
[ci] Strip all conditional <TargetFrameworks> nodes from MAUI test cs…
jonathanpeppers Jun 26, 2026
eb70515
[ci] Move MAUI TargetFrameworks rewrite into a shared template
jonathanpeppers Jun 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions build-tools/automation/azure-pipelines-public.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
10 changes: 3 additions & 7 deletions build-tools/automation/azure-pipelines.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
17 changes: 17 additions & 0 deletions build-tools/automation/yaml-templates/set-maui-target-framework-android.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
parameters:
project:

steps:
- powershell: |
$project = '${{ parameters.project }}'
[xml] $xml = Get-Content $project
# The MAUI template has multiple conditional <TargetFrameworks> nodes; keep only one.
$nodes = @($xml.SelectNodes('/Project/PropertyGroup/TargetFrameworks'))
if ($nodes.Count -eq 0) { throw "No <TargetFrameworks> 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
28 changes: 14 additions & 14 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.NET.Sdk" Version="11.0.100-preview.6.26322.111">
<Dependency Name="Microsoft.NET.Sdk" Version="11.0.100-preview.6.26328.106">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>d8addc1562ad98c7cab19ed654e9caabd1112d87</Sha>
<Sha>4e63ed688b0db806aa962c318a237b22aa069435</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink" Version="11.0.0-preview.6.26322.111">
<Dependency Name="Microsoft.NET.ILLink" Version="11.0.0-preview.6.26328.106">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>d8addc1562ad98c7cab19ed654e9caabd1112d87</Sha>
<Sha>4e63ed688b0db806aa962c318a237b22aa069435</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-preview.6.26322.111">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-preview.6.26328.106">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>d8addc1562ad98c7cab19ed654e9caabd1112d87</Sha>
<Sha>4e63ed688b0db806aa962c318a237b22aa069435</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-preview.26322.111">
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-preview.26328.106">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>d8addc1562ad98c7cab19ed654e9caabd1112d87</Sha>
<Sha>4e63ed688b0db806aa962c318a237b22aa069435</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest-11.0.100-preview.4" Version="11.0.100-preview.4.26215.121">
<Uri>https://github.com/dotnet/dotnet</Uri>
Expand All @@ -36,17 +36,17 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26322.111">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26328.106">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>d8addc1562ad98c7cab19ed654e9caabd1112d87</Sha>
<Sha>4e63ed688b0db806aa962c318a237b22aa069435</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="11.0.0-beta.26322.111">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="11.0.0-beta.26328.106">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>d8addc1562ad98c7cab19ed654e9caabd1112d87</Sha>
<Sha>4e63ed688b0db806aa962c318a237b22aa069435</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="11.0.100-preview.6.26322.111">
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="11.0.100-preview.6.26328.106">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>d8addc1562ad98c7cab19ed654e9caabd1112d87</Sha>
<Sha>4e63ed688b0db806aa962c318a237b22aa069435</Sha>
</Dependency>
<Dependency Name="MSTest" Version="4.3.0-preview.26321.1">
<Uri>https://github.com/microsoft/testfx</Uri>
Expand Down
12 changes: 6 additions & 6 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<Project>
<!--Package versions-->
<PropertyGroup>
<MicrosoftNETSdkPackageVersion>11.0.100-preview.6.26322.111</MicrosoftNETSdkPackageVersion>
<MicrosoftNETSdkPackageVersion>11.0.100-preview.6.26328.106</MicrosoftNETSdkPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkPackageVersion>11.0.0-preview.6.26322.111</MicrosoftNETILLinkPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-preview.6.26322.111</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETILLinkPackageVersion>11.0.0-preview.6.26328.106</MicrosoftNETILLinkPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-preview.6.26328.106</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftDotNetApiCompatPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetApiCompatPackageVersion>
<!-- Last version built for net10.0, needed for CI steps that only have the .NET 10 SDK installed (e.g., BAR manifest publishing) -->
<MicrosoftDotNetBuildTasksFeedPackageVersionNet10>11.0.0-beta.26060.102</MicrosoftDotNetBuildTasksFeedPackageVersionNet10>
<MicrosoftDotNetBuildTasksFeedPackageVersion>11.0.0-beta.26322.111</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>11.0.0-beta.26328.106</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftNETWorkloadMonoToolchainCurrentManifest110100preview4PackageVersion>11.0.100-preview.4.26215.121</MicrosoftNETWorkloadMonoToolchainCurrentManifest110100preview4PackageVersion>
<MicrosoftNETWorkloadEmscriptenCurrentManifest110100preview4PackageVersion>11.0.100-preview.4.26215.121</MicrosoftNETWorkloadEmscriptenCurrentManifest110100preview4PackageVersion>
<MicrosoftNETWorkloadMonoToolChainPackageVersion>$(MicrosoftNETWorkloadMonoToolChainCurrentManifest110100preview4PackageVersion)</MicrosoftNETWorkloadMonoToolChainPackageVersion>
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest110100preview4PackageVersion)</MicrosoftNETWorkloadEmscriptenPackageVersion>
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>11.0.100-preview.6.26322.111</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-preview.26322.111</MicrosoftDotNetCecilPackageVersion>
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>11.0.100-preview.6.26328.106</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-preview.26328.106</MicrosoftDotNetCecilPackageVersion>
<MSTestPackageVersion>4.3.0-preview.26321.1</MSTestPackageVersion>
<SystemIOHashingPackageVersion>10.0.9</SystemIOHashingPackageVersion>
<SystemReflectionMetadataPackageVersion>11.0.0-preview.1.26104.118</SystemReflectionMetadataPackageVersion>
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
2 changes: 1 addition & 1 deletion src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
{
Expand Down
Loading