From d93aded1c0ca62db872e5dd1d8dcb78f3202b79c Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Mon, 20 Aug 2018 16:27:48 -0700
Subject: [PATCH] Remove package version from the output path for shared
 runtime archives

---
 .vsts/builds/ci-official.yml | 6 +++---
 build/SharedFx.targets       | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.vsts/builds/ci-official.yml b/.vsts/builds/ci-official.yml
index 86f5079ad8..4a8e788db0 100644
--- a/.vsts/builds/ci-official.yml
+++ b/.vsts/builds/ci-official.yml
@@ -31,8 +31,8 @@ phases:
   # TODO: configure harvesting to run as a part of build.cmd
   - powershell: >
       src/Installers/Windows/build.ps1
-      -x64 artifacts/assets/Runtime/2.2.0-preview1-$(Build.BuildNumber)/aspnetcore-runtime-internal-2.2.0-preview1-$(Build.BuildNumber)-win-x64.zip
-      -x86 artifacts/assets/Runtime/2.2.0-preview1-$(Build.BuildNumber)/aspnetcore-runtime-internal-2.2.0-preview1-$(Build.BuildNumber)-win-x86.zip
+      -x64 artifacts/runtime/aspnetcore-runtime-internal-2.2.0-preview1-$(Build.BuildNumber)-win-x64.zip
+      -x86 artifacts/runtime/aspnetcore-runtime-internal-2.2.0-preview1-$(Build.BuildNumber)-win-x86.zip
       -Config $(BuildConfiguration)
       -BuildNumber $(Build.BuildNumber)
     displayName: Build Windows installers
@@ -176,7 +176,7 @@ phases:
       ./build.sh
       --ci
       /t:BuildInstallers
-      /p:_SharedFxSourceDir=$(Build.SourcesDirectory)/artifacts/assets/Runtime/2.2.0-preview1-$(Build.BuildNumber)/
+      /p:_SharedFxSourceDir=$(Build.SourcesDirectory)/artifacts/runtime/
     displayName: Build linux installers
   - task: PublishTestResults@2
     displayName: Publish test results
diff --git a/build/SharedFx.targets b/build/SharedFx.targets
index 0544fc522c..1e260135a4 100644
--- a/build/SharedFx.targets
+++ b/build/SharedFx.targets
@@ -3,7 +3,9 @@
   <Import Project="SharedFx.props" />
 
   <PropertyGroup>
-    <SharedFxOutputPath>$([MSBuild]::NormalizeDirectory($(ArtifactsDir)))assets\Runtime\$(PackageVersion)\</SharedFxOutputPath>
+    <SharedFxOutputPath>$([MSBuild]::NormalizeDirectory($(ArtifactsDir)))runtime\</SharedFxOutputPath>
+    <!-- TODO: temporary. Publish Windows to folder so dotnet-install.ps1 can use the folder as a source. -->
+    <SharedFxOutputPath Condition="$(SharedFxRID.StartsWith('win')) AND '$(TEAMCITY_VERSION)' != '' ">$([MSBuild]::NormalizeDirectory($(ArtifactsDir)))assets\Runtime\$(PackageVersion)\</SharedFxOutputPath>
   </PropertyGroup>
 
   <Target Name="GetMetapackageArtifactInfo">