Merge pull request #665 from dagood/update-2.1.3

[release/2.1] Update to new 2.1.3 ProdCon build

Author: dagood

ProdConFeed.txt

@@ -1 +1 @@
-https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/20180720-01/final/index.json
+https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/20180722-01/final/index.json

dependencies.props

@@ -5,8 +5,8 @@
     for which dotnet/versions commit was last used to update the dependency.
   -->
   <PropertyGroup>
-    <ProdConCurrentRef>249d209ddf374b9fd057e23e1ddd8941aec117ee</ProdConCurrentRef>
-    <CoreClrCurrentRef>249d209ddf374b9fd057e23e1ddd8941aec117ee</CoreClrCurrentRef>
+    <ProdConCurrentRef>c6f30484e30cd7db70143b1c46da03c9e5d37547</ProdConCurrentRef>
+    <CoreClrCurrentRef>c6f30484e30cd7db70143b1c46da03c9e5d37547</CoreClrCurrentRef>
     <BuildToolsCurrentRef>91c9a3b3374ff71e72c06d5773bd26598539aa1d</BuildToolsCurrentRef>
   </PropertyGroup>
 
@@ -23,6 +23,16 @@
     <ILLinkTasksPackageVersion>0.1.5-preview-1461378</ILLinkTasksPackageVersion>
   </PropertyGroup>
 
+  <!--
+    Packages built by ProdCon, but not source-build. These are included as prebuilts, or embedded in
+    the product as version strings to be used by the SDK to fetch extra content.
+  -->
+  <PropertyGroup>
+    <MicrosoftAspNetCoreAllPackageVersion>2.1.3-rtm-30923</MicrosoftAspNetCoreAllPackageVersion>
+    <MicrosoftAspNetCoreAppPackageVersion>2.1.3-rtm-30923</MicrosoftAspNetCoreAppPackageVersion>
+    <MicrosoftNETSdkRazorPackageVersion>2.1.2-rtm-30923</MicrosoftNETSdkRazorPackageVersion>
+  </PropertyGroup>
+
   <ItemGroup>
     <!-- Get ILAsm tool version from CoreCLR. -->
     <RemoteDependencyBuildInfo Include="CoreClr">
@@ -40,7 +50,7 @@
 
     <DependencyInfo Include="ProdCon" Condition="'$(UpdateFromManifestFile)' == ''">
       <DependencyType>Orchestrated build</DependencyType>
-      <BasePath>build-info/dotnet/product/cli/release/2.1.3</BasePath>
+      <BasePath>build-info/dotnet/product/cli/release/2.1</BasePath>
       <CurrentRef>$(ProdConCurrentRef)</CurrentRef>
       <VersionsRepoOwner>dotnet</VersionsRepoOwner>
       <VersionsRepo>versions</VersionsRepo>

dependencies.targets

@@ -95,5 +95,20 @@
         ReplacementSubstituteOld="$(ProdConBlobFeedReplaceOld)"
         ReplacementSubstituteNew="$(ProdConBlobFeedReplaceNew)" />
     </ItemGroup>
+
+    <!-- Upgrade some package versions that are built only by ProdCon. -->
+    <ItemGroup>
+      <PackageUpdatedFromProdCon Include="Microsoft.AspNetCore.All" Element="MicrosoftAspNetCoreAllPackageVersion" />
+      <PackageUpdatedFromProdCon Include="Microsoft.AspNetCore.App" Element="MicrosoftAspNetCoreAppPackageVersion" />
+      <PackageUpdatedFromProdCon Include="Microsoft.NET.Sdk.Razor" Element="MicrosoftNETSdkRazorPackageVersion" />
+
+      <UpdateStep
+        Include="ProdCon"
+        UpdaterType="Orchestrated blob feed package version"
+        PackageId="@(PackageUpdatedFromProdCon)"
+        Path="$(MSBuildThisFileDirectory)dependencies.props"
+        ElementName="%(PackageUpdatedFromProdCon.Element)"
+        SkipIfNoReplacementFound="true" />
+    </ItemGroup>
   </Target>
 </Project>

extract-patches.sh

@@ -2,6 +2,13 @@
 set -euo pipefail
 IFS=$'\n\t'
 
