Fix it for 'dotnet build' scenario

daxian-dbw · andyleejordan · commit ca28391b3886 · 2016-06-28T18:31:38.000-07:00
diff --git a/src/Microsoft.PowerShell.CoreCLR.AssemblyLoadContext/CoreCLR/CorePsAssemblyLoadContext.cs b/src/Microsoft.PowerShell.CoreCLR.AssemblyLoadContext/CoreCLR/CorePsAssemblyLoadContext.cs
@@ -189,6 +189,7 @@ protected override Assembly Load(AssemblyName assemblyName)
             if (useResolvingHandlerOnly)
                 throw new NotSupportedException(UseResolvingEventHandlerOnly);
 
+            System.Console.WriteLine("== LC1 == Requesting: {0}", assemblyName.FullName);
             return Resolve(this, assemblyName);
         }
 
@@ -246,6 +247,7 @@ private Assembly Resolve(AssemblyLoadContext loadContext, AssemblyName assemblyN
                 // In this case, return null so that other Resolving event handlers can kick in to resolve the request.
                 if (!isAssemblyFileFound || !isAssemblyFileMatching)
                 {
+                    System.Console.WriteLine("  -- Return null");
                     return null;
                 }
 
@@ -256,6 +258,7 @@ private Assembly Resolve(AssemblyLoadContext loadContext, AssemblyName assemblyN
                 {
                     // Add the loaded assembly to the cache
                     AssemblyCache.TryAdd(assemblyName.Name, asmLoaded);
+                    System.Console.WriteLine("  ++ Load succeed: {0}", asmLoaded.FullName);
                 }
             }
 
@@ -270,6 +273,7 @@ private Assembly Resolve(AssemblyLoadContext loadContext, AssemblyName assemblyN
         internal Assembly LoadFrom(string assemblyPath)
         {
             ValidateAssemblyPath(assemblyPath, "assemblyPath");
+            System.Console.WriteLine("*** LC1 *** LoadFrom {0}", assemblyPath);
 
             Assembly asmLoaded;
             AssemblyName assemblyName = GetAssemblyName(assemblyPath);
@@ -300,6 +304,7 @@ internal Assembly LoadFrom(string assemblyPath)
                     {
                         probingPaths.Add(parentPath);
                     }
+                    System.Console.WriteLine("  ++ LoadFrom succeed: {0}", asmLoaded.FullName);
                 }
             }
 
@@ -436,10 +441,28 @@ internal IEnumerable<string> GetAvailableDotNetTypes()
             return coreClrTypeCatalog.Keys;
         }
 
+        /// <summary>
+        /// Set the profile optimization root on the approprite load context
+        /// </summary>
+        internal void SetProfileOptimizationRootImpl(string directoryPath)
+        {
+            if (this.useResolvingHandlerOnly)
+                activeLoadContext.SetProfileOptimizationRoot(directoryPath);
+        }
+
+        /// <summary>
+        /// Start the profile optimization on the approprite load context
+        /// </summary>
+        internal void StartProfileOptimizationImpl(string profile)
+        {
+            if (this.useResolvingHandlerOnly)
+                activeLoadContext.StartProfileOptimization(profile);
+        }
+
         #endregion Protected_Internal_Methods
-        
+
         #region Private_Methods
-        
+
         /// <summary>
         /// Handle the AssemblyLoad event
         /// </summary>
