Skip to content

Enable restore for ref and src projects in libraries #33242

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 44 commits into from
Mar 10, 2020
Merged

Enable restore for ref and src projects in libraries #33242

Changes from 1 commit
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
b3cf550
Enable restore for projects in libraries
ViktorHofer Mar 5, 2020
0ce2d86
Remove winrt.depproj
ViktorHofer Mar 5, 2020
f16320d
Remove tools.depproj
ViktorHofer Mar 5, 2020
760517e
Enable upfront restore
ViktorHofer Mar 5, 2020
bf91cc2
Stop flowing of package dependencies
ViktorHofer Mar 5, 2020
2e0cb60
Merge illink.tasks packageref with others
ViktorHofer Mar 5, 2020
6f9d305
Update TargetFramework.Sdk
ViktorHofer Mar 5, 2020
b80e055
Error task cleanup in composits
ViktorHofer Mar 5, 2020
6db735c
Add comments for Target ordering
ViktorHofer Mar 5, 2020
0202258
Set composit tfms to BuildTargetFramework
ViktorHofer Mar 5, 2020
7b063a1
Disable project restore for others
ViktorHofer Mar 5, 2020
c095003
Fix analyzers and build references in P2P
ViktorHofer Mar 6, 2020
7eb863e
Reenable codeanalysis package
ViktorHofer Mar 6, 2020
964fb2f
Fix casing of PInvokeAnalyzerException file
ViktorHofer Mar 6, 2020
317a436
Update global.json
ViktorHofer Mar 6, 2020
99074d8
Update Versions.props
ViktorHofer Mar 6, 2020
9522d84
Update Version.Details.xml
ViktorHofer Mar 6, 2020
3dd120b
Enable static graph evaluation for restore
ViktorHofer Mar 6, 2020
0cfae53
Make ApiCmpat.proj restorable
ViktorHofer Mar 7, 2020
ae5432a
Optimize restore and disable RestoreTaskEx meanwhile
ViktorHofer Mar 7, 2020
7d44c9c
Remove dir.traversal.tarets from depproj container
ViktorHofer Mar 7, 2020
3184f2a
Remove harvestPackages.depproj and refactoring
ViktorHofer Mar 7, 2020
af638ca
Fix WindowsRuntime test
ViktorHofer Mar 7, 2020
4c17df5
Revert dirs.proj depproj change
ViktorHofer Mar 8, 2020
7da6e40
Add sourcelink back to Tools.props
ViktorHofer Mar 8, 2020
2705614
Set ilasm/ildasm RID for restore
ViktorHofer Mar 8, 2020
b579b3d
Sequence restore into steps out of upfront restore
ViktorHofer Mar 9, 2020
0c1d442
Fix docker entrypoints by using build
ViktorHofer Mar 9, 2020
a492cf6
Move build of generate shims into ref.proj
ViktorHofer Mar 9, 2020
17a15cc
PR feedback
ViktorHofer Mar 9, 2020
273f9fd
Fixing enterprise pipeline
ViktorHofer Mar 9, 2020
5f78ca0
Revert dirs.proj depproj refactoring
ViktorHofer Mar 9, 2020
72c7458
Enable restore in dirs.proj libraries
ViktorHofer Mar 9, 2020
8638a58
It must work!!
ViktorHofer Mar 9, 2020
60d0600
Please work
ViktorHofer Mar 9, 2020
ef3e477
Fix one error at a time
ViktorHofer Mar 9, 2020
a6f4038
Add packages.proj to upfront restore
ViktorHofer Mar 10, 2020
aacea8c
Fix sequencing
ViktorHofer Mar 10, 2020
2f824ef
Remove unnecessary packageref
ViktorHofer Mar 10, 2020
6856d29
More fixes in ProjectRef composition
ViktorHofer Mar 10, 2020
7144258
Undo commented out lines in dirs.proj
ViktorHofer Mar 10, 2020
4f336ab
Sequence refs correctly and cleanup
ViktorHofer Mar 10, 2020
90fc025
Cleanup proj containers
ViktorHofer Mar 10, 2020
34e403c
Remove wrong condition
ViktorHofer Mar 10, 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
Prev Previous commit
Next Next commit
Make ApiCmpat.proj restorable
  • Loading branch information
@ViktorHofer
ViktorHofer committed Mar 7, 2020
commit 0cfae531f83cd2073e0b32b97ff032ae5844ca8c
18 changes: 11 additions & 7 deletions src/libraries/shims/ApiCompat.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
<Project DefaultTargets="Build">
<Project>
<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />

<Import Project="Directory.Build.props" />
<PropertyGroup>
<TargetFramework>$(BuildTargetFramework)</TargetFramework>
</PropertyGroup>

<PropertyGroup>
<ApiCompatTarget>$(BuildTargetFramework)</ApiCompatTarget>
<ApiCompatTarget>$(TargetFramework)</ApiCompatTarget>
<ApiCompatTarget Condition="$(BuildTargetFramework.Contains('netcoreapp'))">netcoreapp</ApiCompatTarget>
<ApiCompatResponseFile>$(IntermediateOutputPath)/apicompat.rsp</ApiCompatResponseFile>
<ApiCompatBaselineFile>$(MSBuildThisFileDirectory)ApiCompatBaseline.$(ApiCompatTarget).netfx461.txt</ApiCompatBaselineFile>
Expand Down Expand Up @@ -98,11 +101,12 @@

</Target>

<Target Name="Build" DependsOnTargets="RunApiCompat" />
<Target Name="Clean">
<Target Name="CleanAdditionalFiles" AfterTargets="Clean">
<RemoveDir Directories="$(BaseIntermediateOutputPath)" />
</Target>
<Target Name="Rebuild" DependsOnTargets="Clean;Build" />

<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />

<!-- Ordering matters! Overwriting the Build target after the Sdk.targets import. -->
<Target Name="Build" DependsOnTargets="RunApiCompat" />
</Project>