Include coreclr-tools in source-built archive (dotnet#1369)

* Include coreclr-tools in source-built archive

* Add add'l pkgs to delete when generating tarball

* Sort additional prebuilts to delete text file

* Report all disallowed prebuilts on tarball creation

Author: dseefeld

build-source-tarball.sh

@@ -312,16 +312,20 @@ done < $SCRIPT_ROOT/support/additional-prebuilts-to-delete.txt
 
 if [ $SKIP_PREBUILT_ENFORCEMENT -ne 1 ]; then
   echo 'Checking for extra prebuilts...'
+  error_encountered=false
   for package in `ls -A $TARBALL_ROOT/packages/prebuilt`
   do
       if grep -q "$package" $SCRIPT_ROOT/support/allowed-prebuilts.txt; then
           echo "Allowing prebuilt $package"
       else
           echo "ERROR: $package is not in the allowed prebuilts list ($SCRIPT_ROOT/support/allowed-prebuilts.txt)"
-          echo "Either remove this prebuilt, add it to the known extras list ($SCRIPT_ROOT/support/additional-prebuilts-to-delete.txt) or add it to the allowed prebuilts list."
-          exit 1
+          error_encountered=true
       fi
   done
+  if [ "$error_encountered" = "true" ]; then
+    echo "Either remove this prebuilt, add it to the known extras list ($SCRIPT_ROOT/support/additional-prebuilts-to-delete.txt) or add it to the allowed prebuilts list."
+    exit 1
+  fi
 fi
 
 echo 'Removing source-built, previously source-built packages and reference packages from il pkg src...'

src/package-source-build/package.proj

@@ -6,11 +6,18 @@
   <Target Name="Pack">
     <!-- Copy PVP to packages dir in order to package them together -->
     <Copy SourceFiles="$(IncludedPackageVersionPropsFile)" DestinationFiles="$(SourceBuiltPackagesPath)PackageVersions.props" />
+
+    <!-- Copy coreclr tools to packages dir to include it in the source-built tarball as well -->
+    <ItemGroup>
+      <CoreClrToolsFiles Include="$(ToolPackageExtractDir)coreclr-tools/*" />
+    </ItemGroup>
+    <Copy SourceFiles="@(CoreClrToolsFiles)" DestinationFolder="$(SourceBuiltPackagesPath)coreclr-tools" />
+
     <PropertyGroup>
         <SourceBuiltTarballName>$(OutputPath)$(SourceBuiltArtifactsTarballName).$(VersionPrefix)-$(VersionSuffix).tar.gz</SourceBuiltTarballName>
     </PropertyGroup>
 
-    <Exec Command="tar --numeric-owner -czf $(SourceBuiltTarballName) *.nupkg *.props" WorkingDirectory="$(SourceBuiltPackagesPath)" />
+    <Exec Command="tar --numeric-owner -czf $(SourceBuiltTarballName) *.nupkg *.props coreclr-tools/*" WorkingDirectory="$(SourceBuiltPackagesPath)" />
 
     <Message Importance="High" Text="Packaged source-built artifacts to $(SourceBuiltTarballName)" />
   </Target>

support/additional-prebuilts-to-delete.txt

@@ -1,33 +1,40 @@
 # this is a list of packages that end up in the tarball's prebuilts folder but are not actually needed.
 # this is typically because part of the build are turned off for DotNetBuildOffline but not DotNetBuildFromSource.
-microsoft.dotnet.arcade.sdk.*.nupkg
+dotnet-dev-certs.3.0.0-rc2.19465.2.nupkg
+dotnet-user-secrets.3.0.0-rc2.19465.2.nupkg
+dotnet-watch.3.0.0-rc2.19465.2.nupkg
+microsoft.aspnetcore.analyzers.3.0.0-rc2.19465.2.nupkg
+microsoft.aspnetcore.developercertificates.xplat.3.0.0-rc2.19465.2.nupkg
+microsoft.aspnetcore.mvc.analyzers.3.0.0-rc2.19465.2.nupkg
+microsoft.aspnetcore.mvc.api.analyzers.3.0.0-rc2.19465.2.nupkg
+microsoft.codeanalysis.analyzers.2.6.1.nupkg
+microsoft.codeanalysis.common.2.9.0.nupkg
+microsoft.codeanalysis.csharp.2.9.0.nupkg
 microsoft.diasymreader.pdb2pdb.*.nupkg
+microsoft.dotnet.arcade.sdk.*.nupkg
+microsoft.dotnet.genapi.*.nupkg
 microsoft.dotnet.signtool.*.nupkg
-sn.1.0.0.nupkg
-vswhere.2.6.7.nupkg
-system.text.encoding.codepages.4.3.0.nupkg
-system.text.encoding.codepages.4.5.1.nupkg
-system.threading.tasks.dataflow.4.5.24.nupkg
+microsoft.net.compilers.toolset.*.nupkg
+microsoft.netcore.app.host.linux-x64.3.0.0.nupkg
+microsoft.visualstudio.setup.configuration.interop.1.16.30.nupkg
 runtime.*.runtime.native.system.security.cryptography.apple.*.nupkg
 runtime.*.runtime.native.system.security.cryptography.openssl.*.nupkg
-system.text.json.1.0.0.nupkg
-system.xml.xpath.4.3.0.nupkg
-microsoft.codeanalysis.csharp.2.9.0.nupkg
-system.xml.xpath.xdocument.4.3.0.nupkg
-microsoft.codeanalysis.common.2.9.0.nupkg
-microsoft.codeanalysis.analyzers.2.6.1.nupkg
-system.valuetuple.4.3.0.nupkg
-microsoft.dotnet.genapi.*.nupkg
-system.runtime.compilerservices.unsafe.4.5.0.nupkg
 runtime.linux-x64.microsoft.netcore.dotnetapphost.*.nupkg
-runtime.linux-x64.microsoft.netcore.dotnethostresolver.*.nupkg
-runtime.linux-x64.microsoft.netcore.dotnethostpolicy.*.nupkg
 runtime.linux-x64.microsoft.netcore.dotnethost.*.nupkg
-microsoft.netcore.app.host.linux-x64.3.0.0.nupkg
-system.composition.runtime.1.0.31.nupkg
+runtime.linux-x64.microsoft.netcore.dotnethostpolicy.*.nupkg
+runtime.linux-x64.microsoft.netcore.dotnethostresolver.*.nupkg
+sn.1.0.0.nupkg
+system.composition.attributedmodel.1.0.31.nupkg
+system.composition.convention.1.0.31.nupkg
 system.composition.hosting.1.0.31.nupkg
+system.composition.runtime.1.0.31.nupkg
 system.composition.typedparts.1.0.31.nupkg
-system.composition.convention.1.0.31.nupkg
-system.composition.attributedmodel.1.0.31.nupkg
-microsoft.visualstudio.setup.configuration.interop.1.16.30.nupkg
-microsoft.net.compilers.toolset.*.nupkg
+system.runtime.compilerservices.unsafe.4.5.0.nupkg
+system.text.encoding.codepages.4.3.0.nupkg
+system.text.encoding.codepages.4.5.1.nupkg
+system.text.json.1.0.0.nupkg
+system.threading.tasks.dataflow.4.5.24.nupkg
+system.valuetuple.4.3.0.nupkg
+system.xml.xpath.4.3.0.nupkg
+system.xml.xpath.xdocument.4.3.0.nupkg
+vswhere.2.6.7.nupkg