From 1d9b77e255736f632b49266aac143de46062ff35 Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Tue, 20 Nov 2018 13:23:55 -0800
Subject: [PATCH] Import DotNetPackageVersionPropsPath into all sub-folder
 builds

---
 build/dependencies.props                        | 1 +
 src/IISIntegration/dependencies.overrides.props | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/build/dependencies.props b/build/dependencies.props
index bb75148f65..f68e6eeff1 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -114,6 +114,7 @@
     <MicrosoftEntityFrameworkCorePackageVersion>3.0.0-preview.18569.2</MicrosoftEntityFrameworkCorePackageVersion>
   </PropertyGroup>
 
+  <Import Project="$(DotNetPackageVersionPropsPath)" Condition=" '$(DotNetPackageVersionPropsPath)' != '' " />
   <Import Project="dependencies.folderbuilds.props" Condition=" '$(IsUniverseBuild)' != 'true' AND '$(DotNetPackageVersionPropsPath)' == ''" />
 
   <PropertyGroup>
diff --git a/src/IISIntegration/dependencies.overrides.props b/src/IISIntegration/dependencies.overrides.props
index c949d0a82d..9c1a843f93 100644
--- a/src/IISIntegration/dependencies.overrides.props
+++ b/src/IISIntegration/dependencies.overrides.props
@@ -3,8 +3,6 @@
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
 
-  <Import Project="$(DotNetPackageVersionPropsPath)" Condition=" '$(DotNetPackageVersionPropsPath)' != '' " />
-
   <PropertyGroup Label="Package Versions: Pinned">
   <!-- The AspNetCoreModule package versions are pinned to an older version for forwards and backwards compatibility tests. -->
     <MicrosoftAspNetCoreAspNetCoreModuleStablePackageVersion>2.2.0-preview3-35497</MicrosoftAspNetCoreAspNetCoreModuleStablePackageVersion>