Merged PR 130648: Update to ProdCon 2.1.2 (20180618-01)

Update to the 2018-06-18 ProdCon 2.1.2 build. Manually updated the AspNetCore package version used and ProdConFeed.txt.
dotnet · Jul 2, 2018 · cfbe095 · cfbe095
1 parent e652861
commit cfbe095
Show file tree

Hide file tree

Showing 12 changed files with 42 additions and 24 deletions.
diff --git a/.vsts-ci.yml b/.vsts-ci.yml
@@ -9,7 +9,6 @@ phases:
     docker.runInSourceBuild: docker run --rm -v $(rootDirectory)/sb/source-build:/src -w /src
     docker.runInTarball: docker run --rm -v $(rootDirectory)/sb/tarball/$(tarballName):/tb -w /tb
     dropDirectory: $(stagingDirectory)/drop
-    prodConBlobFeedUrlPrefix: ''
     rootDirectory: $(Build.SourcesDirectory)/..
     stagingDirectory: $(rootDirectory)/sb/staging
     tarballName: tarball_$(Build.BuildId)
@@ -38,7 +37,14 @@ phases:
       displayName: Clean sb directory and copy source from cloned directory
 
     # fetch vsts commits if building internally
-    - script: $(docker.runInSourceBuild) $(imageName) ./fetch-vsts-commits.sh $(user.PAT)
+    - script: |
+        set -x
+        # Ignore failure for the first command. It will intentionally fail if the commit is only
+        # available in VSTS. "submodule update --init" is the simplest way to set up the submodule
+        # directory. ("submodule init" only sets up .git/config, not the e.g. src/coreclr/.git and
+        # .git/modules/src/coreclr/ directories.)
+        $(docker.runInSourceBuild) $(imageName) git submodule update --init --recursive
+        $(docker.runInSourceBuild) $(imageName) ./fetch-vsts-commits.sh $(user.PAT)
       displayName: Fetch internal vsts commits
       condition: and(succeeded(), ne(variables['user.PAT'], ''))
 
@@ -88,7 +94,9 @@ phases:
       condition: and(succeeded(), eq(variables['buildOfflineTarball'], true))
 
     # run smoke tests
-    - script: $(docker.runInTarball) $(imageName) ./smoke-test.sh --minimal --projectOutput --configuration $(buildConfiguration)
+    # "-e SKIP_INIT_BUILD=true": init-build was already done by the build. Now, skip it, because the
+    # support build.sh tries to pass all args to init-build.proj where there is no "RunSmokeTest".
+    - script: $(docker.runInTarball) -e SKIP_INIT_BUILD=true $(imageName) ./build.sh /t:RunSmokeTest /p:Configuration=$(buildConfiguration) /p:ProdConBlobFeedUrlPrefix=$(prodConBlobFeedUrlPrefix)
       displayName: Run smoke-test
       condition: and(succeeded(), eq(variables['buildOfflineTarball'], true))
 

diff --git a/ProdConFeed.txt b/ProdConFeed.txt
@@ -1 +1 @@
-https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/20180605-09/final/index.json
+https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/20180618-01/final/index.json
diff --git a/dependencies.props b/dependencies.props
@@ -38,19 +38,17 @@
       <RawVersionsBaseUrl>https://raw.githubusercontent.com/dotnet/versions</RawVersionsBaseUrl>
     </DependencyBuildInfo>
 
-    <DependencyInfo Include="ProdCon">
+    <DependencyInfo Include="ProdCon" Condition="'$(UpdateFromManifestFile)' == ''">
       <DependencyType>Orchestrated build</DependencyType>
       <BasePath>build-info/dotnet/product/cli/release/2.1</BasePath>
       <CurrentRef>$(ProdConCurrentRef)</CurrentRef>
       <VersionsRepoOwner>dotnet</VersionsRepoOwner>
       <VersionsRepo>versions</VersionsRepo>
     </DependencyInfo>
