rm src/package-source-build: fix binlog overwrite (#1574)

Author: dagood

repos/package-source-build.proj

@@ -6,17 +6,34 @@
     <RepoApiImplemented>false</RepoApiImplemented>
     <ProjectDirectory>$(SubmoduleDirectory)$(RepositoryName)/</ProjectDirectory>
     <SkipEnsurePackagesCreated>true</SkipEnsurePackagesCreated>
-    <BuildArgs>--binaryLog</BuildArgs>
-    <BuildArgs Condition="'$(OfflineBuild)' != 'true'">$(BuildArgs) /p:IncludedPackageVersionPropsFile="$(PackageVersionPropsPath)"</BuildArgs>
-    <BuildArgs Condition="'$(OfflineBuild)' == 'true'">$(BuildArgs) /p:IncludedPackageVersionPropsFile="$(GennedPackageVersionPropsPath)"</BuildArgs>
-    <BuildCommand>$(ProjectDirectory)pack$(ShellExtension) $(BuildArgs)</BuildCommand>
+    <IncludedPackageVersionPropsFile Condition="'$(OfflineBuild)' != 'true'">$(PackageVersionPropsPath)</IncludedPackageVersionPropsFile>
+    <IncludedPackageVersionPropsFile Condition="'$(OfflineBuild)' == 'true'">$(GennedPackageVersionPropsPath)</IncludedPackageVersionPropsFile>
   </PropertyGroup>
 
   <ItemGroup>
-    <UseSourceBuiltSdkOverride Include="@(ArcadeSdkOverride)" />
     <RepositoryReference Include="arcade" />
     <RepositoryReference Include="sdk" />
   </ItemGroup>
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))/dir.targets" />
+
+  <Target Name="RepoBuild">
+    <!-- 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 coreclr-tools/*" WorkingDirectory="$(SourceBuiltPackagesPath)" />
+
+    <Message Importance="High" Text="Packaged source-built artifacts to $(SourceBuiltTarballName)" />
+  </Target>
+
 </Project>