[release/2.2] Configure 2.2 ProdCon auto-update and update (#671)

* Configure 2.2 ProdCon auto-update

* Update ProdCon to 20180725-01-1890599

* Fix dotnet/templating build commands, use CoreOnly

* Update 2.1 to 2.2 in smoke-test.sh

* Default UseStableVersions to false for smoke-test

This matches the RuntimeFrameworkVersion from the prebuilt Microsoft.DotNet.Web.ProjectTemplates.2.2 we get from the ProdCon blob feed.

* Disable dotnet/templating SourceLink: no git calls

Author: dagood

ProdConFeed.txt

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

dependencies.props

@@ -5,7 +5,7 @@
     for which dotnet/versions commit was last used to update the dependency.
   -->
   <PropertyGroup>
-    <ProdConCurrentRef>0d790d5e60a1f051098b5e066f7f760f2978ab2f</ProdConCurrentRef>
+    <ProdConCurrentRef>370e36164ef030daf1086ac5ef8a7de8956d5724</ProdConCurrentRef>
     <CoreClrCurrentRef>293e58e87c0575e7e425a1bab57d5eb0e25d743e</CoreClrCurrentRef>
     <BuildToolsCurrentRef>91c9a3b3374ff71e72c06d5773bd26598539aa1d</BuildToolsCurrentRef>
   </PropertyGroup>
@@ -28,9 +28,9 @@
     the product as version strings to be used by the SDK to fetch extra content.
   -->
   <PropertyGroup>
-    <MicrosoftAspNetCoreAllPackageVersion>2.1.3-rtm-30931</MicrosoftAspNetCoreAllPackageVersion>
-    <MicrosoftAspNetCoreAppPackageVersion>2.1.3-rtm-30931</MicrosoftAspNetCoreAppPackageVersion>
-    <MicrosoftNETSdkRazorPackageVersion>2.1.2-rtm-30931</MicrosoftNETSdkRazorPackageVersion>
+    <MicrosoftAspNetCoreAllPackageVersion>2.2.0-preview1-34785</MicrosoftAspNetCoreAllPackageVersion>
+    <MicrosoftAspNetCoreAppPackageVersion>2.2.0-preview1-34785</MicrosoftAspNetCoreAppPackageVersion>
+    <MicrosoftNETSdkRazorPackageVersion>2.2.0-preview1-34785</MicrosoftNETSdkRazorPackageVersion>
   </PropertyGroup>
 
   <ItemGroup>
@@ -50,7 +50,7 @@
 
     <DependencyInfo Include="ProdCon" Condition="'$(UpdateFromManifestFile)' == ''">
       <DependencyType>Orchestrated build</DependencyType>
-      <BasePath>build-info/dotnet/product/cli/release/2.1</BasePath>
+      <BasePath>build-info/dotnet/product/cli/release/2.2</BasePath>
       <CurrentRef>$(ProdConCurrentRef)</CurrentRef>
       <VersionsRepoOwner>dotnet</VersionsRepoOwner>
       <VersionsRepo>versions</VersionsRepo>

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>20180726-03</OfficialBuildId>
+    <OfficialBuildId>20180725-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>20180726-03</OfficialBuildId>
+    <OfficialBuildId>20180725-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>20180726-04</OfficialBuildId>
+    <OfficialBuildId>20180725-02</OfficialBuildId>
   </PropertyGroup>
 
   <ItemGroup>

repos/dir.props

@@ -38,7 +38,7 @@
   <!-- for RTM only, default to stabilized builds because that's what matches the official builds -->
   <!-- once https://github.com/dotnet/source-build/issues/550 is fixed we will be able to determine this automatically -->
   <PropertyGroup>
-    <UseStableVersions Condition="'$(UseStableVersions)' == ''">true</UseStableVersions>
+    <UseStableVersions Condition="'$(UseStableVersions)' == ''">false</UseStableVersions>
   </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>20180726.2</OfficialBuildId>
+    <OfficialBuildId>20180725.2</OfficialBuildId>
     <OutputVersionArgs>/p:BUILD_BUILDNUMBER=$(OfficialBuildId)</OutputVersionArgs>
     <BuildCommandArgs>--pack --configuration $(Configuration) $(OutputVersionArgs)</BuildCommandArgs>
 

repos/templating.proj

@@ -7,8 +7,6 @@
     <PackageDateTime>20170727</PackageDateTime>
     <PackageBuildQuality>beta2</PackageBuildQuality>
     <RepoApiImplemented>false</RepoApiImplemented>
-    <!-- This repo is not currently built in ProdCon -->
-    <OrchestratedManifestBuildName>N/A</OrchestratedManifestBuildName>
   </PropertyGroup>
 
   <ItemGroup>
@@ -18,15 +16,29 @@
     <MSBuildProperties Include="BUILD_NUMBER=$(BuildNumber)" />
     <MSBuildProperties Include="PackageDateTime=$(PackageDateTime)" />
     <MSBuildProperties Include="PackageBuildQuality=$(PackageBuildQuality)" />
+    <MSBuildProperties Include="PB_SkipTests=true" />
+    <MSBuildProperties Include="TargetFramework=netcoreapp2.1" />
+    <MSBuildProperties Include="CoreOnly=true" />
+    <MSBuildProperties Include="SourceLinkCreate=false" />
   </ItemGroup>
 
   <ItemGroup>
     <RepositoryReference Include="clicommandlineparser" />
   </ItemGroup>
+
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))/dir.targets" />
 
   <Target Name="RepoBuild">
-    <Exec Command="$(DotnetToolCommand) msbuild /t:Build @(MSBuildProperties->'/p:%(Identity)', ' ') $(ProjectDirectory)/build.proj $(RedirectRepoOutputToLog)"
+    <PropertyGroup>
+      <BuildCommandArgs>/t:GetReady /t:Restore /t:Build /t:Pack</BuildCommandArgs>
+      <BuildCommandArgs>$(BuildCommandArgs) /bl</BuildCommandArgs>
+      <BuildCommandArgs>$(BuildCommandArgs) @(MSBuildProperties->'/p:%(Identity)', ' ')</BuildCommandArgs>
+      <BuildCommandArgs>$(BuildCommandArgs) $(ProjectDirectory)build/CoreBuild.proj</BuildCommandArgs>
+      <BuildCommandArgs>$(BuildCommandArgs) $(RedirectRepoOutputToLog)</BuildCommandArgs>
+    </PropertyGroup>
+
+    <Exec Command="$(DotnetToolCommand) msbuild $(BuildCommandArgs)"
+          WorkingDirectory="$(ProjectDirectory)"
           EnvironmentVariables="@(EnvironmentVariables)" />
 
     <!-- The templates are built to a different folder than the packages, copy them into the packages folder. -->

smoke-test.sh

@@ -3,7 +3,7 @@ set -euo pipefail
 
 SCRIPT_ROOT="$(cd -P "$( dirname "$0" )" && pwd)"
 TARBALL_PREFIX=dotnet-sdk-
-VERSION_PREFIX=2.1
+VERSION_PREFIX=2.2
 DEV_CERTS_VERSION_DEFAULT=2.1.0
 
 projectOutput=false