From 961ed8992c2413014907a84ca13f8071686d4520 Mon Sep 17 00:00:00 2001
From: Pavel Krymets <pavel@krymets.com>
Date: Wed, 14 Feb 2018 16:30:35 -0800
Subject: [PATCH] Add SITE_EXTENSION_SDK_VERSION override (#151)

---
 build/repo.targets | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/build/repo.targets b/build/repo.targets
index 7dfd281b16..0758b39d66 100644
--- a/build/repo.targets
+++ b/build/repo.targets
@@ -2,13 +2,15 @@
   <Import Project="$(RepositoryRoot)\build\dependencies.props" />
 
   <PropertyGroup>
-      <_SdkVersion>$([System.IO.Path]::GetFileName($([System.IO.Path]::GetDirectoryName('$(MSBuildExtensionsPath)'))))</_SdkVersion>
+      <ComposeSdk Condition="$(SITE_EXTENSION_SDK_VERSION) == ''">True</ComposeSdk>
+      <_SdkVersion>$(SITE_EXTENSION_SDK_VERSION)</_SdkVersion>
+      <_SdkVersion Condition="'$(_SdkVersion)' == ''">$([System.IO.Path]::GetFileName($([System.IO.Path]::GetDirectoryName('$(MSBuildExtensionsPath)'))))</_SdkVersion>
       <TestDotNetPath>$(RepositoryRoot).test-dotnet\</TestDotNetPath>
       <AppsArtifactDirectory>$(RepositoryRoot)artifacts\apps</AppsArtifactDirectory>
       <SiteExtensionWorkingDirectory>$(TestDotNetPath)extension\</SiteExtensionWorkingDirectory>
       <SiteExtensionOutputDirectory>$(RepositoryRoot)artifacts\build</SiteExtensionOutputDirectory>
       <TestProjectDirectory>$(RepositoryRoot)\test\Microsoft.AspNetCore.AzureAppServices.FunctionalTests\</TestProjectDirectory>
-      <SiteExtensionFeed Condition="$(SiteExtensionFeed) == ''">https://dotnet.myget.org/F/aspnetcore-ci-dev/</SiteExtensionFeed>
+      <SiteExtensionFeed Condition="$(SiteExtensionFeed) == ''">https://dotnet.myget.org/F/aspnetcore-release/</SiteExtensionFeed>
   </PropertyGroup>
 
   <Target Name="_AddTestRuntimes">
@@ -22,10 +24,14 @@
     <RemoveDir Directories="$(SiteExtensionWorkingDirectory)" Condition="Exists($(SiteExtensionWorkingDirectory))" />
   </Target>
 
-  <Target Name="_AddSiteExtensionRuntime">
-
+  <Target Name="_AddSiteExtensionSdk">
     <ItemGroup>
       <DotNetCoreSdk Include="$(_SdkVersion)" InstallDir="$(SiteExtensionWorkingDirectory)" Arch="x86" />
+    </ItemGroup>
+  </Target>
+
+  <Target Name="_AddSiteExtensionRuntime">
+    <ItemGroup>
       <DotNetCoreRuntime
         Include="$(MicrosoftNETCoreApp21PackageVersion)"
         InstallDir="$(SiteExtensionWorkingDirectory)"
@@ -35,7 +41,7 @@
     </ItemGroup>
   </Target>
 
-  <Target Name="BuildSiteExtension" DependsOnTargets="_CleanSiteExtension;_AddSiteExtensionRuntime;InstallDotNet">
+  <Target Name="ComposeSiteExtensions" Condition="'$(ComposeSdk)' == 'True'" DependsOnTargets="_AddSiteExtensionSdk;_AddSiteExtensionRuntime;InstallDotNet">
     <ItemGroup>
       <RuntimeArchiveItems Include="$(RuntimeArchives)" />
       <DotNetCacheArchiveItems Include="$(DotNetCacheArchives)" />
@@ -71,6 +77,10 @@
     <UnzipArchive File="%(RuntimeArchiveItems.Identity)" Destination="$(SiteExtensionWorkingDirectory)" Condition="'$(RuntimeArchives)' != ''" Overwrite="true" />
     <UnzipArchive File="%(DotNetCacheArchiveItems.Identity)" Destination="$(SiteExtensionWorkingDirectory)DotNetCache" Condition="'$(DotNetCacheArchives)' != ''" Overwrite="true" />
 
+  </Target>
+
+  <Target Name="BuildSiteExtension" DependsOnTargets="_CleanSiteExtension;ComposeSiteExtensions;_AddSiteExtensionSdk;InstallDotNet">
+
     <MSBuild Projects="%(SiteExtensions.Identity)"
       Targets="Restore"
       Properties="BuildNumber=$(BuildNumber)" />