From 05ad10ffba2034f33f36ab8bf15d65f9a84231ab Mon Sep 17 00:00:00 2001
From: Nick Guerrera <nicholg@microsoft.com>
Date: Fri, 18 Oct 2019 18:11:18 -0700
Subject: [PATCH] Fix build

---
 eng/Version.Details.xml                     | 11 ++++++-----
 eng/Versions.props                          |  2 +-
 src/redist/targets/BundledTemplates.targets |  1 +
 src/redist/targets/GenerateLayout.targets   |  2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 4927bf516..699792a2f 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -17,7 +17,11 @@
       <Uri>https://github.com/dotnet/core-setup</Uri>
       <Sha>3daa0867abd7693bc654d9b02cdfe957428b36f1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.DotNetAppHost" Version="3.1.0-preview2.19517.10">
+    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.1.0-preview2.19517.10">
+      <Uri>https://github.com/dotnet/core-setup</Uri>
+      <Sha>3daa0867abd7693bc654d9b02cdfe957428b36f1</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="3.1.0-preview2.19517.10">
       <Uri>https://github.com/dotnet/core-setup</Uri>
       <Sha>3daa0867abd7693bc654d9b02cdfe957428b36f1</Sha>
     </Dependency>
@@ -25,10 +29,7 @@
       <Uri>https://github.com/dotnet/core-setup</Uri>
       <Sha>3daa0867abd7693bc654d9b02cdfe957428b36f1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.1.0-preview2.19517.10">
-      <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>3daa0867abd7693bc654d9b02cdfe957428b36f1</Sha>
-    </Dependency>
+    <!-- Change blob version in GenerateLayout.targets if this is unpinned to service targeting pack -->
     <!-- No new netstandard.library planned for 3.1 timeframe at this time. -->
     <Dependency Name="NETStandard.Library.Ref" Version="2.1.0" Pinned="true">
       <Uri>https://github.com/dotnet/core-setup</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index d4988c8a6..1fad89461 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -63,7 +63,7 @@
     <!-- Dependencies from https://github.com/dotnet/core-setup -->
     <MicrosoftNETCoreAppInternalPackageVersion>3.1.0-preview2.19517.10</MicrosoftNETCoreAppInternalPackageVersion>
     <MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.0-preview2.19517.10</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
-    <MicrosoftNETCoreAppHostwinx64PackageVersion>3.1.0-preview2.19516.1</MicrosoftNETCoreAppHostwinx64PackageVersion>
+    <MicrosoftNETCoreAppHostwinx64PackageVersion>3.1.0-preview2.19517.10</MicrosoftNETCoreAppHostwinx64PackageVersion>
     <MicrosoftNETCoreAppRefPackageVersion>3.1.0-preview2.19517.10</MicrosoftNETCoreAppRefPackageVersion>
     <MicrosoftNETCoreDotNetHostResolverPackageVersion>3.1.0-preview2.19517.10</MicrosoftNETCoreDotNetHostResolverPackageVersion>
     <MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>3.1.0-preview2.19517.10</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets
index f98cef149..02c0a1a2c 100644
--- a/src/redist/targets/BundledTemplates.targets
+++ b/src/redist/targets/BundledTemplates.targets
@@ -126,6 +126,7 @@
                      Version="[$(MicrosoftDotNetCommonItemTemplates21PackageVersion)];
                               [$(MicrosoftDotNetCommonItemTemplates22PackageVersion)]; 
                               [$(MicrosoftDotNetCommonItemTemplates30PackageVersion)];
+                              [$(MicrosoftDotNetCommonItemTemplates31PackageVersion)];
                               " />
 
     <PackageDownload Update="Microsoft.DotNet.Web.Spa.ProjectTemplates"
diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets
index 142501dd2..b5f0f53ea 100644
--- a/src/redist/targets/GenerateLayout.targets
+++ b/src/redist/targets/GenerateLayout.targets
@@ -16,7 +16,7 @@
 
     <!-- Change these individually to or $(CoreSetupBlobVersion), $(AspNetCoreBlobVersion), or appropriate fixed version depending if corresponding .Ref packages are unpinned. -->
     <NETCoreAppTargetingPackBlobVersion>$(CoreSetupBlobVersion)</NETCoreAppTargetingPackBlobVersion>
-    <AspNetCoreTargetingPackBlobVersion>$(CoreSetupBlobVersion)</AspNetCoreTargetingPackBlobVersion>
+    <AspNetCoreTargetingPackBlobVersion>$(AspNetCoreBlobVersion)</AspNetCoreTargetingPackBlobVersion>
     <WindowsDesktopTargetingPackBlobVersion>$(CoreSetupBlobVersion)</WindowsDesktopTargetingPackBlobVersion>
     <NETStandardTargetingPackBlobVersion>3.0.0</NETStandardTargetingPackBlobVersion>
   </PropertyGroup>