Skip to content

Commit

Permalink
Convert solution relative paths to OS slashes
Browse files Browse the repository at this point in the history
Fixes dotnet#2022, fixes dotnet#1957.

Ported the code change only from mono@86adc96.
  • Loading branch information
rainersigwald committed Feb 7, 2018
1 parent 5cd9c11 commit f0c8eb8
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions src/Build/Construction/Solution/ProjectInSolution.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
using System.Security;
using System.Text;
using System.Xml;
using Microsoft.Build.Shared;

using XMakeAttributes = Microsoft.Build.Shared.XMakeAttributes;
using ProjectFileErrorUtilities = Microsoft.Build.Shared.ProjectFileErrorUtilities;
using BuildEventFileInfo = Microsoft.Build.Shared.BuildEventFileInfo;
using ErrorUtilities = Microsoft.Build.Shared.ErrorUtilities;
using System.Collections.ObjectModel;
using System.Linq;

namespace Microsoft.Build.Construction
{
Expand Down Expand Up @@ -155,7 +155,11 @@ public string ProjectName
public string RelativePath
{
get { return _relativePath; }
internal set { _relativePath = value; }
internal set
{
_relativePath = FileUtilities.MaybeAdjustFilePath(value,
baseDirectory:this.ParentSolution.SolutionFileDirectory ?? String.Empty);
}
}

/// <summary>
Expand Down

0 comments on commit f0c8eb8

Please sign in to comment.