-
-    <UpdateStep Include="ProdCon">
-      <UpdaterType>Orchestrated blob feed attribute</UpdaterType>
-      <SingleLineFile>$(MSBuildThisFileDirectory)ProdConFeed.txt</SingleLineFile>
-      <AttributeName>Url</AttributeName>
-    </UpdateStep>
+    <DependencyInfo Include="ProdCon" Condition="'$(UpdateFromManifestFile)' != ''">
+      <DependencyType>Orchestrated build file</DependencyType>
+      <Path>$(UpdateFromManifestFile)</Path>
+    </DependencyInfo>
   </ItemGroup>
 
   <ItemGroup Condition="'$(SkipBuildToolsUpdate)' != 'true'">

diff --git a/dependencies.targets b/dependencies.targets
@@ -84,7 +84,14 @@
         UpdaterType="Build attribute from orchestrated build"
         AttributeName="BuildId"
         Path="%(RepoProjectWithProperties.Identity)"
-        ElementName="OfficialBuildId" />
+        ElementName="OfficialBuildId"
+        SkipIfNoReplacementFound="true" />
+
+      <UpdateStep
+        Include="ProdCon"
+        UpdaterType="Orchestrated blob feed attribute"
+        SingleLineFile="$(MSBuildThisFileDirectory)ProdConFeed.txt"
+        AttributeName="Url" />
     </ItemGroup>
   </Target>
 </Project>
diff --git a/fetch-vsts-commits.sh b/fetch-vsts-commits.sh
@@ -28,10 +28,10 @@ fetch() {
     name=$1
     remote=$2
 
-    pushd "$SCRIPT_ROOT/src/$name"
-    git fetch "$remote" +refs/heads/*:refs/remotes/${remote_ref_name}/*
-    popd
-
+    (
+        cd "$SCRIPT_ROOT/src/$name"
+        git fetch "$remote" +refs/heads/*:refs/remotes/${remote_ref_name}/*
+    )
 }
 
 fetch_vsts() {

diff --git a/repos/cli.proj b/repos/cli.proj
@@ -48,8 +48,11 @@
     <ExtraPackageVersionPropsPackageInfo
       Include="
         Microsoft.AspNetCore.All;
-        Microsoft.AspNetCore.App;
-        Microsoft.NET.Sdk.Razor"
+        Microsoft.AspNetCore.App"
+      Version="2.1.2" />
+    <!-- This package wasn't built in latest 2.1.2 build: stick with what we had from 2.1.1. -->
+    <ExtraPackageVersionPropsPackageInfo
+      Include="Microsoft.NET.Sdk.Razor"
       Version="2.1.1" />
   </ItemGroup>
 

diff --git a/repos/core-setup.proj b/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>20180606-03</OfficialBuildId>
+    <OfficialBuildId>20180618-03</OfficialBuildId>
 
     <!-- Need to set $(PackagesOutput) so WriteVersions writes the versions file for cli, until cli respects auto-dependency flow -->
     <PackagesOutput>$(SourceBuiltPackagesPath)</PackagesOutput>

diff --git a/repos/corefx.proj b/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>20180606-05</OfficialBuildId>
+    <OfficialBuildId>20180618-03</OfficialBuildId>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/cli b/src/cli
diff --git a/src/core-setup b/src/core-setup
diff --git a/src/corefx b/src/corefx
diff --git a/support/tarball/build.sh b/support/tarball/build.sh
@@ -34,5 +34,7 @@ PREBUILT_PACKAGE_SOURCE="$SCRIPT_ROOT/prebuilt/nuget-packages"
     exit 1
 )
 
-$CLI_ROOT/dotnet $CLI_ROOT/sdk/$CLI_VERSION/MSBuild.dll $SCRIPT_ROOT/tools-local/init-build.proj /t:WriteDynamicPropsToStaticPropsFiles /p:GeneratingStaticPropertiesFile=true ${MSBUILD_ARGUMENTS[@]} "$@"
+if [ -z "${SKIP_INIT_BUILD:-}" ]; then
+    $CLI_ROOT/dotnet $CLI_ROOT/sdk/$CLI_VERSION/MSBuild.dll $SCRIPT_ROOT/tools-local/init-build.proj /t:WriteDynamicPropsToStaticPropsFiles /p:GeneratingStaticPropertiesFile=true ${MSBUILD_ARGUMENTS[@]} "$@"
+fi
 $CLI_ROOT/dotnet $CLI_ROOT/sdk/$CLI_VERSION/MSBuild.dll $SCRIPT_ROOT/build.proj ${MSBUILD_ARGUMENTS[@]} "$@"