Update to Preview4 and include Tier3 repos

.vsts.pipelines/builds/matrix.yml

@@ -14,9 +14,7 @@ jobs:
   parameters:
     job: centos71
     imageName: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-359e48e-20200313130914
-# Temporarily disable reporting on prebuilt leaks until entire product builds.
-# See https://github.com/dotnet/source-build/issues/1548
-    reportPrebuiltLeaks: false
+    reportPrebuiltLeaks: true
     matrix:
 # Temporarily disable unit tests until entire product builds.
 # See https://github.com/dotnet/source-build/issues/1549

.vsts.pipelines/jobs/ci-linux.yml

@@ -88,17 +88,15 @@ jobs:
     continueOnError: true
 
   # Run smoke tests. This is needed even in tarball legs to create the smoke-test-prereqs archive.
-# Temporarily disable smoke-tests until entire product builds.
-# See https://github.com/dotnet/source-build/issues/1552
-#  - script: |
-#      set -ex
-#      df -h
-#      $(docker.run) $(docker.src.map) $(docker.src.work) $(imageName) ./build.sh \
-#        --run-smoke-test \
-#        /p:Configuration=$(sb.configuration) \
-#        /p:ProdConBlobFeedUrlPrefix=$(prodConBlobFeedUrlPrefix)
-#      du -h $(rootDirectory) | sort -h | tail -n 50
-#    displayName: Run smoke-test
+  - script: |
+      set -ex
+      df -h
+      $(docker.run) $(docker.src.map) $(docker.src.work) $(imageName) ./build.sh \
+        --run-smoke-test \
+        /p:Configuration=$(sb.configuration) \
+        /p:ProdConBlobFeedUrlPrefix=$(prodConBlobFeedUrlPrefix)
+      du -h $(rootDirectory) | sort -h | tail -n 50
+    displayName: Run smoke-test
 
   # Run unit tests that we support.
   - script: |
@@ -179,25 +177,17 @@ jobs:
       df -h
       $(docker.run) $(docker.tb.map) $(docker.drop.map) $(docker.tb.work) $(imageName) /bin/bash -c '
         mkdir -p /drop/tarball/
-        # Temporarily disable smoke-tests until entire product builds.
-        # See https://github.com/dotnet/source-build/issues/1552
-        ##smokeTestPackages="$(tarballName)/packages/smoke-test-packages" 
+        smokeTestPackages="$(tarballName)/packages/smoke-test-packages" 
         # smokeTestPackages is a package cache, with redundant data and unnecessary structure. E.g.
         # $smokeTestPackages/name/version/name.version.nupkg <- We want this.
         # $smokeTestPackages/name/version/lib/net46/name.dll <- This is already in the nupkg.
         # This find moves the nupkg files into $smokeTestPackages:
-        # Temporarily disable smoke-tests until entire product builds.
-        # See https://github.com/dotnet/source-build/issues/1552
-        ##find "$smokeTestPackages" -iname "*.nupkg" -exec mv {} "$smokeTestPackages" \;
+        find "$smokeTestPackages" -iname "*.nupkg" -exec mv {} "$smokeTestPackages" \;
         # This find removes all non-nupkg files, which are not wanted:
-        # Temporarily disable smoke-tests until entire product builds.
-        # See https://github.com/dotnet/source-build/issues/1552
-        ##find "$smokeTestPackages" -not -iname "*.nupkg" -delete
+        find "$smokeTestPackages" -not -iname "*.nupkg" -delete
         # Make one .tar.gz for build, another for extras necessary to smoke test:
         tar --numeric-owner "--exclude=$smokeTestPackages" -zcf "/drop/tarball/$(tarballName).tar.gz" "$(tarballName)"
-        # Temporarily disable smoke-tests until entire product builds.
-        # See https://github.com/dotnet/source-build/issues/1552
-        ##tar --numeric-owner -zcf "/drop/tarball/$(tarballName)-smoke-test-prereqs.tar.gz" "$smokeTestPackages"'
+        tar --numeric-owner -zcf "/drop/tarball/$(tarballName)-smoke-test-prereqs.tar.gz" "$smokeTestPackages"'
       du -h $(rootDirectory) | sort -h | tail -n 50
     displayName: Copy tarball to output
     condition: and(succeeded(), eq(variables['sb.tarball'], true))
@@ -227,18 +217,16 @@ jobs:
     condition: and(succeeded(), eq(variables['sb.tarball'], true))
 
   # Run smoke tests.
