From e0c575000fa7ffdc84a87e1d57beb643bcb2fed7 Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Fri, 26 Oct 2018 12:21:52 -0700
Subject: [PATCH] Ensure MicrosoftNETCoreAppPackageVersion is always defined

---
 build/dependencies.props          | 2 ++
 build/external-dependencies.props | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/build/dependencies.props b/build/dependencies.props
index 8bd8ba4adb..6a74f270ab 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -35,6 +35,8 @@
   <PropertyGroup>
     <!-- Assign this variable last because it may be updated from DotNetPackageVersionPropsPath as MicrosoftNETCoreAppPackageVersion. -->
     <MicrosoftNETCoreApp22PackageVersion Condition="'$(MicrosoftNETCoreAppPackageVersion)' != ''">$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreApp22PackageVersion>
+    <!-- Assign this variable to ensure they are consistent. -->
+    <MicrosoftNETCoreAppPackageVersion>$(MicrosoftNETCoreApp22PackageVersion)</MicrosoftNETCoreAppPackageVersion>
 
     <!-- Determined by build tools -->
     <MicrosoftAspNetCoreBuildToolsApiCheckPackageVersion>$(KoreBuildVersion)</MicrosoftAspNetCoreBuildToolsApiCheckPackageVersion>
diff --git a/build/external-dependencies.props b/build/external-dependencies.props
index 9ed3c8aebd..a0e9fdad8e 100644
--- a/build/external-dependencies.props
+++ b/build/external-dependencies.props
@@ -99,6 +99,8 @@
     <ExternalDependency Include="Microsoft.NETCore.App" Version="$(MicrosoftNETCoreApp20PackageVersion)" VariableName="MicrosoftNETCoreApp20PackageVersion" />
     <ExternalDependency Include="Microsoft.NETCore.App" Version="$(MicrosoftNETCoreApp21PackageVersion)" VariableName="MicrosoftNETCoreApp21PackageVersion" />
     <ExternalDependency Include="Microsoft.NETCore.App" Version="$(MicrosoftNETCoreApp22PackageVersion)" VariableName="MicrosoftNETCoreApp22PackageVersion" />
+    <!-- This variable should be used for anything that needs "latest" netcoreapp. -->
+    <ExternalDependency Include="Microsoft.NETCore.App" Version="$(MicrosoftNETCoreAppPackageVersion)" VariableName="MicrosoftNETCoreAppPackageVersion" />
 
     <!-- Microsoft.NetCore.DotNetAppHost for global tools-->
     <ExternalDependency Include="Microsoft.NETCore.DotNetAppHost" Version="$(MicrosoftNETCoreDotNetAppHost21PackageVersion)" VariableName="MicrosoftNETCoreDotNetAppHost21PackageVersion" />