Skip to content

[release/11.0.2xx] Source code updates from dotnet/dotnet #56821

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 3 commits into
base: release/11.0.2xx
Choose a base branch
from
Open

[release/11.0.2xx] Source code updates from dotnet/dotnet #56821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c5cd70e
Backflow from https://github.com/dotnet/dotnet / 550c49d build 338815
dotnet-maestro[bot] Oct 29, 2026
c4ba821
Update dependencies from build 338815
dotnet-maestro[bot] Oct 29, 2026
efa6c7c
Update dependencies from build 338948
dotnet-maestro[bot] Oct 29, 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
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"microsoft.dotnet.helix.jobmonitor": {
"version": "11.0.0-beta.26508.107",
"version": "11.0.0-beta.26529.105",
"commands": [
"dotnet-helix-job-monitor"
]
Expand Down
3 changes: 3 additions & 0 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
<PackageVersion Include="Microsoft.Build.NuGetSdkResolver" Version="$(MicrosoftBuildNuGetSdkResolverPackageVersion)" />
<PackageVersion Include="Microsoft.Build.TaskAuthoring.Analyzer" Version="$(MicrosoftBuildTaskAuthoringAnalyzerPackageVersion)" />
<PackageVersion Include="OpenTelemetry" Version="$(OpenTelemetryDotnetPackageVersion)" />
<PackageVersion Include="OpenTelemetry.Api" Version="$(OpenTelemetryDotnetPackageVersion)" />
<PackageVersion Include="OpenTelemetry.Api.ProviderBuilderExtensions" Version="$(OpenTelemetryDotnetPackageVersion)" />
<PackageVersion Include="OpenTelemetry.Exporter.InMemory" Version="$(OpenTelemetryDotnetPackageVersion)" />
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="$(OpenTelemetryDotnetPackageVersion)" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="$(OpenTelemetryInstrumentationHttpPackageVersion)" />
Expand Down Expand Up @@ -63,6 +65,7 @@
<PackageVersion Include="Microsoft.DotNet.Installer.Windows.Security.TestData" Version="$(MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion)" />
<PackageVersion Include="Microsoft.DotNet.SignCheckTask" Version="$(ArcadeSdkVersion)" />
<PackageVersion Include="Microsoft.DotNet.XUnitV3Extensions" Version="$(MicrosoftDotNetXUnitV3ExtensionsPackageVersion)" />
<PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion)" />
<PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelPackageVersion)" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion)" />
<PackageVersion Include="Microsoft.Extensions.FileProviders.Abstractions" Version="$(MicrosoftExtensionsFileProvidersAbstractionsPackageVersion)" />
Expand Down
114 changes: 58 additions & 56 deletions eng/Version.Details.props
View file
Open in desktop

Large diffs are not rendered by default.

