From 84157041bca3953591988421abdbe97a823358ec Mon Sep 17 00:00:00 2001
From: John Luo <jt.luo@mail.utoronto.ca>
Date: Wed, 11 Oct 2017 17:43:59 -0700
Subject: [PATCH] Update properties fore restore on CI

---
 build/PackageArchive.targets                 | 4 ++--
 build/tools/templates/Archive/Archive.csproj | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/build/PackageArchive.targets b/build/PackageArchive.targets
index a78b6c6408..0465a73e55 100644
--- a/build/PackageArchive.targets
+++ b/build/PackageArchive.targets
@@ -4,7 +4,7 @@
     <_WorkRoot>$(RepositoryRoot).w\</_WorkRoot>
   </PropertyGroup>
 
-  <Target Name="_BuildFallbackArchive" DependsOnTargets="ResolveRepoInfo">
+  <Target Name="_BuildFallbackArchive" DependsOnTargets="ResolveRepoInfo;_ResolveCurrentSharedFrameworkVersion">
     <Error Text="DotNetRestoreSources must be specified" Condition=" '$(DotNetRestoreSources)' == '' " />
     <Error Text="OutputPackageName must be specified" Condition=" '$(OutputPackageName)' == '' " />
     <Error Text="ArchiverPath must be specified" Condition=" '$(ArchiverPath)' == '' " />
@@ -37,7 +37,7 @@
     <MSBuild
       Projects="$(_WorkRoot)Archive.csproj"
       Targets="Restore"
-      Properties="RestorePackagesPath=$(FallbackStagingDir);DotNetRestoreSources=$(DotNetRestoreSources);AspNetUniverseBuildOffline=true" />
+      Properties="RestorePackagesPath=$(FallbackStagingDir);RuntimeFrameworkVersion=$(SharedFrameworkVersion);DotNetRestoreSources=$(DotNetRestoreSources);AspNetUniverseBuildOffline=true" />
 
     <!-- Create the archive -->
     <Exec Command="$(ArchiverPath) -a $(FallbackOutputArchive) $(FallbackStagingDir)" />
diff --git a/build/tools/templates/Archive/Archive.csproj b/build/tools/templates/Archive/Archive.csproj
index 252842049b..baa0ab2068 100644
--- a/build/tools/templates/Archive/Archive.csproj
+++ b/build/tools/templates/Archive/Archive.csproj
@@ -5,6 +5,7 @@
     <EnableApiCheck>false</EnableApiCheck>
     <DotnetCliToolTargetFramework>netcoreapp2.0</DotnetCliToolTargetFramework>
     <RestoreSources>$(DotNetRestoreSources)</RestoreSources>
+    <RestoreSources>$(RestoreSources);https://dotnet.myget.org/F/dotnet-core/api/v3/index.json;</RestoreSources>
     <RestoreSources Condition="'$(DotNetBuildOffline)' != 'true' AND '$(AspNetUniverseBuildOffline)' != 'true' ">
       $(RestoreSources);
       https://dotnet.myget.org/F/aspnet-2-0-2-october2017-patch/api/v3/index.json;