-# Temporarily disable smoke-tests until entire product builds.
-# See https://github.com/dotnet/source-build/issues/1552
-#  - script: |
-#      set -ex
-#      df -h
-#      $(docker.run) $(docker.tb.map) $(docker.tb.work) $(imageName) "$(tarballName)/smoke-test.sh" \
-#        --minimal \
-#        --projectOutput \
-#        --configuration $(sb.configuration)
-#      du -h $(rootDirectory) | sort -h | tail -n 50
-#    displayName: Run smoke-test in tarball
-#    condition: and(succeeded(), eq(variables['sb.tarball'], true))
+  - script: |
+      set -ex
+      df -h
+      $(docker.run) $(docker.tb.map) $(docker.tb.work) $(imageName) "$(tarballName)/smoke-test.sh" \
+        --minimal \
+        --projectOutput \
+        --configuration $(sb.configuration)
+      du -h $(rootDirectory) | sort -h | tail -n 50
+    displayName: Run smoke-test in tarball
+    condition: and(succeeded(), eq(variables['sb.tarball'], true))
 
   - script: df -h
     displayName: Check space (df -h)

Directory.Build.props

@@ -20,7 +20,7 @@
     <Platform Condition="'$(Platform)' == '' AND '$(BuildArchitecture)' == 'arm64'">$(BuildArchitecture)</Platform>
     <Platform Condition="'$(Platform)' == ''">x64</Platform>
 
-    <UseStableVersions Condition="'$(UseStableVersions)' == ''">true</UseStableVersions>
+    <UseStableVersions Condition="'$(UseStableVersions)' == ''">false</UseStableVersions>
 
     <!-- new supported portable/nonportable options.  These control whether to build portable runtime
          or portable SDK.  The PortableBuild flag is only set in runtime-portable.proj and should
@@ -121,7 +121,7 @@
     <PrebuiltSourceBuiltPackagesPath>$(ProjectDir)packages/source-built/</PrebuiltSourceBuiltPackagesPath>
     <PrebuiltSourceBuiltPackagesPath Condition="'$(CustomPrebuiltSourceBuiltPackagesPath)' != ''">$(CustomPrebuiltSourceBuiltPackagesPath)/</PrebuiltSourceBuiltPackagesPath>
     <SourceBuiltTarBallPath>$(OutputPath)</SourceBuiltTarBallPath>
-    <SourceBuiltToolsetDir>$(LocalBlobStorageRoot)Toolset/</SourceBuiltToolsetDir>
+    <SourceBuiltToolsetDir>$(LocalBlobStorageRoot)Sdk/</SourceBuiltToolsetDir>
     <SourceBuiltRuntimeDir>$(LocalBlobStorageRoot)Runtime/</SourceBuiltRuntimeDir>
     <SourceBuiltAspNetCoreRuntime>$(LocalBlobStorageRoot)aspnetcore/Runtime/</SourceBuiltAspNetCoreRuntime>
     <RestoreSourcePropsPath>$(IntermediatePath)RestoreSources.props</RestoreSourcePropsPath>

eng/Version.Details.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20153.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20201.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>421b20fb860907c45673de791177e3fd61402197</Sha>
+      <Sha>bce0a98620c1c5a110b2bba9912f3d5929069c6b</Sha>
     </Dependency>
     <Dependency Name="Private.SourceBuild.ReferencePackages" Version="1.0.0-beta.20217.1">
       <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
@@ -22,51 +22,51 @@
       <Sha>c01a538851a8ab1a1fbeb2e6243f391fff7587b4</Sha>
       <RepoName>aspnet-xdt</RepoName>
     </Dependency>
-    <Dependency Name="ILLink.Tasks" Version="0.1.6-prerelease.20152.3" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
+    <Dependency Name="ILLink.Tasks" Version="5.0.0-preview3.20220.1" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
       <Uri>https://github.com/mono/linker</Uri>
-      <Sha>a9bfc450a9da6b050ba043ca43b9241beb6f3f60</Sha>
+      <Sha>7573e99c7665f565fe4a6ac4784d5c641213d5e1</Sha>
       <RepoName>linker</RepoName>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.0-preview2.20160.6">
+    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.0-preview4.20251.6">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d12f79a4d1b908636b96005fe30f547e54cea3ee</Sha>
+      <Sha>47ec733ba79b196e4e09d0c89bad245155002353</Sha>
       <RepoName>runtime</RepoName>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.0-preview2.20160.6">
+    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.0-preview4.20251.6">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>d12f79a4d1b908636b96005fe30f547e54cea3ee</Sha>
+      <Sha>47ec733ba79b196e4e09d0c89bad245155002353</Sha>
       <RepoName>runtime-portable</RepoName>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="3.1.2" CoherentParentDependency="Microsoft.AspNetCore.App.Ref">
