diff --git a/eng/Subsets.props b/eng/Subsets.props
index 748d226815fb8b..96790e12b84f25 100644
--- a/eng/Subsets.props
+++ b/eng/Subsets.props
@@ -86,6 +86,7 @@
+
@@ -116,6 +117,7 @@
+
@@ -277,4 +279,8 @@
+
+
+
+
diff --git a/eng/pipelines/coreclr/templates/finalize-publish.yml b/eng/pipelines/coreclr/templates/finalize-publish.yml
deleted file mode 100644
index 3bfc8ec089366b..00000000000000
--- a/eng/pipelines/coreclr/templates/finalize-publish.yml
+++ /dev/null
@@ -1,62 +0,0 @@
-parameters:
- # Optional: dependencies of the job
- dependsOn: ''
-
- artifactsDir: $(Build.StagingDirectory)/artifacts
-
- gitHubUser: dotnet-build-bot
- gitHubEmail: dotnet-build-bot@microsoft.com
- gitHubAuthToken: $(AccessToken-dotnet-build-bot-public-repo)
-
- versionsRepoOwner: dotnet
- versionsRepo: versions
-
-jobs:
- - template: /eng/common/templates/job/publish-build-assets.yml
- parameters:
- configuration: Release
- pool:
- name: NetCoreInternal-Pool
- queue: BuildPool.Windows.10.Amd64.VS2017
- dependsOn: ${{ parameters.dependsOn }}
- publishUsingPipelines: true
- # Update dotnet/versions
- - job: Finalize_Publish_Versions
- displayName: Finalize Publish Versions
- dependsOn:
- - Asset_Registry_Publish
- pool:
- name: Hosted VS2017
- variables:
- - group: DotNet-Versions-Publish
- steps:
- # Download nuget packages
- - task: DownloadBuildArtifacts@0
- displayName: Download nuget package artifacts
- inputs:
- buildType: current
- artifactName: PackageArtifacts
- downloadPath: ${{ parameters.artifactsDir }}/nuget
-
- - powershell: |
- $prefix = "refs/heads/"
- $branch = "$(Build.SourceBranch)"
- $branchName = $branch
- if ($branchName.StartsWith($prefix))
- {
- $branchName = $branchName.Substring($prefix.Length)
- }
- Write-Host "For Build.SourceBranch $branch, FullBranchName is $branchName"
- Write-Host "##vso[task.setvariable variable=FullBranchName;]$branchName"
- ls -R ${{ parameters.artifactsDir }}/nuget/*.nupkg
- & $(Build.SourcesDirectory)/eng/common/build.ps1 -restore -build -ci `
- -projects "$(Build.SourcesDirectory)/eng/updateversions.proj" `
- /p:GitHubUser="${{ parameters.gitHubUser }}" `
- /p:GitHubEmail="${{ parameters.gitHubEmail }}" `
- /p:GitHubAuthToken="${{ parameters.gitHubAuthToken }}" `
- /p:VersionsRepoOwner="${{ parameters.versionsRepoOwner }}" `
- /p:VersionsRepo="${{ parameters.versionsRepo }}" `
- /p:VersionsRepoPath="build-info/dotnet/coreclr/$branchName" `
- /p:ShippedNuGetPackageGlobPath="${{ parameters.artifactsDir }}/nuget/*.nupkg"
-
- displayName: Update dotnet/versions
diff --git a/eng/pipelines/official/jobs/prepare-signed-artifacts.yml b/eng/pipelines/official/jobs/prepare-signed-artifacts.yml
index 77f33ab315a541..b7a5b60ee1ba19 100644
--- a/eng/pipelines/official/jobs/prepare-signed-artifacts.yml
+++ b/eng/pipelines/official/jobs/prepare-signed-artifacts.yml
@@ -43,8 +43,8 @@ jobs:
- script: >-
build.cmd -ci
+ -subsetcategory installer -subset publish
-configuration Release
- -projects $(Build.SourcesDirectory)\src\installer\publish\prepare-artifacts.proj
/p:PublishRidAgnosticPackagesFromPlatform=${{ parameters.PublishRidAgnosticPackagesFromPlatform }}
/p:OfficialBuildId=$(Build.BuildNumber)
/p:SignType=$(SignType)
diff --git a/src/installer/publish/prepare-artifacts.proj b/src/installer/publish/prepare-artifacts.proj
index 599388672ced66..1bf2b52c6a5234 100644
--- a/src/installer/publish/prepare-artifacts.proj
+++ b/src/installer/publish/prepare-artifacts.proj
@@ -1,4 +1,4 @@
-
+