Merge remote-tracking branch 'origin/master' into render-inside-win-ui-comp-tree

# Conflicts:
#	src/Avalonia.OpenGL/Angle/AngleEglInterface.cs

build/NetFX.props

@@ -1,7 +1,7 @@
 <Project>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-preview.2" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
   </ItemGroup>
 
 </Project>

src/Avalonia.DesignerSupport/Remote/HtmlTransport/HtmlTransport.cs

@@ -38,11 +38,13 @@ namespace Avalonia.DesignerSupport.Remote.HtmlTransport
         public HtmlWebSocketTransport(IAvaloniaRemoteTransportConnection signalTransport, Uri listenUri)
         {
             if (listenUri.Scheme != "http")
-                throw new ArgumentException("listenUri");
+                throw new ArgumentException("URI scheme is not HTTP.", nameof(listenUri));
 
             var resourcePrefix = "Avalonia.DesignerSupport.Remote.HtmlTransport.webapp.build.";
             _resources = typeof(HtmlWebSocketTransport).Assembly.GetManifestResourceNames()
-                .Where(r => r.StartsWith(resourcePrefix) && r.EndsWith(".gz")).ToDictionary(
+                .Where(r => r.StartsWith(resourcePrefix, StringComparison.OrdinalIgnoreCase)
+                         && r.EndsWith(".gz", StringComparison.OrdinalIgnoreCase))
+                .ToDictionary(
                     r => r.Substring(resourcePrefix.Length).Substring(0,r.Length-resourcePrefix.Length-3),
                     r =>
                     {

src/Avalonia.OpenGL/Angle/AngleEglInterface.cs

@@ -7,7 +7,7 @@ namespace Avalonia.OpenGL.Angle
 {
     public class AngleEglInterface : EglInterface
     {
-        [DllImport("libglesv2.dll", CharSet = CharSet.Ansi)]
+        [DllImport("avangle.dll", CharSet = CharSet.Ansi)]
         static extern IntPtr EGL_GetProcAddress(string proc);
 
         public AngleEglInterface() : base(LoadAngle())
@@ -17,14 +17,19 @@ namespace Avalonia.OpenGL.Angle
 
         static Func<string, IntPtr> LoadAngle()
         {
-            if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-                throw new PlatformNotSupportedException();
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
             {
                 var disp = EGL_GetProcAddress("eglGetPlatformDisplayEXT");
+
                 if (disp == IntPtr.Zero)
+                {
                     throw new OpenGlException("libegl.dll doesn't have eglGetPlatformDisplayEXT entry point");
-                return EGL_GetProcAddress;
+                }
+
+                return eglGetProcAddress;
             }
+            
+            throw new PlatformNotSupportedException();
         }
 
     }