[automated] Merge branch 'vs18.0' => 'main' #12592
Merged
+19
−3
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
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=80&v=4){kind=small}
…#12584) Fixes part of #12486, but not all. ### Context This introduces a new Terminal Logger Parameter (`DISABLENODEDISPLAY`) that disables the live-updating node display portion of the Terminal Logger output. This output is very wasteful when LLMs are running the build, and the hope is that we can toggle this flag automatically at the dotnet CLI level to maintain the structure benefits of TL while also not flooding the context. ### Changes Made * introduced a new parameter and threaded it through the logic ### Testing * Manual testing done - verified that the flag does in fact disable the display entirely. https://github.com/user-attachments/assets/f6e9f74b-77c2-46be-a1ae-7d974d5d7348 ### Notes This will use the logic from dotnet/sdk#51054 in the SDK to turn off the live-update feature. Co-authored-by: Chet Husk <[email protected]>
Backport of #12594 to vs18.0 Fixes https://dev.azure.com/devdiv/DevDiv/_workitems/edit/2586915/ ### Context the recent change ac5fef4#diff-40f77147ccc6867c10324ec4ddf8110ede2e43499d939b73ef83c7f5febb7a75 doesn't have null check on an attempt to get property from `_environmentVariableProperties ` collection that can be null. ### Changes Made Handle possible null ref exception. ### More details In the referenced ticket you can find a dump and check the callstack of exception and exact line that throws: ``` 0:000> !ip2md 00007FFE726D8367 MethodDesc: 00007ffe71fca150 Method Name: Microsoft.Build.Execution.ProjectInstance..ctor(Microsoft.Build.Execution.ProjectInstance, Boolean, Microsoft.Build.Execution.RequestedProjectState) Class: 00007ffe7221bdc8 MethodTable: 00007ffe72018e50 mdToken: 00000000060015c7 Module: 00007ffe71fb1000 IsJitted: yes CodeAddr: 00007ffe726d79b0 Transparency: Critical **Source file: /_/src/Build/Instance/ProjectInstance.cs @ 848** ``` and the ProjectInstance with _environmentVariableProperties = null ``` 0:000> !do 0000020eeb96b220 Name: Microsoft.Build.Execution.ProjectInstance MethodTable: 00007ffe72018e50 EEClass: 00007ffe7221bdc8 Size: 256(0x100) bytes File: C:\Program Files\Microsoft Visual Studio\18\Preview\MSBuild\Current\Bin\Microsoft.Build.dll Fields: MT Field Offset Type VT Attr Value Name 00007ffe720565b0 400079f 8 ...Microsoft.Build]] 0 instance 0000000000000000 _actualTargets 00007ffe720564e8 40007a0 10 ...Microsoft.Build]] 0 instance 0000000000000000 _targets 00007fff11f93348 40007a1 18 ...tring, mscorlib]] 0 instance 0000000000000000 _defaultTargets 00007fff11f93348 40007a2 20 ...tring, mscorlib]] 0 instance 0000000000000000 _initialTargets 00007fff11f88eb0 40007a3 28 ...tring, mscorlib]] 0 instance 0000000000000000 _importPaths 00007fff11f88eb0 40007a4 30 ...tring, mscorlib]] 0 instance 0000000000000000 _importPathsIncludingDuplicates 00007ffe7201de08 40007a5 38 ...Microsoft.Build]] 0 instance 0000020eeb96b320 _globalProperties 00007fff106d03a0 40007a6 40 ...tring, mscorlib]] 0 instance 0000000000000000 _globalPropertiesToTreatAsLocal 00007fff11f9c638 40007a7 f4 System.Boolean 1 instance 0 _explicitToolsVersionSpecified 00007ffe7201de08 40007a8 48 ...Microsoft.Build]] 0 instance 0000020eeb96bee0 _properties 00007ffe7201de08 40007a9 50 ...Microsoft.Build]] **0 instance 0000000000000000 _environmentVariableProperties** 00007ffe7201de08 40007aa 58 ...Microsoft.Build]] 0 instance 0000000000000000 _sdkResolvedEnvironmentVariableProperties 00007ffe72079e88 40007ab 60 ...Microsoft.Build]] 0 instance 0000020eeb96c890 _items 00007ffe7207b3a8 40007ac 68 ...Microsoft.Build]] 0 instance 0000000000000000 _itemsByEvaluatedInclude 00007fff11fa07a0 40007ad 70 System.String 0 instance 0000000000000000 _directory 00007ffe72025028 40007ae 78 ...n.ElementLocation 0 instance 0000000000000000 _projectFileLocation 00007ffe720797f8 40007af 80 ...Microsoft.Build]] 0 instance 0000000000000000 _itemDefinitions 00007ffe7202af50 40007b0 88 ...tion.HostServices 0 instance 0000000000000000 _hostServices 00007fff11f9c638 40007b1 f5 System.Boolean 1 instance 0 _usingDifferentToolsVersionFromProjectFile 00007fff11fa07a0 40007b2 90 System.String 0 instance 0000000000000000 _originalProjectToolsVersion 00007fff11f9c638 40007b3 f6 System.Boolean 1 instance 1 _isImmutable 00007ffe7205ac40 40007b4 98 ...ild]], mscorlib]] 0 instance 0000000000000000 _beforeTargets 00007ffe7205ac40 40007b5 a0 ...ild]], mscorlib]] 0 instance 0000000000000000 _afterTargets 00007ffe72021a70 40007b6 a8 ...valuation.Toolset 0 instance 0000000000000000 _toolset 00007fff11fa07a0 40007b7 b0 System.String 0 instance 0000000000000000 _subToolsetVersion 00007ffe720307d0 40007b8 b8 ...tion.TaskRegistry 0 instance 0000000000000000 _taskRegistry 00007fff11f9c638 40007b9 f7 System.Boolean 1 instance 0 _translateEntireState 00007fff11fa3368 40007ba f0 System.Int32 1 instance -1 _evaluationId 00007ffe7202bc58 40007bb c0 ...estedProjectState 0 instance 0000020eeb96c438 _requestedProjectStateFilter 00007ffe720568e0 40007bc c8 ...Microsoft.Build]] 0 instance 0000000000000000 <EvaluatedItemElements>k__BackingField 00007fff11f88f10 40007bd d0 ...tring, mscorlib]] 0 instance 0000000000000000 <ImportPaths>k__BackingField 00007fff11f88f10 40007be d8 ...tring, mscorlib]] 0 instance 0000000000000000 <ImportPathsIncludingDuplicates>k__BackingField 00007ffe7201f388 40007bf e0 ...tElementCacheBase 0 instance 0000000000000000 <ProjectRootElementCache>k__BackingField 00007ffe72030320 40007c0 e8 ...ng.LoggingContext 0 instance 0000000000000000 _loggingContext ``` ### Testing Manual Co-authored-by: YuliiaKovalova <[email protected]>
> [!NOTE] > This is a codeflow update. It may contain both source code changes from [the VMR](https://github.com/dotnet/dotnet) as well as dependency updates. Learn more [here](https://github.com/dotnet/dotnet/tree/main/docs/Codeflow-PRs.md). This pull request brings the following source code changes [marker]: <> (Begin:0ca9ffca-5797-48b7-89c1-0247660753a9) ## From https://github.com/dotnet/dotnet - **Subscription**: [0ca9ffca-5797-48b7-89c1-0247660753a9](https://maestro.dot.net/subscriptions?search=0ca9ffca-5797-48b7-89c1-0247660753a9) - **Build**: [20250929.15](https://dev.azure.com/dnceng/internal/_build/results?buildId=2804886) ([285185](https://maestro.dot.net/channel/5173/github:dotnet:dotnet/build/285185)) - **Date Produced**: September 30, 2025 6:46:10 AM UTC - **Commit**: [e72b5bbe719d747036ce9c36582a205df9f1c361](dotnet/dotnet@e72b5bb) - **Commit Diff**: [7f2a07b...e72b5bb](dotnet/dotnet@7f2a07b...e72b5bb) - **Branch**: [release/10.0.1xx](https://github.com/dotnet/dotnet/tree/release/10.0.1xx) [marker]: <> (End:0ca9ffca-5797-48b7-89c1-0247660753a9) [marker]: <> (Start:Footer:CodeFlow PR) ## Associated changes in source repos - dotnet/arcade@fac534d...a4c9a07 - dotnet/aspnetcore@52453ff...8d29610 - dotnet/cecil@2a768f2...27abc57 - dotnet/deployment-tools@fb3ca08...c0c5287 - dotnet/diagnostics@a321e26...46edddd - dotnet/efcore@5f505fd...3c78edc - dotnet/emsdk@8e74ba4...36bb709 - dotnet/fsharp@7903428...8d12fd3 - NuGet/NuGet.Client@6a593d0...28eeb09 - dotnet/razor@64d0011...909624c - dotnet/roslyn@633a6e3...7831533 - dotnet/runtime@d1691e1...e04af3c - dotnet/sdk@b4882e0...b7b9812 - dotnet/source-build-reference-packages@2994715...fdb961b - dotnet/symreader@9994998...26c6c31 - dotnet/templating@b67630f...fcc5f29 - microsoft/vstest@4d2e4b0...e3d46be - dotnet/windowsdesktop@5cf429a...e2dc1b2 - dotnet/winforms@687601b...2b94716 - dotnet/wpf@e103fb8...a94c8eb [marker]: <> (End:Footer:CodeFlow PR) --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
|
This pull request has been updated. This PR merges commits made on vs18.0 by the following committers:
|
|
This pull request has been updated. This PR merges commits made on vs18.0 by the following committers:
|
1 similar comment
|
This pull request has been updated. This PR merges commits made on vs18.0 by the following committers:
|
Fixes an error /azure-pipelines/vs-insertion.yml (Line: 94, Col: 7): 'value' is already defined That arose because we needed an elseif after the new clause.
|
This pull request has been updated. This PR merges commits made on vs18.0 by the following committers:
|
JanProvaznik
approved these changes
Oct 6, 2025
AR-May
added a commit
that referenced
this pull request
Oct 6, 2025
Moving version label near to version prefix hoping that we will introduce merge conflicts on version label when merging release branch to main. See #12592 (comment)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
I detected changes in the vs18.0 branch which have not been merged yet to main. I'm a robot and am configured to help you automatically keep main up to date, so I've opened this PR.
This PR merges commits made on vs18.0 by the following committers:
Instructions for merging from UI
This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, not a squash or rebase commit.
If this repo does not allow creating merge commits from the GitHub UI, use command line instructions.
Instructions for merging via command line
Run these commands to merge this pull request from the command line.
or if you are using SSH
After PR checks are complete push the branch
Instructions for resolving conflicts
Instructions for updating this pull request
Contributors to this repo have permission update this pull request by pushing to the branch 'merge/vs18.0-to-main'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.
The provided examples assume that the remote is named 'origin'. If you have a different remote name, please replace 'origin' with the name of your remote.
or if you are using SSH
Contact .NET Core Engineering (dotnet/dnceng) if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/main/.github/workflows/scripts/inter-branch-merge.ps1.