From a058bc0c0a4b5a22c629bc6c4c65df1e3fdc6a0a Mon Sep 17 00:00:00 2001
From: John Luo <johluo@microsoft.com>
Date: Fri, 26 Oct 2018 00:22:35 -0700
Subject: [PATCH] Win-arm shared framework

---
 .azure/pipelines/ci-official.yml | 3 +++
 Directory.Build.props            | 1 +
 build/SharedFx.props             | 2 +-
 build/repo.props                 | 2 ++
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.azure/pipelines/ci-official.yml b/.azure/pipelines/ci-official.yml
index bf6f9e35a8..83d1ec95e4 100644
--- a/.azure/pipelines/ci-official.yml
+++ b/.azure/pipelines/ci-official.yml
@@ -44,6 +44,8 @@ phases:
     displayName: Build NuGet packages and win-x64 runtime
   - script: build.cmd -ci /p:SkipTests=true /p:Configuration=$(BuildConfiguration) /p:BuildNumber=$(Build.BuildNumber) /t:BuildSharedFx /p:SharedFxRID=win-x86
     displayName: Build win-x86 runtime
+  - script: build.cmd -ci /p:SkipTests=true /p:Configuration=$(BuildConfiguration) /p:BuildNumber=$(Build.BuildNumber) /t:BuildSharedFx /p:SharedFxRID=win-arm
+    displayName: Build win-arm runtime
   - powershell: >
       src/Installers/Windows/clone_and_build_ancm.ps1
       -GitCredential '$(dn-bot-devdiv-build-rw-code-rw)'
@@ -56,6 +58,7 @@ phases:
       src/Installers/Windows/build.ps1
       -x64 artifacts/runtime/aspnetcore-runtime-internal-2.2.0-preview3-$(Build.BuildNumber)-win-x64.zip
       -x86 artifacts/runtime/aspnetcore-runtime-internal-2.2.0-preview3-$(Build.BuildNumber)-win-x86.zip
+      -x86 artifacts/runtime/aspnetcore-runtime-internal-2.2.0-preview3-$(Build.BuildNumber)-win-arm.zip
       -Config $(BuildConfiguration)
       -BuildNumber $(Build.BuildNumber)
       -SignType $(_SignType)
diff --git a/Directory.Build.props b/Directory.Build.props
index 2ab01c9e29..fea1bad021 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -52,6 +52,7 @@
     <SupportedRuntimeIdentifiers>
       win-x64;
       win-x86;
+      win-arm;
       osx-x64;
       linux-musl-x64;
       linux-x64;
diff --git a/build/SharedFx.props b/build/SharedFx.props
index 87d90c2d8b..336628d8db 100644
--- a/build/SharedFx.props
+++ b/build/SharedFx.props
@@ -65,7 +65,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <WindowsSharedFxRIDs Include="win-x64;win-x86"/>
+    <WindowsSharedFxRIDs Include="win-x64;win-x86;win-arm"/>
     <NonWindowsSharedFxRIDs Include="osx-x64" CrossgenSymbols="false" />
     <NonWindowsSharedFxRIDs Include="linux-musl-x64" />
     <NonWindowsSharedFxRIDs Include="linux-x64" />
diff --git a/build/repo.props b/build/repo.props
index 3b9e529aba..f96923abea 100644
--- a/build/repo.props
+++ b/build/repo.props
@@ -18,6 +18,7 @@
     <IntermediateInstaller Include="win-x86" FileExt=".wixlib" />
     <IntermediateInstaller Include="win-x64" FileExt=".zip" />
     <IntermediateInstaller Include="win-x64" FileExt=".wixlib" />
+    <IntermediateInstaller Include="win-arm" FileExt=".zip" />
     <IntermediateInstaller Include="osx-x64" FileExt=".tar.gz" />
     <IntermediateInstaller Include="linux-x64" FileExt=".tar.gz" />
     <IntermediateInstaller Include="linux-arm" FileExt=".tar.gz" />
@@ -27,6 +28,7 @@
     <NativeInstaller Include="win-x86" FileExt=".zip" />
     <NativeInstaller Include="win-x64" FileExt=".exe" />
     <NativeInstaller Include="win-x64" FileExt=".zip" />
+    <NativeInstaller Include="win-arm" FileExt=".zip" />
     <NativeInstaller Include="osx-x64" FileExt=".tar.gz" />
     <NativeInstaller Include="linux-x64" FileExt=".tar.gz" />
     <NativeInstaller Include="linux-arm" FileExt=".tar.gz" />