Skip to content

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

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

Open
dotnet-maestro wants to merge 25 commits into
base: release/11.0.1xx-preview6
Choose a base branch
from
+41 −34
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
9dd0b7a
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] Jun 27, 2026
7b18ccb
Re-generate global.json for PR #25841: [release/11.0.1xx-preview6] Up…
Jun 27, 2026
9faff43
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] Jun 28, 2026
1c8b9cb
Re-generate global.json for PR #25841: [release/11.0.1xx-preview6] Up…
Jun 28, 2026
1f178d6
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] Jun 29, 2026
557c29f
Re-generate global.json for PR #25841: [release/11.0.1xx-preview6] Up…
Jun 29, 2026
6b5c36d
Merge branch 'release/11.0.1xx-preview6' into darc-release/11.0.1xx-p…
rolfbjarne Jun 30, 2026
b2f6e81
Merge branch 'release/11.0.1xx-preview6' into darc-release/11.0.1xx-p…
dalexsoto Jun 30, 2026
97a4b69
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] Jul 1, 2026
b64dc7c
Re-generate global.json for PR #25841: [release/11.0.1xx-preview6] Up…
Jul 1, 2026
34aba36
[tests] Teach DotNetWatchTest that Mono tests might be ignored.
rolfbjarne Jul 1, 2026
35e0461
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] Jul 1, 2026
576d67b
Re-generate global.json for PR #25841: [release/11.0.1xx-preview6] Up…
Jul 1, 2026
2019974
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] Jul 2, 2026
cbc38e6
Re-generate global.json for PR #25841: [release/11.0.1xx-preview6] Up…
Jul 2, 2026
45149b4
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] Jul 3, 2026
1b9c62b
Re-generate global.json for PR #25841: [release/11.0.1xx-preview6] Up…
Jul 3, 2026
3adcc16
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] Jul 4, 2026
18d8c2b
Re-generate global.json for PR #25841: [release/11.0.1xx-preview6] Up…
Jul 4, 2026
dfeb8ec
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] Jul 7, 2026
22ba24a
Re-generate global.json for PR #25841: [release/11.0.1xx-preview6] Up…
Jul 7, 2026
8b4f074
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] Jul 8, 2026
c8180df
Re-generate global.json for PR #25841: [release/11.0.1xx-preview6] Up…
Jul 8, 2026
898f5a8
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] Jul 9, 2026
6ef56e8
Re-generate global.json for PR #25841: [release/11.0.1xx-preview6] Up…
Jul 9, 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
20 changes: 10 additions & 10 deletions eng/Version.Details.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@ This file should be imported by eng/Versions.props
<Project>
<PropertyGroup>
<!-- dotnet-dotnet dependencies -->
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26322.110</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>11.0.0-beta.26322.110</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-preview.26322.110</MicrosoftDotNetCecilPackageVersion>
<MicrosoftDotNetSharedFrameworkSdkPackageVersion>11.0.0-beta.26322.110</MicrosoftDotNetSharedFrameworkSdkPackageVersion>
<MicrosoftNETILLinkPackageVersion>11.0.0-preview.6.26322.110</MicrosoftNETILLinkPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>11.0.0-preview.6.26322.110</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>11.0.0-preview.6.26322.110</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
<MicrosoftNETSdkPackageVersion>11.0.100-preview.6.26322.110</MicrosoftNETSdkPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-preview.6.26322.110</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>11.0.100-preview.6.26322.110</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26357.118</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>11.0.0-beta.26357.118</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-preview.26357.118</MicrosoftDotNetCecilPackageVersion>
<MicrosoftDotNetSharedFrameworkSdkPackageVersion>11.0.0-beta.26357.118</MicrosoftDotNetSharedFrameworkSdkPackageVersion>
<MicrosoftNETILLinkPackageVersion>11.0.0-preview.6.26357.118</MicrosoftNETILLinkPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>11.0.0-preview.6.26357.118</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>11.0.0-preview.6.26357.118</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
<MicrosoftNETSdkPackageVersion>11.0.100-preview.6.26357.118</MicrosoftNETSdkPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-preview.6.26357.118</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>11.0.100-preview.6.26357.118</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
<!-- dotnet-macios dependencies -->
<MicrosoftiOSSdknet100_260PackageVersion>26.0.11017</MicrosoftiOSSdknet100_260PackageVersion>
<MicrosoftiOSSdknet100_265PackageVersion>26.5.10301</MicrosoftiOSSdknet100_265PackageVersion>
Expand Down
40 changes: 20 additions & 20 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.NET.Sdk" Version="11.0.100-preview.6.26322.110">
<Dependency Name="Microsoft.NET.Sdk" Version="11.0.100-preview.6.26357.118">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>e92aef9c9fd05991d32c4f2a1525710fef4aa9df</Sha>
<Sha>2461daa1d76b420ad12e4ebd73e64a4421cc365f</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink" Version="11.0.0-preview.6.26322.110">
<Dependency Name="Microsoft.NET.ILLink" Version="11.0.0-preview.6.26357.118">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>e92aef9c9fd05991d32c4f2a1525710fef4aa9df</Sha>
<Sha>2461daa1d76b420ad12e4ebd73e64a4421cc365f</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="11.0.0-preview.6.26322.110">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="11.0.0-preview.6.26357.118">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>e92aef9c9fd05991d32c4f2a1525710fef4aa9df</Sha>
<Sha>2461daa1d76b420ad12e4ebd73e64a4421cc365f</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Runtime.MonoTargets.Sdk" Version="11.0.0-preview.6.26322.110">
<Dependency Name="Microsoft.NET.Runtime.MonoTargets.Sdk" Version="11.0.0-preview.6.26357.118">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>e92aef9c9fd05991d32c4f2a1525710fef4aa9df</Sha>
<Sha>2461daa1d76b420ad12e4ebd73e64a4421cc365f</Sha>
</Dependency>
<!-- Set TRACKING_DOTNET_RUNTIME_SEPARATELY to something in Make.config if changing the version outside of dependency flow -->
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-preview.6.26322.110">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-preview.6.26357.118">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>e92aef9c9fd05991d32c4f2a1525710fef4aa9df</Sha>
<Sha>2461daa1d76b420ad12e4ebd73e64a4421cc365f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-preview.26322.110">
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-preview.26357.118">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>e92aef9c9fd05991d32c4f2a1525710fef4aa9df</Sha>
<Sha>2461daa1d76b420ad12e4ebd73e64a4421cc365f</Sha>
</Dependency>
<!-- This is a subscription of the .NET 10/Xcode 26.0 versions of our packages -->
<Dependency Name="Microsoft.MacCatalyst.Sdk.net10.0_26.0" Version="26.0.11017">
Expand Down Expand Up @@ -61,25 +61,25 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="11.0.0-beta.26322.110">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="11.0.0-beta.26357.118">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>e92aef9c9fd05991d32c4f2a1525710fef4aa9df</Sha>
<Sha>2461daa1d76b420ad12e4ebd73e64a4421cc365f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="11.0.0-beta.26322.110">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="11.0.0-beta.26357.118">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>e92aef9c9fd05991d32c4f2a1525710fef4aa9df</Sha>
<Sha>2461daa1d76b420ad12e4ebd73e64a4421cc365f</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="11.0.100-preview.6.26322.110">
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="11.0.100-preview.6.26357.118">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>e92aef9c9fd05991d32c4f2a1525710fef4aa9df</Sha>
<Sha>2461daa1d76b420ad12e4ebd73e64a4421cc365f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.iOS.Shared" Version="11.0.0-prerelease.26217.1">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>866707736d49c2323628744716cda2475b3af9ee</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26322.110">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26357.118">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>e92aef9c9fd05991d32c4f2a1525710fef4aa9df</Sha>
<Sha>2461daa1d76b420ad12e4ebd73e64a4421cc365f</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
</ToolsetDependencies>
Expand Down
6 changes: 3 additions & 3 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"sdk": {
"version": "11.0.100-preview.6.26322.110",
"version": "11.0.100-preview.6.26357.118",
"paths": [
"builds/downloads/dotnet",
"$host$"
],
"errorMessage": "The .NET SDK could not be found, please run 'make dotnet -C builds'."
},
"tools": {
"dotnet": "11.0.100-preview.6.26322.110"
"dotnet": "11.0.100-preview.6.26357.118"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26322.110"
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26357.118"
}
}
7 changes: 6 additions & 1 deletion tests/common/DotNet.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,12 @@ static void IgnoreIfUnsupportedMonoRuntime (Dictionary<string, string>? properti
return;
if (!properties.TryGetValue ("UseMonoRuntime", out var useMonoRuntime))
return;
if (!string.Equals (useMonoRuntime, "true", StringComparison.OrdinalIgnoreCase))
IgnoreIfUnsupportedMonoRuntime (string.Equals (useMonoRuntime, "true", StringComparison.OrdinalIgnoreCase));
}

public static void IgnoreIfUnsupportedMonoRuntime (bool useMonoRuntime)
{
if (!useMonoRuntime)
return;
if (Configuration.dotnet_monovm_supported)
return;
Expand Down
2 changes: 2 additions & 0 deletions tests/dotnet/UnitTests/DotNetWatchTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,8 @@ static partial void ChangeVariable ()
{ "RunWithOpen", "false" }, // this makes it so that the watched process is a subprocess, which means that ctrl-c in the terminal will kill everything. It also means that it'll get killed if something times out in the test.
};

DotNet.IgnoreIfUnsupportedMonoRuntime (useMonoRuntime);

var watchTask = Execution.RunWithCallbacksAsync (
DotNet.Executable,
args,
Expand Down
Loading