Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Enable Building of packages in 3.1 branch #41448

Merged
Anipik merged 6 commits into from
Oct 1, 2019
Merged

Enable Building of packages in 3.1 branch #41448

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b30cc5f
enable Packaging
Anipik Sep 30, 2019
50bed29
fixing harvesting failures
Anipik Sep 30, 2019
1998988
removing target path
Anipik Sep 30, 2019
c8c6551
Refactor how we calculate stable package identity
ericstj Sep 30, 2019
87213ca
removing ref to baseline.props
Anipik Sep 30, 2019
fd52d75
another ref to baseline.props
Anipik Sep 30, 2019
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
1 change: 1 addition & 0 deletions pkg/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
For offline builds we still set OfficialBuildId but we need to build all the packages for a single
leg only, so we also take DotNetBuildFromSource into account. -->
<BuildingAnOfficialBuildLeg Condition="'$(BuildingAnOfficialBuildLeg)' == '' AND '$(OfficialBuildId)' != '' AND '$(DotNetBuildFromSource)' != 'true'">true</BuildingAnOfficialBuildLeg>
<HarvestStablePackage>false</HarvestStablePackage>
</PropertyGroup>

<!-- Packages opt-in to automatic RID-specific builds by placing a *.RID.props next to their project
Expand Down
4 changes: 1 addition & 3 deletions src/System.Runtime.WindowsRuntime.UI.Xaml/pkg/System.Runtime.WindowsRuntime.UI.Xaml.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,7 @@
<TargetFramework>netcoreapp1.0</TargetFramework>
</File>-->

<HarvestIncludePaths Include="runtimes/win8/lib/netstandard1.3">
<TargetPath>runtimes/win/lib/netcore50</TargetPath>
</HarvestIncludePaths>
<HarvestIncludePaths Include="runtimes/win/lib/netcore50" />

<File Include="$(PlaceHolderFile)">
<TargetPath>runtimes/win-aot/lib/uap10.0.16299</TargetPath>
Expand Down
8 changes: 2 additions & 6 deletions src/System.Runtime.WindowsRuntime/pkg/System.Runtime.WindowsRuntime.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,8 @@
<TargetFramework>netcoreapp1.0</TargetFramework>
</File> -->

<HarvestIncludePaths Include="runtimes/win8/lib/netstandard1.3">
<TargetPath>runtimes/win/lib/netcore50</TargetPath>
</HarvestIncludePaths>
<HarvestIncludePaths Include="runtimes/win8-aot/lib/netcore50">
<TargetPath>runtimes/win-aot/lib/netcore50</TargetPath>
</HarvestIncludePaths>
<HarvestIncludePaths Include="runtimes/win/lib/netcore50" />
<HarvestIncludePaths Include="runtimes/win-aot/lib/netcore50" />

<File Include="$(PlaceHolderFile)">
<TargetPath>runtimes/win-aot/lib/uap10.0.16299</TargetPath>
Expand Down
2 changes: 1 addition & 1 deletion src/packages.builds
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<PropertyGroup>
<BuildAllPackages>false</BuildAllPackages>
<BuildAllPackages>true</BuildAllPackages>
</PropertyGroup>

<ItemGroup Condition="'$(BuildAllPackages)' == 'true'">
Expand Down