add a version property to the inserted component#280
Merged
tmat merged 2 commits intodotnet:masterfrom Jul 13, 2018
brettfo:vsman-version
Merged
add a version property to the inserted component#280tmat merged 2 commits intodotnet:masterfrom brettfo:vsman-version
version property to the inserted component#280tmat merged 2 commits intodotnet:masterfrom
brettfo:vsman-version
Conversation
This was referenced Jun 21, 2018
jasonmalinowski
approved these changes
Jun 21, 2018
brettfo
commented
Jun 21, 2018
| <_Args Include="SetupOutputPath=$(VisualStudioSetupInsertionPath)"/> | ||
| <_Args Include="ComponentIntermediateOutputPath=$(VisualStudioSetupIntermediateOutputPath)$(_ComponentName)\"/> | ||
| <_Args Include="SwixBuildPath=$(NuGetPackageRoot)microbuild.plugins.swixbuild\$(MicroBuildPluginsSwixBuildVersion)\"/> | ||
| <_Args Include="ManifestBuildVersion=$(ManifestBuildVersion)" /> |
Member
Author
There was a problem hiding this comment.
Consumers of the repo toolset will need to specify this value (see dotnet/project-system#3669) and update their toolset reference. The change is such that if only one of these changes (the property or the toolset update) is accepted, then nothing will break, but the .vsman files just won't have the new info/buildVersion property.
Member
There was a problem hiding this comment.
Why is this not set directly to VsixVersion?
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
This is to make other internal tooling better able to handle merge conflicts by adding a version for each inserted component.
The
.vsmanfiles used for insertion will be scanned for ainfo/buildVersionproperty which will be forwarded into aversionproperty in the config JSON file. See dotnet/fsharp#5226.