+getIndexedSubmoduleSha() {
+    (
+        cd ".."
+        git ls-tree HEAD "$REPO_NAME" | awk '{print $3}'
+    )
+}
+
 SOURCE="${BASH_SOURCE[0]}"
 while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
   DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
@@ -10,9 +17,9 @@ while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symli
 done
 DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
 
-BASE_SHA=$1
 REPO_NAME=$(basename $(pwd))
 PATCHES_DIR=$DIR/patches/$REPO_NAME
+BASE_SHA=${1:-$(getIndexedSubmoduleSha)}
 
 if [ ! -d $PATCHES_DIR ]; then
     mkdir -p $PATCHES_DIR

repos/cli.proj

@@ -45,14 +45,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ExtraPackageVersionPropsPackageInfo
-      Include="
-        Microsoft.AspNetCore.All;
-        Microsoft.AspNetCore.App"
-      Version="2.1.3" />
-    <ExtraPackageVersionPropsPackageInfo
-      Include="Microsoft.NET.Sdk.Razor"
-      Version="2.1.2" />
+    <ExtraPackageVersionPropsPackageInfo Include="Microsoft.AspNetCore.All" Version="$(MicrosoftAspNetCoreAllPackageVersion)" />
+    <ExtraPackageVersionPropsPackageInfo Include="Microsoft.AspNetCore.App" Version="$(MicrosoftAspNetCoreAppPackageVersion)" />
+    <ExtraPackageVersionPropsPackageInfo Include="Microsoft.NET.Sdk.Razor" Version="$(MicrosoftNETSdkRazorPackageVersion)" />
   </ItemGroup>
 
   <ItemGroup>

repos/core-setup.proj

@@ -6,7 +6,7 @@
     <BuildArguments Condition="$(Platform.Contains('arm'))">$(BuildArguments) -TargetArchitecture=$(Platform) -DisableCrossgen=true -CrossBuild=true</BuildArguments>
     <BuildCommand>$(ProjectDirectory)/build$(ShellExtension) $(BuildArguments) -- /p:BuildDebPackage=false /p:BuildAllPackages=true</BuildCommand>
     <BuildCommand Condition="$(Platform.Contains('arm'))">$(ArmEnvironmentVariables) $(BuildCommand)</BuildCommand>
-    <OfficialBuildId>20180720-04</OfficialBuildId>
+    <OfficialBuildId>20180722-02</OfficialBuildId>
 
     <!-- Need to set $(PackagesOutput) so WriteVersions writes the versions file for cli, until cli respects auto-dependency flow -->
     <PackagesOutput>$(SourceBuiltPackagesPath)</PackagesOutput>

repos/coreclr.proj

@@ -10,7 +10,7 @@
     <BuildCommand>$(ProjectDirectory)/build$(ShellExtension) $(BuildArguments) --</BuildCommand>
     <BuildCommand Condition="$(Platform.Contains('arm'))">$(ArmEnvironmentVariables) $(BuildCommand)</BuildCommand>
     <CleanCommand>$(ProjectDirectory)/clean$(ShellExtension)</CleanCommand>
-    <OfficialBuildId>20180720-02</OfficialBuildId>
+    <OfficialBuildId>20180722-03</OfficialBuildId>
   </PropertyGroup>
 
   <ItemGroup>

repos/corefx.proj

@@ -7,7 +7,7 @@
     <BuildCommand Condition="$(Platform.Contains('arm'))">$(ArmEnvironmentVariables) $(BuildCommand)</BuildCommand>
     <PackagesOutput>$(ProjectDirectory)/bin/packages/$(Configuration)</PackagesOutput>
     <CleanCommand>$(ProjectDirectory)/clean$(ShellExtension)</CleanCommand>
-    <OfficialBuildId>20180720-08</OfficialBuildId>
+    <OfficialBuildId>20180722-02</OfficialBuildId>
   </PropertyGroup>
 
   <ItemGroup>

repos/sdk.proj

@@ -2,7 +2,7 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))/dir.props" />
   <PropertyGroup>
-    <OfficialBuildId>20180720.2</OfficialBuildId>
+    <OfficialBuildId>20180722.2</OfficialBuildId>
     <OutputVersionArgs>/p:BUILD_BUILDNUMBER=$(OfficialBuildId)</OutputVersionArgs>
     <BuildCommandArgs>--pack --configuration $(Configuration) $(OutputVersionArgs)</BuildCommandArgs>