Merge main branch to release/dnup #51827
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…false for file-based apps using default SDK (dotnet#51542) Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: jjonescz <3669664+jjonescz@users.noreply.github.com> Co-authored-by: Jan Jones <janjones@microsoft.com>
Co-authored-by: marcpopMSFT <12663534+marcpopMSFT@users.noreply.github.com>
Merging with force because the known issue is not relevant to the branding change.
Merging with force because the known issue is not relevant to the branding change.
…c28-4eaf-adba-4031b4acc786
…105.4 On relative base path root Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.25515.2 -> To Version 9.0.0-beta.25555.4
…105.4 On relative base path root Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.25515.2 -> To Version 9.0.0-beta.25555.4
…efaultNoneItems to false for file-based apps using default SDK (dotnet#51593) Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: jjonescz <3669664+jjonescz@users.noreply.github.com> Co-authored-by: Jan Jones <janjones@microsoft.com>
…538-40e7-bbbf-aff67dc52e26
…a-4e21-af15-47b6e255c9ce
…merge/release/9.0.1xx-to-release/9.0.3xx
…0251107.1 On relative base path root Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Mocks From Version 9.0.112-servicing.25520.5 -> To Version 9.0.113-servicing.25557.1 Microsoft.TemplateEngine.Abstractions From Version 9.0.112 -> To Version 9.0.113
[[ commit created by automation ]]
…9c5d-555f720457d0
Updated Dependencies: Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal, Microsoft.CodeAnalysis.Razor.Tooling.Internal, Microsoft.NET.Sdk.Razor.SourceGenerators.Transport (Version 10.0.0-preview.25502.107 -> 10.0.0-preview.25556.109) Microsoft.Build, Microsoft.Build.Localization, Microsoft.NET.Test.Sdk, Microsoft.TestPlatform.Build, Microsoft.TestPlatform.CLI (Version 18.0.0-preview-25502-107 -> 18.1.0-preview-25556-109) Microsoft.Build.NuGetSdkResolver, NuGet.Build.Tasks, NuGet.Build.Tasks.Console, NuGet.Build.Tasks.Pack, NuGet.CommandLine.XPlat, NuGet.Commands, NuGet.Common, NuGet.Configuration, NuGet.Credentials, NuGet.DependencyResolver.Core, NuGet.Frameworks, NuGet.LibraryModel, NuGet.Localization, NuGet.Packaging, NuGet.ProjectModel, NuGet.Protocol, NuGet.Versioning (Version 7.0.0-rc.307 -> 7.0.0-preview.2.5709) Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.BuildClient, Microsoft.CodeAnalysis.CSharp, Microsoft.CodeAnalysis.CSharp.CodeStyle, Microsoft.CodeAnalysis.CSharp.Features, Microsoft.CodeAnalysis.CSharp.Workspaces, Microsoft.CodeAnalysis.PublicApiAnalyzers, Microsoft.CodeAnalysis.Workspaces.Common, Microsoft.CodeAnalysis.Workspaces.MSBuild, Microsoft.Net.Compilers.Toolset, Microsoft.Net.Compilers.Toolset.Framework (Version 5.0.0-2.25502.107 -> 5.3.0-1.25556.109) Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Installers, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Build.Tasks.Workloads, Microsoft.DotNet.Helix.Sdk, Microsoft.DotNet.SignTool, Microsoft.DotNet.XliffTasks, Microsoft.DotNet.XUnitExtensions (Version 10.0.0-beta.25522.2 -> 10.0.0-beta.25556.109) Microsoft.FSharp.Compiler (Version 14.0.100-rc2.25502.107 -> 15.0.200-servicing.25556.109) Microsoft.TemplateEngine.Abstractions, Microsoft.TemplateEngine.Authoring.TemplateVerifier, Microsoft.TemplateEngine.Edge, Microsoft.TemplateEngine.Mocks, Microsoft.TemplateEngine.Orchestrator.RunnableProjects, Microsoft.TemplateEngine.TestHelper, Microsoft.TemplateEngine.Utils, Microsoft.TemplateSearch.Common, Microsoft.TemplateSearch.TemplateDiscovery (Version 10.0.100-rc.2.25502.107 -> 10.0.100-rc.2.25556.109) Added Dependencies: Microsoft.CodeAnalysis.ExternalAccess.HotReload (Version 5.3.0-1.25556.109)
- VS uses the local appdata, VS versioned folder, sdk.txt file to determine whether or not to accept preview sdks - VS Release rejects preview SDKs by default which causes the msbuild sdk resolver to not find sdks, as msbuild respects the vs settings - This changes the vs settings to enable our internal SDKs to be found by msbuild when it's going under test. - Possible improvements: this PR assumes sdk.txt content ordering does not matter - based on VS code this appears to be true but could change in the future Also tried: - modifying global.json to enable preview sdks, which was not enough. some tests have a custom global.json and it seems to not take precedence setting env vars such as msbuildsdks which did not take precedence over the vs setting This commit is a condensed version of the work done in dotnet#51591 and dotnet#51598
…VisitQualifiedName
… merge/release/10.0.1xx-to-release/10.0.2xx
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: SimonZhao888 <133954995+SimonZhao888@users.noreply.github.com> Co-authored-by: Noah Gilson <noahgilson@microsoft.com> Co-authored-by: DonnaChen888 <v-donnachen@microsoft.com> Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: marcpopMSFT <12663534+marcpopMSFT@users.noreply.github.com> Co-authored-by: Marc Paine <marcpop@microsoft.com> Co-authored-by: jonathanpeppers <840039+jonathanpeppers@users.noreply.github.com> Co-authored-by: Daniel Plaisted <daplaist@microsoft.com> Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
…otnet#51723) Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: jjonescz <3669664+jjonescz@users.noreply.github.com>
# Conflicts: # eng/Version.Details.props # eng/Version.Details.xml # eng/common/core-templates/job/publish-build-assets.yml # eng/common/core-templates/post-build/post-build.yml # global.json
…lable (dotnet#51792) Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: Youssef1313 <31348972+Youssef1313@users.noreply.github.com> Co-authored-by: Youssef Victor <youssefvictor00@gmail.com>
…cef-4c48-a65b-32c3d9e8702f
…251119.2 On relative base path root Microsoft.Testing.Platform From Version 2.1.0-preview.25553.3 -> To Version 2.1.0-preview.25569.2 MSTest From Version 4.1.0-preview.25553.3 -> To Version 4.1.0-preview.25569.2
…se/10.0.2xx-to-main
# Conflicts: # src/Cli/dotnet/Telemetry/EnvironmentDetectionRule.cs # test/UnitTests.proj
marcpopMSFT
approved these changes
Nov 20, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
15 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.