From 40292a53d0232782f6c68a5cc03ee8b9e75c45cb Mon Sep 17 00:00:00 2001
From: Tomas Weinfurt <tweinfurt@yahoo.com>
Date: Tue, 15 Jan 2019 22:15:06 +0000
Subject: [PATCH 1/3] small improvements for build on ARM

---
 Directory.Build.props | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Directory.Build.props b/Directory.Build.props
index fef460b50a10..d25a3bfbe68e 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -55,6 +55,9 @@
     <TargetGroup Condition="'$(TargetGroup)' == ''">netcoreapp</TargetGroup>
     <OSGroup Condition="'$(OSGroup)' == ''">$(DefaultOSGroup)</OSGroup>
     <ConfigurationGroup Condition="'$(ConfigurationGroup)' == ''">Debug</ConfigurationGroup>
+    <HostArch>$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture)</HostArch>
+    <ArchGroup Condition="'$(ArchGroup)' == '' AND '$(HostArch)' == 'Arm'">arm</ArchGroup>
+    <ArchGroup Condition="'$(ArchGroup)' == '' AND '$(HostArch)' == 'Arm64'">arm64</ArchGroup>
     <ArchGroup Condition="'$(ArchGroup)' == ''">x64</ArchGroup>
 
     <!-- Initialize BuildConfiguration from the individual properties if it wasn't already explicitly set -->
@@ -285,6 +288,8 @@
 
     <!-- Rhel 6 and FreeBSD doesn't support the source control git package so disable SourceLink -->
     <EnableSourceLink Condition="$(RuntimeOS.StartsWith('rhel.6')) OR '$(_runtimeOSFamily)' == 'FreeBSD'">false</EnableSourceLink>
+    <EnableSourceLinkCondition="'$(HostArch)' == 'Arm' OR '$(HostArch)' == 'Arm64'">false</EnableSourceLink>
+
   </PropertyGroup>
 
   <!-- Set up Default symbol and optimization for Configuration -->

From 98f62f1ac851015a343c726582ba94f76c31f53a Mon Sep 17 00:00:00 2001
From: Tomas Weinfurt <toweinfurt@microsoft.com>
Date: Tue, 15 Jan 2019 14:55:36 -0800
Subject: [PATCH 2/3] add missing space

---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index d25a3bfbe68e..981cdbd4600a 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -288,7 +288,7 @@
 
     <!-- Rhel 6 and FreeBSD doesn't support the source control git package so disable SourceLink -->
     <EnableSourceLink Condition="$(RuntimeOS.StartsWith('rhel.6')) OR '$(_runtimeOSFamily)' == 'FreeBSD'">false</EnableSourceLink>
-    <EnableSourceLinkCondition="'$(HostArch)' == 'Arm' OR '$(HostArch)' == 'Arm64'">false</EnableSourceLink>
+    <EnableSourceLink Condition="'$(HostArch)' == 'Arm' OR '$(HostArch)' == 'Arm64'">false</EnableSourceLink>
 
   </PropertyGroup>
 

From 6cf86b94bc153618acd5f67124d99835d63de080 Mon Sep 17 00:00:00 2001
From: Tomas Weinfurt <tweinfurt@yahoo.com>
Date: Wed, 16 Jan 2019 18:26:41 +0000
Subject: [PATCH 3/3] add note about SourceLink on ARM

---
 Directory.Build.props | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Directory.Build.props b/Directory.Build.props
index d25a3bfbe68e..dffcd673c257 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -288,6 +288,7 @@
 
     <!-- Rhel 6 and FreeBSD doesn't support the source control git package so disable SourceLink -->
     <EnableSourceLink Condition="$(RuntimeOS.StartsWith('rhel.6')) OR '$(_runtimeOSFamily)' == 'FreeBSD'">false</EnableSourceLink>
+    <!-- is is not supported on ARM platforms either. -->
     <EnableSourceLinkCondition="'$(HostArch)' == 'Arm' OR '$(HostArch)' == 'Arm64'">false</EnableSourceLink>
 
   </PropertyGroup>