From 3902730301a994821223802a05350d231ccc2f97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Pedro?= <jpedrolmail@gmail.com>
Date: Fri, 13 Sep 2019 15:14:28 +0100
Subject: [PATCH 1/2] Use Microsoft.NETFramework.ReferenceAssemblies.

---
 build/NetFX.props | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/build/NetFX.props b/build/NetFX.props
index 4d2841714b..ed5cb6dd69 100644
--- a/build/NetFX.props
+++ b/build/NetFX.props
@@ -1,11 +1,7 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net461' and '$(OS)' == 'Unix' ">
-    <FrameworkPathOverride>/usr/lib/mono/4.6.1-api</FrameworkPathOverride>
-    <FrameworkPathOverride Condition="$([MSBuild]::IsOsPlatform('OSX'))">/Library/Frameworks/Mono.framework/Versions/Current/lib/mono/4.6.1-api</FrameworkPathOverride>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net47' and '$(OS)' == 'Unix' ">
-    <FrameworkPathOverride>/usr/lib/mono/4.7-api/</FrameworkPathOverride>
-    <FrameworkPathOverride Condition="$([MSBuild]::IsOsPlatform('OSX'))">/Library/Frameworks/Mono.framework/Versions/Current/lib/mono/4.7-api</FrameworkPathOverride>
-  </PropertyGroup>
+<Project>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-preview.2" PrivateAssets="All" />
+  </ItemGroup>
 
 </Project>

From 16a8ff862b32dbdb3113dcd5f84bc21aaf13ee59 Mon Sep 17 00:00:00 2001
From: Yatao Li <yatli@microsoft.com>
Date: Mon, 16 Sep 2019 00:49:27 +0800
Subject: [PATCH 2/2] X11: map super to win key

---
 src/Avalonia.X11/X11KeyTransform.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.X11/X11KeyTransform.cs b/src/Avalonia.X11/X11KeyTransform.cs
index 87a4174c06..59f1da564c 100644
--- a/src/Avalonia.X11/X11KeyTransform.cs
+++ b/src/Avalonia.X11/X11KeyTransform.cs
@@ -104,8 +104,8 @@ namespace Avalonia.X11
             {X11Key.x, Key.X},
             {X11Key.y, Key.Y},
             {X11Key.z, Key.Z},
-            {X11Key.Meta_L, Key.LWin },
-            {X11Key.Meta_R, Key.RWin },
+            {X11Key.Super_L, Key.LWin },
+            {X11Key.Super_R, Key.RWin },
             {X11Key.Menu, Key.Apps},
             //{ X11Key.?, Key.Sleep }
             {X11Key.KP_0, Key.NumPad0},