Skip to content

Restore followup #34632

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ViktorHofer merged 2 commits into from
Apr 7, 2020
Merged

Restore followup #34632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
315ce78
Remove dead yml file
ViktorHofer Apr 7, 2020
bb42dbf
Fix installer prepare for publish
ViktorHofer Apr 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions eng/Subsets.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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." />
Expand Down Expand Up @@ -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. -->
Expand Down Expand Up @@ -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>
62 changes: 0 additions & 62 deletions eng/pipelines/coreclr/templates/finalize-publish.yml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion eng/pipelines/official/jobs/prepare-signed-artifacts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/installer/publish/prepare-artifacts.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project>
<Project DefaultTargets="Build">
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />

<UsingTask TaskName="GenerateChecksums" AssemblyFile="$(InstallerTasksAssemblyPath)" />
Expand Down