Restore followup (#34632)

* Remove dead yml file

* Fix installer prepare for publish

diff --git a/eng/Subsets.props b/eng/Subsets.props
index 748d226..96790e1 100644 (file)
--- a/eng/Subsets.props
+++ b/eng/Subsets.props
@@ -86,6 +86,7 @@
 
   <ItemGroup>
     <!-- Libraries -->
+    <SubsetName Include="Depprojs" Category="Libraries" Description="The libraries upfront restore projects." />
     <SubsetName Include="Native" Category="Libraries" Description="The native libraries used in the shared framework." />
     <SubsetName Include="Ref" Category="Libraries" Description="The managed reference libraries." />
     <SubsetName Include="Src" Category="Libraries" Description="The managed implementation libraries." />
@@ -116,6 +117,7 @@
     <SubsetName Include="Bundle" Category="Installer" Description="The shared framework bundle installer projects. Produces .exe installers for Windows." />
     <SubsetName Include="Installers" Category="Installer" Description="Generates additional installers. This produces the shared frameworks and their installers." />
     <SubsetName Include="Test" Category="Installer" Description="The test projects. Note that building this doesn't execute tests: you must also pass the '-test' argument." />
+    <SubsetName Include="Publish" Category="Installer" OnDemand="true" Description="Builds the installer publish infrastructure." />
   </ItemGroup>
 
   <!-- Default targets, parallelization and configurations. -->
@@ -277,4 +279,8 @@
     <InstallerProject Include="@(TestProjectToBuild)" Pack="false" Test="true" BuildInParallel="false" />
   </ItemGroup>
 
+  <ItemGroup Condition="$(_subsetCategory.Contains('installer')) and $(_subset.Contains('-publish-'))">
+    <InstallerProject Include="$(InstallerProjectRoot)publish\prepare-artifacts.proj" />
+  </ItemGroup>
+
 </Project>

diff --git a/eng/pipelines/coreclr/templates/finalize-publish.yml b/eng/pipelines/coreclr/templates/finalize-publish.yml
deleted file mode 100644 (file)
index 3bfc8ec..0000000
--- 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 77f33ab..b7a5b60 100644 (file)
--- 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 5993886..1bf2b52 100644 (file)
--- a/src/installer/publish/prepare-artifacts.proj
+++ b/src/installer/publish/prepare-artifacts.proj
@@ -1,4 +1,4 @@
-<Project>
+<Project DefaultTargets="Build">
   <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
 
   <UsingTask TaskName="GenerateChecksums" AssemblyFile="$(InstallerTasksAssemblyPath)" />