Merge pull request #751 from dotnet/master

Update live with current master

Author: mairaw

core/extensions/DllMapDemo/Demo.cs

@@ -0,0 +1,24 @@
+using System;
+using System.IO;
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+public class DllMapDemo
+{
+    public static void Main()
+    {
+        try
+        {
+            DllMap.Register(Assembly.GetExecutingAssembly());
+            int thirty = NativeSum(10, 20);
+            Console.WriteLine($"OldLib.NativeSum(10,20) = {thirty}");
+        }
+        catch (Exception e)
+        {
+            Console.WriteLine($"Error: {e.Message} Line: {e.Source}");
+        }
+    }
+
+    [DllImport("OldLib")]
+    static extern int NativeSum(int arg1, int arg2);
+}

core/extensions/DllMapDemo/Demo.csproj

@@ -0,0 +1,11 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+  </PropertyGroup>
+  <ItemGroup>
+    <None Include="Demo.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+</Project>

core/extensions/DllMapDemo/Demo.xml

@@ -0,0 +1,3 @@
+<configuration>
+    <dllmap dll="OldLib" target="NewLib"/>
+</configuration>

core/extensions/DllMapDemo/Map.cs

@@ -0,0 +1,46 @@
+using System;
+using System.Collections;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Xml.Linq;
+
+public static class DllMap
+{
+    // Register a call-back for native library resolution.
+    public static void Register(Assembly assembly)
+    {
+        NativeLibrary.SetDllImportResolver(assembly, MapAndLoad);
+    }
+
+    // The callback: which loads the mapped libray in place of the original
+    private static IntPtr MapAndLoad(string libraryName, Assembly assembly, DllImportSearchPath? dllImportSearchPath)
+    {
+        string mappedName = null;
+        mappedName = MapLibraryName(assembly.Location, libraryName, out mappedName) ? mappedName : libraryName;
+        return NativeLibrary.Load(mappedName, assembly, dllImportSearchPath);
+    }
+
+    // Parse the assembly.xml file, and map the old name to the new name of a library.
+    private static bool MapLibraryName(string assemblyLocation, string originalLibName, out string mappedLibName)
+    {
+        string xmlPath = Path.Combine(Path.GetDirectoryName(assemblyLocation),
+            Path.GetFileNameWithoutExtension(assemblyLocation) + ".xml");
+        mappedLibName = null;
+
+        if (!File.Exists(xmlPath))
+            return false;
+
+        XElement root = XElement.Load(xmlPath);
+        var map =
+            (from el in root.Elements("dllmap")
+             where (string)el.Attribute("dll") == originalLibName
+             select el).SingleOrDefault();
+
+        if (map != null)
+            mappedLibName = map.Attribute("target").Value;
+
+        return (mappedLibName != null);
+    }
+}

core/extensions/DllMapDemo/NewLib.cpp

@@ -0,0 +1,12 @@
+#include <stdio.h>
+
+#if defined(__GNUC__)
+#define EXPORT extern "C" __attribute__((visibility("default")))
+#elif defined(_MSC_VER)
+#define EXPORT extern "C" __declspec(dllexport)
+#endif 
+
+extern "C" EXPORT int NativeSum(int a, int b)
+{
+    return a + b;
+}

core/extensions/DllMapDemo/ReadMe.md

