Fixed regression on mono

- Use HOME instead of ProgramFiles - Removed tracing for replacement attempts #974
aspnet · Dec 6, 2014 · a5f8100 · a5f8100
1 parent 7a3d13e
commit a5f8100
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/Microsoft.Framework.Runtime/Servicing/ServicingIndex.cs b/src/Microsoft.Framework.Runtime/Servicing/ServicingIndex.cs
@@ -84,8 +84,6 @@ public void Initialize(string folderPath)
 
         public bool TryGetReplacement(string packageId, SemanticVersion packageVersion, string assetPath, out string replacementPath)
         {
-            Trace.TraceInformation("[{0}]: TryGetReplacement {1} {2} {3}", GetType().Name, packageId, packageVersion, assetPath);
-
             Entry entry;
             if (_entries.TryGetValue(new EntryKey(packageId, packageVersion), out entry))
             {

diff --git a/src/Microsoft.Framework.Runtime/Servicing/ServicingTable.cs b/src/Microsoft.Framework.Runtime/Servicing/ServicingTable.cs
@@ -31,11 +31,15 @@ private static ServicingIndex LoadIndex()
                 var kreServicing = Environment.GetEnvironmentVariable("KRE_SERVICING");
                 if (string.IsNullOrEmpty(kreServicing))
                 {
+                    var servicingRoot = Environment.GetEnvironmentVariable("ProgramFiles") ??
+                                        Environment.GetEnvironmentVariable("HOME");
+
                     kreServicing = Path.Combine(
-                        Environment.GetEnvironmentVariable("ProgramFiles"),
+                        servicingRoot,
                         "KRE",
                         "Servicing");
                 }
+
                 index.Initialize(kreServicing);
                 return index;
             });