From 07d014ab324719bd0f7aea734f1842d55f08d797 Mon Sep 17 00:00:00 2001
From: John Luo <jt.luo@mail.utoronto.ca>
Date: Thu, 14 Dec 2017 16:10:08 -0800
Subject: [PATCH] January patch fixes

---
 build/RuntimeStore.targets                    | 41 +++++++++++++++++--
 build/RuntimeStoreInstaller.targets           |  9 ++--
 .../tools/packaging/store_debian_config.json  |  2 +-
 .../HostingStartup/HostingStartup.csproj      | 11 +++++
 version.props                                 |  1 +
 5 files changed, 55 insertions(+), 9 deletions(-)

diff --git a/build/RuntimeStore.targets b/build/RuntimeStore.targets
index 876dccc6ee..b99613bebf 100644
--- a/build/RuntimeStore.targets
+++ b/build/RuntimeStore.targets
@@ -148,7 +148,40 @@
              Properties="$(_ComposeStoreProps)" />
   </Target>
 
+  <Target Name="_BuildHostingDeps" >
+    <PropertyGroup>
+      <HostingStartupWorkDir>$(_WorkRoot)HostingStartup\</HostingStartupWorkDir>
+      <_HostingStartupProps>DepsOutputPath=$(_DepsOutputDirectory)</_HostingStartupProps>
+      <_HostingStartupProps>$(_HostingStartupProps);DotNetRestoreSourcesPropsPath=$(GeneratedRestoreSourcesPropsPath)</_HostingStartupProps>
+      <_HostingStartupProps>$(_HostingStartupProps);RuntimeFrameworkVersion=$(MicrosoftNETCoreApp20PackageVersion)</_HostingStartupProps>
+      <_HostingStartupProps>$(_HostingStartupProps);HostingStartupPackageName=$(HostingStartupPackageName)</_HostingStartupProps>
+      <_HostingStartupProps>$(_HostingStartupProps);HostingStartupPackageVersion=$(HostingStartupPackageVersion)</_HostingStartupProps>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <HostingStartupFiles Include="$(_TemplatesDirectory)HostingStartup\**\*" />
+    </ItemGroup>
+
+    <!-- Clear working directory -->
+    <RemoveDir Directories="$(HostingStartupWorkDir)bin" />
+    <RemoveDir Directories="$(HostingStartupWorkDir)obj" />
+
+    <!-- Copy build assets -->
+    <Copy SourceFiles="@(HostingStartupFiles)" DestinationFolder="$(HostingStartupWorkDir)\%(RecursiveDir)" />
+
+    <!--- Workaround for https://github.com/dotnet/sdk/issues/1779 -->
+    <MSBuild Projects="$(HostingStartupWorkDir)HostingStartup.csproj"
+             Targets="Restore"
+             Properties="$(_HostingStartupProps);_SolutionTarget=Restore" />
+
+    <!--- MSBuild caches things if you run inproc so have to use Exec -->
+    <MSBuild Projects="$(HostingStartupWorkDir)HostingStartup.csproj"
+             Targets="Build;CollectDeps"
+             Properties="$(_HostingStartupProps)" />
+  </Target>
+
   <Target Name="BuildHostingDeps" DependsOnTargets="ResolveRepoInfo">
+
     <!-- Generate RS.Reference project -->
     <RepoTasks.ResolveHostingStartupPackages
       BuildArtifacts="@(ArtifactInfo)"
@@ -156,10 +189,10 @@
       <Output TaskParameter="HostingStartupArtifacts" ItemName="HostingStartupArtifacts" />
     </RepoTasks.ResolveHostingStartupPackages>
 
-    <!--- MSBuild caches things if you run inproc so have to use Exec -->
-    <MSBuild Projects="$(_TemplatesDirectory)HostingStartup/HostingStartup.csproj"
-             Targets="Restore;Rebuild;CollectDeps"
-             Properties="DepsOutputPath=$(_DepsOutputDirectory);HostingStartupPackageName=%(HostingStartupArtifacts.PackageId);HostingStartupPackageVersion=%(HostingStartupArtifacts.Version);RuntimeFrameworkVersion=$(MicrosoftNETCoreApp20PackageVersion)" />
+    <MSBuild
+      Projects="$(MSBuildProjectFullPath)"
+      Targets="_BuildHostingDeps"
+      Properties="HostingStartupPackageName=%(HostingStartupArtifacts.PackageId);HostingStartupPackageVersion=%(HostingStartupArtifacts.Version)" />
 
     <ItemGroup>
       <DepsFiles Include="$(_DepsOutputDirectory)**\*.deps.json" />
