diff --git a/eng/pipelines/templates/stages/vmr-build.yml b/eng/pipelines/templates/stages/vmr-build.yml
index 61cb16a0f..72d3ffe79 100644
--- a/eng/pipelines/templates/stages/vmr-build.yml
+++ b/eng/pipelines/templates/stages/vmr-build.yml
@@ -68,7 +68,7 @@ stages:
name: ${{ variables.defaultPoolName }}
demands: ${{ variables.defaultPoolDemands }}
container: ${{ parameters.centOSStream8Container }}
- bootstrapPrep: false # 🚫
+ bootstrapPrep: true # ✅
buildFromArchive: false # 🚫
enablePoison: false # 🚫
excludeOmniSharpTests: true # ✅
@@ -87,7 +87,7 @@ stages:
name: ${{ variables.defaultPoolName }}
demands: ${{ variables.defaultPoolDemands }}
container: ${{ parameters.centOSStream8Container }}
- bootstrapPrep: false # 🚫
+ bootstrapPrep: true # ✅
buildFromArchive: true # ✅
enablePoison: false # 🚫
excludeOmniSharpTests: true # ✅
@@ -105,7 +105,7 @@ stages:
name: ${{ variables.defaultPoolName }}
demands: ${{ variables.defaultPoolDemands }}
container: ${{ parameters.centOSStream9Container }}
- bootstrapPrep: false # 🚫
+ bootstrapPrep: true # ✅
buildFromArchive: true # ✅
enablePoison: false # 🚫
excludeOmniSharpTests: false # 🚫
@@ -123,7 +123,7 @@ stages:
name: ${{ variables.defaultPoolName }}
demands: ${{ variables.defaultPoolDemands }}
container: ${{ parameters.fedora36Container }}
- bootstrapPrep: false # 🚫
+ bootstrapPrep: true # 🚫
buildFromArchive: true # ✅
enablePoison: true # ✅
excludeOmniSharpTests: false # 🚫
@@ -141,7 +141,7 @@ stages:
name: ${{ variables.defaultPoolName }}
demands: ${{ variables.defaultPoolDemands }}
container: ${{ parameters.ubuntu2004Container }}
- bootstrapPrep: false # 🚫
+ bootstrapPrep: true # ✅
buildFromArchive: false # 🚫
enablePoison: false # 🚫
excludeOmniSharpTests: false # 🚫
@@ -175,7 +175,7 @@ stages:
name: ${{ variables.defaultPoolName }}
demands: ${{ variables.defaultPoolDemands }}
container: ${{ parameters.fedora36Container }}
- bootstrapPrep: false # 🚫
+ bootstrapPrep: true # 🚫
buildFromArchive: false # 🚫
enablePoison: false # 🚫
excludeOmniSharpTests: false # 🚫
diff --git a/src/SourceBuild/content/Directory.Build.props b/src/SourceBuild/content/Directory.Build.props
index a4649f591..5b88ccfd1 100644
--- a/src/SourceBuild/content/Directory.Build.props
+++ b/src/SourceBuild/content/Directory.Build.props
@@ -229,6 +229,10 @@
+
+
+
+
diff --git a/src/SourceBuild/content/eng/Versions.props b/src/SourceBuild/content/eng/Versions.props
index c2dc06d8a..7a51bf998 100644
--- a/src/SourceBuild/content/eng/Versions.props
+++ b/src/SourceBuild/content/eng/Versions.props
@@ -24,6 +24,6 @@
or minor release, prebuilts may be needed. When the release is mature, prebuilts are not
necessary, and this property is removed from the file.
-->
- 0.1.0-8.0.100-2
+ 0.1.0-8.0.100-4.centos.8-x64
diff --git a/src/SourceBuild/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj b/src/SourceBuild/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj
index a22d70373..bcfc97c70 100644
--- a/src/SourceBuild/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj
+++ b/src/SourceBuild/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj
@@ -13,36 +13,40 @@
-
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -73,6 +77,29 @@
Targets="CopyDownloadedPackage"
Properties="SourcePath=$(RestorePackagesPath);DestinationPath=$(UnpackedTarPath);PackageName=%(PackageDownload.Identity);PackageVersion=%(PackageDownload.Version)" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets
index 3a68fd5f1..b99d03e87 100644
--- a/src/SourceBuild/content/repo-projects/Directory.Build.targets
+++ b/src/SourceBuild/content/repo-projects/Directory.Build.targets
@@ -111,12 +111,10 @@
+ NewText="_InitializeBuildToolFramework="$(NetCurrent)"" />
+ NewText="_InitializeBuildToolFramework="$(NetCurrent)"" />
diff --git a/src/SourceBuild/patches/sourcelink/0001-command-line-api-updates.patch b/src/SourceBuild/patches/sourcelink/0001-command-line-api-updates.patch
new file mode 100644
index 000000000..f222c0dc2
--- /dev/null
+++ b/src/SourceBuild/patches/sourcelink/0001-command-line-api-updates.patch
@@ -0,0 +1,25 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Michael Simons
+Date: Fri, 27 Jan 2023 17:50:38 +0000
+Subject: [PATCH] command-line-api updates
+
+Updates necessary to build with the command-line-api version included in source-build.
+
+Backport: https://github.com/dotnet/sourcelink/issues/945
+---
+ src/dotnet-sourcelink/Program.cs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/dotnet-sourcelink/Program.cs b/src/dotnet-sourcelink/Program.cs
+index 0803734..9affcf5 100644
+--- a/src/dotnet-sourcelink/Program.cs
++++ b/src/dotnet-sourcelink/Program.cs
+@@ -64,7 +64,7 @@ private static string GetSourceLinkVersion()
+
+ private static RootCommand GetRootCommand()
+ {
+- var authArg = new Option(new[] { "--auth", "-a" }, "Authentication method").FromAmong(AuthenticationMethod.Basic);
++ var authArg = new Option(new[] { "--auth", "-a" }, "Authentication method").AcceptOnlyFromAmong(AuthenticationMethod.Basic);
+ var userArg = new Option(new[] { "--user", "-u" }, "Username to use to authenticate") { Arity = ArgumentArity.ExactlyOne };
+ var passwordArg = new Option(new[] { "--password", "-p" }, "Password to use to authenticate") { Arity = ArgumentArity.ExactlyOne };
+