VS 2015 RTM - csproj xml node Project\ProjectExtensions\VisualStudio\UserProperties attribute order differs based on machine that saves file

[davkean]

From @bbarry on November 4, 2015 18:21

When 2 or more people make changes to a project that has multiple properties stored on the UserProperties tag, the order of the properties on the attribute appears to depend on order that code runs to set the attributes.

I have several csproj files with

<ProjectExtensions>
  <VisualStudio>
    <UserProperties 
      PingPoet_SlashDocs_DocCommentIncludeFileBasePath="...removed..." 
      PingPoet_SlashDocs_SlashDocPathReplacePattern="...removed..." 
      PingPoet_SlashDocs_SlashDocPathMatchPattern="^...removed...$" />
  </VisualStudio>
</ProjectExtensions>

(the node is on one line).

With the project file in source control and multiple developers, this line changes every time a dev makes any change to the file. This results in merge conflicts very often as in this case there are 6 possible ways to have that line.

Copied from original issue: dotnet/roslyn#6556

[Eli-Black-Work]

We're also seeing this in Visual Studio 2017.

[davkean]

We have fixed this in the new project system and now persist in machine agnostic order, existing projects will benefit from this when the new project system starts opening .NET Framework-based projects in the future.

Microsofties, PR is here: https://devdiv.visualstudio.com/DevDiv/_git/CPS/pullrequest/225250.

[davkean]

This fix has been merged. Make explicit note that existing .NET Framework projects will not benefit until they are opened in the new project system, something that is planned but we have no date.