diff --git a/build/RuntimeStoreInstaller.targets b/build/RuntimeStoreInstaller.targets
index 315cde6a0c..c55fb09c65 100644
--- a/build/RuntimeStoreInstaller.targets
+++ b/build/RuntimeStoreInstaller.targets
@@ -304,8 +304,8 @@
       <RHStoreDirectories Include="$(RHInstallerInstallRoot)store" />
       <GenericStoreDirectories Include="$(GenericInstallerInstallRoot)additionalDeps" />
       <GenericStoreDirectories Include="$(GenericInstallerInstallRoot)store" />
-      <RSDependencies Include="$(RSInstallerName)-2.0.0">
-        <Version>2.0.0</Version>
+      <RSDependencies Include="$(RSInstallerName)-$(RuntimeStoreInstallerDependencyVersion)">
+        <Version>$(RuntimeStoreInstallerDependencyVersion)</Version>
       </RSDependencies>
       <HostingDependencies Include="$(RSInstallerName)-$(PackageVersion)">
         <Version>$(PackageVersion)</Version>
@@ -409,6 +409,7 @@
     <ItemGroup>
       <DebConfigItems Include="DOTNET_VERSION" Replacement="$(DotnetVersion)" />
       <DebConfigItems Include="DEB_VERSION" Replacement="$(DebVersion)" />
+      <DebConfigItems Include="RS_DEP_VERSION" Replacement="$(RsDepVersion)" />
     </ItemGroup>
 
     <!-- Update versions -->
@@ -464,11 +465,11 @@
     <MSBuild
       Projects="$(MSBuildProjectFullPath)"
       Targets="_GenerateDeb"
-      Properties="$(CommonRSArguments);RSArchive=$(TimestampRSArchive);DebVersion=$(Version)" />
+      Properties="$(CommonRSArguments);RSArchive=$(TimestampRSArchive);DebVersion=$(Version);RsDepVersion=$(RuntimeStoreInstallerDependencyVersion)" />
     <MSBuild
       Projects="$(MSBuildProjectFullPath)"
       Targets="_GenerateDeb"
-      Properties="$(CommonRSArguments);RSArchive=$(TimestampFreeLinuxRSArchive);DebVersion=$(PackageVersionNoTimestamp)" />
+      Properties="$(CommonRSArguments);RSArchive=$(TimestampFreeLinuxRSArchive);DebVersion=$(PackageVersionNoTimestamp);RsDepVersion=$(RuntimeStoreInstallerDependencyVersion)" />
     <MSBuild
       Projects="$(MSBuildProjectFullPath)"
       Targets="_GenerateDeb"
diff --git a/build/tools/packaging/store_debian_config.json b/build/tools/packaging/store_debian_config.json
index 70dffe42a9..880cba3a38 100644
--- a/build/tools/packaging/store_debian_config.json
+++ b/build/tools/packaging/store_debian_config.json
@@ -29,6 +29,6 @@
     },
 
     "debian_dependencies": {
-        "aspnetcore-store-2.0.0": {}
+        "aspnetcore-store-RS_DEP_VERSION": {}
     }
 }
\ No newline at end of file
diff --git a/build/tools/templates/HostingStartup/HostingStartup.csproj b/build/tools/templates/HostingStartup/HostingStartup.csproj
index dbb96336d5..5c165b8f0e 100644
--- a/build/tools/templates/HostingStartup/HostingStartup.csproj
+++ b/build/tools/templates/HostingStartup/HostingStartup.csproj
@@ -1,8 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
+  <Import Project="$(DotNetRestoreSourcePropsPath)" Condition="'$(DotNetRestoreSourcePropsPath)' != ''"/>
+
   <PropertyGroup>
     <TargetFramework>netcoreapp2.0</TargetFramework>
     <OutputType>Exe</OutputType>
+    <RestoreSources>$(DotNetRestoreSources)</RestoreSources>
+    <RestoreSources Condition="'$(DotNetBuildOffline)' != 'true' AND '$(AspNetUniverseBuildOffline)' != 'true' ">
+      $(RestoreSources);
+      https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json;
+    </RestoreSources>
+    <RestoreSources Condition="'$(DotNetBuildOffline)' != 'true'">
+      $(RestoreSources);
+      https://api.nuget.org/v3/index.json;
+    </RestoreSources>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/version.props b/version.props
index bc7193fb8e..1b4a62e7b2 100644
--- a/version.props
+++ b/version.props
@@ -1,5 +1,6 @@
 <Project>
   <PropertyGroup>
+    <RuntimeStoreInstallerDependencyVersion>2.0.3</RuntimeStoreInstallerDependencyVersion>
     <VersionPrefix>2.0.5</VersionPrefix>
     <VersionSuffix>rtm</VersionSuffix>
     <PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' == 'rtm' ">$(VersionPrefix)</PackageVersion>