Add inter-branch merge flow file #10274
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
f-alizada
changed the title
AR-May
approved these changes
Jun 20, 2024
f-alizada
changed the title
AR-May
approved these changes
Jun 21, 2024
maridematte
approved these changes
Jun 21, 2024
JanKrivanek
added a commit
that referenced
this pull request
Jul 8, 2024
* Final branding for 17.11 (#10270) * Final branding and public API version update * Update the regex for initial commit detection * Disable CustomAnalyzerTest * Delete CompatibilitySuppressions file * Add inter-branch merge flow file (#10274) * Add version to BuildResult 2 (#10288) Fixes #10208 Context We are adding a version field to this class to make the ResultsCache backwards compatible with at least 2 previous releases (meaning the newer VS can read a cache created by older VS). The cache is not forwards compatible (older versions of VS cannot read cache created by newer versions). The adding of a version field is done without a breaking change in 3 steps, each separated with at least 1 intermediate release. Execution plan: 1st step (done): Add a special key to the _savedEnvironmentVariables dictionary during the serialization. A workaround overload of the TranslateDictionary function is created to achieve it. The presence of this key will indicate that the version is serialized next. When serializing, add a key to the dictionary and serialize a version field. Do not actually save the special key to dictionary during the deserialization but read a version as a next field if it presents. 2nd step: Stop serialize a special key with the dictionary _savedEnvironmentVariables using the TranslateDictionary function workaround overload. Always serialize and de-serialize the version field. Continue to deserialize _savedEnvironmentVariables with the TranslateDictionary function workaround overload in order not to deserialize dictionary with the special keys. 3rd step: Stop using the TranslateDictionary function workaround overload during _savedEnvironmentVariables deserialization. Changes Made 1st step from above description. Testing Unit tests, manual tests, experimental insertion * Add CompatibilitySuppressions.xml --------- Co-authored-by: AR-May <[email protected]> Co-authored-by: Farhad Alizada <[email protected]> Co-authored-by: Jan Krivanek <[email protected]>
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.
Context
Introduction of the merge flow.
Changes Made
Testing
Testing was done manually:
https://github.com/f-alizada/msbuild/actions
Should be merged only after this: #10257 is merged