Skip to content

17.10 to main manual - #10000

Merged
rainersigwald merged 4 commits into
dotnet:mainfrom
surayya-MS:17.10-to-main-manual
Apr 11, 2024
Merged

rainersigwald merged 4 commits into
dotnet:mainfrom
surayya-MS:17.10-to-main-manual

Conversation

@surayya-MS

Copy link
Copy Markdown
Member

The purpose of this PR is to preserve the commits that were squashed when merged in https://github.com/dotnet/msbuild/pull/9992/commits

dotnet-bot and others added 4 commits April 10, 2024 16:14
* Localized file check-in by OneLocBuild Task: Build definition ID 9434: Build ID 9347357

* Localized file check-in by OneLocBuild Task: Build definition ID 9434: Build ID 9347357

* Localized file check-in by OneLocBuild Task: Build definition ID 9434: Build ID 9394753

* Localized file check-in by OneLocBuild Task: Build definition ID 9434: Build ID 9394753

* Remove spurious `Ł` character in Italian version string

---------

Co-authored-by: Rainer Sigwald <raines@microsoft.com>
Fixes AB#2017198 by releasing the handle to the file by disposing the AssemblyInformation deterministically.

@rainersigwald rainersigwald left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wanted to fast-forward merge this to avoid the GitHub merge commit on top of your merge commit but main has moved so oh well.

@rainersigwald
rainersigwald merged commit b158ddb into dotnet:main Apr 11, 2024
@surayya-MS
surayya-MS deleted the 17.10-to-main-manual branch April 22, 2024 08:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

4 participants