[ArPow] Merge new repos to release/6.0.1xx (#11620)

* [ArPow] Add runtime repo to tarball (#11506)

* Add runtime repo / update runtime project

* Update runtime-portable logs and properties

* Create runtime-portable git-info

* Fix unpack of IntermediatePackages

* Re-enable references to runtime

* Pass TargetRid and NonPortable to runtime build

* Only build allconfigurations in non-portable build

* Add SDK patch to disable new CA warning

* Increase built tarball timeout

* Update prebuilt version

* [ArPow] Add installer repo to tarball (#11483)

* Ignore  failure in no-network case

Co-authored-by: Dan Seefeldt <dseefeld@microsoft.com>
Co-authored-by: Michael Simons <msimons@microsoft.com>
Co-authored-by: Matt Galbraith <mattgal@microsoft.com>

eng/Versions.props

@@ -159,7 +159,7 @@
     <MicrosoftBuildFrameworkVersion>15.7.179</MicrosoftBuildFrameworkVersion>
     <MicrosoftBuildUtilitiesCoreVersion>15.7.179</MicrosoftBuildUtilitiesCoreVersion>
     <PrivateSourceBuiltArtifactsPackageVersion>0.1.0-6.0.100-bootstrap.11</PrivateSourceBuiltArtifactsPackageVersion>
-    <PrivateSourceBuiltPrebuiltsPackageVersion>0.1.0-6.0.100-6</PrivateSourceBuiltPrebuiltsPackageVersion>
+    <PrivateSourceBuiltPrebuiltsPackageVersion>0.1.0-6.0.100-14</PrivateSourceBuiltPrebuiltsPackageVersion>
   </PropertyGroup>
   <!-- Workload manifest package versions -->
   <PropertyGroup>

eng/common/tools.sh

@@ -402,7 +402,7 @@ function StopProcesses {
 function TryLogClientIpAddress () {
   echo 'Attempting to log this client''s IP for Azure Package feed telemetry purposes'
   if command -v curl > /dev/null; then
-    curl -s 'http://co1.msedge.net/fdv2/diagnostics.aspx' | grep ' IP: '
+    curl -s 'http://co1.msedge.net/fdv2/diagnostics.aspx' | grep ' IP: ' || true
   fi
 }
 

src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml

@@ -25,7 +25,7 @@ jobs:
       Fedora33-Offline:
         _runOnline: false
         _Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2
-  timeoutInMinutes: 120
+  timeoutInMinutes: 180
   variables:
     _TarballDir: $(Build.StagingDirectory)/tarball
   workspace:

src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets

@@ -110,6 +110,17 @@
       WorkingDirectory="$(RepoRoot)"
       Condition="$(IsRootRepo) == 'true'" />
 
+    <!-- Because the root repo was locally cloned, the remote.origin.url needs to be updated from the local source to the real origin -->
+    <Exec
+      Command="git config --file $(TarballRepoSourceDir)/.git/config --unset remote.origin.url"
+      WorkingDirectory="$(RepoRoot)"
+      Condition="$(IsRootRepo) == 'true'" />
+
+    <Exec
+      Command="git config --file $(TarballRepoSourceDir)/.git/config --add remote.origin.url `git config --get remote.origin.url`"
+      WorkingDirectory="$(RepoRoot)"
+      Condition="$(IsRootRepo) == 'true'" />
+
     <Exec
       Command="git init $(TarballRepoSourceDir)"
       WorkingDirectory="$(RepoRoot)"
@@ -177,6 +188,10 @@
       <EngCommonContent Include="$(RepoRoot)eng/common/**/*" />
     </ItemGroup>
 
+    <Copy
+      SourceFiles="$(TarballGitInfoDir)runtime.props"
+      DestinationFiles="$(TarballGitInfoDir)runtime-portable.props" />
+
     <Copy
       SourceFiles="@(TarballContent)"
       DestinationFiles="@(TarballContent->'$(TarballRootDir)%(RecursiveDir)%(Filename)%(Extension)')" />

src/SourceBuild/tarball/content/Directory.Build.props

@@ -235,11 +235,11 @@
     <!-- same thing here for CLI -->
     <ExtraPackageVersionPropsPackageInfo Include="MicrosoftNETCoreAppRuntimewinx64Version" Version="$(coresetupOutputPackageVersion)" />
     <!-- same thing here for toolset -->
-    <ExtraPackageVersionPropsPackageInfo Include="MicrosoftNETCoreAppRuntimewinx64PackageVersion" Version="%24(MicrosoftNETCoreDotNetAppHostPackageVersion)" />
+    <ExtraPackageVersionPropsPackageInfo Include="MicrosoftNETCoreAppRuntimewinx64PackageVersion" Version="%24(MicrosoftNETCoreAppCompositeVersion)" />
     <!-- same thing here for core-sdk -->
-    <ExtraPackageVersionPropsPackageInfo Include="MicrosoftNETCoreAppRuntimePackageVersion" Version="%24(MicrosoftNETCoreDotNetAppHostPackageVersion)" />
+    <ExtraPackageVersionPropsPackageInfo Include="MicrosoftNETCoreAppRuntimePackageVersion" Version="%24(MicrosoftNETCoreAppCompositeVersion)" />
-    <ExtraPackageVersionPropsPackageInfo Include="MicrosoftNETCoreAppRuntimeVersion" Version="%24(MicrosoftNETCoreDotNetAppHostPackageVersion)" />
+    <ExtraPackageVersionPropsPackageInfo Include="MicrosoftNETCoreAppRuntimeVersion" Version="%24(MicrosoftNETCoreAppCompositeVersion)" />
-    <ExtraPackageVersionPropsPackageInfo Include="MicrosoftNETCoreAppHostPackageVersion" Version="%24(MicrosoftNETCoreDotNetAppHostPackageVersion)" />
+    <ExtraPackageVersionPropsPackageInfo Include="MicrosoftNETCoreAppHostPackageVersion" Version="%24(MicrosoftNETCoreAppCompositeVersion)" />
     <ExtraPackageVersionPropsPackageInfo Include="MicrosoftAspNetCoreAppRuntimePackageVersion" Version="%24(MicrosoftAspNetCoreAppRuntimeLinux$(Platform)PackageVersion)" />
     <!-- core-sdk uses this property for ASP.NET blob directory -->
     <ExtraPackageVersionPropsPackageInfo Include="VSRedistCommonAspNetCoreTargetingPackx6430PackageVersion" Version="$(aspnetcoreOutputPackageVersion)" />
@@ -247,6 +247,9 @@
     <ExtraPackageVersionPropsPackageInfo Include="MicrosoftAspNetCoreAppRuntimePackageVersion" Version="%24(MicrosoftAspNetCoreAppRuntimeOsxX64PackageVersion)" DoNotOverwrite="true" />
     <ExtraPackageVersionPropsPackageInfo Include="MicrosoftAspNetCoreAppRuntimePackageVersion" Version="%24(MicrosoftAspNetCoreAppRuntimewinx64PackageVersion)" DoNotOverwrite="true" />
 
+    <!-- Used by installer to determine sdk version -->
+    <ExtraPackageVersionPropsPackageInfo Include="MicrosoftDotnetToolsetInternalPackageVersion" Version="%24(MicrosoftNETSdkPackageVersion)" />
+
     <!-- Used by sdk to determine msbuild version for fsharp -->
     <ExtraPackageVersionPropsPackageInfo Include="FSharpBuildVersion" Version="%24(MicrosoftBuildPackageVersion)" />
 

src/SourceBuild/tarball/content/eng/Versions.props

@@ -23,6 +23,6 @@
   <PropertyGroup>
     <PrivateSourceBuiltArtifactsPackageVersion>0.1.0-6.0.100-bootstrap.11</PrivateSourceBuiltArtifactsPackageVersion>
     <PrivateSourceBuiltPrebuiltsPackageVersionPrefix>0.1.0-6.0.100-</PrivateSourceBuiltPrebuiltsPackageVersionPrefix>
-    <PrivateSourceBuiltPrebuiltsPackageVersionSuffix>6</PrivateSourceBuiltPrebuiltsPackageVersionSuffix>
+    <PrivateSourceBuiltPrebuiltsPackageVersionSuffix>11</PrivateSourceBuiltPrebuiltsPackageVersionSuffix>
   </PropertyGroup>
 </Project>

src/SourceBuild/tarball/content/patches/aspnetcore/0005-Add-installer-artifacts-to-source-build-intermediate.patch

@@ -0,0 +1,36 @@
+From a5620750c0d6c6fd8652daf7064fbc3622b6d320 Mon Sep 17 00:00:00 2001
+From: Michael Simons <msimons@microsoft.com>
+Date: Mon, 16 Aug 2021 16:49:27 +0000
+Subject: [PATCH] Add installer artifacts to source build intermediate
+
+---
+ eng/SourceBuild.props | 15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
+
+diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props
+index 5c714e42c4..e7024a7707 100644
+--- a/eng/SourceBuild.props
++++ b/eng/SourceBuild.props
+@@ -60,4 +60,19 @@
+     </PropertyGroup>
+   </Target>
+ 
++  <Target Name="GetAspnetcoreCategorizedIntermediateNupkgContents"
++          BeforeTargets="GetCategorizedIntermediateNupkgContents">
++    <PropertyGroup>
++      <InstallersArtifactsDir>$(CurrentRepoSourceBuildArtifactsDir)\installers\$(Configuration)\</InstallersArtifactsDir>
++    </PropertyGroup>
++
++    <ItemGroup>
++      <!--
++        Add the internal installers artifacts required by dotnet/installer.
++      -->
++      <IntermediateNupkgArtifactFile Include="$(InstallersArtifactsDir)aspnetcore-runtime-internal-*.tar.gz" />
++      <IntermediateNupkgArtifactFile Include="$(InstallersArtifactsDir)aspnetcore_base_runtime.version" />
++    </ItemGroup>
++  </Target>
++
+ </Project>
+-- 
+2.29.2
+

src/SourceBuild/tarball/content/patches/runtime/0001-Conditionally-build-allconfigurations.patch

@@ -0,0 +1,27 @@
+From c1eaa569a1ebe3aa688ca251fcbcb42ee086cf27 Mon Sep 17 00:00:00 2001
+From: dseefeld <dseefeld@microsoft.com>
+Date: Wed, 18 Aug 2021 12:20:24 +0000
+Subject: [PATCH] Conditionally build allconfigurations
+
+When building portable, only a subset of runtime needs to be
+built.  allconfigurations is only needed in a non-portable build.
+---
+ eng/SourceBuild.props | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props
+index 7dfc80d41fd..1e3bd504931 100644
+--- a/eng/SourceBuild.props
++++ b/eng/SourceBuild.props
+@@ -37,7 +37,7 @@
+       <InnerBuildArgs>$(InnerBuildArgs) --arch $(TargetRidPlatform)</InnerBuildArgs>
+       <InnerBuildArgs>$(InnerBuildArgs) --configuration $(Configuration)</InnerBuildArgs>
+       <InnerBuildArgs>$(InnerBuildArgs) --ci</InnerBuildArgs>
+-      <InnerBuildArgs>$(InnerBuildArgs) --allconfigurations</InnerBuildArgs>
++      <InnerBuildArgs  Condition="'$(SourceBuildNonPortable)' == 'true'">$(InnerBuildArgs) --allconfigurations</InnerBuildArgs>
+       <InnerBuildArgs>$(InnerBuildArgs) --verbosity $(LogVerbosity)</InnerBuildArgs>
+       <InnerBuildArgs>$(InnerBuildArgs) --nodereuse false</InnerBuildArgs>
+       <InnerBuildArgs>$(InnerBuildArgs) --warnAsError false</InnerBuildArgs>
+-- 
+2.31.1
+

src/SourceBuild/tarball/content/patches/sdk/0004-Add-toolset-zip-as-source-build-intermediate.patch

@@ -0,0 +1,31 @@
+From 3c008b2c3f04f2d0bd04ae0c1f7d56a64141842c Mon Sep 17 00:00:00 2001
+From: Michael Simons <msimons@microsoft.com>
+Date: Mon, 16 Aug 2021 16:33:33 +0000
+Subject: [PATCH] Add toolset zip as source build intermediate
+
+---
+ eng/SourceBuild.props | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props
+index 8bc7785fb..539a1490a 100644
+--- a/eng/SourceBuild.props
++++ b/eng/SourceBuild.props
+@@ -11,4 +11,14 @@
+     </PropertyGroup>
+   </Target>
+ 
++  <Target Name="GetSdkCategorizedIntermediateNupkgContents"
++          BeforeTargets="GetCategorizedIntermediateNupkgContents">
++    <ItemGroup>
++      <!--
++        Add the internal toolset zip required by dotnet/installer.
++      -->
++      <IntermediateNupkgArtifactFile Include="$(CurrentRepoSourceBuildArtifactsPackagesDir)NonShipping\dotnet-toolset-internal-*.zip" />
++    </ItemGroup>
++  </Target>
++
+ </Project>
+-- 
+2.29.2
+

src/SourceBuild/tarball/content/patches/sdk/0004-Disable-CA1416-for-ProcessExtensions.patch

@@ -0,0 +1,42 @@
+From 3e0c6887921670b5d9e312b121791307516a4ce2 Mon Sep 17 00:00:00 2001
+From: dseefeld <dseefeld@microsoft.com>
+Date: Wed, 18 Aug 2021 11:41:59 +0000
+Subject: [PATCH] Disable CA1416 for ProcessExtensions
+
+Since source-build loads an updated version of code analysis, this
+warning is showing up here.  Disable warning, since code is meant
+to be windows only.
+
+Eliminates errors like:
+    /src/tb-installer/src/sdk.5fab7585de482237f470634489b969a1bd03e063/artifacts/source-build/self/src/src/Cli/Microsoft.DotNet.Cli.Utils/Extensions/ProcessExtensions.cs(38,20): error CA1416: This call site is reachable on all platforms. 'ManagementObjectCollection.ManagementObjectEnumerator.MoveNext()' is only supported on: 'windows'. [/src/tb-installer/src/sdk.5fab7585de482237f470634489b969a1bd03e063/artifacts/source-build/self/src/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj]
+    /src/tb-installer/src/sdk.5fab7585de482237f470634489b969a1bd03e063/artifacts/source-build/self/src/src/Cli/Microsoft.DotNet.Cli.Utils/Extensions/ProcessExtensions.cs(35,55): error CA1416: This call site is reachable on all platforms. 'ManagementObjectSearcher.Get()' is only supported on: 'windows'. [/src/tb-installer/src/sdk.5fab7585de482237f470634489b969a1bd03e063/artifacts/source-build/self/src/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj]
+    /src/tb-installer/src/sdk.5fab7585de482237f470634489b969a1bd03e063/artifacts/source-build/self/src/src/Cli/Microsoft.DotNet.Cli.Utils/Extensions/ProcessExtensions.cs(36,80): error CA1416: This call site is reachable on all platforms. 'ManagementObjectCollection.GetEnumerator()' is only supported on: 'windows'. [/src/tb-installer/src/sdk.5fab7585de482237f470634489b969a1bd03e063/artifacts/source-build/self/src/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj]
+    /src/tb-installer/src/sdk.5fab7585de482237f470634489b969a1bd03e063/artifacts/source-build/self/src/src/Cli/Microsoft.DotNet.Cli.Utils/Extensions/ProcessExtensions.cs(38,60): error CA1416: This call site is reachable on all platforms. 'ManagementObjectCollection.ManagementObjectEnumerator.Current' is only supported on: 'windows'. [/src/tb-installer/src/sdk.5fab7585de482237f470634489b969a1bd03e063/artifacts/source-build/self/src/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj]
+    /src/tb-installer/src/sdk.5fab7585de482237f470634489b969a1bd03e063/artifacts/source-build/self/src/src/Cli/Microsoft.DotNet.Cli.Utils/Extensions/ProcessExtensions.cs(34,49): error CA1416: This call site is reachable on all platforms. 'ManagementObjectSearcher' is only supported on: 'windows'. [/src/tb-installer/src/sdk.5fab7585de482237f470634489b969a1bd03e063/artifacts/source-build/self/src/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj]
+    /src/tb-installer/src/sdk.5fab7585de482237f470634489b969a1bd03e063/artifacts/source-build/self/src/src/Cli/Microsoft.DotNet.Cli.Utils/Extensions/ProcessExtensions.cs(38,60): error CA1416: This call site is reachable on all platforms. 'ManagementBaseObject.GetPropertyValue(string)' is only supported on: 'windows'. [/src/tb-installer/src/sdk.5fab7585de482237f470634489b969a1bd03e063/artifacts/source-build/self/src/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj]
+---
+ .../Microsoft.DotNet.Cli.Utils/Extensions/ProcessExtensions.cs  | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/Extensions/ProcessExtensions.cs b/src/Cli/Microsoft.DotNet.Cli.Utils/Extensions/ProcessExtensions.cs
+index a9e9880c7..82519dc63 100644
+--- a/src/Cli/Microsoft.DotNet.Cli.Utils/Extensions/ProcessExtensions.cs
++++ b/src/Cli/Microsoft.DotNet.Cli.Utils/Extensions/ProcessExtensions.cs
+@@ -12,6 +12,7 @@ namespace Microsoft.DotNet.Cli.Utils
+     /// </summary>
+     public static class ProcessExtensions
+     {
++#pragma warning disable CA1416
+         /// <summary>
+         /// Returns the parent process of this process by querying the Win32_Process class.
+         /// </summary>
+@@ -37,5 +38,6 @@ public static int GetParentProcessId(this Process process)
+ 
+             return enumerator.MoveNext() ? Convert.ToInt32(enumerator.Current.GetPropertyValue("ParentProcessId")) : -1;
+         }
++#pragma warning restore CA1416
+     }
+ }
+-- 
+2.31.1
+

src/SourceBuild/tarball/content/repos/Directory.Build.targets

@@ -489,30 +489,34 @@
 
 
     <PropertyGroup Condition="'@(_BuiltIntermediatePackages)' != ''">
-        <_DestinationPath>$(SourceBuiltPackagesPath)</_DestinationPath>
+        <_NupkgDestinationPath>$(SourceBuiltPackagesPath)</_NupkgDestinationPath>
         <!-- SBRP packages unpack into the Reference packages directory instead of into blob-feed packages -->
-        <_DestinationPath Condition="$([System.String]::Copy(%(_BuiltIntermediatePackages.Identity)).Contains('source-build-reference-packages'))">$(ReferencePackagesDir)</_DestinationPath>
+        <_NupkgDestinationPath Condition="$([System.String]::Copy(%(_BuiltIntermediatePackages.Identity)).Contains('source-build-reference-packages'))">$(ReferencePackagesDir)</_NupkgDestinationPath>
     </PropertyGroup>
 
     <ZipFileExtractToDirectory Condition="'@(_BuiltIntermediatePackages)' != ''"
                             SourceArchive="%(_BuiltIntermediatePackages.Identity)"
-                            DestinationDirectory="$(SourceBuiltPackagesPath)extractArtifacts/"
+                            DestinationDirectory="$(SourceBuiltPackagesPath)extractArtifacts/%(_BuiltIntermediatePackages.FileName)/"
                             OverwriteDestination="true" />
 
     <ItemGroup Condition="'@(_BuiltIntermediatePackages)' != ''">
-      <SourceBuiltNupkgFiles Include="$(SourceBuiltPackagesPath)extractArtifacts/**/*.nupkg" />
+      <SourceBuiltNupkgFiles Include="$(SourceBuiltPackagesPath)extractArtifacts/**/artifacts/*.nupkg" />
-      <!-- don't copy some packages that we specifically want to override for now due to bad reference package generation                                                  -->
-      <!-- relevant issues: https://github.com/dotnet/runtime/issues/44646, https://github.com/dotnet/runtime/issues/45183, https://github.com/dotnet/runtime/issues/45417 -->
-      <!-- these should be fixed for 6.0 proper                                                                                                                            -->
-      <PrebuiltPackagesToUse Include="$(PrebuiltPackagesPath)/*.nupkg" />
-      <SourceBuiltNupkgFilesToSkip Include="@(PrebuiltPackagesToUse -> '$(SourceBuiltPackagesPath)extractArtifacts/artifacts/%(Filename)%(Extension)')" />
-      <SourceBuiltNupkgFiles Condition="$([System.String]::Copy(%(_BuiltIntermediatePackages.Identity)).Contains('source-build-reference-packages'))" Remove="@(SourceBuiltNupkgFilesToSkip)" />
     </ItemGroup>
 
     <Copy
       Condition="'@(SourceBuiltNupkgFiles)' != ''"
       SourceFiles="@(SourceBuiltNupkgFiles)"
-      DestinationFiles="@(SourceBuiltNupkgFiles -> '$(_DestinationPath)%(Filename)%(Extension)')" />
+      DestinationFiles="@(SourceBuiltNupkgFiles -> '$(_NupkgDestinationPath)%(Filename)%(Extension)')" />
+
+    <ItemGroup Condition="'@(_BuiltIntermediatePackages)' != ''">
+      <SourceBuiltAssetFiles Include="$(SourceBuiltPackagesPath)extractArtifacts/**/artifacts/*.*" />
+      <SourceBuiltAssetFiles Remove="$(SourceBuiltPackagesPath)extractArtifacts/**/artifacts/*.nupkg" />
+    </ItemGroup>
+
+    <Copy
+      Condition="'@(SourceBuiltAssetFiles)' != ''"
+      SourceFiles="@(SourceBuiltAssetFiles)"
+      DestinationFiles="@(SourceBuiltAssetFiles -> '$(SourceBuiltAssetsDir)%(Filename)%(Extension)')" />
 
     <RemoveDir
       Condition="Exists('$(SourceBuiltPackagesPath)extractArtifacts/')"

src/SourceBuild/tarball/content/repos/aspnetcore.proj

@@ -26,8 +26,7 @@
   <ItemGroup>
     <RepositoryReference Include="arcade" />
     <RepositoryReference Include="source-build" />
-    <!-- TODO:  Enable with https://github.com/dotnet/source-build/issues/2274
+    <RepositoryReference Include="runtime" />
-    <RepositoryReference Include="runtime" /> -->
     <RepositoryReference Include="msbuild" />
     <RepositoryReference Include="roslyn" />
     <!-- TODO:  https://github.com/dotnet/source-build/issues/2319

src/SourceBuild/tarball/content/repos/installer.proj

@@ -6,61 +6,45 @@
   <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
 
   <PropertyGroup>
-     <OverrideTargetRid>$(TargetRid)</OverrideTargetRid>
+    <OverrideTargetRid>$(TargetRid)</OverrideTargetRid>
-     <OverrideTargetRid Condition="'$(TargetOS)' == 'OSX'">osx-x64</OverrideTargetRid>
+    <OverrideTargetRid Condition="'$(TargetOS)' == 'OSX'">osx-x64</OverrideTargetRid>
-     <OSNameOverride>$(OverrideTargetRid.Substring(0, $(OverrideTargetRid.IndexOf("-"))))</OSNameOverride>
+    <OSNameOverride>$(OverrideTargetRid.Substring(0, $(OverrideTargetRid.IndexOf("-"))))</OSNameOverride>
 
-     <RuntimeArg>--runtime-id $(OverrideTargetRid)</RuntimeArg>
+    <RuntimeArg>--runtime-id $(OverrideTargetRid)</RuntimeArg>
-     <RuntimeArg Condition="'$(TargetOS)' == 'Linux'">--runtime-id $(TargetRid)</RuntimeArg>
+    <RuntimeArg Condition="'$(TargetOS)' == 'Linux'">--runtime-id $(TargetRid)</RuntimeArg>
 
-     <BuildCommandArgs>--restore --build --pack --ci --binaryLog</BuildCommandArgs>
+    <BuildCommandArgs>$(StandardSourceBuildArgs)</BuildCommandArgs>
-     <BuildCommandArgs>$(BuildCommandArgs) --configuration $(Configuration)</BuildCommandArgs>
+    <BuildCommandArgs>$(BuildCommandArgs) $(RuntimeArg)</BuildCommandArgs>
-     <BuildCommandArgs>$(BuildCommandArgs) $(RuntimeArg)</BuildCommandArgs>
 
-     <!--
+    <!--
-       Setting NETCoreAppMaximumVersion to a high version so that the sdk doesn't complain if we're restoring/publishing for a higher version than the sdk.
+      Setting NETCoreAppMaximumVersion to a high version so that the sdk doesn't complain if we're restoring/publishing for a higher version than the sdk.
-       See https://github.com/dotnet/sdk/issues/1512#issuecomment-377082883
+      See https://github.com/dotnet/sdk/issues/1512#issuecomment-377082883
-     -->
+    -->
-     <BuildCommandArgs>$(BuildCommandArgs) /p:NETCoreAppMaximumVersion=99.9</BuildCommandArgs>
+    <BuildCommandArgs>$(BuildCommandArgs) /p:NETCoreAppMaximumVersion=99.9</BuildCommandArgs>
-     <BuildCommandArgs>$(BuildCommandArgs) /p:OSName=$(OSNameOverride)</BuildCommandArgs>
+    <BuildCommandArgs>$(BuildCommandArgs) /p:OSName=$(OSNameOverride)</BuildCommandArgs>
-     <BuildCommandArgs Condition="'$(TargetOS)' == 'Linux'">$(BuildCommandArgs) /p:Rid=$(TargetRid)</BuildCommandArgs>
+    <BuildCommandArgs Condition="'$(TargetOS)' == 'Linux'">$(BuildCommandArgs) /p:Rid=$(TargetRid)</BuildCommandArgs>
-     <BuildCommandArgs>$(BuildCommandArgs) /p:DOTNET_INSTALL_DIR=$(DotNetCliToolDir)</BuildCommandArgs>
+    <BuildCommandArgs>$(BuildCommandArgs) /p:DOTNET_INSTALL_DIR=$(DotNetCliToolDir)</BuildCommandArgs>
 
+    <BuildCommandArgs Condition="'$(TargetOS)' == 'Linux'">$(BuildCommandArgs) /p:AspNetCoreSharedFxInstallerRid=linux-$(Platform)</BuildCommandArgs>
+    <!-- core-sdk always wants to build portable on OSX and FreeBSD -->
+    <BuildCommandArgs Condition="'$(TargetOS)' == 'FreeBSD'">$(BuildCommandArgs) /p:CoreSetupRid=freebsd-x64 /p:PortableBuild=true</BuildCommandArgs>
+    <BuildCommandArgs Condition="'$(TargetOS)' == 'OSX'">$(BuildCommandArgs) /p:CoreSetupRid=osx-x64</BuildCommandArgs>
+    <BuildCommandArgs Condition="'$(TargetOS)' == 'Linux'">$(BuildCommandArgs) /p:CoreSetupRid=$(TargetRid)</BuildCommandArgs>
 
-     <BuildCommandArgs Condition="'$(TargetOS)' == 'Linux'">$(BuildCommandArgs) /p:AspNetCoreSharedFxInstallerRid=linux-$(Platform)</BuildCommandArgs>
+    <!-- Consume the source-built Core-Setup. This line must be removed to source-build CLI without source-building Core-Setup first. -->
-     <!-- core-sdk always wants to build portable on OSX and FreeBSD -->
+    <BuildCommandArgs>$(BuildCommandArgs) /p:CoreSetupBlobRootUrl=file:%2F%2F$(SourceBuiltAssetsDir)</BuildCommandArgs>
-     <BuildCommandArgs Condition="'$(TargetOS)' == 'FreeBSD'">$(BuildCommandArgs) /p:CoreSetupRid=freebsd-x64 /p:PortableBuild=true</BuildCommandArgs>
-     <BuildCommandArgs Condition="'$(TargetOS)' == 'OSX'">$(BuildCommandArgs) /p:CoreSetupRid=osx-x64</BuildCommandArgs>
-     <BuildCommandArgs Condition="'$(TargetOS)' == 'Linux'">$(BuildCommandArgs) /p:CoreSetupRid=$(TargetRid)</BuildCommandArgs>
 
-     <!-- Consume the source-built Core-Setup. This line must be removed to source-build CLI without source-building Core-Setup first. -->
+    <!-- location to pick up the toolset binaries from.  This must be removed to source-build core-sdk without building toolset first -->
-     <BuildCommandArgs>$(BuildCommandArgs) /p:CoreSetupBlobRootUrl=file:%2F%2F$(LocalBlobStorageRoot)</BuildCommandArgs>
+    <BuildCommandArgs>$(BuildCommandArgs) /p:DotnetToolsetBlobRootUrl=file:%2F%2F$(SourceBuiltAssetsDir)</BuildCommandArgs>
 
-     <!-- location to pick up the toolset binaries from.  This must be removed to source-build core-sdk without building toolset first -->
+    <BuildCommandArgs>$(BuildCommandArgs) /p:UsePortableLinuxSharedFramework=false</BuildCommandArgs>
-     <BuildCommandArgs>$(BuildCommandArgs) /p:DotnetToolsetBlobRootUrl=file:%2F%2F$(LocalBlobStorageRoot)</BuildCommandArgs>
 
-     <BuildCommandArgs>$(BuildCommandArgs) /p:SkipBuildingInstallers=true</BuildCommandArgs>
+    <BuildCommand>$(StandardSourceBuildCommand) $(BuildCommandArgs)</BuildCommand>
-     <BuildCommandArgs>$(BuildCommandArgs) /p:IncludeNuGetPackageArchive=false</BuildCommandArgs>
-     <BuildCommandArgs>$(BuildCommandArgs) /p:IncludeAdditionalSharedFrameworks=false</BuildCommandArgs>
-     <BuildCommandArgs>$(BuildCommandArgs) /p:UsePortableLinuxSharedFramework=false</BuildCommandArgs>
-     <BuildCommandArgs>$(BuildCommandArgs) /p:IncludeSharedFrameworksForBackwardsCompatibilityTests=false</BuildCommandArgs>
 
-     <BuildCommand>$(ProjectDirectory)/build$(ShellExtension) $(BuildCommandArgs)</BuildCommand>
-
-    <PackageOutputRid Condition="'$(TargetOS)' == 'Windows_NT'">win-x64</PackageOutputRid>
-    <PackageOutputRid Condition="'$(TargetOS)' == 'OSX'">osx-x64</PackageOutputRid>
-    <PackageOutputRid Condition="'$(TargetOS)' == 'FreeBSD'">freebsd-x64</PackageOutputRid>
-    <PackageOutputRid Condition="'$(PackageOutputRid)' == ''">$(TargetRid)</PackageOutputRid>
-    <TarBallOutput>$(PackagesOutput)</TarBallOutput>
     <RepoApiImplemented>false</RepoApiImplemented>
     <SourceOverrideRepoApiImplemented>true</SourceOverrideRepoApiImplemented>
     <DependencyVersionInputRepoApiImplemented>true</DependencyVersionInputRepoApiImplemented>
 
-    <EnvironmentExternalRestoreSources>$(SourceBuiltPackagesPath)</EnvironmentExternalRestoreSources>
-    <EnvironmentExternalRestoreSources>$(EnvironmentExternalRestoreSources)%3B$(ReferencePackagesDir)%3B$(PrebuiltPackagesPath)</EnvironmentExternalRestoreSources>
-
-    <!-- This project builds zips, not NuGet packages. -->
-    <SkipEnsurePackagesCreated>true</SkipEnsurePackagesCreated>
     <NuGetConfigFile>$(ProjectDirectory)NuGet.config</NuGetConfigFile>
 
     <!-- This repo uses text-only template packages from the internal transport feed. -->
@@ -72,16 +56,14 @@
   </ItemGroup>
 
   <ItemGroup>
-    <RepositoryReference Include="application-insights" />
     <RepositoryReference Include="arcade" />
     <RepositoryReference Include="aspnetcore" />
     <RepositoryReference Include="clicommandlineparser" />
     <RepositoryReference Include="fsharp" />
     <RepositoryReference Include="msbuild" />
-    <RepositoryReference Include="netcorecli-fsc" />
+    <RepositoryReference Include="source-build" />
-    <RepositoryReference Include="newtonsoft-json" />
+    <!-- TODO:  https://github.com/dotnet/source-build/issues/2279
-    <RepositoryReference Include="newtonsoft-json901" />
+    <RepositoryReference Include="nuget-client" /> -->
-    <RepositoryReference Include="nuget-client" />
     <RepositoryReference Include="roslyn" />
     <RepositoryReference Include="runtime" />
     <RepositoryReference Include="sdk" />
@@ -103,9 +85,6 @@
   <ItemGroup>
     <EnvironmentVariables Include="CLIBUILD_SKIP_TESTS=true" />
 
-    <!-- Pass multiple restore sources as environment: avoid the shell seeing ';' in an Exec. -->
-    <EnvironmentVariables Include="ExternalRestoreSources=$(EnvironmentExternalRestoreSources)" />
-
     <!-- Disable bundled tools until we can figure out:
       Unable to find package dotnet-dev-certs.
       Unable to find package dotnet-ef.
@@ -116,16 +95,18 @@
   </ItemGroup>
 
   <Target Name="CopyTarBall"
-          AfterTargets="CopyPackage"
+          AfterTargets="ExtractIntermediatePackages"
           Inputs="$(MSBuildProjectFullPath)"
           Outputs="$(RepoCompletedSemaphorePath)CopyTarBall.complete">
     <ItemGroup>
-      <CliTarBalls Include="$(TarBallOutput)*$(TarBallExtension)" />
+      <CliTarBalls Include="$(SourceBuiltAssetsDir)*$(TarBallExtension)" />
     </ItemGroup>
 
+    <Error Condition="'@(CliTarBalls)' == ''" Text="'$(SourceBuiltPackagesPath)*$(TarBallExtension)' does not exist." />
+
     <Copy SourceFiles="@(CliTarBalls)"
           DestinationFolder="$(SourceBuiltTarBallPath)"
-          Condition="'@(CliTarBalls)'!=''" />
+          Condition="'@(CliTarBalls)' != ''" />
 
     <WriteLinesToFile File="$(RepoCompletedSemaphorePath)CopyTarBall.complete" Overwrite="true" />
   </Target>

src/SourceBuild/tarball/content/repos/known-good.proj

@@ -45,6 +45,7 @@
         <RepositoryReference Include="linker" />
         <RepositoryReference Include="msbuild" />
         <RepositoryReference Include="runtime-portable" />
+        <RepositoryReference Include="runtime" />
         <RepositoryReference Include="templating" />
 
         <!-- Tier 4 -->
@@ -55,6 +56,9 @@
         <RepositoryReference Include="sdk" />
         <RepositoryReference Include="vstest" />
 
+        <!-- Tier 6 -->
+        <RepositoryReference Include="installer" />
+
         <!-- Package source-build artifacts -->
         <RepositoryReference Include="package-source-build" />
       </ItemGroup>

src/SourceBuild/tarball/content/repos/msbuild.proj

@@ -30,10 +30,8 @@
 
   <ItemGroup>
     <RepositoryReference Include="arcade" />
-    <!-- TODO:  Enable with https://github.com/dotnet/source-build/issues/2274
+    <RepositoryReference Include="runtime" />
-    <RepositoryReference Include="runtime" /> -->
+    <RepositoryReference Include="roslyn" />
-    <!-- TODO:  Enable with https://github.com/dotnet/source-build/issues/2272 
-    <RepositoryReference Include="roslyn" /> -->
   </ItemGroup>
 
   <!--

src/SourceBuild/tarball/content/repos/runtime-portable.proj

@@ -1,5 +1,9 @@
 <Project>
   <Import Project="runtime.common.props"/>
+  
+  <PropertyGroup>
+    <SourceDirectory>runtime</SourceDirectory>
+  </PropertyGroup>
 
   <!-- Repository References -->
   <ItemGroup>
@@ -19,8 +23,9 @@
       <PortableObjDir>$(ProjectDirectory)artifacts/portableObj</PortableObjDir>
     </PropertyGroup>
     <ItemGroup>
-      <PortableLogFilesToCopy Include="$(ProjectDirectory)artifacts/log/**/*" />
+      <PortableLogFilesToCopy Include="$(ProjectDirectory)artifacts/**/*.log" />
-      <PortableObjFilesToCopy Include="$(ProjectDirectory)artifacts/obj/**/project.assets.json" />
+      <PortableLogFilesToCopy Include="$(ProjectDirectory)artifacts/**/*.binlog" />
+      <PortableObjFilesToCopy Include="$(ProjectDirectory)artifacts/**/project.assets.json" />
     </ItemGroup>
     <MakeDir Directories="$(PortableLogDir)" Condition="Exists('$(ProjectDirectory)artifacts')"/>
     <MakeDir Directories="$(PortableObjDir)" Condition="Exists('$(ProjectDirectory)artifacts')"/>

src/SourceBuild/tarball/content/repos/runtime.common.props

@@ -1,6 +1,5 @@
 <Project>
   <PropertyGroup>
-    <RepositoryName>runtime</RepositoryName>
     <SourceDirectory>runtime</SourceDirectory>
   </PropertyGroup>
 

src/SourceBuild/tarball/content/repos/runtime.proj

@@ -1,22 +1,27 @@
 <Project>
   <Import Project="runtime.common.props"/>
 
+  <PropertyGroup>
+    <OverrideTargetRid>$(TargetRid)</OverrideTargetRid>
+    <OverrideTargetRid Condition="'$(TargetOS)' == 'OSX'">osx-x64</OverrideTargetRid>
+    <OverrideTargetRid Condition="'$(TargetOS)' == 'FreeBSD'">freebsd-x64</OverrideTargetRid>
+    <OverrideTargetRid Condition="'$(TargetOS)' == 'Windows_NT'">win-x64</OverrideTargetRid>
+
+    <BuildCommandArgs>$(StandardSourceBuildArgs)</BuildCommandArgs>
+    <BuildCommandArgs>$(BuildCommandArgs) /p:TargetRid=$(OverrideTargetRid)</BuildCommandArgs>
+    <BuildCommandArgs>$(BuildCommandArgs) /p:SourceBuildNonPortable=true</BuildCommandArgs>
+    <BuildCommand>$(StandardSourceBuildCommand) $(BuildCommandArgs)</BuildCommand>
+  </PropertyGroup>
+
   <!-- Repository References -->
   <ItemGroup>
       <RepositoryReference Include="arcade" />
       <RepositoryReference Include="symreader" />
       <RepositoryReference Include="linker" />
-      <RepositoryReference Include="newtonsoft-json" />
+      <RepositoryReference Include="source-build" />
-      <RepositoryReference Include="newtonsoft-json901" />
       <RepositoryReference Include="roslyn" />
-      <RepositoryReference Include="runtime-portable" Condition="'$(TargetOS)' == 'Linux' and '$(BuildPortableRuntime)' == 'true'" />
+      <RepositoryReference Include="runtime-portable" />
   </ItemGroup>
 
-    <!-- Additional Targets -->
-  <Target Name="InstallJustBuiltRuntime" AfterTargets="RemoveBuiltPackagesFromCache">
-    <!-- Install the runtime that was just built to be used by downstream repos, namely, aspnetcore -->
-    <Exec Command="tar -xvf $(SourceBuiltAssetsDir)dotnet-runtime-$(runtimeOutputPackageVersion)-$(OverrideTargetRid).tar.gz -C $(DotNetCliToolDir)" />
-  </Target>
-
   <Import Project="runtime.common.targets" />
 </Project>

src/SourceBuild/tarball/content/repos/sdk.proj

@@ -35,8 +35,7 @@
   <ItemGroup>
     <RepositoryReference Include="arcade" />
     <RepositoryReference Include="xliff-tasks" />
-    <!-- TODO:  Enable with https://github.com/dotnet/source-build/issues/2274
+    <RepositoryReference Include="runtime" />
-    <RepositoryReference Include="runtime" /> -->
     <RepositoryReference Include="msbuild" />
     <RepositoryReference Include="source-build" />
     <!-- TODO:  https://github.com/dotnet/source-build/issues/2279

src/SourceBuild/tarball/content/repos/vstest.proj

@@ -13,8 +13,7 @@
 
   <ItemGroup>
     <RepositoryReference Include="diagnostics" />
-    <!-- TODO:  Enable with https://github.com/dotnet/source-build/issues/2275
+    <RepositoryReference Include="runtime" />
-    <RepositoryReference Include="runtime" /> -->
     <RepositoryReference Include="source-build" />
   </ItemGroup>
 

src/redist/targets/GenerateLayout.targets

@@ -94,7 +94,9 @@
 
     <PropertyGroup>
       <CoreSetupRootUrl>$(CoreSetupBlobRootUrl)Runtime/</CoreSetupRootUrl>
+      <CoreSetupRootUrl Condition=" '$(DotNetBuildFromSource)' == 'true' AND '$(DotNetBuildOffline)' == 'true' ">$(CoreSetupBlobRootUrl)</CoreSetupRootUrl>
       <AspNetCoreSharedFxRootUrl>$(CoreSetupBlobRootUrl)aspnetcore/Runtime/</AspNetCoreSharedFxRootUrl>
+      <AspNetCoreSharedFxRootUrl Condition=" '$(DotNetBuildFromSource)' == 'true' AND '$(DotNetBuildOffline)' == 'true' ">$(CoreSetupBlobRootUrl)</AspNetCoreSharedFxRootUrl>
       <WinFormsAndWpfSharedFxRootUrl>$(CoreSetupBlobRootUrl)WindowsDesktop/</WinFormsAndWpfSharedFxRootUrl>
       <CoreSetupDownloadDirectory>$(IntermediateDirectory)/coreSetupDownload/$(MicrosoftNETCoreAppRuntimePackageVersion)</CoreSetupDownloadDirectory>
       <CombinedSharedHostAndFrameworkArchive>$(CoreSetupDownloadDirectory)/combinedSharedHostAndFrameworkArchive$(ArchiveExtension)</CombinedSharedHostAndFrameworkArchive>
@@ -109,6 +111,7 @@
     <ItemGroup>
       <BundledLayoutComponent Include="CombinedSharedHostAndFrameworkArchive">
         <BaseUrl>$(CoreSetupRootUrl)$(CoreSetupBlobVersion)</BaseUrl>
+        <BaseUrl Condition=" '$(DotNetBuildFromSource)' == 'true' AND '$(DotNetBuildOffline)' == 'true' ">$(CoreSetupRootUrl)</BaseUrl>
         <DownloadFileName>$(CombinedFrameworkHostArchiveFileName)</DownloadFileName>
         <RelativeLayoutPath></RelativeLayoutPath>
       </BundledLayoutComponent>
@@ -232,6 +235,7 @@
 
       <BundledLayoutComponent Include="ToolsetArchive">
         <BaseUrl>$(DotnetToolsetBlobRootUrl)Sdk/$(MicrosoftDotnetToolsetInternalPackageVersion)</BaseUrl>
+        <BaseUrl Condition=" '$(DotNetBuildFromSource)' == 'true' AND '$(DotNetBuildOffline)' == 'true' ">$(DotnetToolsetBlobRootUrl)</BaseUrl>
         <DownloadFileName>dotnet-toolset-internal-$(MicrosoftDotnetToolsetInternalPackageVersion).zip</DownloadFileName>
         <RelativeLayoutPath>sdk/$(Version)</RelativeLayoutPath>
       </BundledLayoutComponent>
@@ -240,6 +244,7 @@
     <ItemGroup Condition=" '$(IncludeAspNetCoreRuntime)' != 'false' ">
       <BundledLayoutComponent Include="DownloadedAspNetCoreSharedFxArchiveFile">
         <BaseUrl>$(AspNetCoreSharedFxRootUrl)$(AspNetCoreBlobVersion)</BaseUrl>
+        <BaseUrl Condition=" '$(DotNetBuildFromSource)' == 'true' AND '$(DotNetBuildOffline)' == 'true' ">$(AspNetCoreSharedFxRootUrl)</BaseUrl>
         <DownloadFileName>$(AspNetCoreSharedFxArchiveFileName)</DownloadFileName>
         <RelativeLayoutPath></RelativeLayoutPath>
       </BundledLayoutComponent>
@@ -280,6 +285,7 @@
       <BundledInstallerComponent Include="AspNetCoreSharedFxBaseRuntimeVersionFile"
                                  Condition="!$(Architecture.StartsWith('arm')) or '$(Rid)' == 'win-arm64' or '$(Rid)' == 'osx-arm64'">
         <BaseUrl>$(AspNetCoreSharedFxRootUrl)$(AspNetCoreBlobVersion)</BaseUrl>
+        <BaseUrl Condition=" '$(DotNetBuildFromSource)' == 'true' AND '$(DotNetBuildOffline)' == 'true' ">$(AspNetCoreSharedFxRootUrl)</BaseUrl>
         <DownloadFileName>$(AspNetCoreSharedFxBaseRuntimeVersionFileName)</DownloadFileName>
       </BundledInstallerComponent>
     </ItemGroup>

src/redist/targets/GenerateMSIs.targets

@@ -2,7 +2,8 @@
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">  
   <PropertyGroup>
     <MicrosoftDotNetBuildTasksInstallersTaskTargetFramework Condition="'$(MSBuildRuntimeType)' == 'Core'">netcoreapp3.1</MicrosoftDotNetBuildTasksInstallersTaskTargetFramework>
-    <MicrosoftDotNetBuildTasksInstallersTaskTargetFramework Condition="'$(DotNetBuildFromSource)' == 'true'">net5.0</MicrosoftDotNetBuildTasksInstallersTaskTargetFramework>
+    <MicrosoftDotNetBuildTasksInstallersTaskTargetFramework Condition="'$(DotNetBuildFromSource)' == 'true' AND '$(DotNetBuildOffline)' != 'true' ">net5.0</MicrosoftDotNetBuildTasksInstallersTaskTargetFramework>
+    <MicrosoftDotNetBuildTasksInstallersTaskTargetFramework Condition="'$(DotNetBuildFromSource)' == 'true' AND '$(DotNetBuildOffline)' == 'true' ">net6.0</MicrosoftDotNetBuildTasksInstallersTaskTargetFramework>
     <MicrosoftDotNetBuildTasksInstallersTaskTargetFramework Condition="'$(MSBuildRuntimeType)' != 'Core'">net472</MicrosoftDotNetBuildTasksInstallersTaskTargetFramework>
     <MicrosoftDotNetBuildTasksInstallersTaskAssembly>$(NuGetPackageRoot)microsoft.dotnet.build.tasks.installers\$(MicrosoftDotNetBuildTasksInstallersPackageVersion)\tools\$(MicrosoftDotNetBuildTasksInstallersTaskTargetFramework)\Microsoft.DotNet.Build.Tasks.Installers.dll</MicrosoftDotNetBuildTasksInstallersTaskAssembly>
   </PropertyGroup>