@@ -0,0 +1,31 @@
+# DllMap Demo
+
+This sample illustrates the use of NativeLibrary APIs to implement library name mappings similar to the [Mono](https://www.mono-project.com/) [Dllmap](http://www.mono-project.com/docs/advanced/pinvoke/dllmap/) feature.
+
+## NativeLibrary APIs
+
+.Net Core 3.0 provides a rich set of APIs to manage native libraries:
+
+- [NativeLibrary APIs](https://docs.microsoft.com/en-us/dotnet/api/system.runtime.interopservices.nativelibrary?view=netcore-3.0): Perform operations on native libraries (such as `Load()`, `Free()`, get the address of an exported  symbol, etc.) in a platform-independent way from managed code.
+- [DllImport Resolver callback](https://docs.microsoft.com/en-us/dotnet/api/system.runtime.interopservices.nativelibrary.setdllimportresolver?view=netcore-3.0):  Gets a callback for first-chance native library resolution using custom logic. 
+- [Native Library Resolve event](https://docs.microsoft.com/en-us/dotnet/api/system.runtime.loader.assemblyloadcontext.resolvingunmanageddll?view=netcore-3.0): Get an event for last-chance native library resolution using custom logic.   
+
+## Library Mapping
+
+These APIs can be used to implement custom native library resolution logic, including DllMap, as illustrated in this example. The sample demonstrates:
+
+- An [app](Demo.cs) that pInvokes a method in `OldLib`, but runs in an environment where only [`NewLib`](NewLib.cpp) is available.
+- The [XML file](Demo.xml) that maps the library name from `OldLib` to `NewLib`. 
+- The [Map](Map.cs) implementation, which parses the above mapping and uses `NativeLibrary` APIs to load the correct library.
+
+## Build and Run
+
+1. Install .NET Core 3.0 Preview 3 or newer.
+
+2. Use the .NET Core SDK to build the project via `dotnet build`.
+
+3. Build the native component `NewLib.cpp` as a dynamic library, using the platform's native toolset. 
+
+    Place the generated native library (`NewLib.dll` / `libNewLib.so` / `libNewLib.dylib`) in the `dotnet build` output directory.
+
+4. Run the app with `dotnet run`

snippets/csharp/VS_Snippets_CLR/environment.IsServerGC/CS/isg.cs

@@ -2,19 +2,19 @@
 using System;
 using System.Runtime;
 
-class Sample 
+class Sample
 {
-    public static void Main() 
+    public static void Main()
     {
-    string result;
+        string result;
 
-    if (GCSettings.IsServerGC == true)
-        result = "server";
-    else 
-        result = "workstation";
-    Console.WriteLine("The {0} garbage collector is running.", result);
+        if (GCSettings.IsServerGC == true)
+            result = "server";
+        else
+            result = "workstation";
+        Console.WriteLine("The {0} garbage collector is running.", result);
     }
 }
 // The example displays output like the following:
 //      The workstation garbage collector is running.
-//</snippet1>
+//</snippet1>

snippets/csharp/VS_Snippets_WebNet/System.Configuration.ConfigurationManager/CS/configurationmanager.cs

@@ -119,7 +119,7 @@ public static class UsingConfigurationManager
     // ConfigurationUserLevel userLevel) method to 
     // get the configuration file.
     // It also creates a custom ConsoleSection and 
-    // sets its ConsoleEment BackgroundColor and
+    // sets its ConsoleElement BackgroundColor and
     // ForegroundColor properties to blue and yellow
     // respectively. Then it uses these properties to
     // set the console colors.  
@@ -239,7 +239,7 @@ public static void GetRoamingConfiguration()
     // OpenExeConfiguration(string)method 
     // to get the application configuration file. 
     // It also creates a custom ConsoleSection and 
-    // sets its ConsoleEment BackgroundColor and
+    // sets its ConsoleElement BackgroundColor and
     // ForegroundColor properties to black and white
     // respectively. Then it uses these properties to
     // set the console colors.  
@@ -496,7 +496,7 @@ public static void MapMachineConfiguration()
     // This function uses the OpenMappedExeConfiguration 
     // method to access a new configuration file.   
     // It also gets the custom ConsoleSection and 
-    // sets its ConsoleEment BackgroundColor and
+    // sets its ConsoleElement BackgroundColor and
     // ForegroundColor properties to green and red
     // respectively. Then it uses these properties to
     // set the console colors.  
@@ -707,4 +707,4 @@ static void Main(string[] args)
   }
   #endregion
 
-// </Snippet1>
+// </Snippet1>

snippets/csharp/language-reference/keywords/switch/type-pattern.cs

@@ -34,7 +34,7 @@ private static void ShowCollectionInformation(object coll)
                break;
             case IEnumerable ie:
                string result = "";
-               foreach (var item in ie) 
+               foreach (var e in ie) 
                   result += "${e} ";
                Console.WriteLine(result);
                break;   

snippets/csharp/language-reference/keywords/switch/type-pattern2.cs

@@ -36,7 +36,7 @@ private static void ShowCollectionInformation(object coll)
         else if (coll is IEnumerable) { 
             IEnumerable ie = (IEnumerable) coll;
             string result = "";
-            foreach (var item in ie) 
+            foreach (var e in ie) 
                result += "${e} ";
             Console.WriteLine(result);
         }