diff --git a/eng/Versions.props b/eng/Versions.props
index 265c5ed44..f286b3c1c 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -159,6 +159,7 @@
15.7.179
15.7.179
0.1.0-6.0.100-bootstrap.11
+ 0.1.0-6.0.100-1
diff --git a/src/SourceBuild/Arcade/eng/common/templates/steps/source-build-run-tarball-build.yml b/src/SourceBuild/Arcade/eng/common/templates/steps/source-build-run-tarball-build.yml
index 2bc2f8eb4..cc57f6752 100644
--- a/src/SourceBuild/Arcade/eng/common/templates/steps/source-build-run-tarball-build.yml
+++ b/src/SourceBuild/Arcade/eng/common/templates/steps/source-build-run-tarball-build.yml
@@ -31,6 +31,7 @@ steps:
SourceFolder: '${{ parameters.sourceFolder }}'
Contents: |
artifacts/**/Private.SourceBuilt.Artifacts*.tar.gz
+ artifacts/prebuilt-report/Private.SourceBuilt.Prebuilts.*.tar.gz
TargetFolder: '$(Build.StagingDirectory)/artifacts'
CleanTargetFolder: true
condition: and(${{ parameters.condition }}, succeeded())
diff --git a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets
index 8fe351cf0..c19d3416e 100644
--- a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets
+++ b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets
@@ -188,6 +188,7 @@
$(TarballRootDir)packages/archive/
Private.SourceBuilt.Artifacts
+ Private.SourceBuilt.Prebuilts
https://dotnetcli.azureedge.net/source-built-artifacts/assets/
archiveArtifacts.txt
$(ExternalTarballsDir)$(ArchiveArtifactsTextFileName)
@@ -197,6 +198,7 @@
+
$(ProjectDir)packages/text-only/
$(ReferencePackagesBaseDir)packages/
Private.SourceBuilt.Artifacts
+ Private.SourceBuilt.Prebuilts
https://dotnetcli.azureedge.net/source-built-artifacts/assets/
archiveArtifacts.txt
$(ExternalTarballsDir)$(ArchiveArtifactsTextFileName)
diff --git a/src/SourceBuild/tarball/content/build.proj b/src/SourceBuild/tarball/content/build.proj
index 1b07656b3..1ae201332 100644
--- a/src/SourceBuild/tarball/content/build.proj
+++ b/src/SourceBuild/tarball/content/build.proj
@@ -138,4 +138,17 @@
Overwrite="true" />
+
+
+
+ $(PrivateSourceBuiltPrebuiltsPackageVersionPrefix)$([MSBuild]::Add($(PrivateSourceBuiltPrebuiltsPackageVersionSuffix), 1))
+ $(PackageReportDir)$(SourceBuiltPrebuiltsTarballName).$(TarballFileVersion).tar.gz
+ $(ResultingPrebuiltPackagesDir)
+
+
+
+
+
+
diff --git a/src/SourceBuild/tarball/content/eng/Versions.props b/src/SourceBuild/tarball/content/eng/Versions.props
index c03787c3d..09a014ccd 100644
--- a/src/SourceBuild/tarball/content/eng/Versions.props
+++ b/src/SourceBuild/tarball/content/eng/Versions.props
@@ -22,5 +22,7 @@
0.1.0-6.0.100-bootstrap.11
+ 0.1.0-6.0.100-
+ 1
diff --git a/src/SourceBuild/tarball/content/prep.sh b/src/SourceBuild/tarball/content/prep.sh
index 58cf90e40..64231d22f 100755
--- a/src/SourceBuild/tarball/content/prep.sh
+++ b/src/SourceBuild/tarball/content/prep.sh
@@ -38,6 +38,7 @@ if [ ! -f $SCRIPT_ROOT/packages/archive/archiveArtifacts.txt ]; then
fi
downloadArtifacts=true
+downloadPrebuilts=true
installDotnet=true
# Check to make sure curl exists to download the archive files
@@ -53,6 +54,12 @@ if [ -f $SCRIPT_ROOT/packages/archive/Private.SourceBuilt.Artifacts.*.tar.gz ];
downloadArtifacts=false
fi
+# Check if Private.SourceBuilt prebuilts archive exists
+if [ -f $SCRIPT_ROOT/packages/archive/Private.SourceBuilt.Prebuilts.*.tar.gz ]; then
+ echo " Private.SourceBuilt.Prebuilts.*.tar.gz exists...it will not be downloaded"
+ downloadPrebuilts=false
+fi
+
# Check if dotnet is installed
if [ -d $SCRIPT_ROOT/.dotnet ]; then
echo " ./.dotnet SDK directory exists...it will not be installed"
@@ -67,6 +74,12 @@ while read -r line; do
(cd $SCRIPT_ROOT/packages/archive/ && curl -O $line)
fi
fi
+ if [[ $line == *"Private.SourceBuilt.Prebuilts"* ]]; then
+ if [ "$downloadPrebuilts" == "true" ]; then
+ echo " Downloading source-built prebuilts..."
+ (cd $SCRIPT_ROOT/packages/archive/ && curl -O $line)
+ fi
+ fi
done < $SCRIPT_ROOT/packages/archive/archiveArtifacts.txt
# Check for the version of dotnet to install
diff --git a/src/SourceBuild/tarball/content/tools-local/init-build.proj b/src/SourceBuild/tarball/content/tools-local/init-build.proj
index 1e2d8f407..3300389d3 100644
--- a/src/SourceBuild/tarball/content/tools-local/init-build.proj
+++ b/src/SourceBuild/tarball/content/tools-local/init-build.proj
@@ -46,6 +46,9 @@
WorkingDirectory="$(PrebuiltSourceBuiltPackagesPath)"
Condition="'$(CustomPrebuiltSourceBuiltPackagesPath)' == ''" />
+
+