+    <Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="5.0.0-preview4.20251.2" CoherentParentDependency="Microsoft.AspNetCore.App.Ref">
       <Uri>https://github.com/dotnet/AspNetCore-Tooling</Uri>
-      <Sha>2dab42e151ea8020a75cdaaa8c46bf5d9093b8c0</Sha>
+      <Sha>56c0dbb97a3c542fa9865aad33fe442341786a09</Sha>
       <RepoName>aspnetcore-tooling</RepoName>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="3.1.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+    <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="5.0.0-preview4.20221.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>247f60e9e34a03ed99e855eb1ea0c20931a968db</Sha>
+      <Sha>bb2aad9a623680ecefd731784c97fcbf9e908730</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.Compilers" Version="3.6.0-2.20153.4" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
+    <Dependency Name="Microsoft.NETCore.Compilers" Version="3.6.0" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>6f2112b58316c97c4f1b97e0f282aef4346947fc</Sha>
+      <Sha>3d85b48dd5e533c7d47e916e2cff417f46bdce10</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Build" Version="16.6.0-preview-20126-02" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
+    <Dependency Name="Microsoft.Build" Version="16.7.0-preview-20220-01" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
       <Uri>https://github.com/microsoft/msbuild</Uri>
-      <Sha>13cfe7fc5a97772e4045671c71fa31a3c0856af0</Sha>
+      <Sha>80e487bff4b7adced47cab46b3481f1a5f2b3178</Sha>
     </Dependency>
-    <Dependency Name="NuGet.Build.Tasks" Version="5.6.0.6478" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
+    <Dependency Name="NuGet.Build.Tasks" Version="5.6.0-preview2.6532" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
       <Uri>https://github.com/NuGet/NuGet.Client</Uri>
-      <Sha>64f2febf7d1de8b0228eca5afed97a96c5a30bba</Sha>
+      <Sha>1c2681b16a0bb9be9271abe043a1cbf892761ef8</Sha>
       <RepoName>nuget-client</RepoName>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging" Version="3.1.2" CoherentParentDependency="Microsoft.AspNetCore.Mvc.Razor.Extensions">
+    <Dependency Name="Microsoft.Extensions.Logging" Version="5.0.0-preview4.20251.2" CoherentParentDependency="Microsoft.AspNetCore.Mvc.Razor.Extensions">
       <Uri>https://github.com/dotnet/Extensions</Uri>
-      <Sha>a309c864ab86230b6f118843481673cdd89d6258</Sha>
+      <Sha>aadd7e9a6bf2bdaa48f7b1aae781a03704adc713</Sha>
       <RepoName>aspnet-extensions</RepoName>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk" Version="5.0.100-preview2.20161.5" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
+    <Dependency Name="Microsoft.NET.Sdk" Version="5.0.100-preview4.20258.2" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
       <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>11d68c998c996a9e033760f4769132cf867de167</Sha>
+      <Sha>d06773deef64b4045a2f8256a383fd8dbef6050e</Sha>
       <RepoName>sdk</RepoName>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.Cli.CommandLine" Version="1.0.0-preview.19208.1" CoherentParentDependency="Microsoft.DotNet.Cli.Runtime">
@@ -84,37 +84,26 @@
       <Uri>https://github.com/dotnet/xliff-tasks</Uri>
       <Sha>a52f3d7fb58470749ee4035fbbcb7e63c78b0459</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="3.1.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="5.0.0-preview4.20257.10" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://github.com/dotnet/AspNetCore</Uri>
-      <Sha>c3acdcac86dad91c3d3fbc3b93ecc6b7ba494bdc</Sha>
+      <Sha>cdfa43bbe0ecc13757cc6517c9a253de77c3ec56</Sha>
       <RepoName>aspnetcore</RepoName>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Cli.Runtime" Version="3.1.102-servicing.20069.1" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
-      <Uri>https://github.com/dotnet/cli</Uri>
-      <Sha>32fddd23b1e53272472f6feb27f5e12a445b7236</Sha>
-      <RepoName>cli</RepoName>
-    </Dependency>
-    <Dependency Name="Microsoft.FSharp.Compiler" Version="5.0.0-beta.20155.4" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
+    <Dependency Name="Microsoft.FSharp.Compiler" Version="11.0.0-beta.20218.1" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
       <Uri>https://github.com/dotnet/fsharp</Uri>
-      <Sha>1e9d40c8897796e21850bd6dca40e15df69a1c97</Sha>
+      <Sha>1bcfb7bc27dc2d482341137150023fc1534506e6</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NET.Sdk.Web" Version="3.1.102-servicing.20068.3" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
       <Uri>https://github.com/aspnet/websdk</Uri>
       <Sha>589ed451f2bcb51d7f47a37ebf4e3d501979174c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TestPlatform.Build" Version="16.3.0" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
