From 50391c0341d7e11e295410065b90d48fc295ffcd Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Wed, 27 Dec 2017 13:30:38 -0800
Subject: [PATCH] Ensure PackageVersion is set when computing sharedfx output
 path

---
 build/SharedFx.targets | 6 ++++++
 build/repo.props       | 1 -
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/build/SharedFx.targets b/build/SharedFx.targets
index af69b181ad..ad33177c66 100644
--- a/build/SharedFx.targets
+++ b/build/SharedFx.targets
@@ -2,6 +2,10 @@
   <Import Project="common.props" />
   <Import Project="SharedFx.props" />
 
+  <PropertyGroup>
+    <SharedFxOutputPath>$([MSBuild]::NormalizeDirectory($(ArtifactsDir)))assets\Runtime\$(PackageVersion)\</SharedFxOutputPath>
+  </PropertyGroup>
+
   <Target Name="BuildMetapackage" DependsOnTargets="ResolveRepoInfo">
     <!-- Clear working directory -->
     <RemoveDir Directories="$(_WorkRoot)" />
@@ -122,6 +126,8 @@
       Lines="@(VersionLines)"
       Overwrite="true" />
 
+    <MakeDir Directories="$(SharedFxOutputPath)" />
+
     <!--
       Used by the downloader scripts when pulling from a 'channel' instead of a specific version.
       The second line must be the package version.
diff --git a/build/repo.props b/build/repo.props
index 482d3e7388..0bd4e57ce2 100644
--- a/build/repo.props
+++ b/build/repo.props
@@ -11,7 +11,6 @@
 
     <SubmoduleRoot>$(RepositoryRoot)modules\</SubmoduleRoot>
     <LineupBuildDir>$([MSBuild]::NormalizeDirectory($(ArtifactsDir)))lineups\</LineupBuildDir>
-    <SharedFxOutputPath>$([MSBuild]::NormalizeDirectory($(ArtifactsDir)))assets\Runtime\$(PackageVersion)\</SharedFxOutputPath>
 
     <DependencyPackageDir>$(RepositoryRoot).deps\build\</DependencyPackageDir>
     <DependencyMirrorPackageDir>$(RepositoryRoot).deps\mirror\</DependencyMirrorPackageDir>