diff --git a/src/System.Management.Automation/utils/ClrFacade.cs b/src/System.Management.Automation/utils/ClrFacade.cs
@@ -661,7 +661,7 @@ internal static void SetSafeWaitHandle(WaitHandle waitHandle, SafeWaitHandle val
         internal static void SetProfileOptimizationRoot(string directoryPath)
         {
 #if CORECLR
-            System.Runtime.Loader.AssemblyLoadContext.Default.SetProfileOptimizationRoot(directoryPath);
+            PSAssemblyLoadContext.SetProfileOptimizationRootImpl(directoryPath); 
 #else
             System.Runtime.ProfileOptimization.SetProfileRoot(directoryPath);
 #endif
@@ -674,7 +674,7 @@ internal static void SetProfileOptimizationRoot(string directoryPath)
         internal static void StartProfileOptimization(string profile)
         {
 #if CORECLR
-            System.Runtime.Loader.AssemblyLoadContext.Default.StartProfileOptimization(profile);
+            PSAssemblyLoadContext.StartProfileOptimizationImpl(profile); 
 #else
             System.Runtime.ProfileOptimization.StartProfile(profile);
 #endif
diff --git a/src/powershell/Program.cs b/src/powershell/Program.cs
@@ -25,6 +25,7 @@ public static int Main(string[] args)
             // Open PowerShell has to set the ALC here, since we don't own the native host
             string appBase = System.IO.Path.GetDirectoryName(typeof(ManagedPSEntry).GetTypeInfo().Assembly.Location);
             Console.WriteLine(" == APPBASE == {0}", appBase);
+            //Console.Read();
             return (int)PowerShellAssemblyLoadContextInitializer.
                            InitializeAndCallEntryMethod(
                                appBase,

Original file line number	Diff line number	Diff line change
`@@ -189,6 +189,7 @@ protected override Assembly Load(AssemblyName assemblyName)`
`189`	`189`	`if (useResolvingHandlerOnly)`
`190`	`190`	`throw new NotSupportedException(UseResolvingEventHandlerOnly);`
`191`	`191`
	`192`	`+ System.Console.WriteLine("== LC1 == Requesting: {0}", assemblyName.FullName);`
`192`	`193`	`return Resolve(this, assemblyName);`
`193`	`194`	`}`
`194`	`195`
`@@ -246,6 +247,7 @@ private Assembly Resolve(AssemblyLoadContext loadContext, AssemblyName assemblyN`
`246`	`247`	`// In this case, return null so that other Resolving event handlers can kick in to resolve the request.`
`247`	`248`	`if (!isAssemblyFileFound \|\| !isAssemblyFileMatching)`
`248`	`249`	`{`
	`250`	`+ System.Console.WriteLine(" -- Return null");`
`249`	`251`	`return null;`
`250`	`252`	`}`
`251`	`253`
`@@ -256,6 +258,7 @@ private Assembly Resolve(AssemblyLoadContext loadContext, AssemblyName assemblyN`
`256`	`258`	`{`
`257`	`259`	`// Add the loaded assembly to the cache`
`258`	`260`	`AssemblyCache.TryAdd(assemblyName.Name, asmLoaded);`
	`261`	`+ System.Console.WriteLine(" ++ Load succeed: {0}", asmLoaded.FullName);`
`259`	`262`	`}`
`260`	`263`	`}`
`261`	`264`
`@@ -270,6 +273,7 @@ private Assembly Resolve(AssemblyLoadContext loadContext, AssemblyName assemblyN`
`270`	`273`	`internal Assembly LoadFrom(string assemblyPath)`
`271`	`274`	`{`
`272`	`275`	`ValidateAssemblyPath(assemblyPath, "assemblyPath");`
	`276`	`+ System.Console.WriteLine("* LC1 * LoadFrom {0}", assemblyPath);`
`273`	`277`
`274`	`278`	`Assembly asmLoaded;`
`275`	`279`	`AssemblyName assemblyName = GetAssemblyName(assemblyPath);`
`@@ -300,6 +304,7 @@ internal Assembly LoadFrom(string assemblyPath)`
`300`	`304`	`{`
`301`	`305`	`probingPaths.Add(parentPath);`
`302`	`306`	`}`
	`307`	`+ System.Console.WriteLine(" ++ LoadFrom succeed: {0}", asmLoaded.FullName);`
`303`	`308`	`}`
`304`	`309`	`}`
`305`	`310`
`@@ -436,10 +441,28 @@ internal IEnumerable<string> GetAvailableDotNetTypes()`
`436`	`441`	`return coreClrTypeCatalog.Keys;`
`437`	`442`	`}`
`438`	`443`
	`444`	`+ /// <summary>`
	`445`	`+ /// Set the profile optimization root on the approprite load context`
	`446`	`+ /// </summary>`
	`447`	`+ internal void SetProfileOptimizationRootImpl(string directoryPath)`
	`448`	`+ {`
	`449`	`+ if (this.useResolvingHandlerOnly)`
	`450`	`+ activeLoadContext.SetProfileOptimizationRoot(directoryPath);`
	`451`	`+ }`
	`452`	`+`
	`453`	`+ /// <summary>`
	`454`	`+ /// Start the profile optimization on the approprite load context`
	`455`	`+ /// </summary>`
	`456`	`+ internal void StartProfileOptimizationImpl(string profile)`
	`457`	`+ {`
	`458`	`+ if (this.useResolvingHandlerOnly)`
	`459`	`+ activeLoadContext.StartProfileOptimization(profile);`
	`460`	`+ }`
	`461`	`+`
`439`	`462`	`#endregion Protected_Internal_Methods`
`440`		`-`
	`463`	`+`
`441`	`464`	`#region Private_Methods`
`442`		`-`
	`465`	`+`
`443`	`466`	`/// <summary>`
`444`	`467`	`/// Handle the AssemblyLoad event`
`445`	`468`	`/// </summary>`