[automated] Merge branch 'vs17.9' => 'main' #9559
Merged
Conversation
This file contains 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
* Disable localization for vs17.8 * Bump version
This was added in dotnet#9193 but not usable in VS.
…otnet#9558) Fixes dotnet#9131 Context As described on the issue, muti-targeted builds did not import the .user file on the outer build. This change makes the outer build import the .user file. Changes Made Added import reference to .user file in Microsoft.Common.CrossTargeting.targets . Testing Test is in SDK repo (dotnet/sdk#37192)
|
This pull request has been updated. This PR merges commits made on vs17.9 by the following committers: |
…ndencies (dotnet#9503) Fixes dotnet#9500 Previously the code was considering all projects when building up the solution dependencies and later that was blowing up due to including projects which weren't built. This moves the logic to the same loop that already filters projects which don't build so should be (trivially) more efficient anyway.
|
This pull request has been updated. This PR merges commits made on vs17.9 by the following committers: |
Handle InvalidProjectFileExceptions as expected/user errors. Add \n to errors logged by SimpleErrorLogger. Fixes dotnet#9394
|
This pull request has been updated. This PR merges commits made on vs17.9 by the following committers: |
…erator (dotnet#9470) * Pass submissionId to the BuildEventContext used by SolutionProjectGenerator When evaluating the generated .sln.metaproj, we do pass a valid submissionId, but then we don't use it when creating the BuildEventContext used by the ProjectInstance to log evaluation events. So evaluation logging events end up having SubmissionId == -1, and thus the loggers registered with the MuxLogger in the IDE do not get the evaluation events. Fixes dotnet#9469 * Ensure that BuildEventContext passed to LoadSolutionForBuild has a valid SubmissionId This way Metaproject generated and other events get properly routed to MuxLogger and other loggers that care about the SubmissionId.
|
This pull request has been updated. This PR merges commits made on vs17.9 by the following committers: |
* darc update-dependencies --id 199769 This should be the GA 8.0 build. * Add Tasks.Dataflow and Channels deps ``` darc add-dependency --name System.Threading.Channels --repo https://dev.azure.com/dnceng/internal/_git/dotnet-runtime --version 8.0.0 --commit 5535e31a712343a63f5d7d796cd874e563e5ac14 --type product darc add-dependency --name System.Threading.Channels --repo https://dev.azure.com/dnceng/internal/_git/dotnet-runtime --version 8.0.0 --commit 5535e31a712343a63f5d7d796cd874e563e5ac14 --type product ``` * Binding redirect updates to 8.0 versions * extend SourceBuildPrebuiltBaseline to new patterns
|
This pull request has been updated. This PR merges commits made on vs17.9 by the following committers: |
Conflicts: eng/Versions.props
|
This pull request has been updated. This PR merges commits made on vs17.9 by the following committers: |
* Combine GetProperties with UpdateProperties functionality. Remove public UpdateProperties from TelemetryBase
|
This pull request has been updated. This PR merges commits made on vs17.9 by the following committers: |
Fixes dotnet#9562 by triggering a full-line redraw when the length of the duration string increases.
…otnet#9557) * Update dependencies from https://github.com/nuget/nuget.client build 6.9.0.64 NuGet.Build.Tasks From Version 6.9.0-preview.1.50 -> To Version 6.9.0-preview.1.64 * Update dependencies from https://github.com/dotnet/roslyn build 20231215.7 Microsoft.Net.Compilers.Toolset From Version 4.9.0-3.23608.9 -> To Version 4.9.0-3.23615.7 --------- 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 vs17.9 by the following committers: |
|
This pull request has been updated. This PR merges commits made on vs17.9 by the following committers: |
…: Build ID 8812032 (dotnet#9495) * Localized file check-in by OneLocBuild Task: Build definition ID 9434: Build ID 8767374 * Localized file check-in by OneLocBuild Task: Build definition ID 9434: Build ID 8767374 * Localized file check-in by OneLocBuild Task: Build definition ID 9434: Build ID 8801027 * Localized file check-in by OneLocBuild Task: Build definition ID 9434: Build ID 8801027 * Localized file check-in by OneLocBuild Task: Build definition ID 9434: Build ID 8805704 * Localized file check-in by OneLocBuild Task: Build definition ID 9434: Build ID 8806682 * Localized file check-in by OneLocBuild Task: Build definition ID 9434: Build ID 8806775 * Localized file check-in by OneLocBuild Task: Build definition ID 9434: Build ID 8806775 * Localized file check-in by OneLocBuild Task: Build definition ID 9434: Build ID 8812032 * Localized file check-in by OneLocBuild Task: Build definition ID 9434: Build ID 8812032 --------- Co-authored-by: AR-May <67507805+AR-May@users.noreply.github.com>
|
This pull request has been updated. This PR merges commits made on vs17.9 by the following committers: |
AR-May
approved these changes
Dec 21, 2023
YuliiaKovalova
approved these changes
Dec 21, 2023
|
This pull request has been updated. This PR merges commits made on vs17.9 by the following committers: |
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 vs17.9 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 vs17.9 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/vs17.9-to-main'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.
or if you are using SSH
Contact .NET Core Engineering if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/master/scripts/GitHubMergeBranches.ps1.