diff --git a/eng/DotNetBuild.props b/eng/DotNetBuild.props
index efb463b9ea62..716734d48003 100644
--- a/eng/DotNetBuild.props
+++ b/eng/DotNetBuild.props
@@ -17,6 +17,7 @@
$(InnerBuildArgs) /p:IncludeAdditionalSharedFrameworks=false
$(InnerBuildArgs) /p:DISABLE_CROSSGEN=true
$(InnerBuildArgs) /p:PgoInstrument=true
+ $(InnerBuildArgs) /p:DotNetBuildPass=$(DotNetBuildPass)
diff --git a/eng/pipelines/templates/jobs/vmr-build.yml b/eng/pipelines/templates/jobs/vmr-build.yml
index 3875e9d54279..83bfa0a3754e 100644
--- a/eng/pipelines/templates/jobs/vmr-build.yml
+++ b/eng/pipelines/templates/jobs/vmr-build.yml
@@ -215,7 +215,7 @@ jobs:
**/*.nupkg
displayName: Download Previous Build (${{ reuseBuildArtifacts }})
- - ${{ eq(parameters.buildSourceOnly, true) }}:
+ - ${{ if eq(parameters.buildSourceOnly, true) }}:
- task: CopyFiles@2
displayName: Copy Previous Build (${{ reuseBuildArtifacts }} - Source Build artifacts)
inputs:
diff --git a/eng/pipelines/templates/stages/vmr-build.yml b/eng/pipelines/templates/stages/vmr-build.yml
index 216be2415593..7fd0577e4ce5 100644
--- a/eng/pipelines/templates/stages/vmr-build.yml
+++ b/eng/pipelines/templates/stages/vmr-build.yml
@@ -390,6 +390,11 @@ stages:
pool: ${{ parameters.pool_Windows }}
targetOS: windows
targetArchitecture: x64
+ ${{ if in(parameters.scope, 'full') }}:
+ buildPass: 2
+ reuseBuildArtifactsFrom:
+ - Windows_x86
+ - Windows_arm64
- template: ../jobs/vmr-build.yml
parameters:
diff --git a/src/Installer/redist-installer/projects/SdkResolver.csproj b/src/Installer/redist-installer/projects/SdkResolver.csproj
index 5b2373bfe817..7ceb0b9b0817 100644
--- a/src/Installer/redist-installer/projects/SdkResolver.csproj
+++ b/src/Installer/redist-installer/projects/SdkResolver.csproj
@@ -7,11 +7,7 @@
false
false
true
-
- true
+ true
diff --git a/src/Installer/redist-installer/projects/VSTemplateLocator.csproj b/src/Installer/redist-installer/projects/VSTemplateLocator.csproj
index 892d2acbe03a..8119ec06e288 100644
--- a/src/Installer/redist-installer/projects/VSTemplateLocator.csproj
+++ b/src/Installer/redist-installer/projects/VSTemplateLocator.csproj
@@ -7,11 +7,7 @@
false
false
true
-
- true
+ true
diff --git a/src/Installer/redist-installer/redist-installer.csproj b/src/Installer/redist-installer/redist-installer.csproj
index 972a0838cc9a..dcba423856ac 100644
--- a/src/Installer/redist-installer/redist-installer.csproj
+++ b/src/Installer/redist-installer/redist-installer.csproj
@@ -19,12 +19,8 @@
-
-
-
+
+
diff --git a/src/SourceBuild/content/repo-projects/sdk.proj b/src/SourceBuild/content/repo-projects/sdk.proj
index 858678e015ac..75b5634f22de 100644
--- a/src/SourceBuild/content/repo-projects/sdk.proj
+++ b/src/SourceBuild/content/repo-projects/sdk.proj
@@ -25,6 +25,9 @@
$(BuildArgs) /p:Architecture=$(TargetArchitecture)
$(BuildArgs) /p:DOTNET_INSTALL_DIR=$(DotNetRoot)
+
+ $(BuildArgs) /p:DotNetBuildPass=$(DotNetBuildPass)
+
$(BuildArgs) /p:AspNetCoreInstallerRid=$(TargetRid)
$(BuildArgs) /p:PortableBuild=true