228 changes: 116 additions & 112 deletions eng/Version.Details.xml
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
"$host$"
],
"errorMessage": "The .NET SDK is not installed or is not configured correctly. Please run ./build to install the correct SDK version locally.",
"version": "11.0.100-rc.1.26425.128",
"version": "11.0.100-rc.2.26504.105",
"allowPrerelease": true,
"rollForward": "latestFeature"
},
"tools": {
"dotnet": "11.0.100-rc.1.26425.128",
"dotnet": "11.0.100-rc.2.26504.105",
"runtimes": {
"dotnet": [
"$(MicrosoftNETCorePlatformsPackageVersion)"
Expand All @@ -27,8 +27,8 @@
"runner": "Microsoft.Testing.Platform"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26508.107",
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26508.107",
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26529.105",
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26529.105",
"Microsoft.Build.NoTargets": "3.7.134",
"Microsoft.Build.Traversal": "4.1.82",
"Microsoft.WixToolset.Sdk": "6.0.3-dotnet.6",
Expand Down
7 changes: 4 additions & 3 deletions src/Layout/redist/tools/tool_projectdata.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@
<TargetFramework>$(SdkTargetFramework)</TargetFramework>
<GenerateDependencyFile>false</GenerateDependencyFile>
<CopyBuildOutputToPublishDirectory>false</CopyBuildOutputToPublishDirectory>
<!-- Only content files are harvested from Microsoft.NET.ProjectData.Tasks, so don't pin its
transitive NuGet dependencies to this band's NuGet version. -->
<CentralPackageTransitivePinningEnabled>false</CentralPackageTransitivePinningEnabled>
<!-- The package's publish output includes runtime dependencies as well as the harvested content.
Keep those dependencies on source-built versions in source-build, but don't pin them to this
SDK band's NuGet versions in regular builds. -->
<CentralPackageTransitivePinningEnabled Condition="'$(DotNetBuildSourceOnly)' != 'true'">false</CentralPackageTransitivePinningEnabled>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 2 additions & 0 deletions src/Workloads/Manifests/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
'$(PrereleaseVersionLabel)' != 'servicing'">-$(PreReleaseVersionLabel)</_workloadVersionSuffix>
<!-- Append the version iteration if it's not empty -->
<_workloadVersionSuffix Condition="'$(_workloadVersionSuffix)' != '' and '$(PrereleaseVersionIteration)' != ''">$(_workloadVersionSuffix).$(PrereleaseVersionIteration)</_workloadVersionSuffix>
<!-- Overridden versions must use the selected 1xx branding, not this branch's branding. -->
<_workloadVersionSuffix Condition="'$(DotNet1xxWorkloadManifestVersion)' != ''">$(DotNet1xxWorkloadManifestPackageIdSuffix)</_workloadVersionSuffix>
<PackageId>$(MSBuildProjectName)-$(BuiltinWorkloadFeatureBand)$(_workloadVersionSuffix)</PackageId>
<PackageId Condition="'$(MSBuildProjectName)' == 'Microsoft.NET.Workload.Emscripten.Current.Transport.Manifest'">Microsoft.NET.Workload.Emscripten.Current.Manifest-$(BuiltinWorkloadFeatureBand).Transport</PackageId>
</PropertyGroup>
Expand Down
8 changes: 4 additions & 4 deletions src/Workloads/VSInsertion/workloads.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,11 +174,11 @@

<!-- MSI packages for ManifestPackagesToDownload -->
<!-- Manifest packages are not RID-specific, add MSI packages for all three architectures -->
<PackageDownload Include="%(ManifestPackagesToDownload.Identity)-$(BuiltInWorkloadFeatureBand).Msi.x86"
<PackageDownload Include="%(ManifestPackagesToDownload.Identity)-$(BuiltInWorkloadFeatureBand)$(DotNet1xxWorkloadManifestPackageIdSuffix).Msi.x86"
Version="[$(DotNet1xxWorkloadManifestVersion)]" />
<PackageDownload Include="%(ManifestPackagesToDownload.Identity)-$(BuiltInWorkloadFeatureBand).Msi.x64"
<PackageDownload Include="%(ManifestPackagesToDownload.Identity)-$(BuiltInWorkloadFeatureBand)$(DotNet1xxWorkloadManifestPackageIdSuffix).Msi.x64"
Version="[$(DotNet1xxWorkloadManifestVersion)]" />
<PackageDownload Include="%(ManifestPackagesToDownload.Identity)-$(BuiltInWorkloadFeatureBand).Msi.arm64"
<PackageDownload Include="%(ManifestPackagesToDownload.Identity)-$(BuiltInWorkloadFeatureBand)$(DotNet1xxWorkloadManifestPackageIdSuffix).Msi.arm64"
Version="[$(DotNet1xxWorkloadManifestVersion)]" />
</ItemGroup>
</Target>
Expand Down Expand Up @@ -214,7 +214,7 @@
<DownloadedWorkloadMsis Include="$(NuGetPackageRoot)\%(RuntimeWorkloadPacksToDownload.Identity).Msi.*\$(DotNet1xxRuntimeVersion)\*.nupkg"
Condition="'%(RuntimeWorkloadPacksToDownload.ExcludeAsMsi)' != 'true'" />
<DownloadedWorkloadMsis Include="$(NuGetPackageRoot)\%(EmsdkWorkloadPacksToDownload.Identity).Msi.*\$(DotNet1xxRuntimeVersion)\*.nupkg" />
<DownloadedWorkloadMsis Include="$(NuGetPackageRoot)\%(ManifestPackagesToDownload.Identity)-$(BuiltInWorkloadFeatureBand).Msi.*\$(DotNet1xxWorkloadManifestVersion)\*.nupkg" />
<DownloadedWorkloadMsis Include="$(NuGetPackageRoot)\%(ManifestPackagesToDownload.Identity)-$(BuiltInWorkloadFeatureBand)$(DotNet1xxWorkloadManifestPackageIdSuffix).Msi.*\$(DotNet1xxWorkloadManifestVersion)\*.nupkg" />
</ItemGroup>

<!-- Copy to shipping packages directory so they appear as build outputs -->
Expand Down
Loading