+    <Dependency Name="Microsoft.TestPlatform.Build" Version="16.7.0-preview-20200428-01" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
       <Uri>https://github.com/microsoft/vstest</Uri>
-      <Sha>55e7e45431c9c05656c999b902686e7402664573</Sha>
-    </Dependency>
-    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.102-servicing.20070.8" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
-      <Uri>https://github.com/dotnet/toolset</Uri>
-      <Sha>a46d93e5e100f9046cb589b5d4ba70bde41f3480</Sha>
-      <RepoName>toolset</RepoName>
+      <Sha>5fd8bb7eabc542fbda5ed8e436f68ca975de0655</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="5.0.100-preview2.20161.13">
-      <Uri>https://github.com/dotnet/core-sdk</Uri>
-      <Sha>9c30c9b429add311e047bfb87c4d4119673fa461</Sha>
-      <RepoName>core-sdk</RepoName>
+      <Uri>https://github.com/dotnet/installer</Uri>
+      <Sha>b0d47ebe3474026fe5cbef83de2b336d292b6c26</Sha>
     </Dependency>
     <!-- external dependencies, not handled by Maestro/Arcade -->
     <Dependency Name="Newtonsoft.Json" Version="12.0.2">

eng/Versions.props

@@ -7,7 +7,7 @@
   </PropertyGroup>
   <!-- Production Dependencies -->
   <PropertyGroup>
-    <PrivateSourceBuildReferencePackagesPackageVersion>1.0.0-beta.20261.1</PrivateSourceBuildReferencePackagesPackageVersion>
-    <PrivateSourceBuiltArtifactsPackageVersion>0.1.0-5.0.100-preview.1.20229.1</PrivateSourceBuiltArtifactsPackageVersion>
+    <PrivateSourceBuildReferencePackagesPackageVersion>1.0.0-beta.20329.1</PrivateSourceBuildReferencePackagesPackageVersion>
+    <PrivateSourceBuiltArtifactsPackageVersion>0.1.0-5.0.100-bootstrap.3</PrivateSourceBuiltArtifactsPackageVersion>
   </PropertyGroup>
 </Project>

global.json

@@ -1,12 +1,12 @@
 {
   "tools": {
-    "dotnet": "5.0.100-preview.3.20216.6"
+    "dotnet": "5.0.100-preview.4.20258.7"
   },
   "msbuild-sdks": {
     "Microsoft.Build.CentralPackageVersions": "2.0.1",
     "Microsoft.Build.Traversal": "2.0.2",
     "Microsoft.NET.Sdk.IL": "3.0.0-preview-27107-01",
-    "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.19616.4",
+    "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20201.2",
     "Yarn.MSBuild": "1.15.2"
   }
 }

patches/arcade/0009-Add-reference-to-PlatformAbstractions.patch

@@ -1,15 +1,15 @@
-From db4c528bb2335f791f46f76f62f392597e298ef0 Mon Sep 17 00:00:00 2001
-From: dseefeld <dseefeld@microsoft.com>
-Date: Wed, 1 Apr 2020 16:32:18 +0000
-Subject: [PATCH] Add reference to PlatformAbstractions
+From db4c528bb2335f791f46f76f62f392597e298ef0 Mon Sep 17 00:00:00 2001  
+From: dseefeld <dseefeld@microsoft.com> 
+Date: Wed, 1 Apr 2020 16:32:18 +0000    
+Subject: [PATCH] Add reference to PlatformAbstractions  
 
-Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk.csproj doesn't have a reference
-to PlatformAbstractions. It builds in the production build because it has a
-reference to Microsoft.Extensions.DependencyModel, which also brought in
-PlatformAbstractions. That dependency has been removed with
-https://github.com/dotnet/core-setup/pull/5218.
-The tarball build uses a newer version of Microsoft.Extensions.DependencyModel
-with the dependency removed, so an explicit dependency needs to be added now until
+Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk.csproj doesn't have a reference    
+to PlatformAbstractions. It builds in the production build because it has a 
+reference to Microsoft.Extensions.DependencyModel, which also brought in    
+PlatformAbstractions. That dependency has been removed with 
+https://github.com/dotnet/core-setup/pull/5218. 
+The tarball build uses a newer version of Microsoft.Extensions.DependencyModel  
+with the dependency removed, so an explicit dependency needs to be added now until  
 Arcade removes their dependency on PlatormAbstractions.
 ---
  .../Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk.csproj              | 1 +