Use the $(UserProfile) MSBuild macro where possible

AArnott · deepakaravindr · commit 746dd342c811 · 2015-10-13T19:31:33.000-07:00
The MSBuild [projectname].nuget.targets files should use this macro instead of a hard-coded path that includes the username so that the generated file can be shared by multiple users.
diff --git a/src/NuGet.Core/NuGet.Commands/MSBuildRestoreResult.cs b/src/NuGet.Core/NuGet.Commands/MSBuildRestoreResult.cs
@@ -13,6 +13,14 @@ namespace NuGet.Commands
 {
     public class MSBuildRestoreResult
     {
+        /// <summary>
+        /// The macros that we may use in MSBuild to replace path roots.
+        /// </summary>
+        private static readonly string[] MacroCandidates = new[]
+        {
+            "UserProfile", // e.g. C:\users\myusername
+        };
+
         /// <summary>
         /// Gets a boolean indicating if the necessary MSBuild file could be generated
         /// </summary>
@@ -101,6 +109,23 @@ public void Commit(ILogger log)
                 }
             }
         }
+
+        private static string ReplacePathsWithMacros(string path)
+        {
+            foreach (var macroName in MacroCandidates)
+            {
+                string macroValue = Environment.GetEnvironmentVariable(macroName);
+                if (path.StartsWith(macroValue, StringComparison.OrdinalIgnoreCase))
+                {
+                    path = $"$({macroName})\\{path.Substring(macroValue.Length)}";
+                }
+
+                break;
+            }
+
+            return path;
+        }
+
         private void GenerateMSBuildErrorFile(string path)
         {
             var ns = XNamespace.Get("http://schemas.microsoft.com/developer/msbuild/2003");
@@ -135,7 +160,7 @@ private void GenerateImportsFile(string path, IEnumerable<string> imports)
                     new XElement(ns + "PropertyGroup",
                         new XAttribute("Condition", "'$(NuGetPackageRoot)' == ''"),
 
-                        new XElement(ns + "NuGetPackageRoot", RepositoryRoot)),
+                        new XElement(ns + "NuGetPackageRoot", ReplacePathsWithMacros(RepositoryRoot))),
                     new XElement(ns + "ImportGroup", imports.Select(i =>
                         new XElement(ns + "Import",
                             new XAttribute("Project", Path.Combine("$(NuGetPackageRoot)", i)),
